Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile	1 Apr 2007 06:08:25 -0000	1.41
+++ Makefile	7 Apr 2007 10:39:39 -0000
@@ -1,19 +1,17 @@
-# $OpenBSD: Makefile,v 1.41 2007/04/01 06:08:25 steven Exp $
+# $OpenBSD$
 
 COMMENT=		"window manager based on the original Blackbox code"
 
-VERSION=		0.9.15.1
+VERSION=		1.0rc3
 DISTNAME=		fluxbox-${VERSION}
 PKGNAME=		${DISTNAME}p0
-CATEGORIES=		x11
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+CATEGORIES=		x11
 
 HOMEPAGE=		http://fluxbox.org/
 
 MAINTAINER=		David Krause <david@openbsd.org>
 
-# X11
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -21,19 +19,21 @@
 WANTLIB=		ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
 			fontconfig freetype stdc++ m c
 
-CONFIGURE_STYLE=	autoconf
-AUTOCONF_VERSION=	2.59
-CONFIGURE_ARGS=		--enable-xinerama --enable-imlib2
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+
+CONFIGURE_STYLE=        autoconf
+AUTOCONF_VERSION=       2.60
+CONFIGURE_ARGS=         --enable-xinerama --enable-imlib2
 
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
 
-NO_REGRESS=		Yes
+NO_REGRESS=             Yes
 
-SEPARATE_BUILD=		simple
+SEPARATE_BUILD=         simple
 
-LIB_DEPENDS=		Imlib2.>=2::graphics/imlib2
+LIB_DEPENDS=            Imlib2.>=2::graphics/imlib2
 
-CONFIGURE_ENV=		PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
+CONFIGURE_ENV=          PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo	5 Apr 2007 17:36:19 -0000	1.23
+++ distinfo	7 Apr 2007 10:39:39 -0000
@@ -1,5 +1,5 @@
-MD5 (fluxbox-0.9.15.1.tar.gz) = hq+mVwqH1oRQKoIKPxdeNw==
-RMD160 (fluxbox-0.9.15.1.tar.gz) = usCPchNn38HX2kkfKGvRnfzYES4=
-SHA1 (fluxbox-0.9.15.1.tar.gz) = oiuKZ5f69O2wO2Y4L+FNgiEqGhE=
-SHA256 (fluxbox-0.9.15.1.tar.gz) = qQiYo5W7MEs+9vhlo1qhFKnIgyvST2nNsGNKImQd384=
-SIZE (fluxbox-0.9.15.1.tar.gz) = 944863
+MD5 (fluxbox-1.0rc3.tar.gz) = 4c87c0a2ed1d50fffdae8ba394ad4866
+RMD160 (fluxbox-1.0rc3.tar.gz) = 634d5066ae0539f46e063b85d2d44c27ded14355
+SHA1 (fluxbox-1.0rc3.tar.gz) = 74131b5698297a101c6d2d6c46b360bff0e998fe
+SHA256 (fluxbox-1.0rc3.tar.gz) = 1e075e96de33c919b18f47abca44f0f29d3832869c8504ff20fcfe8ae4ae05cc
+SIZE (fluxbox-1.0rc3.tar.gz) = 1060710
Index: patches/patch-data_README_style
===================================================================
RCS file: /cvs/ports/x11/fluxbox/patches/patch-data_README_style,v
retrieving revision 1.1
diff -u -r1.1 patch-data_README_style
--- patches/patch-data_README_style	25 Jan 2006 03:57:44 -0000	1.1
+++ patches/patch-data_README_style	7 Apr 2007 10:39:39 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-data_README_style,v 1.1 2006/01/25 03:57:44 david Exp $
---- data/README.style.orig	Mon Nov 15 14:40:53 2004
-+++ data/README.style	Mon Jan 23 03:19:26 2006
+$OpenBSD$
+--- data/README.style.orig	Sat Mar 31 10:31:03 2007
++++ data/README.style	Sat Mar 31 10:31:17 2007
 @@ -315,7 +315,7 @@ handleWidth:                    4
  menuFont:                       lucidasans-10
  titleFont:                      lucidasans-bold-10
Index: patches/patch-nls_Makefile_in
===================================================================
RCS file: patches/patch-nls_Makefile_in
diff -N patches/patch-nls_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-nls_Makefile_in	7 Apr 2007 10:39:39 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- nls/Makefile.in.orig	Sat Mar 31 10:30:03 2007
++++ nls/Makefile.in	Sat Mar 31 10:30:20 2007
+@@ -522,7 +522,7 @@ distclean-local:
+ 
+ fluxbox-nls.hh:
+ 	chmod +x $(srcdir)/nlsinfo
+-	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
++	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > ${srcdir}/fluxbox-nls.hh
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in	7 Apr 2007 10:39:39 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig	Sat Mar 31 10:30:28 2007
++++ src/Makefile.in	Sat Mar 31 10:30:44 2007
+@@ -862,7 +862,7 @@ defaults.hh: Makefile
+ 		echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \
+ 		echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \
+ 		echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
+-		echo 'const char* svnversion(void);' ) > defaults.hh
++		echo 'const char* svnversion(void);' ) > ${srcdir}/defaults.hh
+ 
+ defaults.cc: force
+ 	@( \
Index: patches/patch-util_Makefile_in
===================================================================
RCS file: patches/patch-util_Makefile_in
diff -N patches/patch-util_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_Makefile_in	7 Apr 2007 10:39:39 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- util/Makefile.in.orig	Sat Mar 31 12:09:56 2007
++++ util/Makefile.in	Sat Mar 31 12:10:12 2007
+@@ -662,8 +662,8 @@ fluxbox-update_configs.o:	fluxbox-update_configs.cc ..
+ startfluxbox: 	startfluxbox.in
+ 		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+ 		            -e "s,@pkgbindir@,$(bindir),g" \
+-		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+-		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
++		            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:S/NONE//g),g" \
++		            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:S/NONE//g),g" \
+ 				$(srcdir)/startfluxbox.in > startfluxbox
+ 		-chmod 755 startfluxbox
+ 
Index: patches/patch-util_fluxbox-generate_menu_in
===================================================================
RCS file: /cvs/ports/x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in,v
retrieving revision 1.6
diff -u -r1.6 patch-util_fluxbox-generate_menu_in
--- patches/patch-util_fluxbox-generate_menu_in	25 Jan 2006 03:57:44 -0000	1.6
+++ patches/patch-util_fluxbox-generate_menu_in	7 Apr 2007 10:39:39 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.6 2006/01/25 03:57:44 david Exp $
---- util/fluxbox-generate_menu.in.orig	Thu Aug 25 11:52:50 2005
-+++ util/fluxbox-generate_menu.in	Mon Jan 23 03:36:56 2006
-@@ -343,7 +343,7 @@ searchForIcon(){
+$OpenBSD$
+--- util/fluxbox-generate_menu.in.orig	Sat Mar 31 10:31:36 2007
++++ util/fluxbox-generate_menu.in	Sat Mar 31 10:31:52 2007
+@@ -337,7 +337,7 @@ searchForIcon(){
      # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE	7 Apr 2007 10:39:39 -0000
@@ -0,0 +1,12 @@
+Fluxbox Configuration
+
+First copy needed user files:
+
+	# cp -fR /usr/local/share/fluxbox/* ~/.fluxbox/
+
+Then configure fluxbox to start when startx is called:
+
+	# echo "exec /usr/local/bin/startfluxbox" > ~/.xinitrc
+	# chmod u+x ~/.xinitrc
+
+Enjoy!
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- pkg/PLIST	25 Jan 2006 03:57:44 -0000	1.15
+++ pkg/PLIST	7 Apr 2007 10:39:39 -0000
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.15 2006/01/25 03:57:44 david Exp $
+@comment $OpenBSD$
 bin/fbrun
 bin/fbsetbg
 bin/fbsetroot
 bin/fluxbox
 bin/fluxbox-generate_menu
+bin/fluxbox-update_configs
 bin/startfluxbox
 @man man/man1/fbrun.1
 @man man/man1/fbsetbg.1