Tue Mar 4 15:51:59 2008 UTC ()
Mechanical changes to add DESTDIR support to packages that install
their files via a custom do-install target.


(jlam)
diff -r1.15 -r1.16 pkgsrc/ham/cwtext/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/ham/fl_logbook/Makefile
diff -r1.10 -r1.11 pkgsrc/ham/gnuradio-examples/Makefile
diff -r1.5 -r1.6 pkgsrc/ham/locator/Makefile
diff -r1.6 -r1.7 pkgsrc/ham/wwl/Makefile
diff -r1.6 -r1.7 pkgsrc/ham/yaesu/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/ham/cwtext/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/cwtext/Makefile 2006/09/09 02:43:09 1.15
+++ pkgsrc/ham/cwtext/Makefile 2008/03/04 15:51:59 1.16
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: Makefile,v 1.15 2006/09/09 02:43:09 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2008/03/04 15:51:59 jlam Exp $
2 2
3DISTNAME= cwtext-0.95 3DISTNAME= cwtext-0.95
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cwtext/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cwtext/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://cwtext.sourceforge.net/ 9HOMEPAGE= http://cwtext.sourceforge.net/
10COMMENT= Morse Code Generator 10COMMENT= Morse Code Generator
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12MAKE_FILE= makefile 14MAKE_FILE= makefile
13USE_TOOLS+= gmake 15USE_TOOLS+= gmake
14BUILD_TARGET= ALL 16BUILD_TARGET= ALL
15 17
16INSTALLATION_DIRS= bin 18INSTALLATION_DIRS= bin
17 19
18post-patch: 20post-patch:
19 ${SED} -e "s,^PREFIX,#PREFIX,g" \ 21 ${SED} -e "s,^PREFIX,#PREFIX,g" \
20 -e "s,gcc,${CC} ${CFLAGS},g" \ 22 -e "s,gcc,${CC} ${CFLAGS},g" \
21 -e "s,python,${PYTHONBIN},g" \ 23 -e "s,python,${PYTHONBIN},g" \
22 ${WRKSRC}/${MAKE_FILE} > ${WRKSRC}/${MAKE_FILE}.done 24 ${WRKSRC}/${MAKE_FILE} > ${WRKSRC}/${MAKE_FILE}.done
23 ${MV} ${WRKSRC}/${MAKE_FILE}.done ${WRKSRC}/${MAKE_FILE} 25 ${MV} ${WRKSRC}/${MAKE_FILE}.done ${WRKSRC}/${MAKE_FILE}
24 26
25do-install: 27do-install:
26 ${INSTALL_PROGRAM} ${WRKSRC}/cwpcm ${PREFIX}/bin 28 ${INSTALL_PROGRAM} ${WRKSRC}/cwpcm ${DESTDIR}${PREFIX}/bin
27 ${INSTALL_PROGRAM} ${WRKSRC}/cwtext ${PREFIX}/bin 29 ${INSTALL_PROGRAM} ${WRKSRC}/cwtext ${DESTDIR}${PREFIX}/bin
28 ${INSTALL_PROGRAM} ${WRKSRC}/cwmm ${PREFIX}/bin 30 ${INSTALL_PROGRAM} ${WRKSRC}/cwmm ${DESTDIR}${PREFIX}/bin
29 31
30.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
31.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/ham/fl_logbook/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/fl_logbook/Makefile 2007/01/21 16:49:23 1.1.1.1
+++ pkgsrc/ham/fl_logbook/Makefile 2008/03/04 15:51:59 1.2
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.1.1.1 2007/01/21 16:49:23 obache Exp $ 1# $NetBSD: Makefile,v 1.2 2008/03/04 15:51:59 jlam Exp $
2# 2#
3 3
4DISTNAME= fl_logbook.121.src 4DISTNAME= fl_logbook.121.src
5PKGNAME= fl_logbook-1.21 5PKGNAME= fl_logbook-1.21
6CATEGORIES= ham 6CATEGORIES= ham
7MASTER_SITES= http://www.w1hkj.com/LinuxApps/ 7MASTER_SITES= http://www.w1hkj.com/LinuxApps/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.w1hkj.com/ 10HOMEPAGE= http://www.w1hkj.com/
11COMMENT= FLTK-based amateur radio log book 11COMMENT= FLTK-based amateur radio log book
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
14 16
15USE_LANGUAGES= c++ 17USE_LANGUAGES= c++
16USE_TOOLS+= gmake 18USE_TOOLS+= gmake
17 19
18MAKE_ENV+= CFG=Release 20MAKE_ENV+= CFG=Release
19 21
20BUILD_TARGET= #defined in dist Makefile 22BUILD_TARGET= #defined in dist Makefile
21 23
22do-install: 24do-install:
23 ${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${PREFIX}/bin 25 ${INSTALL_PROGRAM} ${WRKSRC}/Release/fl_logbook ${DESTDIR}${PREFIX}/bin
24 26
25.include "../../x11/fltk/buildlink3.mk" 27.include "../../x11/fltk/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/ham/gnuradio-examples/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-examples/Attic/Makefile 2007/08/08 03:10:17 1.10
+++ pkgsrc/ham/gnuradio-examples/Attic/Makefile 2008/03/04 15:51:59 1.11
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.10 2007/08/08 03:10:17 wulf Exp $ 1# $NetBSD: Makefile,v 1.11 2008/03/04 15:51:59 jlam Exp $
2 2
3PKGNAME= gnuradio-examples-${VERSION} 3PKGNAME= gnuradio-examples-${VERSION}
4COMMENT= GUI framework for GNU Radio based on wxPython 4COMMENT= GUI framework for GNU Radio based on wxPython
5COMMENT= Examples for GNU Radio 5COMMENT= Examples for GNU Radio
6 6
 7PKG_DESTDIR_SUPPORT= user-destdir
 8
7.include "../../meta-pkgs/gnuradio/Makefile.common" 9.include "../../meta-pkgs/gnuradio/Makefile.common"
8 10
9CONFIGURE_ARGS+=--enable-gnuradio-examples 11CONFIGURE_ARGS+=--enable-gnuradio-examples
10 12
11EXAMPLE_DIR= ${LOCALBASE}/share/examples/gnuradio/python 13EXAMPLE_DIR= ${LOCALBASE}/share/examples/gnuradio/python
12 14
13PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_explorer/hfx2.py 15PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_explorer/hfx2.py
14PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/radio.py 16PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/radio.py
15PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/ui.py 17PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/ui.py
16PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_copy.py 18PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_copy.py
17PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_fft.py 19PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_fft.py
18PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_play.py 20PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_play.py
19PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_to_file.py 21PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_to_file.py
@@ -84,22 +86,22 @@ PYTHON_PATCH_SCRIPTS+= gnuradio-examples @@ -84,22 +86,22 @@ PYTHON_PATCH_SCRIPTS+= gnuradio-examples
84PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py 86PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py
85PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv.py 87PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv.py
86PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py 88PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
87PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py 89PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
88PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py 90PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
89PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wxapt_rcv.py 91PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
90PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/wfm_rcv_file.py 92PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/usrp/wfm_rcv_file.py
91 93
92do-install: 94do-install:
93 set -e; \ 95 set -e; \
94 cd ${WRKSRC}/gnuradio-examples/python; \ 96 cd ${WRKSRC}/gnuradio-examples/python; \
95 for d in `find * -type d`; \ 97 for d in `find * -type d`; \
96 do \ 98 do \
97 ${INSTALL_SCRIPT_DIR} ${EXAMPLE_DIR}/"$$d"; \ 99 ${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXAMPLE_DIR}/"$$d"; \
98 done; \ 100 done; \
99 for f in `find . \! -name "Makefile*" -type f`; \ 101 for f in `find . \! -name "Makefile*" -type f`; \
100 do \ 102 do \
101 ${INSTALL_SCRIPT} "$$f" ${EXAMPLE_DIR}/"$$f"; \ 103 ${INSTALL_SCRIPT} "$$f" ${DESTDIR}${EXAMPLE_DIR}/"$$f"; \
102 done 104 done
103 105
104.include "../../ham/gnuradio-wxgui/buildlink3.mk" 106.include "../../ham/gnuradio-wxgui/buildlink3.mk"
105.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/ham/locator/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/locator/Makefile 2006/06/01 22:15:59 1.5
+++ pkgsrc/ham/locator/Makefile 2008/03/04 15:51:59 1.6
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile,v 1.5 2006/06/01 22:15:59 joerg Exp $ 1# $NetBSD: Makefile,v 1.6 2008/03/04 15:51:59 jlam Exp $
2# 2#
3 3
4DISTNAME= locator-0.1 4DISTNAME= locator-0.1
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/} 6MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/}
7 7
8MAINTAINER= dawszy@arhea.net 8MAINTAINER= dawszy@arhea.net
9HOMEPAGE= http://www.stauss.purespace.de/ 9HOMEPAGE= http://www.stauss.purespace.de/
10COMMENT= Longitudes, latitudes to HAM locator converter 10COMMENT= Longitudes, latitudes to HAM locator converter
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12NO_CONFIGURE= yes 14NO_CONFIGURE= yes
13 15
14INSTALLATION_DIRS= bin 16INSTALLATION_DIRS= bin
15 17
16USE_LANGUAGES= c++ 18USE_LANGUAGES= c++
17 19
18do-install: 20do-install:
19 ${INSTALL_PROGRAM} ${WRKSRC}/locator ${PREFIX}/bin 21 ${INSTALL_PROGRAM} ${WRKSRC}/locator ${DESTDIR}${PREFIX}/bin
20 22
21.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/ham/wwl/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/wwl/Makefile 2005/06/16 06:57:59 1.6
+++ pkgsrc/ham/wwl/Makefile 2008/03/04 15:51:59 1.7
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:59 jlam Exp $ 1# $NetBSD: Makefile,v 1.7 2008/03/04 15:51:59 jlam Exp $
2# 2#
3 3
4DISTNAME= wwl-1.2 4DISTNAME= wwl-1.2
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= http://www.ibiblio.org/pub/Linux/apps/ham/ 6MASTER_SITES= http://www.ibiblio.org/pub/Linux/apps/ham/
7 7
8MAINTAINER= dawszy@arhea.net 8MAINTAINER= dawszy@arhea.net
9#HOMEPAGE= not known 9#HOMEPAGE= not known
10COMMENT= Calculates distance (qrb) 10COMMENT= Calculates distance (qrb)
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12WRKSRC= ${WRKDIR}/wwl 14WRKSRC= ${WRKDIR}/wwl
13NO_CONFIGURE= yes 15NO_CONFIGURE= yes
14 16
15INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin
16 18
17do-install: 19do-install:
18 ${INSTALL_PROGRAM} ${WRKSRC}/wwl ${PREFIX}/bin 20 ${INSTALL_PROGRAM} ${WRKSRC}/wwl ${DESTDIR}${PREFIX}/bin
19 21
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/ham/yaesu/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/yaesu/Makefile 2006/01/14 11:45:46 1.6
+++ pkgsrc/ham/yaesu/Makefile 2008/03/04 15:51:59 1.7
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2006/01/14 11:45:46 wulf Exp $ 1# $NetBSD: Makefile,v 1.7 2008/03/04 15:51:59 jlam Exp $
2# 2#
3 3
4DISTNAME= yaesu-0.13 4DISTNAME= yaesu-0.13
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/} 6MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/ham/}
7 7
8MAINTAINER= dawszy@arhea.net 8MAINTAINER= dawszy@arhea.net
9#HOMEPAGE= not known 9#HOMEPAGE= not known
10COMMENT= Control interface for Yaesu FT-890 HF transceiver 10COMMENT= Control interface for Yaesu FT-890 HF transceiver
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12WRKSRC= ${WRKDIR}/yaesu 14WRKSRC= ${WRKDIR}/yaesu
13NO_CONFIGURE= yes 15NO_CONFIGURE= yes
14 16
15INSTALLATION_DIRS= bin share/doc 17INSTALLATION_DIRS= bin share/doc
16 18
17do-install: 19do-install:
18 ${INSTALL_PROGRAM} ${WRKSRC}/yaesu ${PREFIX}/bin 20 ${INSTALL_PROGRAM} ${WRKSRC}/yaesu ${DESTDIR}${PREFIX}/bin
19 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/yaesu.README 21 ${INSTALL_DATA} ${WRKSRC}/README \
 22 ${DESTDIR}${PREFIX}/share/doc/yaesu.README
20 23
21.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"