PKG_DESTDIR_SUPPORT

36 files changed, 322 insertions, 121 deletions

diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index ced6ac7d256..d1e393f8052 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/17 19:58:36 abs Exp $
 #
 
 DISTNAME=	mp3asm-0.1.3-1
@@ -14,14 +14,16 @@ COMMENT=	MPEG 1/2/2.5 audio layer 1,2,3 frame level editor
 WRKSRC=		${WRKDIR}/mp3asm-0.1
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS+= share/doc/mp3asm
+PKG_DESTDIR_SUPPORT=user-destdir
+
 post-patch:
 	${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c		\
 		> ${WRKSRC}/src/mp3asm.c.done
 	${MV} ${WRKSRC}/src/mp3asm.c.done ${WRKSRC}/src/mp3asm.c
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mp3asm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mp3asm
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mp3asm
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 336a07c88b8..9d7ac514d04 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/17 20:00:48 abs Exp $
 
 DISTNAME=	mpegaudio
 PKGNAME=	mpegaudio-3.9
@@ -9,8 +9,11 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	MPEG/audio Layer 1 and Layer 2 encoder/decoder package
 
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+=  bin ${PKGMANDIR}/man1
+
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo
index 52a5126fe4b..de4b052ad4d 100644
--- a/audio/mpegaudio/distinfo
+++ b/audio/mpegaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2006/06/09 15:08:08 minskim Exp $
+$NetBSD: distinfo,v 1.4 2009/12/17 20:00:48 abs Exp $
 
 SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf
 RMD160 (mpegaudio.tar.Z) = 3e40fa6629e0bb88046ac882bbfcc263925f7006
 Size (mpegaudio.tar.Z) = 144707 bytes
-SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03
-SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369
+SHA1 (patch-aa) = ce73eab14c962f143997b73e19a00e3d3e585ec7
+SHA1 (patch-ab) = c901c8b0b0af5232ed4759970b320988bcfe1266
 SHA1 (patch-ac) = 389d7973e317362d5927be96ab3222f011410b40
 SHA1 (patch-ad) = f81fb4c7557d9fe96d9164c0df4367389df6b2e4
 SHA1 (patch-ae) = 65bc956b1cc3a97ca3569c3943760d41b63f10e8
diff --git a/audio/mpegaudio/patches/patch-aa b/audio/mpegaudio/patches/patch-aa
index 042c62eb71d..919545ac6e5 100644
--- a/audio/mpegaudio/patches/patch-aa
+++ b/audio/mpegaudio/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- Makefile.orig	Wed Jan  5 02:47:50 1994
+--- Makefile.orig	1994-01-05 01:47:50.000000000 +0000
 +++ Makefile
 @@ -1,10 +1,21 @@
  ALL : musicin musicout
@@ -23,8 +23,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
 +	rm -f *.core *.o musicin musicout
 +
 +install:
-+	${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin
-+	${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables
-+	${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/
++	${BSD_INSTALL_PROGRAM} musicin ${DESTDIR}${PREFIX}/bin/mpeg_musicin
++	${BSD_INSTALL_PROGRAM} musicout ${DESTDIR}${PREFIX}/bin/mpeg_musicout
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mpegaudio/tables
++	${BSD_INSTALL_DATA} tables/* ${DESTDIR}${PREFIX}/lib/mpegaudio/tables/
 +	
diff --git a/audio/mpegaudio/patches/patch-ab b/audio/mpegaudio/patches/patch-ab
index 353648b2b64..71336b425ae 100644
--- a/audio/mpegaudio/patches/patch-ab
+++ b/audio/mpegaudio/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- common.h.orig	Wed Jan  5 02:42:00 1994
+--- common.h.orig	1994-01-05 01:42:00.000000000 +0000
 +++ common.h
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ common.h
  #endif
  
  #ifdef  UNIX
diff --git a/audio/mserv-devel/Makefile b/audio/mserv-devel/Makefile
index 59e7be5f482..56a74c5b1a5 100644
--- a/audio/mserv-devel/Makefile
+++ b/audio/mserv-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/10 11:32:40 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/17 19:58:19 abs Exp $
 #
 
 DISTNAME=	mserv-0.39a
@@ -19,20 +19,21 @@ REPLACE_PERL=		support/mservedit webclient/main.cgi \
 			webclient/margin.cgi webclient/mserv.cgi
 USE_TOOLS+=		perl:run pkg-config
 
+INSTALLATION_DIRS+= share/doc/mserv share/mserv/webclient
+PKG_DESTDIR_SUPPORT= user-destdir
+
 post-configure:
 	${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
+	${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} \
 		${WRKSRC}/INSTALL \
 		${WRKSRC}/LICENSE \
-		${PREFIX}/share/doc/mserv
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mserv/webclient
+		${DESTDIR}${PREFIX}/share/doc/mserv
 	${INSTALL_DATA} \
 		${WRKSRC}/webclient/* \
-		${PREFIX}/share/mserv/webclient
+		${DESTDIR}${PREFIX}/share/mserv/webclient
 
 .include "../../audio/libshout/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index c9b59e5b36a..34b9bbe2d0d 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/05/20 00:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/12/17 20:31:37 abs Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -15,26 +15,27 @@ EXTRACT_ONLY=		felt-3.05.src.tar.gz
 
 WRKSRC=			${WRKDIR}/FElt-3.05
 USE_X11BASE=		yes
+USE_TOOLS+=		gzcat
 XAW_TYPE?=		3d
 
 MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
 MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}
 MAKE_ENV+=		SH=${SH:Q}
 
-USE_GNU_READLINE=	# uses remove_history() and history_list()
+USE_GNU_READLINE=	YES # uses remove_history() and history_list()
 
-INSTALLATION_DIRS=	lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=	lib/X11/app-defaults share/doc/felt share/examples/felt
+INSTALLATION_DIRS+=	share/examples/felt share/doc/felt
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 post-extract:
-	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
+	${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
-	${INSTALL_DATA} ${WRKSRC}/felt.ps ${PREFIX}/share/doc/felt
+	${INSTALL_DATA} ${WRKSRC}/felt.ps ${DESTDIR}${PREFIX}/share/doc/felt
 	cd ${WRKSRC} && ${INSTALL_DATA} FAQ FAQ.html README README.old	\
-		COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
+		COPYING CHANGELOG TODO ${DESTDIR}${PREFIX}/share/doc/felt
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/felt
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index 9db731ab602..ea2e34d3ee2 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/08/02 19:59:21 dholland Exp $
+$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a
@@ -6,19 +6,22 @@ Size (felt-3.05.src.tar.gz) = 956901 bytes
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
-SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
-SHA1 (patch-ac) = 4bbdbf6c4fd597cbdaa355c5da9d6a46d649b66e
-SHA1 (patch-ad) = b39e8556168d434dc156915e5f33b1eaf5745144
-SHA1 (patch-ae) = 96d50e03a7996ed5a57e4d17846608029552a7ea
-SHA1 (patch-af) = 3be12b2c927219420424bdd8fd67cc12739aba99
-SHA1 (patch-ag) = 4c6f78e5869aab7a1d20c4086fc3cd0dc8edbe2d
-SHA1 (patch-ah) = 97b61774130ed3a0fb4c053776ed1cbd7dc42c38
-SHA1 (patch-ai) = b6c2d940d4ca9fc18439bdda0aa0a436a20787a9
-SHA1 (patch-aj) = 81a1abf01df1818a3779153fb68dcb50ded195f9
-SHA1 (patch-ak) = 58591211dd9a04983613be83b1e479ef9ea833a7
-SHA1 (patch-al) = 1918af0d648ae4f00a720f5402524980588467c8
-SHA1 (patch-am) = cee82a628575135bf8cc45c4737ab679b5cffe72
-SHA1 (patch-an) = 00a2196b96bfe0823ba58bb444576131df398682
-SHA1 (patch-ao) = 749e6edcb0061e39371ef4be668b4523c3e4dd89
-SHA1 (patch-ap) = bef0795860964285c41f7845362f4fef63726191
+SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160
+SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53
+SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f
+SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643
+SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55
+SHA1 (patch-af) = efe9378b488d1425ea284ec29c838359aa8f6a9b
+SHA1 (patch-ag) = 392eb3d708ab4b2004586d3203ec64a778dce886
+SHA1 (patch-ah) = d48f55d8cc9c3b6d1bc75b56e4f8023e42e6d37e
+SHA1 (patch-ai) = 00d557b31d2b912de9f952a4f76f2742e98dca1a
+SHA1 (patch-aj) = 9104b418485bdd9f56c699ac4be9ed64422d19d2
+SHA1 (patch-ak) = 0ad726e6992a822ffcf32367f06305ac6ea818cc
+SHA1 (patch-al) = 3267802ff6467ffc37cb4de564b005bf1ceb91ac
+SHA1 (patch-am) = de488591d0d7abace294ccb9a9aa6914b2b9fd4d
+SHA1 (patch-an) = 70195df18c833e46d354e9f2a0212e2bf03e68d2
+SHA1 (patch-ao) = 23106adc13a2ea06f94be807a188c8320f4fde8a
+SHA1 (patch-ap) = 69650c94ca86ec069049a4fc58553534f26ea4bf
+SHA1 (patch-aq) = 2265c8e39c1a9bf2cb4f423fabf1dd6128d16210
+SHA1 (patch-ar) = 3915c952bc526d10acd5245b33835c2f76002e93
+SHA1 (patch-as) = 76dd3f51b62eac4d3e2ca6bbf8d579bdad84a3d2
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 8fbeb35084d..f3a8130467e 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 06:31:43 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2009/12/17 20:31:37 abs Exp $
 
---- etc/Makefile.conf.orig	Sat Mar  4 20:37:06 2000
-+++ etc/Makefile.conf	Tue May 22 12:21:18 2001
+--- etc/Makefile.conf.orig	2000-03-05 01:37:06.000000000 +0000
++++ etc/Makefile.conf
 @@ -1,26 +1,26 @@
 -AR		= ar
 -CC		= gcc
diff --git a/cad/felt/patches/patch-ab b/cad/felt/patches/patch-ab
index 3abbdd6f810..b8ae319b215 100644
--- a/cad/felt/patches/patch-ab
+++ b/cad/felt/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $
 
---- src/Velvet/Makefile.orig	Mon Feb 21 17:44:51 2000
+--- src/Velvet/Makefile.orig	2000-02-21 22:44:51.000000000 +0000
 +++ src/Velvet/Makefile
 @@ -18,7 +18,7 @@
  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
@@ -11,9 +11,9 @@ $NetBSD: patch-ab,v 1.3 2001/08/23 04:26:52 jlam Exp $
  #	  /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
  #	  /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
  #	  /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
-@@ -40,4 +40,4 @@
+@@ -40,4 +40,4 @@ include $(TOPDIR)/etc/Makefile.bin
  
  velvet.o:	velvet.ad.h interface.h
  
 -install::;	@$(INSTALL) -m 0644 Velvet.ad $(X11DEF) 2> /dev/null || true
-+install::;	@$(INSTALL) -m 0644 Velvet.ad $(X11DEF)/Velvet 2> /dev/null || true
++install::;	@$(INSTALL) -m 0644 Velvet.ad $(DESTDIR)$(X11DEF)/Velvet 2> /dev/null || true
diff --git a/cad/felt/patches/patch-ac b/cad/felt/patches/patch-ac
index 217ffbdd913..30ed599d66f 100644
--- a/cad/felt/patches/patch-ac
+++ b/cad/felt/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2004/01/29 11:11:15 agc Exp $
+$NetBSD: patch-ac,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Patchwork/oogl.h	2004/01/29 10:29:34	1.1
-+++ src/Patchwork/oogl.h	2004/01/29 11:08:02
+--- src/Patchwork/oogl.h.orig	2000-02-21 22:44:31.000000000 +0000
++++ src/Patchwork/oogl.h
 @@ -2,370 +2,369 @@
  symbols.h
  **************************************************************************/
diff --git a/cad/felt/patches/patch-ad b/cad/felt/patches/patch-ad
index da54112285c..8761889fb48 100644
--- a/cad/felt/patches/patch-ad
+++ b/cad/felt/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2005/04/30 17:26:43 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- include/allocate.h.orig	Mon Feb 21 16:44:25 2000
+--- include/allocate.h.orig	2000-02-21 22:44:25.000000000 +0000
 +++ include/allocate.h
 @@ -25,7 +25,7 @@
  
diff --git a/cad/felt/patches/patch-ae b/cad/felt/patches/patch-ae
index 60cf4eb225b..e82d11a2bc7 100644
--- a/cad/felt/patches/patch-ae
+++ b/cad/felt/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/data.c.orig	2007-08-08 18:34:32.000000000 +0000
+--- lib/Matrix/data.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/data.c
 @@ -25,7 +25,7 @@
   ************************************************************************/
diff --git a/cad/felt/patches/patch-af b/cad/felt/patches/patch-af
index 2f3e8fdea6d..5fdf277b7f4 100644
--- a/cad/felt/patches/patch-af
+++ b/cad/felt/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/factor.c.orig	2007-08-08 18:36:55.000000000 +0000
+--- lib/Matrix/factor.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/factor.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-ag b/cad/felt/patches/patch-ag
index d7cf83e2668..c2ed2c88c23 100644
--- a/cad/felt/patches/patch-ag
+++ b/cad/felt/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/c_factor.c.orig	2007-08-08 18:40:32.000000000 +0000
+--- lib/Matrix/c_factor.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/c_factor.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-ah b/cad/felt/patches/patch-ah
index 155a5ffd3f2..d719ca0eac6 100644
--- a/cad/felt/patches/patch-ah
+++ b/cad/felt/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/c_data.c.orig	2007-08-08 18:37:42.000000000 +0000
+--- lib/Matrix/c_data.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/c_data.c
 @@ -25,7 +25,7 @@
   ************************************************************************/
diff --git a/cad/felt/patches/patch-ai b/cad/felt/patches/patch-ai
index 5f641496b51..d85e92091ce 100644
--- a/cad/felt/patches/patch-ai
+++ b/cad/felt/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Matrix/eigen.c.orig	2007-08-08 18:41:56.000000000 +0000
+--- lib/Matrix/eigen.c.orig	2000-02-21 22:44:25.000000000 +0000
 +++ lib/Matrix/eigen.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-aj b/cad/felt/patches/patch-aj
index 716686b7c38..2eb2ccc9d45 100644
--- a/cad/felt/patches/patch-aj
+++ b/cad/felt/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- lib/Widgets/xwd.c.orig	2007-08-08 18:42:55.000000000 +0000
+--- lib/Widgets/xwd.c.orig	2000-02-21 22:44:23.000000000 +0000
 +++ lib/Widgets/xwd.c
 @@ -24,7 +24,7 @@
  # include <X11/XWDFile.h>
diff --git a/cad/felt/patches/patch-ak b/cad/felt/patches/patch-ak
index bf9649283e4..93a3c75f70a 100644
--- a/cad/felt/patches/patch-ak
+++ b/cad/felt/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2007/08/08 19:15:45 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Burlap/allocate.h.orig	2007-08-08 18:55:52.000000000 +0000
+--- src/Burlap/allocate.h.orig	2000-02-21 22:44:29.000000000 +0000
 +++ src/Burlap/allocate.h
 @@ -28,7 +28,7 @@
  
diff --git a/cad/felt/patches/patch-al b/cad/felt/patches/patch-al
index 3893ad04cba..868e36c54d3 100644
--- a/cad/felt/patches/patch-al
+++ b/cad/felt/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-al,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Burlap/interactive.c.orig	2007-08-08 18:49:34.000000000 +0000
+--- src/Burlap/interactive.c.orig	2000-02-21 22:44:30.000000000 +0000
 +++ src/Burlap/interactive.c
 @@ -26,7 +26,7 @@
  
diff --git a/cad/felt/patches/patch-am b/cad/felt/patches/patch-am
index 037f2a0e1da..7d334cbf4b7 100644
--- a/cad/felt/patches/patch-am
+++ b/cad/felt/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-am,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Patchwork/util.c.orig	2007-08-08 18:51:20.000000000 +0000
+--- src/Patchwork/util.c.orig	2000-02-21 22:44:31.000000000 +0000
 +++ src/Patchwork/util.c
 @@ -28,7 +28,7 @@
  # include <math.h>
diff --git a/cad/felt/patches/patch-an b/cad/felt/patches/patch-an
index e992972e0a7..9f564b9648c 100644
--- a/cad/felt/patches/patch-an
+++ b/cad/felt/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2007/08/08 19:15:46 joerg Exp $
+$NetBSD: patch-an,v 1.2 2009/12/17 20:31:37 abs Exp $
 
---- src/Velvet/error.c.orig	2007-08-08 18:52:21.000000000 +0000
+--- src/Velvet/error.c.orig	2000-02-21 22:44:26.000000000 +0000
 +++ src/Velvet/error.c
 @@ -25,7 +25,7 @@
  
diff --git a/cad/felt/patches/patch-ao b/cad/felt/patches/patch-ao
index 2a32889223b..2fb5026cd44 100644
--- a/cad/felt/patches/patch-ao
+++ b/cad/felt/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2007/09/29 12:08:25 rillig Exp $
+$NetBSD: patch-ao,v 1.2 2009/12/17 20:31:37 abs Exp $
 
 Since gcc 4, type casts are no longer lvalues.
 
---- src/Burlap/descriptor.h.orig	2000-02-21 23:44:29.000000000 +0100
-+++ src/Burlap/descriptor.h	2007-09-29 14:04:42.000000000 +0200
+--- src/Burlap/descriptor.h.orig	2000-02-21 22:44:29.000000000 +0000
++++ src/Burlap/descriptor.h
 @@ -65,6 +65,7 @@
  
  # define D_NumTypes	(T_External + 1)
diff --git a/cad/felt/patches/patch-ap b/cad/felt/patches/patch-ap
index 5e7a90870a1..d0adf5fd9a4 100644
--- a/cad/felt/patches/patch-ap
+++ b/cad/felt/patches/patch-ap
@@ -1,9 +1,9 @@
-$NetBSD: patch-ap,v 1.1 2008/08/02 19:59:21 dholland Exp $
+$NetBSD: patch-ap,v 1.2 2009/12/17 20:31:37 abs Exp $
 
 Makes analysis.c consistent with Analysis.h.
 
---- src/Velvet/analysis.c~	2000-02-21 17:44:28.000000000 -0500
-+++ src/Velvet/analysis.c	2008-08-02 15:57:22.000000000 -0400
+--- src/Velvet/analysis.c.orig	2000-02-21 22:44:28.000000000 +0000
++++ src/Velvet/analysis.c
 @@ -964,7 +964,13 @@ static void ExternalCallback (w, client_
   ************************************************************************/
  
diff --git a/cad/felt/patches/patch-aq b/cad/felt/patches/patch-aq
new file mode 100644
index 00000000000..9be52376324
--- /dev/null
+++ b/cad/felt/patches/patch-aq
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.orig	2000-03-05 01:43:26.000000000 +0000
++++ etc/Makefile
+@@ -29,9 +29,9 @@ clean::;
+ 
+ clobber::;
+ 
+-install::;	@$(MKDIR) $(DESTLIB)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTLIB)
+ 		@for f in Defaults/*.defaults Translations/*.trn; do \
+-		$(INSTALL) -m 0644 $$f $(DESTLIB); done
++		$(INSTALL) -m 0644 $$f $(DESTDIR)$(DESTLIB); done
+ 
+ depend::;
+ 
diff --git a/cad/felt/patches/patch-ar b/cad/felt/patches/patch-ar
new file mode 100644
index 00000000000..afdf31c0990
--- /dev/null
+++ b/cad/felt/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.bin.orig	2000-02-21 22:44:50.000000000 +0000
++++ etc/Makefile.bin
+@@ -31,8 +31,8 @@ clean::;	@$(RM) $(OBJS) $(PROG) core
+ 
+ clobber::;	@$(RM) $(OBJS) $(PROG) $(SRCS) core tags
+ 
+-install::;	@$(MKDIR) $(DESTBIN)
+-		@$(INSTALL) -s -m 0755 $(PROG) $(DESTBIN)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTBIN)
++		@$(INSTALL) -s -m 0755 $(PROG) $(DESTDIR)$(DESTBIN)
+ 
+ depend::;
+ 
diff --git a/cad/felt/patches/patch-as b/cad/felt/patches/patch-as
new file mode 100644
index 00000000000..3cd5da1ff79
--- /dev/null
+++ b/cad/felt/patches/patch-as
@@ -0,0 +1,16 @@
+$NetBSD: patch-as,v 1.1 2009/12/17 20:31:37 abs Exp $
+
+--- etc/Makefile.man.orig	2000-02-21 22:44:50.000000000 +0000
++++ etc/Makefile.man
+@@ -29,9 +29,9 @@ clean::;
+ 
+ clobber::;
+ 
+-install::;	@$(MKDIR) $(DESTMAN)/$(SECTION)
++install::;	@$(MKDIR) $(DESTDIR)$(DESTMAN)/$(SECTION)
+ 		@for f in $(MANS); do \
+-		$(INSTALL) -m 0644 $$f $(DESTMAN)/$(SECTION); done
++		$(INSTALL) -m 0644 $$f $(DESTDIR)$(DESTMAN)/$(SECTION); done
+ 
+ depend::;
+ 
diff --git a/chat/anope/Makefile b/chat/anope/Makefile
index f572a03616e..f3d73b0605e 100644
--- a/chat/anope/Makefile
+++ b/chat/anope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/17 18:00:13 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/17 20:56:46 abs Exp $
 
 DISTNAME=	anope-1.7.21
 CATEGORIES=	chat
@@ -20,6 +20,8 @@ FILES_SUBST+=	ANOPE_GROUP=${ANOPE_GROUP:Q}
 PKG_USERS_VARS+=	ANOPE_USER
 PKG_GROUPS_VARS+=	ANOPE_GROUP
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 PKG_USERS=	${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN}
@@ -60,19 +62,19 @@ SUBST_MESSAGE.utils=	Fixing hardcoded utilities.
 
 .include "../../mk/pthread.buildlink3.mk"
 
+INSTALLATION_DIRS+=	share/doc/anope share/examples/anope lib/anope/modules
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/anope
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/anope
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/anope
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/anoperc
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listchans
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listnicks
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/services
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/modules/*.so
-	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/anope/languages/*
-	${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope
-	${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/backups
-	${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/logs
-	${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/examples/anope
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/anope
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/anoperc
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listchans
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listnicks
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/services
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/modules/*.so
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/anope/languages/*
+	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope
+	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/backups
+	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/logs
+	${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/examples/anope
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/anope/distinfo b/chat/anope/distinfo
index ba4b3feb600..0e5e9bb06ba 100644
--- a/chat/anope/distinfo
+++ b/chat/anope/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.4 2008/06/13 23:32:45 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2009/12/17 20:56:46 abs Exp $
 
 SHA1 (anope-1.7.21.tar.gz) = 1a8c845fcfd6351a4225fc8e38bb6e90f5201a4b
 RMD160 (anope-1.7.21.tar.gz) = ac2b22d60e6be2e7ea02e933fc005c5b3b206180
 Size (anope-1.7.21.tar.gz) = 1523615 bytes
-SHA1 (patch-aa) = 3a5dcfd4029a4a6f55a3b39d34e706502ecfe05c
+SHA1 (patch-aa) = 6db1799996f7eb8f2d88ddd99f4baef5a843865b
+SHA1 (patch-ab) = 9684780fa938db06f53014e7d45e9e6debf9e92c
+SHA1 (patch-ac) = d08a26c28b7e6130b7eb459a7109ad67160eb43d
+SHA1 (patch-ad) = 7b64822e486fa8673db8e47edc9b86c7183505c7
+SHA1 (patch-ae) = 6c02aaa1d809e113338d35b672911269c1932d29
+SHA1 (patch-af) = 77e21789e0af1b845c417dabd02e2ad9a5e04239
diff --git a/chat/anope/patches/patch-aa b/chat/anope/patches/patch-aa
index 5b920f69a3b..7f863fb49c6 100644
--- a/chat/anope/patches/patch-aa
+++ b/chat/anope/patches/patch-aa
@@ -1,12 +1,50 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/10/20 22:40:24 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/17 20:56:46 abs Exp $
 
---- src/Makefile.orig	2005-11-16 23:22:43.000000000 +0000
+--- src/Makefile.orig	2008-01-10 22:31:39.000000000 +0000
 +++ src/Makefile
-@@ -111,7 +111,6 @@ install: services
- 	ln $(BINDEST)/services $(BINDEST)/listnicks
- 	ln $(BINDEST)/services $(BINDEST)/listchans
+@@ -108,17 +108,16 @@ spotless:
+ 	(cd core ; ${MAKE} distclean)
+ 
+ install: services
+-	test -d ${BINDEST} || mkdir ${BINDEST}
+-	$(INSTALL) services $(BINDEST)/services
+-	$(INSTALL) bin/anoperc $(BINDEST)/anoperc
+-	rm -f $(BINDEST)/listnicks $(BINDEST)/listchans
+-	ln $(BINDEST)/services $(BINDEST)/listnicks
+-	ln $(BINDEST)/services $(BINDEST)/listchans
++	test -d ${DESTDIR}${BINDEST} || mkdir ${DESTDIR}${BINDEST}
++	$(INSTALL) services ${DESTDIR}$(BINDEST)/services
++	$(INSTALL) bin/anoperc ${DESTDIR}$(BINDEST)/anoperc
++	rm -f ${DESTDIR}$(BINDEST)/listnicks ${DESTDIR}$(BINDEST)/listchans
++	ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listnicks
++	ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listchans
  	(cd ../lang ; $(MAKE) install)
 -	$(CP) ../data/* $(DATDEST)
- 	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
- 	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
- 	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
+-	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
+-	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
+-	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
++	$(INSTALL) bin/mydbgen ${DESTDIR}$(DATDEST)/mydbgen
++	test -d ${DESTDIR}$(DATDEST)/backups || mkdir ${DESTDIR}$(DATDEST)/backups
++	test -d ${DESTDIR}$(DATDEST)/logs || mkdir ${DESTDIR}$(DATDEST)/logs
+ 	@if [ "$(MODULE_PATH)" ] ; then \
+ 		test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
+ 		test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
+@@ -127,12 +126,12 @@ install: services
+ 		(cd core ; ${MAKE} install) ; \
+ 	fi
+ 	@if [ "$(RUNGROUP)" ] ; then \
+-		echo chgrp -R $(RUNGROUP) $(DATDEST) ; \
+-		chgrp -R $(RUNGROUP) $(DATDEST) ; \
+-		echo chmod -R g+rw $(DATDEST) ; \
+-		chmod -R g+rw $(DATDEST) ; \
+-		echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
+-		find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
++		echo chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
++		chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
++		echo chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
++		chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
++		echo find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
++		find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
+ 	fi
+ 
+ DUMMY:
diff --git a/chat/anope/patches/patch-ab b/chat/anope/patches/patch-ab
new file mode 100644
index 00000000000..23a86ac0846
--- /dev/null
+++ b/chat/anope/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1 2009/12/17 20:56:46 abs Exp $
+
+--- lang/Makefile.orig	2008-01-10 22:31:35.000000000 +0000
++++ lang/Makefile
+@@ -18,22 +18,22 @@ all: $(LANGOBJS)
+ distclean: clean spotless
+ 
+ install: all
+-	test -d $(DATDEST)/languages || mkdir $(DATDEST)/languages
++	test -d $(DESTDIR)$(DATDEST)/languages || mkdir $(DESTDIR)$(DATDEST)/languages
+ 	@if [ "$(RUNGROUP)" ] ; then \
+-		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
+-		chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
+-		echo chmod -R g+rw $(DATDEST)/languages ; \
+-		chmod -R g+rw $(DATDEST)/languages ; \
+-		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
+-		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
+-		chgrp -R $(RUNGROUP) $(DATDEST)/languages/* ; \
+-		echo chmod -R g+rw $(DATDEST)/languages/* ; \
+-		chmod -R g+rw $(DATDEST)/languages/* ; \
++		echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
++		chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
++		echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \
++		chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \
++		$(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \
++		echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
++		chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages/* ; \
++		echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \
++		chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \
+ 	fi
+ 	@if [ ! "$(RUNGROUP)" ] ; then \
+-		chmod 700 $(DATDEST)/languages/ ; \
+-		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
+-		chmod 600 $(DATDEST)/languages/* ; \
++		chmod 700 $(DESTDIR)$(DATDEST)/languages/ ; \
++		$(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \
++		chmod 600 $(DESTDIR)$(DATDEST)/languages/* ; \
+ 	fi
+ 	
+ clean:
diff --git a/chat/anope/patches/patch-ac b/chat/anope/patches/patch-ac
new file mode 100644
index 00000000000..5a5c14d59a9
--- /dev/null
+++ b/chat/anope/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/12/17 20:56:46 abs Exp $
+
+--- src/modules/Makefile.orig	2008-01-10 22:31:39.000000000 +0000
++++ src/modules/Makefile
+@@ -16,7 +16,7 @@ all: modules subs
+ modules: $(OBJECTS) $(SO_FILES)
+ 
+ install: 
+-	$(CP) ./*.so $(MODULE_PATH) 
++	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
+ 
+ distclean: spotless
+ 
diff --git a/chat/anope/patches/patch-ad b/chat/anope/patches/patch-ad
new file mode 100644
index 00000000000..7fe61d3eed7
--- /dev/null
+++ b/chat/anope/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/12/17 20:56:46 abs Exp $
+
+--- src/protocol/Makefile.orig	2008-01-10 22:31:38.000000000 +0000
++++ src/protocol/Makefile
+@@ -16,7 +16,7 @@ all: modules subs
+ modules: $(OBJECTS) $(SO_FILES)
+ 
+ install: 
+-	$(CP) ./*.so $(MODULE_PATH) 
++	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
+ 
+ distclean: clean spotless
+ 
diff --git a/chat/anope/patches/patch-ae b/chat/anope/patches/patch-ae
new file mode 100644
index 00000000000..16f5a4e9bee
--- /dev/null
+++ b/chat/anope/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/12/17 20:56:46 abs Exp $
+
+--- src/core/Makefile.orig	2008-01-10 22:31:37.000000000 +0000
++++ src/core/Makefile
+@@ -16,7 +16,7 @@ all: modules subs
+ modules: $(OBJECTS) $(SO_FILES)
+ 
+ install: 
+-	$(CP) ./*.so $(MODULE_PATH) 
++	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
+ 
+ distclean: spotless
+ 
diff --git a/chat/anope/patches/patch-af b/chat/anope/patches/patch-af
new file mode 100644
index 00000000000..a60b8f7fcdb
--- /dev/null
+++ b/chat/anope/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2009/12/17 20:56:46 abs Exp $
+
+--- src/tools/Makefile.orig	2008-01-10 22:31:37.000000000 +0000
++++ src/tools/Makefile
+@@ -30,10 +30,10 @@ clean:
+ spotless: clean
+ 
+ install: anopesmtp db-merger epona2anope
+-	test -d ${BINDEST} || mkdir ${BINDEST}
+-	test -d $(BINDEST)/tools || mkdir $(BINDEST)/tools
+-	$(INSTALL) anopesmtp $(BINDEST)/tools/anopesmtp
+-	$(INSTALL) db-merger $(BINDEST)/tools/db-merger
+-	$(INSTALL) epona2anope $(BINDEST)/tools/epona2anope
++	test -d ${DESTDIR}/${BINDEST} || mkdir ${DESTDIR}/${BINDEST}
++	test -d ${DESTDIR}/$(BINDEST)/tools || mkdir ${DESTDIR}/$(BINDEST)/tools
++	$(INSTALL) anopesmtp ${DESTDIR}/$(BINDEST)/tools/anopesmtp
++	$(INSTALL) db-merger ${DESTDIR}/$(BINDEST)/tools/db-merger
++	$(INSTALL) epona2anope ${DESTDIR}/$(BINDEST)/tools/epona2anope
+ 
+ DUMMY:
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index cd22daca3ea..5145ca7d9eb 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/07/27 09:38:06 obache Exp $
+# $NetBSD: Makefile,v 1.21 2009/12/17 20:20:43 abs Exp $
 
 DISTNAME=	sirc-2.211
 PKGREVISION=	2
@@ -50,6 +50,8 @@ DIST_SUBDIR=	sirc
 
 REPLACE_PERL+=	dsirc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 .if defined(DEFAULT_IRC_SERVER)
 IRC_SERVER=	${DEFAULT_IRC_SERVER}
@@ -57,10 +59,9 @@ IRC_SERVER=	${DEFAULT_IRC_SERVER}
 IRC_SERVER=	us.undernet.org
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 lib/sirc/scripts
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc
 	cd ${WRKSRC} ; ( \
 		${ECHO} "y" ; \
 		${ECHO} "" ; \
@@ -69,18 +70,17 @@ do-install:
 		${ECHO} "-O3" ; \
 		${ECHO} "" ; \
 		${ECHO} "${PERL5}" ; \
-		${ECHO} "${PREFIX}/bin" ; \
+		${ECHO} "${DESTDIR}${PREFIX}/bin" ; \
 		${ECHO} "y" ; \
-		${ECHO} "${PREFIX}/lib/sirc" ; \
+		${ECHO} "${DESTDIR}${PREFIX}/lib/sirc" ; \
 		${ECHO} "y" ; \
 		${ECHO} "n" ; \
-		${ECHO} "${PREFIX}/${PKGMANDIR}/man1" ; \
+		${ECHO} "${DESTDIR}${PREFIX}/${PKGMANDIR}/man1" ; \
 		${ECHO} "${IRC_SERVER}" ; \
 		${ECHO} "" ; \
 	) | ./install
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc/scripts
-	@for i in ${SIRC_SCRIPTS} ; do \
+	for i in ${SIRC_SCRIPTS} ; do \
 		${ECHO} installing $$i ; \
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${PREFIX}/lib/sirc/scripts/$$i ; done
+		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${DESTDIR}${PREFIX}/lib/sirc/scripts/$$i ; done
 
 .include "../../mk/bsd.pkg.mk"