pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: cdrtools: Import 3.02a10
Hi,
Thanks for your work to update cdrtools package.
I have half-baked sysutils/cdrtools package in my local tree.
My package uses BUILD_DIRS instead of custom do-build target.
pkgsrc/devel/gmake (GNU make) is used to
build the package.
BUILD_DIRS+= libschily
BUILD_DIRS+= libscgcmd
BUILD_DIRS+= librscg
BUILD_DIRS+= libcdrdeflt
BUILD_DIRS+= libdeflt
BUILD_DIRS+= libscg
BUILD_DIRS+= libparanoia
BUILD_DIRS+= libmdigest
BUILD_DIRS+= libedc
BUILD_DIRS+= libhfs_iso
BUILD_DIRS+= libfile
BUILD_DIRS+= libsiconv
BUILD_DIRS+= libfind
BUILD_DIRS+= btcflash
BUILD_DIRS+= cdda2wav
BUILD_DIRS+= cdrecord
BUILD_DIRS+= mkisofs
BUILD_DIRS+= mkisofs/diag
BUILD_DIRS+= readcd
BUILD_DIRS+= scgcheck
BUILD_DIRS+= scgskeleton
I use mkisofs and cdrecord commands built with GNU make
and they work without problem.
Anyway I wish you could update sysutils/cdrtools to the latest.
Thank you.
Michael Baeuerle <micha%NetBSD.org@localhost> writes:
> Module Name: pkgsrc-wip
> Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
> Pushed By: micha
> Date: Fri Nov 19 18:13:01 2021 +0100
> Changeset: 80d1c5b51acc566e111dfc9b6c04c66b19985032
>
> Added Files:
> cdrtools/DESCR
> cdrtools/Makefile
> cdrtools/PLIST
> cdrtools/TODO
> cdrtools/distinfo
> cdrtools/files/INSTALL.pkgsrc
> cdrtools/hacks.mk
>
> Log Message:
> cdrtools: Import 3.02a10
>
> This package is based on Schily Tools 2021-09-18.
> Intended as update for sysutils/cdrtools.
>
> To see a diff of this commit:
> https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=80d1c5b51acc566e111dfc9b6c04c66b19985032
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> diffstat:
> cdrtools/DESCR | 15 +++++
> cdrtools/Makefile | 131 ++++++++++++++++++++++++++++++++++++++++++
> cdrtools/PLIST | 115 ++++++++++++++++++++++++++++++++++++
> cdrtools/TODO | 4 ++
> cdrtools/distinfo | 5 ++
> cdrtools/files/INSTALL.pkgsrc | 14 +++++
> cdrtools/hacks.mk | 13 +++++
> 7 files changed, 297 insertions(+)
>
> diffs:
> diff --git a/cdrtools/DESCR b/cdrtools/DESCR
> new file mode 100644
> index 0000000000..1b269cbadd
> --- /dev/null
> +++ b/cdrtools/DESCR
> @@ -0,0 +1,15 @@
> +Cdrecord allows you to burn CDs, DVDs, and Blu-ray discs. It works
> +as a burn engine for several applications. Cdrecord supports CD
> +recorders from many different vendors; all SCSI-3/mmc and ATAPI/mmc
> +compliant drives should also work. Supported features include:
> +IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data CDs,
> +and mixed CDs; full multi-session support, CD-RWs (rewritable),
> +TAO, DAO, and human-readable error messages.
> +
> +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 --git a/cdrtools/Makefile b/cdrtools/Makefile
> new file mode 100644
> index 0000000000..d0971588de
> --- /dev/null
> +++ b/cdrtools/Makefile
> @@ -0,0 +1,131 @@
> +# $NetBSD$
> +
> +DISTNAME= schily-2021-09-18
> +PKGNAME= cdrtools-3.02a10
> +CATEGORIES= sysutils
> +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=schilytools/}
> +EXTRACT_SUFX= .tar.bz2
> +
> +MAINTAINER= pkgsrc-users%NetBSD.org@localhost
> +HOMEPAGE= https://sourceforge.net/projects/schilytools/
> +COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
> +LICENSE= cddl-1.0 AND gnu-gpl-v2 AND gnu-lgpl-v2.1 AND 2-clause-bsd
> +
> +MAKE_JOBS_SAFE= no
> +
> +.include "../../mk/bsd.prefs.mk"
> +
> +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}
> +
> +# 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.
> +CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord
> +
> +CONF_FILES= ${PREFIX}/share/examples/cdrtools/cdrecord ${CDRECORD_CONF}
> +SPECIAL_PERMS+= ${PREFIX}/share/examples/cdrtools/cdrecord ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
> +AUTO_MKDIRS= yes
> +
> +# Configure config file location
> +SUBST_CLASSES+= fix
> +SUBST_STAGE.fix= pre-configure
> +SUBST_FILES.fix+= cdrecord/cdrecord.1
> +SUBST_FILES.fix+= cdrecord/cdrecord.dfl
> +SUBST_SED.fix= -e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
> +SUBST_MESSAGE.fix= Replace defaults file paths.
> +
> +# 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,${CDRECORD_CONF:Q},'
> +
> +# Shared platform specific code for schilytools (provided by smake package)
> +.include "../../devel/smake/Makefile.common"
> +
> +do-configure:
> + ${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
> +.endif
> +
> +do-install:
> + for program in btcflash cdda2wav cdrecord mkisofs \
> + readcd scgcheck scgskeleton; do \
> + cd ${WRKSRC}/$${program}; \
> + ${INSTALL_PROGRAM} OBJ/*/$${program} \
> + ${DESTDIR}${PREFIX}/bin; \
> + done
> + for program in cdda2mp3 cdda2ogg; do \
> + ${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/$${program} \
> + ${DESTDIR}${PREFIX}/bin; \
> + ${INSTALL_MAN} ${WRKSRC}/cdda2wav/$${program}.1 \
> + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
> + done
> + 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 \
> + ${INSTALL_MAN} ${WRKSRC}/$${program}/$${program}.8 \
> + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8; \
> + done
> + cd ${WRKSRC}/mkisofs/diag; \
> + for f in devdump isodebug isodump isoinfo isovfy; do \
> + ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \
> + ${INSTALL_MAN} $$f.8 \
> + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
> + done
> + ${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/[cik]* \
> + ${DESTDIR}${PREFIX}/lib/siconv
> + ${RM} ${DESTDIR}${PREFIX}/lib/siconv/*mk
> + ${INSTALL_DATA} ${WRKSRC}/cdda2wav/README* \
> + ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdda2wav
> + ${INSTALL_DATA} ${WRKSRC}/cdrecord/README* \
> + ${DESTDIR}${PREFIX}/share/doc/cdrtools/cdrecord
> + ${INSTALL_DATA} ${WRKSRC}/mkisofs/README* \
> + ${DESTDIR}${PREFIX}/share/doc/cdrtools/mkisofs
> + ${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"
> +.include "../../mk/oss.buildlink3.mk"
> +.include "../../mk/bsd.pkg.mk"
> diff --git a/cdrtools/PLIST b/cdrtools/PLIST
> new file mode 100644
> index 0000000000..f5e641f9b2
> --- /dev/null
> +++ b/cdrtools/PLIST
> @@ -0,0 +1,115 @@
> +@comment $NetBSD$
> +bin/btcflash
> +bin/cdda2mp3
> +bin/cdda2ogg
> +bin/cdda2wav
> +bin/cdrecord
> +bin/devdump
> +bin/isodebug
> +bin/isodump
> +bin/isoinfo
> +bin/isovfy
> +bin/mkisofs
> +bin/readcd
> +bin/scgcheck
> +bin/scgskeleton
> +lib/siconv/cp10000
> +lib/siconv/cp10006
> +lib/siconv/cp10007
> +lib/siconv/cp10029
> +lib/siconv/cp10079
> +lib/siconv/cp10081
> +lib/siconv/cp1250
> +lib/siconv/cp1251
> +lib/siconv/cp1252
> +lib/siconv/cp1253
> +lib/siconv/cp1254
> +lib/siconv/cp1255
> +lib/siconv/cp1256
> +lib/siconv/cp1257
> +lib/siconv/cp1258
> +lib/siconv/cp437
> +lib/siconv/cp737
> +lib/siconv/cp775
> +lib/siconv/cp850
> +lib/siconv/cp852
> +lib/siconv/cp855
> +lib/siconv/cp857
> +lib/siconv/cp860
> +lib/siconv/cp861
> +lib/siconv/cp862
> +lib/siconv/cp863
> +lib/siconv/cp864
> +lib/siconv/cp865
> +lib/siconv/cp866
> +lib/siconv/cp869
> +lib/siconv/cp874
> +lib/siconv/iso8859-1
> +lib/siconv/iso8859-10
> +lib/siconv/iso8859-11
> +lib/siconv/iso8859-13
> +lib/siconv/iso8859-14
> +lib/siconv/iso8859-15
> +lib/siconv/iso8859-16
> +lib/siconv/iso8859-2
> +lib/siconv/iso8859-3
> +lib/siconv/iso8859-4
> +lib/siconv/iso8859-5
> +lib/siconv/iso8859-6
> +lib/siconv/iso8859-7
> +lib/siconv/iso8859-8
> +lib/siconv/iso8859-9
> +lib/siconv/koi8-r
> +lib/siconv/koi8-u
> +man/man1/btcflash.1
> +man/man1/cdda2mp3.1
> +man/man1/cdda2ogg.1
> +man/man1/cdda2wav.1
> +man/man1/cdrecord.1
> +man/man1/readcd.1
> +man/man1/scgcheck.1
> +man/man8/devdump.8
> +man/man8/isodebug.8
> +man/man8/isodump.8
> +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
> +share/doc/cdrtools/cdrecord/README.DiskT@2
> +share/doc/cdrtools/cdrecord/README.WORM
> +share/doc/cdrtools/cdrecord/README.audio
> +share/doc/cdrtools/cdrecord/README.cdplus
> +share/doc/cdrtools/cdrecord/README.cdrw
> +share/doc/cdrtools/cdrecord/README.cdtext
> +share/doc/cdrtools/cdrecord/README.clone
> +share/doc/cdrtools/cdrecord/README.copy
> +share/doc/cdrtools/cdrecord/README.multi
> +share/doc/cdrtools/cdrecord/README.parallel
> +share/doc/cdrtools/cdrecord/README.raw
> +share/doc/cdrtools/cdrecord/README.rscsi
> +share/doc/cdrtools/cdrecord/README.solaris-x86-ATAPI-DMA
> +share/doc/cdrtools/cdrecord/README.solaris-x86-ata-DMA
> +share/doc/cdrtools/cdrecord/README.sony
> +share/doc/cdrtools/cdrecord/README.sun-lofi
> +share/doc/cdrtools/cdrecord/README.verify
> +share/doc/cdrtools/cdrecord/README.volmgt
> +share/doc/cdrtools/mkisofs/README
> +share/doc/cdrtools/mkisofs/README.compression
> +share/doc/cdrtools/mkisofs/README.eltorito
> +share/doc/cdrtools/mkisofs/README.graft_dirs
> +share/doc/cdrtools/mkisofs/README.hfs_boot
> +share/doc/cdrtools/mkisofs/README.hfs_magic
> +share/doc/cdrtools/mkisofs/README.hide
> +share/doc/cdrtools/mkisofs/README.joliet
> +share/doc/cdrtools/mkisofs/README.macosx
> +share/doc/cdrtools/mkisofs/README.mkhybrid
> +share/doc/cdrtools/mkisofs/README.prep_boot
> +share/doc/cdrtools/mkisofs/README.rootinfo
> +share/doc/cdrtools/mkisofs/README.session
> +share/doc/cdrtools/mkisofs/README.sort
> +share/doc/cdrtools/mkisofs/README.sparcboot
> +share/doc/cdrtools/mkisofs/README.sunx86boot
> +share/examples/cdrtools/cdrecord
> diff --git a/cdrtools/TODO b/cdrtools/TODO
> new file mode 100644
> index 0000000000..a18336182b
> --- /dev/null
> +++ b/cdrtools/TODO
> @@ -0,0 +1,4 @@
> +- pkglint complains that "mk/defaults/mk.conf" specifies a different config file
> + But the entry is commented out and the cdrecord source tree says "cdrecord",
> + not "cdrecord.conf". Should it be changed or removed?
> +- Is "hacks.mk" still required for macOS?
> diff --git a/cdrtools/distinfo b/cdrtools/distinfo
> new file mode 100644
> index 0000000000..f43c6ebd26
> --- /dev/null
> +++ b/cdrtools/distinfo
> @@ -0,0 +1,5 @@
> +$NetBSD$
> +
> +BLAKE2s (schily-2021-09-18.tar.bz2) = 1ee4b41d2f684e695d40cf03e4335ad0e699cbf0bb99b46e197e202d79ccc949
> +SHA512 (schily-2021-09-18.tar.bz2) = d25765074ac39ca2db63cb9841288dd4457f55588e0389a58ad78da62f745a766b4608d3d137a1908e2ca60511784d5f0af67bab1d1612478dbf120188ed5f31
> +Size (schily-2021-09-18.tar.bz2) = 4952788 bytes
> diff --git a/cdrtools/files/INSTALL.pkgsrc b/cdrtools/files/INSTALL.pkgsrc
> new file mode 100644
> index 0000000000..394b9bd112
> --- /dev/null
> +++ b/cdrtools/files/INSTALL.pkgsrc
> @@ -0,0 +1,14 @@
> +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.
> +
> +
> +You will need to stop Solaris volume management before using PKGNAME_NOREV:
> +
> + /etc/init.d/volmgt stop
> diff --git a/cdrtools/hacks.mk b/cdrtools/hacks.mk
> new file mode 100644
> index 0000000000..1eec7c6a3e
> --- /dev/null
> +++ b/cdrtools/hacks.mk
> @@ -0,0 +1,13 @@
> +# $NetBSD$
> +
> +.include "../../mk/bsd.prefs.mk"
> +
> +.if ${OPSYS} == "Darwin" && defined(ABI) && ${ABI} == "64" && \
> + ${_USE_CWRAPPERS} == "yes"
> +#
> +# PR pkg/51257: "sysutils/cdrtools" fails to build under Mac OS X 64bit
> +# when cwrappers are used
> +#
> +LDFLAGS+= -L${PREFIX}/lib -lintl
> +
> +.endif
--
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
Home |
Main Index |
Thread Index |
Old Index