From owner-freebsd-ports Mon Aug 13 17:10:16 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F091537B40D for ; Mon, 13 Aug 2001 17:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7E0A1X13126; Mon, 13 Aug 2001 17:10:01 -0700 (PDT) (envelope-from gnats) Received: from speedy.netbeat.de (speedy.netbeat.de [212.6.214.36]) by hub.freebsd.org (Postfix) with ESMTP id 3B92A37B409 for ; Mon, 13 Aug 2001 17:05:11 -0700 (PDT) (envelope-from wwwrun@speedy.netbeat.de) Received: (from wwwrun@localhost) by speedy.netbeat.de (8.9.3/8.9.3) id CAA27187; Tue, 14 Aug 2001 02:05:03 +0200 Message-Id: <200108140005.CAA27187@speedy.netbeat.de> Date: Tue, 14 Aug 2001 02:05:03 +0200 From: Oliver Lehmann Reply-To: Oliver Lehmann To: FreeBSD-gnats-submit@freebsd.org Cc: Oliver Lehmann X-Send-Pr-Version: 3.113 Subject: ports/29687: Update sysutils/xcdroast Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29687 >Category: ports >Synopsis: Update sysutils/xcdroast >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 13 17:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD sina.sesamestreet.net 4.4-PRERELEASE FreeBSD 4.4-PRERELEASE #0: Sat Aug 11 04:09:45 CEST 2001 olivleh1@bert.sesamestreet.net:/usr/obj/usr/src/sys/SINA i386 >Description: - Update to Alpha9 (because, since updating cdrecord, Alpha8 would not compile) - Enable non-root mode - Update Maintainer E-Mail Address >How-To-Repeat: >Fix: diff -ruN xcdroast.old/Makefile xcdroast/Makefile --- xcdroast.old/Makefile Sun Aug 12 23:57:50 2001 +++ xcdroast/Makefile Tue Aug 14 01:52:08 2001 @@ -6,12 +6,12 @@ # PORTNAME= xcdroast -PORTVERSION= 0.98.a.8 +PORTVERSION= 0.98.a.9 CATEGORIES= sysutils MASTER_SITES= http://www.xcdroast.org/download/ -DISTNAME= xcdroast-0.98alpha8 +DISTNAME= ${PORTNAME}-0.98alpha9 -MAINTAINER= Kai_Allard_Liao@gmx.de +MAINTAINER= lehmann@ans-netz.de RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ mkisofs:${PORTSDIR}/sysutils/mkisofs @@ -21,10 +21,33 @@ USE_GTK= yes USE_IMLIB= yes +post-patch: + for i in xcdroast.h Makefile ; do \ + ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$$i ; \ + done + post-install: - ${LN} -sf ${PREFIX}/bin/cdrecord ${X11BASE}/lib/xcdroast-0.98/bin/cdrecord - ${LN} -sf ${PREFIX}/bin/mkisofs ${X11BASE}/lib/xcdroast-0.98/bin/mkisofs - ${LN} -sf ${PREFIX}/bin/cdda2wav ${X11BASE}/lib/xcdroast-0.98/bin/cdda2wav - ${LN} -sf ${PREFIX}/bin/readcd ${X11BASE}/lib/xcdroast-0.98/bin/readcd + ${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 + + pw groupadd -n cdwrite + + for i in cdrecord cdda2wav mkisofs readcd ; do \ + chown root:cdwrite ${PREFIX}/bin/$i && \ + chmod 4710 ${PREFIX}/bin/$i ; \ + done + + chown root:cdwrite ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap + chmod 2755 ${PREFIX}/lib/xcdroast-0.98/bin/xcdrwrap + + @${ECHO} "" + @${ECHO} "***************************************************************" + @${ECHO} " The first time root have to start xcdroast, to create the" + @${ECHO} " root-configuration-file ${PREFIX}/etc/xcdroast.conf. Without" + @${ECHO} " this file, a normal user will get an error message." + @${ECHO} "***************************************************************" + @${ECHO} "" .include diff -ruN xcdroast.old/distinfo xcdroast/distinfo --- xcdroast.old/distinfo Tue Jan 16 18:15:40 2001 +++ xcdroast/distinfo Tue Aug 14 00:34:45 2001 @@ -1 +1 @@ -MD5 (xcdroast-0.98alpha8.tar.gz) = b26664d09a530f798e062cfb9f8aac8f +MD5 (xcdroast-0.98alpha9.tar.gz) = 543d3237e7109572f5fcb6bdc6cf3e44 diff -ruN xcdroast.old/files/patch-Makefile xcdroast/files/patch-Makefile --- xcdroast.old/files/patch-Makefile Tue Jan 16 18:15:40 2001 +++ xcdroast/files/patch-Makefile Tue Aug 14 01:01:58 2001 @@ -1,26 +1,11 @@ ---- Makefile.orig Sun Nov 26 15:03:56 2000 -+++ Makefile Tue Jan 16 18:02:52 2001 -@@ -5,7 +5,7 @@ - +--- Makefile.orig Tue Aug 14 01:01:08 2001 ++++ Makefile Tue Aug 14 01:01:32 2001 +@@ -6,7 +6,7 @@ # Installation prefix directory: --PREFIX=/usr -+PREFIX?=/usr/X11R6 - #PREFIX=/usr/local + #PREFIX=/usr +-PREFIX=/usr/local ++PREFIX=%%PREFIX%% PRE_LIBDIR=$(PREFIX)/lib/xcdroast-0.98 -@@ -13,10 +13,10 @@ - - #--- - --CFLAGS=-Wall `gtk-config --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" --LIBS=`gtk-config --libs` `imlib-config --libs` -lgdk_imlib --TOOLLIBS=`gtk-config --libs` --CC=gcc -+CFLAGS+=-Wall `${GTK_CONFIG} --cflags` `imlib-config --cflags` -DPRE_PREFIX="\"$(PREFIX)\"" -DPRE_LIBDIR="\"$(PRE_LIBDIR)\"" -+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 - + # put here the prefix where you want xcdroast to look for diff -ruN xcdroast.old/files/patch-aa xcdroast/files/patch-aa --- xcdroast.old/files/patch-aa Thu Jan 1 01:00:00 1970 +++ xcdroast/files/patch-aa Tue Aug 14 00:47:30 2001 @@ -0,0 +1,19 @@ +--- xcdroast.h.orig Tue Aug 14 00:15:43 2001 ++++ xcdroast.h Tue Aug 14 00:46:08 2001 +@@ -89,14 +89,14 @@ + #define SAVEMASTERTRACK "mkisofs.out" + + /* 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" + + /* language stuff*/ + #define MAXENTRIES 512 diff -ruN xcdroast.old/pkg-plist xcdroast/pkg-plist --- xcdroast.old/pkg-plist Mon Mar 12 18:49:32 2001 +++ xcdroast/pkg-plist Tue Aug 14 01:50:43 2001 @@ -1,4 +1,4 @@ -bin/xcdrgtk +bin/xcdroast lib/xcdroast-0.98/icons/burnproof.gif lib/xcdroast-0.98/icons/cddblogo.gif lib/xcdroast-0.98/icons/dialog_default.png @@ -19,6 +19,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message