Fri Jan 29 23:54:51 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.14 -r1.15 pkgsrc/ham/tlf/Makefile
diff -r1.5 -r1.6 pkgsrc/ham/tlf/distinfo
diff -r0 -r1.1 pkgsrc/ham/tlf/patches/patch-ab
diff -r0 -r1.1 pkgsrc/ham/tlf/patches/patch-ac
diff -r0 -r1.1 pkgsrc/ham/tlf/patches/patch-ad
diff -r0 -r1.1 pkgsrc/ham/tlf/patches/patch-ae

cvs diff -r1.14 -r1.15 pkgsrc/ham/tlf/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/tlf/Makefile 2006/12/27 06:47:30 1.14
+++ pkgsrc/ham/tlf/Makefile 2010/01/29 23:54:50 1.15
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1# $NetBSD: Makefile,v 1.14 2006/12/27 06:47:30 wulf Exp $ 1# $NetBSD: Makefile,v 1.15 2010/01/29 23:54:50 joerg Exp $
2# 2#
3 3
4DISTNAME= tlf-0.9.30 4DISTNAME= tlf-0.9.30
5CATEGORIES= ham 5CATEGORIES= ham
6MASTER_SITES= http://sharon.pi8zaa.ampr.org/pub/linux/ham/tlf/ 6MASTER_SITES= http://sharon.pi8zaa.ampr.org/pub/linux/ham/tlf/
7 7
8MAINTAINER= wulf@NetBSD.org 8MAINTAINER= wulf@NetBSD.org
9HOMEPAGE= http://home.iae.nl/users/reinc/TLF-0.2.html 9HOMEPAGE= http://home.iae.nl/users/reinc/TLF-0.2.html
10COMMENT= Advanced hamradio logging and contest program 10COMMENT= Advanced hamradio logging and contest program
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12USE_NCURSES= yes 14USE_NCURSES= yes
13USE_TOOLS+= gmake msgfmt 15USE_TOOLS+= gmake msgfmt
14GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
15PTHREAD_OPTS+= require 17PTHREAD_OPTS+= require
16PTHREAD_AUTO_VARS= yes 18PTHREAD_AUTO_VARS= yes
17 19
18CONFIGURE_ARGS+= --enable-hamlib 20CONFIGURE_ARGS+= --enable-hamlib
19 21
 22INSTALLATION_DIRS+= share/tlf
 23
20post-patch: 24post-patch:
21 ${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC:Q}/share/logcfg.dat 25 ${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC:Q}/share/logcfg.dat
22 26
23.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
24 28
25LIBS+= ${LIBOSSAUDIO} 29LIBS+= ${LIBOSSAUDIO}
26 30
27.include "../../mk/curses.buildlink3.mk" 31.include "../../mk/curses.buildlink3.mk"
28.include "../../mk/oss.buildlink3.mk" 32.include "../../mk/oss.buildlink3.mk"
29.include "../../ham/hamlib/buildlink3.mk" 33.include "../../ham/hamlib/buildlink3.mk"
30.include "../../devel/ncurses/buildlink3.mk" 34.include "../../devel/ncurses/buildlink3.mk"
31.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/ham/tlf/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/tlf/distinfo 2006/12/27 06:40:29 1.5
+++ pkgsrc/ham/tlf/distinfo 2010/01/29 23:54:50 1.6
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
1$NetBSD: distinfo,v 1.5 2006/12/27 06:40:29 wulf Exp $ 1$NetBSD: distinfo,v 1.6 2010/01/29 23:54:50 joerg Exp $
2 2
3SHA1 (tlf-0.9.30.tar.gz) = 11e5d694c1b73c746b0d15b3e975f05fd55b7754 3SHA1 (tlf-0.9.30.tar.gz) = 11e5d694c1b73c746b0d15b3e975f05fd55b7754
4RMD160 (tlf-0.9.30.tar.gz) = d7b952fa202dbe1a3061f653b1eb698ea36188e6 4RMD160 (tlf-0.9.30.tar.gz) = d7b952fa202dbe1a3061f653b1eb698ea36188e6
5Size (tlf-0.9.30.tar.gz) = 390608 bytes 5Size (tlf-0.9.30.tar.gz) = 390608 bytes
6SHA1 (patch-aa) = 0587a3f36bf0a6620c70a5d3290d6d5384c8c092 6SHA1 (patch-aa) = 0587a3f36bf0a6620c70a5d3290d6d5384c8c092
 7SHA1 (patch-ab) = 4cb7a8ed026d2a9bfed5dbe3ea6ce3d275ffc621
 8SHA1 (patch-ac) = dca763b7c9da4ed936fe686972d93f139d99c2e7
 9SHA1 (patch-ad) = 8d980f329644f91c2a2b33bd7af9f7f1f75e22c5
 10SHA1 (patch-ae) = 4b9203a3e20bba5a074c681dc6b02f827aceca75

File Added: pkgsrc/ham/tlf/patches/patch-ab
$NetBSD: patch-ab,v 1.1 2010/01/29 23:54:51 joerg Exp $

--- scripts/Makefile.in.orig	2010-01-29 23:48:05.000000000 +0000
+++ scripts/Makefile.in
@@ -284,7 +284,7 @@ uninstall-am: uninstall-info-am
 
 
 install-exec-local:
-	install soundlog $(bindir)
+	install soundlog ${DESTDIR}$(bindir)
 
 uninstall:
 	rm -f $(bindir)/soundlog

File Added: pkgsrc/ham/tlf/patches/patch-ac
$NetBSD: patch-ac,v 1.1 2010/01/29 23:54:51 joerg Exp $

--- share/Makefile.in.orig	2010-01-29 23:48:53.000000000 +0000
+++ share/Makefile.in
@@ -286,14 +286,14 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	install -m 0644 callmaster $(pkgdatadir)
-	install -m 0644 cty.dat $(pkgdatadir)
-	install -m 0644 logcfg.dat $(pkgdatadir)
-	install -m 0644 arrlsections $(pkgdatadir)
-	install -m 0644 ea_sections $(pkgdatadir)
-	install -m 0644 paccmults $(pkgdatadir)
-	install -m 0644 spdxmults $(pkgdatadir)
-	install -m 0644 ssamults $(pkgdatadir)
+	install -m 0644 callmaster ${DESTDIR}$(pkgdatadir)
+	install -m 0644 cty.dat ${DESTDIR}$(pkgdatadir)
+	install -m 0644 logcfg.dat ${DESTDIR}$(pkgdatadir)
+	install -m 0644 arrlsections ${DESTDIR}$(pkgdatadir)
+	install -m 0644 ea_sections ${DESTDIR}$(pkgdatadir)
+	install -m 0644 paccmults ${DESTDIR}$(pkgdatadir)
+	install -m 0644 spdxmults ${DESTDIR}$(pkgdatadir)
+	install -m 0644 ssamults ${DESTDIR}$(pkgdatadir)
 
 uninstall:
 	rm -rf $(pkgdatadir)

File Added: pkgsrc/ham/tlf/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2010/01/29 23:54:51 joerg Exp $

--- rules/Makefile.in.orig	2010-01-29 23:51:09.000000000 +0000
+++ rules/Makefile.in
@@ -445,23 +445,23 @@ uninstall-info: uninstall-info-recursive
 
 
 install-data-local:
-	$(mkinstalldirs) $(pkgdatadir)/rules
-	install -m 0644 arrldx_dx $(pkgdatadir)/rules
-	install -m 0644 arrldx_usa $(pkgdatadir)/rules
-	install -m 0644 arrlfd $(pkgdatadir)/rules
-	install -m 0644 arrlss $(pkgdatadir)/rules
-	install -m 0644 cqww $(pkgdatadir)/rules
-	install -m 0644 dxped $(pkgdatadir)/rules
-	install -m 0644 eusprint $(pkgdatadir)/rules
-	install -m 0644 lzdx $(pkgdatadir)/rules
-	install -m 0644 pacc_pa $(pkgdatadir)/rules
-	install -m 0644 pacc_dx $(pkgdatadir)/rules
-	install -m 0644 qso $(pkgdatadir)/rules
-	install -m 0644 spdx_dx $(pkgdatadir)/rules
-	install -m 0644 spdx_sp $(pkgdatadir)/rules
-	install -m 0644 ssa_mt $(pkgdatadir)/rules
-	install -m 0644 template $(pkgdatadir)/rules
-	install -m 0644 wpx $(pkgdatadir)/rules
+	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 arrldx_dx ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 arrldx_usa ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 arrlfd ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 arrlss ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 cqww ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 dxped ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 eusprint ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 lzdx ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 pacc_pa ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 pacc_dx ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 qso ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 spdx_dx ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 spdx_sp ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 ssa_mt ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 template ${DESTDIR}$(pkgdatadir)/rules
+	install -m 0644 wpx ${DESTDIR}$(pkgdatadir)/rules
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

File Added: pkgsrc/ham/tlf/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2010/01/29 23:54:51 joerg Exp $

--- doc/Makefile.in.orig	2010-01-29 23:52:01.000000000 +0000
+++ doc/Makefile.in
@@ -285,8 +285,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	$(mkinstalldirs) $(pkgdatadir)/doc
-	install -m 0644 README $(pkgdatadir)/doc
+	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/doc
+	install -m 0644 README ${DESTDIR}$(pkgdatadir)/doc
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: