diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2002-09-09 00:56:05 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2002-09-09 00:56:05 +0000 |
| commit | 5686db256754e06a59935507737ede635c3b8c94 (patch) | |
| tree | 5881c798b244ba53df783000d0b496197b69376f /x11-wm/fvwm2 | |
| parent | b95103c143fcd823ef6d47cf5be326ba1bb61944 (diff) | |
| download | ports-5686db256754e06a59935507737ede635c3b8c94.tar.gz ports-5686db256754e06a59935507737ede635c3b8c94.zip | |
Fix package build and package deinstall when not using GNOME.
PR: 42545
Noticed by: bento & Udo Schweigert <udo.schweigert@siemens.com>
Notes
Notes:
svn path=/head/; revision=65868
Diffstat (limited to 'x11-wm/fvwm2')
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/fvwm2/pkg-plist | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index b7063924444a..b42e636a06bc 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -30,7 +30,7 @@ WANT_GNOME= yes .include <bsd.port.pre.mk> -.if ${HAVE_GNOME:Mimlib}!="" +.if ${HAVE_GNOME:Mimlib}!="" && !defined(WITHOUT_GNOME) USE_GNOME+= imlib PKGNAMESUFFIX= -imlib .endif @@ -52,8 +52,11 @@ CONFIGURE_ARGS+= --disable-shape PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" -.if defined(HAVE_GNOME) +.if defined(HAVE_GNOME) && !defined(WITHOUT_GNOME) USE_GNOME= yes +CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \ + --enable-gtktest --enable-imlibtest +PLIST_SUB+= GNOMEDATADIR="share/fvwm" PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm" .else CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \ diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist index d1fe26b66b68..b3c51fcae6da 100644 --- a/x11-wm/fvwm2/pkg-plist +++ b/x11-wm/fvwm2/pkg-plist @@ -5,6 +5,8 @@ bin/fvwm-menu-directory bin/fvwm-menu-headlines bin/fvwm-menu-xlock bin/fvwm2 +bin/fvwm +bin/fvwm-root bin/fvwm24_convert bin/fvwmbug bin/xpmroot @@ -29,7 +31,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent libexec/fvwm/%%FVWM_VERSION%%/FvwmForm -%%GNOME:%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk +libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent |