Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

6 files changed, 29 insertions, 16 deletions

diff --git a/ham/cwtext/Makefile b/ham/cwtext/Makefile
index 35aad0ebcd9..2920de3e075 100644
--- a/ham/cwtext/Makefile
+++ b/ham/cwtext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 15:51:59 jlam Exp $
 
 DISTNAME=	cwtext-0.95
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cwtext.sourceforge.net/
 COMMENT=	Morse Code Generator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=	makefile
 USE_TOOLS+=	gmake
 BUILD_TARGET=	ALL
@@ -23,9 +25,9 @@ post-patch:
 	${MV} ${WRKSRC}/${MAKE_FILE}.done ${WRKSRC}/${MAKE_FILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cwpcm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cwtext ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cwmm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cwpcm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cwtext ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cwmm ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/fl_logbook/Makefile b/ham/fl_logbook/Makefile
index 4f5a5ebfae3..253422c768d 100644
--- a/ham/fl_logbook/Makefile
+++ b/ham/fl_logbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/21 16:49:23 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 15:51:59 jlam Exp $
 #
 
 DISTNAME=		fl_logbook.121.src
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.w1hkj.com/
 COMMENT=		FLTK-based amateur radio log book
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 
 USE_LANGUAGES=		c++
@@ -20,7 +22,7 @@ MAKE_ENV+=		CFG=Release
 BUILD_TARGET=		#defined in dist Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index 2b62ac2cf91..0ca422a0ec4 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2007/08/08 03:10:17 wulf Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/04 15:51:59 jlam Exp $
 
 PKGNAME=	gnuradio-examples-${VERSION}
 COMMENT=	GUI framework for GNU Radio based on wxPython
 COMMENT=	Examples for GNU Radio
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
 CONFIGURE_ARGS+=--enable-gnuradio-examples
@@ -94,11 +96,11 @@ do-install:
 	cd ${WRKSRC}/gnuradio-examples/python;				\
 	for d in `find * -type d`;					\
 	do								\
-		${INSTALL_SCRIPT_DIR} ${EXAMPLE_DIR}/"$$d";		\
+		${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXAMPLE_DIR}/"$$d";	\
 	done;								\
 	for f in `find . \! -name "Makefile*" -type f`;			\
 	do								\
-		${INSTALL_SCRIPT} "$$f" ${EXAMPLE_DIR}/"$$f";		\
+		${INSTALL_SCRIPT} "$$f" ${DESTDIR}${EXAMPLE_DIR}/"$$f";	\
 	done
 
 .include "../../ham/gnuradio-wxgui/buildlink3.mk"
diff --git a/ham/locator/Makefile b/ham/locator/Makefile
index 09c0f284abf..3c3b36a0d9c 100644
--- a/ham/locator/Makefile
+++ b/ham/locator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/01 22:15:59 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 15:51:59 jlam Exp $
 #
 
 DISTNAME=	locator-0.1
@@ -9,6 +9,8 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.stauss.purespace.de/
 COMMENT=	Longitudes, latitudes to HAM locator converter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin
@@ -16,6 +18,6 @@ INSTALLATION_DIRS=	bin
 USE_LANGUAGES=	c++
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/locator ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/locator ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/wwl/Makefile b/ham/wwl/Makefile
index 0ba05493691..bf1e9a95007 100644
--- a/ham/wwl/Makefile
+++ b/ham/wwl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 15:51:59 jlam Exp $
 #
 
 DISTNAME=	wwl-1.2
@@ -9,12 +9,14 @@ MAINTAINER=	dawszy@arhea.net
 #HOMEPAGE=	not known
 COMMENT=	Calculates distance (qrb)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/wwl
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wwl ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/wwl ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/yaesu/Makefile b/ham/yaesu/Makefile
index ebf73d8a44c..055ddf98c3c 100644
--- a/ham/yaesu/Makefile
+++ b/ham/yaesu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/01/14 11:45:46 wulf Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 15:51:59 jlam Exp $
 #
 
 DISTNAME=	yaesu-0.13
@@ -9,13 +9,16 @@ MAINTAINER=	dawszy@arhea.net
 #HOMEPAGE=	not known
 COMMENT=	Control interface for Yaesu FT-890 HF transceiver
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/yaesu
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin share/doc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/yaesu ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/yaesu.README
+	${INSTALL_PROGRAM} ${WRKSRC}/yaesu ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/yaesu.README
 
 .include "../../mk/bsd.pkg.mk"