Tue Dec 29 05:06:06 2015 UTC ()
pkglint.


(dholland)
diff -r1.35 -r1.36 pkgsrc/sysutils/cdrdao/Makefile
diff -r1.12 -r1.13 pkgsrc/sysutils/cdrdao/Makefile.common
cvs diff -r1.35 -r1.36 pkgsrc/sysutils/cdrdao/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrdao/Makefile 2012/10/23 19:50:54 1.35
+++ pkgsrc/sysutils/cdrdao/Makefile 2015/12/29 05:06:06 1.36
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Makefile,v 1.35 2012/10/23 19:50:54 asau Exp $ 1# $NetBSD: Makefile,v 1.36 2015/12/29 05:06:06 dholland Exp $
2 2
3.include "../../sysutils/cdrdao/Makefile.common" 3.include "../../sysutils/cdrdao/Makefile.common"
4 4
5PKGREVISION= 1 5PKGREVISION= 1
6 6
7PKGNAME= cdrdao-${CDRDAO_VER} 7PKGNAME= cdrdao-${CDRDAO_VER}
8 8
9COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode 9COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
10 10
11CONFIGURE_ARGS+= --without-xdao 11CONFIGURE_ARGS+= --without-xdao
12 12
13.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" 13.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
14CONFIGURE_ARGS+= --without-posix-threads 14CONFIGURE_ARGS+= --without-posix-threads
15.endif 15.endif
16 16
 17INSTALLATION_DIRS+= share/doc/cdrdao/testtocs \
 18 share/examples/cdrdao/psxcopy
 19
17post-install: 20post-install:
18 ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao 
19 ${INSTALL_MAN} ${WRKSRC}/README \ 21 ${INSTALL_MAN} ${WRKSRC}/README \
20 ${WRKSRC}/README.PlexDAE \ 22 ${WRKSRC}/README.PlexDAE \
21 ${DESTDIR}${PREFIX}/share/doc/cdrdao 23 ${DESTDIR}${PREFIX}/share/doc/cdrdao
22 ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs 
23 ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \ 24 ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \
24 ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs 25 ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
25 ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao 
26 ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \ 26 ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \
27 ${DESTDIR}${PREFIX}/share/examples/cdrdao 27 ${DESTDIR}${PREFIX}/share/examples/cdrdao
28 ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy 
29 ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \ 28 ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
30 ${WRKSRC}/contrib/psxcopy-0.2/README \ 29 ${WRKSRC}/contrib/psxcopy-0.2/README \
31 ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \ 30 ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
32 ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \ 31 ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \
33 ${WRKSRC}/contrib/psxcopy-0.2/read-psx \ 32 ${WRKSRC}/contrib/psxcopy-0.2/read-psx \
34 ${WRKSRC}/contrib/psxcopy-0.2/write-psx \ 33 ${WRKSRC}/contrib/psxcopy-0.2/write-psx \
35 ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy 34 ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy
36 ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \ 35 ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
37 ${DESTDIR}${PREFIX}/share/examples/cdrdao 36 ${DESTDIR}${PREFIX}/share/examples/cdrdao
38 37
39.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/cdrdao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrdao/Makefile.common 2014/10/09 14:06:57 1.12
+++ pkgsrc/sysutils/cdrdao/Makefile.common 2015/12/29 05:06:06 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.12 2014/10/09 14:06:57 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.13 2015/12/29 05:06:06 dholland Exp $
2# 2#
3# used by sysutils/cdrdao/Makefile 3# used by sysutils/cdrdao/Makefile
4# used by sysutils/gcdmaster/Makefile 4# used by sysutils/gcdmaster/Makefile
5 5
6DISTNAME= cdrdao-${CDRDAO_VER} 6DISTNAME= cdrdao-${CDRDAO_VER}
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= david@maxwell.net 11MAINTAINER= david@maxwell.net
12HOMEPAGE= http://cdrdao.sourceforge.net/ 12HOMEPAGE= http://cdrdao.sourceforge.net/
13COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode 13COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
14 14
@@ -33,23 +33,23 @@ CONFIGURE_ARGS+=--with-scglib @@ -33,23 +33,23 @@ CONFIGURE_ARGS+=--with-scglib
33.endif 33.endif
34 34
35.if !empty(CC:M*gcc*) 35.if !empty(CC:M*gcc*)
36MAKE_ENV+= CCOM=gcc 36MAKE_ENV+= CCOM=gcc
37.endif 37.endif
38 38
39# override ARCH to avoid picking up a bad ${ARCH} during the build 39# override ARCH to avoid picking up a bad ${ARCH} during the build
40MAKE_ENV+= ARCH="" 40MAKE_ENV+= ARCH=""
41 41
42post-extract: 42post-extract:
43 ${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id 43 ${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id
44 44
45post-configure: 45post-configure:
46 cd ${WRKSRC}/scsilib/RULES ; \ 46 set -e; cd ${WRKSRC}/scsilib/RULES ; \
47 ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \ 47 ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
48 ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \ 48 ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
49 ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \ 49 ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
50 ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul; 50 ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
51 51
52.include "../../audio/libao/buildlink3.mk" 52.include "../../audio/libao/buildlink3.mk"
53.include "../../audio/libmad/buildlink3.mk" 53.include "../../audio/libmad/buildlink3.mk"
54.include "../../audio/libvorbis/buildlink3.mk" 54.include "../../audio/libvorbis/buildlink3.mk"
55.include "../../devel/pccts/buildlink3.mk" 55.include "../../devel/pccts/buildlink3.mk"