Index: head/x11-wm/fluxbox-devel/Makefile =================================================================== --- head/x11-wm/fluxbox-devel/Makefile (revision 103997) +++ head/x11-wm/fluxbox-devel/Makefile (revision 103998) @@ -1,77 +1,78 @@ # New ports collection makefile for: fluxbox-devel # Date created: 21 May 2003 # Whom: hendrik@scholz.net # # $FreeBSD$ # PORTNAME= fluxbox PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= fluxbox PKGNAMESUFFIX= -devel MAINTAINER= mezz7@cox.net COMMENT= A small and fast window manager based on BlackBox LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \ xterm:${PORTSDIR}/x11/XFree86-4-clients BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients CONFLICTS= fluxbox-0.1.* USE_BZIP2= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes WANT_GNOME= yes USE_REINPLACE= yes CONFIGURE_ARGS= --enable-nls .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde .endif .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-xinerama .endif .include MAN1= fluxbox.1 .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-gnome .else CONFIGURE_ARGS+= --disable-gnome .endif NLSMAKEFILES= nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \ nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pt_BR \ nls/pt_PT nls/ru_RU nls/sv_SE nls/tr_TR pre-everything:: @${ECHO_CMD} "" @${ECHO_CMD} "Definable build options" @${ECHO_CMD} "-----------------------" .if !defined(WITH_XINERAMA) @${ECHO_CMD} "WITH_XINERAMA - Enable Xinerama support" .endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" .endif post-patch:: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in post-configure:: .for i in ${NLSMAKEFILES} @${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile .endfor post-install:: @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11-wm/fluxbox-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in =================================================================== --- head/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in (revision 103997) +++ head/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in (revision 103998) @@ -1,85 +1,94 @@ ---- util/fluxbox-generate_menu.in.orig Thu Jan 22 00:45:46 2004 -+++ util/fluxbox-generate_menu.in Thu Jan 22 00:51:27 2004 +--- util/fluxbox-generate_menu.in Mon Jan 12 13:14:55 2004 ++++ util/fluxbox-generate_menu.in Sun Mar 14 12:02:01 2004 @@ -45,7 +45,7 @@ WHOAMI=`whoami` -[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin +[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:%%LOCALBASE%%/bin:%%X11BASE%%/bin # Functions display_usage() { @@ -78,8 +78,8 @@ Only for packagers: - -p prefix; default is /usr/local - -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected + -p prefix; default is @PREFIX@ + -n Gnome-prefix; %%X11BASE%%, %%LOCALBASE%% and /opt autodetected -q KDE-prefix; idem dito +@@ -109,7 +109,7 @@ + case `uname` in + Linux|*BSD) + find_it() { +- which $1 > /dev/null 2>&1 && shift && $* ++ which $1 > /dev/null 2>&1 && shift && "$@" + } + + find_it_options() { @@ -614,19 +614,19 @@ # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run' # --- PREFIX'es -# These are prefixes; So if fluxbox is installed in /usr/bin/fluxbox -# your prefix is: /usr +# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox +# your prefix is: @PREFIX@ -# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so +# fluxbox-generate already looks in %%LOCALBASE%%, %%X11BASE%% and /opt so # there should be no need to specify them. # -# PREFIX=/usr -# GNOME_PREFIX=/opt/gnome -# KDE_PREFIX=/opt/kde +# PREFIX=@PREFIX@ +# GNOME_PREFIX=%%X11BASE%% +# KDE_PREFIX=%%LOCALBASE%% # 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/:@PREFIX@/share/fluxbox/backgrounds/:%%X11BASE%%/share/wallpapers" # --- Boolean variables. @@ -749,7 +749,7 @@ # gnome prefix -for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do +for GNOME_PREFIX in "${GNOME_PREFIX}" %%X11BASE%% %%LOCALBASE%% /opt "${PREFIX}"; do if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then break; fi @@ -757,7 +757,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}" %%LOCALBASE%% %%X11BASE%% /opt "${PREFIX}"; do if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then break; fi @@ -840,7 +840,7 @@ links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${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] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; esac @@ -856,7 +856,7 @@ append_submenu "${NETMENU}" append_submenu "${BROWSERMENU}" normal_find mozilla-firebird MozillaFirebird galeon mozilla dillo netscape - 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}}" Property changes on: head/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in =================================================================== --- head/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in (revision 103997) +++ head/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in (revision 103998) @@ -1,11 +1,20 @@ ---- util/startfluxbox.in.orig Thu Jan 22 00:52:42 2004 -+++ util/startfluxbox.in Thu Jan 22 00:56:37 2004 +--- util/startfluxbox.in Sat Dec 6 18:29:21 2003 ++++ util/startfluxbox.in Sun Mar 14 11:52:50 2004 +@@ -6,7 +6,7 @@ + exec sh ~/.fluxbox/startup + else + if [ ! -d ~/.fluxbox ]; then +- mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} ++ mkdir -p ~/.fluxbox/backgrounds ~/.fluxbox/styles ~/.fluxbox/pixmaps + fi + if [ ! -r ~/.fluxbox/startup ]; then + cat << EOF > ~/.fluxbox/startup @@ -24,7 +24,7 @@ @pkgbindir@/bsetroot -solid black # This shows the fluxbox-splash-screen -# fbsetbg -C /usr/share/fluxbox/splash.jpg +# fbsetbg -C @pkgdatadir@/splash.jpg # Other examples. Check man xset for details. # Property changes on: head/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property