More fixes:

- Don't hardcode "gtk12-config", but use GTK_CONFIG and IMLIB_CONFIG vars.
- patch improvement
- plist fixes
- remove added group cdwrite on deinstall

- chown root:cdwrite various utilities used by xcdroast, such as
  cdrecord, and set them chmod 4710.  I don't know if I like this.
  Opinions (Security Officer?)?

3 files changed, 25 insertions, 18 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 915c11dd0201..df8f7797a620 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -21,23 +21,25 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 USE_IMLIB=	yes
 
+MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
+		IMLIB_CONFIG="${IMLIB_CONFIG}"
+
 post-patch:
 	for i in xcdroast.h Makefile ; do \
 	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
 	done
 
-post-install:
+	for i in Makefile ; do \
+	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
+	done
 
-	${LN} -sf ${LOCALBASE}/bin/cdrecord ${PREFIX}/lib/xcdroast-0.98/bin/cdrecord
-	${LN} -sf ${LOCALBASE}/bin/mkisofs ${PREFIX}/lib/xcdroast-0.98/bin/mkisofs
-	${LN} -sf ${LOCALBASE}/bin/cdda2wav ${PREFIX}/lib/xcdroast-0.98/bin/cdda2wav
-	${LN} -sf ${LOCALBASE}/bin/readcd ${PREFIX}/lib/xcdroast-0.98/bin/readcd
+post-install:
 
 	/usr/sbin/pw groupadd -n cdwrite
 
-	for i in cdrecord cdda2wav mkisofs readcd ; do \
-	    ${CHOWN} root:cdwrite ${PREFIX}/bin/$i && \
-	    ${CHMOD} 4710 ${PREFIX}/bin/$i ; \
+	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
diff --git a/sysutils/xcdroast/files/patch-Makefile b/sysutils/xcdroast/files/patch-Makefile
index 8b745c967a72..7356c3bbc034 100644
--- a/sysutils/xcdroast/files/patch-Makefile
+++ b/sysutils/xcdroast/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	Tue Jul 17 23:46:26 2001
-+++ Makefile	Sat Aug 18 20:15:52 2001
-@@ -6,7 +6,7 @@
++++ Makefile	Tue Aug 21 13:07:40 2001
+@@ -6,13 +6,13 @@
  # Installation prefix directory:
  
  #PREFIX=/usr
@@ -9,17 +9,25 @@
  PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98
  
  # put here the prefix where you want xcdroast to look for 
+ # cdrecord/mkisofs/readcd/cdda2wav. 
+ # e.g. /usr
+-CDRTOOLS_PREFIX=$(PREFIX)
++CDRTOOLS_PREFIX=%%LOCALBASE%%
+ 
+ # for linux
+ INSTALL=/usr/bin/install -c
 @@ -23,10 +23,10 @@
  
  #---
  
 -CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
-+CFLAGS=-Wall `gtk12-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)\""
+-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 
 -TOOLLIBS=`gtk-config --libs`
-+LIBS=`gtk12-config --libs` `imlib-config --libs` -lgdk_imlib 
-+TOOLLIBS=`gtk12-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 
++TOOLLIBS=`${GTK_CONFIG} --libs`
  CC=gcc
  
  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/pkg-plist b/sysutils/xcdroast/pkg-plist
index 760c21bb86c1..47cada07d392 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -15,13 +15,10 @@ 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/mkisofs
-lib/xcdroast-0.98/bin/cdrecord
-lib/xcdroast-0.98/bin/cdda2wav
-lib/xcdroast-0.98/bin/readcd
 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