Fri Aug 26 13:39:55 2011 UTC ()
Fix build failure on Solaris-10 with gcc. PR 45287.


(cheusov)
diff -r1.81 -r1.82 pkgsrc/sysutils/cdrtools/Makefile
cvs diff -r1.81 -r1.82 pkgsrc/sysutils/cdrtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/Makefile 2011/07/12 13:32:25 1.81
+++ pkgsrc/sysutils/cdrtools/Makefile 2011/08/26 13:39:55 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.81 2011/07/12 13:32:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.82 2011/08/26 13:39:55 cheusov Exp $
2 2
3DISTNAME= cdrtools-3.01a05 3DISTNAME= cdrtools-3.01a05
4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/} 4PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6#MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \ 6#MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
7# http://ftp.berlios.de/pub/cdrecord/ 7# http://ftp.berlios.de/pub/cdrecord/
8MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ \ 8MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
9 http://ftp.berlios.de/pub/cdrecord/alpha/ 9 http://ftp.berlios.de/pub/cdrecord/alpha/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= wiz@NetBSD.org 12MAINTAINER= wiz@NetBSD.org
13HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html 13HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
14COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray 14COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
@@ -29,31 +29,29 @@ CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION @@ -29,31 +29,29 @@ CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION
29LDFLAGS.NetBSD+= -lutil 29LDFLAGS.NetBSD+= -lutil
30 30
31# avoid picking up a bad ${ARCH} during the build 31# avoid picking up a bad ${ARCH} during the build
32MAKE_ENV+= ARCH="" 32MAKE_ENV+= ARCH=""
33MAKE_ENV+= MAKEPROG="gmake" 33MAKE_ENV+= MAKEPROG="gmake"
34MAKE_ENV+= COPTX=${CFLAGS:Q} 34MAKE_ENV+= COPTX=${CFLAGS:Q}
35MAKE_ENV+= LDOPTX=${LDFLAGS:Q} 35MAKE_ENV+= LDOPTX=${LDFLAGS:Q}
36MAKE_ENV+= INS_BASE=${PREFIX:Q} 36MAKE_ENV+= INS_BASE=${PREFIX:Q}
37MAKE_FLAGS+= GMAKE_NOWARN=true 37MAKE_FLAGS+= GMAKE_NOWARN=true
38# do we want to compile shared libraries? 38# do we want to compile shared libraries?
39# needs changes in the install target and PLIST 39# needs changes in the install target and PLIST
40#MAKE_ENV+= LINKMODE=dynamic 40#MAKE_ENV+= LINKMODE=dynamic
41 41
42# if we're using a gcc which is named gcc, we need to set CCOM=gcc 42# Map PKGSRC_COMPILER to CCOM used by cdrtools build system.
43# in MAKE_ENV so the make infrastructure picks the right options. 43ccmap.gcc= gcc
44.if !empty(CC:M*gcc*) 44MAKE_FLAGS+= CCOM=${ccmap.${PKGSRC_COMPILER}:Ucc}
45MAKE_ENV+= CCOM="gcc" 
46.endif 
47 45
48# allow us to override the default /etc/default/cdrecord by patching 46# allow us to override the default /etc/default/cdrecord by patching
49# the documentation appropriately. Additionally, we also provide a 47# the documentation appropriately. Additionally, we also provide a
50# MESSAGE stating the reasons we do this, as required by the license. 48# MESSAGE stating the reasons we do this, as required by the license.
51CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf 49CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
52 50
53.if ${CDRECORD_CONF} != "/etc/default/cdrecord" 51.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
54MESSAGE_SRC+= MESSAGE.cdrecord.conf 52MESSAGE_SRC+= MESSAGE.cdrecord.conf
55MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} 53MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
56MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q} 54MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q}
57.endif 55.endif
58 56
59CONF_FILES+= share/examples/cdrtools/cdrecord ${CDRECORD_CONF} 57CONF_FILES+= share/examples/cdrtools/cdrecord ${CDRECORD_CONF}