[88372] trunk/dports/x11/openmotif

[jeremyhu at macports.org]

Revision: 88372
          http://trac.macports.org/changeset/88372
Author:   jeremyhu at macports.org
Date:     2011-12-29 15:06:27 -0800 (Thu, 29 Dec 2011)
Log Message:
-----------
openmotif: Bump to version 2.3.3.  Closes #30898

Modified Paths:
--------------
    trunk/dports/x11/openmotif/Portfile

Added Paths:
-----------
    trunk/dports/x11/openmotif/files/patch-clients-uil-UilDefI.h.diff

Removed Paths:
-------------
    trunk/dports/x11/openmotif/files/patch-demos-programs-peridoc-Makefile.in.diff

Modified: trunk/dports/x11/openmotif/Portfile
===================================================================
--- trunk/dports/x11/openmotif/Portfile	2011-12-29 22:48:49 UTC (rev 88371)
+++ trunk/dports/x11/openmotif/Portfile	2011-12-29 23:06:27 UTC (rev 88372)
@@ -3,8 +3,7 @@
 PortSystem      1.0
 
 name            openmotif
-version         2.3.2
-revision        3
+version         2.3.3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set subdir      [lindex [split ${version} -] 0]
 worksrcdir      ${name}-${subdir}
@@ -24,9 +23,9 @@
                 ftp://ftp.ics.com/openmotif/${branch}/${subdir}/
 fetch.use_epsv  no
 
-checksums       md5     bf5479d52bc114d299200ec20e463e96 \
-                sha1    c98ac1bf3640ce57da34a0704bdeb2b12011ae1f \
-                rmd160  2346a93fcec57b9c18b6657d1cc681b6001cba28
+checksums           sha1    2a51e2f28078c4db7ff0c8517eb257001716b699 \
+                    rmd160  015323e212e91ea3beaf039593de5ba75b01e4a6 \
+                    sha256  c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
 
 depends_build \
 	port:pkgconfig \
@@ -43,11 +42,12 @@
 	port:xorg-libXp \
 	port:xorg-libXt
 
-patchfiles      patch-demos-programs-peridoc-Makefile.in.diff \
-                patch-lib-Mrm-Makefile.in.diff \
-                patch-uintptr_t-cast.diff \
-                patch-lib-XmP.h.diff
+# patch-lib-Mrm-Makefile.in.diff
 
+patchfiles      patch-uintptr_t-cast.diff \
+                patch-lib-XmP.h.diff \
+                patch-clients-uil-UilDefI.h.diff
+
 post-patch {
     reinplace "s|iconv_open|libiconv_open|g" ${worksrcpath}/configure
     reinplace -E "/^LDFLAGS/s|\$| @LDFLAGS@|" ${worksrcpath}/lib/Xm/Makefile.in

Added: trunk/dports/x11/openmotif/files/patch-clients-uil-UilDefI.h.diff
===================================================================
--- trunk/dports/x11/openmotif/files/patch-clients-uil-UilDefI.h.diff	                        (rev 0)
+++ trunk/dports/x11/openmotif/files/patch-clients-uil-UilDefI.h.diff	2011-12-29 23:06:27 UTC (rev 88372)
@@ -0,0 +1,11 @@
+--- clients/uil/UilDefI.h.orig	2011-12-29 11:45:36.000000000 -0800
++++ clients/uil/UilDefI.h	2011-12-29 11:45:52.000000000 -0800
+@@ -283,7 +283,7 @@ extern char* uil_mmove(char*, char*, int
+ #include "UilIODef.h"
+ #include "UilDiagDef.h"
+ #include "UilSarDef.h"
+-#if defined(linux)
++#if defined(linux) || defined(__APPLE__)
+ #define YYSTYPE yystype
+ #endif
+ #include "UilLexPars.h"

Deleted: trunk/dports/x11/openmotif/files/patch-demos-programs-peridoc-Makefile.in.diff
===================================================================
--- trunk/dports/x11/openmotif/files/patch-demos-programs-peridoc-Makefile.in.diff	2011-12-29 22:48:49 UTC (rev 88371)
+++ trunk/dports/x11/openmotif/files/patch-demos-programs-peridoc-Makefile.in.diff	2011-12-29 23:06:27 UTC (rev 88372)
@@ -1,23 +0,0 @@
---- demos/programs/periodic/Makefile.in	2008-09-19 09:55:02.000000000 -0500
-+++ demos/programs/periodic/Makefile.in	2008-11-21 03:13:23.000000000 -0600
-@@ -34,7 +34,8 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--bin_PROGRAMS = periodic$(EXEEXT)
-+PERIODIC_BIN_NAME = om_periodic$(EXEEXT)
-+bin_PROGRAMS = $(PERIODIC_BIN_NAME)
- subdir = demos/programs/periodic
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -289,8 +290,8 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--periodic$(EXEEXT): $(periodic_OBJECTS) $(periodic_DEPENDENCIES) 
--	@rm -f periodic$(EXEEXT)
-+$(PERIODIC_BIN_NAME): $(periodic_OBJECTS) $(periodic_DEPENDENCIES) 
-+	@rm -f $(PERIODIC_BIN_NAME)
- 	$(LINK) $(periodic_OBJECTS) $(periodic_LDADD) $(LIBS)
- 
- mostlyclean-compile:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111229/b860f496/attachment.html>