[50570] trunk/dports/graphics/gd2

[mcalhoun at macports.org]

Revision: 50570
          http://trac.macports.org/changeset/50570
Author:   mcalhoun at macports.org
Date:     2009-05-04 11:22:14 -0700 (Mon, 04 May 2009)
Log Message:
-----------
gd2:
  * Two of the patchfiles were added in r34193 because of #14216. gdlib-config seems to have changed so that they are no longer needed.
  * Manually setting hardcode_direct was added in r13017. It no longer seems to be needed.
  * Use muniversal PortGroup to build universal binaries.

Fixes #19391 (maintainer timeout).

Modified Paths:
--------------
    trunk/dports/graphics/gd2/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/gd2/files/patch-Makefile.in.diff
    trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff

Modified: trunk/dports/graphics/gd2/Portfile
===================================================================
--- trunk/dports/graphics/gd2/Portfile	2009-05-04 18:14:51 UTC (rev 50569)
+++ trunk/dports/graphics/gd2/Portfile	2009-05-04 18:22:14 UTC (rev 50570)
@@ -1,10 +1,11 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    gd2
 version                 2.0.35
-revision                4
+revision                5
 categories              graphics
 maintainers             ryandesign
 homepage                http://www.libgd.org/
@@ -54,9 +55,7 @@
     port:xpm
 
 patchfiles \
-    patch-gdft.c.diff \
-    patch-Makefile.in.diff \
-    patch-config-gdlib-config.in.diff
+    patch-gdft.c.diff
 
 post-patch {
     if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
@@ -68,10 +67,14 @@
 
 use_autoreconf          yes
 
-post-destroot {
+post-build {
     if {[variant_isset universal]} {
-       reinplace "s|${configure.universal_ldflags}||" \
-           ${destroot}${prefix}/bin/gdlib-config
+       foreach arch ${universal_archs_to_use} {
+           reinplace "s| ${configure.universal_ldflags}||" \
+               ${worksrcpath}-${arch}/config/gdlib-config
+           reinplace "s| [muniversal_get_arch_flag ${arch}]||" \
+               ${worksrcpath}-${arch}/config/gdlib-config
+       }
     }
 }
 
@@ -79,17 +82,16 @@
     depends_lib lib:libdl:dlcompat
 }
 
-platform darwin {
-    post-configure {
-        reinplace "s/^\\(hardcode_direct=\\)yes/\\1no/" ${worksrcpath}/libtool
-    }
+if { ! [variant_isset no_x11] } {
+    configure.args-append  --x-includes=${prefix}/include --x-libraries=${prefix}/lib
 }
 
 variant no_x11 {
     depends_lib-delete \
         port:xpm
     configure.args-append \
-        --without-x
+        --without-x \
+        --without-xpm
 }
 
 livecheck.check         regex

Deleted: trunk/dports/graphics/gd2/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/graphics/gd2/files/patch-Makefile.in.diff	2009-05-04 18:14:51 UTC (rev 50569)
+++ trunk/dports/graphics/gd2/files/patch-Makefile.in.diff	2009-05-04 18:22:14 UTC (rev 50570)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-04-23 07:57:51.000000000 -0700
-+++ Makefile.in	2008-02-06 21:20:20.000000000 -0800
-@@ -347,7 +347,7 @@
- libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
- libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
- libgd_la_LIBADD = $(LTLIBICONV)
--LDADD = ./libgd.la $(LIBICONV)
-+LDADD = ./libgd.la $(LTLIBICONV)
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 

Deleted: trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff
===================================================================
--- trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff	2009-05-04 18:14:51 UTC (rev 50569)
+++ trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff	2009-05-04 18:22:14 UTC (rev 50570)
@@ -1,20 +0,0 @@
---- config/gdlib-config.in.orig	2006-10-11 02:46:22.000000000 -0700
-+++ config/gdlib-config.in	2008-02-06 21:35:40.000000000 -0800
-@@ -71,7 +71,7 @@
- 	echo @LDFLAGS@
- 	;;
-     --libs)
--	echo @LIBS@ @LIBICONV@
-+	echo @LIBS@ @LTLIBICONV@
- 	;;
-     --cflags|--includes)
- 	echo -I at includedir@
-@@ -84,7 +84,7 @@
- 	echo "includedir: $includedir"
- 	echo "cflags:     -I at includedir@"
- 	echo "ldflags:    @LDFLAGS@"
--	echo "libs:       @LIBS@ @LIBICONV@"
-+	echo "libs:       @LIBS@ @LTLIBICONV@"
- 	echo "libdir:     $libdir"
- 	echo "features:   @FEATURES@"
- 	;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090504/1009c63e/attachment.html>