Hi,
This diff updates fluxbox to its latest version, 1.3.1.
Tested on i386 and sparc64.
"mandoc -Tlint" still reports a lot of errors, thus USE_GROFF must
remain.
I've already sent upstream the fix for sparc64 and I'm waiting for
an answer...
Comments? OKs?
Ciao,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 22 Nov 2010 08:36:56 -0000 1.50
+++ Makefile 13 Apr 2011 14:42:03 -0000
@@ -2,9 +2,7 @@
COMMENT= window manager based on the original Blackbox code
-VERSION= 0.9.15.1
-DISTNAME= fluxbox-${VERSION}
-REVISION= 3
+DISTNAME= fluxbox-1.3.1
CATEGORIES= x11
@@ -20,21 +18,27 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
- Xau Xdmcp expat fontconfig freetype stdc++ m c z \
- pthread-stubs xcb Imlib2
+MODULES= converters/libiconv
+
+WANTLIB= ICE Imlib2 SM X11 Xau Xdmcp Xext Xft Xinerama \
+ Xpm Xrandr Xrender c expat fontconfig freetype \
+ fribidi m pthread-stubs stdc++ xcb z
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
-CONFIGURE_ARGS= --enable-xinerama --enable-imlib2
+# Should be 2.67
+AUTOCONF_VERSION= 2.65
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
USE_LIBTOOL= Yes
+USE_GMAKE= Yes
USE_GROFF = Yes
NO_REGRESS= Yes
SEPARATE_BUILD= simple
-LIB_DEPENDS= graphics/imlib2
+LIB_DEPENDS= devel/fribidi \
+ graphics/imlib2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 5 Apr 2007 17:36:19 -0000 1.23
+++ distinfo 13 Apr 2011 14:42:03 -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.3.1.tar.gz) = +dh5Y+lXAm96pL56FfwVQQ==
+RMD160 (fluxbox-1.3.1.tar.gz) = mxj6C2h4FOU27klf211FldUcV+k=
+SHA1 (fluxbox-1.3.1.tar.gz) = zZ63bfHD4Ymoz6gTLp5YBdO+9gQ=
+SHA256 (fluxbox-1.3.1.tar.gz) = AJQVZz/Ki4soZpFVeBR32xo1ja2qvm+Tv7HtCHvfo20=
+SIZE (fluxbox-1.3.1.tar.gz) = 1094727
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_in 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Wed Apr 13 11:54:42 2011
++++ configure.in Wed Apr 13 11:55:35 2011
+@@ -613,7 +613,7 @@ if test "x$enableval" = "xyes"; then
+ AC_MSG_CHECKING([for fribidi/fribidi.h])
+ AC_TRY_COMPILE(
+ #include <fribidi/fribidi.h>
+- , fribidi_version_info,
++ , FRIBIDI_VERSION,
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have
FRIBIDI])
+ LIBS="$LIBS -lfribidi",
Index: patches/patch-data_Makefile_in
===================================================================
RCS file: patches/patch-data_Makefile_in
diff -N patches/patch-data_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-data_Makefile_in 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- data/Makefile.in.orig Sun Feb 27 18:40:21 2011
++++ data/Makefile.in Wed Apr 13 12:51:44 2011
+@@ -590,19 +590,19 @@ all-local: menu init apps
+ install-pkgdataDATA:
+ @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
+- $(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
++ $(INSTALL_DATA) $(builddir)/menu $(DESTDIR)$(DEFAULT_MENU)
+ @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
+ $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+ @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
+- $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
++ $(INSTALL_DATA) $(builddir)/apps $(DESTDIR)$(DEFAULT_APPS)
+ @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
+ $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
+ @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+- $(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
++ $(INSTALL_DATA) $(builddir)/init $(DESTDIR)$(DEFAULT_INIT)
+ @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
+ $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
Index: patches/patch-data_README_style
===================================================================
RCS file: patches/patch-data_README_style
diff -N patches/patch-data_README_style
--- patches/patch-data_README_style 25 Jan 2006 03:57:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
-@@ -315,7 +315,7 @@ handleWidth: 4
- menuFont: lucidasans-10
- titleFont: lucidasans-bold-10
-
--rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
-+rootCommand: fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
- ...
-
- Alright! Our style is finished. Let's see how the sucker looks. First we
Index: patches/patch-src_FbTk_FbString_cc
===================================================================
RCS file: patches/patch-src_FbTk_FbString_cc
diff -N patches/patch-src_FbTk_FbString_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_FbTk_FbString_cc 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/FbTk/FbString.cc.orig Wed Apr 13 12:12:03 2011
++++ src/FbTk/FbString.cc Wed Apr 13 12:12:45 2011
+@@ -85,7 +85,7 @@ FbTk::FbString makeVisualFromLogical(const FbTk::FbStr
+ result.reserve(S4);
+
+ us.resize(S);
+- FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
++ FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHARSET_UTF8,
+ const_cast<char*>(src.c_str()), S - 1,
+ &us[0]);
+
+@@ -93,7 +93,7 @@ FbTk::FbString makeVisualFromLogical(const FbTk::FbStr
+ fribidi_log2vis(&us[0], len, &base, &out_us[0], NULL, NULL, NULL);
+
+ result.resize(S4);
+- len = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, &out_us[0], len,
&result[0]);
++ len = fribidi_unicode_to_charset(FRIBIDI_CHARSET_UTF8, &out_us[0], len,
&result[0]);
+ result.resize(len); // trim to currently used chars
+
+ return result;
Index: patches/patch-src_Screen_cc
===================================================================
RCS file: patches/patch-src_Screen_cc
diff -N patches/patch-src_Screen_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Screen_cc 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix a crash on sparc64: the bpid variable that is passed to
+XChangeProperty() is not a long.
+
+--- src/Screen.cc.orig Wed Apr 13 15:17:24 2011
++++ src/Screen.cc Wed Apr 13 15:19:04 2011
+@@ -361,7 +361,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
+
+ // we're going to manage the screen, so now add our pid
+ #ifdef HAVE_GETPID
+- pid_t bpid = getpid();
++ unsigned long bpid = (unsigned long)getpid();
+
+ rootWindow().changeProperty(fluxbox->getFluxboxPidAtom(), XA_CARDINAL,
+ sizeof(pid_t) * 8, PropModeReplace,
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 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- util/Makefile.in.orig Wed Apr 13 12:26:28 2011
++++ util/Makefile.in Wed Apr 13 12:27:55 2011
+@@ -256,7 +256,7 @@ top_srcdir = @top_srcdir@
+
+ # util/Makefile.am for Fluxbox
+ SUBDIRS = fbrun
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
++INCLUDES = -I../src -I$(top_srcdir)/src/FbTk
+ bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
+ fbsetroot_SOURCES = fbsetroot.cc fbsetroot.hh
+ fbsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \
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 -p -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 13 Apr 2011 14:42:03 -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(){
+--- util/fluxbox-generate_menu.in.orig Thu Sep 9 14:39:18 2010
++++ util/fluxbox-generate_menu.in Wed Apr 13 11:41:27 2011
+@@ -308,7 +308,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/PLIST
===================================================================
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 25 Jan 2006 03:57:44 -0000 1.15
+++ pkg/PLIST 13 Apr 2011 14:42:03 -0000
@@ -1,20 +1,28 @@
@comment $OpenBSD: PLIST,v 1.15 2006/01/25 03:57:44 david Exp $
-bin/fbrun
+@bin bin/fbrun
bin/fbsetbg
-bin/fbsetroot
-bin/fluxbox
+@bin bin/fbsetroot
+@bin bin/fluxbox
bin/fluxbox-generate_menu
+@bin bin/fluxbox-remote
+@bin bin/fluxbox-update_configs
bin/startfluxbox
@man man/man1/fbrun.1
@man man/man1/fbsetbg.1
@man man/man1/fbsetroot.1
+@man man/man1/fluxbox-remote.1
@man man/man1/fluxbox.1
-@man man/man1/fluxstyle.1
@man man/man1/startfluxbox.1
+@man man/man5/fluxbox-apps.5
+@man man/man5/fluxbox-keys.5
+@man man/man5/fluxbox-menu.5
+@man man/man5/fluxbox-style.5
share/fluxbox/
+share/fluxbox/apps
share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
+share/fluxbox/overlay
share/fluxbox/styles/
share/fluxbox/styles/Artwiz
share/fluxbox/styles/BlueFlux/
@@ -42,9 +50,6 @@ share/fluxbox/styles/BlueFlux/pixmaps/to
share/fluxbox/styles/BlueFlux/pixmaps/toolbar_label.xpm
share/fluxbox/styles/BlueFlux/theme.cfg
share/fluxbox/styles/BlueNight
-share/fluxbox/styles/Carbondioxide
-share/fluxbox/styles/Clean
-share/fluxbox/styles/Cthulhain
share/fluxbox/styles/Emerge/
share/fluxbox/styles/Emerge/pixmaps/
share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
@@ -71,13 +76,96 @@ share/fluxbox/styles/LemonSpace
share/fluxbox/styles/Makro
share/fluxbox/styles/MerleyKay
share/fluxbox/styles/Meta
-share/fluxbox/styles/Minimal
share/fluxbox/styles/Nyz
share/fluxbox/styles/Operation
share/fluxbox/styles/Outcomes
-share/fluxbox/styles/Rampage
share/fluxbox/styles/Results
share/fluxbox/styles/Shade
-share/fluxbox/styles/Spiff
share/fluxbox/styles/Twice
+share/fluxbox/styles/arch/
+share/fluxbox/styles/arch/pixmaps/
+share/fluxbox/styles/arch/pixmaps/bullet.xpm
+share/fluxbox/styles/arch/pixmaps/closefcs.xpm
+share/fluxbox/styles/arch/pixmaps/closepr.xpm
+share/fluxbox/styles/arch/pixmaps/closeufcs.xpm
+share/fluxbox/styles/arch/pixmaps/frame.xpm
+share/fluxbox/styles/arch/pixmaps/gripfcs.xpm
+share/fluxbox/styles/arch/pixmaps/maxfcs.xpm
+share/fluxbox/styles/arch/pixmaps/maxpr.xpm
+share/fluxbox/styles/arch/pixmaps/maxufcs.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconfcs.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconpr.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconufcs.xpm
+share/fluxbox/styles/arch/pixmaps/minfcs.xpm
+share/fluxbox/styles/arch/pixmaps/minpr.xpm
+share/fluxbox/styles/arch/pixmaps/minufcs.xpm
+share/fluxbox/styles/arch/pixmaps/selected.xpm
+share/fluxbox/styles/arch/pixmaps/shadefcs.xpm
+share/fluxbox/styles/arch/pixmaps/shadepr.xpm
+share/fluxbox/styles/arch/pixmaps/shadeufcs.xpm
+share/fluxbox/styles/arch/pixmaps/stickfcs.xpm
+share/fluxbox/styles/arch/pixmaps/stickpr.xpm
+share/fluxbox/styles/arch/pixmaps/stickufcs.xpm
+share/fluxbox/styles/arch/pixmaps/stuckfcs.xpm
+share/fluxbox/styles/arch/pixmaps/stuckufcs.xpm
+share/fluxbox/styles/arch/pixmaps/tbarfcs.xpm
+share/fluxbox/styles/arch/pixmaps/tbarufcs.xpm
+share/fluxbox/styles/arch/pixmaps/unselected.xpm
+share/fluxbox/styles/arch/pixmaps/unshadefcs.xpm
+share/fluxbox/styles/arch/pixmaps/unshadepr.xpm
+share/fluxbox/styles/arch/pixmaps/unshadeufcs.xpm
+share/fluxbox/styles/arch/theme.cfg
+share/fluxbox/styles/bloe/
+share/fluxbox/styles/bloe/pixmaps/
+share/fluxbox/styles/bloe/pixmaps/bullet.xpm
+share/fluxbox/styles/bloe/pixmaps/closefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/closepr.xpm
+share/fluxbox/styles/bloe/pixmaps/closeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/frame.xpm
+share/fluxbox/styles/bloe/pixmaps/maxfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/maxpr.xpm
+share/fluxbox/styles/bloe/pixmaps/maxufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconpr.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/minfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/minpr.xpm
+share/fluxbox/styles/bloe/pixmaps/minufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/selected.xpm
+share/fluxbox/styles/bloe/pixmaps/shadefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/shadepr.xpm
+share/fluxbox/styles/bloe/pixmaps/shadeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stickfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stickpr.xpm
+share/fluxbox/styles/bloe/pixmaps/stickufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stuckfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stuckufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/tbarfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/tbarufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/unselected.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadepr.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/windowlabelfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/windowlabelufcs.xpm
+share/fluxbox/styles/bloe/theme.cfg
+share/fluxbox/styles/bora_black/
+share/fluxbox/styles/bora_black/theme.cfg
+share/fluxbox/styles/bora_blue/
+share/fluxbox/styles/bora_blue/theme.cfg
+share/fluxbox/styles/bora_green/
+share/fluxbox/styles/bora_green/theme.cfg
+share/fluxbox/styles/carp/
+share/fluxbox/styles/carp/theme.cfg
+share/fluxbox/styles/green_tea/
+share/fluxbox/styles/green_tea/theme.cfg
+share/fluxbox/styles/ostrich/
+share/fluxbox/styles/ostrich/theme.cfg
share/fluxbox/styles/qnx-photon
+share/fluxbox/styles/zimek_bisque/
+share/fluxbox/styles/zimek_bisque/theme.cfg
+share/fluxbox/styles/zimek_darkblue/
+share/fluxbox/styles/zimek_darkblue/theme.cfg
+share/fluxbox/styles/zimek_green/
+share/fluxbox/styles/zimek_green/theme.cfg
+share/fluxbox/windowmenu
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile 22 Nov 2010 08:36:56 -0000 1.50
+++ Makefile 13 Apr 2011 14:42:03 -0000
@@ -2,9 +2,7 @@
COMMENT= window manager based on the original Blackbox code
-VERSION= 0.9.15.1
-DISTNAME= fluxbox-${VERSION}
-REVISION= 3
+DISTNAME= fluxbox-1.3.1
CATEGORIES= x11
@@ -20,21 +18,27 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
- Xau Xdmcp expat fontconfig freetype stdc++ m c z \
- pthread-stubs xcb Imlib2
+MODULES= converters/libiconv
+
+WANTLIB= ICE Imlib2 SM X11 Xau Xdmcp Xext Xft Xinerama \
+ Xpm Xrandr Xrender c expat fontconfig freetype \
+ fribidi m pthread-stubs stdc++ xcb z
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
-CONFIGURE_ARGS= --enable-xinerama --enable-imlib2
+# Should be 2.67
+AUTOCONF_VERSION= 2.65
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
USE_LIBTOOL= Yes
+USE_GMAKE= Yes
USE_GROFF = Yes
NO_REGRESS= Yes
SEPARATE_BUILD= simple
-LIB_DEPENDS= graphics/imlib2
+LIB_DEPENDS= devel/fribidi \
+ graphics/imlib2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 5 Apr 2007 17:36:19 -0000 1.23
+++ distinfo 13 Apr 2011 14:42:03 -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.3.1.tar.gz) = +dh5Y+lXAm96pL56FfwVQQ==
+RMD160 (fluxbox-1.3.1.tar.gz) = mxj6C2h4FOU27klf211FldUcV+k=
+SHA1 (fluxbox-1.3.1.tar.gz) = zZ63bfHD4Ymoz6gTLp5YBdO+9gQ=
+SHA256 (fluxbox-1.3.1.tar.gz) = AJQVZz/Ki4soZpFVeBR32xo1ja2qvm+Tv7HtCHvfo20=
+SIZE (fluxbox-1.3.1.tar.gz) = 1094727
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_in 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Wed Apr 13 11:54:42 2011
++++ configure.in Wed Apr 13 11:55:35 2011
+@@ -613,7 +613,7 @@ if test "x$enableval" = "xyes"; then
+ AC_MSG_CHECKING([for fribidi/fribidi.h])
+ AC_TRY_COMPILE(
+ #include <fribidi/fribidi.h>
+- , fribidi_version_info,
++ , FRIBIDI_VERSION,
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_FRIBIDI, [1], [Define to 1 if you have
FRIBIDI])
+ LIBS="$LIBS -lfribidi",
Index: patches/patch-data_Makefile_in
===================================================================
RCS file: patches/patch-data_Makefile_in
diff -N patches/patch-data_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-data_Makefile_in 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- data/Makefile.in.orig Sun Feb 27 18:40:21 2011
++++ data/Makefile.in Wed Apr 13 12:51:44 2011
+@@ -590,19 +590,19 @@ all-local: menu init apps
+ install-pkgdataDATA:
+ @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
+- $(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
++ $(INSTALL_DATA) $(builddir)/menu $(DESTDIR)$(DEFAULT_MENU)
+ @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
+ $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+ @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
+- $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
++ $(INSTALL_DATA) $(builddir)/apps $(DESTDIR)$(DEFAULT_APPS)
+ @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
+ $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
+ @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+- $(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
++ $(INSTALL_DATA) $(builddir)/init $(DESTDIR)$(DEFAULT_INIT)
+ @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
+ $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
Index: patches/patch-data_README_style
===================================================================
RCS file: patches/patch-data_README_style
diff -N patches/patch-data_README_style
--- patches/patch-data_README_style 25 Jan 2006 03:57:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
-@@ -315,7 +315,7 @@ handleWidth: 4
- menuFont: lucidasans-10
- titleFont: lucidasans-bold-10
-
--rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
-+rootCommand: fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
- ...
-
- Alright! Our style is finished. Let's see how the sucker looks. First we
Index: patches/patch-src_FbTk_FbString_cc
===================================================================
RCS file: patches/patch-src_FbTk_FbString_cc
diff -N patches/patch-src_FbTk_FbString_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_FbTk_FbString_cc 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/FbTk/FbString.cc.orig Wed Apr 13 12:12:03 2011
++++ src/FbTk/FbString.cc Wed Apr 13 12:12:45 2011
+@@ -85,7 +85,7 @@ FbTk::FbString makeVisualFromLogical(const FbTk::FbStr
+ result.reserve(S4);
+
+ us.resize(S);
+- FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
++ FriBidiStrIndex len = fribidi_charset_to_unicode(FRIBIDI_CHARSET_UTF8,
+ const_cast<char*>(src.c_str()), S - 1,
+ &us[0]);
+
+@@ -93,7 +93,7 @@ FbTk::FbString makeVisualFromLogical(const FbTk::FbStr
+ fribidi_log2vis(&us[0], len, &base, &out_us[0], NULL, NULL, NULL);
+
+ result.resize(S4);
+- len = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, &out_us[0], len,
&result[0]);
++ len = fribidi_unicode_to_charset(FRIBIDI_CHARSET_UTF8, &out_us[0], len,
&result[0]);
+ result.resize(len); // trim to currently used chars
+
+ return result;
Index: patches/patch-src_Screen_cc
===================================================================
RCS file: patches/patch-src_Screen_cc
diff -N patches/patch-src_Screen_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Screen_cc 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix a crash on sparc64: the bpid variable that is passed to
+XChangeProperty() is not a long.
+
+--- src/Screen.cc.orig Wed Apr 13 15:17:24 2011
++++ src/Screen.cc Wed Apr 13 15:19:04 2011
+@@ -361,7 +361,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
+
+ // we're going to manage the screen, so now add our pid
+ #ifdef HAVE_GETPID
+- pid_t bpid = getpid();
++ unsigned long bpid = (unsigned long)getpid();
+
+ rootWindow().changeProperty(fluxbox->getFluxboxPidAtom(), XA_CARDINAL,
+ sizeof(pid_t) * 8, PropModeReplace,
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 13 Apr 2011 14:42:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- util/Makefile.in.orig Wed Apr 13 12:26:28 2011
++++ util/Makefile.in Wed Apr 13 12:27:55 2011
+@@ -256,7 +256,7 @@ top_srcdir = @top_srcdir@
+
+ # util/Makefile.am for Fluxbox
+ SUBDIRS = fbrun
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
++INCLUDES = -I../src -I$(top_srcdir)/src/FbTk
+ bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
+ fbsetroot_SOURCES = fbsetroot.cc fbsetroot.hh
+ fbsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \
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 -p -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 13 Apr 2011 14:42:03 -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(){
+--- util/fluxbox-generate_menu.in.orig Thu Sep 9 14:39:18 2010
++++ util/fluxbox-generate_menu.in Wed Apr 13 11:41:27 2011
+@@ -308,7 +308,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/PLIST
===================================================================
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 25 Jan 2006 03:57:44 -0000 1.15
+++ pkg/PLIST 13 Apr 2011 14:42:03 -0000
@@ -1,20 +1,28 @@
@comment $OpenBSD: PLIST,v 1.15 2006/01/25 03:57:44 david Exp $
-bin/fbrun
+@bin bin/fbrun
bin/fbsetbg
-bin/fbsetroot
-bin/fluxbox
+@bin bin/fbsetroot
+@bin bin/fluxbox
bin/fluxbox-generate_menu
+@bin bin/fluxbox-remote
+@bin bin/fluxbox-update_configs
bin/startfluxbox
@man man/man1/fbrun.1
@man man/man1/fbsetbg.1
@man man/man1/fbsetroot.1
+@man man/man1/fluxbox-remote.1
@man man/man1/fluxbox.1
-@man man/man1/fluxstyle.1
@man man/man1/startfluxbox.1
+@man man/man5/fluxbox-apps.5
+@man man/man5/fluxbox-keys.5
+@man man/man5/fluxbox-menu.5
+@man man/man5/fluxbox-style.5
share/fluxbox/
+share/fluxbox/apps
share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
+share/fluxbox/overlay
share/fluxbox/styles/
share/fluxbox/styles/Artwiz
share/fluxbox/styles/BlueFlux/
@@ -42,9 +50,6 @@ share/fluxbox/styles/BlueFlux/pixmaps/to
share/fluxbox/styles/BlueFlux/pixmaps/toolbar_label.xpm
share/fluxbox/styles/BlueFlux/theme.cfg
share/fluxbox/styles/BlueNight
-share/fluxbox/styles/Carbondioxide
-share/fluxbox/styles/Clean
-share/fluxbox/styles/Cthulhain
share/fluxbox/styles/Emerge/
share/fluxbox/styles/Emerge/pixmaps/
share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
@@ -71,13 +76,96 @@ share/fluxbox/styles/LemonSpace
share/fluxbox/styles/Makro
share/fluxbox/styles/MerleyKay
share/fluxbox/styles/Meta
-share/fluxbox/styles/Minimal
share/fluxbox/styles/Nyz
share/fluxbox/styles/Operation
share/fluxbox/styles/Outcomes
-share/fluxbox/styles/Rampage
share/fluxbox/styles/Results
share/fluxbox/styles/Shade
-share/fluxbox/styles/Spiff
share/fluxbox/styles/Twice
+share/fluxbox/styles/arch/
+share/fluxbox/styles/arch/pixmaps/
+share/fluxbox/styles/arch/pixmaps/bullet.xpm
+share/fluxbox/styles/arch/pixmaps/closefcs.xpm
+share/fluxbox/styles/arch/pixmaps/closepr.xpm
+share/fluxbox/styles/arch/pixmaps/closeufcs.xpm
+share/fluxbox/styles/arch/pixmaps/frame.xpm
+share/fluxbox/styles/arch/pixmaps/gripfcs.xpm
+share/fluxbox/styles/arch/pixmaps/maxfcs.xpm
+share/fluxbox/styles/arch/pixmaps/maxpr.xpm
+share/fluxbox/styles/arch/pixmaps/maxufcs.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconfcs.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconpr.xpm
+share/fluxbox/styles/arch/pixmaps/menuiconufcs.xpm
+share/fluxbox/styles/arch/pixmaps/minfcs.xpm
+share/fluxbox/styles/arch/pixmaps/minpr.xpm
+share/fluxbox/styles/arch/pixmaps/minufcs.xpm
+share/fluxbox/styles/arch/pixmaps/selected.xpm
+share/fluxbox/styles/arch/pixmaps/shadefcs.xpm
+share/fluxbox/styles/arch/pixmaps/shadepr.xpm
+share/fluxbox/styles/arch/pixmaps/shadeufcs.xpm
+share/fluxbox/styles/arch/pixmaps/stickfcs.xpm
+share/fluxbox/styles/arch/pixmaps/stickpr.xpm
+share/fluxbox/styles/arch/pixmaps/stickufcs.xpm
+share/fluxbox/styles/arch/pixmaps/stuckfcs.xpm
+share/fluxbox/styles/arch/pixmaps/stuckufcs.xpm
+share/fluxbox/styles/arch/pixmaps/tbarfcs.xpm
+share/fluxbox/styles/arch/pixmaps/tbarufcs.xpm
+share/fluxbox/styles/arch/pixmaps/unselected.xpm
+share/fluxbox/styles/arch/pixmaps/unshadefcs.xpm
+share/fluxbox/styles/arch/pixmaps/unshadepr.xpm
+share/fluxbox/styles/arch/pixmaps/unshadeufcs.xpm
+share/fluxbox/styles/arch/theme.cfg
+share/fluxbox/styles/bloe/
+share/fluxbox/styles/bloe/pixmaps/
+share/fluxbox/styles/bloe/pixmaps/bullet.xpm
+share/fluxbox/styles/bloe/pixmaps/closefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/closepr.xpm
+share/fluxbox/styles/bloe/pixmaps/closeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/frame.xpm
+share/fluxbox/styles/bloe/pixmaps/maxfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/maxpr.xpm
+share/fluxbox/styles/bloe/pixmaps/maxufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconpr.xpm
+share/fluxbox/styles/bloe/pixmaps/menuiconufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/minfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/minpr.xpm
+share/fluxbox/styles/bloe/pixmaps/minufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/selected.xpm
+share/fluxbox/styles/bloe/pixmaps/shadefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/shadepr.xpm
+share/fluxbox/styles/bloe/pixmaps/shadeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stickfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stickpr.xpm
+share/fluxbox/styles/bloe/pixmaps/stickufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stuckfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/stuckufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/tbarfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/tbarufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/unselected.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadefcs.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadepr.xpm
+share/fluxbox/styles/bloe/pixmaps/unshadeufcs.xpm
+share/fluxbox/styles/bloe/pixmaps/windowlabelfcs.xpm
+share/fluxbox/styles/bloe/pixmaps/windowlabelufcs.xpm
+share/fluxbox/styles/bloe/theme.cfg
+share/fluxbox/styles/bora_black/
+share/fluxbox/styles/bora_black/theme.cfg
+share/fluxbox/styles/bora_blue/
+share/fluxbox/styles/bora_blue/theme.cfg
+share/fluxbox/styles/bora_green/
+share/fluxbox/styles/bora_green/theme.cfg
+share/fluxbox/styles/carp/
+share/fluxbox/styles/carp/theme.cfg
+share/fluxbox/styles/green_tea/
+share/fluxbox/styles/green_tea/theme.cfg
+share/fluxbox/styles/ostrich/
+share/fluxbox/styles/ostrich/theme.cfg
share/fluxbox/styles/qnx-photon
+share/fluxbox/styles/zimek_bisque/
+share/fluxbox/styles/zimek_bisque/theme.cfg
+share/fluxbox/styles/zimek_darkblue/
+share/fluxbox/styles/zimek_darkblue/theme.cfg
+share/fluxbox/styles/zimek_green/
+share/fluxbox/styles/zimek_green/theme.cfg
+share/fluxbox/windowmenu
