diff options
| author | cy <cy@FreeBSD.org> | 2002-09-10 16:49:18 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2002-09-10 16:49:18 +0800 |
| commit | 98ce5d15faf1590f86ed2d5233598cf8f540e211 (patch) | |
| tree | 02b588ea5202f12bc7d178928bfc02ddc97192e9 /x11-wm | |
| parent | 663b1feb1be3f19f482e59271c23ecfce53c408c (diff) | |
| download | freebsd-ports-gnome-98ce5d15faf1590f86ed2d5233598cf8f540e211.tar.gz freebsd-ports-gnome-98ce5d15faf1590f86ed2d5233598cf8f540e211.tar.zst freebsd-ports-gnome-98ce5d15faf1590f86ed2d5233598cf8f540e211.zip | |
Pkg-plist should reflect that FvwmGtk is installed only when GTK is detected.
Noticed by: Udo Schweigert <Udo.Schweigert@siemens.com>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 12 | ||||
| -rw-r--r-- | x11-wm/fvwm2/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm24/Makefile | 12 | ||||
| -rw-r--r-- | x11-wm/fvwm24/pkg-plist | 2 |
4 files changed, 12 insertions, 16 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 diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index b42e636a06bc..db9baf2f6e36 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/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/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist index 3a0195f1aa4d..f5d814d0b2f6 100644 --- a/x11-wm/fvwm24/pkg-plist +++ b/x11-wm/fvwm24/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 |