aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cdrtools-devel/Makefile4
-rw-r--r--sysutils/cdrtools-devel/pkg-plist16
2 files changed, 4 insertions, 16 deletions
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 9edfaab19b59..1a3c9ddbbe32 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -49,8 +49,7 @@ SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \
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
diff --git a/sysutils/cdrtools-devel/pkg-plist b/sysutils/cdrtools-devel/pkg-plist
index 5848fa95e5f3..6430678bce42 100644
--- a/sysutils/cdrtools-devel/pkg-plist
+++ b/sysutils/cdrtools-devel/pkg-plist
@@ -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%%