please test
Index: x11/fluxbox/Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- x11/fluxbox/Makefile 12 Jun 2005 16:52:20 -0000 1.35
+++ x11/fluxbox/Makefile 5 Oct 2005 22:27:33 -0000
@@ -2,7 +2,7 @@
COMMENT= "window manager based on the original Blackbox code"
-VERSION= 0.9.13
+VERSION= 0.9.14
DISTNAME= fluxbox-${VERSION}
CATEGORIES= x11
Index: x11/fluxbox/distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- x11/fluxbox/distinfo 25 May 2005 06:59:56 -0000 1.20
+++ x11/fluxbox/distinfo 5 Oct 2005 22:27:33 -0000
@@ -1,4 +1,4 @@
-MD5 (fluxbox-0.9.13.tar.gz) = aa0ad2392524242fdc25eca58c028553
-RMD160 (fluxbox-0.9.13.tar.gz) = 8191b985d8fb7f43e97b8d5040afd9ebbd14a08b
-SHA1 (fluxbox-0.9.13.tar.gz) = dddfb557c7f539e8c941b2a9be224da0dc18dc29
-SIZE (fluxbox-0.9.13.tar.gz) = 899873
+MD5 (fluxbox-0.9.14.tar.gz) = fc013c3d233ce11bcb8b6d989b1a4326
+RMD160 (fluxbox-0.9.14.tar.gz) = 8185498a076a87ec7b0cce088c52ae493020c6a2
+SHA1 (fluxbox-0.9.14.tar.gz) = ca81da9cab1df67d41b539527fc077f99ea366f8
+SIZE (fluxbox-0.9.14.tar.gz) = 928623
Index: x11/fluxbox/patches/patch-data_Makefile_in
===================================================================
RCS file: x11/fluxbox/patches/patch-data_Makefile_in
diff -N x11/fluxbox/patches/patch-data_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/fluxbox/patches/patch-data_Makefile_in 5 Oct 2005 22:27:33 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- data/Makefile.in.orig Wed Sep 14 15:27:20 2005
++++ data/Makefile.in Wed Oct 5 16:54:18 2005
+@@ -535,7 +535,7 @@ install-pkgdataDATA:
+ $(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
+ @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
+- $(INSTALL_DATA) keys $(DESTDIR)$(DEFAULT_KEYS)
++ $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
+ @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+ $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+ $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
Index: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
===================================================================
RCS file: x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
diff -N x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
--- x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in 19 Jun 2005
03:55:50 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.5 2005/06/19 03:55:50 david
Exp $
---- util/fluxbox-generate_menu.in.orig Thu Apr 28 05:21:09 2005
-+++ util/fluxbox-generate_menu.in Sat Jun 18 22:32:37 2005
-@@ -38,6 +38,7 @@
- # - don't use id -u or $UID, use whoami
- # - getopts won't work on all platforms, but the config-file can
- # compensate for that.
-+# - OpenBSD and Solaris grep do not have the -m option
- # - various software like grep/sed/perl may be not present or not
- # the version you have. for example grep '\W' only works on gnu-grep.
- # Keep this in mind, use bare basic defaults.
-@@ -271,7 +272,7 @@ doSearch(){
- # $dnlamVERBOSE "# Searching for icon $temp_icon for $execname" >>
$ICONMAPPING
-
- # check in $ICONMAPPING before searching directories
-- entry_icon=`grep -m 1 "^\"${execname}\"" $ICONMAPPING | grep -o '<.*>'`
-+ entry_icon=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o
'<.*>'`
- if [ -n "$entry_icon" ]; then
- entry_icon=`replaceWithinString "$entry_icon" "<"`
- entry_icon=`replaceWithinString "$entry_icon" ">"`
-@@ -365,16 +366,16 @@ createIconMapping(){
- # >> $ICONMAPPING
- find "$DIR" -type f -name "*.desktop" | while read DESKTOP_FILE;
do
- # echo $DESKTOP_FILE;
-- #entry_name=`grep -m 1 '^[ ]*Name=' $DESKTOP_FILE`
-+ #entry_name=`grep '^[ ]*Name=' $DESKTOP_FILE | head -n 1`
- #entry_name=${entry_name##*=}
-- entry_exec=`grep -m 1 '^[ ]*Exec=' "$DESKTOP_FILE"`
-+ entry_exec=`grep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1`
- entry_exec=${entry_exec##*=}
- entry_exec=`replaceWithinString "$entry_exec" "\""`
- if [ -z "$entry_exec" ]; then
- entry_exec=${DESKTOP_FILE%%.desktop*}
- fi
-
-- entry_icon=`grep -m 1 '^[ ]*Icon=' "$DESKTOP_FILE"`
-+ entry_icon=`grep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1`
- entry_icon=${entry_icon##*=}
-
- # $dnlamVERBOSE echo "--- $entry_exec $entry_icon" >&2
-@@ -407,11 +408,11 @@ lookupIcon() {
- execname=`removePath "$execname"`
-
- #echo "grepping ${execname}"
-- iconString=`grep -m 1 "^\"${execname}\"" $ICONMAPPING | grep -o '<.*>'`
-+ iconString=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o
'<.*>'`
- # $dnlamVERBOSE "lookupIcon $execname, $iconString" >&2
-
- if [ -z "$iconString" ] ; then
-- iconString=`grep -m 1 "^\"${execname%% *}" $ICONMAPPING | grep -o
'<.*>'`
-+ iconString=`grep "^\"${execname%% *}" $ICONMAPPING | head -n 1 | grep
-o '<.*>'`
- fi
-
- if [ -z "$iconString" ] && [ -z "$PARSING_DESKTOP" ] ; then
Index: x11/fluxbox/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- x11/fluxbox/pkg/PLIST 23 Jan 2005 12:44:10 -0000 1.14
+++ x11/fluxbox/pkg/PLIST 5 Oct 2005 22:27:33 -0000
@@ -1,15 +1,15 @@
@comment $OpenBSD: PLIST,v 1.14 2005/01/23 12:44:10 matthieu Exp $
@conflict blackbox-*
@conflict openbox-*
-bin/bsetroot
bin/fbrun
bin/fbsetbg
+bin/fbsetroot
bin/fluxbox
bin/fluxbox-generate_menu
bin/startfluxbox
[EMAIL PROTECTED] man/man1/bsetroot.1
@man man/man1/fbrun.1
@man man/man1/fbsetbg.1
[EMAIL PROTECTED] man/man1/fbsetroot.1
@man man/man1/fluxbox.1
@man man/man1/fluxstyle.1
@man man/man1/startfluxbox.1
