From owner-freebsd-ports@FreeBSD.ORG Sat Nov 4 03:45:42 2006 Return-Path: X-Original-To: ports@FreeBSD.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC0E616A403; Sat, 4 Nov 2006 03:45:42 +0000 (UTC) (envelope-from nork@FreeBSD.org) Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120]) by mx1.FreeBSD.org (Postfix) with ESMTP id B23ED43D60; Sat, 4 Nov 2006 03:45:41 +0000 (GMT) (envelope-from nork@FreeBSD.org) Received: from nadesico.ninth-nine.com (nadesico.ninth-nine.com [219.127.74.122]) by sakura.ninth-nine.com (8.13.8/8.13.8/NinthNine) with SMTP id kA43jcrg088286; Sat, 4 Nov 2006 12:45:38 +0900 (JST) (envelope-from nork@FreeBSD.org) Date: Sat, 4 Nov 2006 12:45:37 +0900 From: Norikatsu Shigemura To: "FreeBSD Ports" Message-Id: <20061104124537.904e2290.nork@FreeBSD.org> In-Reply-To: <790a9fff0610311236j402abb72y63657811184327aa@mail.gmail.com> References: <20061031225913.0001429d.nork@FreeBSD.org> <619ABB65-8CAA-48FC-B0F8-70904CC3DC42@pkix.net> <790a9fff0610311236j402abb72y63657811184327aa@mail.gmail.com> X-Mailer: Sylpheed version 2.3.0beta4 (GTK+ 2.10.6; i386-portbld-freebsd6.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 (sakura.ninth-nine.com [219.127.74.121]); Sat, 04 Nov 2006 12:45:40 +0900 (JST) Cc: Chuck Swiger , Scot Hetzel , Norikatsu Shigemura Subject: Re: make ports depending on sysutils/cdrtools* USE_GNOME=cdrools X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Nov 2006 03:45:42 -0000 Thanks for your many comments! On Tue, 31 Oct 2006 14:36:54 -0600 "Scot Hetzel" wrote: > If it doesn't then it would be better to add a USE_CDRTOOLS knob to bsd.port.mk > that would allow the selection of either the cdrtools or cdrtools-cjk ports. > .if defined(USE_CDRTOOLS) > .if exists(${DOCSDIR}/cdrtools-cjk/README) || defined(WITH_CJK) || > ${USE_CDRTOOLS} == "CJK" > WANT_CDRTOOLS_CJK= yes > .endif > .if defined(WANT_CDRTOOLS_CJK) > RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk > .else > RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools > .endif > .endif I rewrote a patch like following. o Fix some bugs. (position is bad) o Change bsd.port.mk instead of bsd.gnome.mk. If this patch is good, I'll send-pr it and forward to portmgr@. Index: Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.544 diff -u -r1.544 bsd.port.mk --- Mk/bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544 +++ Mk/bsd.port.mk 4 Nov 2006 03:29:31 -0000 @@ -2081,6 +2081,15 @@ RUN_DEPENDS+= gs:${PORTSDIR}/${GHOSTSCRIPT_PORT} .endif +# Set up the cdrtools. +.if defined(USE_CDRTOOLS) +.if exists(${DOCSDIR}/cdrtools-cjk/README) || defined(WITH_CJK) || ${USE_CDRTOOLS:L} == "cjk" +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk +.else +RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools + .endif +.endif + # Macro for doing in-place file editing using regexps REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} Index: audio/abcde/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/abcde/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- audio/abcde/Makefile 3 May 2006 05:14:08 -0000 1.29 +++ audio/abcde/Makefile 4 Nov 2006 03:19:51 -0000 @@ -28,7 +28,7 @@ PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf .if defined(WITH_CDDA2WAV) -RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools +USE_CDRTOOLS= yes .endif .if defined(WITH_DAGRAB) Index: audio/grip/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/grip/Makefile,v retrieving revision 1.73 diff -u -r1.73 Makefile --- audio/grip/Makefile 14 Oct 2006 08:52:32 -0000 1.73 +++ audio/grip/Makefile 4 Nov 2006 03:19:51 -0000 @@ -64,7 +64,7 @@ .endif .if defined(WITH_CDDA2WAV) -RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools +USE_CDRTOOLS= yes .endif .if defined(WITH_BLADEENC) Index: audio/mp3burn/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/mp3burn/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- audio/mp3burn/Makefile 3 Jul 2006 03:39:46 -0000 1.5 +++ audio/mp3burn/Makefile 4 Nov 2006 03:19:51 -0000 @@ -17,13 +17,13 @@ ogg123:${PORTSDIR}/audio/vorbis-tools \ ${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \ ${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis/Header.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \ - cdrecord:${PORTSDIR}/sysutils/cdrtools \ ${SITE_PERL}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_PERL5= yes +USE_CDRTOOLS= yes NO_BUILD= yes MAN1= mp3burn.1 Index: audio/prokyon3/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/prokyon3/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- audio/prokyon3/Makefile 3 May 2006 05:14:25 -0000 1.10 +++ audio/prokyon3/Makefile 4 Nov 2006 03:19:51 -0000 @@ -38,8 +38,8 @@ .endif .if defined(WITH_BURN) -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - mpg123:${PORTSDIR}/audio/mpg123 \ +USE_CDRTOOLS= yes +RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 \ ogg123:${PORTSDIR}/audio/vorbis-tools \ normalize:${PORTSDIR}/audio/normalize \ bash:${PORTSDIR}/shells/bash2 Index: graphics/lphoto/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/lphoto/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- graphics/lphoto/Makefile 24 May 2006 14:21:42 -0000 1.14 +++ graphics/lphoto/Makefile 4 Nov 2006 03:19:51 -0000 @@ -23,7 +23,7 @@ RUN_DEPENDS= gphoto2:${PORTSDIR}/graphics/gphoto2 \ kdepyuic:${PORTSDIR}/x11-toolkits/py-kde \ ${PYTHON_SITELIBDIR}/OpenGL/GL/GL__init__.py:${PORTSDIR}/graphics/py-opengl -# cdrecord:${PORTSDIR}/sysutils/cdrtools +#USE_CDRTOOLS= yes USE_PYTHON= yes NO_BUILD= yes Index: misc/instant-workstation/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/instant-workstation/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- misc/instant-workstation/Makefile 29 Sep 2006 05:40:00 -0000 1.32 +++ misc/instant-workstation/Makefile 4 Nov 2006 03:19:51 -0000 @@ -18,11 +18,11 @@ DEPRECATED= ${BROKEN} EXPIRATION_DATE=2006-12-01 +USE_CDRTOOLS= yes USE_GHOSTSCRIPT_RUN= yes RUN_DEPENDS= acroread7:${PORTSDIR}/print/acroread7 \ bash:${PORTSDIR}/shells/bash2 \ - cdrecord:${PORTSDIR}/sysutils/cdrtools \ dos2unix:${PORTSDIR}/converters/unix2dos \ emacs:${PORTSDIR}/editors/emacs \ fetchmail:${PORTSDIR}/mail/fetchmail \ Index: misc/lesspipe/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/lesspipe/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- misc/lesspipe/Makefile 17 Apr 2006 16:46:42 -0000 1.3 +++ misc/lesspipe/Makefile 4 Nov 2006 03:19:51 -0000 @@ -27,8 +27,8 @@ dvi2tty:${PORTSDIR}/print/dvi2tty \ pstotext:${PORTSDIR}/print/pstotext \ mp3info:${PORTSDIR}/audio/mp3info \ - isoinfo:${PORTSDIR}/sysutils/cdrtools \ cabextract:${PORTSDIR}/archivers/cabextract +USE_CDRTOOLS= yes .endif USE_PERL5= yes Index: multimedia/dvd-slideshow/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/dvd-slideshow/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- multimedia/dvd-slideshow/Makefile 10 Oct 2006 10:50:14 -0000 1.8 +++ multimedia/dvd-slideshow/Makefile 4 Nov 2006 03:20:43 -0000 @@ -20,11 +20,11 @@ ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ sox:${PORTSDIR}/audio/sox \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ - mkisofs:${PORTSDIR}/sysutils/cdrtools \ seq2:${PORTSDIR}/misc/seq2 \ ${X11BASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf NO_BUILD= yes +USE_CDRTOOLS= yes OPTIONS= DVDRWTOOLS "Needed to record/burn DVD" off \ LAME "Optional support for audio" off \ Index: multimedia/dvdrip/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/dvdrip/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- multimedia/dvdrip/Makefile 24 Sep 2006 12:25:56 -0000 1.30 +++ multimedia/dvdrip/Makefile 4 Nov 2006 03:19:51 -0000 @@ -16,7 +16,6 @@ COMMENT= This is dvd::rip, a Perl Gtk+ based dvd-ripper RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao \ - cdrecord:${PORTSDIR}/sysutils/cdrtools \ convert:${PORTSDIR}/graphics/ImageMagick \ mplayer:${PORTSDIR}/multimedia/mplayer \ pstree:${PORTSDIR}/sysutils/pstree \ @@ -34,6 +33,7 @@ PERL_CONFIGURE= yes USE_PERL5= yes +USE_CDRTOOLS= yes USE_GETTEXT= yes MAN1= dvdrip.1 dvdrip-progress.1 dvdrip-splitpipe.1 Index: multimedia/ldvd/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/ldvd/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- multimedia/ldvd/Makefile 25 Sep 2006 00:33:50 -0000 1.16 +++ multimedia/ldvd/Makefile 4 Nov 2006 03:19:51 -0000 @@ -18,7 +18,6 @@ LIB_DEPENDS= dvdread.3:${PORTSDIR}/multimedia/libdvdread RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ - mkisofs:${PORTSDIR}/sysutils/cdrtools \ ifo_dump:${PORTSDIR}/multimedia/ogle \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ buffer:${PORTSDIR}/misc/buffer \ @@ -27,6 +26,7 @@ USE_BZIP2= yes USE_PERL5= yes +USE_CDRTOOLS= yes DATA= de.lang en.lang PORTDOCS= AUTHORS HISTORY README.de README.en PLIST_FILES= bin/ldvd bin/ldvd-ls etc/ldvd.conf.sample \ Index: multimedia/qdvdauthor/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/qdvdauthor/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- multimedia/qdvdauthor/Makefile 7 Mar 2006 08:27:00 -0000 1.12 +++ multimedia/qdvdauthor/Makefile 4 Nov 2006 03:19:51 -0000 @@ -76,7 +76,7 @@ RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools .endif .if !defined(WITHOUT_CDRTOOLS) -RUN_DEPENDS+= mkisofs:${PORTSDIR}/sysutils/cdrtools +USE_CDRTOOLS= yes .endif .if defined(WITH_DVDRWTOOLS) RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools Index: multimedia/tovid/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/tovid/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- multimedia/tovid/Makefile 30 Jul 2006 21:31:19 -0000 1.11 +++ multimedia/tovid/Makefile 4 Nov 2006 03:31:45 -0000 @@ -33,7 +33,6 @@ tcrequant:${PORTSDIR}/multimedia/transcode \ vcdxbuild:${PORTSDIR}/multimedia/vcdimager \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ - mkisofs:${PORTSDIR}/sysutils/cdrtools \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools RUN_DEPENDS= \ ${BUILD_DEPENDS} \ @@ -42,6 +41,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes +USE_CDRTOOLS= yes GNU_CONFIGURE= yes MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \ Index: sysutils/cdbakeoven/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/cdbakeoven/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- sysutils/cdbakeoven/Makefile 13 May 2006 04:15:25 -0000 1.13 +++ sysutils/cdbakeoven/Makefile 4 Nov 2006 03:19:51 -0000 @@ -15,11 +15,11 @@ MAINTAINER= lofi@freebsd.org COMMENT= KDE frontend for cdrecord and mkisofs/mkhybrid -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - mpg123:${PORTSDIR}/audio/mpg123 \ +RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \ ogg123:${PORTSDIR}/audio/vorbis-tools USE_BZIP2= yes +USE_CDRTOOLS= yes USE_KDEBASE_VER=3 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes Index: sysutils/cdbkup/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/cdbkup/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- sysutils/cdbkup/Makefile 2 Jun 2004 17:17:30 -0000 1.3 +++ sysutils/cdbkup/Makefile 4 Nov 2006 03:19:51 -0000 @@ -16,15 +16,14 @@ MAINTAINER= kay_lehmann@web.de COMMENT= Simple but full-featured backup/restore perl scripts (uses gnu tar) -BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject +BUILD_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject +RUN_DEPENDS= ${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes USE_PERL5= yes +USE_CDRTOOLS= yes CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/sbin MAN1= cdbkup.1 cdappend.1 cdcat.1 cdrstr.1 cdsplit.1 Index: sysutils/dvd+rw-tools/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/dvd+rw-tools/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- sysutils/dvd+rw-tools/Makefile 10 May 2006 19:16:18 -0000 1.22 +++ sysutils/dvd+rw-tools/Makefile 4 Nov 2006 03:19:51 -0000 @@ -14,7 +14,7 @@ MAINTAINER= chuck@pkix.net COMMENT= DVD burning software -RUN_DEPENDS= ${LOCALBASE}/bin/mkisofs:${PORTSDIR}/sysutils/cdrtools +USE_CDRTOOLS= yes MAN1= growisofs.1 BIN_FILES= growisofs dvd+rw-format dvd+rw-booktype dvd+rw-mediainfo dvd-ram-control Index: sysutils/eroaster/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/eroaster/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- sysutils/eroaster/Makefile 14 Oct 2006 08:53:22 -0000 1.7 +++ sysutils/eroaster/Makefile 4 Nov 2006 03:21:33 -0000 @@ -16,8 +16,7 @@ MAINTAINER= dave@gufi.org COMMENT= A GNOME2 frontend to mkisofs/cdrecord -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2 \ - cdrecord:${PORTSDIR}/sysutils/cdrtools +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/_gnome.so:${PORTSDIR}/x11-toolkits/py-gnome2 .if defined(WITH_ADDITIONAL_PROGRAMS) BUILD_DEPENDS+= bchunk:${PORTSDIR}/sysutils/bchunk \ @@ -32,6 +31,7 @@ GNU_CONFIGURE= yes USE_PYTHON= yes +USE_CDRTOOLS= yes pre-everything:: @${ECHO_MSG} "===> You can enable more features by defining WITH_ADDITIONAL_PROGRAMS" Index: sysutils/freesbie/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/freesbie/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- sysutils/freesbie/Makefile 3 Feb 2006 20:19:58 -0000 1.11 +++ sysutils/freesbie/Makefile 4 Nov 2006 03:19:51 -0000 @@ -14,9 +14,8 @@ MAINTAINER= riggs@rrr.de COMMENT= Yet another cool answer to the system-on-cd question -RUN_DEPENDS= mkisofs:${PORTSDIR}/sysutils/cdrtools - USE_BZIP2= yes +USE_CDRTOOLS= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}2 Index: sysutils/gcombust/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gcombust/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- sysutils/gcombust/Makefile 7 Mar 2006 08:27:38 -0000 1.44 +++ sysutils/gcombust/Makefile 4 Nov 2006 03:21:54 -0000 @@ -14,13 +14,13 @@ MAINTAINER= mcdouga9@msu.edu COMMENT= A GTK+ frontend for mkisofs and cdrecord -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - cdlabelgen:${PORTSDIR}/print/cdlabelgen +RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen USE_GETTEXT= yes USE_X_PREFIX= yes USE_PERL5_BUILD=yes USE_GNOME= gtk12 gnomehier +USE_CDRTOOLS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ Index: sysutils/gnomebaker/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gnomebaker/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- sysutils/gnomebaker/Makefile 14 Oct 2006 08:53:24 -0000 1.12 +++ sysutils/gnomebaker/Makefile 4 Nov 2006 03:22:12 -0000 @@ -21,6 +21,7 @@ USE_XLIB= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils +USE_CDRTOOLS= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes @@ -34,12 +35,6 @@ RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao -.if defined(WITH_CJK) -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk -.else -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools -.endif - .if defined(WITH_DVD) RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif Index: sysutils/graveman/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/graveman/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- sysutils/graveman/Makefile 30 Jun 2006 00:49:53 -0000 1.10 +++ sysutils/graveman/Makefile 4 Nov 2006 03:22:31 -0000 @@ -14,7 +14,6 @@ MAINTAINER= toxa@toxahost.ru COMMENT= Another GTK2 frontend for cdrecord, mkisofs, readcd and sox -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng USE_BZIP2= yes @@ -23,6 +22,7 @@ GNU_CONFIGURE= yes USE_X_PREFIX= yes USE_GNOME= libglade2 intlhack gnomehack gnomeprefix +USE_CDRTOOLS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" Index: sysutils/gtoaster/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gtoaster/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- sysutils/gtoaster/Makefile 13 May 2006 04:15:34 -0000 1.23 +++ sysutils/gtoaster/Makefile 4 Nov 2006 03:22:51 -0000 @@ -17,8 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graphical cd cooking interface -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools - WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/gtoaster @@ -27,6 +25,7 @@ WANT_GNOME= yes USE_GNOME= gnomehack gnometarget gtk12 USE_GMAKE= yes +USE_CDRTOOLS= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" Index: sysutils/hal/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/hal/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- sysutils/hal/Makefile 29 Oct 2006 04:08:41 -0000 1.2 +++ sysutils/hal/Makefile 4 Nov 2006 03:33:59 -0000 @@ -17,8 +17,8 @@ .if !defined(HAL_SLAVE) LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit -RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \ - isoinfo:${PORTSDIR}/sysutils/cdrtools +RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids +USE_CDRTOOLS= yes .endif USE_BZIP2= yes Index: sysutils/k3b/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/k3b/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- sysutils/k3b/Makefile 4 Sep 2006 05:40:34 -0000 1.38 +++ sysutils/k3b/Makefile 4 Nov 2006 03:19:51 -0000 @@ -14,8 +14,7 @@ MAINTAINER= h.eichmann@gmx.de COMMENT= A CD/DVD recording GUI for KDE -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ - cdrdao:${PORTSDIR}/sysutils/cdrdao +RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ dvdcss:${PORTSDIR}/multimedia/libdvdcss \ samplerate:${PORTSDIR}/audio/libsamplerate @@ -25,6 +24,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal USE_GMAKE= yes +USE_CDRTOOLS= yes USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 USE_KDELIBS_VER= 3 Index: sysutils/livecd/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/livecd/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- sysutils/livecd/Makefile 13 May 2006 04:15:39 -0000 1.9 +++ sysutils/livecd/Makefile 4 Nov 2006 03:19:51 -0000 @@ -14,9 +14,8 @@ MAINTAINER= ebrandi.home@uol.com.br COMMENT= Tool Set to create custom FreeBSD LiveCD -RUN_DEPENDS= mkisofs:${PORTSDIR}/sysutils/cdrtools - NO_BUILD= yes +USE_CDRTOOLS= yes MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" Index: sysutils/nautilus-cd-burner/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/nautilus-cd-burner/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- sysutils/nautilus-cd-burner/Makefile 14 Oct 2006 08:35:20 -0000 1.32 +++ sysutils/nautilus-cd-burner/Makefile 4 Nov 2006 03:23:39 -0000 @@ -22,6 +22,7 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack +USE_CDRTOOLS= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes @@ -38,10 +39,7 @@ .include .if defined(WITH_CJK) -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk WITHOUT_DVD= yes -.else -RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools .endif .if !defined(WITHOUT_DVD) Index: sysutils/xcdroast/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/xcdroast/Makefile,v retrieving revision 1.34 diff -u -r1.34 Makefile --- sysutils/xcdroast/Makefile 13 May 2006 04:15:52 -0000 1.34 +++ sysutils/xcdroast/Makefile 4 Nov 2006 03:35:17 -0000 @@ -19,8 +19,6 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= Another X11 frontend to mkisofs/cdrecord -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools - OPTIONS= GTK2 "Enable GTK2 support" off \ NONROOT "Use xcdroast w/o being root" off \ NLS "Native language support" on @@ -28,6 +26,7 @@ USE_X_PREFIX= yes USE_GETTEXT= yes USE_ICONV= yes +USE_CDRTOOLS= yes GNU_CONFIGURE= yes WANT_GNOME= yes