diff options
author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /wm/bbrun | |
parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'wm/bbrun')
-rw-r--r-- | wm/bbrun/Makefile | 13 | ||||
-rw-r--r-- | wm/bbrun/PLIST | 2 | ||||
-rw-r--r-- | wm/bbrun/distinfo | 3 | ||||
-rw-r--r-- | wm/bbrun/patches/patch-aa | 13 |
4 files changed, 9 insertions, 22 deletions
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index 198cd39e19c..94ec2718417 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/17 18:57:49 tron Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:28 jlam Exp $ DISTNAME= bbrun-1.3 WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun @@ -9,8 +9,9 @@ MAINTAINER= ptiJo@noos.fr HOMEPAGE= http://www.dwave.net/~jking/bbrun/ COMMENT= run utility for BlackBox -USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES +USE_GMAKE= YES ALL_TARGET= bbrun @@ -19,7 +20,7 @@ do-install: ${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 "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbrun/PLIST b/wm/bbrun/PLIST index b715541d6b2..ce6be6b60bd 100644 --- a/wm/bbrun/PLIST +++ b/wm/bbrun/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:28 jlam Exp $ bin/bbrun share/doc/bbrun/README @dirrm share/doc/bbrun diff --git a/wm/bbrun/distinfo b/wm/bbrun/distinfo index c010fec9595..ca0d7c0c7dd 100644 --- a/wm/bbrun/distinfo +++ b/wm/bbrun/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/06/17 18:57:50 tron Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:51:28 jlam Exp $ SHA1 (bbrun-1.3.tar.gz) = 719af622334f6c3186f07da7c9246a8b05381f6c Size (bbrun-1.3.tar.gz) = 19423 bytes -SHA1 (patch-aa) = 20abf46fedcd208fc2a50d8afc2615bf4b6ae95a diff --git a/wm/bbrun/patches/patch-aa b/wm/bbrun/patches/patch-aa deleted file mode 100644 index e2ffcda84b4..00000000000 --- a/wm/bbrun/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/06/17 18:57:50 tron Exp $ - ---- 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` - OBJS = bbrun.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ |