Move x11-wm/fluxbox-devel from X11BASE to LOCALBASE. As for the other ports,

chase the change of fluxbox-devel's home. Bump the PORTREVISION. Be sure to
read in the UPDATING.

6 files changed, 55 insertions, 26 deletions

diff --git a/UPDATING b/UPDATING
index c362ec08e4b6..6f3768ade269 100644
--- a/UPDATING
+++ b/UPDATING
@@ -9,6 +9,22 @@ upgrades.
 
 
 20060831:
+  AFFECTS: users of x11-wm/fluxbox-devel
+  AUTHOR: mezz@FreeBSD.org
+
+  The prefix has been changed, the fluxbox-devel now lives in LOCALBASE. You
+  will need to download the fluxbox_prefix.sh script and run it as in your
+  normal users that have ~/.fluxbox. The script only will replace old path to
+  the new path; it does not affect on anything else.
+
+  	$ fetch http://people.freebsd.org/~mezz/script/fluxbox_prefix.sh
+	$ sh fluxbox_prefix.sh
+
+  It will creating a backup of ~/.fluxbox to ~/.fluxbox-bak. If everything
+  work fine, then you can remove ~/.fluxbox-bak. If you have the different
+  default of LOCALBASE and X11BASE, you can edit it in fluxbox_prefix.sh.
+
+20060831:
   AFFECTS: users of games/warzone
   AUTHOR: alepulver@FreeBSD.org
 
diff --git a/x11-themes/flux-art/Makefile b/x11-themes/flux-art/Makefile
index 6dcc20bb76bb..daf0ccde5c36 100644
--- a/x11-themes/flux-art/Makefile
+++ b/x11-themes/flux-art/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flux-art
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.iluxa.kremenchug.net/files/
 
@@ -18,7 +19,7 @@ RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/fluxbox-devel
 CONFLICTS=	fluxbox-fluxmod-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 INSTALL_DIR=	${PREFIX}/share/fluxbox/styles
@@ -28,7 +29,7 @@ DATA_CMD=	cd ${WRKSRC}; ${FIND} * -type f
 
 pre-install:
 	@for theme in `${THEME_CMD}`; do \
-		${SED} -i '' -e "s,~/.fluxbox,${X11BASE}/share/fluxbox," ${WRKSRC}/$$theme; \
+		${SED} -i '' -e "s,~/.fluxbox,${LOCALBASE}/share/fluxbox," ${WRKSRC}/$$theme; \
 	done
 
 do-install:
diff --git a/x11-themes/fluxbox-sid-pack/Makefile b/x11-themes/fluxbox-sid-pack/Makefile
index f755c5d42086..03b1d4c05ec8 100644
--- a/x11-themes/fluxbox-sid-pack/Makefile
+++ b/x11-themes/fluxbox-sid-pack/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluxbox-sid-pack
 PORTVERSION=	20031226
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://fluxbox.org/download/themes/sid/
 DISTNAME=	sidpack
@@ -17,7 +18,7 @@ COMMENT=	Sid themes pack for fluxbox
 RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/fluxbox-devel
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 978e32c1c415..c0f2da0fae7e 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.0rc2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
@@ -22,10 +22,10 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 CONFLICTS=	fluxbox-0.1.*
 
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
index 915065367fad..bc77d49baa86 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
@@ -1,5 +1,5 @@
---- util/fluxbox-generate_menu.in.orig	Tue Jun 13 20:36:08 2006
-+++ util/fluxbox-generate_menu.in	Tue Jun 13 20:46:24 2006
+--- util/fluxbox-generate_menu.in.orig	Mon Aug 28 01:26:18 2006
++++ util/fluxbox-generate_menu.in	Mon Aug 28 01:37:24 2006
 @@ -48,7 +48,7 @@
  
  
@@ -27,18 +27,19 @@
      -q  KDE-prefix; idem dito
  
  
-@@ -282,7 +282,9 @@
+@@ -282,7 +282,10 @@
      # echo -n "for $temp_icon"
      eval doSearchLoop $USER_ICONPATHS \
        "$FB_ICONDIR" \
 -      "/usr/share/${execname%% *}" \
 +      "%%LOCALBASE%%/share/${execname%% *}" \
 +      "%%X11BASE%%/share/${execname%% *}" \
++      "%%LOCALBASE%%/share/gnome/${execname%% *}" \
 +      "%%X11BASE%%/share/gnome/${execname%% *}" \
        ${OTHER_ICONPATHS} \
  
  
-@@ -1204,16 +1206,16 @@
+@@ -1204,16 +1207,16 @@
  # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
  # your prefix is: @PREFIX@
  
@@ -55,11 +56,11 @@
  
  # Sepparate the list of background-dirs with semicolumns ':'
 -# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
-+# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%X11BASE%%/share/wallpapers"
++# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%LOCALBASE%%/share/wallpapers:%%X11BASE%%/share/wallpapers"
  
  
  # --- Boolean variables.
-@@ -1281,29 +1283,31 @@
+@@ -1281,29 +1284,35 @@
          -g) GNOMEMENU=yes; shift;;
          -in) NO_ICON=yes; shift;;
          -is) OTHER_ICONPATHS="
@@ -81,6 +82,8 @@
 -                /usr/local/X11R6/share/icons/hicolor/16x16,
 +                %%LOCALBASE%%/share/icons,
 +                %%LOCALBASE%%/share/icons/mini,
++                %%LOCALBASE%%/share/gnome/icons,
++                %%LOCALBASE%%/share/gnome/pixmaps,
 +                %%LOCALBASE%%/share/pixmaps,
 +                %%LOCALBASE%%/share/xclass/icons,
 +                %%LOCALBASE%%/share/xclass/pixmaps,
@@ -89,8 +92,8 @@
 +                %%LOCALBASE%%/share/icons/hicolor/16x16,
 +                %%X11BASE%%/share/icons,
 +                %%X11BASE%%/share/icons/mini,
-+                %%X11BASE%%/share/gnome/icons
-+                %%X11BASE%%/share/gnome/pixmaps
++                %%X11BASE%%/share/gnome/icons,
++                %%X11BASE%%/share/gnome/pixmaps,
 +                %%X11BASE%%/share/pixmaps,
 +                %%X11BASE%%/share/xclass/icons,
 +                %%X11BASE%%/share/xclass/pixmaps,
@@ -105,13 +108,15 @@
 -                /usr/share/xsessions 
 -                /usr/share/services 
 +                %%LOCALBASE%%/share/applications
++                %%LOCALBASE%%/share/gnome/applications
++                %%LOCALBASE%%/share/gnome/xsessions
 +                %%X11BASE%%/share/applications
 +                %%X11BASE%%/share/gnome/applications
 +                %%X11BASE%%/share/gnome/xsessions
              "
              # /usr/share/apps \
              shift;;
-@@ -1378,7 +1382,7 @@
+@@ -1378,7 +1387,7 @@
  
  
  # gnome prefix
@@ -120,7 +125,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -1386,7 +1390,7 @@
+@@ -1386,7 +1395,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -129,7 +134,7 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -1474,7 +1478,7 @@
+@@ -1474,7 +1483,7 @@
  else
      [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
      #The precise order is up for debate.
@@ -138,7 +143,7 @@
          if find_it $browser; then
              DEFAULT_BROWSER=$browser
              break
-@@ -1514,7 +1518,8 @@
+@@ -1514,7 +1523,8 @@
      links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
      firefox|firebird|mozilla|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
      konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
@@ -148,7 +153,7 @@
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
      MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1533,7 +1538,8 @@
+@@ -1533,7 +1543,8 @@
      append_submenu "${BROWSERMENU}"
          normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer
          find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index 100d3731e34a..7543e4c5c9d3 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxbg
 PORTVERSION=	0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,17 +17,23 @@ COMMENT=	Background changer for fluxbox/blackbox
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 
-.if !exists(${X11BASE}/bin/bsetbg) &&  \
-    !exists(${X11BASE}/bin/fbsetbg) && \
-    !exists(${X11BASE}/bin/fbsetbg-devel)
-RUN_DEPENDS=	fbsetbg:${PORTSDIR}/x11-wm/fluxbox
-.endif
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
 
+.include <bsd.port.pre.mk>
+
+.if !exists(${X11BASE}/bin/bsetbg) &&  \
+    !exists(${LOCALBASE}/bin/fbsetbg) && \
+    !exists(${X11BASE}/bin/fbsetbg)
+RUN_DEPENDS=	fbsetbg:${PORTSDIR}/x11-wm/fluxbox-devel
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/fluxbg_conf.cc
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>