--- audio/aumix/Makefile.old Sat Aug 31 08:52:07 2002 +++ audio/aumix/Makefile Sat Aug 31 08:53:04 2002 @@ -18,7 +18,8 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --enable-own-labels \ @@ -30,8 +31,8 @@ .include -.if defined(HAVE_GTK) -USE_GTK= yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME= gtk12 .else CONFIGURE_ARGS+=--without-gtk .endif --- audio/autozen/Makefile.old Sat Aug 31 08:53:14 2002 +++ audio/autozen/Makefile Sat Aug 31 08:53:27 2002 @@ -18,7 +18,8 @@ MAKE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 DOC_FILES= CHANGES COPYING DATA_FILES= deep-relax.seq deep_delta_slide.seq delta_slide.seq \ --- audio/denemo/Makefile.old Sat Aug 31 08:53:32 2002 +++ audio/denemo/Makefile Sat Aug 31 08:53:45 2002 @@ -22,7 +22,8 @@ SHARED= denemo.conf denemo.keymaprc english.keymaprc french.keymaprc DOCS= AUTHORS ChangeLog DESIGN GOALS NEWS README TODO DOCDIR= share/doc/${PORTNAME} -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_X_PREFIX= yes post-configure: --- audio/easytag/Makefile.old Sat Aug 31 08:53:48 2002 +++ audio/easytag/Makefile Sat Aug 31 08:53:58 2002 @@ -17,7 +17,8 @@ LIB_DEPENDS= id3-3.7.13:${PORTSDIR}/audio/id3lib \ vorbis.2:${PORTSDIR}/audio/libvorbis -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIG_SHELL="${SH}" \ CPPFLAGS="-I${LOCALBASE}/include" \ --- audio/gkrellmms/Makefile.old Sat Aug 31 08:54:07 2002 +++ audio/gkrellmms/Makefile Sat Aug 31 08:54:18 2002 @@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= imlib .include --- audio/gkrellmss/Makefile.old Sat Aug 31 08:54:27 2002 +++ audio/gkrellmss/Makefile Sat Aug 31 08:55:38 2002 @@ -19,9 +19,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes -USE_ESOUND= yes -USE_GTK= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= esound imlib USE_XPM= yes DOC_FILES= Changelog README Themes --- audio/gkrellmvolume/Makefile.old Sat Aug 31 08:55:56 2002 +++ audio/gkrellmvolume/Makefile Sat Aug 31 08:56:07 2002 @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/volume USE_X_PREFIX= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= imlib .include --- audio/gmixer/Makefile.old Sat Aug 31 08:56:12 2002 +++ audio/gmixer/Makefile Sat Aug 31 08:56:20 2002 @@ -15,7 +15,8 @@ ALL_TARGET= gmixer -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin --- audio/gnapster/Makefile.old Sat Aug 31 08:56:24 2002 +++ audio/gnapster/Makefile Sat Aug 31 08:56:59 2002 @@ -14,7 +14,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes -USE_IMLIB= yes +USE_GNOMENG= yes WANT_GNOME= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -22,8 +22,8 @@ .include -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mimlib}!="" +USE_GNOME= imlib CONFIGURE_ARGS+= --datadir=${PREFIX}/share .else CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf --- audio/gqmpeg/Makefile.old Sat Aug 31 08:57:23 2002 +++ audio/gqmpeg/Makefile Sat Aug 31 08:58:57 2002 @@ -23,10 +23,10 @@ USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gdkpixbuf USE_LIBTOOL= yes USE_AUTOCONF= yes -WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ @@ -35,10 +35,6 @@ MAN1= gqmpeg.1 .include - -.if defined(HAVE_GNOME) -USE_GNOME= yes -.endif .if !defined(WITH_MPG321) pre-everything:: --- audio/grip/Makefile.old Sat Aug 31 08:59:25 2002 +++ audio/grip/Makefile Sat Aug 31 08:59:55 2002 @@ -22,20 +22,20 @@ USE_GMAKE= yes USE_X_PREFIX= yes -USE_GTK= yes -USE_GNOMELIBS= yes +USE_GNOMENG= yes +USE_GNOME= gnomelibs GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS= -L${LOCALBASE}/lib .if defined(WITH_DEBUG) CFLAGS+= -g LDFLAGS+= -g .endif -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" --- audio/xmms-a52dec/Makefile.old Sat Aug 31 09:00:12 2002 +++ audio/xmms-a52dec/Makefile Sat Aug 31 09:00:22 2002 @@ -19,7 +19,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/liba52dec.so ${PREFIX}/lib/xmms/Input/ --- audio/mhwaveedit/Makefile.old Sat Aug 31 09:00:41 2002 +++ audio/mhwaveedit/Makefile Sat Aug 31 09:00:57 2002 @@ -17,7 +17,8 @@ LIB_DEPENDS= sndfile.0:${PORTSDIR}/audio/libsndfile USE_REINPLACE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ --- audio/lame/Makefile.old Sat Aug 31 09:01:04 2002 +++ audio/lame/Makefile Sat Aug 31 09:04:34 2002 @@ -20,13 +20,14 @@ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes CONFIGURE_ARGS= --enable-nasm .include -.if (defined(HAVE_GTK) || defined(WITH_GTK)) && !defined(WITHOUT_GTK) -USE_GTK= yes +.if (${HAVE_GNOME:Mgtk12}!="" || defined(WITH_GTK)) && !defined(WITHOUT_GTK) +USE_GNOME+= gtk12 PLIST_SUB+= WITH_GTK='' .else PLIST_SUB+= WITH_GTK='@comment ' @@ -35,12 +36,12 @@ MAN1= lame.1 post-build: -.if defined(HAVE_GTK) && !defined(WITHOUT_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK) cd ${WRKSRC}/frontend && make mp3x .endif post-install: -.if defined(HAVE_GTK) && !defined(WITHOUT_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK) ${INSTALL_PROGRAM} ${WRKSRC}/frontend/mp3x ${PREFIX}/bin/ .endif --- audio/lame-devel/Makefile.old Sat Aug 31 09:03:16 2002 +++ audio/lame-devel/Makefile Sat Aug 31 09:04:04 2002 @@ -41,7 +41,8 @@ --enable-mp3rtp USE_GMAKE= yes USE_LIBTOOL= yes -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes MAN1= lame.1 @@ -49,8 +50,8 @@ .include -.if defined(HAVE_GTK) -USE_GTK= yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME+= gtk12 CONFIGURE_ARGS+= --enable-mp3x PLIST_SUB+= GTK= .else --- audio/mad/Makefile.old Sat Aug 31 09:04:44 2002 +++ audio/mad/Makefile Sat Aug 31 09:05:21 2002 @@ -17,7 +17,8 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext -WANT_ESOUND= yes +USE_GNOMENG= yes +WANT_GNOME= yes USE_AUTOCONF= yes USE_LIBTOOL= yes @@ -35,8 +36,8 @@ .include -.if defined(HAVE_ESOUND) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound .else CONFIGURE_ARGS+= --without-esd .endif --- audio/lopster/Makefile.old Sat Aug 31 09:05:36 2002 +++ audio/lopster/Makefile Sat Aug 31 09:05:45 2002 @@ -18,7 +18,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_X_PREFIX= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" --- audio/midimountain/Makefile.old Sat Aug 31 09:05:59 2002 +++ audio/midimountain/Makefile Sat Aug 31 09:06:12 2002 @@ -16,7 +16,8 @@ MAINTAINER= ports@FreeBSD.org USE_REINPLACE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_GMAKE= yes --- audio/mp3info/Makefile.old Sat Aug 31 09:06:23 2002 +++ audio/mp3info/Makefile Sat Aug 31 09:07:10 2002 @@ -14,7 +14,8 @@ MAINTAINER= petef@FreeBSD.org -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes MAN1= mp3info.1 @@ -22,7 +23,8 @@ ALL_TARGET= doc mp3info -.if defined(HAVE_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME+= gtk12 ALL_TARGET+= gmp3info PLIST_SUB+= WITH_GTK="" .else --- audio/mpg123/Makefile.old Sat Aug 31 09:07:35 2002 +++ audio/mpg123/Makefile Sat Aug 31 09:08:29 2002 @@ -25,7 +25,8 @@ MAINTAINER= des@FreeBSD.org -WANT_ESOUND= yes +USE_GNOMENG= yes +WANT_GNOME= yes .if defined(WITH_ICONV) MAKE_ARGS+= WITH_ICONV=yes @@ -49,8 +50,8 @@ MAKE_ENV+= USE_INET6=yes .endif -.if defined(HAVE_ESOUND) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound ALL_TARGET= freebsd-esd .elif defined(HAVE_NAS) PKGNAMESUFFIX= -nas --- audio/xmms-gdancer/Makefile.old Sat Aug 31 09:08:43 2002 +++ audio/xmms-gdancer/Makefile Sat Aug 31 09:08:52 2002 @@ -17,7 +17,8 @@ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes --- audio/replay/Makefile.old Sat Aug 31 09:09:16 2002 +++ audio/replay/Makefile Sat Aug 31 09:09:28 2002 @@ -15,8 +15,8 @@ MAINTAINER= nakai@FreeBSD.org USE_X_PREFIX= yes -USE_GTK= yes -USE_ESOUND= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 esound GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" --- audio/snd/Makefile.old Sat Aug 31 09:09:37 2002 +++ audio/snd/Makefile Sat Aug 31 09:10:36 2002 @@ -72,7 +72,8 @@ PLIST= ${WRKDIR}/pkg-plist .if !defined(WITHOUT_X11) PREFIX= ${X11BASE} -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_XLIB= yes .endif WRKSRC= ${WRKDIR}/snd-5 --- audio/soundtracker/Makefile.old Sat Aug 31 09:10:53 2002 +++ audio/soundtracker/Makefile Sat Aug 31 09:11:34 2002 @@ -13,8 +13,7 @@ MAINTAINER= kzentner@u.washington.edu USE_X_PREFIX= yes -USE_GTK= yes -USE_ESOUND= yes +USE_GNOMENG= yes WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -22,8 +21,8 @@ .include -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mgnomelibs}!="" +USE_GNOME= gtk12 esound CONFIGURE_ARGS+=--enable-gnome .else CONFIGURE_ARGS+=--disable-gnome --- audio/teknap/Makefile.old Sat Aug 31 09:14:47 2002 +++ audio/teknap/Makefile Sat Aug 31 09:15:59 2002 @@ -8,7 +8,7 @@ PORTNAME= TekNap PORTVERSION= 1.2 CATEGORIES= audio -MASTER_SITES= ftp://ukug.uk.freebsd.org/pub/lord_cj/ +MASTER_SITES= ftp://ukug.uk.freebsd.org/pub/lord_cj/ MAINTAINER= calle.madestrand@norrgarden.se @@ -24,15 +24,16 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" USE_GMAKE= yes -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" .include -.if defined(HAVE_GTK) -USE_GTK= yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME+= gtk12 CONFIGURE_ARGS+=--with-gtk .else CONFIGURE_ARGS+=--without-gtk --- audio/timidity++/Makefile.old Sat Aug 31 09:16:24 2002 +++ audio/timidity++/Makefile Sat Aug 31 09:17:07 2002 @@ -23,7 +23,8 @@ audio/timidity++-xaw audio/timidity++-xskin \ japanese/timidity++-slang japanese/timidity++-tcltk USE_BZIP2= yes -WANT_ESOUND= yes +USE_GNOMENG= yes +WANT_GNOME= yes GNU_CONFIGURE= yes .if !defined(WITHOUT_X11) USE_XLIB= yes @@ -52,8 +53,8 @@ .include -.if defined(HAVE_ESOUND) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME= esound CONFIGURE_ARGS+=--enable-audio=oss,esd .else CONFIGURE_ARGS+=--enable-audio=oss --- audio/timidity++-emacs/Makefile.old Sat Aug 31 09:17:21 2002 +++ audio/timidity++-emacs/Makefile Sat Aug 31 09:17:52 2002 @@ -44,7 +44,8 @@ ELISPDIR= ${PREFIX}/share/emacs/site-lisp .elif ${INTERFACE} == "gtk" LINK= gtkmidi -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 CONFIGURE_ENV= SHLD="gcc -shared" .elif ${INTERFACE} == "motif" LINK= xmmidi --- audio/wmusic/Makefile.old Sat Aug 31 09:18:02 2002 +++ audio/wmusic/Makefile Sat Aug 31 09:18:18 2002 @@ -20,7 +20,8 @@ CONFIGURE_ENV= PATH_GTKCONFIG=${PREFIX}/bin/gtk12-config USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_X_PREFIX= yes USE_XPM= yes --- audio/wsoundserver/Makefile.old Sat Aug 31 09:18:51 2002 +++ audio/wsoundserver/Makefile Sat Aug 31 09:19:26 2002 @@ -20,7 +20,8 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker USE_X_PREFIX= yes -WANT_ESOUND= yes +USE_GNOMENG= yes +WANT_GNOME= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/WINGs" @@ -36,8 +37,8 @@ .include -.if defined(HAVE_ESOUND) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound} +USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd .endif --- audio/x11amp/Makefile.old Sat Aug 31 09:19:47 2002 +++ audio/x11amp/Makefile Sat Aug 31 09:20:00 2002 @@ -14,10 +14,9 @@ MAINTAINER= dburr@FreeBSD.org - USE_XLIB= yes -USE_GTK= yes -USE_ESOUND= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 esound USE_LIBTOOL= yes LIBTOOLFILES= configure libx11amp/configure CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" --- audio/xhippo/Makefile.old Sat Aug 31 09:20:10 2002 +++ audio/xhippo/Makefile Sat Aug 31 09:20:58 2002 @@ -16,7 +16,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 USE_XLIB= yes -USE_GTK= yes +USE_GNOMENG= yes WANT_GNOME= yes GNU_CONFIGURE= yes MAKE_ARGS= CFLAGS="${CFLAGS}" @@ -26,8 +26,8 @@ .include -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME= gtk12 .endif post-install: --- audio/xmixer/Makefile.old Sat Aug 31 09:21:16 2002 +++ audio/xmixer/Makefile Sat Aug 31 09:21:26 2002 @@ -15,7 +15,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_REINPLACE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_AUTOCONF= yes MAN1= xmixer.1 --- audio/xmms-crossfade/Makefile.old Sat Aug 31 09:21:35 2002 +++ audio/xmms-crossfade/Makefile Sat Aug 31 09:22:05 2002 @@ -18,7 +18,8 @@ USE_X_PREFIX= yes USE_LIBTOOL= yes USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 INSTALLS_SHLIB= yes post-install: --- audio/xmms-fc/Makefile.old Sat Aug 31 09:22:24 2002 +++ audio/xmms-fc/Makefile Sat Aug 31 09:22:32 2002 @@ -17,6 +17,7 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 .include --- audio/xmms-crystality/Makefile.old Sat Aug 31 09:22:50 2002 +++ audio/xmms-crystality/Makefile Sat Aug 31 09:23:09 2002 @@ -17,8 +17,8 @@ LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms USE_X_PREFIX= yes -USE_GTK= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= imlib INSTALLS_SHLIB= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" --- audio/xmms-liveice/Makefile.old Sat Aug 31 09:23:14 2002 +++ audio/xmms-liveice/Makefile Sat Aug 31 09:23:23 2002 @@ -19,7 +19,8 @@ WRKSRC= ${WRKDIR}/LiveIce-1.0.0 USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_LIBTOOL= yes .include --- audio/xmms-shn/Makefile.old Sat Aug 31 09:23:49 2002 +++ audio/xmms-shn/Makefile Sat Aug 31 09:24:00 2002 @@ -16,7 +16,8 @@ RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_GMAKE= yes --- audio/xmms-sndfile/Makefile.old Sat Aug 31 09:24:31 2002 +++ audio/xmms-sndfile/Makefile Sat Aug 31 09:24:42 2002 @@ -18,7 +18,8 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_LIBTOOL= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes --- audio/xmms-sndstretch/Makefile.old Sat Aug 31 09:25:00 2002 +++ audio/xmms-sndstretch/Makefile Sat Aug 31 09:25:09 2002 @@ -18,7 +18,8 @@ WRKSRC= ${WRKDIR}/sndstretch_xmms -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_GMAKE= yes USE_X_PREFIX= yes MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS} --- audio/xmms-tfmx/Makefile.old Sat Aug 31 09:25:49 2002 +++ audio/xmms-tfmx/Makefile Sat Aug 31 09:25:58 2002 @@ -17,7 +17,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_LIBTOOL= yes .include --- audio/xmms-volnorm/Makefile.old Sat Aug 31 09:26:44 2002 +++ audio/xmms-volnorm/Makefile Sat Aug 31 09:26:54 2002 @@ -18,7 +18,8 @@ LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} INSTALLS_SHLIB= yes --- audio/xmp/Makefile.old Sat Aug 31 09:27:21 2002 +++ audio/xmp/Makefile Sat Aug 31 09:31:55 2002 @@ -21,15 +21,16 @@ CONFIGURE_ARGS= --disable-alsa CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" USE_AUTOCONF= yes -WANT_ESOUND= yes +USE_GNOMENG= yes +WANT_GNOME= yes .include .if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha" -USE_ESOUND= yes +USE_GNOME+= esound CONFIGURE_ARGS+= --disable-oss --enable-esd -.elif defined(HAVE_ESOUND) -USE_ESOUND= yes +.elif ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound CONFIGURE_ARGS+= --enable-esd .endif --- audio/soribada/Makefile.old Sat Aug 31 09:32:23 2002 +++ audio/soribada/Makefile Sat Aug 31 09:32:34 2002 @@ -16,7 +16,8 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes --- audio/mp3stat/Makefile.old Sat Aug 31 09:32:44 2002 +++ audio/mp3stat/Makefile Sat Aug 31 09:32:57 2002 @@ -17,7 +17,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" --- audio/xmms-musepack/Makefile.old Sat Aug 31 09:33:09 2002 +++ audio/xmms-musepack/Makefile Sat Aug 31 09:33:18 2002 @@ -16,7 +16,8 @@ USE_X_PREFIX= yes USE_GMAKE= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_LIBTOOL= yes post-install: --- audio/terminatorx/Makefile.old Sat Aug 31 09:33:24 2002 +++ audio/terminatorx/Makefile Sat Aug 31 09:33:39 2002 @@ -20,7 +20,8 @@ BUILD_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .endif -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes pre-everything: --- audio/xmms-ladspa/Makefile.old Sat Aug 31 09:34:10 2002 +++ audio/xmms-ladspa/Makefile Sat Aug 31 09:34:20 2002 @@ -17,7 +17,8 @@ WRKSRC= ${WRKDIR}/xmms_ladspa USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 do-install: @${INSTALL_DATA} ${WRKSRC}/ladspa.so ${PREFIX}/lib/xmms/Effect/ --- audio/zinf/Makefile.old Sat Aug 31 09:34:39 2002 +++ audio/zinf/Makefile Sat Aug 31 09:36:23 2002 @@ -18,8 +18,9 @@ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ ttf.4:${PORTSDIR}/print/freetype -USE_GTK= yes -WANT_ESOUND= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 +WANT_GNOME= yes USE_GMAKE= yes USE_AUTOCONF_VER=213 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ @@ -34,8 +35,8 @@ CFLAGS+= "-D_M_ALPHA" .endif -.if defined(HAVE_ESOUND) || defined(WITH_ALL_PLUGINS) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound}!="" || defined(WITH_ALL_PLUGINS) +USE_GNOME+= esound PLIST_SUB+= ESOUND="" .else CONFIGURE_ARGS+= --disable-esd @@ -69,11 +70,11 @@ @${ECHO_MSG} "WITH_ALL_PLUGINS=yes build with all plugins" @${ECHO_MSG} -# Stop a flood of complaints and PRs from people who can't be bothered +# Stop a flood of complaints and PRs from people who can't be bothered # to keep their ports and packages up to date. pre-extract: @test -d ${LOCALBASE}/include/freetype1/freetype && true \ - || { echo '===> UPGRADE print/freetype TO CURRENT VERSION!';false; } + || { ${ECHO_MSG} '===> UPGRADE print/freetype TO CURRENT VERSION!';false; } post-install: @${MKDIR} ${PREFIX}/etc/sdr/plugins