Date: Tue, 26 Aug 2003 23:52:40 -0500 (CDT) From: Jeremy Messenger <mezz7@cox.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56023: Patch: x11-wm/fluxbox-devel fixes correct prefix and etc... Message-ID: <200308270452.h7R4qeu0033520@ns1.mezzweb.com> Resent-Message-ID: <200308270520.h7R5K82j095110@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56023
>Category: ports
>Synopsis: Patch: x11-wm/fluxbox-devel fixes correct prefix and etc...
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 26 22:20:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mezz
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386
>Description:
When I played with the Fluxbox and noticed there have few problems and mostly
is relating with the prefix and name in the fluxbox-generate_menu. By default
it is pointing at /usr/share and /usr/local/share. And, some has
${prefix}/share/fluxbox, which should be fluxbox-devel.
One more thing: I also noticed that Fluxbox's configure has --enable-gnome by
default. So, I thought why not to add the --disable-gnome in Makefile in case
if you don't have the Gnome installed.
>How-To-Repeat:
n/a
>Fix:
Here's fixes:
-Fluxbox is enable the Gnome by default, so if the value returns as
false then disable the Gnome support (--disable-gnome).
-Change from 'fluxbox' to 'fluxbox-devel' in the
util/fluxbox-generate_menu.
-Correct the prefix in the util/fluxbox-generate_menu by replace
'/usr...' to '%%X11PREFIX%%' and the REINPLACE_CMD will replace them to
the real prefix what you have installed.
Later, when Fluxbox releases the next version and we should do something like
%%X11BASE%% for KDE/Gnome and change from %%X11PREFIX%% to %%PREFIX%% for where
fluxbox is installed in prefix. Speak for fluxbox-generate_menu.
It is probably good idea to bump the version, but I didn't add it in the patch.
--- fluxbox-devel.diff begins here ---
diff -ur fluxbox-devel.orig/Makefile fluxbox-devel/Makefile
--- fluxbox-devel.orig/Makefile Thu Jul 10 18:34:08 2003
+++ fluxbox-devel/Makefile Tue Aug 26 23:29:51 2003
@@ -39,6 +39,8 @@
.if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
CONFIGURE_ARGS+= --enable-gnome
+.else
+CONFIGURE_ARGS+= --disable-gnome
.endif
NLSMAKEFILES= nls nls/C nls/da_DK nls/es_ES nls/et_EE nls/fr_FR nls/pt_BR \
@@ -60,7 +62,8 @@
@${REINPLACE_CMD} -e 's|PACKAGE=fluxbox|PACKAGE=fluxbox-devel|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|fluxbox-generate_menu|fluxbox-generate_menu-devel|g; \
- s|fbrun|fbrun-devel|g' ${WRKSRC}/util/fluxbox-generate_menu
+ s|fbrun|fbrun-devel|g; s|%%X11PREFIX%%|${PREFIX}|g' \
+ ${WRKSRC}/util/fluxbox-generate_menu
post-configure::
.for i in ${NLSMAKEFILES}
diff -ur fluxbox-devel.orig/files/patch-util::fluxbox-generate_menu fluxbox-devel/files/patch-util::fluxbox-generate_menu
--- fluxbox-devel.orig/files/patch-util::fluxbox-generate_menu Thu Jul 10 18:34:08 2003
+++ fluxbox-devel/files/patch-util::fluxbox-generate_menu Tue Aug 26 12:51:16 2003
@@ -1,5 +1,87 @@
---- util/fluxbox-generate_menu.orig Thu Jul 10 23:22:00 2003
-+++ util/fluxbox-generate_menu Thu Jul 10 23:22:19 2003
+--- util/fluxbox-generate_menu.orig Tue Aug 26 11:38:50 2003
++++ util/fluxbox-generate_menu Tue Aug 26 12:45:09 2003
+@@ -72,7 +72,7 @@
+
+ Only for packagers:
+
+- -p Package-datadir; /usr/local/share
++ -p Package-datadir; %%X11PREFIX%%/share
+ -n Gnome-datadir
+ -q KDE-datadir
+
+@@ -529,7 +529,7 @@
+ # Name of the outputfile
+ # FILENAME=${HOME}/.fluxbox/menu
+
+-# MENUTITLE=\`fluxbox -version|cut -d " " -f-2\`
++# MENUTITLE=\`fluxbox-devel -version|cut -d " " -f-2\`
+
+ # standard url for console-browsers
+ # HOMEPAGE=fluxbox.org
+@@ -539,21 +539,21 @@
+
+ # --- Datadirs
+ # These are datadirs; So if fluxbox data is installed in
+-# /usr/share/fluxbox
+-# your datadir is: /usr/share
++# %%X11PREFIX%%/share/fluxbox-devel
++# your datadir is: %%X11PREFIX%%/share
+
+ # Data-dir
+-# PKGDATADIR=/usr/share
++# PKGDATADIR=%%X11PREFIX%%/share
+
+ # Gnome data-dir
+ # in case gnome is installed in another datadir.
+-# GPKGDATADIR=/opt/gnome/share
++# GPKGDATADIR=%%X11PREFIX%%/share
+
+ # Kde data-dir
+-# KPKGDATADIR=/opt/kde/share
++# KPKGDATADIR=%%X11PREFIX%%/share
+
+ # Sepparate the list of background-dirs with semicolumns ':'
+-# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:/usr/local/share/fluxbox/backgrounds/:/usr/share/wallpapers"
++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:%%X11PREFIX%%/share/fluxbox-devel/backgrounds/:%%X11PREFIX%%/share/wallpapers"
+
+ # --- Boolean variables.
+ # Setting a variable to ``no'' won't help. Comment them out if you don't
+@@ -626,7 +626,7 @@
+ PREFIX="${PREFIX:=@PREFIX@}"
+ if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then
+ if [ "$PREFIX" = '@PREFIX@' ]; then
+- PKGDATADIR=/usr/local/share
++ PKGDATADIR=%%X11PREFIX%%/share
+ else
+ PKGDATADIR=${PREFIX}/share
+ fi
+@@ -644,7 +644,7 @@
+
+ # directory for the backgrounds
+ if [ -z "$BACKGROUND_DIRS" ]; then
+- BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:${PKGDATADIR}/fluxbox/backgrounds/"
++ BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:${PKGDATADIR}/fluxbox-devel/backgrounds/"
+ fi
+
+ # find the default terminal
+@@ -718,7 +718,7 @@
+ links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
+ firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;;
+ konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
+- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
++ opera) append "[exec] (opera) {opera}" ;;
+ MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
+ *) append "[exec] (`basename $DEFAULT_BROWSER`) {$DEFAULT_BROWSER}" ;;
+ esac
+@@ -734,7 +734,7 @@
+ append_submenu "${NETMENU}"
+ append_submenu "${BROWSERMENU}"
+ normal_find netscape galeon mozilla dillo
+- find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
++ find_it opera append "[exec] (opera) {opera}"
+ find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}"
+ find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
+ find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"
@@ -876,7 +876,7 @@
append "[config] (${CONFIGUREMENU})"
--- fluxbox-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308270452.h7R4qeu0033520>