summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gettext-lib/Makefile4
-rw-r--r--devel/gettext-m4/Makefile4
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/gettext/distinfo8
-rw-r--r--devel/gettext/patches/patch-aa19
-rw-r--r--devel/gettext/patches/patch-ac16
-rw-r--r--devel/gettext/patches/patch-ak19
7 files changed, 51 insertions, 23 deletions
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index a17a5af67bd..ee50509323e 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/07/19 03:07:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/19 19:20:34 seb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
#
@@ -21,6 +21,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --with-included-gettext
CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess
CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub
+CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
PATCHDIR= ${.CURDIR}/../../devel/gettext/patches
DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index 73173fd78ec..81875fa2411 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/19 03:07:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/19 19:20:34 seb Exp $
DISTNAME= gettext-0.10.35
PKGNAME= gettext-m4-0.10.35
@@ -15,6 +15,8 @@ GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-included-gettext
CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess
CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub
+CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
PATCHDIR= ${.CURDIR}/../../devel/gettext/patches
DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index f8cb0e8906d..c898996548e 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/07/19 03:07:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/19 19:20:30 seb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
#
@@ -19,6 +19,8 @@ USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess
CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub
+CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
INFO_FILES= gettext.info
TEXINFO_OVERRIDE= YES
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index ed5b661ca34..d43d48bed23 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2002/07/21 19:26:30 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/19 19:20:31 seb Exp $
SHA1 (gettext-0.10.35.tar.gz) = fcf5aedd794b45f9a63cb30deba96e842cc2d77c
Size (gettext-0.10.35.tar.gz) = 713694 bytes
-SHA1 (patch-aa) = 3a08075e113a90cb4848718a73b55e572be7d1bb
+SHA1 (patch-aa) = 059c972c3a1de3801b7369715c18183f483a4b03
SHA1 (patch-ab) = aa7e3c08b3b598d48c768bea0d7afe9e375c4174
-SHA1 (patch-ac) = a31996698a632614bbf5269bcd22b4d3e7077e0c
+SHA1 (patch-ac) = 78ddaf89f7f069751097c6a692a04dbaf9a3914f
SHA1 (patch-ad) = c30246c62ad2a3809f092d4e83747a781437fc8c
SHA1 (patch-ae) = a5b82ab8b98c34a8889d60fd9cb224bc1ccdd4d0
SHA1 (patch-af) = 1e93d62e848f3dd6d902c0c91b32bb593f3afc43
@@ -12,4 +12,4 @@ SHA1 (patch-ag) = 72e94b26e72ff9d3a7af01304e1854fe48b1b5de
SHA1 (patch-ah) = 2822c9d3a6e9f2a9ae0d4b5ed5c25525e3d4f34d
SHA1 (patch-ai) = dd77fb17fae639152ae1deca233f3a56629ecaea
SHA1 (patch-aj) = d0f2f662d895c015f85df0eedd4cc7d2e4170122
-SHA1 (patch-ak) = d75e08203f779c26094e876aee5869c3aa1d9dff
+SHA1 (patch-ak) = ab2ecc0805258b029782f51a357e0b8c8abd02fa
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index dc527e97766..2eb0197f563 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2000/06/30 17:07:36 danw Exp $
+$NetBSD: patch-aa,v 1.8 2002/08/19 19:20:32 seb Exp $
-Build shared libintl
+Build shared libintl. And force directory for locale date.
---- configure.orig Fri Jun 23 04:15:24 2000
-+++ configure Fri Jun 23 04:15:36 2000
-@@ -3958,7 +3958,7 @@
+--- configure.orig Fri May 1 07:48:25 1998
++++ configure
+@@ -3690,7 +3690,7 @@ fi
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.cat
+ INSTOBJEXT=.cat
+- DATADIRNAME=lib
++ DATADIRNAME=${PKGLOCALEDIR}
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -3958,7 +3958,7 @@ fi
fi
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
index a98280b519a..ea4848e55d9 100644
--- a/devel/gettext/patches/patch-ac
+++ b/devel/gettext/patches/patch-ac
@@ -1,14 +1,18 @@
-$NetBSD: patch-ac,v 1.2 2000/11/29 05:05:29 itojun Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $
---- intl/Makefile.in.orig Mon Apr 27 14:53:18 1998
-+++ intl/Makefile.in Tue Nov 28 21:02:03 2000
-@@ -121,3 +121,3 @@
+--- intl/Makefile.in.orig Mon Apr 27 23:53:18 1998
++++ intl/Makefile.in
+@@ -119,11 +119,11 @@ install-exec: all
+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ fi; \
$(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+ $(LIBTOOL) install -c libintl.la $(libdir); \
++ $(LIBTOOL) --mode=install ${INSTALL_DATA} libintl.la $(libdir); \
else \
-@@ -125,3 +125,3 @@
+ : ; \
fi
-install-data: all
+install-data:
if test "$(PACKAGE)" = "gettext"; then \
+ if test -r $(MKINSTALLDIRS); then \
+ $(MKINSTALLDIRS) $(gettextsrcdir); \
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index a148709a9f4..fd605336be6 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,10 +1,19 @@
-$NetBSD: patch-ak,v 1.1 2000/10/31 17:06:19 itojun Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/19 19:20:33 seb Exp $
-use locally-built msgfmt.
+Use locally-built msgfmt. And fix locale directory.
---- po/Makefile.in.in- Wed Nov 1 01:46:43 2000
-+++ po/Makefile.in.in Wed Nov 1 01:47:00 2000
-@@ -30,9 +30,9 @@
+--- po/Makefile.in.in.orig Wed Apr 29 03:53:09 1998
++++ po/Makefile.in.in
+@@ -20,7 +20,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+ localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+
+@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL
CC = @CC@
GENCAT = @GENCAT@
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 14:54:50 +0000