--- x11-wm/aewm/Makefile Mon Sep 2 10:17:14 2002 +++ x11-wm/aewm/Makefile Mon Sep 2 10:20:13 2002 @@ -25,18 +25,20 @@ PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes USE_X_PREFIX= yes -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes .include -.if defined(HAVE_GTK) -USE_GTK=yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME+= gtk12 +PKGNAMESUFFIX= -gtk .endif do-patch: ${PERL} -pi -e 's:/etc/X11/aewm/aewmrc:${PREFIX}/etc/aewmrc:g' \ ${WRKSRC}/aewm.h ${PERL} -pi -e 's:\+make:\+gmake:g' ${WRKSRC}/Makefile -.if defined(HAVE_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" ${PERL} -pi -e 's:gtk-config:${GTK_CONFIG}:g' \ ${WRKSRC}/clients/Makefile ${PERL} -pi -e 's:/etc/X11/aewm/clientsrc:${PREFIX}/etc/clientsrc:g' \ @@ -44,7 +46,7 @@ .endif post-build: -.if defined(HAVE_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \ ${GTKCLIENTS} ${XAWCLIENTS} .else @@ -57,7 +59,7 @@ .for i in aewm aemenu aepanel ${XAWCLIENTS} ${ECHO_CMD} bin/${i} >> ${PLIST} .endfor -.if defined(HAVE_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" .for i in ${GTKCLIENTS} ${ECHO_CMD} bin/${i} >> ${PLIST} .endfor @@ -80,7 +82,7 @@ .for i in ${XAWCLIENTS} ${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin .endfor -.if defined(HAVE_GTK) +.if ${HAVE_GNOME:Mgtk12}!="" .for i in ${GTKCLIENTS} ${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin .endfor --- x11-wm/alloywm/Makefile Mon Sep 2 10:18:39 2002 +++ x11-wm/alloywm/Makefile Mon Sep 2 10:19:41 2002 @@ -16,7 +16,8 @@ PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes USE_X_PREFIX= yes -WANT_GTK= yes +USE_GNOMENG= yes +WANT_GNOME= yes SCRIPTS= ${WRKSRC}/scriptdir pre-configure: @@ -27,7 +28,7 @@ ${CHMOD} +x ${WRKSRC}/configure do-build: - cd ${WRKSRC}/goodies && gmake + cd ${WRKSRC}/goodies && ${MAKE} .for ii in client events main misc new screen widgets cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${X11BASE}/include \ ${ii}.c @@ -52,7 +53,8 @@ -exec ${INSTALL_PROGRAM} {} ${PREFIX}/bin \; .include -.if defined(HAVE_GTK) -USE_GTK=yes +.if ${HAVE_GNOME:Mgtk12}!="" +USE_GNOME+= gtk12 +PKGNAMESUFFIX= -gtk .endif .include --- x11-wm/amaterus/Makefile Mon Sep 2 10:20:17 2002 +++ x11-wm/amaterus/Makefile Mon Sep 2 10:20:26 2002 @@ -15,7 +15,8 @@ LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml 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" --- x11-wm/bbapm/Makefile Mon Sep 2 10:20:40 2002 +++ x11-wm/bbapm/Makefile Mon Sep 2 10:20:47 2002 @@ -17,7 +17,8 @@ MAINTAINER= adam@vectors.cx USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 GNU_CONFIGURE= yes do-install: --- x11-wm/bbrun/Makefile Mon Sep 2 10:20:56 2002 +++ x11-wm/bbrun/Makefile Mon Sep 2 10:21:09 2002 @@ -15,7 +15,8 @@ LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_GMAKE= yes USE_XPM= yes WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun --- x11-wm/enlightenment/Makefile Mon Sep 2 10:21:17 2002 +++ x11-wm/enlightenment/Makefile Mon Sep 2 10:21:49 2002 @@ -27,8 +27,8 @@ USE_GMAKE= yes USE_X_PREFIX= yes -USE_ESOUND= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= esound imlib USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --- x11-wm/fvwm2/Makefile Mon Sep 2 10:24:00 2002 +++ x11-wm/fvwm2/Makefile Mon Sep 2 10:25:01 2002 @@ -12,7 +12,6 @@ http://www.fvwm.org/generated/icon_download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_BZIP2= yes MAINTAINER= cy@FreeBSD.org @@ -25,13 +24,15 @@ USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes +USE_BZIP2= yes +USE_GNOMENG= yes +WANT_GNOME= yes .include -WANT_GNOME= yes -.if defined(HAVE_GNOME) -USE_GTK= yes -USE_IMLIB= yes +.if ${HAVE_GNOME:Mimlib}!="" +USE_GNOME+= imlib +PKGNAMESUFFIX= -imlib .endif GNU_CONFIGURE= yes --- x11-wm/fvwm2-devel/Makefile Mon Sep 2 10:29:23 2002 +++ x11-wm/fvwm2-devel/Makefile Mon Sep 2 10:30:09 2002 @@ -12,7 +12,6 @@ http://www.fvwm.org/generated/icon_download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_BZIP2= yes MAINTAINER= cy@FreeBSD.org @@ -23,11 +22,11 @@ .endif USE_GMAKE= yes -USE_GTK= yes -USE_IMLIB= yes USE_XPM= yes USE_X_PREFIX= yes +USE_GNOMENG= yes WANT_GNOME= yes +USE_BZIP2= yes GNU_CONFIGURE= yes @@ -40,8 +39,9 @@ .include -.if defined(HAVE_GNOME) -USE_GNOME= yes +.if ${HAVE_GNOME:Mimlib}!="" +USE_GNOME+= imlib +PKGNAMESUFFIX= -imlib PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm" .else CONFIGURE_ARGS+= --without-gnome --- x11-wm/icepref/Makefile Mon Sep 2 10:30:23 2002 +++ x11-wm/icepref/Makefile Mon Sep 2 10:30:35 2002 @@ -17,7 +17,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_PYTHON= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 NO_BUILD= yes MAN1= icepref.1 --- x11-wm/icewm/Makefile Mon Sep 2 10:31:00 2002 +++ x11-wm/icewm/Makefile Mon Sep 2 10:33:39 2002 @@ -17,7 +17,7 @@ LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes -WANT_ESOUND= yes +USE_GNOMENG= yes WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -33,9 +33,9 @@ .include -.if defined(HAVE_GNOME) +.if ${HAVE_GNOME:Mgnomelibs}!="" .undef HAVE_ESOUND -USE_GNOME= yes +USE_GNOME+= gnomelibs CONFIGURE_ARGS+= --with-imlib --without-xpm --with-gnome-menus \ --enable-guievents --with-icesound=esound INSTALL_TARGET= install install-gnome @@ -43,8 +43,8 @@ .else USE_XPM= yes CONFIGURE_ARGS+= --without-imlib --with-xpm --without-gnome-menus -.if defined(HAVE_ESOUND) -USE_ESOUND= yes +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound CONFIGURE_ARGS+= --enable-guievents --with-icesound=esound PLIST_SUB+= ESOUND="" .else --- x11-wm/libepplet/Makefile Mon Sep 2 10:33:57 2002 +++ x11-wm/libepplet/Makefile Mon Sep 2 10:34:25 2002 @@ -10,7 +10,6 @@ CATEGORIES= x11-wm devel MASTER_SITES= ftp://kde.planetmirror.com/pub/enlightenment/epplets/ \ ftp://ftp.dti.ad.jp/pub/X/enlightenment/epplets/ - DISTNAME= epplet-base-${PORTVERSION} MAINTAINER= cmc@groupofnine.org @@ -18,7 +17,8 @@ WRKSRC= ${WRKDIR}/Epplets-${PORTVERSION} USE_X_PREFIX= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= imlib USE_LIBTOOL= yes CONFIGURE_ENV= EROOT=${X11BASE}/share/enlightenment \ EBIN=${X11BASE}/bin --- x11-wm/qvwm/Makefile Mon Sep 2 10:34:37 2002 +++ x11-wm/qvwm/Makefile Mon Sep 2 10:34:48 2002 @@ -14,8 +14,8 @@ MAINTAINER= nakai@FreeBSD.org USE_X_PREFIX= yes -USE_ESOUND= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= esound imlib USE_XPM= yes GNU_CONFIGURE= yes --- x11-wm/sawfish/Makefile Mon Sep 2 10:34:59 2002 +++ x11-wm/sawfish/Makefile Mon Sep 2 10:35:48 2002 @@ -26,7 +26,6 @@ USE_X_PREFIX= yes USE_GMAKE= yes -USE_IMLIB= yes USE_REINPLACE= yes USE_GNOMENG= yes WANT_GNOME= yes --- x11-wm/scwm/Makefile Mon Sep 2 10:35:52 2002 +++ x11-wm/scwm/Makefile Mon Sep 2 10:36:07 2002 @@ -16,10 +16,10 @@ RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons USE_X_PREFIX= yes +USE_GNOMENG= yes +USE_GNOME= esound imlib USE_GMAKE= yes USE_XPM= yes -USE_ESOUND= yes -USE_IMLIB= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} --- x11-wm/spager/Makefile Mon Sep 2 10:36:18 2002 +++ x11-wm/spager/Makefile Mon Sep 2 10:36:28 2002 @@ -15,7 +15,8 @@ RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 ALL_TARGET= spager --- x11-wm/fluxconf/Makefile Mon Sep 2 10:21:58 2002 +++ x11-wm/fluxconf/Makefile Mon Sep 2 10:22:07 2002 @@ -13,7 +13,8 @@ MAINTAINER= hendrik@scholz.net USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_BZIP2= yes .ifndef(WITHOUT_LOGO) --- x11-wm/xfce/Makefile Mon Sep 2 10:41:22 2002 +++ x11-wm/xfce/Makefile Mon Sep 2 10:41:37 2002 @@ -20,7 +20,8 @@ USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GTK= yes +USE_GNOMENG= yes +USE_GNOME= gtk12 USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} --- x11-wm/waimea/Makefile Mon Sep 2 10:36:35 2002 +++ x11-wm/waimea/Makefile Mon Sep 2 10:36:44 2002 @@ -14,7 +14,8 @@ MAINTAINER= danfe@regency.nsu.ru USE_GMAKE= yes -USE_IMLIB= yes +USE_GNOMENG= yes +USE_GNOME= imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes