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

(-)/usr/ports/sysutils/xcdroast/Makefile (-23 / +4 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	xcdroast
8
PORTNAME=	xcdroast
9
PORTVERSION=	0.98.a.9
9
PORTVERSION=	0.98.a.10
10
CATEGORIES=	sysutils
10
CATEGORIES=	sysutils
11
MASTER_SITES=	http://www.xcdroast.org/download/
11
MASTER_SITES=	http://www.xcdroast.org/download/
12
DISTNAME=	${PORTNAME}-0.98alpha9
12
DISTNAME=	${PORTNAME}-0.98alpha10
13
13
14
MAINTAINER=	lehmann@ans-netz.de
14
MAINTAINER=	lehmann@ans-netz.de
15
15
Lines 22-27 Link Here
22
USE_IMLIB=	yes
22
USE_IMLIB=	yes
23
23
24
MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
24
MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
25
		GLIB_CONFIG="${GLIB_CONFIG}" \
25
		IMLIB_CONFIG="${IMLIB_CONFIG}"
26
		IMLIB_CONFIG="${IMLIB_CONFIG}"
26
27
27
post-patch:
28
post-patch:
Lines 29-59 Link Here
29
	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
30
	  ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \
30
	done
31
	done
31
32
32
	for i in Makefile ; do \
33
	for i in Makefile xcdroast.h ; do \
33
	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
34
	  ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \
34
	done
35
	done
35
36
36
post-install:
37
post-install:
37
	@${CAT} ${PKGMESSAGE}
38
	@${CAT} ${PKGMESSAGE}
38
39
enable-nonroot:
40
41
	/usr/sbin/pw groupadd -n cdwrite
42
43
	for i in cdrecord cdda2wav mkisofs readcd; do \
44
	    ${CHOWN} root:cdwrite ${LOCALBASE}/bin/$$i ; \
45
	    ${CHMOD} 4710 ${LOCALBASE}/bin/$$i ; \
46
	done
47
48
	${CHOWN} root:cdwrite ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap
49
	${CHMOD} 2755 ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap
50
51
	@${ECHO} ""
52
	@${ECHO} "***************************************************************"
53
	@${ECHO} " The first time root have to start xcdroast, to create the"
54
	@${ECHO} " root-configuration-file ${PREFIX}/etc/xcdroast.conf. Without"
55
	@${ECHO} " this file, a normal user will get an error message."
56
	@${ECHO} "***************************************************************"
57
	@${ECHO} ""
58
39
59
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)/usr/ports/sysutils/xcdroast/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (xcdroast-0.98alpha9.tar.gz) = 543d3237e7109572f5fcb6bdc6cf3e44
1
MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8
(-)/usr/ports/sysutils/xcdroast/files/patch-Makefile (-10 / +11 lines)
Lines 1-5 Link Here
1
--- Makefile.orig	Tue Jul 17 23:46:26 2001
1
--- Makefile.orig	Tue Apr 23 21:23:10 2002
2
+++ Makefile	Tue Aug 21 13:07:40 2001
2
+++ Makefile	Fri May 17 16:32:22 2002
3
@@ -6,13 +6,13 @@
3
@@ -6,13 +6,13 @@
4
 # Installation prefix directory:
4
 # Installation prefix directory:
5
 
5
 
Lines 16-33 Link Here
16
 
16
 
17
 # for linux
17
 # for linux
18
 INSTALL=/usr/bin/install -c
18
 INSTALL=/usr/bin/install -c
19
@@ -23,10 +23,10 @@
19
@@ -29,11 +29,11 @@
20
 
20
 
21
 #---
21
 #---
22
 
22
 
23
-CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
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)\""
24
-CFLAGS2=-Wall `glib-config --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" $(EXTRA_CFLAGS)
25
-LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib 
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` 
26
-TOOLLIBS=`gtk-config --libs`
29
-TOOLLIBS=`gtk-config --libs`
27
+CFLAGS=-Wall `${GTK_CONFIG} --cflags` `${IMLIB_CONFIG} --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
30
+LIBS=`${GTK_CONFIG} --libs` `gdk-pixbuf-config --libs` 
28
+CFLAGS2=-Wall `${GTK_CONFIG} --cflags --libs` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\""
29
+LIBS=`${GTK_CONFIG} --libs` `${IMLIB_CONFIG} --libs` -lgdk_imlib 
30
+TOOLLIBS=`${GTK_CONFIG} --libs`
31
+TOOLLIBS=`${GTK_CONFIG} --libs`
31
 CC=gcc
32
 CC=cc
32
 
33
 
33
 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
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)
Line 0 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-xcdrdata.h (+10 lines)
Line 0 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 (-7 / +46 lines)
Lines 1-11 Link Here
1
--- xcdroast.h.orig	Tue Aug 14 00:15:43 2001
1
--- xcdroast.h.orig	Tue Apr 23 20:55:27 2002
2
+++ xcdroast.h	Tue Aug 14 00:46:08 2001
2
+++ xcdroast.h	Fri May 17 17:19:29 2002
3
@@ -89,14 +89,14 @@
3
@@ -41,12 +41,12 @@
4
 #define SAVEMASTERTRACK "mkisofs.out"
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 "/usr/local/bin/cdrecord" 
27
+#define CDDA2WAV "/usr/local/bin/cdda2wav"
28
+#define READCD "/usr/local/bin/readcd"
29
+#define MKISOFS "/usr/local/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"
5
 
44
 
6
 /* default paths/configfile */
45
 /* default paths/configfile */
7
-#define PREFIX "/usr/local"
46
-#define PREFIX "/usr/local"
8
+#define PREFIX "%%PREFIX%%"
47
+#define PREFIX "/usr/X11R6"
9
 #define LIBDIR "lib/xcdroast-0.98"
48
 #define LIBDIR "lib/xcdroast-0.98"
10
 #define CONFIGDIR "~/.xcdroast"
49
 #define CONFIGDIR "~/.xcdroast"
11
 #define CONFFILE "xcdr098.cfg"
50
 #define CONFFILE "xcdr098.cfg"
Lines 13-19 Link Here
13
 #define ISOOPTFILE "isoopt.cfg"
52
 #define ISOOPTFILE "isoopt.cfg"
14
 #define ISOHEADERFILE "isoheader.cfg"
53
 #define ISOHEADERFILE "isoheader.cfg"
15
-#define ROOTCONFIG "/etc/xcdroast.conf"
54
-#define ROOTCONFIG "/etc/xcdroast.conf"
16
+#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf"
55
+#define ROOTCONFIG "/usr/X11R6/etc/xcdroast.conf"
56
 #define NONROOTBAK "nonrootflags.cfg"
17
 
57
 
18
 /* language stuff*/
58
 /* language stuff*/
19
 #define MAXENTRIES 512 
(-)/usr/ports/sysutils/xcdroast/pkg-message (-2 / +2 lines)
Lines 2-8 Link Here
2
                         ATTENTION!
2
                         ATTENTION!
3
3
4
You must be root to use xcdroast.  To use it as normal user,
4
You must be root to use xcdroast.  To use it as normal user,
5
type "make enable-nonroot" in the ports' directory.
5
click "enable-nonroot" after starting it at first as root.
6
But beware!  This is a security risk!
6
But beware!  This is a security risk!
7
It modifies the following files and gives them the
7
It modifies the following files and gives them the
8
set-user-ID-on-execution bit:
8
set-user-ID-on-execution bit:
Lines 12-18 Link Here
12
cdda2wav(1)
12
cdda2wav(1)
13
mkisofs(8)
13
mkisofs(8)
14
14
15
All members of group "cdwrite" are able to run these files
15
All members of group "xcdwrite" are able to run these files
16
as root.  Usually, these group has no members.
16
as root.  Usually, these group has no members.
17
17
18
************************************************************
18
************************************************************
(-)/usr/ports/sysutils/xcdroast/pkg-plist (-6 / +12 lines)
Lines 1-4 Link Here
1
bin/xcdroast
1
bin/xcdroast
2
lib/xcdroast-0.98/bin/cdda2wav
3
lib/xcdroast-0.98/bin/cddbtool
4
lib/xcdroast-0.98/bin/cdrecord
5
lib/xcdroast-0.98/bin/mkisofs
6
lib/xcdroast-0.98/bin/readcd
7
lib/xcdroast-0.98/bin/rmtool
8
lib/xcdroast-0.98/bin/vrfytool
9
lib/xcdroast-0.98/bin/wavplay
10
lib/xcdroast-0.98/bin/xcdrwrap
2
lib/xcdroast-0.98/icons/burnproof.gif
11
lib/xcdroast-0.98/icons/burnproof.gif
3
lib/xcdroast-0.98/icons/cddblogo.gif
12
lib/xcdroast-0.98/icons/cddblogo.gif
4
lib/xcdroast-0.98/icons/dialog_default.png
13
lib/xcdroast-0.98/icons/dialog_default.png
Lines 6-24 Link Here
6
lib/xcdroast-0.98/icons/dialog_information.png
15
lib/xcdroast-0.98/icons/dialog_information.png
7
lib/xcdroast-0.98/icons/dialog_question.png
16
lib/xcdroast-0.98/icons/dialog_question.png
8
lib/xcdroast-0.98/icons/dialog_warning.png
17
lib/xcdroast-0.98/icons/dialog_warning.png
18
lib/xcdroast-0.98/icons/xcdricon.gif
9
lib/xcdroast-0.98/icons/xcdrlogo.gif
19
lib/xcdroast-0.98/icons/xcdrlogo.gif
20
lib/xcdroast-0.98/icons/xcdrlogo2.gif
10
lib/xcdroast-0.98/lang/lang_extract.sh
21
lib/xcdroast-0.98/lang/lang_extract.sh
11
lib/xcdroast-0.98/lang/langhelp.def
22
lib/xcdroast-0.98/lang/langhelp.def
12
lib/xcdroast-0.98/lang/language.def
23
lib/xcdroast-0.98/lang/language.def
13
lib/xcdroast-0.98/sound/test.wav
24
lib/xcdroast-0.98/sound/test.wav
14
lib/xcdroast-0.98/bin/cddbtool
15
lib/xcdroast-0.98/bin/rmtool
16
lib/xcdroast-0.98/bin/vrfytool
17
lib/xcdroast-0.98/bin/wavplay
18
lib/xcdroast-0.98/bin/xcdrwrap
19
@dirrm lib/xcdroast-0.98/bin
25
@dirrm lib/xcdroast-0.98/bin
20
@dirrm lib/xcdroast-0.98/icons
26
@dirrm lib/xcdroast-0.98/icons
21
@dirrm lib/xcdroast-0.98/lang
27
@dirrm lib/xcdroast-0.98/lang
22
@dirrm lib/xcdroast-0.98/sound
28
@dirrm lib/xcdroast-0.98/sound
23
@dirrm lib/xcdroast-0.98
29
@dirrm lib/xcdroast-0.98
24
@unexec /usr/sbin/pw groupdel -n cdwrite
30
@unexec /usr/sbin/pw groupdel -n xcdwrite

Return to bug 38185