* Mike Erdely <[EMAIL PROTECTED]> [071108 13:33]: > On Thu, Nov 08, 2007 at 06:26:46PM +0200, Genadijus Paleckis wrote: > > working for me on i386. please test and comment. > > Here's a modified diff that fixes WANTLIB and IMO handles the > SEPARATE_BUILD a little better (no FILESDIR stuff): > > Works for me on i386. > > Also, CC'd $MAINTAINER.
I already have a port of 1.0.0 also, but there is one fatal flaw still. If you run with malloc.conf->F, fluxbox segfaults on exit. I reported this bug to the fluxbox project page but haven't heard anything yet. See fluxbox bug 1814636: https://sourceforge.net/tracker/index.php?func=detail&aid=1814636&group_id=35398&atid=413960 Here is my latest diff incorporating feedback from landry@, merdely@, and others. It also has a patch to disable the SIGSEGV signal handler. Without this patch and with malloc.conf on, fluxbox never exits and has to be killed on the command line. With the patch, fluxbox will dump core but at least I can sign out. David Index: x11/fluxbox/Makefile =================================================================== RCS file: /cvs/ports/x11/fluxbox/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- x11/fluxbox/Makefile 15 Sep 2007 20:04:19 -0000 1.42 +++ x11/fluxbox/Makefile 10 Nov 2007 09:12:52 -0000 @@ -2,9 +2,8 @@ COMMENT= window manager based on the original Blackbox code -VERSION= 0.9.15.1 +VERSION= 1.0.0 DISTNAME= fluxbox-${VERSION} -PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} @@ -18,22 +17,22 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -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 +WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrandr \ + Xrender c expat fontconfig freetype m stdc++ z + +USE_GMAKE= yes +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --enable-xinerama \ + --enable-imlib2 \ + --program-prefix="" \ + --program-suffix="" USE_X11= Yes USE_LIBTOOL= Yes -NO_REGRESS= Yes - SEPARATE_BUILD= simple LIB_DEPENDS= Imlib2.>=2::graphics/imlib2 - -CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig" .include <bsd.port.mk> Index: x11/fluxbox/distinfo =================================================================== RCS file: /cvs/ports/x11/fluxbox/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- x11/fluxbox/distinfo 5 Apr 2007 17:36:19 -0000 1.23 +++ x11/fluxbox/distinfo 10 Nov 2007 09:12:52 -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.0.0.tar.gz) = HziRd+F80ejb7QfICBKWHw== +RMD160 (fluxbox-1.0.0.tar.gz) = uLofWPfDl1bDKCkdIeZVcmjgWAs= +SHA1 (fluxbox-1.0.0.tar.gz) = uTSSOQ4hw9pfV12ZPnpS5PmVOjI= +SHA256 (fluxbox-1.0.0.tar.gz) = mK/KrknNPLHKX6MrN51jDsiKdeZMuEcqECPbHRw1wSo= +SIZE (fluxbox-1.0.0.tar.gz) = 975940 Index: x11/fluxbox/patches/patch-data_README_style =================================================================== RCS file: x11/fluxbox/patches/patch-data_README_style diff -N x11/fluxbox/patches/patch-data_README_style --- x11/fluxbox/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: x11/fluxbox/patches/patch-src_fluxbox_cc =================================================================== RCS file: x11/fluxbox/patches/patch-src_fluxbox_cc diff -N x11/fluxbox/patches/patch-src_fluxbox_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/fluxbox/patches/patch-src_fluxbox_cc 10 Nov 2007 09:12:52 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- src/fluxbox.cc.orig Fri Aug 10 14:23:15 2007 ++++ src/fluxbox.cc Sat Nov 10 01:52:51 2007 +@@ -253,7 +253,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dp + + //catch system signals + SignalHandler &sigh = SignalHandler::instance(); +- sigh.registerHandler(SIGSEGV, this); ++ //sigh.registerHandler(SIGSEGV, this); + sigh.registerHandler(SIGFPE, this); + sigh.registerHandler(SIGPIPE, this); // e.g. output sent to grep + sigh.registerHandler(SIGTERM, this); +@@ -1087,9 +1087,9 @@ void Fluxbox::handleSignal(int signum) { + case SIGUSR2: + reconfigure(); + break; +- case SIGSEGV: +- abort(); +- break; ++ //case SIGSEGV: ++ // abort(); ++ // break; + case SIGFPE: + case SIGINT: + case SIGPIPE: Index: x11/fluxbox/patches/patch-util_Makefile_in =================================================================== RCS file: x11/fluxbox/patches/patch-util_Makefile_in diff -N x11/fluxbox/patches/patch-util_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/fluxbox/patches/patch-util_Makefile_in 10 Nov 2007 09:12:52 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- util/Makefile.in.orig Thu Nov 8 12:11:29 2007 ++++ util/Makefile.in Thu Nov 8 12:11:49 2007 +@@ -620,7 +620,7 @@ fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbset + $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh + + fluxbox-update_configs.o: fluxbox-update_configs.cc ../config.h \ +- $(top_srcdir)/src/defaults.hh ++ ../src/defaults.hh + + fluxbox-remote.o: fluxbox-remote.cc + Index: x11/fluxbox/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 --- x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in 25 Jan 2006 03:57:44 -0000 1.6 +++ x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in 10 Nov 2007 09:12:52 -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 Mon Oct 8 13:49:08 2007 ++++ util/fluxbox-generate_menu.in Wed Oct 10 14:59:46 2007 +@@ -338,7 +338,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: x11/fluxbox/pkg/MESSAGE =================================================================== RCS file: x11/fluxbox/pkg/MESSAGE diff -N x11/fluxbox/pkg/MESSAGE --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/fluxbox/pkg/MESSAGE 10 Nov 2007 09:12:52 -0000 @@ -0,0 +1,5 @@ +In order to use fluxbox as your window manager, you must change your +.xinitrc or .xsession appropriately and add a line similar to the +following: + + exec ${PREFIX}/bin/startfluxbox Index: x11/fluxbox/pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- x11/fluxbox/pkg/PLIST 25 Jan 2006 03:57:44 -0000 1.15 +++ x11/fluxbox/pkg/PLIST 10 Nov 2007 09:12:52 -0000 @@ -4,6 +4,8 @@ bin/fbsetbg bin/fbsetroot bin/fluxbox bin/fluxbox-generate_menu +bin/fluxbox-remote +bin/fluxbox-update_configs bin/startfluxbox @man man/man1/fbrun.1 @man man/man1/fbsetbg.1 @@ -42,9 +44,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 +70,95 @@ 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
