Upgrade to 0.98.a.13.

PR:		ports/46697
Submitted by:	maintainer

8 files changed, 73 insertions, 135 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 835b2efb739c..987f3dec9172 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	xcdroast
-PORTVERSION=	0.98.a.10
+PORTVERSION=	0.98.a.13
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.xcdroast.org/download/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.xcdroast.org/download/
+MASTER_SITE_SUBDIR=	xcdroast
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./alpha/}
 
 MAINTAINER=	lehmann@ans-netz.de
@@ -17,26 +19,34 @@ RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	imlib gdkpixbuf
+USE_GNOME=	gdkpixbuf
+GNU_CONFIGURE=	yes
 
-MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		IMLIB_CONFIG="${IMLIB_CONFIG}"
+CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}"
 
 MAN1=		xcdroast.1
 
-post-patch:
-	for i in xcdroast.h Makefile ; do \
-	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
-	done
+.if defined(WITH_NONROOT)
+CONFIGURE_ARGS+=--enable-nonrootmode
+.else
+CONFIGURE_ARGS+=--disable-nonrootmode
+.endif
+
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "      WITH_NONROOT=yes Use xcdroast w/o beeing root"
+	@${ECHO} ""
 
-	for i in Makefile xcdroast.h ; do \
-	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
-	done
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g; \
+	                 s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/xcdroast.h;
 
 post-install:
+.if defined(WITH_NONROOT)
 	@${CAT} ${PKGMESSAGE}
-
+.endif
 .include <bsd.port.mk>
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index ad31a86a134e..382a5ffbbba2 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1 +1 @@
-MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8
+MD5 (xcdroast-0.98alpha13.tar.gz) = ba5d006cc8a9d13c223ccc11c2fc088a
diff --git a/sysutils/xcdroast/files/patch-Makefile b/sysutils/xcdroast/files/patch-Makefile
deleted file mode 100644
index 78fcebcbbe80..000000000000
--- a/sysutils/xcdroast/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	Tue Apr 23 21:23:10 2002
-+++ Makefile	Fri May 17 16:32:22 2002
-@@ -6,13 +6,13 @@
- # Installation prefix directory:
- 
- #PREFIX=/usr
--PREFIX=/usr/local
-+PREFIX=%%PREFIX%%
- 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
-@@ -29,11 +29,11 @@
- 
- #---
- 
--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`
-+LIBS=`${GTK_CONFIG} --libs` `gdk-pixbuf-config --libs` 
-+TOOLLIBS=`${GTK_CONFIG} --libs`
- 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
deleted file mode 100644
index e8ca0c13d2aa..000000000000
--- a/sysutils/xcdroast/files/patch-io.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-src::xcdroast.h b/sysutils/xcdroast/files/patch-src::xcdroast.h
new file mode 100644
index 000000000000..21197a15ceae
--- /dev/null
+++ b/sysutils/xcdroast/files/patch-src::xcdroast.h
@@ -0,0 +1,19 @@
+--- src/xcdroast.h.orig	Fri Dec 27 18:57:24 2002
++++ src/xcdroast.h	Fri Dec 27 18:59:40 2002
+@@ -99,11 +99,11 @@
+    then in $PREFIX (e.g. /usr/bin/cdrecord instead of 
+    /usr/local/lib/xcdroast-0.98/bin/cdrecord) */
+ 
+-#define CDRECORD "bin/cdrecord" 
+-#define CDRECORDPRODVD "bin/cdrecord.prodvd" 
+-#define CDDA2WAV "bin/cdda2wav"
+-#define READCD "bin/readcd"
+-#define MKISOFS "bin/mkisofs"
++#define CDRECORD "%%LOCALBASE%%/bin/cdrecord" 
++#define CDRECORDPRODVD "%%LOCALBASE%%/bin/cdrecord.prodvd" 
++#define CDDA2WAV "%%LOCALBASE%%/bin/cdda2wav"
++#define READCD "%%LOCALBASE%%/bin/readcd"
++#define MKISOFS "%%LOCALBASE%%/bin/mkisofs"
+ 
+ /* MINIMUM required versions. Greater versions are now silently
+    accepted. 
diff --git a/sysutils/xcdroast/files/patch-xcdrdata.h b/sysutils/xcdroast/files/patch-xcdrdata.h
deleted file mode 100644
index 64ca43e39e67..000000000000
--- a/sysutils/xcdroast/files/patch-xcdrdata.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index bf6fd8e18bd2..000000000000
--- a/sysutils/xcdroast/files/patch-xcdroast.h
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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"
-+#define PREFIX "%%PREFIX%%"
- #define LIBDIR "lib/xcdroast-0.98"
- #define CONFIGDIR "~/.xcdroast"
- #define CONFFILE "xcdr098.cfg"
- #define LOGFILE "xcdr098.log"
- #define ISOOPTFILE "isoopt.cfg"
- #define ISOHEADERFILE "isoheader.cfg"
--#define ROOTCONFIG "/etc/xcdroast.conf"
-+#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf"
- #define NONROOTBAK "nonrootflags.cfg"
- 
- /* language stuff*/
diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist
index 1551f2cef7ed..12df2d452f5f 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -1,4 +1,5 @@
 bin/xcdroast
+lib/charset.alias
 lib/xcdroast-0.98/bin/cddbtool
 lib/xcdroast-0.98/bin/rmtool
 lib/xcdroast-0.98/bin/vrfytool
@@ -12,15 +13,37 @@ 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/xcdricon.png
 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
+share/locale/bg/LC_MESSAGES/xcdroast.mo
+share/locale/ca/LC_MESSAGES/xcdroast.mo
+share/locale/cs/LC_MESSAGES/xcdroast.mo
+share/locale/da/LC_MESSAGES/xcdroast.mo
+share/locale/de/LC_MESSAGES/xcdroast.mo
+share/locale/es/LC_MESSAGES/xcdroast.mo
+share/locale/et/LC_MESSAGES/xcdroast.mo
+share/locale/fi/LC_MESSAGES/xcdroast.mo
+share/locale/fr/LC_MESSAGES/xcdroast.mo
+share/locale/gl/LC_MESSAGES/xcdroast.mo
+share/locale/hr/LC_MESSAGES/xcdroast.mo
+share/locale/hu/LC_MESSAGES/xcdroast.mo
+share/locale/id/LC_MESSAGES/xcdroast.mo
+share/locale/it/LC_MESSAGES/xcdroast.mo
+share/locale/ja/LC_MESSAGES/xcdroast.mo
+share/locale/locale.alias
+share/locale/nl/LC_MESSAGES/xcdroast.mo
+share/locale/no/LC_MESSAGES/xcdroast.mo
+share/locale/pl/LC_MESSAGES/xcdroast.mo
+share/locale/pt_BR/LC_MESSAGES/xcdroast.mo
+share/locale/ru/LC_MESSAGES/xcdroast.mo
+share/locale/sk/LC_MESSAGES/xcdroast.mo
+share/locale/sv/LC_MESSAGES/xcdroast.mo
+share/locale/tr/LC_MESSAGES/xcdroast.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
 @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 if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi