Thu Sep 3 14:43:34 2015 UTC ()
Update to 3.01, based on diff by Frederik in private mail.

NEW features of cdrtools-3.01:

This is the first localization step for cdrtools. All programs now (hopefully)
call gettext() for all strings that need localization.

-	The next step will include dgettext() calls for the libraries.

-	The following step will include the extracted strings

-	The last step will include German translations and install support
	for the resulting binary message object files.


(wiz)
diff -r1.112 -r1.113 pkgsrc/sysutils/cdrtools/Makefile
diff -r1.86 -r1.87 pkgsrc/sysutils/cdrtools/distinfo

cvs diff -r1.112 -r1.113 pkgsrc/sysutils/cdrtools/Makefile (switch to unified diff)

--- pkgsrc/sysutils/cdrtools/Makefile 2015/07/14 09:29:58 1.112
+++ pkgsrc/sysutils/cdrtools/Makefile 2015/09/03 14:43:34 1.113
@@ -1,156 +1,156 @@ @@ -1,156 +1,156 @@
1# $NetBSD: Makefile,v 1.112 2015/07/14 09:29:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.113 2015/09/03 14:43:34 wiz Exp $
2 2
3DISTNAME= cdrtools-3.01a30 3DISTNAME= cdrtools-3.01
4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/} 4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://cdrtools.sourceforge.net/private/cdrecord.html 10HOMEPAGE= http://cdrtools.sourceforge.net/private/cdrecord.html
11COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray 11COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
12#LICENSE= CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1 12#LICENSE= CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1
13 13
14CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]* 14CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME:C/a[0-9]*//} 16WRKSRC= ${WRKDIR}/${DISTNAME:C/a[0-9]*//}
17 17
18MAKE_JOBS_SAFE= no # makefiles.5 18MAKE_JOBS_SAFE= no # makefiles.5
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22USE_TOOLS+= gm4 gmake tbl 22USE_TOOLS+= gm4 gmake tbl
23 23
24CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION 24CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION
25LDFLAGS.NetBSD+= -lutil 25LDFLAGS.NetBSD+= -lutil
26 26
27LDFLAGS+= ${BUILDLINK_LDADD.iconv} 27LDFLAGS+= ${BUILDLINK_LDADD.iconv}
28 28
29# NetBSD 6.0 (and update releases) have incomplete implemenations of the 29# NetBSD 6.0 (and update releases) have incomplete implemenations of the
30# "*at" system calls. Pretend that they aren't present at all to 30# "*at" system calls. Pretend that they aren't present at all to
31# avoid build failures. 31# avoid build failures.
32.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \ 32.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
33 empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*) 33 empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
34. for func in faccessat fchmodat fchownat fexecve fstatat linkat mkdirat \ 34. for func in faccessat fchmodat fchownat fexecve fstatat linkat mkdirat \
35 mkfifoat mknodat openat readlinkat renameat symlinkat unlinkat \ 35 mkfifoat mknodat openat readlinkat renameat symlinkat unlinkat \
36 utimensat 36 utimensat
37CONFIGURE_ENV+= ac_cv_func_${func}=no 37CONFIGURE_ENV+= ac_cv_func_${func}=no
38. endfor 38. endfor
39.endif 39.endif
40 40
41# avoid picking up a bad ${ARCH} during the build 41# avoid picking up a bad ${ARCH} during the build
42MAKE_ENV+= ARCH="" 42MAKE_ENV+= ARCH=""
43MAKE_ENV+= MAKEPROG="gmake" 43MAKE_ENV+= MAKEPROG="gmake"
44MAKE_ENV+= COPTX=${CFLAGS:Q} 44MAKE_ENV+= COPTX=${CFLAGS:Q}
45MAKE_ENV+= LDOPTX=${LDFLAGS:Q} 45MAKE_ENV+= LDOPTX=${LDFLAGS:Q}
46MAKE_ENV+= INS_BASE=${PREFIX:Q} 46MAKE_ENV+= INS_BASE=${PREFIX:Q}
47MAKE_FLAGS+= GMAKE_NOWARN=true 47MAKE_FLAGS+= GMAKE_NOWARN=true
48# do we want to compile shared libraries? 48# do we want to compile shared libraries?
49# needs changes in the install target and PLIST 49# needs changes in the install target and PLIST
50#MAKE_ENV+= LINKMODE=dynamic 50#MAKE_ENV+= LINKMODE=dynamic
51 51
52# Map PKGSRC_COMPILER to CCOM used by cdrtools build system. 52# Map PKGSRC_COMPILER to CCOM used by cdrtools build system.
53ccmap.gcc= gcc 53ccmap.gcc= gcc
54MAKE_FLAGS+= CCOM=${ccmap.${PKGSRC_COMPILER}:Ucc} 54MAKE_FLAGS+= CCOM=${ccmap.${PKGSRC_COMPILER}:Ucc}
55 55
56# allow us to override the default /etc/default/cdrecord by patching 56# allow us to override the default /etc/default/cdrecord by patching
57# the documentation appropriately. Additionally, we also provide a 57# the documentation appropriately. Additionally, we also provide a
58# MESSAGE stating the reasons we do this, as required by the license. 58# MESSAGE stating the reasons we do this, as required by the license.
59CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf 59CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
60 60
61.if ${CDRECORD_CONF} != "/etc/default/cdrecord" 61.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
62MESSAGE_SRC+= MESSAGE.cdrecord.conf 62MESSAGE_SRC+= MESSAGE.cdrecord.conf
63MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} 63MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
64MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q} 64MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q}
65.endif 65.endif
66 66
67CONF_FILES+= share/examples/cdrtools/cdrecord ${CDRECORD_CONF} 67CONF_FILES+= share/examples/cdrtools/cdrecord ${CDRECORD_CONF}
68 68
69INSTALLATION_DIRS= bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \ 69INSTALLATION_DIRS= bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
70 share/doc/cdrtools/cdda2wav \ 70 share/doc/cdrtools/cdda2wav \
71 share/doc/cdrtools/cdrecord \ 71 share/doc/cdrtools/cdrecord \
72 share/doc/cdrtools/mkisofs \ 72 share/doc/cdrtools/mkisofs \
73 share/examples/cdrtools 73 share/examples/cdrtools
74 74
75SUBST_CLASSES+= fix 75SUBST_CLASSES+= fix
76SUBST_STAGE.fix= post-patch 76SUBST_STAGE.fix= post-patch
77SUBST_FILES.fix= btcflash/btcflash.1 77SUBST_FILES.fix= btcflash/btcflash.1
78SUBST_FILES.fix+= cdrecord/cdrecord.1 78SUBST_FILES.fix+= cdrecord/cdrecord.1
79SUBST_FILES.fix+= libcdrdeflt/cdrdeflt.c 79SUBST_FILES.fix+= libcdrdeflt/cdrdeflt.c
80SUBST_FILES.fix+= mkisofs/diag/isoinfo.8 80SUBST_FILES.fix+= mkisofs/diag/isoinfo.8
81SUBST_FILES.fix+= readcd/readcd.1 81SUBST_FILES.fix+= readcd/readcd.1
82SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g" 82SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
83SUBST_MESSAGE.fix= Fixing paths. 83SUBST_MESSAGE.fix= Fixing paths.
84 84
85SUBST_CLASSES+= oss 85SUBST_CLASSES+= oss
86SUBST_STAGE.oss= post-patch 86SUBST_STAGE.oss= post-patch
87SUBST_FILES.oss= cdda2wav/local.cnf.in 87SUBST_FILES.oss= cdda2wav/local.cnf.in
88SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSSOUND},g" 88SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSSOUND},g"
89SUBST_MESSAGE.oss= Fixing OSS sound device path. 89SUBST_MESSAGE.oss= Fixing OSS sound device path.
90 90
91SUBST_CLASSES+= ins_base 91SUBST_CLASSES+= ins_base
92SUBST_STAGE.ins_base= pre-configure 92SUBST_STAGE.ins_base= pre-configure
93SUBST_FILES.ins_base= DEFAULTS/Defaults.* 93SUBST_FILES.ins_base= DEFAULTS/Defaults.*
94SUBST_SED.ins_base= -e "/^INS_BASE=/d" 94SUBST_SED.ins_base= -e "/^INS_BASE=/d"
95SUBST_MESSAGE.ins_base= Fixing INS_BASE. 95SUBST_MESSAGE.ins_base= Fixing INS_BASE.
96 96
97do-configure: 97do-configure:
98 cd ${WRKSRC}/RULES; \ 98 cd ${WRKSRC}/RULES; \
99 for suffix in netbsd-cc.rul netbsd-gcc.rul; do \ 99 for suffix in netbsd-cc.rul netbsd-gcc.rul; do \
100 if [ ! -f ${MACHINE}-$$suffix ]; then \ 100 if [ ! -f ${MACHINE}-$$suffix ]; then \
101 ln -sf i386-$$suffix ${MACHINE}-$$suffix; \ 101 ln -sf i386-$$suffix ${MACHINE}-$$suffix; \
102 fi; \ 102 fi; \
103 done; \ 103 done; \
104 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config 104 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
105 105
106post-build: 106post-build:
107 cd ${WRKSRC}; \ 107 cd ${WRKSRC}; \
108 for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \ 108 for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \
109 tbl $${manpage} > $${manpage}.tmp; \ 109 tbl $${manpage} > $${manpage}.tmp; \
110 mv -f $${manpage}.tmp $${manpage}; \ 110 mv -f $${manpage}.tmp $${manpage}; \
111 done 111 done
112 112
113do-install: 113do-install:
114 for program in btcflash cdda2wav cdrecord mkisofs \ 114 for program in btcflash cdda2wav cdrecord mkisofs \
115 readcd scgcheck scgskeleton; do \ 115 readcd scgcheck scgskeleton; do \
116 cd ${WRKSRC}/$${program}; \ 116 cd ${WRKSRC}/$${program}; \
117 ${INSTALL_PROGRAM} OBJ/*/$${program} \ 117 ${INSTALL_PROGRAM} OBJ/*/$${program} \
118 ${DESTDIR}${PREFIX}/bin; \ 118 ${DESTDIR}${PREFIX}/bin; \
119 done 119 done
120 for program in cdda2mp3 cdda2ogg; do \ 120 for program in cdda2mp3 cdda2ogg; do \
121 ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/$${program} \ 121 ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/$${program} \
122 ${DESTDIR}${PREFIX}/bin; \ 122 ${DESTDIR}${PREFIX}/bin; \
123 ${INSTALL_MAN} ${WRKSRC}/cdda2wav/$${program}.1 \ 123 ${INSTALL_MAN} ${WRKSRC}/cdda2wav/$${program}.1 \
124 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 124 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
125 done 125 done
126 for program in btcflash cdda2wav cdrecord \ 126 for program in btcflash cdda2wav cdrecord \
127 readcd scgcheck; do \ 127 readcd scgcheck; do \
128 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 \ 128 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 \
129 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 129 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
130 done 130 done
131 for program in mkisofs; do \ 131 for program in mkisofs; do \
132 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \ 132 ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \
133 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \ 133 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \
134 done 134 done
135 cd ${WRKSRC}/mkisofs/diag; \ 135 cd ${WRKSRC}/mkisofs/diag; \
136 for f in devdump isodebug isodump isoinfo isovfy; do \ 136 for f in devdump isodebug isodump isoinfo isovfy; do \
137 ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \ 137 ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \
138 ${INSTALL_MAN} $$f.8 \ 138 ${INSTALL_MAN} $$f.8 \
139 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \ 139 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
140 done 140 done
141 ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \ 141 ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
142 ${DESTDIR}${PREFIX}/lib/siconv 142 ${DESTDIR}${PREFIX}/lib/siconv
143 ${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk 143 ${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk
144 ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \ 144 ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
145 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav 145 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav
146 ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \ 146 ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
147 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord 147 ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord
148 ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \ 148 ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
149 ${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs 149 ${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs
150 ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ 150 ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
151 ${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord 151 ${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord
152 152
153.include "../../converters/libiconv/buildlink3.mk" 153.include "../../converters/libiconv/buildlink3.mk"
154.include "../../devel/gettext-lib/buildlink3.mk" 154.include "../../devel/gettext-lib/buildlink3.mk"
155.include "../../mk/oss.buildlink3.mk" 155.include "../../mk/oss.buildlink3.mk"
156.include "../../mk/bsd.pkg.mk" 156.include "../../mk/bsd.pkg.mk"

cvs diff -r1.86 -r1.87 pkgsrc/sysutils/cdrtools/distinfo (switch to unified diff)

--- pkgsrc/sysutils/cdrtools/distinfo 2015/07/14 09:29:58 1.86
+++ pkgsrc/sysutils/cdrtools/distinfo 2015/09/03 14:43:34 1.87
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.86 2015/07/14 09:29:58 wiz Exp $ 1$NetBSD: distinfo,v 1.87 2015/09/03 14:43:34 wiz Exp $
2 2
3SHA1 (cdrtools-3.01a30.tar.bz2) = 9849e402db9bb4cce7f872b53d5a5194fd4c073e 3SHA1 (cdrtools-3.01.tar.bz2) = 62766aa9bfeec91b3c78da7c59b5c96bfbec84d9
4RMD160 (cdrtools-3.01a30.tar.bz2) = 371b4318f7736720c94d9f9630c90609f3eeba8e 4RMD160 (cdrtools-3.01.tar.bz2) = 3696b1bc502905cbe7c06e492b42d2ffe2dba982
5Size (cdrtools-3.01a30.tar.bz2) = 2097525 bytes 5Size (cdrtools-3.01.tar.bz2) = 2087416 bytes