diff options
author | joerg <joerg> | 2005-10-10 21:36:56 +0000 |
---|---|---|
committer | joerg <joerg> | 2005-10-10 21:36:56 +0000 |
commit | 3e9c6cec4f6fd19a96dfbf8c1bc932ac9c8dd6d7 (patch) | |
tree | 75fc71d54a7a7065e100b00303fd47cd614fc635 | |
parent | 34de897732c0cd0444ec944f55ebd5380923642c (diff) | |
download | pkgsrc-3e9c6cec4f6fd19a96dfbf8c1bc932ac9c8dd6d7.tar.gz |
Add support for DragonFly.
-rw-r--r-- | sysutils/cdrdao/Makefile | 5 | ||||
-rw-r--r-- | sysutils/cdrdao/distinfo | 9 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ab | 18 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ai | 33 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-al | 22 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-am | 13 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ao | 16 |
7 files changed, 103 insertions, 13 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 3aa0f4c97bd..1d90d1cb7c1 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/10/08 12:35:15 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2005/10/10 21:36:56 joerg Exp $ .include "../../sysutils/cdrdao/Makefile.common" @@ -14,6 +14,9 @@ CONFIGURE_ARGS+= --without-xdao CONFIGURE_ARGS+= --without-posix-threads .endif +post-extract: + ${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id + post-install: ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao ${INSTALL_MAN} ${WRKSRC}/README \ diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index 035ec3eacfb..fc258c4d3ee 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,16 +1,19 @@ -$NetBSD: distinfo,v 1.15 2005/09/26 01:01:46 fredb Exp $ +$NetBSD: distinfo,v 1.16 2005/10/10 21:36:56 joerg Exp $ SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210 RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14 Size (cdrdao-1.2.0.tar.gz) = 2041966 bytes SHA1 (patch-aa) = ac38ac97ffbd502c5b5ea4de771ce92c520ae10e -SHA1 (patch-ab) = 5cbacba844e1fa3c55634bdbbe3ec8a998d20273 +SHA1 (patch-ab) = 4aa2499b6e5768d7f8dee32b1b7d0bfc55d30f71 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f SHA1 (patch-ad) = 2c092aa6755f6029bbd07db9fee03e655081fdb7 SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45 SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f -SHA1 (patch-ai) = 84f868e768b6eb44e506972cc73ad4795b7b1aaa +SHA1 (patch-ai) = 3441edbe934b8e2a996259aaf293618c94c147d5 SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd SHA1 (patch-ak) = 28d58c003a2025d032df061eff1394d2372826c8 +SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 +SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc +SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab index 71cb7c5c350..c29474c3821 100644 --- a/sysutils/cdrdao/patches/patch-ab +++ b/sysutils/cdrdao/patches/patch-ab @@ -1,11 +1,17 @@ -$NetBSD: patch-ab,v 1.4 2004/06/20 19:05:25 dillo Exp $ +$NetBSD: patch-ab,v 1.5 2005/10/10 21:36:56 joerg Exp $ -have a default scsi device which is likely to be correct (at least -on single CD systems). - ---- dao/main.cc.orig 2004-06-05 22:57:34.000000000 +0200 +--- dao/main.cc.orig 2005-05-09 15:48:40.000000000 +0000 +++ dao/main.cc -@@ -115,7 +115,11 @@ static int FIFO_BUFFERS = 32; +@@ -108,7 +108,7 @@ static TrackData::SubChannelMode READ_SU + + static Settings *SETTINGS = NULL; // settings read from $HOME/.cdrdao + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + + # ifdef USE_SCGLIB + static const char *SCSI_DEVICE = "0,0,0"; +@@ -124,7 +124,11 @@ static int FIFO_BUFFERS = 32; #else diff --git a/sysutils/cdrdao/patches/patch-ai b/sysutils/cdrdao/patches/patch-ai index 7c18f898f0f..079c74168cb 100644 --- a/sysutils/cdrdao/patches/patch-ai +++ b/sysutils/cdrdao/patches/patch-ai @@ -1,13 +1,40 @@ -$NetBSD: patch-ai,v 1.1 2005/06/04 19:05:38 adrianp Exp $ +$NetBSD: patch-ai,v 1.2 2005/10/10 21:36:56 joerg Exp $ ---- configure.orig 2005-06-04 15:19:02.000000000 +0100 +--- configure.orig 2005-05-12 18:30:44.000000000 +0000 +++ configure +@@ -10250,7 +10250,7 @@ _ACEOF + *-freebsd2*) + scsilib_libs="$scsilib_libs" + ;; +- *-freebsd[3456]*) ++ *-freebsd[3456]* | *-dragonfly*) + scsilib_libs="$scsilib_libs -lcam" + ;; + esac +@@ -10268,7 +10268,7 @@ else + scsilib_objs="ScsiIf-linux.o sg_err.o" + ;; + +- *-freebsd[3456]*) ++ *-freebsd[3456]* | *-dragonfly*) + scsilib_libs="-lcam" + scsilib_objs="ScsiIf-freebsd-cam.o" + ;; +@@ -10496,7 +10496,7 @@ case "$host" in + esac + + case "$host" in +- *-freebsd*) ++ *-freebsd* | *-dragonfly*) + if test "$use_pthreads" = yes; then + LDFLAGS="-pthread $LDFLAGS" + thread_libs="" @@ -10514,7 +10514,7 @@ _ACEOF esac case "$host" in - *-linux-* | *-freebsd[456]* | *-solaris*) -+ *-linux-* | *-freebsd[456]* | *-solaris* | *-netbsd*) ++ *-linux-* | *-freebsd[456]* | *-solaris* | *-netbsd* | *-dragonfly*) sound_if_obj=SoundIF-ao.o ;; diff --git a/sysutils/cdrdao/patches/patch-al b/sysutils/cdrdao/patches/patch-al new file mode 100644 index 00000000000..9182df0354e --- /dev/null +++ b/sysutils/cdrdao/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1 2005/10/10 21:36:56 joerg Exp $ + +--- dao/dao.cc.orig 2005-07-10 10:19:53.000000000 +0000 ++++ dao/dao.cc +@@ -55,7 +55,7 @@ + + + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #define IPC_ARG_T void + #else + #define IPC_ARG_T msgbuf +@@ -892,7 +892,7 @@ static int getSharedMemory(long nofBuffe + maxSegmentSize = info.shmmax; + } + +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) + maxSegmentSize = 4 * 1024 * 1024; // 4 MB + #else + maxSegmentSize = 1 * 1024 * 1024; // 1 MB diff --git a/sysutils/cdrdao/patches/patch-am b/sysutils/cdrdao/patches/patch-am new file mode 100644 index 00000000000..22a69eb6cb3 --- /dev/null +++ b/sysutils/cdrdao/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2005/10/10 21:36:56 joerg Exp $ + +--- scsilib/libscg/scsihack.c.orig 2005-07-10 10:22:38.000000000 +0000 ++++ scsilib/libscg/scsihack.c +@@ -129,7 +129,7 @@ EXPORT scg_ops_t scg_std_ops = { + + #endif /* linux */ + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + #define SCSI_IMPL /* We have a SCSI implementation for *BSD */ + + #include "scsi-bsd.c" diff --git a/sysutils/cdrdao/patches/patch-ao b/sysutils/cdrdao/patches/patch-ao new file mode 100644 index 00000000000..201501fa483 --- /dev/null +++ b/sysutils/cdrdao/patches/patch-ao @@ -0,0 +1,16 @@ +$NetBSD: patch-ao,v 1.1 2005/10/10 21:36:56 joerg Exp $ + +--- scsilib/include/xmconfig.h.orig 2005-07-10 10:24:39.000000000 +0000 ++++ scsilib/include/xmconfig.h +@@ -763,9 +763,9 @@ extern "C" { + #endif + + /* +- * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS ++ * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS / DragonFly + */ +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) + # define PROTOTYPES + # define HAVE_AOUT + # define HAVE_STDARG_H |