Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Oct 2014 21:57:13 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r370671 - head/sysutils/cdrtools-devel
Message-ID:  <201410112157.s9BLvDTS012093@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Sat Oct 11 21:57:12 2014
New Revision: 370671
URL: https://svnweb.freebsd.org/changeset/ports/370671
QAT: https://qat.redports.org/buildarchive/r370671/

Log:
  - Convert USE_BZIP2 to USES
  - Modernize plist
  
  Approved by:	portmgr blanket

Modified:
  head/sysutils/cdrtools-devel/Makefile
  head/sysutils/cdrtools-devel/pkg-plist

Modified: head/sysutils/cdrtools-devel/Makefile
==============================================================================
--- head/sysutils/cdrtools-devel/Makefile	Sat Oct 11 21:42:10 2014	(r370670)
+++ head/sysutils/cdrtools-devel/Makefile	Sat Oct 11 21:57:12 2014	(r370671)
@@ -49,8 +49,7 @@ SICONVTABLES=	cp10000 cp10006 cp10007 cp
 		iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u
 
 NO_LATEST_LINK=	yes
-USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake tar:bzip2
 #CFLAGS+=	-DSOURCE_MODIFIED
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a(.+)$//}
 SUB_FILES=	pkg-message
@@ -181,7 +180,6 @@ do-install:
 .if defined(WITH_RSCSI)
 	${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

Modified: head/sysutils/cdrtools-devel/pkg-plist
==============================================================================
--- head/sysutils/cdrtools-devel/pkg-plist	Sat Oct 11 21:42:10 2014	(r370670)
+++ head/sysutils/cdrtools-devel/pkg-plist	Sat Oct 11 21:57:12 2014	(r370671)
@@ -70,15 +70,9 @@ 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
-@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi
-etc/cdrecord.sample
-@exec [ -f %B/cdrecord ] || cp %B/%f %B/cdrecord
-%%RSCSI%%@unexec if cmp -s %D/etc/rscsi.sample %D/etc/rscsi; then rm -f %D/etc/rscsi; else echo "If permanently deleting this package, %D/etc/rscsi must be removed manually."; fi
-%%RSCSI%%etc/rscsi.sample
-%%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi
+%%RSCSI%%@(,,4555) sbin/rscsi
+@sample etc/cdrecord.sample
+%%RSCSI%%@sample etc/rscsi.sample
 %%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
@@ -91,7 +85,6 @@ etc/cdrecord.sample
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/README
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2
@@ -107,7 +100,6 @@ etc/cdrecord.sample
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony
 %%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdrecord
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito
@@ -124,5 +116,3 @@ etc/cdrecord.sample
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sort
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sparcboot
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sunx86boot
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mkisofs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410112157.s9BLvDTS012093>