* Add WITH_WINSNAP knob for winsnap patch.

* Bump PORTREVISION.

PR:		ports/47214
Submitted by:	maintainer

4 files changed, 54 insertions, 4 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 0076bd5f..dcb8b10 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.14
+PORTREVISION=   1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 .if defined(WITH_REMEMBER)
 PATCH_SITES=    http://www.bugfactory.org/~gav/fluxbox/
 PATCH_DIST_STRIP=   -p1
-PATCHFILES+=	remember-0.1.14-4.gz
+PATCHFILES=	remember-0.1.14-4.gz
+.endif
+
+.if defined(WITH_WINSNAP)
+PATCH_SITES+=   http://www.raisdorf.net/files/FreeBSD/
+PATCH_DIST_STRIP=   -p1
+PATCHFILES+=    winsnap-0.1.14.patch
 .endif
 
 MAINTAINER=	hendrik@scholz.net
@@ -50,7 +57,7 @@ MAN1=		fluxbox.1
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
-pre-everything::
+pre-everything:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Definable build options"
 	@${ECHO_CMD} "-----------------------"
@@ -63,6 +70,23 @@ pre-everything::
 .if !defined(WITH_REMEMBER)
 	@${ECHO_CMD} "WITH_REMEMBER	- Enable the unofficial remember patch"
 .endif
+.if !defined(WITH_WINSNAP)
+	@${ECHO_CMD} "WITH_WINSNAP	- Enable the unofficial window snapping patch"
+.endif
+	@${ECHO_CMD} ""
+
+post-install:
+.if defined(WITH_WINSNAP)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "The window snapping patch from Shawn Singh requires some"
+	@${ECHO_CMD} "changes to your ~/.fluxbox/init file:"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "    session.screen0.edgeSnapThreshold: 10"
+	@${ECHO_CMD} "    session.screen0.edgeResistThreshold: 10"
 	@${ECHO_CMD} ""
+	@${ECHO_CMD} "The values can be changed to mimic the behavior of Enlightenment:"
+	@${ECHO_CMD} "snap: 3, resist: 15"
+	@${ECHO_CMD} ""
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index 29a44f3..8b719ab 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,2 +1,3 @@
 MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
 MD5 (remember-0.1.14-4.gz) = 437e2edd16e57a1a9f113c5e1f936709
+MD5 (winsnap-0.1.14.patch) = 519a70da183a23ed88bab2f95ee07505
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 0076bd5f..dcb8b10 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.14
+PORTREVISION=   1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 .if defined(WITH_REMEMBER)
 PATCH_SITES=    http://www.bugfactory.org/~gav/fluxbox/
 PATCH_DIST_STRIP=   -p1
-PATCHFILES+=	remember-0.1.14-4.gz
+PATCHFILES=	remember-0.1.14-4.gz
+.endif
+
+.if defined(WITH_WINSNAP)
+PATCH_SITES+=   http://www.raisdorf.net/files/FreeBSD/
+PATCH_DIST_STRIP=   -p1
+PATCHFILES+=    winsnap-0.1.14.patch
 .endif
 
 MAINTAINER=	hendrik@scholz.net
@@ -50,7 +57,7 @@ MAN1=		fluxbox.1
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
-pre-everything::
+pre-everything:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Definable build options"
 	@${ECHO_CMD} "-----------------------"
@@ -63,6 +70,23 @@ pre-everything::
 .if !defined(WITH_REMEMBER)
 	@${ECHO_CMD} "WITH_REMEMBER	- Enable the unofficial remember patch"
 .endif
+.if !defined(WITH_WINSNAP)
+	@${ECHO_CMD} "WITH_WINSNAP	- Enable the unofficial window snapping patch"
+.endif
+	@${ECHO_CMD} ""
+
+post-install:
+.if defined(WITH_WINSNAP)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "The window snapping patch from Shawn Singh requires some"
+	@${ECHO_CMD} "changes to your ~/.fluxbox/init file:"
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "    session.screen0.edgeSnapThreshold: 10"
+	@${ECHO_CMD} "    session.screen0.edgeResistThreshold: 10"
 	@${ECHO_CMD} ""
+	@${ECHO_CMD} "The values can be changed to mimic the behavior of Enlightenment:"
+	@${ECHO_CMD} "snap: 3, resist: 15"
+	@${ECHO_CMD} ""
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 29a44f3..8b719ab 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1,2 +1,3 @@
 MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
 MD5 (remember-0.1.14-4.gz) = 437e2edd16e57a1a9f113c5e1f936709
+MD5 (winsnap-0.1.14.patch) = 519a70da183a23ed88bab2f95ee07505