PKGREVISON++

- install into LOCALBASE, not X11BASE.
- style cosmetics (DESCR has 80 columns, sort CATEGORIES, whitespace)

8 files changed, 44 insertions, 41 deletions

diff --git a/wm/bbkeys/DESCR b/wm/bbkeys/DESCR
index 162ce46f60d..f909dc57ed4 100644
--- a/wm/bbkeys/DESCR
+++ b/wm/bbkeys/DESCR
@@ -1,5 +1,5 @@
-Provide keyboard shortcuts for X11R6, specifically intended for use with
-the Blackbox window manager but usable with any.
+Provide keyboard shortcuts for X11R6, specifically intended for use with the
+Blackbox window manager but usable with any.
 
 Can bind actions such as executing commands, altering the states of windows,
 switching workspaces, etc. to arbitrary keys.
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index 1d46c54f039..1cbb5d62c75 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2002/09/24 14:21:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/17 05:41:09 salo Exp $
 #
 
 DISTNAME=	bbkeys-0.8.5
-CATEGORIES=	x11 wm
-MASTER_SITES=	http://bbkeys.sourceforge.net/downloads/ \
-		${MASTER_SITE_SOURCEFORGE:=bbkeys/}
+PKGREVISION=	1
+CATEGORIES=	wm x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbkeys/}
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
@@ -12,7 +12,8 @@ COMMENT=	General X Window keygrabber
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_X11BASE=	YES
+USE_X11=	YES
 
 .include "../../lang/perl5/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index 705894e9013..e440212bdf4 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/12/14 00:21:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/17 05:41:10 salo Exp $
 #
 
 DISTNAME=	bbpager-0.3.1
-CATEGORIES=	x11 wm
+PKGREVISION=	1
+CATEGORIES=	wm x11
 MASTER_SITES=	http://bbtools.thelinuxcommunity.org/sources/
 
 MAINTAINER=	packages@netbsd.org
@@ -11,7 +12,7 @@ COMMENT=	pager for the blackbox window manager
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_X11BASE=	YES
+USE_X11=	YES
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1
diff --git a/wm/blackbox/DESCR b/wm/blackbox/DESCR
index 0254ea261bf..9013f97a774 100644
--- a/wm/blackbox/DESCR
+++ b/wm/blackbox/DESCR
@@ -1,5 +1,4 @@
-Blackbox is yet another addition to the list of window managers
-For X11R6. Blackbox is built with C++, sharing no common code with
-any other window manager. It is designed to be small and fast, with
-a built in graphics class, near complete ICCCM compliance, and
-support for multple desktop environments.
+Blackbox is yet another addition to the list of window managers For X11R6.
+Blackbox is built with C++, sharing no common code with any other window
+manager.  It is designed to be small and fast, with a built in graphics class,
+near complete ICCCM compliance, and support for multple desktop environments.
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 6f212025113..0451905d829 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.11 2003/02/20 16:54:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/17 05:41:10 salo Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
-PKGREVISION=	2
-CATEGORIES=	x11 wm
+PKGREVISION=	3
+CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	small and fast X11R6 window manager
 
-DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
 .include "../../devel/gettext-lib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index 1b373a95d59..07be18a2379 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2003/02/20 16:50:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/17 05:41:11 salo Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
 PKGNAME=	bsetroot-0.1
-PKGREVISION=	2
-CATEGORIES=	x11 wm
+PKGREVISION=	3
+CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	tools to set the root windows background
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
-do-build:
-	( cd ${WRKSRC}/nls && ${MAKE} && \
-	 cd ${WRKSRC}/util && ${MAKE} )
+BUILD_DIRS=	${WRKSRC}/nls ${WRKSRC}/util
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin
@@ -27,4 +25,5 @@ do-install:
 	( cd ${WRKSRC}/nls && ${MAKE} install )
 
 .include "../../devel/gettext-lib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/DESCR b/wm/fluxbox/DESCR
index fc4b4c84d9a..11e3b841bfd 100644
--- a/wm/fluxbox/DESCR
+++ b/wm/fluxbox/DESCR
@@ -1,4 +1,5 @@
 Fluxbox is yet another windowmanager for X.
+
 It is based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and
-handles styles, colors, window placement, and similar things exactly
-like blackbox (100% theme/style compatibility).
+handles styles, colors, window placement, and similar things exactly like
+blackbox (100% theme/style compatibility).
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index e611087cd8f..f5f8ee0ce61 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/02/14 20:57:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/17 05:41:11 salo Exp $
 #
 
 DISTNAME=	fluxbox-0.1.14
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,15 +11,16 @@ MAINTAINER=	jmcneill@netbsd.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
-DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
-USE_BUILDLINK2=		YES
-USE_X11BASE=		YES
-USE_CXX=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+USE_CXX=	YES
+GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--enable-kde
+CONFIGURE_ARGS=	--enable-kde
 
 .include "../../fonts/Xft2/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"