From hscholz@goanna.lan.raisdorf.net  Sun Nov 24 09:59:11 2002
Return-Path: <hscholz@goanna.lan.raisdorf.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6E0F437B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Nov 2002 09:59:11 -0800 (PST)
Received: from goanna.lan.raisdorf.net (pD9527DBC.dip.t-dialin.net [217.82.125.188])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8242943E6E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Nov 2002 09:59:04 -0800 (PST)
	(envelope-from hscholz@goanna.lan.raisdorf.net)
Received: from goanna.lan.raisdorf.net (localhost [127.0.0.1])
	by goanna.lan.raisdorf.net (8.12.6/8.12.5) with ESMTP id gAOHwxwv043863;
	Sun, 24 Nov 2002 18:59:00 +0100 (CET)
	(envelope-from hscholz@goanna.lan.raisdorf.net)
Received: (from hscholz@localhost)
	by goanna.lan.raisdorf.net (8.12.6/8.12.6/Submit) id gAOHwvq0043862;
	Sun, 24 Nov 2002 18:58:57 +0100 (CET)
Message-Id: <200211241758.gAOHwvq0043862@goanna.lan.raisdorf.net>
Date: Sun, 24 Nov 2002 18:58:57 +0100 (CET)
From: Hendrik Scholz <hendrik@scholz.net>
Reply-To: Hendrik Scholz <hendrik@scholz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Hendrik Scholz <hendrik@scholz.net>
Subject: maintainer-update: x11-wm/fluxbox: add remember and Xft patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45685
>Category:       ports
>Synopsis:       maintainer-update: x11-wm/fluxbox: add remember and Xft patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 10:00:02 PST 2002
>Closed-Date:    Sun Nov 24 14:11:39 PST 2002
>Last-Modified:  Sun Nov 24 14:11:39 PST 2002
>Originator:     Hendrik Scholz
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
NetUSE AG
>Environment:
System: FreeBSD goanna.lan.raisdorf.net 4.7-STABLE FreeBSD 4.7-STABLE #5: Thu Oct 17 16:21:01 CEST 2002 hscholz@goanna.lan.raisdorf.net:/usr/src/sys/compile/GOANNA i386


	
>Description:
maintainer-update of x11-wm/fluxbox

Changes:

 - add new unofficial remember patch
 - add Xft patch http://www.cse.unsw.edu.au/~simonb/fluxbox-0.1.13.aa.patch
   by adding to files/
 - bump PORTREVISION

This is the first fluxbox port available with Xft (anti aliased fonts) AND
the remember patch.

>How-To-Repeat:
	
>Fix:

	

--- fluxbox-0.1.13_1_aa_and_remember.patch begins here ---
diff -urP fluxbox-0.1.13/Makefile fluxbox/Makefile
--- fluxbox-0.1.13/Makefile	Sun Nov 24 17:42:47 2002
+++ fluxbox/Makefile	Sun Nov 24 18:46:45 2002
@@ -7,18 +7,32 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.13
+PORTREVISION=   1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if defined(WITH_REMEMBER)
+PATCH_SITES=    http://www.raisdorf.net/files/FreeBSD/
+PATCHFILES= remember-patch-0.1.13.gz
+PATCH_DIST_STRIP=       -p1
+.endif
+
 MAINTAINER=	hendrik@scholz.net
 
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
+.if defined(WITH_REMEMBER)
+BUILD_DEPENDS=  automake14:${PORTSDIR}/devel/automake14
+.endif
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
 WANT_GNOME=	yes
+.if defined(WITH_REMEMBER)
+USE_GMAKE=  yes
+CONFIGURE_ENV=  AUTOMAKE="${AUTOMAKE}"
+.endif
 CONFIGURE_ARGS=	--disable-newwmspec
 .if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-kde
@@ -44,6 +58,9 @@
 .endif
 .if !defined(WITH_KDE)
 	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
+.endif
+.if !defined(WITH_REMEMBER)
+	@${ECHO_CMD} "WITH_REMEMBER   - Enable the unofficial remember patch"
 .endif
 	@${ECHO_CMD} ""
 
diff -urP fluxbox-0.1.13/distinfo fluxbox/distinfo
--- fluxbox-0.1.13/distinfo	Sun Nov 24 17:42:47 2002
+++ fluxbox/distinfo	Sun Nov 24 18:30:47 2002
@@ -1 +1,2 @@
 MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
+MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
diff -urP fluxbox-0.1.13/files/patch-src::Font.cc fluxbox/files/patch-src::Font.cc
--- fluxbox-0.1.13/files/patch-src::Font.cc	Thu Jan  1 01:00:00 1970
+++ fluxbox/files/patch-src::Font.cc	Sun Nov 24 18:24:06 2002
@@ -0,0 +1,11 @@
+--- src/Font.cc.orig	Fri Oct 25 23:07:07 2002
++++ src/Font.cc	Sun Nov 24 18:23:28 2002
+@@ -140,7 +140,7 @@
+ 	if (name == 0)
+ 		return false;
+ 	bool ret_val = m_fontimp->load(name);
+-	if (ret_val && name == 0) { //prevent from having a bad fontimp
++	if (ret_val && name != 0) { //prevent from having a bad fontimp
+ 		m_fontstr = name; // if the load really succeded then set font string
+ 	} else {
+ 		m_fontstr = "";
diff -urP fluxbox-0.1.13/files/patch-src::Screen.cc fluxbox/files/patch-src::Screen.cc
--- fluxbox-0.1.13/files/patch-src::Screen.cc	Thu Jan  1 01:00:00 1970
+++ fluxbox/files/patch-src::Screen.cc	Sun Nov 24 18:24:29 2002
@@ -0,0 +1,19 @@
+--- src/Screen.cc.orig	Sun Nov 17 12:27:50 2002
++++ src/Screen.cc	Sun Nov 24 18:23:28 2002
+@@ -284,7 +284,7 @@
+ 	image_control->setDither(*resource.image_dither);
+ 	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(), 
+ 			image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
+-
++	theme->reconfigure(*resource.antialias);
+ 
+ 	const char *s =	i18n->getMessage(
+ 		FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
+@@ -447,7 +447,6 @@
+ 
+ 	XFree(children);
+ 	XFlush(getBaseDisplay()->getXDisplay());
+-	theme->reconfigure(*resource.antialias);
+ }
+ 
+ namespace {
--- fluxbox-0.1.13_1_aa_and_remember.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: tom 
Responsible-Changed-When: Sun Nov 24 12:26:22 PST 2002 
Responsible-Changed-Why:  
Reassign misfiled PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45685 
Responsible-Changed-From-To: freebsd-ports->pat 
Responsible-Changed-By: pat 
Responsible-Changed-When: Sun Nov 24 12:57:37 PST 2002 
Responsible-Changed-Why:  
Over to me. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45685 
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Sun Nov 24 14:11:24 PST 2002 
State-Changed-Why:  
Committed, Thanks! (fix whitespace) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45685 
>Unformatted:
