Update to 0.7.

Author incorporated all the FreeBSD-specific patches from files/.
Now, if none of the supported bg-setting programs are installed
at install-time, x11-fm/fluxbox will be installed.

5 files changed, 8 insertions, 72 deletions

diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index bbf7aad1cfff..6b1462f9b08c 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxbg
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,17 +16,16 @@ COMMENT=	Background changer for fluxbox/blackbox
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+.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_REINPLACE=	yes
 USE_GNOME=	gnomehack gnometarget
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" \
-		${WRKSRC}/src/fluxbg_conf.cc
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11/fluxbg/distinfo b/x11/fluxbg/distinfo
index a729f3f75c15..51f82b75aa08 100644
--- a/x11/fluxbg/distinfo
+++ b/x11/fluxbg/distinfo
@@ -1 +1 @@
-MD5 (fluxbg-0.6.tar.gz) = c94c05da0d86ad30aab44af420356c7b
+MD5 (fluxbg-0.7.tar.gz) = 31ecc527ba937e78deebca49a5f93275
diff --git a/x11/fluxbg/files/patch-src::fluxbg_conf.cc b/x11/fluxbg/files/patch-src::fluxbg_conf.cc
deleted file mode 100644
index 35fc2f9baacc..000000000000
--- a/x11/fluxbg/files/patch-src::fluxbg_conf.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/fluxbg_conf.cc.orig	Sat Aug  9 12:00:29 2003
-+++ src/fluxbg_conf.cc	Tue Sep 30 20:53:24 2003
-@@ -10,6 +10,8 @@
- #include <iostream>
- #include <fstream>
- #include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
- 
- 
- extern "C"{
-@@ -158,6 +160,16 @@
- 	BailOut();
- 
- if (try_access("/usr/local/bin/fbsetbg")==1)
-+	BailOut();
-+
-+/* FreeBSD installs stuff in a Better Place [tm]
-+   also, the fluxbox-devel port appends "-devel" to binary names */
-+
-+if (try_access("%%X11BASE%%/bin/fbsetbg-devel")==1)
-+	BailOut();
-+if (try_access("%%X11BASE%%/bin/fbsetbg")==1)
-+	BailOut();
-+if (try_access("%%X11BASE%%/bin/bsetbg")==1)
- 	BailOut();
- 
- if (write_empty_conf()!=1)
diff --git a/x11/fluxbg/files/patch-src::fluxbgd.c b/x11/fluxbg/files/patch-src::fluxbgd.c
deleted file mode 100644
index f1142d36fa38..000000000000
--- a/x11/fluxbg/files/patch-src::fluxbgd.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/fluxbgd.c.orig	Tue Sep 30 20:40:39 2003
-+++ src/fluxbgd.c	Tue Sep 30 20:42:40 2003
-@@ -91,13 +91,14 @@
-  int main(int argc, char **argv)
-  {
- 
-- int c;
-+ int c, line_max, current_line, last_line;
-  int bOptionA = 0;
-  int bError = 0;
-  char * szInputFile = (char *) 0;
-  char * szInterval = (char *) 0;
-  char * eptr; /* seems not to be used */
-  char * next_set[120];  /* maximum line size */
-+ char * sys_command;
- /* TODO: next_set could be fixed to any length !*/
- 
-  szCommand = argv[0];
-@@ -206,10 +207,9 @@
- 		PrintError("Could not open file");
- 		exit(EXIT_FAILURE);
- 		}
--	int line_max = 0;
--	int current_line = 0;
--	int last_line = 0;
--	char *sys_command;
-+	line_max = 0;
-+	current_line = 0;
-+	last_line = 0;
- 	/* next while loop is checking how much lines are in the file */
- 
- 	while (fgets (next_set, sizeof(next_set), fp) != NULL)
diff --git a/x11/fluxbg/pkg-message b/x11/fluxbg/pkg-message
index c795639f07bd..76eb23c7f982 100644
--- a/x11/fluxbg/pkg-message
+++ b/x11/fluxbg/pkg-message
@@ -1,8 +1,5 @@
 
 
-Before you can use fluxbg, you must first run fluxbg_conf.
-
-Before you can use fluxbg_conf, you must first install boxtools,
-fluxbox, or fluxbox-devel.
+You must run fluxbg_conf before you can use fluxbg!