8 files changed, 96 insertions, 47 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 1799f6374634..f2e5cdb501c5 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xcdroast
-PORTVERSION=	0.98.a.9
+PORTVERSION=	0.98.a.10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.xcdroast.org/download/
-DISTNAME=	${PORTNAME}-0.98alpha9
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./alpha/}
 
 MAINTAINER=	lehmann@ans-netz.de
 
@@ -22,6 +22,7 @@ USE_GTK=	yes
 USE_IMLIB=	yes
 
 MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
 		IMLIB_CONFIG="${IMLIB_CONFIG}"
 
 post-patch:
@@ -29,31 +30,11 @@ post-patch:
 	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
 	done
 
-	for i in Makefile ; do \
+	for i in Makefile xcdroast.h ; do \
 	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
 	done
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-enable-nonroot:
-
-	/usr/sbin/pw groupadd -n cdwrite
-
-	for i in cdrecord cdda2wav mkisofs readcd; do \
-	    ${CHOWN} root:cdwrite ${LOCALBASE}/bin/$$i ; \
-	    ${CHMOD} 4710 ${LOCALBASE}/bin/$$i ; \
-	done
-
-	${CHOWN} root:cdwrite ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap
-	${CHMOD} 2755 ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap
-
-	@${ECHO} ""
-	@${ECHO} "***************************************************************"
-	@${ECHO} " The first time root have to start xcdroast, to create the"
-	@${ECHO} " root-configuration-file ${PREFIX}/etc/xcdroast.conf. Without"
-	@${ECHO} " this file, a normal user will get an error message."
-	@${ECHO} "***************************************************************"
-	@${ECHO} ""
-
 .include <bsd.port.mk>
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index dbaba1e26412..ad31a86a134e 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1 +1 @@
-MD5 (xcdroast-0.98alpha9.tar.gz) = 543d3237e7109572f5fcb6bdc6cf3e44
+MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8
diff --git a/sysutils/xcdroast/files/patch-Makefile b/sysutils/xcdroast/files/patch-Makefile
index 7356c3bbc034..78fcebcbbe80 100644
--- a/sysutils/xcdroast/files/patch-Makefile
+++ b/sysutils/xcdroast/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Jul 17 23:46:26 2001
-+++ Makefile	Tue Aug 21 13:07:40 2001
+--- Makefile.orig	Tue Apr 23 21:23:10 2002
++++ Makefile	Fri May 17 16:32:22 2002
 @@ -6,13 +6,13 @@
  # Installation prefix directory:
  
@@ -16,18 +16,19 @@
  
  # for linux
  INSTALL=/usr/bin/install -c
-@@ -23,10 +23,10 @@
+@@ -29,11 +29,11 @@
  
  #---
  
--CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
--CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
--LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib 
+-CFLAGS=-Wall `gtk-config --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
+-CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
++CFLAGS=-Wall `${GTK_CONFIG} --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
++CFLAGS2=-Wall `${GLIB_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
+ 
+-LIBS=`gtk-config --libs` `gdk-pixbuf-config --libs` 
 -TOOLLIBS=`gtk-config --libs`
-+CFLAGS=-Wall `${GTK_CONFIG} --cflags` `${IMLIB_CONFIG} --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
-+CFLAGS2=-Wall `${GTK_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
-+LIBS=`${GTK_CONFIG} --libs` `${IMLIB_CONFIG} --libs` -lgdk_imlib 
++LIBS=`${GTK_CONFIG} --libs` `gdk-pixbuf-config --libs` 
 +TOOLLIBS=`${GTK_CONFIG} --libs`
- CC=gcc
+ CC=cc
  
  OBJ = main.o language.o init.o tools.o xtools.o menus.o setup.o io.o duplicate.o wav_frontend.o wav_id.o create.o
diff --git a/sysutils/xcdroast/files/patch-io.c b/sysutils/xcdroast/files/patch-io.c
new file mode 100644
index 000000000000..e8ca0c13d2aa
--- /dev/null
+++ b/sysutils/xcdroast/files/patch-io.c
@@ -0,0 +1,12 @@
+--- io.c.orig	Fri May 17 17:12:28 2002
++++ io.c	Fri May 17 17:12:44 2002
+@@ -8492,7 +8492,8 @@
+ 			return 1;
+ 		} else {
+ 			/* create command to create new group */
+-			g_snprintf(tmp,MAXLINE,"%s %s\n", GROUPADD, NONROOTMODEGROUP);
++
++			g_snprintf(tmp,MAXLINE,"%s groupadd -n %s\n", GROUPADD, NONROOTMODEGROUP);
+ 			strcat(ret,tmp);
+ 		}	
+ 	 }
diff --git a/sysutils/xcdroast/files/patch-xcdrdata.h b/sysutils/xcdroast/files/patch-xcdrdata.h
new file mode 100644
index 000000000000..64ca43e39e67
--- /dev/null
+++ b/sysutils/xcdroast/files/patch-xcdrdata.h
@@ -0,0 +1,10 @@
+--- xcdrdata.h.orig	Fri May 17 16:40:55 2002
++++ xcdrdata.h	Fri May 17 16:40:30 2002
+@@ -3,6 +3,7 @@
+ */
+ 
+ #include <time.h>
++#include <sys/types.h>
+ 
+ typedef struct setup_data {
+ 	gint writer_devnr;
diff --git a/sysutils/xcdroast/files/patch-xcdroast.h b/sysutils/xcdroast/files/patch-xcdroast.h
index da1959a6f648..bf6fd8e18bd2 100644
--- a/sysutils/xcdroast/files/patch-xcdroast.h
+++ b/sysutils/xcdroast/files/patch-xcdroast.h
@@ -1,7 +1,46 @@
---- xcdroast.h.orig	Tue Aug 14 00:15:43 2001
-+++ xcdroast.h	Tue Aug 14 00:46:08 2001
-@@ -89,14 +89,14 @@
- #define SAVEMASTERTRACK "mkisofs.out"
+--- xcdroast.h.orig	Tue Apr 23 20:55:27 2002
++++ xcdroast.h	Fri May 17 17:19:29 2002
+@@ -41,12 +41,12 @@
+ #define UNAME "/bin/uname -a"
+ #define UNAME2 "/usr/bin/uname -a"
+ #define CHOWN "/bin/chown"
+-#define CHOWN2 "/usr/bin/chown"
++#define CHOWN2 "/usr/sbin/chown"
+ #define CHGRP "/bin/chgrp"
+ #define CHGRP2 "/usr/bin/chgrp"
+ #define CHMOD "/bin/chmod"
+ #define CHMOD2 "/usr/bin/chmod"
+-#define GROUPADD "/usr/sbin/groupadd"
++#define GROUPADD "/usr/sbin/pw"
+ 
+ #define WAVPLAY "bin/wavplay"
+ #define RMTOOL "bin/rmtool"
+@@ -59,10 +59,10 @@
+    then in $PREFIX (e.g. /usr/bin/cdrecord instead of 
+    /usr/local/lib/xcdroast-0.98/bin/cdrecord) */
+ 
+-#define CDRECORD "bin/cdrecord" 
+-#define CDDA2WAV "bin/cdda2wav"
+-#define READCD "bin/readcd"
+-#define MKISOFS "bin/mkisofs"
++#define CDRECORD "%%LOCALBASE%%/bin/cdrecord" 
++#define CDDA2WAV "%%LOCALBASE%%/bin/cdda2wav"
++#define READCD "%%LOCALBASE%%/bin/readcd"
++#define MKISOFS "%%LOCALBASE%%/bin/mkisofs"
+ 
+ /* MINIMUM required versions. Greater versions are now silently
+    accepted. 
+@@ -70,7 +70,7 @@
+    IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */
+  
+ #define CDRECORD_VERSION "1.11a19"
+-#define MKISOFS_VERSION "1.15a17"
++#define MKISOFS_VERSION "1.15a21"
+ #define CDDA2WAV_VERSION "1.11a19"
+ #define READCD_VERSION "1.11a19"
+ 
+@@ -116,14 +116,14 @@
+ #define SAVEMASTERLIST "xcdrmaster.lst"
  
  /* default paths/configfile */
 -#define PREFIX "/usr/local"
@@ -14,6 +53,6 @@
  #define ISOHEADERFILE "isoheader.cfg"
 -#define ROOTCONFIG "/etc/xcdroast.conf"
 +#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf"
+ #define NONROOTBAK "nonrootflags.cfg"
  
  /* language stuff*/
- #define MAXENTRIES 512 
diff --git a/sysutils/xcdroast/pkg-message b/sysutils/xcdroast/pkg-message
index d34149f1a1c0..3ae2ce099f95 100644
--- a/sysutils/xcdroast/pkg-message
+++ b/sysutils/xcdroast/pkg-message
@@ -2,7 +2,7 @@
                          ATTENTION!
 
 You must be root to use xcdroast.  To use it as normal user,
-type "make enable-nonroot" in the ports' directory.
+click "enable-nonroot" after starting it at first as root.
 But beware!  This is a security risk!
 It modifies the following files and gives them the
 set-user-ID-on-execution bit:
@@ -12,7 +12,7 @@ readcd(1)
 cdda2wav(1)
 mkisofs(8)
 
-All members of group "cdwrite" are able to run these files
+All members of group "xcdwrite" are able to run these files
 as root.  Usually, these group has no members.
 
 ************************************************************
diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist
index 47cada07d392..2f7f046b05ab 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -1,4 +1,13 @@
 bin/xcdroast
+lib/xcdroast-0.98/bin/cdda2wav
+lib/xcdroast-0.98/bin/cddbtool
+lib/xcdroast-0.98/bin/cdrecord
+lib/xcdroast-0.98/bin/mkisofs
+lib/xcdroast-0.98/bin/readcd
+lib/xcdroast-0.98/bin/rmtool
+lib/xcdroast-0.98/bin/vrfytool
+lib/xcdroast-0.98/bin/wavplay
+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
@@ -6,19 +15,16 @@ lib/xcdroast-0.98/icons/dialog_error.png
 lib/xcdroast-0.98/icons/dialog_information.png
 lib/xcdroast-0.98/icons/dialog_question.png
 lib/xcdroast-0.98/icons/dialog_warning.png
+lib/xcdroast-0.98/icons/xcdricon.gif
 lib/xcdroast-0.98/icons/xcdrlogo.gif
+lib/xcdroast-0.98/icons/xcdrlogo2.gif
 lib/xcdroast-0.98/lang/lang_extract.sh
 lib/xcdroast-0.98/lang/langhelp.def
 lib/xcdroast-0.98/lang/language.def
 lib/xcdroast-0.98/sound/test.wav
-lib/xcdroast-0.98/bin/cddbtool
-lib/xcdroast-0.98/bin/rmtool
-lib/xcdroast-0.98/bin/vrfytool
-lib/xcdroast-0.98/bin/wavplay
-lib/xcdroast-0.98/bin/xcdrwrap
 @dirrm lib/xcdroast-0.98/bin
 @dirrm lib/xcdroast-0.98/icons
 @dirrm lib/xcdroast-0.98/lang
 @dirrm lib/xcdroast-0.98/sound
 @dirrm lib/xcdroast-0.98
-@unexec /usr/sbin/pw groupdel -n cdwrite
+@unexec /usr/sbin/pw groupdel -n xcdwrite