From owner-freebsd-ports-bugs@FreeBSD.ORG  Wed Dec  3 15:33:20 2003
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7D7F516A4CE; Wed,  3 Dec 2003 15:33:20 -0800 (PST)
Received: from blues.jpj.net (blues.jpj.net [208.210.80.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0177943FE9; Wed,  3 Dec 2003 15:33:17 -0800 (PST)
	(envelope-from trevor@jpj.net)
Received: from blues.jpj.net (localhost.jpj.net [127.0.0.1])
	by blues.jpj.net (8.12.10/8.12.3) with ESMTP id hB3NXDq2062457;
	Wed, 3 Dec 2003 18:33:13 -0500 (EST)
	(envelope-from trevor@jpj.net)
Received: from localhost (trevor@localhost)hB3NXDw3062454;
	Wed, 3 Dec 2003 18:33:13 -0500 (EST)
X-Authentication-Warning: blues.jpj.net: trevor owned process doing -bs
Date: Wed, 3 Dec 2003 18:33:13 -0500 (EST)
From: Trevor Johnson <trevor@jpj.net>
To: portmgr@freebsd.org, freebsd-ports-bugs@freebsd.org
Message-ID: <20031203183250.O61614@blues.jpj.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: patch for ports/x11-wm/aewm
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Dec 2003 23:33:20 -0000

Get this to compile when GTK+ is not present.  Fix whitespace too.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/aewm/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	3 Nov 2003 03:56:42 -0000	1.15
+++ Makefile	3 Dec 2003 23:21:51 -0000
@@ -13,8 +13,6 @@
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	ICCCM-compliant window manager based on 9wm

-BROKEN=		"Does not compile, will be removed after Feb 2"
-
 GTKCLIENTS=	aemenu-gtk aepanel-gtk
 XAWCLIENTS=	set-gnome-pda \
 		aesession \
@@ -29,18 +27,19 @@
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
-REINPLACE_ARGS=	-i'' -E
+REINPLACE_ARGS=	-i '' -E

 .include <bsd.port.pre.mk>
 .if ${HAVE_GNOME:Mgtk20}!=""
-USE_GNOME+=    gtk20
-PKGNAMESUFFIX= -gtk
+USE_GNOME+=	gtk20
+PKGNAMESUFFIX=	-gtk
 .endif

 do-patch:
 	${REINPLACE_CMD} 's:/etc/X11/aewm/aewmrc:${PREFIX}/etc/aewmrc:g' \
 		${WRKSRC}/src/aewm.h
 	${REINPLACE_CMD} 's:\+make:\+gmake:g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} 's:clients::g' ${WRKSRC}/Makefile
 .if ${HAVE_GNOME:Mgtk20}!=""
 	${REINPLACE_CMD} 's:gtk-config:${GTK_CONFIG}:g' \
 		${WRKSRC}/clients/Makefile
-- 
Trevor Johnson