View | Details | Raw Unified | Return to bug 46697
Collapse All | Expand All

(-)/usr/ports/sysutils/xcdroast/Makefile (-15 / +25 lines)
Lines 6-14 Link Here
6
#
6
#
7
7
8
PORTNAME=	xcdroast
8
PORTNAME=	xcdroast
9
PORTVERSION=	0.98.a.10
9
PORTVERSION=	0.98.a.13
10
CATEGORIES=	sysutils
10
CATEGORIES=	sysutils
11
MASTER_SITES=	http://www.xcdroast.org/download/
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
12
		http://www.xcdroast.org/download/
13
MASTER_SITE_SUBDIR=	xcdroast
12
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./alpha/}
14
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./alpha/}
13
15
14
MAINTAINER=	lehmann@ans-netz.de
16
MAINTAINER=	lehmann@ans-netz.de
Lines 17-42 Link Here
17
		mkisofs:${PORTSDIR}/sysutils/mkisofs
19
		mkisofs:${PORTSDIR}/sysutils/mkisofs
18
20
19
USE_X_PREFIX=	yes
21
USE_X_PREFIX=	yes
20
USE_GMAKE=	yes
21
USE_GNOMENG=	yes
22
USE_GNOMENG=	yes
22
USE_GNOME=	imlib gdkpixbuf
23
USE_GNOME=	gdkpixbuf
24
GNU_CONFIGURE=	yes
23
25
24
MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
26
CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
25
		GLIB_CONFIG="${GLIB_CONFIG}" \
27
		GLIB_CONFIG="${GLIB_CONFIG}"
26
		IMLIB_CONFIG="${IMLIB_CONFIG}"
27
28
28
MAN1=		xcdroast.1
29
MAN1=		xcdroast.1
29
30
31
.if defined(WITH_NONROOT)
32
CONFIGURE_ARGS+=--enable-nonrootmode
33
.else
34
CONFIGURE_ARGS+=--disable-nonrootmode
35
.endif
36
37
pre-everything::
38
	@${ECHO} ""
39
	@${ECHO} "You may use the following build options:"
40
	@${ECHO} ""
41
	@${ECHO} "      WITH_NONROOT=yes Use xcdroast w/o beeing root"
42
	@${ECHO} ""
43
30
post-patch:
44
post-patch:
31
	for i in xcdroast.h Makefile ; do \
45
	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g; \
32
	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
46
	                 s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/xcdroast.h;
33
	done
34
35
	for i in Makefile xcdroast.h ; do \
36
	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
37
	done
38
47
39
post-install:
48
post-install:
49
.if defined(WITH_NONROOT)
40
	@${CAT} ${PKGMESSAGE}
50
	@${CAT} ${PKGMESSAGE}
41
51
.endif
42
.include <bsd.port.mk>
52
.include <bsd.port.mk>
(-)/usr/ports/sysutils/xcdroast/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8
1
MD5 (xcdroast-0.98alpha13.tar.gz) = ba5d006cc8a9d13c223ccc11c2fc088a
(-)/usr/ports/sysutils/xcdroast/files/patch-Makefile (-34 lines)
Lines 1-34 Link Here
1
--- Makefile.orig	Tue Apr 23 21:23:10 2002
2
+++ Makefile	Fri May 17 16:32:22 2002
3
@@ -6,13 +6,13 @@
4
 # Installation prefix directory:
5
 
6
 #PREFIX=/usr
7
-PREFIX=/usr/local
8
+PREFIX=%%PREFIX%%
9
 PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98
10
 
11
 # put here the prefix where you want xcdroast to look for 
12
 # cdrecord/mkisofs/readcd/cdda2wav. 
13
 # e.g. /usr
14
-CDRTOOLS_PREFIX=$(PREFIX)
15
+CDRTOOLS_PREFIX=%%LOCALBASE%%
16
 
17
 # for linux
18
 INSTALL=/usr/bin/install -c
19
@@ -29,11 +29,11 @@
20
 
21
 #---
22
 
23
-CFLAGS=-Wall `gtk-config --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
24
-CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
25
+CFLAGS=-Wall `${GTK_CONFIG} --cflags` `gdk-pixbuf-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
26
+CFLAGS2=-Wall `${GLIB_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
27
 
28
-LIBS=`gtk-config --libs` `gdk-pixbuf-config --libs` 
29
-TOOLLIBS=`gtk-config --libs`
30
+LIBS=`${GTK_CONFIG} --libs` `gdk-pixbuf-config --libs` 
31
+TOOLLIBS=`${GTK_CONFIG} --libs`
32
 CC=cc
33
 
34
 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
(-)/usr/ports/sysutils/xcdroast/files/patch-io.c (-12 lines)
Lines 1-12 Link Here
1
--- io.c.orig	Fri May 17 17:12:28 2002
2
+++ io.c	Fri May 17 17:12:44 2002
3
@@ -8492,7 +8492,8 @@
4
 			return 1;
5
 		} else {
6
 			/* create command to create new group */
7
-			g_snprintf(tmp,MAXLINE,"%s %s\n", GROUPADD, NONROOTMODEGROUP);
8
+
9
+			g_snprintf(tmp,MAXLINE,"%s groupadd -n %s\n", GROUPADD, NONROOTMODEGROUP);
10
 			strcat(ret,tmp);
11
 		}	
12
 	 }
(-)/usr/ports/sysutils/xcdroast/files/patch-src::xcdroast.h (+19 lines)
Line 0 Link Here
1
--- src/xcdroast.h.orig	Fri Dec 27 18:57:24 2002
2
+++ src/xcdroast.h	Fri Dec 27 18:59:40 2002
3
@@ -99,11 +99,11 @@
4
    then in $PREFIX (e.g. /usr/bin/cdrecord instead of 
5
    /usr/local/lib/xcdroast-0.98/bin/cdrecord) */
6
 
7
-#define CDRECORD "bin/cdrecord" 
8
-#define CDRECORDPRODVD "bin/cdrecord.prodvd" 
9
-#define CDDA2WAV "bin/cdda2wav"
10
-#define READCD "bin/readcd"
11
-#define MKISOFS "bin/mkisofs"
12
+#define CDRECORD "%%LOCALBASE%%/bin/cdrecord" 
13
+#define CDRECORDPRODVD "%%LOCALBASE%%/bin/cdrecord.prodvd" 
14
+#define CDDA2WAV "%%LOCALBASE%%/bin/cdda2wav"
15
+#define READCD "%%LOCALBASE%%/bin/readcd"
16
+#define MKISOFS "%%LOCALBASE%%/bin/mkisofs"
17
 
18
 /* MINIMUM required versions. Greater versions are now silently
19
    accepted. 
(-)/usr/ports/sysutils/xcdroast/files/patch-xcdrdata.h (-10 lines)
Lines 1-10 Link Here
1
--- xcdrdata.h.orig	Fri May 17 16:40:55 2002
2
+++ xcdrdata.h	Fri May 17 16:40:30 2002
3
@@ -3,6 +3,7 @@
4
 */
5
 
6
 #include <time.h>
7
+#include <sys/types.h>
8
 
9
 typedef struct setup_data {
10
 	gint writer_devnr;
(-)/usr/ports/sysutils/xcdroast/files/patch-xcdroast.h (-58 lines)
Lines 1-58 Link Here
1
--- xcdroast.h.orig	Tue Apr 23 20:55:27 2002
2
+++ xcdroast.h	Fri May 17 17:19:29 2002
3
@@ -41,12 +41,12 @@
4
 #define UNAME "/bin/uname -a"
5
 #define UNAME2 "/usr/bin/uname -a"
6
 #define CHOWN "/bin/chown"
7
-#define CHOWN2 "/usr/bin/chown"
8
+#define CHOWN2 "/usr/sbin/chown"
9
 #define CHGRP "/bin/chgrp"
10
 #define CHGRP2 "/usr/bin/chgrp"
11
 #define CHMOD "/bin/chmod"
12
 #define CHMOD2 "/usr/bin/chmod"
13
-#define GROUPADD "/usr/sbin/groupadd"
14
+#define GROUPADD "/usr/sbin/pw"
15
 
16
 #define WAVPLAY "bin/wavplay"
17
 #define RMTOOL "bin/rmtool"
18
@@ -59,10 +59,10 @@
19
    then in $PREFIX (e.g. /usr/bin/cdrecord instead of 
20
    /usr/local/lib/xcdroast-0.98/bin/cdrecord) */
21
 
22
-#define CDRECORD "bin/cdrecord" 
23
-#define CDDA2WAV "bin/cdda2wav"
24
-#define READCD "bin/readcd"
25
-#define MKISOFS "bin/mkisofs"
26
+#define CDRECORD "%%LOCALBASE%%/bin/cdrecord" 
27
+#define CDDA2WAV "%%LOCALBASE%%/bin/cdda2wav"
28
+#define READCD "%%LOCALBASE%%/bin/readcd"
29
+#define MKISOFS "%%LOCALBASE%%/bin/mkisofs"
30
 
31
 /* MINIMUM required versions. Greater versions are now silently
32
    accepted. 
33
@@ -70,7 +70,7 @@
34
    IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */
35
  
36
 #define CDRECORD_VERSION "1.11a19"
37
-#define MKISOFS_VERSION "1.15a17"
38
+#define MKISOFS_VERSION "1.15a21"
39
 #define CDDA2WAV_VERSION "1.11a19"
40
 #define READCD_VERSION "1.11a19"
41
 
42
@@ -116,14 +116,14 @@
43
 #define SAVEMASTERLIST "xcdrmaster.lst"
44
 
45
 /* default paths/configfile */
46
-#define PREFIX "/usr/local"
47
+#define PREFIX "%%PREFIX%%"
48
 #define LIBDIR "lib/xcdroast-0.98"
49
 #define CONFIGDIR "~/.xcdroast"
50
 #define CONFFILE "xcdr098.cfg"
51
 #define LOGFILE "xcdr098.log"
52
 #define ISOOPTFILE "isoopt.cfg"
53
 #define ISOHEADERFILE "isoheader.cfg"
54
-#define ROOTCONFIG "/etc/xcdroast.conf"
55
+#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf"
56
 #define NONROOTBAK "nonrootflags.cfg"
57
 
58
 /* language stuff*/
(-)/usr/ports/sysutils/xcdroast/pkg-plist (-5 / +28 lines)
Lines 1-4 Link Here
1
bin/xcdroast
1
bin/xcdroast
2
lib/charset.alias
2
lib/xcdroast-0.98/bin/cddbtool
3
lib/xcdroast-0.98/bin/cddbtool
3
lib/xcdroast-0.98/bin/rmtool
4
lib/xcdroast-0.98/bin/rmtool
4
lib/xcdroast-0.98/bin/vrfytool
5
lib/xcdroast-0.98/bin/vrfytool
Lines 12-26 Link Here
12
lib/xcdroast-0.98/icons/dialog_question.png
13
lib/xcdroast-0.98/icons/dialog_question.png
13
lib/xcdroast-0.98/icons/dialog_warning.png
14
lib/xcdroast-0.98/icons/dialog_warning.png
14
lib/xcdroast-0.98/icons/xcdricon.gif
15
lib/xcdroast-0.98/icons/xcdricon.gif
16
lib/xcdroast-0.98/icons/xcdricon.png
15
lib/xcdroast-0.98/icons/xcdrlogo.gif
17
lib/xcdroast-0.98/icons/xcdrlogo.gif
16
lib/xcdroast-0.98/icons/xcdrlogo2.gif
17
lib/xcdroast-0.98/lang/lang_extract.sh
18
lib/xcdroast-0.98/lang/langhelp.def
19
lib/xcdroast-0.98/lang/language.def
20
lib/xcdroast-0.98/sound/test.wav
18
lib/xcdroast-0.98/sound/test.wav
19
share/locale/bg/LC_MESSAGES/xcdroast.mo
20
share/locale/ca/LC_MESSAGES/xcdroast.mo
21
share/locale/cs/LC_MESSAGES/xcdroast.mo
22
share/locale/da/LC_MESSAGES/xcdroast.mo
23
share/locale/de/LC_MESSAGES/xcdroast.mo
24
share/locale/es/LC_MESSAGES/xcdroast.mo
25
share/locale/et/LC_MESSAGES/xcdroast.mo
26
share/locale/fi/LC_MESSAGES/xcdroast.mo
27
share/locale/fr/LC_MESSAGES/xcdroast.mo
28
share/locale/gl/LC_MESSAGES/xcdroast.mo
29
share/locale/hr/LC_MESSAGES/xcdroast.mo
30
share/locale/hu/LC_MESSAGES/xcdroast.mo
31
share/locale/id/LC_MESSAGES/xcdroast.mo
32
share/locale/it/LC_MESSAGES/xcdroast.mo
33
share/locale/ja/LC_MESSAGES/xcdroast.mo
34
share/locale/locale.alias
35
share/locale/nl/LC_MESSAGES/xcdroast.mo
36
share/locale/no/LC_MESSAGES/xcdroast.mo
37
share/locale/pl/LC_MESSAGES/xcdroast.mo
38
share/locale/pt_BR/LC_MESSAGES/xcdroast.mo
39
share/locale/ru/LC_MESSAGES/xcdroast.mo
40
share/locale/sk/LC_MESSAGES/xcdroast.mo
41
share/locale/sv/LC_MESSAGES/xcdroast.mo
42
share/locale/tr/LC_MESSAGES/xcdroast.mo
43
share/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
44
share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
21
@dirrm lib/xcdroast-0.98/bin
45
@dirrm lib/xcdroast-0.98/bin
22
@dirrm lib/xcdroast-0.98/icons
46
@dirrm lib/xcdroast-0.98/icons
23
@dirrm lib/xcdroast-0.98/lang
24
@dirrm lib/xcdroast-0.98/sound
47
@dirrm lib/xcdroast-0.98/sound
25
@dirrm lib/xcdroast-0.98
48
@dirrm lib/xcdroast-0.98
26
@unexec if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi
49
@unexec if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi

Return to bug 46697