4 files changed, 78 insertions, 14 deletions
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index bdfb8d6409e1..8601fd0fce2c 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,27 +7,58 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.12
-PORTREVISION=   1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if defined(WITH_REMEMBER)
+PATCH_SITES=	http://fluxbox.sourceforge.net/download/patches/
+PATCHFILES=	unofficial-fluxbox-0.1.12-remember-patch.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	hendrik@scholz.net
 
-RUN_DEPENDS=    bsetbg:${PORTSDIR}/x11-wm/boxtools
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
+RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-
-.if defined(WITH_XINERAMA)
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+CONFIGURE_ENV=	AUTOMAKE="${AUTOMAKE}"
+.if defined(WITH_REMEMBER)
+USE_GMAKE=	yes
+.endif
+.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-kde
+.endif
+.if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
 MAN1=		fluxbox.1
 
-.if !defined(WITH_XINERAMA)
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-gnome
+.endif
+
 pre-everything::
-	@${ECHO_CMD} "To enable xinerama support define WITH_XINERAMA"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Definable build options"
+	@${ECHO_CMD} "-----------------------"
+.if !defined(WITH_XINERAMA)
+	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
+.endif
+.if !defined(WITH_REMEMBER)
+	@${ECHO_CMD} "WITH_REMEMBER	- Enable the unofficial remember patch"
+.endif
+.if !defined(WITH_KDE)
+	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
 .endif
+	@${ECHO_CMD} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index df1ce10d4dba..1c320796cc96 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1 +1,2 @@
 MD5 (fluxbox-0.1.12.tar.gz) = f90b191af969b49be3dcf901c36d5e13
+MD5 (unofficial-fluxbox-0.1.12-remember-patch.bz2) = cec040561aba84c1ca18fcfcaba17661
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index bdfb8d6409e1..8601fd0fce2c 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,27 +7,58 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.12
-PORTREVISION=   1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if defined(WITH_REMEMBER)
+PATCH_SITES=	http://fluxbox.sourceforge.net/download/patches/
+PATCHFILES=	unofficial-fluxbox-0.1.12-remember-patch.bz2
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	hendrik@scholz.net
 
-RUN_DEPENDS=    bsetbg:${PORTSDIR}/x11-wm/boxtools
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
+RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-
-.if defined(WITH_XINERAMA)
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+CONFIGURE_ENV=	AUTOMAKE="${AUTOMAKE}"
+.if defined(WITH_REMEMBER)
+USE_GMAKE=	yes
+.endif
+.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-kde
+.endif
+.if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
 MAN1=		fluxbox.1
 
-.if !defined(WITH_XINERAMA)
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-gnome
+.endif
+
 pre-everything::
-	@${ECHO_CMD} "To enable xinerama support define WITH_XINERAMA"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Definable build options"
+	@${ECHO_CMD} "-----------------------"
+.if !defined(WITH_XINERAMA)
+	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
+.endif
+.if !defined(WITH_REMEMBER)
+	@${ECHO_CMD} "WITH_REMEMBER	- Enable the unofficial remember patch"
+.endif
+.if !defined(WITH_KDE)
+	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
 .endif
+	@${ECHO_CMD} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index df1ce10d4dba..1c320796cc96 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1 +1,2 @@
 MD5 (fluxbox-0.1.12.tar.gz) = f90b191af969b49be3dcf901c36d5e13
+MD5 (unofficial-fluxbox-0.1.12-remember-patch.bz2) = cec040561aba84c1ca18fcfcaba17661