[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: soft lock in progress
Christian Weisgerber <naddy@mips.inka.de> wrote:
> Han Boetes <han@mijncomputer.nl> wrote:
> > Could you be so kind to revert fluxbox to the latest 0.1.14 version.
>
> Done.
>
> Note that the share/fluxbox/menu handling is very questionable. This
> should probably be either a fixed template or a configuration file.
How's this?
All you get is this basic menu wich the options for xterm, and generate
a menu and to exit/restart. Easy for beginners and root wont have to run
the script.
# Han
--
http://www.xs4all.nl/~hanb/software
http://www.xs4all.nl/~hanb/documents/quotingguide.html
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 25 Aug 2003 17:15:56 -0000 1.22
+++ Makefile 26 Aug 2003 01:31:54 -0000
@@ -14,7 +14,7 @@
HOMEPAGE= http://fluxbox.org/
-MAINTAINER= Han Boetes <han@mijncomputer.nl>
+MAINTAINER= Han Boetes <han@linux-mandrake.com>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -31,5 +31,7 @@
USE_X11= Yes
SUBST_VARS= VERSION
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/menu ${PREFIX}/share/fluxbox
.include <bsd.port.mk>
Index: files/menu
===================================================================
RCS file: files/menu
diff -N files/menu
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/menu 26 Aug 2003 01:31:55 -0000
@@ -0,0 +1,7 @@
+[begin] (Fluxbox)
+ [exec] (Xterm) {xterm}
+ [exec] (Generate Menu) {fluxbox-generate_menu}
+ [reconfig] (Reload config)
+ [restart] (Restart)
+ [exit] (Exit)
+[end]
Index: pkg/DEINSTALL
===================================================================
RCS file: pkg/DEINSTALL
diff -N pkg/DEINSTALL
--- pkg/DEINSTALL 27 May 2002 13:30:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2002/05/27 13:30:44 lebel Exp $
-#
-# fluxbox de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-rm -f ${PREFIX}/share/fluxbox/menu*
-
-exit 0
Index: pkg/INSTALL
===================================================================
RCS file: pkg/INSTALL
diff -N pkg/INSTALL
--- pkg/INSTALL 27 May 2002 13:30:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2002/05/27 13:30:44 lebel Exp $
-#
-# Pre/post-installation setup of fluxbox
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
-
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
- echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
- exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
- PRE-INSTALL)
- : nothing to pre-install for this port
- ;;
- POST-INSTALL)
- ${PREFIX}/bin/fluxbox-generate_menu \
- -p ${PREFIX}/share \
- -o ${PREFIX}/share/fluxbox/menu \
- -m Fluxbox-${VERSION}
- ;;
- *)
- echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
- exit 1
- ;;
-esac
-
-exit 0
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 25 Aug 2003 17:15:56 -0000 1.9
+++ pkg/PLIST 26 Aug 2003 01:31:55 -0000
@@ -10,6 +10,7 @@
man/man1/fluxbox.1
share/fluxbox/init
share/fluxbox/keys
+share/fluxbox/menu
share/fluxbox/nls/C/fluxbox.cat
share/fluxbox/nls/POSIX
share/fluxbox/nls/US_ASCII