diff options
author | drochner <drochner@pkgsrc.org> | 2006-12-11 12:28:36 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2006-12-11 12:28:36 +0000 |
commit | a0a0c5012f9e4cb92dc8ec3efdbf1c7b1b0b8a30 (patch) | |
tree | ff9131b993de39c1a462b93654a77c913dc491d7 | |
parent | 817191c6447e7a5dd7f13f853fa7b25303f05cd2 (diff) | |
download | pkgsrc-a0a0c5012f9e4cb92dc8ec3efdbf1c7b1b0b8a30.tar.gz |
update to 1.2.2
changes: Man page cleanup
-rw-r--r-- | sysutils/cdrdao/Makefile.common | 5 | ||||
-rw-r--r-- | sysutils/cdrdao/distinfo | 13 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-aa | 21 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ab | 12 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ap | 13 |
5 files changed, 33 insertions, 31 deletions
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common index 284e2a0de41..58729bc4853 100644 --- a/sysutils/cdrdao/Makefile.common +++ b/sysutils/cdrdao/Makefile.common @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.common,v 1.5 2006/06/30 01:44:55 joerg Exp $ +# $NetBSD: Makefile.common,v 1.6 2006/12/11 12:28:36 drochner Exp $ DISTNAME= cdrdao-${CDRDAO_VER} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= david@maxwell.net HOMEPAGE= http://cdrdao.sourceforge.net/ @@ -15,7 +16,7 @@ DISTINFO_FILE= ${CDRDAODIR}/distinfo PKG_INSTALLATION_TYPES= overwrite pkgviews -CDRDAO_VER= 1.2.1 +CDRDAO_VER= 1.2.2 GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index 98f4a437f1a..c8ad8af5649 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.17 2006/05/29 15:22:29 drochner Exp $ +$NetBSD: distinfo,v 1.18 2006/12/11 12:28:36 drochner Exp $ -SHA1 (cdrdao-1.2.1.tar.gz) = 530725bd0ed29eeda97eb5fcedbf7b4b44f4e863 -RMD160 (cdrdao-1.2.1.tar.gz) = 4f6cabd016af69746db6d31d58ec0a7f49c38fde -Size (cdrdao-1.2.1.tar.gz) = 1728003 bytes -SHA1 (patch-aa) = ac38ac97ffbd502c5b5ea4de771ce92c520ae10e -SHA1 (patch-ab) = 4aa2499b6e5768d7f8dee32b1b7d0bfc55d30f71 +SHA1 (cdrdao-1.2.2.tar.bz2) = 2699e56e00342c1fa2a3815ed02418fe964b276b +RMD160 (cdrdao-1.2.2.tar.bz2) = c537c535a4106655f89f7cfa5895ffcb5b9464e2 +Size (cdrdao-1.2.2.tar.bz2) = 1408344 bytes +SHA1 (patch-aa) = c79fcb39b1ee0bb36f41b1db8401c2f9f97a04c4 +SHA1 (patch-ab) = 90b8be33404a1a8212399610553a05a4d7c77b39 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f SHA1 (patch-ad) = 2c092aa6755f6029bbd07db9fee03e655081fdb7 SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45 @@ -16,4 +16,3 @@ SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 -SHA1 (patch-ap) = a9d9c2fdb35a30af650608ea827e79028ce37fc8 diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa index bb0deac3629..a608ef5eaca 100644 --- a/sysutils/cdrdao/patches/patch-aa +++ b/sysutils/cdrdao/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2004/07/19 02:21:57 fredb Exp $ +$NetBSD: patch-aa,v 1.7 2006/12/11 12:28:36 drochner Exp $ ---- dao/ScsiIf-lib.cc.orig 2004-04-13 13:38:58.000000000 -0500 +--- dao/ScsiIf-lib.cc.orig 2006-09-19 11:07:11.000000000 +0200 +++ dao/ScsiIf-lib.cc -@@ -289,6 +289,12 @@ +@@ -289,6 +289,12 @@ int ScsiIf::inquiry() revision_[i] = 0; } @@ -15,3 +15,18 @@ $NetBSD: patch-aa,v 1.6 2004/07/19 02:21:57 fredb Exp $ return 0; } +@@ -430,6 +436,7 @@ const int ScsiIf::lun () + #include "ScsiIf-common.cc" + //<<<<<<< ScsiIf-lib.cc + ++#if 0 + #ifndef linux + + /* Function for mapping any SCSI device to the corresponding SG device. +@@ -576,5 +583,6 @@ const char *ScsiIfImpl::openScsiDevAsSg( + } + + #endif /* linux */ ++#endif + //======= + //>>>>>>> 1.6 diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab index c29474c3821..2a6530d7aa8 100644 --- a/sysutils/cdrdao/patches/patch-ab +++ b/sysutils/cdrdao/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.5 2005/10/10 21:36:56 joerg Exp $ +$NetBSD: patch-ab,v 1.6 2006/12/11 12:28:36 drochner Exp $ ---- dao/main.cc.orig 2005-05-09 15:48:40.000000000 +0000 +--- dao/main.cc.orig 2006-09-19 11:07:11.000000000 +0200 +++ dao/main.cc -@@ -108,7 +108,7 @@ static TrackData::SubChannelMode READ_SU - - static Settings *SETTINGS = NULL; // settings read from $HOME/.cdrdao +@@ -129,7 +129,7 @@ static HANDLE fh = NULL; + static char devstr[10]; + #endif -#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; +@@ -145,7 +145,11 @@ static int FIFO_BUFFERS = 32; #else diff --git a/sysutils/cdrdao/patches/patch-ap b/sysutils/cdrdao/patches/patch-ap deleted file mode 100644 index edc77413cc4..00000000000 --- a/sysutils/cdrdao/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2006/05/29 15:22:29 drochner Exp $ - ---- xdao/ProgressDialog.h.orig 2006-05-29 10:39:33.000000000 +0200 -+++ xdao/ProgressDialog.h -@@ -62,7 +62,7 @@ private: - bool leadTimeFilled_; - - struct timeval time_; -- bool ProgressDialog::time(); -+ bool time(); - - Gtk::Button *cancelButton_; - Gtk::Button *closeButton_; |