From b180b781b95b90978d101647939e6701fc852168 Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Thu, 11 Oct 2001 09:11:22 +0000
Subject: There was a problem with PLIST if the user had gtk+ installed but
 didn't use FVWM2_USE_GTK=YES. The problem is fixed by adding
 --without-gtk-prefix to CONFIGURE_ARGS if FVWM2_USE_GTK=NO.

---
 wm/fvwm2/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'wm/fvwm2')

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index d0f57d98c76..b2c2332dc5b 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/09 12:19:06 martti Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/11 09:11:22 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -20,12 +20,11 @@ CONFLICTS=	fvwm-2.*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 FVWM_VER=	2.4.3
 
-## USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
 
-PLIST_SUBST+=	FVWM_VER=${FVWM_VER}
+PLIST_SUBST+=		FVWM_VER=${FVWM_VER}
 
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--enable-extras --without-gnome
@@ -59,9 +58,10 @@ post-install:
 
 .if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
 .include "../../x11/gtk/buildlink.mk"
-PLIST_SUBST+=	GTK=""
+PLIST_SUBST+=	    GTK=""
 .else
-PLIST_SUBST+=	GTK="@comment "
+PLIST_SUBST+=	    GTK="@comment "
+CONFIGURE_ARGS+=    --without-gtk-prefix
 .endif
 
 .if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES"
-- 
cgit v1.2.3