From 9db88bb589e7c06f293d51fba7544655b73e80d6 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Mon, 17 Jun 2002 18:57:49 +0000
Subject: Fix build problem on systems where the "xpkwedge" package is
 installed. Patches supplied by Robert Elz in PR pkg/17300.

---
 wm/bbrun/Makefile         | 10 ++++++----
 wm/bbrun/distinfo         |  4 ++--
 wm/bbrun/patches/patch-aa | 21 +++++----------------
 3 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'wm/bbrun')

diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 082db4e417e..198cd39e19c 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.2 2002/06/17 18:57:49 tron Exp $
 
 DISTNAME=	bbrun-1.3
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
@@ -10,14 +9,17 @@ MAINTAINER=	ptiJo@noos.fr
 HOMEPAGE=	http://www.dwave.net/~jking/bbrun/
 COMMENT=	run utility for BlackBox
 
-USE_GMAKE=		yes
-USE_BUILDLINK_ONLY=	yes
+USE_GMAKE=		YES
+USE_BUILDLINK_ONLY=	YES
+
+ALL_TARGET=	bbrun
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bbrun ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbrun/distinfo b/wm/bbrun/distinfo
index be81b65ff2d..c010fec9595 100644
--- a/wm/bbrun/distinfo
+++ b/wm/bbrun/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/06/17 18:57:50 tron Exp $
 
 SHA1 (bbrun-1.3.tar.gz) = 719af622334f6c3186f07da7c9246a8b05381f6c
 Size (bbrun-1.3.tar.gz) = 19423 bytes
-SHA1 (patch-aa) = 728c220afe870f998d7772ab7c26fd170e734796
+SHA1 (patch-aa) = 20abf46fedcd208fc2a50d8afc2615bf4b6ae95a
diff --git a/wm/bbrun/patches/patch-aa b/wm/bbrun/patches/patch-aa
index 15c1aa0f1d2..e2ffcda84b4 100644
--- a/wm/bbrun/patches/patch-aa
+++ b/wm/bbrun/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/17 18:57:50 tron Exp $
 
---- Makefile.orig	Wed Feb  6 21:05:51 2002
-+++ Makefile
+--- Makefile.orig	Wed Feb  6 20:05:51 2002
++++ Makefile	Mon Jun 17 07:16:33 2002
 @@ -1,6 +1,6 @@
  CC     = gcc
 -LIBS   = -lXpm `gtk-config --libs`
 -CFLAGS = `gtk-config --cflags`
-+LIBS   = -lXpm `${GTK_CONFIG} --libs`
-+CFLAGS = `${GTK_CONFIG} --cflags`
++LIBS   += -lXpm `${GTK_CONFIG} --libs`
++CFLAGS += `${GTK_CONFIG} --cflags`
  OBJS   = bbrun.o \
           ../wmgeneral/wmgeneral.o \
           ../wmgeneral/misc.o \
-@@ -9,8 +9,10 @@
- .c.o:
- 	$(CC) -c -O2 -Wall $< -o $*.o $(CFLAGS)
- 
-+all: bbrun
-+
- bbrun: $(OBJS)
- 	$(CC) -Wall -g -o bbrun $^ $(LIBS)
- 
- clean:
- 	rm -f bbrun $(OBJS)
-- 
cgit v1.2.3