diff options
author | tron <tron> | 2001-02-27 08:48:14 +0000 |
---|---|---|
committer | tron <tron> | 2001-02-27 08:48:14 +0000 |
commit | 7866a7f5be019c07008ca0f8ad5cdf0f5d5b3cbf (patch) | |
tree | 6ea283f42836b5385d7f6ba8681fe6d2b64c617d /devel/gmake | |
parent | 9698f6055b3a851f397a4642a14b27b5b9b3d3f1 (diff) | |
download | pkgsrc-7866a7f5be019c07008ca0f8ad5cdf0f5d5b3cbf.tar.gz |
Install locale files to "${PKGLOCALEDIR}/locale" instead of hard coding
the path to "share/locale".
Diffstat (limited to 'devel/gmake')
-rw-r--r-- | devel/gmake/Makefile | 11 | ||||
-rw-r--r-- | devel/gmake/files/patch-sum | 9 | ||||
-rw-r--r-- | devel/gmake/patches/patch-aa | 19 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ac | 22 | ||||
-rw-r--r-- | devel/gmake/pkg/PLIST | 20 |
6 files changed, 75 insertions, 19 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index ebec577cceb..182cf14ed5a 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/02/16 14:38:27 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2001/02/27 08:48:14 tron Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # @@ -11,9 +11,12 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/make/make.html COMMENT= GNU version of 'make' utility -CONFIGURE_ARGS= --program-prefix="g" -GNU_CONFIGURE= yes -USE_GTEXINFO= yes +USE_GTEXINFO= YES +GNU_CONFIGURE= YES +CONFIGURE_ARGS+=--program-prefix="g" +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" + +MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" post-extract: ${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig diff --git a/devel/gmake/files/patch-sum b/devel/gmake/files/patch-sum index b26c109b8a4..1c864cc7053 100644 --- a/devel/gmake/files/patch-sum +++ b/devel/gmake/files/patch-sum @@ -1,6 +1,5 @@ -$NetBSD: patch-sum,v 1.2 1999/11/11 13:30:01 fredb Exp $ +$NetBSD: patch-sum,v 1.3 2001/02/27 08:48:15 tron Exp $ -This placeholder file is generated by the ``makepatchsum'' target -whenever the patches directory is empty or missing. Its purpose -is to ensure that the presence of any obsolete patches will cause -the proper error to be emitted at build time. +MD5 (patch-aa) = d9f7b39fe6502be5118c39b26642f387 +MD5 (patch-ab) = 849012df2dff4ca268f2cc5ae7c5f94c +MD5 (patch-ac) = c58acacfb8cf95f416bd26c460118705 diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa new file mode 100644 index 00000000000..69544f1afff --- /dev/null +++ b/devel/gmake/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.6 2001/02/27 08:48:15 tron Exp $ + +--- configure.orig Fri Jun 23 18:09:54 2000 ++++ configure Tue Feb 27 09:31:08 2001 +@@ -2851,12 +2851,12 @@ + + if test "x$prefix" = xNONE; then + cat >> confdefs.h <<EOF +-#define LOCALEDIR "$ac_default_prefix/share/locale" ++#define LOCALEDIR "$ac_default_prefix/${PKGLOCALEDIR}/locale" + EOF + + else + cat >> confdefs.h <<EOF +-#define LOCALEDIR "$prefix/share/locale" ++#define LOCALEDIR "$prefix/${PKGLOCALEDIR}/locale" + EOF + + fi diff --git a/devel/gmake/patches/patch-ab b/devel/gmake/patches/patch-ab new file mode 100644 index 00000000000..7bc8f4e8a47 --- /dev/null +++ b/devel/gmake/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.5 2001/02/27 08:48:38 tron Exp $ + +--- i18n/Makefile.in.orig Fri Jun 23 18:35:27 2000 ++++ i18n/Makefile.in Tue Feb 27 09:38:18 2001 +@@ -81,7 +81,7 @@ + + AUTOMAKE_OPTIONS = gnits + +-localedir = $(prefix)/share/locale ++localedir = $(prefix)/$(PKGLOCALEDIR)/locale + + ALL_POFILES = @ALL_POFILES@ + ALL_MOFILES = @ALL_MOFILES@ diff --git a/devel/gmake/patches/patch-ac b/devel/gmake/patches/patch-ac new file mode 100644 index 00000000000..0f992104937 --- /dev/null +++ b/devel/gmake/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2001/02/27 08:48:39 tron Exp $ + +--- Makefile.in.orig Fri Jun 23 18:35:23 2000 ++++ Makefile.in Tue Feb 27 09:40:18 2001 +@@ -101,7 +101,7 @@ + man_MANS = make.1 + info_TEXINFOS = make.texinfo + +-DEFS = -DALIASPATH=\"$(aliaspath)\" -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@ ++DEFS = -DALIASPATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@ + + INCLUDES = -I. -I$(srcdir) $(GLOBINC) + +@@ -117,7 +117,7 @@ + + POTFILES = $(SRCS) remote-cstms.c vmsfunctions.c + +-localedir = $(prefix)/share/locale ++localedir = $(prefix)/$(PKGLOCALEDIR)/locale + aliaspath = $(localedir):. + + # --------------- Local INSTALL Section diff --git a/devel/gmake/pkg/PLIST b/devel/gmake/pkg/PLIST index 041685d627e..b9fc5640850 100644 --- a/devel/gmake/pkg/PLIST +++ b/devel/gmake/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2000/07/27 13:55:43 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/02/27 08:48:16 tron Exp $ bin/gmake @unexec install-info --delete %D/info/make.info %D/info/dir info/make.info @@ -14,12 +14,12 @@ info/make.info-9 info/make.info-10 @exec install-info %D/info/make.info %D/info/dir man/man1/gmake.1 -share/locale/de/LC_MESSAGES/make.mo -share/locale/es/LC_MESSAGES/make.mo -share/locale/fr/LC_MESSAGES/make.mo -share/locale/ja/LC_MESSAGES/make.mo -share/locale/ko/LC_MESSAGES/make.mo -share/locale/nl/LC_MESSAGES/make.mo -share/locale/pl/LC_MESSAGES/make.mo -share/locale/pt_BR/LC_MESSAGES/make.mo -share/locale/ru/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/make.mo |