4 files changed, 36 insertions, 30 deletions

diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 05c902bd6683..2631f2db3c05 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -3,17 +3,19 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $
 #
 
 DISTNAME=	gettext-0.10.35
 CATEGORIES=	devel
-MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
+MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/ \
+		ftp://alpha.gnu.org/pub/gnu
 
 MAINTAINER=	nacai@iname.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnu-gettext
+
+PLIST_SUB=	X11BASE=${X11BASE}
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
@@ -25,5 +27,6 @@ post-install:
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
 		${PREFIX}/share/gettext/po-mode.el
+	${MKDIR} ${X11BASE}/share/locale
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
index 29dad1ad6f74..73bde596d6c4 100644
--- a/devel/gettext-devel/files/patch-ae
+++ b/devel/gettext-devel/files/patch-ae
@@ -1,5 +1,14 @@
---- configure.orig	Fri May  1 13:48:25 1998
-+++ configure	Thu Dec  3 20:11:52 1998
+--- configure.orig	Fri May  1 07:48:25 1998
++++ configure	Wed Feb 17 02:05:55 1999
+@@ -3958,7 +3958,7 @@
+    fi
+    
+ 
+-      l=
++      l=l
+    
+ 
+          test -d po || mkdir po
 @@ -4004,7 +4004,7 @@
    ;;
  esac
diff --git a/devel/gettext-devel/files/patch-ah b/devel/gettext-devel/files/patch-ah
new file mode 100644
index 000000000000..a45dc903c3b9
--- /dev/null
+++ b/devel/gettext-devel/files/patch-ah
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig	Wed Feb 17 02:18:40 1999
++++ intl/Makefile.in	Wed Feb 17 02:30:13 1999
+@@ -119,7 +119,7 @@
+ 	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ 	  fi; \
+ 	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++	  $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ 	else \
+ 	  : ; \
+ 	fi
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index 4899dd242253..6d3c89b44981 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -12,6 +12,11 @@ info/gettext.info
 @exec install-info %D/info/gettext.info %D/info/dir
 include/libintl.h
 lib/libintl.a
+lib/libintl.la
+lib/libintl.so
+lib/libintl.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gettext.m4
 share/aclocal/lcmessage.m4
 share/aclocal/progtest.m4
@@ -57,28 +62,6 @@ share/locale/locale.alias
 @dirrm share/gettext/intl
 @dirrm share/gettext/po
 @dirrm share/gettext
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale
+@unexec rm -r %D/share/locale
+@exec mkdir -p %%X11BASE%%/share/locale
+@unexec rm -r %%X11BASE%%/share/locale