diff options
Diffstat (limited to 'sysutils')
22 files changed, 1 insertions, 576 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 2bf92183697..1bcceaef013 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.444 2008/11/04 11:13:20 markd Exp $ +# $NetBSD: Makefile,v 1.445 2008/11/05 19:48:51 wiz Exp $ # COMMENT= System utilities @@ -42,7 +42,6 @@ SUBDIR+= cdbkup SUBDIR+= cdrdao SUBDIR+= cdrkit SUBDIR+= cdrtools -SUBDIR+= cdrtools-ossdvd SUBDIR+= cfengine2 SUBDIR+= checkpassword SUBDIR+= checkpassword-pam diff --git a/sysutils/cdrtools-ossdvd/DESCR b/sysutils/cdrtools-ossdvd/DESCR deleted file mode 100644 index 271596bfabd..00000000000 --- a/sysutils/cdrtools-ossdvd/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -Cdrecord allows you to burn CDs with a CD-R/CD-RW recorder. 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 version is patched to also write DVDs. diff --git a/sysutils/cdrtools-ossdvd/MESSAGE.SunOS b/sysutils/cdrtools-ossdvd/MESSAGE.SunOS deleted file mode 100644 index 3ef1a211799..00000000000 --- a/sysutils/cdrtools-ossdvd/MESSAGE.SunOS +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.SunOS,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $ - -You will need to stop Solaris volume management before using -${PKGNAME_NOREV}: - - /etc/init.d/volmgt stop - -=========================================================================== diff --git a/sysutils/cdrtools-ossdvd/MESSAGE.cdrecord.conf b/sysutils/cdrtools-ossdvd/MESSAGE.cdrecord.conf deleted file mode 100644 index 17428687597..00000000000 --- a/sysutils/cdrtools-ossdvd/MESSAGE.cdrecord.conf +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.cdrecord.conf,v 1.2 2004/02/03 05:17:43 reed 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 cdrtools -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 --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile deleted file mode 100644 index b44925b8a09..00000000000 --- a/sysutils/cdrtools-ossdvd/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:35 joerg Exp $ - -DISTNAME= cdrtools-2.01.01a05 -PKGNAME= cdrtools-ossdvd-2.01.1.36 -PKGREVISION= 2 -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ -EXTRACT_SUFX= .tar.bz2 - -PATCHFILES= cdrtools-2.01.01a05-ossdvd.patch.bz2 -PATCH_SITES= ftp://ftp.crashrecovery.org/pub/linux/cdrtools/ \ - http://crashrecovery.org/oss-dvd/ -PATCH_DIST_STRIP= -p1 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://crashrecovery.org/oss-dvd.html -COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs/DVDs - -CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-[a-z0-9]* - -PKG_INSTALLATION_TYPES= overwrite pkgviews -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../mk/bsd.prefs.mk" - -WRKSRC= ${WRKDIR}/cdrtools-2.01.01 -USE_TOOLS+= gmake tbl - -.if ${LOCALBASE} != "/opt/schily" -BUILDLINK_TRANSFORM+= rmdir:/opt/schily -.endif - -# 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} - -# if we're using a gcc which is named gcc, we need to set CCOM=gcc -# in MAKE_ENV so the make infrastructure picks the right options. -.if !empty(CC:M*gcc*) -MAKE_ENV+= CCOM="gcc" -.endif - -# 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 - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 - -SUBST_CLASSES+= fix -SUBST_STAGE.fix= post-patch -SUBST_FILES.fix= cdrecord/defaults.c cdrecord/cdrecord.1 \ - readcd/readcd.1 -SUBST_SED.fix= -e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g" -SUBST_MESSAGE.fix= Fixing paths. - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 - -post-extract: - ${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly - ${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly - ${CP} ${WRKSRC}/RULES/power-macintosh-darwin-cc.rul \ - ${WRKSRC}/RULES/i386-darwin-cc.rul - ${CP} ${WRKSRC}/RULES/power-macintosh-darwin-gcc.rul \ - ${WRKSRC}/RULES/i386-darwin-gcc.rul - -do-configure: - cd ${WRKSRC}/RULES; \ - for suffix in netbsd-cc.rul netbsd-gcc.rul; do \ - if [ ! -f ${MACHINE}-$$suffix ]; then \ - ${LN} -sf i386-$$suffix ${MACHINE}-$$suffix; \ - fi; \ - done - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} 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 - -do-install: - cd ${WRKSRC}/cdda2wav; \ - ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${DESTDIR}${PREFIX}/bin; \ - ${INSTALL_MAN} cdda2wav.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - cd ${WRKSRC}/cdrecord; \ - ${INSTALL_PROGRAM} OBJ/*/cdrecord ${DESTDIR}${PREFIX}/bin; \ - ${INSTALL_MAN} cdrecord.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - cd ${WRKSRC}/mkisofs; \ - ${INSTALL_PROGRAM} OBJ/*/mkisofs ${DESTDIR}${PREFIX}/bin; \ - ${INSTALL_MAN} mkisofs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 - cd ${WRKSRC}/mkisofs/diag; \ - for f in devdump isodump isoinfo isovfy; do \ - ${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin; \ - ${INSTALL_MAN} isoinfo.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \ - done - cd ${WRKSRC}/readcd; \ - ${INSTALL_PROGRAM} OBJ/*/readcd ${DESTDIR}${PREFIX}/bin; \ - ${INSTALL_MAN} readcd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h) -LDFLAGS+= -lrt -.endif - -.include "../../mk/oss.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrtools-ossdvd/PLIST b/sysutils/cdrtools-ossdvd/PLIST deleted file mode 100644 index 4f3510449cc..00000000000 --- a/sysutils/cdrtools-ossdvd/PLIST +++ /dev/null @@ -1,17 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2005/06/24 21:47:57 wiz Exp $ -bin/cdda2wav -bin/cdrecord -bin/devdump -bin/isodump -bin/isoinfo -bin/isovfy -bin/mkisofs -bin/readcd -man/man1/cdda2wav.1 -man/man1/cdrecord.1 -man/man1/readcd.1 -man/man8/devdump.8 -man/man8/isodump.8 -man/man8/isoinfo.8 -man/man8/isovfy.8 -man/man8/mkisofs.8 diff --git a/sysutils/cdrtools-ossdvd/distinfo b/sysutils/cdrtools-ossdvd/distinfo deleted file mode 100644 index a675c14fc40..00000000000 --- a/sysutils/cdrtools-ossdvd/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: distinfo,v 1.10 2007/06/08 17:30:09 wiz Exp $ - -SHA1 (cdrtools-2.01.01a05.tar.bz2) = a4de142e6bd13c37d4701cf86496d708523976b3 -RMD160 (cdrtools-2.01.01a05.tar.bz2) = 74dd5db073de43f1116f423f40e376808a07fb5c -Size (cdrtools-2.01.01a05.tar.bz2) = 1435799 bytes -SHA1 (cdrtools-2.01.01a05-ossdvd.patch.bz2) = f8bf9152cbdb88842e59e0217bea1a0468593feb -RMD160 (cdrtools-2.01.01a05-ossdvd.patch.bz2) = 8b872f7fc62c9578e467c8fc7f645cafe7ca0214 -Size (cdrtools-2.01.01a05-ossdvd.patch.bz2) = 15629 bytes -SHA1 (patch-ac) = 6def0342f51fcb30f81b89a125afdb76e4f913a3 -SHA1 (patch-ah) = 8dc829b923493f1d0f47926fc11af30ceeb4b0db -SHA1 (patch-ai) = af53cf30e31459bf16c6f75f54503db4475da08c -SHA1 (patch-aj) = 6bae62f59745e5dd070ff4a6c93496d88f2ed99a -SHA1 (patch-ba) = 72d25c371894c0e4ededc5593a78f6b02f35b6de -SHA1 (patch-bb) = 528abe11c5a01615b4dbcd7304b39374f8d3c255 -SHA1 (patch-ca) = 1b4d17e0d5d738d76f15e9cca0827b93d24dd095 -SHA1 (patch-cb) = 575b11d6e2a7f1b2792c983c570e524c1972406f -SHA1 (patch-cc) = f018155aee1d966343758909f47632d39e96b5dd -SHA1 (patch-cd) = 6f7d7ac5bc5116e933bc19066ec0a38b5e04fc59 -SHA1 (patch-ce) = 04d842a7f78f4d6ab89da652023f4f8d7d6403fa -SHA1 (patch-cf) = 50855c214fb718594837001e57fa0cdebb9b5cf0 -SHA1 (patch-cg) = 686ac754c463ce37d15be19dcb8048741d8546f2 -SHA1 (patch-ch) = 1b19fd90e79dec9abdda3311cdcf7601b62c52f3 -SHA1 (patch-ci) = 55845889183b28e1b6cd70ee8f24a2803137ad23 diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ac b/sysutils/cdrtools-ossdvd/patches/patch-ac deleted file mode 100644 index 1b667082ec8..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2006/02/04 12:05:17 wiz Exp $ - ---- include/btorder.h.orig 2003-06-15 21:41:22.000000000 +0000 -+++ include/btorder.h -@@ -27,6 +27,9 @@ - #include <sys/types.h> /* try to load isa_defs.h on Solaris */ - #define _INCL_SYS_TYPES_H - #endif -+#ifdef __NetBSD__ -+#include <machine/endian.h> -+#endif - - #ifndef _MCONFIG_H - #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/ -@@ -107,7 +110,7 @@ error Only one of _BIT_FIELDS_LTOH or _ - # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ - defined(__PPC) || defined(powerpc) || defined(__powerpc__) - --# if defined(__BIG_ENDIAN__) -+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN - # define _BIT_FIELDS_HTOL - # else - # define _BIT_FIELDS_LTOH diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ah b/sysutils/cdrtools-ossdvd/patches/patch-ah deleted file mode 100644 index db37429475b..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ah +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2006/02/04 12:05:17 wiz Exp $ - ---- cdda2wav/setuid.c.orig 2004-08-19 12:54:34.000000000 +0200 -+++ cdda2wav/setuid.c -@@ -94,7 +94,7 @@ void needroot(necessary) - - if (geteuid() == 0) return; /* nothing to do */ - --#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID) -+#if defined (HAVE_SETEUID) - if (seteuid(effective_uid)) { - perror("seteuid in needroot()"); - exit(PERM_ERROR); -@@ -133,7 +133,7 @@ void dontneedroot() - return; - if (geteuid() != 0) return; /* nothing to do */ - --#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID) -+#if defined (HAVE_SETEUID) - if (seteuid(real_uid)) { - perror("seteuid in dontneedroot()"); - exit(PERM_ERROR); -@@ -217,7 +217,7 @@ void needgroup(necessary) - - if (getegid() == effective_gid) return; /* nothing to do */ - --#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID) -+#if defined (HAVE_SETEGID) - if (setegid(effective_gid)) { - perror("setegid in needgroup()"); - exit(PERM_ERROR); -@@ -249,7 +249,7 @@ void dontneedgroup() - exit(INTERNAL_ERROR); - } - if (getegid() != effective_gid) return; /* nothing to do */ --#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID) -+#if defined (HAVE_SETEGID) - if (setegid(real_gid)) { - perror("setegid in dontneedgroup()"); - exit(PERM_ERROR); diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ai b/sysutils/cdrtools-ossdvd/patches/patch-ai deleted file mode 100644 index 292ad232ced..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ai +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2007/06/08 17:30:09 wiz Exp $ - ---- libscg/scsi-bsd.c.orig 2004-01-14 23:13:05.000000000 +0000 -+++ libscg/scsi-bsd.c -@@ -39,6 +39,7 @@ static char __sccsid[] = - - #undef sense - #include <sys/scsiio.h> -+#include <util.h> - - /* - * Warning: you may change this source, but if you do that -@@ -47,7 +48,7 @@ static char __sccsid[] = - * Choose your name instead of "schily" and make clear that the version - * string is related to a modified source. - */ --LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/ -+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42nb1"; /* The version for this transport*/ - - #define MAX_SCG 16 /* Max # of SCSI controllers */ - #define MAX_TGT 16 -@@ -107,7 +108,7 @@ scgo_version(scgp, what) - * return "schily" for the SCG_AUTHOR request. - */ - case SCG_AUTHOR: -- return (_scg_auth_schily); -+ return ("frueauf"); - case SCG_SCCS_ID: - return (__sccsid); - } -@@ -139,6 +140,10 @@ scgo_open(scgp, device) - register int l; - register int nopen = 0; - char devname[64]; -+#if defined(__NetBSD__) -+ struct scsi_addr mysaddr; -+ int myslicename = getrawpartition(); -+#endif - - if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) { - errno = EINVAL; -@@ -165,6 +170,60 @@ scgo_open(scgp, device) - if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) - goto openbydev; - -+ -+/* -+ * I know of no method in NetBSD to probe the scsibus and get the mapping -+ * busnumber,target,lun --> devicename. -+ * -+ * Because of this implement a true bruteforce hack to find -+ * out what cdroms there are. -+ * -+ * Note that this method only finds cd0-cd7. Anything higher -+ * than this needs additional tweaks. -+ * -+ * Feel free to implement this cleanly if you have better knowledge. -+ * Until then this helps to get -scanbus und thus xcdroast working :-) -+ * -+ */ -+#if defined(__NetBSD__) -+ if (busno >= 0 && tgt >= 0 && tlun >= 0) { -+ for (l=0; l < MAX_LUN ; l++) { -+ sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename); -+ f = open(devname, O_RDWR); -+ if (f >= 0) { -+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) { -+ close(f); -+ errno = EINVAL; -+ return (0); -+ } -+ if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) { -+ scglocal(scgp)->scgfiles[busno][tgt][tlun] = f; -+ return(1); -+ } -+ } -+ } -+ } else for (l=0; l < MAX_LUN ; l++) { -+ sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename); -+ f = open(devname, O_RDWR); -+ if (f >= 0) { -+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) { -+ close(f); -+ errno = EINVAL; -+ return (0); -+ } -+ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr); -+ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr); -+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) { -+ close(f); -+ errno = EINVAL; -+ return (0); -+ } -+ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr); -+ if (scg_setup(scgp, f, busno, tgt, tlun)) -+ nopen++; -+ } -+ } -+#else /* not __NetBSD__ */ - if (busno >= 0 && tgt >= 0 && tlun >= 0) { - - js_snprintf(devname, sizeof (devname), -@@ -201,6 +260,7 @@ scgo_open(scgp, device) - } - } - } -+#endif /* end of not __NetBSD__ */ - /* - * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l - * We do the apropriate tests and try our best. diff --git a/sysutils/cdrtools-ossdvd/patches/patch-aj b/sysutils/cdrtools-ossdvd/patches/patch-aj deleted file mode 100644 index 2f7b521d333..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-aj +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2006/02/04 12:05:17 wiz Exp $ - ---- cdrecord/scsi_cdr.c.orig 2004-05-24 22:36:01.000000000 +0000 -+++ cdrecord/scsi_cdr.c -@@ -318,7 +318,11 @@ request_sense(scgp) - char sensebuf[CCS_SENSE_LEN]; - register struct scg_cmd *scmd = scgp->scmd; - -- -+#ifdef __NetBSD__ -+ /* request sense already done by kernel */ -+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense, -+ scgp->scmd->sense_count); -+#else - fillbytes((caddr_t)scmd, sizeof (*scmd), '\0'); - scmd->addr = sensebuf; - scmd->size = sizeof (sensebuf); -@@ -334,6 +338,7 @@ request_sense(scgp) - if (scg_cmd(scgp) < 0) - return (-1); - scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp)); -+#endif - return (0); - } - diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ba b/sysutils/cdrtools-ossdvd/patches/patch-ba deleted file mode 100644 index b0439cb566d..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ba +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2006/02/04 12:05:17 wiz Exp $ - ---- readcd/readcd.c.orig 2005-06-11 13:22:10.000000000 +0000 -+++ readcd/readcd.c -@@ -399,12 +399,12 @@ main(ac, av) - /* - * We don't need root privilleges anymore. - */ --#ifdef HAVE_SETREUID -- if (setreuid(-1, getuid()) < 0) --#else - #ifdef HAVE_SETEUID - if (seteuid(getuid()) < 0) - #else -+#ifdef HAVE_SETREUID -+ if (setreuid(-1, getuid()) < 0) -+#else - if (setuid(getuid()) < 0) - #endif - #endif diff --git a/sysutils/cdrtools-ossdvd/patches/patch-bb b/sysutils/cdrtools-ossdvd/patches/patch-bb deleted file mode 100644 index 8474446f4e6..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2006/02/04 12:05:17 wiz Exp $ - ---- mkisofs/mkisofs.c.orig 2006-01-12 00:29:46.000000000 +0000 -+++ mkisofs/mkisofs.c -@@ -2412,12 +2412,12 @@ parse_input_files: - } - } - /* We don't need root privilleges anymore. */ --#ifdef HAVE_SETREUID -- if (setreuid(-1, getuid()) < 0) --#else - #ifdef HAVE_SETEUID - if (seteuid(getuid()) < 0) - #else -+#ifdef HAVE_SETREUID -+ if (setreuid(-1, getuid()) < 0) -+#else - if (setuid(getuid()) < 0) - #endif - #endif diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ca b/sysutils/cdrtools-ossdvd/patches/patch-ca deleted file mode 100644 index 8bf851a0053..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ca +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ca,v 1.3 2006/02/04 12:05:17 wiz Exp $ - ---- cdrecord/defaults.c.orig 2005-05-31 09:52:33.000000000 +0000 -+++ cdrecord/defaults.c -@@ -53,7 +53,7 @@ open_cdrdefaults() - * don't contribute work and don't give support, they are causing extra - * work for me and this way slow down the cdrecord development. - */ -- return (defltopen("/etc/default/cdrecord")); -+ return (defltopen("@CDRECORD_CONF@")); - } - - EXPORT void diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cb b/sysutils/cdrtools-ossdvd/patches/patch-cb deleted file mode 100644 index 73b7c0804b3..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-cb +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-cb,v 1.3 2006/02/04 12:05:17 wiz Exp $ - ---- cdrecord/cdrecord.1.orig 2005-05-15 12:41:01.000000000 +0000 -+++ cdrecord/cdrecord.1 -@@ -2033,8 +2033,8 @@ login shell. - - .SH FILES - .TP --/etc/default/cdrecord --Default values can be set for the following options in /etc/default/cdrecord. -+@CDRECORD_CONF@ -+Default values can be set for the following options in @CDRECORD_CONF@. - For example: - .SM CDR_FIFOSIZE=8m - or -@@ -2043,7 +2043,7 @@ or - .TP - CDR_DEVICE - This may either hold a device identifier that is suitable to the open --call of the SCSI transport library or a label in the file /etc/default/cdrecord -+call of the SCSI transport library or a label in the file @CDRECORD_CONF@ - that allows to identify a specific drive on the system. - .TP - CDR_SPEED diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cc b/sysutils/cdrtools-ossdvd/patches/patch-cc deleted file mode 100644 index 815cd423be6..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cc,v 1.2 2006/02/04 12:05:17 wiz Exp $ - ---- readcd/readcd.1.orig 2006-01-11 23:06:28.000000000 +0000 -+++ readcd/readcd.1 -@@ -183,7 +183,7 @@ If the argument to the - .B dev= - option does not contain the characters ',', '/', '@' or ':', - it is interpreted as an label name that may be found in the file --/etc/default/cdrecord (see FILES section). -+@CDRECORD_CONF@ (see FILES section). - .TP - .BI timeout= # - Set the default SCSI command timeout value to diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cd b/sysutils/cdrtools-ossdvd/patches/patch-cd deleted file mode 100644 index 244dc251bd8..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-cd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cd,v 1.2 2006/02/04 12:05:17 wiz Exp $ - ---- include/schily.h.orig 2006-01-11 23:26:07.000000000 +0000 -+++ include/schily.h -@@ -115,7 +115,7 @@ extern int fspawnl __PR((FILE *, FILE *, - extern int fspawnv_nowait __PR((FILE *, FILE *, FILE *, - const char *, int, char *const*)); - extern int fgetline __PR((FILE *, char *, int)); --extern int fgetstr __PR((FILE *, char *, int)); -+extern int schily_fgetstr __PR((FILE *, char *, int)); - extern void file_raise __PR((FILE *, int)); - extern int fileclose __PR((FILE *)); - extern FILE *fileluopen __PR((int, const char *)); diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ce b/sysutils/cdrtools-ossdvd/patches/patch-ce deleted file mode 100644 index 63b42aa5cd7..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ce +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ce,v 1.2 2006/02/04 12:05:17 wiz Exp $ - ---- libschily/stdio/fgetstr.c.orig 2004-09-25 12:26:06.000000000 +0000 -+++ libschily/stdio/fgetstr.c -@@ -25,7 +25,7 @@ - */ - - EXPORT int --fgetstr(f, buf, len) -+schily_fgetstr(f, buf, len) - register FILE *f; - char *buf; - register int len; -@@ -59,5 +59,5 @@ getstr(buf, len) - char *buf; - int len; - { -- return (fgetstr(stdin, buf, len)); -+ return (schily_fgetstr(stdin, buf, len)); - } diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cf b/sysutils/cdrtools-ossdvd/patches/patch-cf deleted file mode 100644 index 9da676458ba..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2006/02/04 12:05:17 wiz Exp $ - ---- mkisofs/tree.c.orig 2004-06-12 13:16:37.000000000 +0000 -+++ mkisofs/tree.c -@@ -1577,7 +1577,7 @@ insert_file_entry(this_dir, whole_path, - /* - * >= is required by the large file summit standard. - */ -- if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x7FFFFFFF)) { -+ if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x0FFFFFFFF)) { - #endif - #ifdef EOVERFLOW - errno = EOVERFLOW; diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cg b/sysutils/cdrtools-ossdvd/patches/patch-cg deleted file mode 100644 index a89ea64833c..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-cg +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2006/02/04 12:05:17 wiz Exp $ - ---- mkisofs/write.c.orig 2005-08-07 14:50:48.000000000 +0000 -+++ mkisofs/write.c -@@ -463,7 +463,7 @@ write_one_file(filename, size, outfile) - static char buffer[SECTOR_SIZE * NSECT]; - FILE *infile; - off_t remain; -- int use; -+ off_t use; - - - if ((infile = fopen(filename, "rb")) == NULL) { -@@ -554,7 +554,10 @@ static char buffer[SECTOR_SIZE * NSECT] - fflush(stderr); - } - #endif -- remain -= use; -+ if (use > remain) -+ remain = 0; -+ else -+ remain -= use; - } - fclose(infile); - }/* write_one_file(... */ diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ch b/sysutils/cdrtools-ossdvd/patches/patch-ch deleted file mode 100644 index cf8fc3477b0..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ch +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2007/06/08 17:30:09 wiz Exp $ - ---- RULES/i386-netbsd-gcc.rul.orig 2002-10-15 20:43:41.000000000 +0000 -+++ RULES/i386-netbsd-gcc.rul -@@ -42,7 +42,7 @@ LIB_KVM= - LIBS_PATH= -L$(OLIBSDIR) - - LDFLAGS= $(LDOPTS) $(LDOPTX) --LDLIBS= $(LIBS) $(LIBX) -+LDLIBS= $(LIBS) $(LIBX) -lutil - - #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) - LDOPTS= $(LIBS_PATH) $(LDPATH) diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ci b/sysutils/cdrtools-ossdvd/patches/patch-ci deleted file mode 100644 index 540119e46d7..00000000000 --- a/sysutils/cdrtools-ossdvd/patches/patch-ci +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2007/06/08 17:30:09 wiz Exp $ - ---- RULES/i386-netbsd-cc.rul.orig 2002-10-15 20:43:40.000000000 +0000 -+++ RULES/i386-netbsd-cc.rul -@@ -42,7 +42,7 @@ LIB_KVM= - LIBS_PATH= -L$(OLIBSDIR) - - LDFLAGS= $(LDOPTS) $(LDOPTX) --LDLIBS= $(LIBS) $(LIBX) -+LDLIBS= $(LIBS) $(LIBX) -lutil - - #LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) - LDOPTS= $(LIBS_PATH) $(LDPATH) |