From owner-svn-ports-all@FreeBSD.ORG Mon Mar 24 00:55:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F8F35BB; Mon, 24 Mar 2014 00:55:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B4DDB04; Mon, 24 Mar 2014 00:55:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2O0t6mP093457; Mon, 24 Mar 2014 00:55:06 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2O0t5N1093450; Mon, 24 Mar 2014 00:55:05 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201403240055.s2O0t5N1093450@svn.freebsd.org> From: Marius Strobl Date: Mon, 24 Mar 2014 00:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348916 - in head/sysutils/cdrtools-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Mar 2014 00:55:06 -0000 Author: marius Date: Mon Mar 24 00:55:05 2014 New Revision: 348916 URL: http://svnweb.freebsd.org/changeset/ports/348916 QAT: https://qat.redports.org/buildarchive/r348916/ Log: - Update to 3.01a23. For release notes see: ftp://ftp.berlios.de/pub/cdrecord/alpha/AN-3.01a23 Note that some versions were skipped as they made no net difference for FreeBSD. - Account for the fact that libiconv now may live in base. - Base LDPATH on ${LOCALBASE} rather than ${PREFIX}. - Add staging support based on r347876. Approved by: beat (mentor, implicit) Added: head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd (contents, props changed) Modified: head/sysutils/cdrtools-devel/Makefile head/sysutils/cdrtools-devel/distinfo head/sysutils/cdrtools-devel/files/patch-ad head/sysutils/cdrtools-devel/pkg-plist Modified: head/sysutils/cdrtools-devel/Makefile ============================================================================== --- head/sysutils/cdrtools-devel/Makefile Mon Mar 24 00:52:35 2014 (r348915) +++ head/sysutils/cdrtools-devel/Makefile Mon Mar 24 00:55:05 2014 (r348916) @@ -18,7 +18,7 @@ ########################################################################### PORTNAME= cdrtools -PORTVERSION= 3.01a16 +PORTVERSION= 3.01a23 PORTEPOCH= 1 CATEGORIES= sysutils audio MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ \ @@ -30,10 +30,6 @@ COMMENT= CD/DVD/BluRay and ISO-9660 imag CONFLICTS= cdrkit-* cdrtools-[0-9]* cjk-cdrtools-* -MAN1= btcflash.1 cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1 -MAN8= isoinfo.8 mkisofs.8 -MLINKS= isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \ - mkisofs.8 mkhybrid.8 DOCS= README.FreeBSD README.mkisofs CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO CDRECORDDOCS= README README.ATAPI README.DiskT@2 README.WORM README.audio \ @@ -54,28 +50,25 @@ SICONVTABLES= cp10000 cp10006 cp10007 cp NO_LATEST_LINK= yes USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake #CFLAGS+= -DSOURCE_MODIFIED WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//} SUB_FILES= pkg-message MAKE_JOBS_UNSAFE= yes .if defined(WITH_CDDA2MP3) -MAN1+= cdda2mp3.1 PLIST_SUB+= CDDA2MP3="" RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .else PLIST_SUB+= CDDA2MP3="@comment " .endif .if defined(WITH_CDDA2OGG) -MAN1+= cdda2ogg.1 PLIST_SUB+= CDDA2OGG="" RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .else PLIST_SUB+= CDDA2OGG="@comment " .endif .if defined(WITH_RSCSI) -MAN1+= rscsi.1 PKGINSTALL= ${PKGDIR}/pkg-install.rscsi PLIST_SUB+= RSCSI="" PKGNAMESUFFIX= -rscsi-devel @@ -88,15 +81,14 @@ MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_ INS_RBASE=${LOCALBASE} CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-cc -NO_STAGE= yes OPTIONS_DEFINE= DOCS NLS .include -.if exists(${LOCALBASE}/lib/libiconv.a) || \ +.if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \ exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS} -MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include +MAKE_ENV+= DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib USES+= gettext iconv .endif @@ -137,12 +129,11 @@ post-patch: .if !defined(WITH_RSCSI) @${RM} ${WRKSRC}/TARGETS/55rscsi .endif -.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.1 cdda2wav/cdda2mp3 \ - cdda2wav/cdda2ogg cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 \ - cdrecord/README.rscsi cdrecord/cdrecord.1 cdrecord/cdrecord.dfl \ - include/schily/deflts.h libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c \ - readcd/readcd.1 rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl \ - scgcheck/scgcheck.1 +.for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \ + cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \ + cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \ + rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1 @${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \ s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \ s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \ @@ -161,85 +152,87 @@ post-patch: # ${WRKSRC}/cdrecord/cdrecord.c do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ - ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \ + ${STAGEDIR}${PREFIX}/bin .if defined(WITH_CDDA2MP3) - @${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ - ${PREFIX}/man/man1/cdda2mp3.1 + ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ + ${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1 .endif .if defined(WITH_CDDA2OGG) - @${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 ${PREFIX}/man/man1 -.endif - @${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ - ${PREFIX}/bin - @${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks - @${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ - ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \ + ${STAGEDIR}${PREFIX}/man/man1 +.endif + ${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \ + ${STAGEDIR}${PREFIX}/bin + ${LN} -sf cdda2wav ${STAGEDIR}${PREFIX}/bin/list_audio_tracks + ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \ + ${STAGEDIR}${PREFIX}/bin .for i in devdump isodebug isodump isoinfo isovfy - @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ - ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \ + ${STAGEDIR}${PREFIX}/bin .endfor - @${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ - ${PREFIX}/bin - @${LN} -sf mkisofs ${PREFIX}/bin/mkhybrid - @${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ - ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \ + ${STAGEDIR}${PREFIX}/bin + ${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid + ${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \ + ${STAGEDIR}${PREFIX}/bin .if defined(WITH_RSCSI) - @${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ - ${PREFIX}/sbin - @${CHMOD} u+s ${PREFIX}/sbin/rscsi -.endif - @${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ - ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \ + ${STAGEDIR}${PREFIX}/sbin + ${CHMOD} u+s ${STAGEDIR}${PREFIX}/sbin/rscsi +.endif + ${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1 .if defined(WITH_RSCSI) - @${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1 .endif - @${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8 - @${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8 - @${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ - ${PREFIX}/etc/cdrecord.sample -.if !exists(${PREFIX}/etc/cdrecord) - @${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord + ${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \ + ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ + ${STAGEDIR}${PREFIX}/etc/cdrecord.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/cdrecord) + ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \ + ${STAGEDIR}${PREFIX}/etc/cdrecord .endif - @${MKDIR} ${PREFIX}/lib/siconv + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/siconv .for i in ${SICONVTABLES} - @${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} ${PREFIX}/lib/siconv + ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \ + ${STAGEDIR}${PREFIX}/lib/siconv .endfor .if defined(WITH_RSCSI) - @${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample -.if !exists(${PREFIX}/etc/rscsi) - @${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi + ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \ + ${STAGEDIR}${PREFIX}/etc/rscsi.sample +.if !exists(${STAGEDIR}${PREFIX}/etc/rscsi) + ${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${STAGEDIR}${PREFIX}/etc/rscsi .endif .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor - @${MKDIR} ${DOCSDIR}/cdda2wav + ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdda2wav .for i in ${CDDA2WAVDOCS} - @${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav + ${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${STAGEDIR}${DOCSDIR}/cdda2wav .endfor - @${MKDIR} ${DOCSDIR}/cdrecord + ${MKDIR} ${STAGEDIR}${DOCSDIR}/cdrecord .for i in ${CDRECORDDOCS} - @${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${DOCSDIR}/cdrecord + ${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${STAGEDIR}${DOCSDIR}/cdrecord .endfor - @${MKDIR} ${DOCSDIR}/mkisofs + ${MKDIR} ${STAGEDIR}${DOCSDIR}/mkisofs .for i in ${MKISOFSDOCS} - @${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}/mkisofs + ${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${STAGEDIR}${DOCSDIR}/mkisofs .endfor -.endif - -post-install: - -@if [ -f ${PKGINSTALL} ]; then ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi - @${CAT} ${PKGMESSAGE} .include Modified: head/sysutils/cdrtools-devel/distinfo ============================================================================== --- head/sysutils/cdrtools-devel/distinfo Mon Mar 24 00:52:35 2014 (r348915) +++ head/sysutils/cdrtools-devel/distinfo Mon Mar 24 00:55:05 2014 (r348916) @@ -1,2 +1,2 @@ -SHA256 (cdrtools-3.01a16.tar.bz2) = e10bfc918558ee64f192af9b42e4797e0dac8c1697df0321f3568bf210ee954d -SIZE (cdrtools-3.01a16.tar.bz2) = 2058899 +SHA256 (cdrtools-3.01a23.tar.bz2) = 92c5044d075739edbeaf7c63db2b0a4313b3d726a4b16d71410e6e062c3afc36 +SIZE (cdrtools-3.01a23.tar.bz2) = 2068254 Added: head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd Mon Mar 24 00:55:05 2014 (r348916) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 ++++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 +@@ -29,8 +29,8 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-DEFOSINCDIRS= /usr/local/include +-LDPATH= -L/opt/schily/lib -L/usr/local/lib ++#DEFOSINCDIRS= /usr/local/include ++#LDPATH= -L/opt/schily/lib -L/usr/local/lib + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work + + ########################################################################### Modified: head/sysutils/cdrtools-devel/files/patch-ad ============================================================================== --- head/sysutils/cdrtools-devel/files/patch-ad Mon Mar 24 00:52:35 2014 (r348915) +++ head/sysutils/cdrtools-devel/files/patch-ad Mon Mar 24 00:55:05 2014 (r348916) @@ -17,19 +17,19 @@ --- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 +++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -20,8 +20,9 @@ +@@ -22,8 +22,9 @@ ########################################################################### - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) -CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) -C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) +XCFLAGS:= $(CFLAGS) +CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) +C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) COPTS= -@@ -29,12 +30,10 @@ +@@ -31,12 +32,10 @@ CWOPTS= -Wall -Wtraditional CWOPTS= -Wall -Wno-unknown-pragmas \ -Wshadow -Wmissing-prototypes -Wstrict-prototypes @@ -42,21 +42,33 @@ C++OPTDYN= -fpic C++OPTGPROF= -pg -@@ -54,18 +53,17 @@ +@@ -56,28 +55,18 @@ FLOAT_OPTIONS= --CC_COM= gcc --CC++_COM= g++ -+CC_COM= $(CC) -+CC++_COM= $(CXX) - --CC= @echo " ==> COMPILING \"$@\""; $(CC_COM) +-__CC_COM= $(_UNIQ)$(CC) +-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) +-CC_COM= $(___CC_COM:$(_UNIQ)%=%) +- +-__CC++_COM= $(_UNIQ)$(CCC) +-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) +-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) +- +-CC_COM_DEF= gcc +-CC++_COM_DEF= g++ +-CC= $(CC_COM_DEF) +-CCC= $(CC++_COM_DEF) +- +-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) -CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) -LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) -LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) -DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) -DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) ++CC_COM= $(CC) ++CC++_COM= $(CXX) ++ ++CCCC = $(CC_COM) +CC++ = $(CC++_COM) +LDCC= $(CC_COM) +LDCC++ = $(CC++_COM) Modified: head/sysutils/cdrtools-devel/pkg-plist ============================================================================== --- head/sysutils/cdrtools-devel/pkg-plist Mon Mar 24 00:52:35 2014 (r348915) +++ head/sysutils/cdrtools-devel/pkg-plist Mon Mar 24 00:55:05 2014 (r348916) @@ -1,6 +1,8 @@ bin/btcflash %%CDDA2MP3%%bin/cdda2mp3 %%CDDA2OGG%%bin/cdda2ogg +%%CDDA2MP3%%man/man1/cdda2mp3.1.gz +%%CDDA2OGG%%man/man1/cdda2ogg.1.gz bin/cdda2wav bin/cdrecord bin/devdump @@ -61,6 +63,13 @@ lib/siconv/iso8859-8 lib/siconv/iso8859-9 lib/siconv/koi8-r lib/siconv/koi8-u +man/man1/btcflash.1.gz +man/man1/cdda2wav.1.gz +man/man1/cdrecord.1.gz +man/man1/readcd.1.gz +man/man1/scgcheck.1.gz +man/man8/isoinfo.8.gz +man/man8/mkisofs.8.gz @dirrm lib/siconv %%RSCSI%%sbin/rscsi %%RSCSI%%@exec chmod u+s %B/%f @@ -72,6 +81,7 @@ etc/cdrecord.sample %%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi %%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi %%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi +%%RSCSI%%man/man1/rscsi.1.gz %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD %%PORTDOCS%%%%DOCSDIR%%/README.mkisofs %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ