ports/158236: [PATCH] cleanup and update to x11-wm/scrotwm

[Niclas Zeising]

>Number:         158236
>Category:       ports
>Synopsis:       [PATCH] cleanup and update to x11-wm/scrotwm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 23 21:00:26 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Niclas Zeising
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Wed Apr 20 17:22:47 CEST 2011 root at vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64


	
>Description:
	x11-wm/scrotwm is out of date (again). I also noticed that the makefile contained a stale master_site and that the global configuration file is erased regardless of any changes in it.
>How-To-Repeat:
	
>Fix:

	Attached patch updates scrotwm to latest version, removes stale master_site and makes installation and deleteion of etc/scrotwm.conf dependent on wether it exists and if it contains changes, as to not overwrite user made changes. It also installes an example screenshot script into share/example/scrotwm/.

--- x11-wm.scrotwm.update.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/Makefile,v
retrieving revision 1.8
diff -u -d -r1.8 Makefile
--- Makefile	23 Jun 2011 10:19:03 -0000	1.8
+++ Makefile	23 Jun 2011 20:48:33 -0000
@@ -6,10 +6,10 @@
 #
 
 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 at phat.za.net
@@ -21,10 +21,8 @@
 .include <bsd.port.pre.mk>
 
 USE_XORG=	x11 xproto xrandr
-USE_XLIB=	yes
 
 MAN1=		scrotwm.1
-PLIST_FILES=	bin/scrotwm bin/startscrotwm lib/libswmhack.so etc/scrotwm.conf
 USE_LDCONFIG=yes
 
 .if defined(WITH_DMENU)
@@ -34,6 +32,9 @@
 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 +43,15 @@
 		-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>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-wm/scrotwm/distinfo,v
retrieving revision 1.8
diff -u -d -r1.8 distinfo
--- distinfo	23 Jun 2011 10:19:03 -0000	1.8
+++ distinfo	23 Jun 2011 20:48:33 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-plist	23 Jun 2011 20:48:33 -0000
@@ -0,0 +1,8 @@
+bin/scrotwm
+bin/startscrotwm
+lib/libswmhack.so
+%%EXAMPLESDIR%%/screenshot.sh
+ at 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
+ at exec [ -f %D/etc/scrotwm.conf ] || cp -p %D/%F %D/etc/scrotwm.conf
+ at dirrm %%EXAMPLESDIR%%
--- x11-wm.scrotwm.update.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: