Mon Feb 9 23:53:52 2009 UTC ()
DESTDIR support.


(joerg)
diff -r1.42 -r1.43 pkgsrc/archivers/gsharutils/Makefile
diff -r1.15 -r1.16 pkgsrc/archivers/gsharutils/distinfo
diff -r1.3 -r1.4 pkgsrc/archivers/gsharutils/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/archivers/gsharutils/patches/patch-ag
diff -r0 -r1.1 pkgsrc/archivers/gsharutils/patches/patch-ak
cvs diff -r1.42 -r1.43 pkgsrc/archivers/gsharutils/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/gsharutils/Makefile 2006/09/20 11:05:20 1.42
+++ pkgsrc/archivers/gsharutils/Makefile 2009/02/09 23:53:52 1.43
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.42 2006/09/20 11:05:20 hira Exp $ 1# $NetBSD: Makefile,v 1.43 2009/02/09 23:53:52 joerg Exp $
2 2
3DISTNAME= sharutils-4.2.1 3DISTNAME= sharutils-4.2.1
4PKGNAME= g${DISTNAME} 4PKGNAME= g${DISTNAME}
5PKGREVISION= 10 5PKGREVISION= 10
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= ${MASTER_SITE_GNU:=sharutils/} 7MASTER_SITES= ${MASTER_SITE_GNU:=sharutils/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/sharutils/sharutils.html 10HOMEPAGE= http://www.gnu.org/software/sharutils/sharutils.html
11COMMENT= Allow packing and unpacking of shell archives 11COMMENT= Allow packing and unpacking of shell archives
12 12
13BROKEN_GETTEXT_DETECTION= yes 13BROKEN_GETTEXT_DETECTION= yes
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19 20
20INSTALL_TARGET= install install-man 21INSTALL_TARGET= install install-man
21INFO_FILES= yes 22INFO_FILES= yes
22USE_TOOLS+= makeinfo msgfmt sh:run mktemp:run perl:run 23USE_TOOLS+= makeinfo msgfmt sh:run mktemp:run perl:run
23 24
24REPLACE_PERL= src/remsync.in 25REPLACE_PERL= src/remsync.in
25 26
26CONFIGURE_ARGS+= --disable-uucode 27CONFIGURE_ARGS+= --disable-uucode
27CONFIGURE_ENV+= SH=${TOOLS_SH:Q} 28CONFIGURE_ENV+= SH=${TOOLS_SH:Q}
28 29
cvs diff -r1.15 -r1.16 pkgsrc/archivers/gsharutils/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/gsharutils/distinfo 2005/08/26 06:07:35 1.15
+++ pkgsrc/archivers/gsharutils/distinfo 2009/02/09 23:53:52 1.16
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.15 2005/08/26 06:07:35 reed Exp $ 1$NetBSD: distinfo,v 1.16 2009/02/09 23:53:52 joerg Exp $
2 2
3SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef 3SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
4RMD160 (sharutils-4.2.1.tar.gz) = 06e1629aa8a1c982e6032f194df6f5fe85f85b43 4RMD160 (sharutils-4.2.1.tar.gz) = 06e1629aa8a1c982e6032f194df6f5fe85f85b43
5Size (sharutils-4.2.1.tar.gz) = 306022 bytes 5Size (sharutils-4.2.1.tar.gz) = 306022 bytes
6SHA1 (patch-aa) = 654641dee00efc19771546cf1753d1025c18d9be 6SHA1 (patch-aa) = 654641dee00efc19771546cf1753d1025c18d9be
7SHA1 (patch-ab) = cc46cfb2ff26861f9c3cd482a31a5c59226a1899 7SHA1 (patch-ab) = cc46cfb2ff26861f9c3cd482a31a5c59226a1899
8SHA1 (patch-ac) = 2fbf90458b0a81082db6b1bd343efb5f2062a947 8SHA1 (patch-ac) = 2fbf90458b0a81082db6b1bd343efb5f2062a947
9SHA1 (patch-ad) = a3b93b3aec1e2247a455a3b2d0678f8ac08f82b5 9SHA1 (patch-ad) = df119a05f737628136ed3f43eb23b79b5075e68e
10SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12 10SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
11SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9 11SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
12SHA1 (patch-ag) = af78d21124b33f0d8bdc27969119222e4d79008e 12SHA1 (patch-ag) = ffcb66111f8c3ce972249db2b14e1526eb68c47c
13SHA1 (patch-ah) = 90fed62712aa4d02d66098581d5e5602e391663e 13SHA1 (patch-ah) = 90fed62712aa4d02d66098581d5e5602e391663e
14SHA1 (patch-ai) = a95e116d517e5fe536a31d12db1c33daaf2609af 14SHA1 (patch-ai) = a95e116d517e5fe536a31d12db1c33daaf2609af
15SHA1 (patch-aj) = 56ee560455a206c6fa5c106f1c759d0a0296dfd7 15SHA1 (patch-aj) = 56ee560455a206c6fa5c106f1c759d0a0296dfd7
 16SHA1 (patch-ak) = ee7d026caa3fca5ad68f69312b38960fab3f281b
cvs diff -r1.3 -r1.4 pkgsrc/archivers/gsharutils/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/archivers/gsharutils/patches/Attic/patch-ad 2005/08/26 06:07:35 1.3
+++ pkgsrc/archivers/gsharutils/patches/Attic/patch-ad 2009/02/09 23:53:52 1.4
@@ -1,30 +1,62 @@ @@ -1,30 +1,62 @@
1$NetBSD: patch-ad,v 1.3 2005/08/26 06:07:35 reed Exp $ 1$NetBSD: patch-ad,v 1.4 2009/02/09 23:53:52 joerg Exp $
2 2
3--- doc/Makefile.in.orig 1995-11-25 02:44:35.000000000 +0000 3--- doc/Makefile.in.orig 1995-11-25 03:44:35.000000000 +0100
4+++ doc/Makefile.in 2005-08-26 05:47:16.587932824 +0000 4+++ doc/Makefile.in
5@@ -37,8 +37,8 @@ 5@@ -37,8 +37,8 @@ MAN1PAGES = @MAN1PAGES@
6 MAN5PAGES = @MAN5PAGES@ 6 MAN5PAGES = @MAN5PAGES@
7  7
8 prefix = @prefix@ 8 prefix = @prefix@
9-infodir = $(prefix)/info 9-infodir = $(prefix)/info
10-mandir = $(prefix)/man 10-mandir = $(prefix)/man
11+infodir = @infodir@ 11+infodir = @infodir@
12+mandir = @mandir@ 12+mandir = @mandir@
13 man1dir = $(mandir)/man1 13 man1dir = $(mandir)/man1
14 man1ext = .1 14 man1ext = .1
15 man5dir = $(mandir)/man5 15 man5dir = $(mandir)/man5
16@@ -109,11 +109,11 @@ 16@@ -82,10 +82,10 @@ install install-exec install-data: all
17 $(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \ 17 install: install-exec install-data
 18 install-exec:
 19 install-data:
 20- $(top_srcdir)/mkinstalldirs $(infodir)
 21+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
 22 cd $(srcdir) && \
 23 for file in sharutils.info* remsync.info*; do \
 24- $(INSTALL_DATA) $$file $(infodir)/$$file; \
 25+ $(INSTALL_DATA) $$file ${DESTDIR}$(infodir)/$$file; \
 26 done
 27
 28 uninstall:
 29@@ -96,24 +96,24 @@ uninstall:
 30 # GNU and switch to Info. The following is for irreductible fellows.
 31
 32 install-man:
 33- $(top_srcdir)/mkinstalldirs $(man1dir)
 34- test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs $(man5dir)
 35+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(man1dir)
 36+ test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs ${DESTDIR}$(man5dir)
 37 for name in $(MAN1PAGES); do \
 38 if test $$name = uudecode; then \
 39- rm -f $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
 40+ rm -f ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
 41 man1base=`echo $(man1dir) | sed 's@.*/\(.*\)@&1@'`; \
 42 echo ".so $$man1base/uuencode$(man1ext)" \
 43- > $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
 44+ > ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
 45 else \
 46 $(INSTALL_DATA) $(srcdir)/$$name.1 \
 47- $(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
 48+ ${DESTDIR}$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
18 fi; \ 49 fi; \
19 done 50 done
20- test -z "$(MAN5PAGES)" || \ 51- test -z "$(MAN5PAGES)" || \
21- for name in $(MAN5PAGES); do \ 52- for name in $(MAN5PAGES); do \
22+ for name in "" $(MAN5PAGES); do \ 53+ for name in "" $(MAN5PAGES); do \
23+ if [ "X$$name" = "X" ]; then continue; fi; \ 54+ if [ "X$$name" = "X" ]; then continue; fi; \
24 $(INSTALL_DATA) $(srcdir)/$$name.5 \ 55 $(INSTALL_DATA) $(srcdir)/$$name.5 \
25 $(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \ 56- $(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
26- done 57- done
 58+ ${DESTDIR}$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
27+ done 59+ done
28  60
29 uninstall-man: 61 uninstall-man:
30 for name in $(MAN1PAGES); do \ 62 for name in $(MAN1PAGES); do \
cvs diff -r1.6 -r1.7 pkgsrc/archivers/gsharutils/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/archivers/gsharutils/patches/Attic/patch-ag 2003/10/20 09:35:06 1.6
+++ pkgsrc/archivers/gsharutils/patches/Attic/patch-ag 2009/02/09 23:53:52 1.7
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-ag,v 1.6 2003/10/20 09:35:06 agc Exp $ 1$NetBSD: patch-ag,v 1.7 2009/02/09 23:53:52 joerg Exp $
2 2
3Apply fix from Kouichirou Hiratsuka in PR 22348 3--- po/Makefile.in.in.orig 1995-12-04 17:19:48.000000000 +0100
4 4+++ po/Makefile.in.in
5--- po/Makefile.in.in 2003/10/20 09:29:50 1.1 5@@ -120,12 +120,16 @@ install-data: all
6+++ po/Makefile.in.in 2003/10/20 09:29:57 
7@@ -120,11 +120,15 @@ 
8 catalogs='$(CATALOGS)'; \ 6 catalogs='$(CATALOGS)'; \
9 for cat in $$catalogs; do \ 7 for cat in $$catalogs; do \
10 if test "`echo $$cat | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \ 8 if test "`echo $$cat | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
11+ if test $(gnulocaledir) = $(localedir) -a \ 9+ if test $(gnulocaledir) = $(localedir) -a \
12+ $(CATOBJEXT) != ".gmo"; then \ 10+ $(CATOBJEXT) != ".gmo"; then \
13+ continue; \ 11+ continue; \
14+ fi; \ 12+ fi; \
15 destdir=$(gnulocaledir); \ 13 destdir=$(gnulocaledir); \
16 else \ 14 else \
17 destdir=$(localedir); \ 15 destdir=$(localedir); \
18 fi; \ 16 fi; \
19- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ 17- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
 18- dir=$$destdir/$$lang/LC_MESSAGES; \
20+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \ 19+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
21 dir=$$destdir/$$lang/LC_MESSAGES; \ 20+ dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
22 $(top_srcdir)/mkinstalldirs $$dir; \ 21 $(top_srcdir)/mkinstalldirs $$dir; \
23 if test -r $$cat; then \ 22 if test -r $$cat; then \
24@@ -144,7 +148,7 @@ 23 $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
 24@@ -144,7 +148,7 @@ install-src: install
25 uninstall: 25 uninstall:
26 catalogs='$(CATALOGS)'; \ 26 catalogs='$(CATALOGS)'; \
27 for cat in $$catalogs; do \ 27 for cat in $$catalogs; do \
28- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ 28- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
29+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \ 29+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
30 rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ 30 rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
31 rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ 31 rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
32 done 32 done
33@@ -180,7 +184,7 @@ 33@@ -180,7 +184,7 @@ update-po: Makefile
34 cd $(srcdir); \ 34 cd $(srcdir); \
35 catalogs='$(CATALOGS)'; \ 35 catalogs='$(CATALOGS)'; \
36 for cat in $$catalogs; do \ 36 for cat in $$catalogs; do \
37- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ 37- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
38+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \ 38+ lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
39 mv $$lang.po $$lang.old.po; \ 39 mv $$lang.po $$lang.old.po; \
40 if $(TUPDATE) $(PACKAGE).pot $$lang.old.po > $$lang.po; then \ 40 if $(TUPDATE) $(PACKAGE).pot $$lang.old.po > $$lang.po; then \
41 rm -f $$lang.old.po; \ 41 rm -f $$lang.old.po; \
File Added: pkgsrc/archivers/gsharutils/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2009/02/09 23:53:52 joerg Exp $

--- src/Makefile.in.orig	2009-02-10 00:48:20.000000000 +0100
+++ src/Makefile.in
@@ -87,14 +87,14 @@ $(OBJECTS) $(COMOBJS): ../config.h ../li
 
 install: install-exec install-data
 install-exec: all
-	$(top_srcdir)/mkinstalldirs $(bindir)
+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 	for name in $(PROGRAMS); do \
 	  $(INSTALL_PROGRAM) $$name \
-		$(bindir)/`echo $$name | sed '$(transform)'`; \
+		${DESTDIR}$(bindir)/`echo $$name | sed '$(transform)'`; \
 	done;
 	for name in $(SCRIPTS); do \
 	  $(INSTALL_SCRIPT) $$name \
-		$(bindir)/`echo $$name | sed '$(transform)'`; \
+		${DESTDIR}$(bindir)/`echo $$name | sed '$(transform)'`; \
 	done
 install-data: