From hscholz@goanna.lan.raisdorf.net  Tue Dec 10 02:56:22 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 936BC37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Dec 2002 02:56:22 -0800 (PST)
Received: from goanna.lan.raisdorf.net (p5086BFBA.dip.t-dialin.net [80.134.191.186])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 478CC43ED1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Dec 2002 02:56:15 -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 gBAAuCtt055598;
	Tue, 10 Dec 2002 11:56:13 +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 gBAAuBtg055597;
	Tue, 10 Dec 2002 11:56:11 +0100 (CET)
Message-Id: <200212101056.gBAAuBtg055597@goanna.lan.raisdorf.net>
Date: Tue, 10 Dec 2002 11:56:11 +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 to 0.1.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46160
>Category:       ports
>Synopsis:       maintainer-update: x11-wm/fluxbox to 0.1.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 10 03:00:11 PST 2002
>Closed-Date:    Wed Jan 01 14:04:37 PST 2003
>Last-Modified:  Wed Jan 01 14:04:37 PST 2003
>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:

This is an update of fluxbox to 0.1.14. It includes the inofficial remember patch.
We have 0.1.13-2 in the ports and 0.1.13-3 in ports/46098.
I've attached a diff against the current ports tree.
You can find various versions of this patch here:

- http://www.raisdorf.net/files/FreeBSD/fluxbox-0.1.13-2_to_0.1.14.patch
  The same patch against the current tree

- http://www.raisdorf.net/files/FreeBSD/fluxbox-0.1.13-3_to_0.1.14.patch
  A patch against the tree after ports/46098 has been applied

- http://www.raisdorf.net/files/FreeBSD/fluxbox-0.1.14.shar
  A complete shar file.

Changes:

 - change AUTOMAKE="${AUTOMAKE}" to =automake14 (from ports/46098)
 - new remember patch URL
 - new patches so bsetbg and bsetroot are not compiled/installed as
   they are part of the boxtools port
 - s/blackbox/fluxbox/ in pkg-plist

This superceedes ports/46098 so feel free to close it.

>How-To-Repeat:
	
>Fix:

	

--- fluxbox-0.1.13-2_to_0.1.14.patch begins here ---
diff -urp fluxbox-0.1.13-2/Makefile fluxbox/Makefile
--- fluxbox-0.1.13-2/Makefile	Sat Dec  7 13:25:29 2002
+++ fluxbox/Makefile	Tue Dec 10 10:54:15 2002
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.1.13
-PORTREVISION=	2
+PORTVERSION=	0.1.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://www.cse.unsw.edu.au/~simonb/
-PATCH_DIST_STRIP=	-p1
-PATCHFILES=	fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
 .if defined(WITH_REMEMBER)
-PATCHFILES+=	fluxbox-remember-patch-0.1.13.gz
+PATCH_SITES=    http://www.bugfactory.org/~gav/fluxbox/
+PATCH_DIST_STRIP=   -p1
+PATCHFILES+=	remember-0.1.14.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
@@ -34,7 +32,7 @@ USE_GNOMENG=	yes
 WANT_GNOME=	yes
 .if defined(WITH_REMEMBER)
 USE_GMAKE=	yes
-CONFIGURE_ENV=	AUTOMAKE="${AUTOMAKE}"
+CONFIGURE_ENV=	AUTOMAKE=automake14
 .endif
 CONFIGURE_ARGS=	--disable-newwmspec
 .if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
diff -urp fluxbox-0.1.13-2/distinfo fluxbox/distinfo
--- fluxbox-0.1.13-2/distinfo	Sat Dec  7 13:25:29 2002
+++ fluxbox/distinfo	Tue Dec 10 10:54:28 2002
@@ -1,4 +1,2 @@
-MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
-MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
-MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
-MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
+MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
+MD5 (remember-0.1.14.gz) = 205e45a85954645768a18fb9b449cac9
Only in fluxbox-0.1.13-2/files: patch-configure
diff -urp fluxbox-0.1.13-2/files/patch-util::Makefile.in fluxbox/files/patch-util::Makefile.in
--- fluxbox-0.1.13-2/files/patch-util::Makefile.in	Sat Dec  7 13:25:29 2002
+++ fluxbox/files/patch-util::Makefile.in	Tue Dec 10 11:33:50 2002
@@ -1,27 +1,22 @@
---- util/Makefile.in.orig	Mon Nov 18 06:03:43 2002
-+++ util/Makefile.in	Thu Nov 21 23:05:33 2002
-@@ -81,20 +81,20 @@
- regex_cmd = @regex_cmd@
+--- util/Makefile.in.orig	Tue Dec 10 11:33:13 2002
++++ util/Makefile.in	Tue Dec 10 11:33:30 2002
+@@ -94,8 +94,8 @@
  
  SUBDIRS = fbrun
+ INCLUDES = -I../src/FbTk/
 -bin_SCRIPTS = bsetbg fluxbox-generate_menu
 -bin_PROGRAMS = bsetroot
 +bin_SCRIPTS = fluxbox-generate_menu
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
  bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
- 	../src/Color.o ../src/Texture.o ../src/StringUtil.o
- 
- 
- MAINTAINERCLEANFILES = Makefile.in
--EXTRA_DIST = bsetbg fluxbox-generate_menu
-+EXTRA_DIST = fluxbox-generate_menu
- subdir = util
+ 	../src/StringUtil.o ../src/FbTk/libFbTk.a
+@@ -107,7 +107,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
 -bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  PROGRAMS = $(bin_PROGRAMS)
  
  am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
diff -urp fluxbox-0.1.13-2/pkg-plist fluxbox/pkg-plist
--- fluxbox-0.1.13-2/pkg-plist	Sat Dec  7 13:25:29 2002
+++ fluxbox/pkg-plist	Tue Dec 10 11:18:11 2002
@@ -4,20 +4,20 @@ bin/fluxbox-generate_menu
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
-share/fluxbox/nls/C/blackbox.cat
-share/fluxbox/nls/bg_BG/blackbox.cat
-share/fluxbox/nls/da_DK/blackbox.cat
-share/fluxbox/nls/es_ES/blackbox.cat
-share/fluxbox/nls/et_EE/blackbox.cat
-share/fluxbox/nls/fr_FR/blackbox.cat
-share/fluxbox/nls/it_IT/blackbox.cat
-share/fluxbox/nls/ja_JP/blackbox.cat
-share/fluxbox/nls/lv_LV/blackbox.cat
-share/fluxbox/nls/pt_BR/blackbox.cat
-share/fluxbox/nls/pt_PT/blackbox.cat
-share/fluxbox/nls/ru_RU/blackbox.cat
-share/fluxbox/nls/sv_SE/blackbox.cat
-share/fluxbox/nls/tr_TR/blackbox.cat
+share/fluxbox/nls/C/fluxbox.cat
+share/fluxbox/nls/bg_BG/fluxbox.cat
+share/fluxbox/nls/da_DK/fluxbox.cat
+share/fluxbox/nls/es_ES/fluxbox.cat
+share/fluxbox/nls/et_EE/fluxbox.cat
+share/fluxbox/nls/fr_FR/fluxbox.cat
+share/fluxbox/nls/it_IT/fluxbox.cat
+share/fluxbox/nls/ja_JP/fluxbox.cat
+share/fluxbox/nls/lv_LV/fluxbox.cat
+share/fluxbox/nls/pt_BR/fluxbox.cat
+share/fluxbox/nls/pt_PT/fluxbox.cat
+share/fluxbox/nls/ru_RU/fluxbox.cat
+share/fluxbox/nls/sv_SE/fluxbox.cat
+share/fluxbox/nls/tr_TR/fluxbox.cat
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/Blue
 share/fluxbox/styles/BlueNight
--- fluxbox-0.1.13-2_to_0.1.14.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Wed Jan 1 14:01:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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