diff options
| author | petef <petef@FreeBSD.org> | 2002-05-27 08:10:24 +0800 |
|---|---|---|
| committer | petef <petef@FreeBSD.org> | 2002-05-27 08:10:24 +0800 |
| commit | 1768574b7d8952d710d384b2cfe72d5a0b0ae32c (patch) | |
| tree | 5fe2bbf770dbb05888eaabd5dc35515d65659cd8 | |
| parent | a8b2e2bd777003d6ac5a149f57b2bc97ebbf2a25 (diff) | |
| download | freebsd-ports-gnome-1768574b7d8952d710d384b2cfe72d5a0b0ae32c.tar.gz freebsd-ports-gnome-1768574b7d8952d710d384b2cfe72d5a0b0ae32c.tar.zst freebsd-ports-gnome-1768574b7d8952d710d384b2cfe72d5a0b0ae32c.zip | |
Only depend on GTK & Imlib if we're buildling the GNOME version.
Submitted by: AMAKAWA Shuhei <sa264@cam.ac.uk>
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 14 | ||||
| -rw-r--r-- | x11-wm/fvwm2/pkg-plist | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm24/Makefile | 14 | ||||
| -rw-r--r-- | x11-wm/fvwm24/pkg-plist | 2 |
4 files changed, 20 insertions, 12 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 72e59ee515c1..219754ff6ae7 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -23,11 +23,16 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke .endif USE_GMAKE= yes -USE_GTK= yes -USE_IMLIB= yes USE_XPM= yes USE_X_PREFIX= yes + +.include <bsd.port.pre.mk> + WANT_GNOME= yes +.if defined(HAVE_GNOME) +USE_GTK= yes +USE_IMLIB= yes +.endif GNU_CONFIGURE= yes @@ -46,13 +51,12 @@ CONFIGURE_ARGS+= --disable-shape PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" -.include <bsd.port.pre.mk> - .if defined(HAVE_GNOME) USE_GNOME= yes PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm" .else -CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints +CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \ + --disable-gtktest --disable-imlibtest PLIST_SUB+= GNOMEDATADIR="share/fvwm" .endif diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist index fc9e521939bc..d1fe26b66b68 100644 --- a/x11-wm/fvwm2/pkg-plist +++ b/x11-wm/fvwm2/pkg-plist @@ -29,7 +29,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 +%%GNOME:%%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 72e59ee515c1..219754ff6ae7 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -23,11 +23,16 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke .endif USE_GMAKE= yes -USE_GTK= yes -USE_IMLIB= yes USE_XPM= yes USE_X_PREFIX= yes + +.include <bsd.port.pre.mk> + WANT_GNOME= yes +.if defined(HAVE_GNOME) +USE_GTK= yes +USE_IMLIB= yes +.endif GNU_CONFIGURE= yes @@ -46,13 +51,12 @@ CONFIGURE_ARGS+= --disable-shape PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" -.include <bsd.port.pre.mk> - .if defined(HAVE_GNOME) USE_GNOME= yes PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm" .else -CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints +CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \ + --disable-gtktest --disable-imlibtest PLIST_SUB+= GNOMEDATADIR="share/fvwm" .endif diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist index fc9e521939bc..d1fe26b66b68 100644 --- a/x11-wm/fvwm24/pkg-plist +++ b/x11-wm/fvwm24/pkg-plist @@ -29,7 +29,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 +%%GNOME:%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent |