From 6bf251943fb669be2d208f6fb7fcd78920282db9 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 9 Feb 2009 23:53:00 +0000
Subject: DESTDIR support.

---
 archivers/freeze/Makefile             |  3 ++-
 archivers/freeze/distinfo             |  4 +--
 archivers/freeze/patches/patch-aa     | 12 +++++----
 archivers/gsharutils/Makefile         |  3 ++-
 archivers/gsharutils/distinfo         |  7 +++---
 archivers/gsharutils/patches/patch-ad | 46 +++++++++++++++++++++++++++++------
 archivers/gsharutils/patches/patch-ag | 18 +++++++-------
 archivers/gsharutils/patches/patch-ak | 22 +++++++++++++++++
 archivers/jamjar/Makefile             |  5 ++--
 archivers/nulib2/Makefile             |  3 ++-
 archivers/nulib2/distinfo             |  4 +--
 archivers/nulib2/patches/patch-ab     | 19 ++++++++++++---
 archivers/star/Makefile               |  5 ++--
 13 files changed, 112 insertions(+), 39 deletions(-)
 create mode 100644 archivers/gsharutils/patches/patch-ak

(limited to 'archivers')

diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index f046bb8ca05..30f9dc9e65b 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/07/17 17:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/02/09 23:53:00 joerg Exp $
 
 DISTNAME=	freeze-2.5
 PKGREVISION=	2
@@ -9,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	FREEZE / MELT compression program - often used in QNX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	prog
diff --git a/archivers/freeze/distinfo b/archivers/freeze/distinfo
index 9446ad3d9a3..b0af1a6c09f 100644
--- a/archivers/freeze/distinfo
+++ b/archivers/freeze/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/07/17 17:17:43 joerg Exp $
+$NetBSD: distinfo,v 1.10 2009/02/09 23:53:00 joerg Exp $
 
 SHA1 (freeze-2.5.tar.gz) = 07b94508fcd95d35236a4090257aa402fd623812
 RMD160 (freeze-2.5.tar.gz) = bc8bdf2ed06738066fd73f7bedb8b9f2dbaa21a2
 Size (freeze-2.5.tar.gz) = 36402 bytes
-SHA1 (patch-aa) = fdf556fd4dc8047db4d2ad95e6ae5ab05f336800
+SHA1 (patch-aa) = 06f7ad902096118539be384574407d274a4bd718
 SHA1 (patch-ab) = ee451389539442c392830c7da252ac836d4a5adf
 SHA1 (patch-ac) = 17b2b3b5514f7dea67ecfe969d8f6e988b5fad40
 SHA1 (patch-ad) = 9f1c797bb45dd76935eed777bd599d6fba87774e
diff --git a/archivers/freeze/patches/patch-aa b/archivers/freeze/patches/patch-aa
index 9e48e8a521c..443fe41098e 100644
--- a/archivers/freeze/patches/patch-aa
+++ b/archivers/freeze/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/07/17 17:17:43 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2009/02/09 23:53:00 joerg Exp $
 
---- Makefile.in.orig	1993-02-24 13:36:56.000000000 +0000
+--- Makefile.in.orig	1993-02-24 14:36:56.000000000 +0100
 +++ Makefile.in
 @@ -3,7 +3,7 @@ srcdir        = @srcdir@
  VPATH         = $(srcdir)
@@ -11,12 +11,14 @@ $NetBSD: patch-aa,v 1.2 2006/07/17 17:17:43 joerg Exp $
  
  INSTALL       = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -20,7 +20,7 @@ default:        prog
+@@ -19,8 +19,8 @@ default:        prog
+ 
  # Added the prefix macro, so that it was easier to change installation place.
  prefix        = /usr/local
- DEST          = $(prefix)/bin
+-DEST          = $(prefix)/bin
 -MANDEST       = $(prefix)/man/man1
-+MANDEST       = $(prefix)/${PKGMANDIR}/man1
++DEST          = ${DESTDIR}$(prefix)/bin
++MANDEST       = ${DESTDIR}$(prefix)/${PKGMANDIR}/man1
  SEC           = 1
  
  HDRS          = bitio.h\
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index dea001b1766..90bb5f16b7c 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/09/20 11:05:20 hira Exp $
+# $NetBSD: Makefile,v 1.43 2009/02/09 23:53:52 joerg Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -13,6 +13,7 @@ COMMENT=	Allow packing and unpacking of shell archives
 BROKEN_GETTEXT_DETECTION=	yes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index 4248db2cc43..71622e12b75 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/08/26 06:07:35 reed Exp $
+$NetBSD: distinfo,v 1.16 2009/02/09 23:53:52 joerg Exp $
 
 SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
 RMD160 (sharutils-4.2.1.tar.gz) = 06e1629aa8a1c982e6032f194df6f5fe85f85b43
@@ -6,10 +6,11 @@ Size (sharutils-4.2.1.tar.gz) = 306022 bytes
 SHA1 (patch-aa) = 654641dee00efc19771546cf1753d1025c18d9be
 SHA1 (patch-ab) = cc46cfb2ff26861f9c3cd482a31a5c59226a1899
 SHA1 (patch-ac) = 2fbf90458b0a81082db6b1bd343efb5f2062a947
-SHA1 (patch-ad) = a3b93b3aec1e2247a455a3b2d0678f8ac08f82b5
+SHA1 (patch-ad) = df119a05f737628136ed3f43eb23b79b5075e68e
 SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
-SHA1 (patch-ag) = af78d21124b33f0d8bdc27969119222e4d79008e
+SHA1 (patch-ag) = ffcb66111f8c3ce972249db2b14e1526eb68c47c
 SHA1 (patch-ah) = 90fed62712aa4d02d66098581d5e5602e391663e
 SHA1 (patch-ai) = a95e116d517e5fe536a31d12db1c33daaf2609af
 SHA1 (patch-aj) = 56ee560455a206c6fa5c106f1c759d0a0296dfd7
+SHA1 (patch-ak) = ee7d026caa3fca5ad68f69312b38960fab3f281b
diff --git a/archivers/gsharutils/patches/patch-ad b/archivers/gsharutils/patches/patch-ad
index 1580e88787b..2651aedaa99 100644
--- a/archivers/gsharutils/patches/patch-ad
+++ b/archivers/gsharutils/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2005/08/26 06:07:35 reed Exp $
+$NetBSD: patch-ad,v 1.4 2009/02/09 23:53:52 joerg Exp $
 
---- doc/Makefile.in.orig	1995-11-25 02:44:35.000000000 +0000
-+++ doc/Makefile.in	2005-08-26 05:47:16.587932824 +0000
-@@ -37,8 +37,8 @@
+--- doc/Makefile.in.orig	1995-11-25 03:44:35.000000000 +0100
++++ doc/Makefile.in
+@@ -37,8 +37,8 @@ MAN1PAGES = @MAN1PAGES@
  MAN5PAGES = @MAN5PAGES@
  
  prefix = @prefix@
@@ -13,8 +13,39 @@ $NetBSD: patch-ad,v 1.3 2005/08/26 06:07:35 reed Exp $
  man1dir = $(mandir)/man1
  man1ext = .1
  man5dir = $(mandir)/man5
-@@ -109,11 +109,11 @@
- 		$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
+@@ -82,10 +82,10 @@ install install-exec install-data: all
+ install: install-exec install-data
+ install-exec:
+ install-data:
+-	$(top_srcdir)/mkinstalldirs $(infodir)
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
+ 	cd $(srcdir) && \
+ 	  for file in sharutils.info* remsync.info*; do \
+-	    $(INSTALL_DATA) $$file $(infodir)/$$file; \
++	    $(INSTALL_DATA) $$file ${DESTDIR}$(infodir)/$$file; \
+ 	  done
+ 
+ uninstall:
+@@ -96,24 +96,24 @@ uninstall:
+ # GNU and switch to Info.  The following is for irreductible fellows.
+ 
+ install-man:
+-	$(top_srcdir)/mkinstalldirs $(man1dir)
+-	test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs $(man5dir)
++	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(man1dir)
++	test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs ${DESTDIR}$(man5dir)
+ 	for name in $(MAN1PAGES); do \
+ 	  if test $$name = uudecode; then \
+-	    rm -f $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
++	    rm -f ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
+ 	    man1base=`echo $(man1dir) | sed 's@.*/\(.*\)@&1@'`; \
+ 	    echo ".so $$man1base/uuencode$(man1ext)" \
+-	      > $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
++	      > ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
+ 	  else \
+ 	    $(INSTALL_DATA) $(srcdir)/$$name.1 \
+-		$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
++		${DESTDIR}$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
  	  fi; \
  	done
 -	test -z "$(MAN5PAGES)" || \
@@ -22,8 +53,9 @@ $NetBSD: patch-ad,v 1.3 2005/08/26 06:07:35 reed Exp $
 +	for name in "" $(MAN5PAGES); do \
 +	    if [ "X$$name" = "X" ]; then continue; fi; \
  	    $(INSTALL_DATA) $(srcdir)/$$name.5 \
- 		$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
+-		$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
 -	  done
++		${DESTDIR}$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
 +	done
  
  uninstall-man:
diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag
index 6a39a3f7207..5450d99d685 100644
--- a/archivers/gsharutils/patches/patch-ag
+++ b/archivers/gsharutils/patches/patch-ag
@@ -1,10 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2003/10/20 09:35:06 agc Exp $
+$NetBSD: patch-ag,v 1.7 2009/02/09 23:53:52 joerg Exp $
 
-Apply fix from Kouichirou Hiratsuka in PR 22348
-
---- po/Makefile.in.in	2003/10/20 09:29:50	1.1
-+++ po/Makefile.in.in	2003/10/20 09:29:57
-@@ -120,11 +120,15 @@
+--- po/Makefile.in.in.orig	1995-12-04 17:19:48.000000000 +0100
++++ po/Makefile.in.in
+@@ -120,12 +120,16 @@ install-data: all
  	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  if test "`echo $$cat | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
@@ -17,11 +15,13 @@ Apply fix from Kouichirou Hiratsuka in PR 22348
  	    destdir=$(localedir); \
  	  fi; \
 -	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+-	  dir=$$destdir/$$lang/LC_MESSAGES; \
 +	  lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
++	  dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
  	  $(top_srcdir)/mkinstalldirs $$dir; \
  	  if test -r $$cat; then \
-@@ -144,7 +148,7 @@
+ 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+@@ -144,7 +148,7 @@ install-src: install
  uninstall:
  	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
@@ -30,7 +30,7 @@ Apply fix from Kouichirou Hiratsuka in PR 22348
  	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
  	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
  	done
-@@ -180,7 +184,7 @@
+@@ -180,7 +184,7 @@ update-po: Makefile
  	cd $(srcdir); \
  	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
diff --git a/archivers/gsharutils/patches/patch-ak b/archivers/gsharutils/patches/patch-ak
new file mode 100644
index 00000000000..b72dd785bc0
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-ak
@@ -0,0 +1,22 @@
+$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:
+ 
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile
index 2f238ad9347..d15706751ee 100644
--- a/archivers/jamjar/Makefile
+++ b/archivers/jamjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/06/16 14:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/02/10 00:03:41 joerg Exp $
 #
 
 DISTNAME=	jamjar-0.7.1
@@ -12,6 +12,7 @@ COMMENT=	Acunia version of the jar archiver
 BUILD_DEPENDS+=	acunia-jam>=1.0:../../devel/acunia-jam
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/jamjar
 
@@ -19,7 +20,7 @@ JAM_COMMAND=	\
 	cd ${WRKSRC} &&							\
 		${SETENV} ${MAKE_ENV}					\
 		${LOCALBASE}/bin/jam					\
-			-sPREFIX="${PREFIX}"				\
+			-sPREFIX="${DESTDIR}${PREFIX}"				\
 			-sCFLAGS="${CFLAGS}"
 
 do-build:
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 49499e5738c..732e5ef10ed 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/19 16:40:26 tv Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/10 00:01:55 joerg Exp $
 #
 
 DISTNAME=	nulibdist-203
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.nulib.com/
 COMMENT=	Handles Apple II ShrinkIt (NuFX) file/disk archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/dist/2/}
 GNU_CONFIGURE=	yes
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo
index 8d4e4cc8363..d1e28e41b74 100644
--- a/archivers/nulib2/distinfo
+++ b/archivers/nulib2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/10/31 05:34:07 minskim Exp $
+$NetBSD: distinfo,v 1.10 2009/02/10 00:01:55 joerg Exp $
 
 SHA1 (nulibdist-203.tar.gz) = c7a9bde218e0a115424dfc2e3d7234ee7faa9b8e
 RMD160 (nulibdist-203.tar.gz) = 84c6eadd64749cfdc11fda74a552072bce1b04db
 Size (nulibdist-203.tar.gz) = 394129 bytes
 SHA1 (patch-aa) = a8c05f177ec5e08dc1bb8968be3febb3586d57a1
-SHA1 (patch-ab) = 013f1e8681f0ac5d7f5757df7ed703bb27a3216c
+SHA1 (patch-ab) = fe70386516a18837589986143d4c0fbdd1082baa
 SHA1 (patch-ac) = 51460a4003c40f68ed19431afc02aa1607f482ef
 SHA1 (patch-ad) = e537bbc19b3edfbabac1e61859dca29b068c36e5
 SHA1 (patch-ae) = 053d302021ea898ae72fc78e69f52660b82989ab
diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab
index 381e507a5e1..9257070b38a 100644
--- a/archivers/nulib2/patches/patch-ab
+++ b/archivers/nulib2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2004/11/29 04:50:35 tv Exp $
+$NetBSD: patch-ab,v 1.6 2009/02/10 00:01:55 joerg Exp $
 
---- Makefile.in.orig	Mon May 22 20:42:57 2000
+--- Makefile.in.orig	2004-10-12 00:25:19.000000000 +0200
 +++ Makefile.in
-@@ -69,7 +69,11 @@
+@@ -69,14 +69,18 @@ LIB_PRODUCT	= libnufx.a
  # Build stuff
  #
  
@@ -15,7 +15,18 @@ $NetBSD: patch-ab,v 1.5 2004/11/29 04:50:35 tv Exp $
  	@true
  
  install: $(PRODUCT)
-@@ -97,7 +101,7 @@
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) $(PRODUCT) $(bindir)
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL_DATA) nulib2.1 $(mandir)/man1/
++	$(srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++	$(INSTALL_PROGRAM) $(PRODUCT) ${DESTDIR}$(bindir)
++	$(srcdir)/mkinstalldirs ${DESTDIR}$(mandir)/man1
++	$(INSTALL_DATA) nulib2.1 ${DESTDIR}$(mandir)/man1/
+ 
+ install-shared:
+ 	LIB_PRODUCT="libnufx.so" $(MAKE) -e install
+@@ -97,7 +101,7 @@ purify:
  	@$(MAKE) PURIFY_BUILD=1
  
  $(PRODUCT): $(OBJS) $(NUFXLIB)
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index ee685c4b076..1e9fb3f1653 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/06/08 02:40:38 tonnerre Exp $
+# $NetBSD: Makefile,v 1.23 2009/02/10 00:07:37 joerg Exp $
 #
 
 DISTNAME=	star-1.4.3
@@ -11,9 +11,10 @@ HOMEPAGE=	http://cdrecord.berlios.de/old/private/star.html
 COMMENT=	The fastest tar like archiver for UNIX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
-MAKE_FLAGS+=	INS_BASE=${PREFIX:Q}
+MAKE_FLAGS+=	INS_BASE=${DESTDIR}${PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
 
-- 
cgit v1.2.3