Date: Tue, 3 Sep 2002 10:48:12 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/42349: [patch] make ports/graphics GNOMENG aware Message-ID: <20020903004812.44CF66A7124@k7.mavetju>
next in thread | raw e-mail | index | archive | help
>Number: 42349
>Category: ports
>Synopsis: [patch] make ports/graphics GNOMENG aware
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 02 17:50:07 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #3: Mon Mar 11 13:32:05 EST 2002 edwin@k7.mavetju.org:/usr/src/sys/compile/k7 i386
>Description:
make ports/graphics GNOMENG aware
>How-To-Repeat:
n/a
>Fix:
graphics/avidemux
graphics/bbrb
graphics/chbg
graphics/cqcam
graphics/divxcalc
graphics/fnlib
graphics/g3dviewer
graphics/gcolor
graphics/geist
graphics/gimageview
graphics/giram
graphics/gkrellkam
graphics/gliv
graphics/gopchop
graphics/gphoto2
graphics/gqview
graphics/gsculpt
graphics/gstreamer-plugins
graphics/gtkdps
graphics/gtkfig
graphics/gtkgraph
graphics/gtksee
graphics/gview
graphics/gxanim
graphics/imagesort
graphics/isreal
graphics/kdegraphics3
graphics/kludge3d
graphics/kuickshow
graphics/libmovtar
graphics/libxine
graphics/maverik
graphics/mplayer
graphics/ogle-gui
graphics/openquicktime
graphics/p5-Gimp
graphics/picturebook
graphics/qiv
graphics/ruby-gdk_imlib
graphics/ruby-gdk_pixbuf
graphics/sane-frontends
graphics/smpeg
graphics/smpeg-xmms
graphics/vertex
graphics/vlc
graphics/xine
graphics/xmms-avi
graphics/xmms-goom
graphics/xmms-infinity
graphics/xmms-iris
graphics/xmms-paranormal
graphics/xmms-xvs
graphics/xmps-opendivx-plugin
graphics/xmps-win32-plugin
graphics/xsane
graphics/xtheater
graphics/xzgv
--- graphics/chbg/Makefile.old Tue Sep 3 10:21:56 2002
+++ graphics/chbg/Makefile Tue Sep 3 10:22:21 2002
@@ -33,7 +33,7 @@
USE_GNOME+= gnomeprefix gnomehack libcapplet
PKGNAMESUFFIX= -gnome
.else
-USE_GTK= yes
+USE_GNOME+= gtk12
.endif
MAN1= chbg.1
--- graphics/cqcam/Makefile.old Tue Sep 3 10:22:34 2002
+++ graphics/cqcam/Makefile Tue Sep 3 10:22:39 2002
@@ -18,7 +18,8 @@
ONLY_FOR_ARCHS= i386
USE_XLIB= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
--- graphics/fnlib/Makefile.old Tue Sep 3 10:23:10 2002
+++ graphics/fnlib/Makefile Tue Sep 3 10:23:16 2002
@@ -15,7 +15,8 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
--- graphics/gcolor/Makefile.old Tue Sep 3 10:23:32 2002
+++ graphics/gcolor/Makefile Tue Sep 3 10:23:35 2002
@@ -15,7 +15,8 @@
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
--- graphics/geist/Makefile.old Tue Sep 3 10:23:52 2002
+++ graphics/geist/Makefile Tue Sep 3 10:24:03 2002
@@ -18,7 +18,8 @@
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LIBS="-L${X11BASE}/lib" \
XML_CONFIG="${XML_CONFIG}"
--- graphics/giram/Makefile.old Tue Sep 3 10:25:21 2002
+++ graphics/giram/Makefile Tue Sep 3 10:26:09 2002
@@ -19,7 +19,8 @@
USE_X_PREFIX= yes
USE_MESA= yes
USE_GMAKE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gl=${X11BASE}
@@ -28,8 +29,9 @@
.include <bsd.port.pre.mk>
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+= Mlibcapplet
+PKGNAMESUFFIX= -gnome
.else
CONFIGURE_ARGS+=--disable-gnome
.endif
--- graphics/gkrellkam/Makefile.old Tue Sep 3 10:26:25 2002
+++ graphics/gkrellkam/Makefile Tue Sep 3 10:26:34 2002
@@ -19,8 +19,8 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USE_X_PREFIX= yes
-USE_GTK= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_GMAKE= yes
MAN5= gkrellkam-list.5
--- graphics/gliv/Makefile.old Tue Sep 3 10:26:49 2002
+++ graphics/gliv/Makefile Tue Sep 3 10:26:53 2002
@@ -20,7 +20,8 @@
USE_BZIP2= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
--- graphics/gphoto2/Makefile.old Tue Sep 3 10:27:19 2002
+++ graphics/gphoto2/Makefile Tue Sep 3 10:27:41 2002
@@ -25,7 +25,8 @@
USE_BZIP2= yes
USE_REINPLACE= yes
-USE_GLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= glib12
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
--- graphics/gqview/Makefile.old Tue Sep 3 10:27:48 2002
+++ graphics/gqview/Makefile Tue Sep 3 10:28:50 2002
@@ -16,7 +16,8 @@
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gdkpixbuf
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -24,8 +25,9 @@
.include <bsd.port.pre.mk>
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+= libcapplet
+PKGNAMESUFFIX= -gnome
.endif
MAN1= gqview.1
--- graphics/gsculpt/Makefile.old Tue Sep 3 10:29:04 2002
+++ graphics/gsculpt/Makefile Tue Sep 3 10:29:07 2002
@@ -17,7 +17,8 @@
WRKSRC= ${WRKDIR}/gSculpt-${PORTVERSION}
USE_REINPLACE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
post-patch:
--- graphics/gtkdps/Makefile.old Tue Sep 3 10:32:41 2002
+++ graphics/gtkdps/Makefile Tue Sep 3 10:32:46 2002
@@ -16,7 +16,8 @@
BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
RUN_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-dps-includes=${X11BASE}/include \
--- graphics/gtkfig/Makefile.old Tue Sep 3 10:32:50 2002
+++ graphics/gtkfig/Makefile Tue Sep 3 10:32:53 2002
@@ -14,7 +14,8 @@
MAINTAINER= dirk@FreeBSD.org
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
.include <bsd.port.mk>
--- graphics/gtkgraph/Makefile.old Tue Sep 3 10:32:57 2002
+++ graphics/gtkgraph/Makefile Tue Sep 3 10:33:04 2002
@@ -18,7 +18,8 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
--- graphics/gtksee/Makefile.old Tue Sep 3 10:33:09 2002
+++ graphics/gtksee/Makefile Tue Sep 3 10:33:16 2002
@@ -23,7 +23,8 @@
RUN_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
.endif
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
--- graphics/gview/Makefile.old Tue Sep 3 10:33:24 2002
+++ graphics/gview/Makefile Tue Sep 3 10:33:34 2002
@@ -15,7 +15,8 @@
MAINTAINER= cpiazza@FreeBSD.org
USE_X_PREFIX= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
--- graphics/gxanim/Makefile.old Tue Sep 3 10:33:39 2002
+++ graphics/gxanim/Makefile Tue Sep 3 10:33:46 2002
@@ -20,6 +20,7 @@
USE_BZIP2= yes
USE_XLIB= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
.include <bsd.port.mk>
--- graphics/imagesort/Makefile.old Tue Sep 3 10:33:51 2002
+++ graphics/imagesort/Makefile Tue Sep 3 10:33:56 2002
@@ -15,7 +15,8 @@
MAINTAINER= markp@FreeBSD.org
USE_X_PREFIX= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin
--- graphics/isreal/Makefile.old Tue Sep 3 10:34:04 2002
+++ graphics/isreal/Makefile Tue Sep 3 10:34:10 2002
@@ -15,7 +15,8 @@
MAINTAINER= markp@FreeBSD.org
USE_XLIB= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/isreal ${PREFIX}/bin
--- graphics/kdegraphics3/Makefile.old Tue Sep 3 10:34:20 2002
+++ graphics/kdegraphics3/Makefile Tue Sep 3 10:34:47 2002
@@ -21,7 +21,8 @@
USE_GMAKE= yes
.if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
PLIST_SUB+= IMLIB=""
CONFIGURE_ARGS+= --with-imlib-config=${X11BASE}/bin
.else
--- graphics/kuickshow/Makefile.old Tue Sep 3 10:35:46 2002
+++ graphics/kuickshow/Makefile Tue Sep 3 10:35:52 2002
@@ -17,7 +17,8 @@
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_KDELIBS_VER= 2
USE_GMAKE= yes
--- graphics/libmovtar/Makefile.old Tue Sep 3 10:35:59 2002
+++ graphics/libmovtar/Makefile Tue Sep 3 10:36:04 2002
@@ -16,7 +16,8 @@
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
--- graphics/libxine/Makefile.old Tue Sep 3 10:36:11 2002
+++ graphics/libxine/Makefile Tue Sep 3 10:36:20 2002
@@ -28,7 +28,8 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
USE_X_PREFIX= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_GMAKE= yes
USE_AUTOMAKE= yes
USE_MESA= yes
--- graphics/maverik/Makefile.old Tue Sep 3 10:36:30 2002
+++ graphics/maverik/Makefile Tue Sep 3 10:37:04 2002
@@ -18,7 +18,8 @@
USE_REINPLACE= yes
USE_SUBMAKE= yes
USE_MESA= yes
-WANT_GTK= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
REALCURDIR="${.CURDIR}" \
DISTNAME="${DISTNAME}"
@@ -37,8 +38,9 @@
--PNGINCL="-I${LOCALBASE}/include"
.endif
-.if defined(HAVE_GTK)
-USE_GTK= yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+= gtk12
+PKGNAMESUFFIX= -gtk
CONFIGURE_ARGS+= --GTK
PLIST_SUB+= GTK=""
.else
--- graphics/mplayer/Makefile.old Tue Sep 3 10:37:18 2002
+++ graphics/mplayer/Makefile Tue Sep 3 10:38:26 2002
@@ -34,7 +34,8 @@
CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
--with-extraincdir=${LOCALBASE}/include
-WANT_GTK= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
MAN1= mplayer.1
MLINKS= mplayer.1 mencoder.1
MANCOMPRESSED= no
@@ -76,12 +77,13 @@
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
.endif
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
WITH_GUI= yes
.endif
.if defined(WITH_GUI)
-USE_GTK= yes
+USE_GNOME+= gtk12
+PKGNAMESUFFIX= -gtk
CONFIGURE_ARGS+= --enable-gui
.endif
@@ -160,7 +162,7 @@
@${ECHO_MSG} "You can enable additional compilation optimizations"
@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
.endif
-.if !defined(WITH_GUI) && !defined(HAVE_GTK)
+.if !defined(WITH_GUI) && ${HAVE_GNOME:Mgtk12}==""
@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
.endif
.if !defined(WITH_DVD)
--- graphics/ogle-gui/Makefile.old Tue Sep 3 10:38:41 2002
+++ graphics/ogle-gui/Makefile Tue Sep 3 10:39:25 2002
@@ -21,10 +21,11 @@
RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
+WANT_GNOME= yes
USE_XPM= yes
USE_REINPLACE= yes
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \
@@ -38,8 +39,9 @@
.include <bsd.port.pre.mk>
-.ifdef(HAVE_GNOME)
-USE_GNOME= yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+= libcapplet
+PKGNAMESUFFIX= -gnome
SHARE_DATADIR= share/gnome
.else
SHARE_DATADIR= share
--- graphics/openquicktime/Makefile.old Tue Sep 3 10:39:35 2002
+++ graphics/openquicktime/Makefile Tue Sep 3 10:39:40 2002
@@ -18,7 +18,8 @@
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALL_SHLIBS= yes
--- graphics/p5-Gimp/Makefile.old Tue Sep 3 10:39:46 2002
+++ graphics/p5-Gimp/Makefile Tue Sep 3 10:39:49 2002
@@ -21,7 +21,8 @@
LIB_DEPENDS= gimp.2:${PORTSDIR}/graphics/gimp1
RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
--- graphics/picturebook/Makefile.old Tue Sep 3 10:40:05 2002
+++ graphics/picturebook/Makefile Tue Sep 3 10:40:11 2002
@@ -16,7 +16,8 @@
MAINTAINER= alan@clegg.com
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
post-build:
cd ${WRKSRC}; \
--- graphics/qiv/Makefile.old Tue Sep 3 10:40:19 2002
+++ graphics/qiv/Makefile Tue Sep 3 10:40:27 2002
@@ -18,7 +18,8 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAN1= qiv.1
--- graphics/ruby-gdk_imlib/Makefile.old Tue Sep 3 10:40:38 2002
+++ graphics/ruby-gdk_imlib/Makefile Tue Sep 3 10:40:46 2002
@@ -21,8 +21,8 @@
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
USE_XLIB= yes
-USE_GTK= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
--- graphics/ruby-gdk_pixbuf/Makefile.old Tue Sep 3 10:40:58 2002
+++ graphics/ruby-gdk_pixbuf/Makefile Tue Sep 3 10:42:11 2002
@@ -16,15 +16,13 @@
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
-USE_GNOMECTRL= yes
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
USE_XLIB= yes
USE_GNOMENG= yes
-USE_GNOME= glib12
+USE_GNOME= glib12 libcapplet gdkpixbuf
.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
--- graphics/sane-frontends/Makefile.old Tue Sep 3 10:42:48 2002
+++ graphics/sane-frontends/Makefile Tue Sep 3 10:42:53 2002
@@ -17,7 +17,8 @@
LIB_DEPENDS= sane.1:${PORTSDIR}/graphics/sane-backends
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
--- graphics/smpeg/Makefile.old Tue Sep 3 10:43:20 2002
+++ graphics/smpeg/Makefile Tue Sep 3 10:43:26 2002
@@ -21,7 +21,8 @@
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
USE_GMAKE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \
--- graphics/smpeg-xmms/Makefile.old Tue Sep 3 10:43:04 2002
+++ graphics/smpeg-xmms/Makefile Tue Sep 3 10:43:08 2002
@@ -18,7 +18,8 @@
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_LIBTOOL= yes
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \
CPPFLAGS="-I${LOCALBASE}/include" \
--- graphics/vertex/Makefile.old Tue Sep 3 10:43:32 2002
+++ graphics/vertex/Makefile Tue Sep 3 10:43:57 2002
@@ -13,7 +13,6 @@
MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
- Imlib.5:${PORTSDIR}/graphics/imlib \
tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${DISTNAME}/vertex
@@ -23,7 +22,8 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_MESA= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
IMLIB_CONFIG="${IMLIB_CONFIG}"
INSTALL_TARGET= vertex_install
--- graphics/vlc/Makefile.old Tue Sep 3 10:44:05 2002
+++ graphics/vlc/Makefile Tue Sep 3 10:44:09 2002
@@ -24,7 +24,8 @@
--includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
.include <bsd.port.mk>
--- graphics/xine/Makefile.old Tue Sep 3 10:44:15 2002
+++ graphics/xine/Makefile Tue Sep 3 10:44:26 2002
@@ -21,7 +21,8 @@
intl.4:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
--- graphics/xmms-avi/Makefile.old Tue Sep 3 10:44:34 2002
+++ graphics/xmms-avi/Makefile Tue Sep 3 10:44:39 2002
@@ -25,7 +25,8 @@
ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_LIBTOOL= yes
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
--- graphics/xmms-xvs/Makefile.old Tue Sep 3 10:45:29 2002
+++ graphics/xmms-xvs/Makefile Tue Sep 3 10:45:37 2002
@@ -18,7 +18,8 @@
RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV+= XML2_CONFIG="${LOCALBASE}/bin/xml2-config" \
XMMS_CONFIG="${X11BASE}/bin/xmms-config"
--- graphics/xmps-opendivx-plugin/Makefile.old Tue Sep 3 10:45:49 2002
+++ graphics/xmps-opendivx-plugin/Makefile Tue Sep 3 10:45:54 2002
@@ -20,7 +20,8 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GMAKE= yes
USE_LIBTOOL= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
PLIST_SUB= LIB_VERSION="${LIB_VERSION}"
--- graphics/xmps-win32-plugin/Makefile.old Tue Sep 3 10:46:03 2002
+++ graphics/xmps-win32-plugin/Makefile Tue Sep 3 10:46:10 2002
@@ -19,7 +19,8 @@
USE_GMAKE= yes
USE_LIBTOOL= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_REINPLACE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
--- graphics/xsane/Makefile.old Tue Sep 3 10:46:29 2002
+++ graphics/xsane/Makefile Tue Sep 3 10:46:37 2002
@@ -21,7 +21,8 @@
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
--- graphics/xzgv/Makefile.old Tue Sep 3 10:46:54 2002
+++ graphics/xzgv/Makefile Tue Sep 3 10:47:01 2002
@@ -15,7 +15,8 @@
MAINTAINER= nosuzuki@e-mail.ne.jp
USE_X_PREFIX= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_GMAKE= yes
MAN1= xzgv.1
--- graphics/xmms-goom/Makefile.old Tue Sep 3 10:44:47 2002
+++ graphics/xmms-goom/Makefile Tue Sep 3 10:44:51 2002
@@ -21,7 +21,8 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
pre-patch:
@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|g;' \
--- graphics/bbrb/Makefile.old Tue Sep 3 10:21:15 2002
+++ graphics/bbrb/Makefile Tue Sep 3 10:21:21 2002
@@ -17,8 +17,8 @@
blackbox:${PORTSDIR}/x11-wm/blackbox
USE_X_PREFIX= yes
-USE_GTK= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
GNU_CONFIGURE= yes
.include <bsd.port.mk>
--- graphics/gimageview/Makefile.old Tue Sep 3 10:24:10 2002
+++ graphics/gimageview/Makefile Tue Sep 3 10:24:58 2002
@@ -17,16 +17,18 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
+WANT_GNOME= yes
GNU_CONFIGURE= yes
-WANT_IMLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.pre.mk>
-.if defined(HAVE_IMLIB)
-USE_IMLIB= yes
+.if ${HAVE_GNOME:Mimlib}!=""
+USE_GNOME+= imlib
+PKGNAMESUFFIX= -imlib
.endif
post-patch:
--- graphics/divxcalc/Makefile.old Tue Sep 3 10:22:56 2002
+++ graphics/divxcalc/Makefile Tue Sep 3 10:23:05 2002
@@ -16,7 +16,8 @@
BUILD_DEPENDS= ${LOCALBASE}/share/automake14/automake/install-sh:${PORTSDIR}/devel/automake14
USE_REINPLACE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
--- graphics/xmms-infinity/Makefile.old Tue Sep 3 10:44:55 2002
+++ graphics/xmms-infinity/Makefile Tue Sep 3 10:45:00 2002
@@ -24,7 +24,8 @@
GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_X_PREFIX= yes
pre-patch:
--- graphics/xmms-iris/Makefile.old Tue Sep 3 10:45:08 2002
+++ graphics/xmms-iris/Makefile Tue Sep 3 10:45:13 2002
@@ -17,7 +17,8 @@
RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
GNU_CONFIGURE= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
USE_MESA= yes
USE_X_PREFIX= yes
--- graphics/xmms-paranormal/Makefile.old Tue Sep 3 10:45:17 2002
+++ graphics/xmms-paranormal/Makefile Tue Sep 3 10:45:24 2002
@@ -24,7 +24,8 @@
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_GMAKE= yes
USE_MESA= yes
USE_X_PREFIX= yes
--- graphics/kludge3d/Makefile.old Tue Sep 3 10:35:35 2002
+++ graphics/kludge3d/Makefile Tue Sep 3 10:35:41 2002
@@ -19,7 +19,8 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_MESA= yes
USE_REINPLACE= yes
USE_GMAKE= yes
--- graphics/g3dviewer/Makefile.old Tue Sep 3 10:23:22 2002
+++ graphics/g3dviewer/Makefile Tue Sep 3 10:23:25 2002
@@ -15,7 +15,8 @@
LIB_DEPENDS= gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_MESA= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= \
--- graphics/xtheater/Makefile.old Tue Sep 3 10:46:44 2002
+++ graphics/xtheater/Makefile Tue Sep 3 10:46:51 2002
@@ -22,7 +22,8 @@
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
USE_BZIP2= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_MESA= yes
USE_REINPLACE= yes
USE_GMAKE= yes
--- graphics/gopchop/Makefile.old Tue Sep 3 10:26:59 2002
+++ graphics/gopchop/Makefile Tue Sep 3 10:27:06 2002
@@ -21,13 +21,14 @@
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
mpeg2.0:${PORTSDIR}/graphics/libmpeg2
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS}
+CPPFLAGS= -I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
post-patch:
--- graphics/gstreamer-plugins/Makefile.old Tue Sep 3 10:29:15 2002
+++ graphics/gstreamer-plugins/Makefile Tue Sep 3 10:32:09 2002
@@ -41,7 +41,8 @@
PLIST_SUB= LOCALBASE="${LOCALBASE}"
# for esound detection
-WANT_ESOUND= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
MAN1= gst-launch-ext.1 gst-visualise.1
@@ -138,7 +139,8 @@
# esound
.if exists(${LOCALBASE}/lib/libesd.a)
-WITH_ESOUND=yes
+USE_GNOME+= esound
+PKGNAMESUFFIX= -esound
.endif
# flac
@@ -263,12 +265,13 @@
.endif
# esound
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if ${HAVE_GNOME:Mesound}=="" || defined(WITH_ESOUND)
CONFIGURE_ARGS+= --disable-esd \
--disable-esdtest
PLIST_SUB+= ESOUND="@comment "
.else
-USE_ESOUND= yes
+USE_GNOME+= esound
+PKGNAMESUFFIX= -esound
CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \
--with-esd-exec-prefix=${LOCALBASE}
PLIST_SUB+= ESOUND=""
@@ -465,7 +468,7 @@
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
.endif
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if ${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
.endif
--- graphics/avidemux/Makefile.old Tue Sep 3 10:21:00 2002
+++ graphics/avidemux/Makefile Tue Sep 3 10:21:11 2002
@@ -24,7 +24,8 @@
USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_XLIB= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LINUXBASE}/usr/include/divx" \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020903004812.44CF66A7124>