cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.9.9 (developement release); 1.0.0 will be the stable one.

Browse Source 
mainly from Francois Briere <f.briere@dopha.org>; modifications from me
ok naddy@
This commit is contained in:
robert 2004-04-28 18:10:34 +00:00
parent 79381172a1
commit 97859f4f1f
9 changed files with 97 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
x11/fluxbox/Makefile
View File

@ -1,20 +1,15 @@
# $OpenBSD: Makefile,v 1.28 2004/04/18 17:38:37 naddy Exp $
# $OpenBSD: Makefile,v 1.29 2004/04/28 18:10:34 robert Exp $
COMMENT= "window manager based on the original Blackbox code"
COMMENT= "window manager based on the original Blackbox code"
VERSION= 0.1.14
VERSION= 0.9.9
DISTNAME= fluxbox-${VERSION}
PKGNAME= ${DISTNAME} #p2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
#MASTER_SITES0= http://www.fluxbox.org/download/patches/
#PATCHFILES= fluxbox-${VERSION}-bugfix1.patch:0
#PATCH_DIST_STRIP= -p1
HOMEPAGE= http://fluxbox.org/
# X11
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -22,14 +17,15 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.54
CONFIGURE_ARGS= --enable-kde --enable-xinerama
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS= --enable-kde --enable-xinerama \
--enable-xinerama
USE_GMAKE= Yes
USE_X11= Yes
SUBST_VARS= VERSION
post-install:
${INSTALL_DATA} ${FILESDIR}/menu ${PREFIX}/share/fluxbox
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
.include <bsd.port.mk>

6
x11/fluxbox/distinfo
View File

@ -1,3 +1,3 @@
MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
RMD160 (fluxbox-0.1.14.tar.gz) = 674f4ea0336f7dc062a6424000987f2fcde073ad
SHA1 (fluxbox-0.1.14.tar.gz) = 323bd101ae99fed56e320651c721815c7a36509a
MD5 (fluxbox-0.9.9.tar.gz) = b0c637b1b6baa646f99877321b5d9e53
RMD160 (fluxbox-0.9.9.tar.gz) = 3cb4ad83b8870de0bce9d7cd340e56801db62e39
SHA1 (fluxbox-0.9.9.tar.gz) = c3feff5bbed1d9e4512618db16bcd1964500d44e

8
x11/fluxbox/files/menu
View File

@ -1,8 +0,0 @@
# $OpenBSD: menu,v 1.1 2003/08/26 19:46:09 naddy Exp $
[begin] (Fluxbox)
[exec] (Xterm) {xterm}
[exec] (Generate Menu) {fluxbox-generate_menu}
[reconfig] (Reload config)
[restart] (Restart)
[exit] (Exit)
[end]

35
x11/fluxbox/patches/patch-configure_in
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-configure_in,v 1.3 2004/01/29 17:52:43 naddy Exp $
--- configure.in.orig 2004-01-29 18:00:33.000000000 +0100
+++ configure.in 2004-01-29 18:01:17.000000000 +0100
@@ -31,7 +31,30 @@ AC_HEADER_TIME
dnl Check for existance of basename(), setlocale() and strftime()
AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="$LIBS -lgen"))
-AC_CHECK_FUNCS(getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose)
+AC_CHECK_FUNCS(getpid setlocale sigaction strcasestr snprintf vsnprintf catopen catgets catclose)
+dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?):
+dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc
+dnl breaks with:
+dnl test.cc:1: error: nonnull argument with out-of-range operand number
+dnl (arg 1, operand 3)
+
+
+AC_MSG_CHECKING(for strftime)
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <time.h>],
+[[
+char * s;
+time_t t = time(NULL);
+size_t x = strftime(s, 5, "%a", localtime(&t));
+]]
+)],
+[
+ AC_DEFINE(HAVE_STRFTIME, 1, [Define to 1 if you have the 'strftime' function.])
+ AC_MSG_RESULT(yes)
+],
+[AC_MSG_RESULT(no)])
+
AC_CHECK_LIB(nsl, t_open, LIBS="$LIBS -lnsl")
AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")

12
x11/fluxbox/patches/patch-src_BaseDisplay_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_BaseDisplay_cc,v 1.3 2003/08/25 17:15:56 naddy Exp $
--- src/BaseDisplay.cc.orig Sun Mar 2 11:38:30 2003
+++ src/BaseDisplay.cc Sun Mar 2 11:38:48 2003
@@ -123,7 +123,7 @@ void bexec(const char *command, char *di
if (! fork()) {
setsid();
putenv(displaystring);
- execl("/bin/sh", "/bin/sh", "-c", command, 0);
+ execl("/bin/sh", "/bin/sh", "-c", command, (void *)NULL);
exit(0);
}
}

12
x11/fluxbox/patches/patch-src_FbCommands_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_FbCommands_cc,v 1.3 2004/04/28 18:10:34 robert Exp $
--- src/FbCommands.cc.orig Sun Apr 18 13:51:59 2004
+++ src/FbCommands.cc Sun Apr 18 13:53:17 2004
@@ -65,7 +65,7 @@
displaystring += intbuff;
setsid();
putenv(const_cast<char *>(displaystring.c_str()));
- execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
+ execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), (void *)NULL);
exit(0);
}
#else // __EMX__

21
x11/fluxbox/patches/patch-util_fbrun_FbRun_cc
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-util_fbrun_FbRun_cc,v 1.1 2004/01/29 17:52:43 naddy Exp $
--- util/fbrun/FbRun.cc.orig 2004-01-29 18:27:18.000000000 +0100
+++ util/fbrun/FbRun.cc 2004-01-29 18:27:33.000000000 +0100
@@ -34,6 +34,7 @@
$OpenBSD: patch-util_fbrun_FbRun_cc,v 1.2 2004/04/28 18:10:34 robert Exp $
--- util/fbrun/FbRun.cc.orig Sun Apr 18 14:00:22 2004
+++ util/fbrun/FbRun.cc Sun Apr 18 14:00:39 2004
@@ -110,7 +110,7 @@
// fork and execute program
if (!fork()) {
setsid();
- execl("/bin/sh", "/bin/sh", "-c", command.c_str(), 0);
+ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (void *)NULL);
exit(0); //exit child
}
#include <iostream>
#include <fstream>
+#include <cassert>
using namespace std;
FbRun::FbRun(int x, int y, size_t width):

16
x11/fluxbox/pkg/DESCR
View File

@ -5,19 +5,3 @@ like Blackbox (100% theme/style compability).
So what's the difference between Fluxbox and Blackbox then? The
answer is: LOTS!
Here is a list of features that have been added to Fluxbox:
* New native integrated keygrabber (supports emacs like keychains)
* Wheel scroll changes workspace
* pwm-like window tabs
* Iconbar (for minimized/iconified windows)
* Configurable titlebar (placement of buttons, new buttons, etc)
* Maximize over slit option
* Slit dockapp ordering
* KDE 3 support
* GNOME 2 support
* Extended window manager hints support
* AntiAliased font support
* UTF-8 support
* Lots of other minor features

66
x11/fluxbox/pkg/PLIST
View File

@ -1,13 +1,18 @@
@comment $OpenBSD: PLIST,v 1.10 2003/08/26 19:46:09 naddy Exp $
@comment $OpenBSD: PLIST,v 1.11 2004/04/28 18:10:34 robert Exp $
@pkgcfl blackbox-*
@pkgcfl openbox-*
bin/bsetbg
bin/bsetroot
bin/fbrun
bin/fbsetbg
bin/fluxbox
bin/fluxbox-generate_menu
bin/startfluxbox
man/man1/bsetroot.1
man/man1/fbrun.1
man/man1/fbsetbg.1
man/man1/fluxbox.1
man/man1/fluxstyle.1
man/man1/startfluxbox.1
share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
@ -16,6 +21,7 @@ share/fluxbox/nls/POSIX
share/fluxbox/nls/US_ASCII
share/fluxbox/nls/bg_BG/fluxbox.cat
share/fluxbox/nls/da_DK/fluxbox.cat
share/fluxbox/nls/de_DE/fluxbox.cat
share/fluxbox/nls/en
share/fluxbox/nls/en_US
share/fluxbox/nls/es
@ -27,45 +33,95 @@ share/fluxbox/nls/it_IT/fluxbox.cat
share/fluxbox/nls/ja_JP/fluxbox.cat
share/fluxbox/nls/lv
share/fluxbox/nls/lv_LV/fluxbox.cat
share/fluxbox/nls/nl_NL/fluxbox.cat
share/fluxbox/nls/pl_PL/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/sl_SI/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/BlueFlux/pixmaps/button_close_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_close_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_max_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_max_pressed.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_max_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_min_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_min_pressed.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_min_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_stick_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_stick_pressed.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_stuck.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm
share/fluxbox/styles/BlueFlux/pixmaps/menu_frame.xpm
share/fluxbox/styles/BlueFlux/pixmaps/title_bar.xpm
share/fluxbox/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm
share/fluxbox/styles/BlueFlux/pixmaps/toolbar.xpm
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/CleanColor
share/fluxbox/styles/Cthulhain
share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
share/fluxbox/styles/Emerge/pixmaps/close-pressed.xpm
share/fluxbox/styles/Emerge/pixmaps/close-unfocus.xpm
share/fluxbox/styles/Emerge/pixmaps/close.xpm
share/fluxbox/styles/Emerge/pixmaps/icon-pressed.xpm
share/fluxbox/styles/Emerge/pixmaps/icon-unfocus.xpm
share/fluxbox/styles/Emerge/pixmaps/icon.xpm
share/fluxbox/styles/Emerge/pixmaps/max-pressed.xpm
share/fluxbox/styles/Emerge/pixmaps/max-unfocus.xpm
share/fluxbox/styles/Emerge/pixmaps/max.xpm
share/fluxbox/styles/Emerge/pixmaps/selected.xpm
share/fluxbox/styles/Emerge/pixmaps/stick-pressed.xpm
share/fluxbox/styles/Emerge/pixmaps/stick-unfocus.xpm
share/fluxbox/styles/Emerge/pixmaps/stick.xpm
share/fluxbox/styles/Emerge/pixmaps/stuck-pressed.xpm
share/fluxbox/styles/Emerge/pixmaps/stuck-unfocus.xpm
share/fluxbox/styles/Emerge/pixmaps/stuck.xpm
share/fluxbox/styles/Emerge/pixmaps/unselected.xpm
share/fluxbox/styles/Emerge/theme.cfg
share/fluxbox/styles/Flux
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/Rancor
share/fluxbox/styles/Results
share/fluxbox/styles/Shade
share/fluxbox/styles/Spiff
share/fluxbox/styles/Twice
share/fluxbox/styles/qnx-photon
@dirrm share/fluxbox/styles/Emerge/pixmaps
@dirrm share/fluxbox/styles/Emerge
@dirrm share/fluxbox/styles/BlueFlux/pixmaps
@dirrm share/fluxbox/styles/BlueFlux
@dirrm share/fluxbox/styles
@dirrm share/fluxbox/nls/tr_TR
@dirrm share/fluxbox/nls/sv_SE
@dirrm share/fluxbox/nls/sl_SI
@dirrm share/fluxbox/nls/ru_RU
@dirrm share/fluxbox/nls/pt_PT
@dirrm share/fluxbox/nls/pt_BR
@dirrm share/fluxbox/nls/pl_PL
@dirrm share/fluxbox/nls/nl_NL
@dirrm share/fluxbox/nls/lv_LV
@dirrm share/fluxbox/nls/ja_JP
@dirrm share/fluxbox/nls/it_IT
@dirrm share/fluxbox/nls/fr_FR
@dirrm share/fluxbox/nls/et_EE
@dirrm share/fluxbox/nls/es_ES
@dirrm share/fluxbox/nls/de_DE
@dirrm share/fluxbox/nls/da_DK
@dirrm share/fluxbox/nls/bg_BG
@dirrm share/fluxbox/nls/C