summaryrefslogtreecommitdiff
path: root/x11-wm/fvwm2
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2002-09-10 08:49:18 +0000
committerCy Schubert <cy@FreeBSD.org>2002-09-10 08:49:18 +0000
commit705008922b9b727b3ba3e81030a3db9bbde536b7 (patch)
treec5f9487f5b2468e5ca18e60f2fc042c182b1bc12 /x11-wm/fvwm2
parentUse catdump in freepwing instead of in japanese/epwutil (diff)
Pkg-plist should reflect that FvwmGtk is installed only when GTK is detected.
Noticed by: Udo Schweigert <Udo.Schweigert@siemens.com>
Notes
Notes: svn path=/head/; revision=66026
Diffstat (limited to 'x11-wm/fvwm2')
-rw-r--r--x11-wm/fvwm2/Makefile12
-rw-r--r--x11-wm/fvwm2/pkg-plist2
2 files changed, 6 insertions, 8 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index b42e636a06bc..db9baf2f6e36 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -30,11 +30,6 @@ WANT_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mimlib}!="" && !defined(WITHOUT_GNOME)
-USE_GNOME+= imlib
-PKGNAMESUFFIX= -imlib
-.endif
-
GNU_CONFIGURE= yes
.if defined(WITH_STROKE)
@@ -52,16 +47,19 @@ CONFIGURE_ARGS+= --disable-shape
PLIST_SUB+= FVWM_VERSION="${PORTVERSION}"
-.if defined(HAVE_GNOME) && !defined(WITHOUT_GNOME)
-USE_GNOME= yes
+.if ${HAVE_GNOME:Mimlib}!=""
+USE_GNOME= imlib
+PKGNAMESUFFIX= -imlib
CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \
--enable-gtktest --enable-imlibtest
PLIST_SUB+= GNOMEDATADIR="share/fvwm"
PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm"
+PLIST_SUB+= GTK=""
.else
CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \
--disable-gtktest --disable-imlibtest
PLIST_SUB+= GNOMEDATADIR="share/fvwm"
+PLIST_SUB+= GTK="@comment not installed: "
.endif
MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index 3a0195f1aa4d..f5d814d0b2f6 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -31,7 +31,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
-libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
+%%GTK%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent