Changeset 99364

Timestamp:

Nov 3, 2012, 8:12:56 AM (12 years ago)

Author:

jmr@…

Message:

openmotif: update to 2.3.4

Location:

trunk/dports/x11/openmotif

Files:

• Portfile (modified) (4 diffs)
• files/patch-autogen.sh.diff (added)
• files/patch-clients-uil-UilDefI.h.diff (deleted)
• files/patch-lib-XmP.h.diff (modified) (2 diffs)

trunk/dports/x11/openmotif/Portfile

@@ -4 +4 @@
 
 name            openmotif
-version         2.3.3
-revision        1
-set branch      [join [lrange [split ${version} .] 0 1] .]
-set subdir      [lindex [split ${version} -] 0]
-worksrcdir      ${name}-${subdir}
+version         2.3.4
 categories      x11
-license         Restrictive
+license         LGPL
 platforms       darwin
 maintainers     nomaintainer
@@ -19 +15 @@
     the original OSF sources.
 
-homepage        http://www.motifzone.net/
+homepage        http://motif.ics.com/
 conflicts       lesstif
-master_sites    http://ftp.ics.com/openmotif/${branch}/${subdir}/ \
-                ftp://ftp.ics.com/openmotif/${branch}/${subdir}/
-fetch.use_epsv  no
+master_sites    sourceforge:project/motif/Motif%20${version}%20Source%20Code
+distname        motif-${version}-src
+extract.suffix  .tgz
 
-checksums           sha1    2a51e2f28078c4db7ff0c8517eb257001716b699 \
-                    rmd160  015323e212e91ea3beaf039593de5ba75b01e4a6 \
-                    sha256  c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
+checksums       md5    612bb8127d0d31da6e5474edf8a5c247 \
+                sha1   49ecfe2a0939232ca78ce318d938044e7f751b6d \
+                rmd160 96e1ed3c5b99d420e3e2e4eae1b5590961191a33
+worksrcdir      motif-${version}
 
 depends_build \
         port:pkgconfig \
-        port:xbitmaps
+        port:xbitmaps \
+        port:autoconf \
+        port:automake \
+        port:libtool
 
 depends_lib \
@@ -46 +46 @@
 patchfiles      patch-uintptr_t-cast.diff \
                 patch-lib-XmP.h.diff \
-                patch-clients-uil-UilDefI.h.diff
+                patch-autogen.sh.diff
 
 post-patch {
-    reinplace "s|iconv_open|libiconv_open|g" ${worksrcpath}/configure
-    reinplace -E "/^LDFLAGS/s|\$| @LDFLAGS@|" ${worksrcpath}/lib/Xm/Makefile.in
+    # Looks like a botched cvs rename - identical files with an 'Exm' name
+    # prefix exist. Only a problem because of a case-conflict with libc's
+    # string.h.
+    file delete ${worksrcpath}/demos/lib/Exm/String.h \
+                ${worksrcpath}/demos/lib/Exm/StringP.h \
+                ${worksrcpath}/demos/lib/Exm/String.c
 }
 
-configure.cflags -fno-strict-aliasing
+pre-configure {
+    system -W ${worksrcpath} "./autogen.sh"
+}
 configure.args  --mandir=${prefix}/share/man    \
                 --enable-xft    \
@@ -62 +68 @@
 
 use_parallel_build  no
-build.env       LANG=C
 
 post-destroot {
-    set docdir ${prefix}/share/doc/${name}-${version}
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
-    xinstall -m 0644 -W ${worksrcpath} BUGREPORT COPYRIGHT.MOTIF ChangeLog LICENSE \
+    xinstall -m 0644 -W ${worksrcpath} BUGREPORT COPYING ChangeLog \
         README RELNOTES TODO ${destroot}${docdir}
 }

trunk/dports/x11/openmotif/files/patch-lib-XmP.h.diff

@@ -1 @@
---- lib/Xm/XmP.h.orig   2011-06-28 16:02:50.000000000 -0700
-+++ lib/Xm/XmP.h        2011-06-28 16:12:34.000000000 -0700
-@@ -1455,12 +1455,15 @@ extern void _XmDestroyParentCallback( 
+--- lib/Xm/XmP.h.orig   2012-10-23 01:50:35.000000000 +1100
++++ lib/Xm/XmP.h        2012-11-03 17:45:45.000000000 +1100
+@@ -1442,9 +1442,13 @@ extern void _XmDestroyParentCallback( 
  
  #endif /* NO_XM_1_2_BC */
@@ -16 +16 @@
  #else
  #  define XM_DEPRECATED
--#  define XM_ALIAS(sym)
- #endif
- 
- #endif /* _XmP_h */
+ #  define XM_ALIAS(sym)