[68582] trunk/dports/devel/gettext

Sun Jun 6 17:24:27 PDT 2010

Revision: 68582
          http://trac.macports.org/changeset/68582
Author:   ryandesign at macports.org
Date:     2010-06-06 17:24:23 -0700 (Sun, 06 Jun 2010)
Log Message:
-----------
gettext: update to 0.18.1.1

Modified Paths:
--------------
    trunk/dports/devel/gettext/Portfile
    trunk/dports/devel/gettext/files/patch-gettext-tools-Makefile.in

Removed Paths:
-------------
    trunk/dports/devel/gettext/files/patch-gettext-tools-tests-Makefile.in

Modified: trunk/dports/devel/gettext/Portfile
===================================================================

--- trunk/dports/devel/gettext/Portfile	2010-06-07 00:18:24 UTC (rev 68581)
+++ trunk/dports/devel/gettext/Portfile	2010-06-07 00:24:23 UTC (rev 68582)
@@ -5,7 +5,7 @@
 PortGroup               archcheck 1.0
 
 name                    gettext
-version                 0.18
+version                 0.18.1.1
 categories              devel
 maintainers             ryandesign
 license                 GPLv3
@@ -25,12 +25,11 @@
     should be implemented. For this task GNU gettext \
     provides the needed tools and library functions.
 
-checksums               md5     d52a3e061032a1ed13856d42fc86f0fd \
-                        sha1    de396ec6877a451427d8597197d18c2d4b8f1a26 \
-                        rmd160  7725881dd68cc05d0b782fe64c08acc90eb6146d
+checksums               md5     3dd55b952826d2b32f51308f2f91aa89 \
+                        sha1    5009deb02f67fc3c59c8ce6b82408d1d35d4e38f \
+                        rmd160  0ca0b6bf0219440404a86f0c16cbac3d1a2ecd37
 
-patchfiles              patch-gettext-tools-Makefile.in \
-                        patch-gettext-tools-tests-Makefile.in
+patchfiles              patch-gettext-tools-Makefile.in
 
 configure.cppflags \
     -no-cpp-precomp
@@ -43,6 +42,12 @@
     --with-included-libcroco \
     --with-included-libxml
 
+# Don't use git (if it's installed) nor cvs to create the autopoint archive
+# because the archives they create for each architecture under muniversal
+# will differ and cannot be merged.
+configure.args-append   --without-git \
+                        --without-cvs
+
 depends_lib \
     port:libiconv \
     port:ncurses \

Modified: trunk/dports/devel/gettext/files/patch-gettext-tools-Makefile.in
===================================================================
--- trunk/dports/devel/gettext/files/patch-gettext-tools-Makefile.in	2010-06-07 00:18:24 UTC (rev 68581)
+++ trunk/dports/devel/gettext/files/patch-gettext-tools-Makefile.in	2010-06-07 00:24:23 UTC (rev 68582)
@@ -1,9 +1,9 @@
---- gettext-tools/Makefile.in.orig	2010-05-09 13:59:01.000000000 -0500
-+++ gettext-tools/Makefile.in	2010-05-10 05:23:23.000000000 -0500
-@@ -1214,7 +1214,7 @@
+--- gettext-tools/Makefile.in.orig	2010-06-03 16:38:55.000000000 -0500
++++ gettext-tools/Makefile.in	2010-06-04 01:16:07.000000000 -0500
+@@ -1248,7 +1248,7 @@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 -SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
 +SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests
  

Deleted: trunk/dports/devel/gettext/files/patch-gettext-tools-tests-Makefile.in
===================================================================
--- trunk/dports/devel/gettext/files/patch-gettext-tools-tests-Makefile.in	2010-06-07 00:18:24 UTC (rev 68581)
+++ trunk/dports/devel/gettext/files/patch-gettext-tools-tests-Makefile.in	2010-06-07 00:24:23 UTC (rev 68582)
@@ -1,39 +0,0 @@
-http://savannah.gnu.org/bugs/?29888
---- gettext-tools/tests/Makefile.in.orig	2010-05-09 13:59:00.000000000 -0500
-+++ gettext-tools/tests/Makefile.in	2010-05-15 08:45:01.000000000 -0500
-@@ -288,13 +285,15 @@
- 	$(am__DEPENDENCIES_1)
- am_gettext_6_prg_OBJECTS = gettext_6_prg-gettext-6-prg.$(OBJEXT)
- gettext_6_prg_OBJECTS = $(am_gettext_6_prg_OBJECTS)
--gettext_6_prg_DEPENDENCIES =
-+gettext_6_prg_DEPENDENCIES = ../gnulib-lib/libgettextlib.la \
-+	$(am__DEPENDENCIES_1)
- gettext_6_prg_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gettext_6_prg_CFLAGS) \
- 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_gettext_7_prg_OBJECTS = gettext_7_prg-gettext-7-prg.$(OBJEXT)
- gettext_7_prg_OBJECTS = $(am_gettext_7_prg_OBJECTS)
--gettext_7_prg_DEPENDENCIES =
-+gettext_7_prg_DEPENDENCIES = ../gnulib-lib/libgettextlib.la \
-+	$(am__DEPENDENCIES_1)
- gettext_7_prg_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gettext_7_prg_CFLAGS) \
- 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -1422,13 +1421,13 @@
- gettext_6_prg_SOURCES = gettext-6-prg.c
- gettext_6_prg_CFLAGS = $(gettext_6_prg_CFLAGS_ at HAVE_NEWLOCALE@)
- gettext_6_prg_CFLAGS_1 = -DUSE_POSIX_THREADS
--gettext_6_prg_LDADD = $(gettext_6_prg_LDADD_ at HAVE_NEWLOCALE@)
--gettext_6_prg_LDADD_1 = $(LDADD) -lpthread
-+gettext_6_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) $(gettext_6_prg_LDADD_ at HAVE_NEWLOCALE@)
-+gettext_6_prg_LDADD_1 = -lpthread
- gettext_7_prg_SOURCES = gettext-7-prg.c
- gettext_7_prg_CFLAGS = $(gettext_7_prg_CFLAGS_ at HAVE_NEWLOCALE@)
- gettext_7_prg_CFLAGS_1 = -DUSE_POSIX_THREADS
--gettext_7_prg_LDADD = $(gettext_7_prg_LDADD_ at HAVE_NEWLOCALE@)
--gettext_7_prg_LDADD_1 = $(LDADD) -lpthread
-+gettext_7_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) $(gettext_7_prg_LDADD_ at HAVE_NEWLOCALE@)
-+gettext_7_prg_LDADD_1 = -lpthread
- gettext_8_prg_SOURCES = gettext-8-prg.c
- gettext_8_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
- cake_SOURCES = plural-1-prg.c setlocale.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100606/1d172882/attachment-0001.html>
