[37843] trunk/dports/x11/openMotif

[ricci at macports.org]

Revision: 37843
          http://trac.macosforge.org/projects/macports/changeset/37843
Author:   ricci at macports.org
Date:     2008-06-25 13:40:39 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
add configure args to use deps from ${prefix}
patch lib/Mrm/Makefile.in to bring in (dep) libs from ${prefix} instead of /usr/X11/lib
rename 'periodic' to 'om_periodic' per ticket 14313

p.s. yes, this fails lint due the directory name, that's next.

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

Added Paths:
-----------
    trunk/dports/x11/openMotif/files/patch-demos-programs-peridoc-Makefile.in.diff
    trunk/dports/x11/openMotif/files/patch-lib-Mrm-Makefile.in.diff

Modified: trunk/dports/x11/openMotif/Portfile
===================================================================
--- trunk/dports/x11/openMotif/Portfile	2008-06-25 19:48:25 UTC (rev 37842)
+++ trunk/dports/x11/openMotif/Portfile	2008-06-25 20:40:39 UTC (rev 37843)
@@ -36,12 +36,27 @@
                 port:zlib \
                 lib:libX11.6:XFree86
 
+patchfiles      patch-demos-programs-peridoc-Makefile.in.diff \
+                patch-lib-Mrm-Makefile.in.diff
+
 post-patch {
     reinplace "s|iconv_open|libiconv_open|g" ${worksrcpath}/configure
     reinplace -E "/^LDFLAGS/s|\$| @LDFLAGS@|" ${worksrcpath}/lib/Xm/Makefile.in
 }
 
-configure.args  --mandir=${prefix}/share/man
+configure.args  --mandir=${prefix}/share/man	\
+                --enable-xft	\
+                --with-fontconfig-config=${prefix}/bin/freetype-config	\
+                --with-fontconfig-includes=${prefix}/include	\
+                --with-fontconfig-lib=${prefix}/lib	\
+                --with-freetype-includes=${prefix}/include	\
+                --with-freetype-lib=${prefix}/lib	\
+                --enable-jpeg	\
+                --with-libjpeg-includes=${prefix}/include	\
+                --with-libjpeg-lib=${prefix}/lib	\
+                --enable-png	\
+                --with-libpng-includes=${prefix}/include	\
+                --with-libpng-lib=${prefix}/lib	
 
 build.env       LANG=C
 

Added: trunk/dports/x11/openMotif/files/patch-demos-programs-peridoc-Makefile.in.diff
===================================================================
--- trunk/dports/x11/openMotif/files/patch-demos-programs-peridoc-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/x11/openMotif/files/patch-demos-programs-peridoc-Makefile.in.diff	2008-06-25 20:40:39 UTC (rev 37843)
@@ -0,0 +1,23 @@
+--- demos/programs/periodic/Makefile.in.orig	2008-06-24 22:13:34.000000000 -0700
++++ demos/programs/periodic/Makefile.in	2008-06-24 22:15:12.000000000 -0700
+@@ -38,7 +38,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
+@@ -295,8 +296,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_LDFLAGS) $(periodic_OBJECTS) $(periodic_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:

Added: trunk/dports/x11/openMotif/files/patch-lib-Mrm-Makefile.in.diff
===================================================================
--- trunk/dports/x11/openMotif/files/patch-lib-Mrm-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/x11/openMotif/files/patch-lib-Mrm-Makefile.in.diff	2008-06-25 20:40:39 UTC (rev 37843)
@@ -0,0 +1,11 @@
+--- lib/Mrm/Makefile.in.orig	2008-06-25 12:42:27.000000000 -0700
++++ lib/Mrm/Makefile.in	2008-06-25 12:42:55.000000000 -0700
+@@ -181,7 +181,7 @@
+ XRENDER_LIBS = @XRENDER_LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+-X_LIBS = @X_LIBS@
++X_LIBS = -L${prefix}/lib @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_XMU = @X_XMU@
+ YACC = @YACC@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080625/2e2099c0/attachment.htm