Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22051/10.4/unstable/main/finkinfo/x11-wm
Modified Files:
fluxbox.info fluxbox.patch
Log Message:
Massively newer version (minorly adjusted from Maintainer's submission on #fink)
Index: fluxbox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/fluxbox.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fluxbox.info 16 Feb 2006 21:33:18 -0000 1.1
+++ fluxbox.info 1 Nov 2006 07:43:00 -0000 1.2
@@ -1,24 +1,23 @@
Package: fluxbox
-Version: 0.1.10
-Revision: 22
-Architecture: powerpc
-GCC: 3.3
-BuildDepends: x11-dev, gcc3.3
-Depends: x11
+Version: 1.0rc2
+Revision: 1002
+GCC: 4.0
+BuildDepends: x11-dev, libiconv-dev, pkgconfig
+Depends: x11, libiconv
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 47b1ffec935466db56d26476a62a9d58
+Source-MD5: 701d6e55553dc53f70e97e639a8cc583
+Patch: %n.patch
PatchScript: <<
-mv util/bsetbg util/bsetbg-flux
-patch -p1 < %a/%n.patch
+ perl -pi -e 's,(PATH=.*),\1 && . %p/bin/init.sh,' util/fbsetbg
<<
-ConfigureParams: --enable-xinerama --mandir=%p/share/man
-SetCXX: g++-3.3
+ConfigureParams: --enable-xinerama --mandir=%p/share/man
--disable-dependency-tracking
+InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS README COPYING data/README.* ChangeLog
Description: Another Window Manager not unlike blackbox
DescPackaging: <<
- This version is compiled with g++-3.3, even in the 10.4 tree. If it is
- ever updated to a more recent compiler, any packages which depend on
- this one must be updated at the same time.
+ Make sure to reload fink's init file after sanitizing PATH
+
+ Check fink-specific paths ahead of generic places
<<
DescDetail: <<
Fluxbox is yet another windowmanager for X.
@@ -37,7 +36,11 @@
* New native integrated keygrabber (supports emacs like keychains)
* Maximize over slit option
* Partial GNOME support
+
+Nota Bene->
+ * In order to do rootless mode and still be able to access the menu
+ (normally right click on the background) use this wm with xrootconsole.
<<
License: BSD
-Maintainer: Joe Gorse <[EMAIL PROTECTED]>
+Maintainer: Joe Gorse <[EMAIL PROTECTED]>
Homepage: http://fluxbox.sourceforge.net/
Index: fluxbox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/fluxbox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fluxbox.patch 16 Feb 2006 21:33:18 -0000 1.1
+++ fluxbox.patch 1 Nov 2006 07:43:00 -0000 1.2
@@ -1,30 +1,69 @@
-diff -ur fluxbox-0.1.10.orig/util/Makefile.in fluxbox-0.1.10/util/Makefile.in
---- fluxbox-0.1.10.orig/util/Makefile.in 2002-07-13 21:00:52.000000000
-0400
-+++ fluxbox-0.1.10/util/Makefile.in 2002-07-14 06:24:18.000000000 -0400
-@@ -78,12 +78,12 @@
- gencat_cmd = @gencat_cmd@
- regex_cmd = @regex_cmd@
+diff -Nurd -x'*~' fluxbox-1.0rc2.orig/util/fluxbox-generate_menu.in
fluxbox-1.0rc2/util/fluxbox-generate_menu.in
+--- fluxbox-1.0rc2.orig/util/fluxbox-generate_menu.in 2006-06-10
13:04:11.000000000 -0400
++++ fluxbox-1.0rc2/util/fluxbox-generate_menu.in 2006-11-01
02:30:18.000000000 -0500
+@@ -48,7 +48,7 @@
--bin_SCRIPTS = bsetbg
--bin_PROGRAMS = bsetroot
-+bin_SCRIPTS = bsetbg-flux
-+bin_PROGRAMS = bsetroot-flux
- bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o
../src/i18n.o ../src/FbAtoms.o
- MAINTAINERCLEANFILES = Makefile.in
--EXTRA_DIST = bsetbg
-+EXTRA_DIST = bsetbg-flux
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
-@@ -177,8 +177,8 @@
- maintainer-clean-compile:
+ WHOAMI=`whoami`
+-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin && .
@PREFIX@/bin/init.sh
--bsetroot: $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES)
-- @rm -f bsetroot
-+bsetroot-flux: $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES)
-+ @rm -f bsetroot-flux
- $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD)
$(LIBS)
+ # Check for Imlib2-support
+ if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
+@@ -282,7 +282,7 @@
+ # echo -n "for $temp_icon"
+ eval doSearchLoop $USER_ICONPATHS \
+ "$FB_ICONDIR" \
+- "/usr/share/${execname%% *}" \
++ "@PREFIX@/share/${execname%% *}" \
+ ${OTHER_ICONPATHS} \
- install-binSCRIPTS: $(bin_SCRIPTS)
+
+@@ -1281,6 +1281,14 @@
+ -g) GNOMEMENU=yes; shift;;
+ -in) NO_ICON=yes; shift;;
+ -is) OTHER_ICONPATHS="
++ @PERFIX@/share/icons,
++ @PREFIX@/share/pixmaps,
++ @PREFIX@/share/icons/default/16x16,
++ @PREFIX@/share/icons/kde/16x16,
++ @PREFIX@/share/icons/default.kde/16x16,
++ @PREFIX@/share/icons/gnome/16x16,
++ @PREFIX@/share/icons/hicolor/16x16,
++ @PREFIX@/share/icons/locolor/16x16,
+ /usr/share/icons,
+ /usr/share/icons/mini,
+ /usr/share/pixmaps,
+@@ -1300,10 +1308,10 @@
+ "
+ shift;;
+ -ds) OTHER_DESKTOP_PATHS="
+- /usr/share/mimelnk
+- /usr/share/applications
+- /usr/share/xsessions
+- /usr/share/services
++ @PREFIX@/share/mimelnk
++ @PREFIX@/share/applications
++ @PREFIX@/share/xsessions
++ @PREFIX@/share/services
+ "
+ # /usr/share/apps \
+ shift;;
+@@ -1378,7 +1386,7 @@
+
+
+ # gnome prefix
+-for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt
"${PREFIX}"; do
++for GNOME_PREFIX in "${GNOME_PREFIX}" @PREFIX@ /usr/local /usr/X11R6 /usr
/opt "${PREFIX}"; do
+ if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
+ break;
+ fi
+@@ -1386,7 +1394,7 @@
+ # Will remain $PREFIX if all else fails
+
+ # kde prefix
+-for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt
"${PREFIX}"; do
++for KDE_PREFIX in "${KDE_PREFIX}" @PREFIX@ /usr/local /usr/X11R6 /usr /opt
"${PREFIX}"; do
+ if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
+ break;
+ fi
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
