- Update to 0.9.32

PR:		ports/158236
Submitted by:	Aragon Gouveia <aragon@phat.za.net> (maintainer)

8 files changed, 72 insertions, 34 deletions

diff --git a/x11-wm/scrotwm/Makefile b/x11-wm/scrotwm/Makefile
index a7eee98fa550..a866753d011e 100644
--- a/x11-wm/scrotwm/Makefile
+++ b/x11-wm/scrotwm/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	scrotwm
-PORTVERSION=	0.9.31
+PORTVERSION=	0.9.32
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://opensource.conformal.com/snapshots/scrotwm/ \
-		http://scrotwm.org/snapshot/
+MASTER_SITES=	http://opensource.conformal.com/snapshots/scrotwm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aragon@phat.za.net
@@ -20,11 +19,9 @@ OPTIONS=	DMENU "Depend on x11/dmenu" Off \
 
 .include <bsd.port.pre.mk>
 
-USE_XORG=	x11 xproto xrandr
-USE_XLIB=	yes
+USE_XORG=	x11 xproto xrandr xt
 
 MAN1=		scrotwm.1
-PLIST_FILES=	bin/scrotwm bin/startscrotwm lib/libswmhack.so etc/scrotwm.conf
 USE_LDCONFIG=yes
 
 .if defined(WITH_DMENU)
@@ -34,6 +31,9 @@ RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
+
 do-build:
 	${CC} ${CFLAGS} -I${X11BASE}/include \
 		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr \
@@ -42,13 +42,15 @@ do-build:
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc/scrotwm.conf.sample
+	@if [ ! -f ${PREFIX}/etc/scrotwm.conf ]; then \
+		${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
+	fi
 	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libswmhack.so ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${PREFIX}/man/man1
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
+	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/scrotwm/distinfo b/x11-wm/scrotwm/distinfo
index bd3aa4080709..37c17668bc47 100644
--- a/x11-wm/scrotwm/distinfo
+++ b/x11-wm/scrotwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scrotwm-0.9.31.tgz) = c2a3b4438e68ec88aa5a347756ed8f447f1a8d2c8dd0bec47f006e36dd45327a
-SIZE (scrotwm-0.9.31.tgz) = 66834
+SHA256 (scrotwm-0.9.32.tgz) = cdcd647484ab6a266d0372fbf20b3c20e143556ac0cc32335740c08f22789871
+SIZE (scrotwm-0.9.32.tgz) = 66951
diff --git a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch b/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
index 1bd35a69603e..6189ba919ef2 100644
--- a/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
+++ b/x11-wm/scrotwm/files/spawn_menu_atbottom.patch
@@ -1,6 +1,15 @@
---- scrotwm.c.orig	2009-10-24 07:10:36.000000000 +0200
-+++ scrotwm.c	2009-10-24 07:11:10.000000000 +0200
-@@ -2812,7 +2812,8 @@
+--- scrotwm.c.orig	2011-07-01 12:27:56.000000000 +0200
++++ scrotwm.c	2011-07-01 12:29:49.000000000 +0200
+@@ -3891,14 +3891,16 @@
+ 					" -nb $bar_color"
+ 					" -nf $bar_font_color"
+ 					" -sb $bar_border"
+-					" -sf $bar_color",	0);
++					" -sf $bar_color"
++					" -b",	0);
+ 	setconfspawn("uniconify",	"dmenu"
+ 					" -i"
+ 					" -fn $bar_font"
  					" -nb $bar_color"
  					" -nf $bar_font_color"
  					" -sb $bar_border"
diff --git a/x11-wm/scrotwm/pkg-plist b/x11-wm/scrotwm/pkg-plist
new file mode 100644
index 000000000000..cb8ebbdfbeac
--- /dev/null
+++ b/x11-wm/scrotwm/pkg-plist
@@ -0,0 +1,8 @@
+bin/scrotwm
+bin/startscrotwm
+lib/libswmhack.so
+%%EXAMPLESDIR%%/screenshot.sh
+@unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi
+etc/scrotwm.conf.sample
+@exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
+@dirrm %%EXAMPLESDIR%%
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index a7eee98fa550..a866753d011e 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	scrotwm
-PORTVERSION=	0.9.31
+PORTVERSION=	0.9.32
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://opensource.conformal.com/snapshots/scrotwm/ \
-		http://scrotwm.org/snapshot/
+MASTER_SITES=	http://opensource.conformal.com/snapshots/scrotwm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aragon@phat.za.net
@@ -20,11 +19,9 @@ OPTIONS=	DMENU "Depend on x11/dmenu" Off \
 
 .include <bsd.port.pre.mk>
 
-USE_XORG=	x11 xproto xrandr
-USE_XLIB=	yes
+USE_XORG=	x11 xproto xrandr xt
 
 MAN1=		scrotwm.1
-PLIST_FILES=	bin/scrotwm bin/startscrotwm lib/libswmhack.so etc/scrotwm.conf
 USE_LDCONFIG=yes
 
 .if defined(WITH_DMENU)
@@ -34,6 +31,9 @@ RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
+
 do-build:
 	${CC} ${CFLAGS} -I${X11BASE}/include \
 		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr \
@@ -42,13 +42,15 @@ do-build:
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc/scrotwm.conf.sample
+	@if [ ! -f ${PREFIX}/etc/scrotwm.conf ]; then \
+		${CP} -p ${PREFIX}/etc/scrotwm.conf.sample ${PREFIX}/etc/scrotwm.conf ; \
+	fi
 	${INSTALL_SCRIPT} ${FILESDIR}/startscrotwm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libswmhack.so ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/scrotwm.conf ${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/scrotwm.1 ${PREFIX}/man/man1
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
+	${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${EXAMPLESDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index bd3aa4080709..37c17668bc47 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scrotwm-0.9.31.tgz) = c2a3b4438e68ec88aa5a347756ed8f447f1a8d2c8dd0bec47f006e36dd45327a
-SIZE (scrotwm-0.9.31.tgz) = 66834
+SHA256 (scrotwm-0.9.32.tgz) = cdcd647484ab6a266d0372fbf20b3c20e143556ac0cc32335740c08f22789871
+SIZE (scrotwm-0.9.32.tgz) = 66951
diff --git a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
index 1bd35a69603e..6189ba919ef2 100644
--- a/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
+++ b/x11-wm/spectrwm/files/spawn_menu_atbottom.patch
@@ -1,6 +1,15 @@
---- scrotwm.c.orig	2009-10-24 07:10:36.000000000 +0200
-+++ scrotwm.c	2009-10-24 07:11:10.000000000 +0200
-@@ -2812,7 +2812,8 @@
+--- scrotwm.c.orig	2011-07-01 12:27:56.000000000 +0200
++++ scrotwm.c	2011-07-01 12:29:49.000000000 +0200
+@@ -3891,14 +3891,16 @@
+ 					" -nb $bar_color"
+ 					" -nf $bar_font_color"
+ 					" -sb $bar_border"
+-					" -sf $bar_color",	0);
++					" -sf $bar_color"
++					" -b",	0);
+ 	setconfspawn("uniconify",	"dmenu"
+ 					" -i"
+ 					" -fn $bar_font"
  					" -nb $bar_color"
  					" -nf $bar_font_color"
  					" -sb $bar_border"
diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist
new file mode 100644
index 000000000000..cb8ebbdfbeac
--- /dev/null
+++ b/x11-wm/spectrwm/pkg-plist
@@ -0,0 +1,8 @@
+bin/scrotwm
+bin/startscrotwm
+lib/libswmhack.so
+%%EXAMPLESDIR%%/screenshot.sh
+@unexec if [ ! -f %D/etc/scrotwm.conf ] || cmp -s %D/etc/scrotwm.conf.sample %D/etc/scrotwm.conf; then rm -f %D/etc/scrotwm.conf; else echo %%PREFIX%%/etc/scrotwm.conf contains changes, remove it manually to delete this package completely.; fi
+etc/scrotwm.conf.sample
+@exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
+@dirrm %%EXAMPLESDIR%%