Attachment 16292 Details for Bug 29925 – file.diff

[patch] file.diff

file.diff (text/plain), 3.89 KB, created by Oliver Lehmann on 2001-08-21 14:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Lehmann

Created: 2001-08-21 14:20:00 UTC

Size: 3.89 KB

patch

obsolete

>diff -ruN xcdroast.old/Makefile xcdroast/Makefile
>--- xcdroast.old/Makefile	Tue Aug 14 22:12:44 2001
>+++ xcdroast/Makefile	Tue Aug 21 15:13:39 2001
>@@ -21,23 +21,25 @@
> 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 -ruN xcdroast.old/files/patch-Makefile xcdroast/files/patch-Makefile
>--- xcdroast.old/files/patch-Makefile	Mon Aug 20 19:05:10 2001
>+++ xcdroast/files/patch-Makefile	Tue Aug 21 13:07:43 2001
>@@ -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 -ruN xcdroast.old/pkg-plist xcdroast/pkg-plist
>--- xcdroast.old/pkg-plist	Tue Aug 14 22:12:44 2001
>+++ xcdroast/pkg-plist	Tue Aug 21 15:12:26 2001
>@@ -15,13 +15,10 @@
> 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

Actions: View | Diff

Attachments on bug 29925: 16292