>Submitter-Id: current-users
>Originator: Norikatsu Shigemura
>Organization: Ensure Technology LTD.
>Confidential: no
>Synopsis: make ports depending on sysutils/cdrtools* USE_GNOME=cdrtools
>Severity: serious
>Priority: medium
>Category: ports
>Class: sw-bug
>Release: FreeBSD 6.2-PRERELEASE i386
>Environment:

System: FreeBSD melfina.ninth-nine.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #32: Sun Oct 22 05:57:55 JST 2006 nork@melfina.ninth-nine.com:/usr/obj/usr/src/sys/MELFINA i386

>Description:

Some ports depending on sysutils/cdrtools and some ports dependeing
on sysutils/cdrtools-cjk are conflicted. So I want to integrate to
USE_GNOME= cdrtools and OPTIONify WITH_CJK.

>How-To-Repeat:

cd /usr/ports/sysutils/gnomebaker; make install WITH_CJK
And, after portupgrade GNOME applications.

# portversion -L =
[Updating the pkgdb in /var/db/pkg ... - xxx packages found (-x +x) . done]
Stale dependency: XXX-x.xx.xx -> cdrtools-2.01_5 -- manually run 'pkgdb -F' to fix, or specify -O to force.

>Fix:



--- cdrtools.diff begins here ---
Index: Mk/bsd.gnome.mk
================================================== =================
RCS file: /home/ncvs/ports/Mk/bsd.gnome.mk,v
retrieving revision 1.135
diff -u -r1.135 bsd.gnome.mk
--- Mk/bsd.gnome.mk 15 Oct 2006 03:42:39 -0000 1.135
+++ Mk/bsd.gnome.mk 31 Oct 2006 13:20:55 -0000
@@ -496,6 +496,13 @@
pygnomedesktop_RUN_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop
pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautiluscdburner metacity

+cdrtools_DETECT= ${LOCALBASE}/bin/cdrecord
+.if defined(WITH_CJK)
+cdrtools_RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
+.else
+cdrtools_RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
+.endif
+
# End component definition section

# This section defines tests for optional software. These work off four
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 31 Oct 2006 13:28:55 -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_GNOME= cdrtools
.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 31 Oct 2006 13:29:18 -0000
@@ -64,7 +64,7 @@
.endif

.if defined(WITH_CDDA2WAV)
-RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools
+USE_GNOME+= cdrtools
.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 31 Oct 2006 13:29:48 -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_GNOME= cdrtools
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 31 Oct 2006 13:30:09 -0000
@@ -38,8 +38,8 @@
.endif

.if defined(WITH_BURN)
-RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools \
- mpg123:${PORTSDIR}/audio/mpg123 \
+USE_GNOME= cdrtools
+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 31 Oct 2006 13:30:34 -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_GNOME= cdrtools

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 31 Oct 2006 13:30:57 -0000
@@ -18,11 +18,11 @@
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2006-12-01

+USE_GNOME= cdrtools
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 31 Oct 2006 13:31:16 -0000
@@ -27,11 +27,11 @@
dvi2tty:${PORTSDIR}/print/dvi2tty \
pstotext:${PORTSDIR}/print/pstotext \
mp3info:${PORTSDIR}/audio/mp3info \
- isoinfo:${PORTSDIR}/sysutils/cdrtools \
cabextract:${PORTSDIR}/archivers/cabextract
.endif

USE_PERL5= yes
+USE_GNOME= cdrtools

NO_BUILD= yes
HAS_CONFIGURE= 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 31 Oct 2006 13:31:45 -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_GNOME= cdrtools

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 31 Oct 2006 13:32:01 -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_GNOME= cdrtools
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 31 Oct 2006 13:32:17 -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_GNOME= cdrtools
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 31 Oct 2006 13:32:33 -0000
@@ -76,7 +76,7 @@
RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
.endif
.if !defined(WITHOUT_CDRTOOLS)
-RUN_DEPENDS+= mkisofs:${PORTSDIR}/sysutils/cdrtools
+USE_GNOME= cdrtools
.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 31 Oct 2006 13:32:51 -0000
@@ -33,13 +33,13 @@
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} \
bash:${PORTSDIR}/shells/bash \
${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26

+USE_GNOME= cdrtools
USE_PYTHON= yes
USE_PYDISTUTILS= yes
GNU_CONFIGURE= yes
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 31 Oct 2006 13:33:07 -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_GNOME= cdrtools
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 31 Oct 2006 13:33:31 -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_GNOME= cdrtools
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 31 Oct 2006 13:34:29 -0000
@@ -14,7 +14,7 @@
MAINTAINER= chuck@pkix.net
COMMENT= DVD burning software

-RUN_DEPENDS= ${LOCALBASE}/bin/mkisofs:${PORTSDIR}/sysutils/cdrtools
+USE_GNOME= cdrtools

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 31 Oct 2006 13:34:59 -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 \
@@ -31,6 +30,7 @@
.endif

GNU_CONFIGURE= yes
+USE_GNOME= cdrtools
USE_PYTHON= yes

pre-everything::
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 31 Oct 2006 13:35:11 -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_GNOME= cdrtools
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 31 Oct 2006 13:35:36 -0000
@@ -14,13 +14,12 @@
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_GNOME= cdrtools gtk12 gnomehier
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 31 Oct 2006 13:36:04 -0000
@@ -20,7 +20,7 @@

USE_XLIB= yes
USE_BZIP2= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui desktopfileutils
+USE_GNOME= cdrtools gnomeprefix gnomehack libgnomeui desktopfileutils
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
@@ -34,12 +34,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 31 Oct 2006 13:36:18 -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
@@ -22,7 +21,7 @@
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
-USE_GNOME= libglade2 intlhack gnomehack gnomeprefix
+USE_GNOME= cdrtools libglade2 intlhack gnomehack gnomeprefix
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 31 Oct 2006 13:36:28 -0000
@@ -17,15 +17,13 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical cd cooking interface

-RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
-
WRKSRC= ${WRKDIR}/${PORTNAME}

PLIST_FILES= bin/gtoaster
USE_GETTEXT= yes
USE_X_PREFIX= yes
WANT_GNOME= yes
-USE_GNOME= gnomehack gnometarget gtk12
+USE_GNOME= cdrtools gnomehack gnometarget gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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 31 Oct 2006 13:36:49 -0000
@@ -17,14 +17,13 @@

.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
.endif

USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnometarget intlhack ltverhack
+USE_GNOME= cdrtools gnomehack gnometarget intlhack ltverhack
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
USE_PYTHON= 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 31 Oct 2006 13:37:12 -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_GNOME= cdrtools
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 31 Oct 2006 13:37:23 -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_GNOME= cdrtools
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 31 Oct 2006 13:37:47 -0000
@@ -21,7 +21,7 @@
USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack
+USE_GNOME= cdrtools gnomeprefix gnomehack intlhack nautilus2 ltverhack
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
@@ -38,10 +38,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 31 Oct 2006 13:38:21 -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_GNOME= cdrtools
GNU_CONFIGURE= yes
WANT_GNOME= yes

@@ -51,11 +50,11 @@

.if defined(WITH_GTK2)
CONFIGURE_ARGS+=--enable-gtk2
-USE_GNOME= gtk20
+USE_GNOME+= gtk20
PATCH_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
.else
CONFIGURE_ARGS+=--disable-gtk2
-USE_GNOME= gdkpixbuf
+USE_GNOME+= gdkpixbuf
.endif

.if defined(WITH_NONROOT)
--- cdrtools.diff ends here ---
_______________________________________________
freebsd-gnome@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org"