aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/aewm/Makefile16
-rw-r--r--x11-wm/alloywm/Makefile10
-rw-r--r--x11-wm/amaterus/Makefile3
-rw-r--r--x11-wm/bbapm/Makefile3
-rw-r--r--x11-wm/bbrun/Makefile3
-rw-r--r--x11-wm/e16/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile4
-rw-r--r--x11-wm/fluxconf/Makefile3
-rw-r--r--x11-wm/fvwm2-devel/Makefile10
-rw-r--r--x11-wm/fvwm2/Makefile11
-rw-r--r--x11-wm/fvwm24/Makefile11
-rw-r--r--x11-wm/icepref/Makefile3
-rw-r--r--x11-wm/icewm/Makefile10
-rw-r--r--x11-wm/libepplet/Makefile4
-rw-r--r--x11-wm/qvwm/Makefile4
-rw-r--r--x11-wm/sawfish/Makefile1
-rw-r--r--x11-wm/scwm/Makefile4
-rw-r--r--x11-wm/spager/Makefile3
-rw-r--r--x11-wm/waimea/Makefile3
-rw-r--r--x11-wm/xfce/Makefile3
-rw-r--r--x11-wm/xfce4/Makefile3
22 files changed, 67 insertions, 53 deletions
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index 93cb6d7e13d0..8fc9f2e0ca74 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -25,18 +25,20 @@ MAN1= aewm.1
PLIST= ${WRKDIR}/pkg-plist
USE_GMAKE= yes
USE_X_PREFIX= yes
-WANT_GTK= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
.include <bsd.port.pre.mk>
-.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 @@ do-patch:
.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 @@ pre-install:
.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 @@ do-install:
.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
diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile
index 1c9e81a3a1cc..01f850e8bd85 100644
--- a/x11-wm/alloywm/Makefile
+++ b/x11-wm/alloywm/Makefile
@@ -16,7 +16,8 @@ HAS_CONFIGURE= yes
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 @@ pre-configure:
${CHMOD} +x ${WRKSRC}/configure
do-build:
- cd ${WRKSRC}/goodies && gmake
+ cd ${WRKSRC}/goodies && ${GMAKE}
.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 @@ do-install:
-exec ${INSTALL_PROGRAM} {} ${PREFIX}/bin \;
.include <bsd.port.pre.mk>
-.if defined(HAVE_GTK)
-USE_GTK=yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+= gtk12
+PKGNAMESUFFIX= -gtk
.endif
.include <bsd.port.post.mk>
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 636a92b9d551..4de90985b2d8 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -15,7 +15,8 @@ MAINTAINER= nakai@FreeBSD.org
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"
diff --git a/x11-wm/bbapm/Makefile b/x11-wm/bbapm/Makefile
index c11ce378e970..416ed2d740e9 100644
--- a/x11-wm/bbapm/Makefile
+++ b/x11-wm/bbapm/Makefile
@@ -17,7 +17,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= adam@vectors.cx
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
GNU_CONFIGURE= yes
do-install:
diff --git a/x11-wm/bbrun/Makefile b/x11-wm/bbrun/Makefile
index 90560b0f27b4..339598d8bfbf 100644
--- a/x11-wm/bbrun/Makefile
+++ b/x11-wm/bbrun/Makefile
@@ -15,7 +15,8 @@ MAINTAINER= adam@vectors.cx
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
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 3ab3d18c9295..640e5ee4f692 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
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
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 3ab3d18c9295..640e5ee4f692 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
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
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 3ab3d18c9295..640e5ee4f692 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
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
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 260e6581f35f..c0fa6f1720fe 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES= http://devaux.fabien.free.fr/flux/
MAINTAINER= hendrik@scholz.net
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
USE_BZIP2= yes
.ifndef(WITHOUT_LOGO)
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 53a99bb8aaf1..4d271ab38ab4 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
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 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke
.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 @@ PLIST_SUB+= FVWM_VERSION="${PORTVERSION}"
.include <bsd.port.pre.mk>
-.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
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index ba2d10086d07..b7063924444a 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
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 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke
USE_GMAKE= yes
USE_XPM= yes
USE_X_PREFIX= yes
+USE_BZIP2= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
.include <bsd.port.pre.mk>
-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
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index ba2d10086d07..b7063924444a 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
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 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke
USE_GMAKE= yes
USE_XPM= yes
USE_X_PREFIX= yes
+USE_BZIP2= yes
+USE_GNOMENG= yes
+WANT_GNOME= yes
.include <bsd.port.pre.mk>
-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
diff --git a/x11-wm/icepref/Makefile b/x11-wm/icepref/Makefile
index eec4197b226e..00c6253251fd 100644
--- a/x11-wm/icepref/Makefile
+++ b/x11-wm/icepref/Makefile
@@ -17,7 +17,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
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
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index b7032fca8834..7e8557d93ec0 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
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 @@ CONFIGURE_ARGS= --enable-i18n --enable-nls \
.include <bsd.port.pre.mk>
-.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 @@ PLIST_SUB+= ESOUND=""
.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
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index bd67e9f72808..2fc86c9e9f2a 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 0.5
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 @@ MAINTAINER= cmc@groupofnine.org
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
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index f5697b3298a6..c8222ccd1491 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/ \
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
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index fa8edb140f40..b9afe6f84eed 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -26,7 +26,6 @@ PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_IMLIB= yes
USE_REINPLACE= yes
USE_GNOMENG= yes
WANT_GNOME= yes
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 137c46efff9e..3d3bab85cc06 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -16,10 +16,10 @@ LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
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}
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index 4de68b520359..3e66fde54fb1 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -15,7 +15,8 @@ MAINTAINER= nakai@FreeBSD.org
RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
USE_X_PREFIX= yes
-USE_GTK= yes
+USE_GNOMENG= yes
+USE_GNOME= gtk12
ALL_TARGET= spager
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 76bbe2adc58a..b8cba7d89579 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR= waimea
MAINTAINER= danfe@regency.nsu.ru
USE_GMAKE= yes
-USE_IMLIB= yes
+USE_GNOMENG= yes
+USE_GNOME= imlib
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 5fb415e0b003..65e8c4c05ef5 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
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}
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 5fb415e0b003..65e8c4c05ef5 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
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}
generated by cgit (git 2.34.1) at 2024-12-27 03:57:38 +0800