[138584] trunk/dports/devel/gettext

[ryandesign at macports.org]

Revision: 138584
          https://trac.macports.org/changeset/138584
Author:   ryandesign at macports.org
Date:     2015-07-12 17:42:23 -0700 (Sun, 12 Jul 2015)
Log Message:
-----------
gettext: avoid circular dependency by not using autoconf (#48332)

Modified Paths:
--------------
    trunk/dports/devel/gettext/Portfile
    trunk/dports/devel/gettext/files/stpncpy.patch

Modified: trunk/dports/devel/gettext/Portfile
===================================================================
--- trunk/dports/devel/gettext/Portfile	2015-07-13 00:41:36 UTC (rev 138583)
+++ trunk/dports/devel/gettext/Portfile	2015-07-13 00:42:23 UTC (rev 138584)
@@ -57,8 +57,6 @@
 platform darwin {
     if {${os.major} < 11} {
         patchfiles-append stpncpy.patch
-        use_autoreconf yes
-        autoreconf.args -fvi
     }
 }
 

Modified: trunk/dports/devel/gettext/files/stpncpy.patch
===================================================================
--- trunk/dports/devel/gettext/files/stpncpy.patch	2015-07-13 00:41:36 UTC (rev 138583)
+++ trunk/dports/devel/gettext/files/stpncpy.patch	2015-07-13 00:42:23 UTC (rev 138584)
@@ -1,11 +1,20 @@
---- gettext-tools/libgettextpo/Makefile.am.orig	2015-06-22 01:42:02.000000000 -0700
-+++ gettext-tools/libgettextpo/Makefile.am	2015-07-11 22:42:42.000000000 -0700
-@@ -105,7 +105,7 @@ LTV_AGE=5
+--- gettext-tools/libgettextpo/Makefile.in.orig	2015-07-10 01:40:00.000000000 -0500
++++ gettext-tools/libgettextpo/Makefile.in	2015-07-12 18:40:45.000000000 -0500
+@@ -415,7 +412,7 @@
+ @WOE32_TRUE at am__DEPENDENCIES_1 = libgettextpo.res.lo
+ am__DEPENDENCIES_2 =
+ libgettextpo_la_DEPENDENCIES = libgnu.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2)
++	$(am__DEPENDENCIES_2) ../gnulib-lib/stpncpy.lo
+ am__libgettextpo_la_SOURCES_DIST = gettext-po.c ../src/str-list.c \
+ 	../src/dir-list.c ../src/message.c ../src/msgl-ascii.c \
+ 	../src/po-error.c ../src/po-xerror.c ../src/write-catalog.c \
+@@ -1859,7 +1856,7 @@
  # How to build libgettextpo.la.
  # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they
  # define an uncontrolled amount of symbols.
 -libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
 +libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING) ../gnulib-lib/stpncpy.lo
- libgettextpo_la_LDFLAGS = \
-   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-   -rpath $(libdir) \
+ libgettextpo_la_LDFLAGS = -version-info \
+ 	$(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \
+ 	@LTLIBINTL@ @LTLIBICONV@ @LTLIBEXPAT@ -lc -no-undefined \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150712/bc2e3a16/attachment.html>