diff options
author | salo <salo@pkgsrc.org> | 2002-11-18 08:03:13 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2002-11-18 08:03:13 +0000 |
commit | a8e377595f6e04cff3b46c0a8d32035e3e95657c (patch) | |
tree | 95e8398eb94b0d2f6a1e0e4db70bcd9d24727ce7 | |
parent | 5986a9a9ffaf1f288eb4621f6abb0e1b112874a7 (diff) | |
download | pkgsrc-a8e377595f6e04cff3b46c0a8d32035e3e95657c.tar.gz |
Fix PKGLOCALEDIR usage. Closes pkg/18656
-rw-r--r-- | archivers/gsharutils/Makefile | 4 | ||||
-rw-r--r-- | archivers/gsharutils/distinfo | 6 | ||||
-rw-r--r-- | archivers/gsharutils/patches/patch-ag | 13 | ||||
-rw-r--r-- | archivers/gsharutils/patches/patch-ah | 15 | ||||
-rw-r--r-- | archivers/gsharutils/patches/patch-aj | 24 |
5 files changed, 47 insertions, 15 deletions
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile index 50f964ca105..aedec8e0e67 100644 --- a/archivers/gsharutils/Makefile +++ b/archivers/gsharutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:04 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/11/18 08:03:13 salo Exp $ DISTNAME= sharutils-4.2.1 PKGNAME= g${DISTNAME} @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g --disable-uucode -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} INSTALL_TARGET= install install-man INFO_FILES= remsync.info sharutils.info TEXINFO_OVERRIDE= YES diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo index c5710976944..d747b959404 100644 --- a/archivers/gsharutils/distinfo +++ b/archivers/gsharutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/07/15 11:44:50 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/11/18 08:03:13 salo Exp $ SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef Size (sharutils-4.2.1.tar.gz) = 306022 bytes @@ -8,4 +8,6 @@ SHA1 (patch-ac) = 76bf1dedc34a462dd05a55511d9caf578cae78d0 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9 -SHA1 (patch-aj) = b7a7f8fba49317f1815e71855d7bf21a0d356af2 +SHA1 (patch-ag) = 330021cbe475a24da8f73f9313b9915f5fe7c581 +SHA1 (patch-ah) = b774a30113e964279720ff7ee1aed934618f8117 +SHA1 (patch-aj) = 039866e5018a807a1a65afb290ebbb90c32aab74 diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag new file mode 100644 index 00000000000..eef50085f23 --- /dev/null +++ b/archivers/gsharutils/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.4 2002/11/18 08:03:14 salo Exp $ + +--- src/Makefile.in.orig Sat Nov 25 22:37:27 1995 ++++ src/Makefile.in Mon Nov 18 04:05:51 2002 +@@ -31,7 +31,7 @@ + transform = @program_transform_name@ + bindir = $(exec_prefix)/bin + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/$(PKGLOCALEDIR)/locale + subdir = src + + AR = ar diff --git a/archivers/gsharutils/patches/patch-ah b/archivers/gsharutils/patches/patch-ah new file mode 100644 index 00000000000..30340d18d31 --- /dev/null +++ b/archivers/gsharutils/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.3 2002/11/18 08:03:15 salo Exp $ + +--- intl/Makefile.in.orig Mon Dec 4 17:19:40 1995 ++++ intl/Makefile.in Mon Nov 18 03:55:12 2002 +@@ -30,8 +30,8 @@ + libdir = $(prefix)/lib + includedir = $(prefix)/include + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale +-gnulocaledir = $(prefix)/share/locale ++localedir = $(prefix)/$(PKGLOCALEDIR)/locale ++gnulocaledir = $(localedir) + gettextsrcdir = $(prefix)/share/gettext + aliaspath = $(localedir):. + subdir = intl diff --git a/archivers/gsharutils/patches/patch-aj b/archivers/gsharutils/patches/patch-aj index 31cfe306e49..6cc20e9b042 100644 --- a/archivers/gsharutils/patches/patch-aj +++ b/archivers/gsharutils/patches/patch-aj @@ -1,13 +1,15 @@ -$NetBSD: patch-aj,v 1.1 2001/07/15 11:44:51 jlam Exp $ +$NetBSD: patch-aj,v 1.2 2002/11/18 08:03:15 salo Exp $ ---- configure.orig Sun Dec 3 19:44:54 1995 -+++ configure -@@ -3581,6 +3581,8 @@ - CATALOGS="$new_CATALOGS" - fi +--- po/Makefile.in.in.orig Mon Dec 4 17:19:48 1995 ++++ po/Makefile.in.in Mon Nov 18 04:06:43 2002 +@@ -28,8 +28,8 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale +-gnulocaledir = $(prefix)/share/locale ++localedir = $(prefix)/$(PKGLOCALEDIR)/locale ++gnulocaledir = $(localedir) + gettextsrcdir = $(prefix)/share/gettext + subdir = po -+DATADIRNAME=${PKGLOCALEDIR} -+ - - - trap '' 1 2 15 |