* Let fluxbox depend on new boxtools port.

* Do not install bsetbg and bsetroot anymore, since this is part of boxtools
  now.
* Bump PORTREVISION.

PR:		43844
Submitted by:	maintainer

8 files changed, 56 insertions, 6 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 3a5fed857a07..a3cd285031e3 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,15 +7,18 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.12
+PORTREVISION=   1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hendrik@scholz.net
 
+RUN_DEPENDS=    bsetbg:${PORTSDIR}/x11-wm/boxtools
+
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		fluxbox.1 bsetroot.1
+MAN1=		fluxbox.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fluxbox-devel/files/patch-Makefile.in b/x11-wm/fluxbox-devel/files/patch-Makefile.in
new file mode 100644
index 000000000000..7de0322bc6d0
--- /dev/null
+++ b/x11-wm/fluxbox-devel/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Oct  8 23:12:58 2002
++++ Makefile.in	Tue Oct  8 23:13:06 2002
+@@ -95,7 +95,7 @@
+ install_sh = @install_sh@
+ regex_cmd = @regex_cmd@
+ 
+-SUBDIRS = data doc nls src util
++SUBDIRS = data doc nls src util/fbrun
+ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..5fae70ca2aee
--- /dev/null
+++ b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	Tue Oct  8 23:14:11 2002
++++ doc/Makefile.in	Tue Oct  8 23:14:41 2002
+@@ -97,8 +97,8 @@
+ 
+ CLEANFILES = fluxbox.1
+ MAINTAINERCLEANFILES = Makefile.in
+-man_MANS = fluxbox.1 bsetroot.1
+-EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
++man_MANS = fluxbox.1
++EXTRA_DIST = fluxbox.1.in Coding_style
+ subdir = doc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 6b7df1a084af..d61cbb533ec1 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -1,5 +1,3 @@
-bin/bsetbg
-bin/bsetroot
 bin/fbrun
 bin/fluxbox
 bin/fluxbox-generate_menu
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 3a5fed857a07..a3cd285031e3 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,15 +7,18 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.12
+PORTREVISION=   1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hendrik@scholz.net
 
+RUN_DEPENDS=    bsetbg:${PORTSDIR}/x11-wm/boxtools
+
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		fluxbox.1 bsetroot.1
+MAN1=		fluxbox.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fluxbox/files/patch-Makefile.in b/x11-wm/fluxbox/files/patch-Makefile.in
new file mode 100644
index 000000000000..7de0322bc6d0
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Oct  8 23:12:58 2002
++++ Makefile.in	Tue Oct  8 23:13:06 2002
+@@ -95,7 +95,7 @@
+ install_sh = @install_sh@
+ regex_cmd = @regex_cmd@
+ 
+-SUBDIRS = data doc nls src util
++SUBDIRS = data doc nls src util/fbrun
+ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-wm/fluxbox/files/patch-doc::Makefile.in b/x11-wm/fluxbox/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..5fae70ca2aee
--- /dev/null
+++ b/x11-wm/fluxbox/files/patch-doc::Makefile.in
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	Tue Oct  8 23:14:11 2002
++++ doc/Makefile.in	Tue Oct  8 23:14:41 2002
+@@ -97,8 +97,8 @@
+ 
+ CLEANFILES = fluxbox.1
+ MAINTAINERCLEANFILES = Makefile.in
+-man_MANS = fluxbox.1 bsetroot.1
+-EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
++man_MANS = fluxbox.1
++EXTRA_DIST = fluxbox.1.in Coding_style
+ subdir = doc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index 6b7df1a084af..d61cbb533ec1 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -1,5 +1,3 @@
-bin/bsetbg
-bin/bsetroot
 bin/fbrun
 bin/fluxbox
 bin/fluxbox-generate_menu