summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/xcdroast/Makefile8
-rw-r--r--sysutils/xcdroast/distinfo10
-rw-r--r--sysutils/xcdroast/patches/patch-aa16
-rw-r--r--sysutils/xcdroast/patches/patch-ac28
-rw-r--r--sysutils/xcdroast/pkg/MESSAGE11
-rw-r--r--sysutils/xcdroast/pkg/PLIST5
6 files changed, 39 insertions, 39 deletions
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 02fe39c0cca..ae7da07ece5 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:22 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/07 11:27:35 drochner Exp $
-DISTNAME= xcdroast-0.98alpha8
-PKGNAME= xcdroast-0.98a8
+DISTNAME= xcdroast-0.98alpha9
+PKGNAME= xcdroast-0.98a9
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.xcdroast.org/
COMMENT= graphical user interface for the command-line cdrecord-tools
DEPENDS+= imlib-*:../../graphics/imlib
-DEPENDS+= cdrecord-1.9nb1:../../sysutils/cdrecord
+DEPENDS+= cdrecord-1.10:../../sysutils/cdrecord
USE_X11= YES
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index f67edbaf1ee..c691d9ccf82 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:11 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/07 11:27:35 drochner Exp $
-SHA1 (xcdroast-0.98alpha8.tar.gz) = 16b1fdb3b94515531f04d083632c7cc4cf651c57
-Size (xcdroast-0.98alpha8.tar.gz) = 559887 bytes
-SHA1 (patch-aa) = 96207a9ae670099258507894854a351fca321050
+SHA1 (xcdroast-0.98alpha9.tar.gz) = 7994b54ce0a0b55fe140f4b2ba14e0d1317d5d52
+Size (xcdroast-0.98alpha9.tar.gz) = 649469 bytes
+SHA1 (patch-aa) = a215d9737f0d69e7410ce5e4b902b865493624b2
SHA1 (patch-ab) = bb019f49215db561d29f52971d186600f1db710e
-SHA1 (patch-ac) = abc9f5273a273bae7f5e3aac6266375a16eff605
+SHA1 (patch-ac) = 5a9e1dafcc5438aa28e81025b32c356eee6c5d08
SHA1 (patch-ad) = 0a9ec2f5f20a39211669fdb0b613955295a41720
diff --git a/sysutils/xcdroast/patches/patch-aa b/sysutils/xcdroast/patches/patch-aa
index da02bf40c7a..7f88b408463 100644
--- a/sysutils/xcdroast/patches/patch-aa
+++ b/sysutils/xcdroast/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/10 23:23:35 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/07 11:27:35 drochner Exp $
---- Makefile-orig Sun Nov 26 15:03:56 2000
-+++ Makefile Fri Feb 9 23:46:24 2001
-@@ -5,7 +5,7 @@
-
+--- Makefile.orig Tue Jul 17 23:46:26 2001
++++ Makefile Mon Aug 6 12:28:22 2001
+@@ -6,7 +6,7 @@
# Installation prefix directory:
--PREFIX=/usr
-+#PREFIX=/usr
- #PREFIX=/usr/local
+ #PREFIX=/usr
+-PREFIX=/usr/local
++#PREFIX=/usr/local
PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98
+ # put here the prefix where you want xcdroast to look for
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
index de2dac55a68..84e0a4363cf 100644
--- a/sysutils/xcdroast/patches/patch-ac
+++ b/sysutils/xcdroast/patches/patch-ac
@@ -1,18 +1,18 @@
-$NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/07 11:27:35 drochner Exp $
---- io.c.orig Sun Nov 26 13:55:57 2000
-+++ io.c Sat Mar 10 16:34:38 2001
+--- io.c.orig Tue Jul 17 21:39:11 2001
++++ io.c Mon Aug 6 12:18:41 2001
@@ -20,7 +20,8 @@
- #include <sys/soundcard.h>
- #include <sys/ioctl.h>
+ # include <sys/soundcard.h>
+ # include <sys/ioctl.h>
#endif
-#ifdef sun
+#if defined(sun) || defined(__NetBSD__)
+#include <sys/ioctl.h>
- #include <sys/audioio.h>
+ # include <sys/audioio.h>
#endif
#ifdef hpux
-@@ -782,7 +783,7 @@
+@@ -996,7 +997,7 @@
GList *dsp;
GList *loop;
struct stat buf;
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
gchar *audiodev;
#endif
dsp = NULL;
-@@ -797,7 +798,7 @@
+@@ -1011,7 +1012,7 @@
dsp = g_list_append(dsp,"/dev/dsp1");
}
#endif
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
/* check if the user has any special audio-hardware running,
which set the AUDIODEV-environment-variable */
audiodev = getenv("AUDIODEV");
-@@ -863,7 +864,7 @@
+@@ -1084,7 +1085,7 @@
}
}
#endif
@@ -39,7 +39,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
-@@ -2130,7 +2131,7 @@
+@@ -2365,7 +2366,7 @@
#if defined(linux) || defined(__FreeBSD__)
gint val;
#endif
@@ -48,7 +48,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
audio_info_t ainfo;
#endif
#ifdef hpux
-@@ -2163,7 +2164,7 @@
+@@ -2400,7 +2401,7 @@
return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
#endif
@@ -57,7 +57,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
dodebug(10,"quering mixer %s\n", setupdata.mix_device);
mix = open(setupdata.mix_device, O_RDONLY);
-@@ -2211,7 +2212,7 @@
+@@ -2450,7 +2451,7 @@
gint set_mixer(gint val) {
gint mix;
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
audio_info_t ainfo;
#endif
#ifdef hpux
-@@ -2241,7 +2242,7 @@
+@@ -2482,7 +2483,7 @@
close(mix);
#endif
@@ -75,7 +75,7 @@ $NetBSD: patch-ac,v 1.2 2001/03/11 11:04:20 drochner Exp $
dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
mix = open(setupdata.mix_device, O_WRONLY);
-@@ -3026,6 +3027,9 @@
+@@ -3275,6 +3276,9 @@
/* got the message that no medium is present?
in this case, ignore return code */
if (strstr(line,"medium not present")) {
diff --git a/sysutils/xcdroast/pkg/MESSAGE b/sysutils/xcdroast/pkg/MESSAGE
index 2ed20cd5055..6800013ae93 100644
--- a/sysutils/xcdroast/pkg/MESSAGE
+++ b/sysutils/xcdroast/pkg/MESSAGE
@@ -1,10 +1,9 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/03/10 12:21:09 drochner Exp $
+$NetBSD: MESSAGE,v 1.3 2001/08/07 11:27:36 drochner Exp $
-xcdrgtk (aka xcdroast) creates its config file into
-${PREFIX}/etc/xcdroast.conf. It will not get removed with pkg_delete(1)
-automatically. So if you no longer intend to use this package don't
-forget to remove it by hand.
-xcdrgtk doesn't work as SUID program if linked against gtk-1.2.9. Other
+xcdroast creates its config file into ${PREFIX}/etc/xcdroast.conf.
+It will not get removed with pkg_delete(1) automatically. So if you no longer
+intend to use this package don't forget to remove it by hand.
+xcdroast doesn't work as SUID program if linked against gtk-1.2.9. Other
options include making cdrecord SUID or using a wrapper like sudo.
===========================================================================
diff --git a/sysutils/xcdroast/pkg/PLIST b/sysutils/xcdroast/pkg/PLIST
index 32e56da6cf0..dc08e7532fd 100644
--- a/sysutils/xcdroast/pkg/PLIST
+++ b/sysutils/xcdroast/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/10 23:23:35 frueauf Exp $
-bin/xcdrgtk
+@comment $NetBSD: PLIST,v 1.2 2001/08/07 11:27:36 drochner Exp $
+bin/xcdroast
lib/xcdroast-0.98/bin/wavplay
lib/xcdroast-0.98/bin/rmtool
lib/xcdroast-0.98/bin/vrfytool
lib/xcdroast-0.98/bin/cddbtool
+lib/xcdroast-0.98/bin/xcdrwrap
lib/xcdroast-0.98/icons/burnproof.gif
lib/xcdroast-0.98/icons/cddblogo.gif
lib/xcdroast-0.98/icons/dialog_default.png