Ticket #13366: libiconv-universal.2.diff

files/patch-src-Makefile.in-darwin.diff

@@ +1 @@
+--- 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.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
++         darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
+          *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
+        esac
+        $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv

Portfile

@@ -37 +37 @@
         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.args \
         --enable-static \
         --mandir=${prefix}/share/man \