[33625] trunk/dports/textproc/libiconv

[ryandesign at macports.org]

Revision: 33625
          http://trac.macosforge.org/projects/macports/changeset/33625
Author:   ryandesign at macports.org
Date:     2008-01-31 16:11:07 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
libiconv: make it possible to build a universal libiconv even when a non-universal libiconv is already active. Thanks very much to nox for solving this. Closes #13366.

Modified Paths:
--------------
    trunk/dports/textproc/libiconv/Portfile

Added Paths:
-----------
    trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff

Modified: trunk/dports/textproc/libiconv/Portfile
===================================================================
--- trunk/dports/textproc/libiconv/Portfile	2008-01-31 22:37:22 UTC (rev 33624)
+++ trunk/dports/textproc/libiconv/Portfile	2008-02-01 00:11:07 UTC (rev 33625)
@@ -37,17 +37,11 @@
 	bin:gperf:gperf
 
 patchfiles \
-    patch-utf8mac.diff
+    patch-utf8mac.diff \
+    patch-src-Makefile.in-darwin.diff
 
-pre-fetch {
-    if {[variant_isset universal]} {
-        if {![catch {registry_active libiconv}]} {
-            return -code error "libiconv needs to be deactivated/uninstalled \
-            before +universal variant can be installed"
-        }
-    }
-}
-
+configure.cppflags
+configure.ldflags
 configure.args \
 	--enable-static \
 	--mandir=${prefix}/share/man \

Added: trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff
===================================================================
--- trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff	                        (rev 0)
+++ trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff	2008-02-01 00:11:07 UTC (rev 33625)
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	2007-11-21 22:52:22.000000000 +0100
++++ src/Makefile.in	2007-11-21 22:58:15.000000000 +0100
+@@ -104,6 +104,7 @@
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
++	  darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080131/bf055bf0/attachment.html