FreeBSD Bugzilla – Attachment 26909 Details for
Bug 45809
update-port: sysutils/xcdroast
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.18 KB, created by
Oliver Lehmann
on 2002-11-27 21:50:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Oliver Lehmann
Created:
2002-11-27 21:50:01 UTC
Size:
10.18 KB
patch
obsolete
>diff -ruN xcdroast.old/Makefile /usr/ports/sysutils/xcdroast/Makefile >--- xcdroast.old/Makefile Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/Makefile Wed Nov 27 22:39:03 2002 >@@ -6,7 +6,7 @@ > # > > PORTNAME= xcdroast >-PORTVERSION= 0.98.a.10 >+PORTVERSION= 0.98.a.11 > CATEGORIES= sysutils > MASTER_SITES= http://www.xcdroast.org/download/ > DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./alpha/} >@@ -17,24 +17,19 @@ > 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 >- >- for i in Makefile xcdroast.h ; do \ >- ${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$$i ; \ >- done >+ @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g; \ >+ s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/xcdroast.h; >+ > > post-install: > @${CAT} ${PKGMESSAGE} >diff -ruN xcdroast.old/distinfo /usr/ports/sysutils/xcdroast/distinfo >--- xcdroast.old/distinfo Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/distinfo Wed Nov 27 21:30:53 2002 >@@ -1 +1 @@ >-MD5 (xcdroast-0.98alpha10.tar.gz) = 6f9ffd30c7ba8f067c2f1bddcc83d7d8 >+MD5 (xcdroast-0.98alpha11.tar.gz) = 62564ac29abb37f325d28be83513aadb >diff -ruN xcdroast.old/files/patch-Makefile /usr/ports/sysutils/xcdroast/files/patch-Makefile >--- xcdroast.old/files/patch-Makefile Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/files/patch-Makefile Thu Jan 1 01:00:00 1970 >@@ -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 -ruN xcdroast.old/files/patch-io.c /usr/ports/sysutils/xcdroast/files/patch-io.c >--- xcdroast.old/files/patch-io.c Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/files/patch-io.c Thu Jan 1 01:00:00 1970 >@@ -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 -ruN xcdroast.old/files/patch-src::xcdroast.h /usr/ports/sysutils/xcdroast/files/patch-src::xcdroast.h >--- xcdroast.old/files/patch-src::xcdroast.h Thu Jan 1 01:00:00 1970 >+++ /usr/ports/sysutils/xcdroast/files/patch-src::xcdroast.h Wed Nov 27 21:28:33 2002 >@@ -0,0 +1,44 @@ >+--- src/xcdroast.h.orig Wed Nov 27 21:25:15 2002 >++++ src/xcdroast.h Wed Nov 27 21:27:36 2002 >+@@ -82,7 +82,7 @@ >+ #endif >+ #define UNAME "/bin/uname -a" >+ #define UNAME2 "/usr/bin/uname -a" >+-#define CHOWN "/bin/chown" >++#define CHOWN "/usr/sbin/chown" >+ #define CHOWN2 "/usr/bin/chown" >+ #define CHGRP "/bin/chgrp" >+ #define CHGRP2 "/usr/bin/chgrp" >+@@ -105,10 +105,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. >+@@ -162,7 +162,7 @@ >+ #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" >+@@ -172,7 +172,7 @@ >+ #define WRITEOPTFILE "writeopt.cfg" >+ #define NONROOTBAK "nonrootflags.cfg" >+ /* rootconfig is stored in $sysconfdir (/usr/local/etc by default) */ >+-#define ROOTCONFIG "xcdroast.conf" >++#define ROOTCONFIG "%%PREFIX%%/etc/xcdroast.conf" >+ >+ /* font definitions */ >+ #define NORMFONT "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*,-default-*-medium-r-*--14-*-*-*-*-*-*-*,*-medium-r-*,*" >diff -ruN xcdroast.old/files/patch-xcdrdata.h /usr/ports/sysutils/xcdroast/files/patch-xcdrdata.h >--- xcdroast.old/files/patch-xcdrdata.h Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/files/patch-xcdrdata.h Thu Jan 1 01:00:00 1970 >@@ -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 -ruN xcdroast.old/files/patch-xcdroast.h /usr/ports/sysutils/xcdroast/files/patch-xcdroast.h >--- xcdroast.old/files/patch-xcdroast.h Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/files/patch-xcdroast.h Thu Jan 1 01:00:00 1970 >@@ -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 -ruN xcdroast.old/pkg-plist /usr/ports/sysutils/xcdroast/pkg-plist >--- xcdroast.old/pkg-plist Wed Nov 27 21:18:53 2002 >+++ /usr/ports/sysutils/xcdroast/pkg-plist Wed Nov 27 22:04:20 2002 >@@ -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_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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 45809
: 26909