diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 2d1a900a79af..48456552a0d4 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gettext PORTVERSION= 0.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gettext diff --git a/devel/gettext/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in index 9f84c7ece670..d303723cb429 100644 --- a/devel/gettext/files/patch-intl::Makefile.in +++ b/devel/gettext/files/patch-intl::Makefile.in @@ -2,7 +2,7 @@ $FreeBSD$ --- intl/Makefile.in.orig Thu Jan 31 16:11:48 2002 -+++ intl/Makefile.in Tue Apr 30 00:00:15 2002 ++++ intl/Makefile.in Tue Apr 30 11:18:46 2002 @@ -52,7 +52,7 @@ YFLAGS = --name-prefix=__gettext @@ -21,7 +21,7 @@ $FreeBSD$ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ -no-undefined -@@ -153,11 +153,11 @@ +@@ -153,22 +153,6 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ @@ -30,15 +30,21 @@ $FreeBSD$ - dest=$(DESTDIR)$(libdir)/charset.alias; \ - if test -f $(DESTDIR)$(libdir)/charset.alias; then \ - orig=$(DESTDIR)$(libdir)/charset.alias; \ -+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata; \ -+ temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \ -+ dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \ -+ if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \ -+ orig=$(DESTDIR)$(prefix)/libdata/charset.alias; \ - sed -f ref-add.sed $$orig > $$temp; \ - $(INSTALL_DATA) $$temp $$dest; \ - rm -f $$temp; \ -@@ -240,9 +240,9 @@ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- if test @GLIBC21@ = no; then \ +- orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- fi; \ +- fi; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ +@@ -240,9 +224,9 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ diff --git a/devel/gettext/files/patch-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in index d1b8e08de435..e489945f3d18 100644 --- a/devel/gettext/files/patch-lib::Makefile.in +++ b/devel/gettext/files/patch-lib::Makefile.in @@ -2,7 +2,7 @@ $FreeBSD$ --- lib/Makefile.in.orig Tue Mar 12 21:04:16 2002 -+++ lib/Makefile.in Tue Apr 30 00:01:20 2002 ++++ lib/Makefile.in Tue Apr 30 11:06:26 2002 @@ -220,7 +220,7 @@ # Need @LTLIBICONV@ because linebreak.c uses iconv(). libgettextlib_la_LDFLAGS = \ @@ -30,6 +30,15 @@ $FreeBSD$ SUFFIXES = .sed .sin +@@ -475,7 +475,7 @@ + + install-data-am: install-gettextsrcDATA + +-install-exec-am: install-exec-local install-libLTLIBRARIES ++install-exec-am: install-libLTLIBRARIES + + install-info: install-info-am + @@ -522,7 +522,7 @@ all-local: charset.alias ref-add.sed ref-del.sed diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist index 459bd45b7b06..f6112d242506 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext/pkg-plist @@ -29,12 +29,10 @@ lib/libgettextsrc.so lib/libintl.a lib/libintl.so lib/libintl.so.2 -libdata/charset.alias libdata/gettext/hostname libdata/gettext/project-id libdata/gettext/urlget libdata/gettext/user-email -@comment libdata/charset.alias share/aclocal/codeset.m4 share/aclocal/gettext.m4 share/aclocal/glibc21.m4