pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools sysutils/cdrtools: Update to 3.02a10
details: https://anonhg.NetBSD.org/pkgsrc/rev/20a996568267
branches: trunk
changeset: 770591:20a996568267
user: micha <micha%pkgsrc.org@localhost>
date: Fri Dec 03 15:13:26 2021 +0000
description:
sysutils/cdrtools: Update to 3.02a10
Rebase to final Schily Tools release 2021-09-18.
Unknown changes because the package formerly based on separate cdrtools
releases (that are not available for recent versions).
diffstat:
sysutils/cdrtools/DESCR | 4 +
sysutils/cdrtools/MESSAGE.SunOS | 9 -
sysutils/cdrtools/MESSAGE.cdrecord.conf | 14 -
sysutils/cdrtools/Makefile | 183 ++++++++-------------
sysutils/cdrtools/PLIST | 3 +-
sysutils/cdrtools/distinfo | 9 +-
sysutils/cdrtools/files/INSTALL.pkgsrc | 14 +
sysutils/cdrtools/patches/patch-cdda2wav-setuid.c | 50 ------
8 files changed, 96 insertions(+), 190 deletions(-)
diffs (truncated from 378 to 300 lines):
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/DESCR
--- a/sysutils/cdrtools/DESCR Fri Dec 03 13:44:01 2021 +0000
+++ b/sysutils/cdrtools/DESCR Fri Dec 03 15:13:26 2021 +0000
@@ -9,3 +9,7 @@
This package also provides tools for retrieving audio tracks,
reading and writing CDs, DVDs, and Blu-ray discs, creating
ISO9660/JOLIET/HFS filesystems, and verifying ISO9660 images.
+
+Note:
+This package is based on the final Schily Tools release 2021-09-18,
+not a dedicated cdrtools release.
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/MESSAGE.SunOS
--- a/sysutils/cdrtools/MESSAGE.SunOS Fri Dec 03 13:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
-
-You will need to stop Solaris volume management before using
-${PKGNAME_NOREV}:
-
- /etc/init.d/volmgt stop
-
-===========================================================================
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/MESSAGE.cdrecord.conf
--- a/sysutils/cdrtools/MESSAGE.cdrecord.conf Fri Dec 03 13:44:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.cdrecord.conf,v 1.1.1.1 2006/01/05 23:27:59 wiz Exp $
-
-Note: The location of the ${PKGNAME_NOREV} `defaults' file has been set to
-
- ${CDRECORD_CONF}
-
-This is the pkgsrc standard config file location, NOT the ${PKGNAME_NOREV}
-standard location, which is /etc/default/cdrecord.
-
-The reason for this is that pkgsrc packages should not use configuration
-files outside ${LOCALBASE} unless they are explicitly set by the user.
-
-===========================================================================
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile Fri Dec 03 13:44:01 2021 +0000
+++ b/sysutils/cdrtools/Makefile Fri Dec 03 15:13:26 2021 +0000
@@ -1,126 +1,85 @@
-# $NetBSD: Makefile,v 1.122 2020/04/14 12:47:34 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2021/12/03 15:13:26 micha Exp $
-DISTNAME= cdrtools-3.01
-PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/}
-PKGREVISION= 1
+DISTNAME= schily-2021-09-18
+PKGNAME= cdrtools-3.02a10
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrtools/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=schilytools/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://cdrtools.sourceforge.net/private/cdrecord.html
+HOMEPAGE= https://sourceforge.net/projects/schilytools/
COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
-#LICENSE= CDDL.Schily.txt AND gnu-gpl-v2 AND gnu-lgpl-v2.1
+LICENSE= cddl-1.0 AND gnu-gpl-v2 AND gnu-lgpl-v2.1 AND 2-clause-bsd
-CONFLICTS= mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
-
-WRKSRC= ${WRKDIR}/${DISTNAME:C/a[0-9]*//}
-
-MAKE_JOBS_SAFE= no # makefiles.5
+MAKE_JOBS_SAFE= no
.include "../../mk/bsd.prefs.mk"
-USE_TOOLS+= gm4 gmake tbl
-
-CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION
-LDFLAGS.NetBSD+= -lutil
-
-LDFLAGS+= ${BUILDLINK_LDADD.iconv}
-
-# NetBSD 6.0 (and update releases) have incomplete implemenations of the
-# "*at" system calls. Pretend that they aren't present at all to
-# avoid build failures.
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
- empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
-. for func in faccessat fchmodat fchownat fexecve fstatat linkat mkdirat \
- mkfifoat mknodat openat readlinkat renameat symlinkat unlinkat \
- utimensat
-CONFIGURE_ENV+= ac_cv_func_${func}=no
-. endfor
-.endif
+TOOL_DEPENDS+= smake>=1.3nb11:../../devel/smake
+SMAKE= MAKEFLAGS= smake
+MAKE_FLAGS+= DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
+# Honor CPPFLAGS, CFLAGS and LDFLAGS
+MAKE_FLAGS+= CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX=${CFLAGS:Q}
-MAKE_ENV+= LDOPTX=${LDFLAGS:Q}
-MAKE_ENV+= INS_BASE=${PREFIX:Q}
-MAKE_FLAGS+= GMAKE_NOWARN=true
-# do we want to compile shared libraries?
-# needs changes in the install target and PLIST
-#MAKE_ENV+= LINKMODE=dynamic
-
-# Map PKGSRC_COMPILER to CCOM used by cdrtools build system.
-.if !empty(PKGSRC_COMPILER:Mclang)
-MAKE_FLAGS+= CCOM=clang
-.elif !empty(PKGSRC_COMPILER:Mgcc)
-MAKE_FLAGS+= CCOM=gcc
-.else
-MAKE_FLAGS+= CCOM=cc
-.endif
+# The default location is /etc/default/cdrecord
+# We patch the documentation appropriately. Additionally, we also install
+# INSTALL.pkgsrc stating the reasons we do this, as required by the license.
+CONF_FILES= ${PREFIX}/share/examples/cdrtools/cdrecord ${PKG_SYSCONFDIR}/cdrecord
+SPECIAL_PERMS+= ${PREFIX}/share/examples/cdrtools/cdrecord ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
+AUTO_MKDIRS= yes
-# allow us to override the default /etc/default/cdrecord by patching
-# the documentation appropriately. Additionally, we also provide a
-# MESSAGE stating the reasons we do this, as required by the license.
-CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
-
-.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
-MESSAGE_SRC+= MESSAGE.cdrecord.conf
-MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
-MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q}
-.endif
-
-CONF_FILES+= share/examples/cdrtools/cdrecord ${CDRECORD_CONF}
-
-INSTALLATION_DIRS= bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
- share/doc/cdrtools/cdda2wav \
- share/doc/cdrtools/cdrecord \
- share/doc/cdrtools/mkisofs \
- share/examples/cdrtools
-
+# Configure config file location
SUBST_CLASSES+= fix
SUBST_STAGE.fix= pre-configure
-SUBST_FILES.fix= btcflash/btcflash.1
SUBST_FILES.fix+= cdrecord/cdrecord.1
-SUBST_FILES.fix+= libcdrdeflt/cdrdeflt.c
-SUBST_FILES.fix+= mkisofs/diag/isoinfo.8
-SUBST_FILES.fix+= readcd/readcd.1
-SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
-SUBST_MESSAGE.fix= Fixing paths.
+SUBST_FILES.fix+= cdrecord/cdrecord.dfl
+SUBST_SED.fix= -e "s,/etc/default/cdrecord,${PKG_SYSCONFDIR}/cdrecord,g"
+SUBST_MESSAGE.fix= Replace defaults file paths.
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= pre-configure
-SUBST_FILES.oss= cdda2wav/local.cnf.in
-SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSSOUND},g"
-SUBST_MESSAGE.oss= Fixing OSS sound device path.
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+= install
+SUBST_STAGE.install= post-configure
+SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
+SUBST_SED.install= -e 's,PKGNAME_NOREV,${PKGNAME_NOREV},'
+SUBST_SED.install+= -e 's,CDRECORD_CONF,${PKG_SYSCONFDIR}/cdrecord,'
-SUBST_CLASSES+= ins_base
-SUBST_STAGE.ins_base= pre-configure
-SUBST_FILES.ins_base= DEFAULTS/Defaults.*
-SUBST_SED.ins_base= -e "/^INS_BASE=/d"
-SUBST_MESSAGE.ins_base= Fixing INS_BASE.
+# Shared platform specific code for schilytools (provided by smake package)
+.include "../../devel/smake/Makefile.common"
do-configure:
- cd ${WRKSRC}/RULES; \
- if [ ! -e i386-netbsd-clang.rul ]; then \
- ln -s i386-netbsd-gcc.rul i386-netbsd-clang.rul; \
- fi; \
- for suffix in netbsd-cc.rul netbsd-gcc.rul netbsd-clang.rul; do \
- if [ ! -e ${MACHINE}-$$suffix ]; then \
- ln -s i386-$$suffix ${MACHINE}-$$suffix; \
- fi; \
- done; \
- if [ ! -e x86_64-darwin-clang.rul ]; then \
- ln -s i386-darwin-clang.rul x86_64-darwin-clang.rul; \
+ ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
+ cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
+
+do-build:
+ cd ${WRKSRC} && \
+ for library in libschily libdeflt libcdrdeflt libedc libfile \
+ libfind libhfs_iso libmdigest libscg libscgcmd librscg \
+ libparanoia libsiconv; \
+ do \
+ cd ${WRKSRC}/$${library} && ${SMAKE} ${MAKE_FLAGS}; \
+ done
+ cd ${WRKSRC}/btcflash && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/cdda2wav && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/cdrecord && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/mkisofs && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/mkisofs/diag && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/readcd && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/scgcheck && ${SMAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/scgskeleton && ${SMAKE} ${MAKE_FLAGS}
+
+# Process tables in manpage
+.if !empty(USE_TOOLS:Mtbl)
+post-build:
+ cd ${WRKSRC} && if ${TEST} -f star/pkgsrc_tbl.done; then :; \
+ else \
+ ${TBL} cdda2wav/cdda2wav.1 >cdda2wav/cdda2wav.1.tmp && \
+ ${MV} -f cdda2wav/cdda2wav.1.tmp cdda2wav/cdda2wav.1 && \
+ ${TBL} mkisofs/mkisofs.8 >mkisofs/mkisofs.8.tmp && \
+ ${MV} -f mkisofs/mkisofs.8.tmp mkisofs/mkisofs.8 && \
+ ${TOUCH} star/pkgsrc_tbl.done; \
fi
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
-
-post-build:
- cd ${WRKSRC}; \
- for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \
- tbl $${manpage} > $${manpage}.tmp; \
- mv -f $${manpage}.tmp $${manpage}; \
- done
+.endif
do-install:
for program in btcflash cdda2wav cdrecord mkisofs \
@@ -135,12 +94,12 @@
${INSTALL_MAN} ${WRKSRC}/cdda2wav/$${program}.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
done
- for program in btcflash cdda2wav cdrecord \
- readcd scgcheck; do \
+ for program in btcflash cdda2wav cdrecord \
+ readcd scgcheck; do \
${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
done
- for program in mkisofs; do \
+ for program in mkisofs; do \
${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \
done
@@ -150,17 +109,19 @@
${INSTALL_MAN} $$f.8 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
done
- ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
+ ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
${DESTDIR}${PREFIX}/lib/siconv
${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk
- ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
+ ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav
- ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
+ ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord
- ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
+ ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs
- ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
+ ${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
${DESTDIR}${PREFIX}/share/examples/cdrtools/cdrecord
+ ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
+ ${DESTDIR}${PREFIX}/share/doc/cdrtools/INSTALL.pkgsrc
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/PLIST
--- a/sysutils/cdrtools/PLIST Fri Dec 03 13:44:01 2021 +0000
+++ b/sysutils/cdrtools/PLIST Fri Dec 03 15:13:26 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/02/21 13:19:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/12/03 15:13:26 micha Exp $
bin/btcflash
bin/cdda2mp3
bin/cdda2ogg
@@ -74,6 +74,7 @@
man/man8/isoinfo.8
man/man8/isovfy.8
man/man8/mkisofs.8
+share/doc/cdrtools/INSTALL.pkgsrc
share/doc/cdrtools/cdda2wav/README
share/doc/cdrtools/cdrecord/README
share/doc/cdrtools/cdrecord/README.ATAPI
diff -r 27035fb76855 -r 20a996568267 sysutils/cdrtools/distinfo
--- a/sysutils/cdrtools/distinfo Fri Dec 03 13:44:01 2021 +0000
+++ b/sysutils/cdrtools/distinfo Fri Dec 03 15:13:26 2021 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.93 2021/10/26 11:19:25 nia Exp $
+$NetBSD: distinfo,v 1.94 2021/12/03 15:13:26 micha Exp $
-BLAKE2s (cdrtools-3.01.tar.bz2) = 469790e82a576c92618ede01e19b78e2eeb9103b647b03b00c96b837afbc6614
Home |
Main Index |
Thread Index |
Old Index