From norn@norn.ca.eu.org Sun Mar 21 18:05:11 1999
Return-Path: <norn@norn.ca.eu.org>
Received: from norn.ca.eu.org (cr965240-a.abtsfd1.bc.wave.home.com [24.113.18.89])
	by hub.freebsd.org (Postfix) with ESMTP id 1CEC11527E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Mar 1999 18:05:00 -0800 (PST)
	(envelope-from norn@norn.ca.eu.org)
Received: (from norn@localhost)
	by norn.ca.eu.org (8.9.3/8.9.3) id SAA44648;
	Sun, 21 Mar 1999 18:04:29 -0800 (PST)
	(envelope-from norn)
Message-Id: <199903220204.SAA44648@norn.ca.eu.org>
Date: Sun, 21 Mar 1999 18:04:29 -0800 (PST)
From: cpiazza@home.net
Sender: norn@norn.ca.eu.org
Reply-To: cpiazza@home.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: Patch: Blackbox 0.50.3 -> 0.50.4 
X-Send-Pr-Version: 3.2

>Number:         10719
>Category:       ports
>Synopsis:       Patch: Blackbox 0.50.3 -> 0.50.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 21 18:10:02 PST 1999
>Closed-Date:    Mon Mar 22 00:51:02 PST 1999
>Last-Modified:  Mon Mar 22 00:51:27 PST 1999
>Originator:     Chris Piazza
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
n/a 
>Environment:

FreeBSD norn.ca.eu.org 4.0-CURRENT

>Description:

New blackbox includes support for the "slit," which allows a clean place to
run "dockapps" in.  Distfile is much smaller because some large themes were
removed from the main distfile (http://blackbox.themes.org to get them).
Also added USE_BZIP2.

Comments welcome.

>How-To-Repeat:

>Fix:

Index: blackbox/Makefile
===================================================================
RCS file: /cvs/freebsd/ports/x11-wm/blackbox/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	1999/03/08 20:57:39	1.17
+++ Makefile	1999/03/22 02:00:14
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Blackbox
-# Version required:	0.50.3
+# Version required:	0.50.4
 # Date created:		June 15, 1998
 # Whom:			Brian Handy <handy@physics.montana.edu>
 #
 # $Id: Makefile,v 1.17 1999/03/08 20:57:39 steve Exp $
 #
 
-DISTNAME=	blackbox-0.50.3
+DISTNAME=	blackbox-0.50.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://balance.wiw.org/pub/blackbox/ \
 		ftp://ftp.aist.com.ua/pub/unix/window_managers/blackbox/
@@ -15,18 +15,22 @@
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 
+CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
+
 .if !defined(USE_KDE)
 pre-fetch:
-	@echo
-	@echo If you would like build Blackbox with KDE support
-	@echo you must set the variable USE_KDE
-	@echo
+	@ ${ECHO_MSG}
+	@ ${ECHO_MSG} If you would like build Blackbox with KDE support
+	@ ${ECHO_MSG} you must set the variable USE_KDE
+	@ ${ECHO_MSG}
 .else
 pre-fetch:
-	@echo
-	@echo Building Blackbox with KDE support
-	@echo
+	@ ${ECHO_MSG}
+	@ ${ECHO_MSG} Building Blackbox with KDE support
+	@ ${ECHO_MSG}
 CONFIGURE_ARGS= --enable-kde
 .endif
+
 .include <bsd.port.mk>
Index: blackbox/files/md5
===================================================================
RCS file: /cvs/freebsd/ports/x11-wm/blackbox/files/md5,v
retrieving revision 1.15
diff -u -r1.15 md5
--- md5	1999/03/08 20:57:52	1.15
+++ md5	1999/03/22 01:19:34
@@ -1 +1 @@
-MD5 (blackbox-0.50.3.tar.gz) = 8432c803287bfe0ace51555482ff0e2d
+MD5 (blackbox-0.50.4.tar.bz2) = 983f5bf6baadefc5492013a829d61d6e
Index: blackbox/pkg/DESCR
===================================================================
RCS file: /cvs/freebsd/ports/x11-wm/blackbox/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- DESCR	1999/03/08 20:57:52	1.3
+++ DESCR	1999/03/22 01:54:41
@@ -1,7 +1,7 @@
 Blackbox is Yet Another Window Manager for X11R6 that arose primarily
-out of the curiosity of the authors.  It's small (around 11700 lines at
-the time of writing), fast, built-in rendering code, image dithering 
-at 8, 15 and 16 bits per pixel and color icon support.  Blackbox is 
-[mostly] ICCCM compliant.  
+out of the curiosity of the authors.  It's small, fast, has built-in
+rendering code, does image dithering at 8, 15 and 16 bits per pixel
+and colour icon support.  Blackbox is [mostly] ICCCM compliant.
 
 Homepage:  http://blackbox.wiw.org/
+Author:	   Brad Hughes <bhughes@tcac.net>
Index: blackbox/pkg/PLIST
===================================================================
RCS file: /cvs/freebsd/ports/x11-wm/blackbox/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST	1999/03/08 20:57:52	1.6
+++ PLIST	1999/03/22 01:53:21
@@ -1,18 +1,5 @@
 bin/blackbox
 bin/bsetroot
-share/Blackbox/brueghel/babel
-share/Blackbox/brueghel/babel.gif
-share/Blackbox/brueghel/babel.txt
-share/Blackbox/brueghel/icarus
-share/Blackbox/brueghel/icarus.gif
-share/Blackbox/brueghel/icarus.txt
-share/Blackbox/brueghel/littlebabel
-share/Blackbox/brueghel/littlebabel.gif
-share/Blackbox/brueghel/littlebabel.txt
-share/Blackbox/brueghel/rebelangels
-share/Blackbox/brueghel/rebelangels.gif
-share/Blackbox/brueghel/rebelangels.txt
-share/Blackbox/brueghel/stylesmenu
 share/Blackbox/rc
 share/Blackbox/menu
 share/Blackbox/styles/blackmagic
@@ -28,6 +15,5 @@
 share/Blackbox/styles/steelblue
 share/Blackbox/styles/steelbox
 share/Blackbox/styles/stylesmenu
-@dirrm share/Blackbox/brueghel
 @dirrm share/Blackbox/styles
 @dirrm share/Blackbox

-Chris

>Release-Note:
>Audit-Trail:

From: Chris Piazza <cpiazza@home.net>
To: cpiazza@home.net
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: RE: ports/10719: Patch: Blackbox 0.50.3 -> 0.50.4
Date: Sun, 21 Mar 1999 18:34:16 -0800 (PST)

 Arrgh!
 Missing patches/patch-ae, see below.
  
 Would someone please enlighten me on this:
 
 Using 'cvs diff', is there any way to get the same action as diff -N?
 cvs diff -uN does not include the new files, but diff -ruN does.
 
 patches/patch-ae:
 
 --- blackbox/patches/patch-ae   Wed Dec 31 16:00:00 1969
 +++ blackbox.new/patches/patch-ae       Sun Mar 21 18:23:33 1999
 @@ -0,0 +1,10 @@
 +--- src/Screen.cc.old  Sun Mar 21 18:18:59 1999
 ++++ src/Screen.cc      Sun Mar 21 18:19:06 1999
 +@@ -311,7 +311,6 @@
 +   }   
 +       
 + #ifdef    KDE
 +-    unsigned long data = (unsigned long) workspacesList->count();
 +
 +     XChangeProperty(display, root_window,
 +                   blackbox->getKWMNumberOfDesktopsAtom(),
 
 
 ---
 Chris Piazza   Abbotsford, BC, Canada
 cpiazza@home.net
 finger norn@norn.ca.eu.org for PGP key
 
State-Changed-From-To: open->closed 
State-Changed-By: jkoshy 
State-Changed-When: Mon Mar 22 00:51:02 PST 1999 
State-Changed-Why:  
Patches(es) applied, thanks! 
>Unformatted:
