Thu Feb 18 12:03:23 2010 UTC ()
Update scrotwm to 0.9.22 snapshot version.
Changes since last version are unknown.

pkgsrc changes:
 * Update HOMEPAGE and MASTER_SITES to new location.
 * Add dependency on x11/dmenu, using for menus
 * Honor package supplied Makefiles, fixes PR#42790.

Build and run tested with NetBSD-i386-5.0.2 with modular X, and
build tested with OpenBSD-i386-4.6 (not tested with Darwin).


(obache)
diff -r1.1.1.1 -r1.2 pkgsrc/wm/scrotwm/Makefile
diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/PLIST
diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/distinfo
diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/wm/scrotwm/patches/patch-ab
diff -r0 -r1.1 pkgsrc/wm/scrotwm/patches/patch-ac
cvs diff -r1.1.1.1 -r1.2 pkgsrc/wm/scrotwm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/scrotwm/Attic/Makefile 2009/02/21 15:15:29 1.1.1.1
+++ pkgsrc/wm/scrotwm/Attic/Makefile 2010/02/18 12:03:23 1.2
@@ -1,30 +1,50 @@ @@ -1,30 +1,50 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/02/21 15:15:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2010/02/18 12:03:23 obache Exp $
2# 2#
3 3
4DISTNAME= scrotwm-0.9.1 4DISTNAME= scrotwm-0.9.22
5CATEGORIES= wm 5CATEGORIES= wm
6MASTER_SITES= http://www.peereboom.us/scrotwm/snapshot/ 6MASTER_SITES= http://scrotwm.org/snapshot/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.peereboom.us/scrotwm/html/scrotwm.html 10HOMEPAGE= http://www.scrotwm.org/
11COMMENT= Small dynamic tiling window manager for X11 11COMMENT= Small dynamic tiling window manager for X11
12 12
 13DEPENDS+= dmenu-[0-9]*:../../x11/dmenu
 14
13BUILDLINK_TRANSFORM+= rm:-Werror 15BUILDLINK_TRANSFORM+= rm:-Werror
14PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
15 17
16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/scrotwm 18.include "../../mk/bsd.prefs.mk"
 19
 20.if ${OPSYS} == "OpenBSD"
 21USE_BSD_MAKEFILE= yes
 22INSTALLATION_DIRS+= bin lib ${PKGMANDIR}/man1
 23MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
 24MAKE_FLAGS+= MANINSTALL=maninstall
 25# sync with major.minor from ${WRKSRC}/lib/shlib_version.
 26CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\"
 27.else
 28USE_TOOLS+= gmake
 29CFLAGS+= -I${X11BASE}/include
 30LDFLAGS+= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 31MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
 32. if ${OPSYS} == "Darwin"
 33BUILD_DIRS= osx
 34. else
 35BUILD_DIRS= linux
 36. endif
 37.endif
17 38
18post-extract: 39INSTALLATION_DIRS+= share/examples/scrotwm
19 ${MV} ${WRKSRC}/linux/linux.c ${WRKSRC} 
20 40
21do-install: 41post-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/scrotwm ${DESTDIR}${PREFIX}/bin 
23 ${INSTALL_DATA} ${WRKSRC}/scrotwm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
24 ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/scrotwm 42 ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/scrotwm
25 ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/scrotwm 43 ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/scrotwm
26 44
27.include "../../x11/libX11/buildlink3.mk" 45.include "../../x11/libX11/buildlink3.mk"
 46BUILDLINK_DEPMETHOD.libXt= build
 47.include "../../x11/libXt/buildlink3.mk"
28.include "../../x11/libXrandr/buildlink3.mk" 48.include "../../x11/libXrandr/buildlink3.mk"
29.include "../../x11/xproto/buildlink3.mk" 49.include "../../x11/xproto/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/scrotwm/Attic/PLIST 2009/06/14 18:19:01 1.2
+++ pkgsrc/wm/scrotwm/Attic/PLIST 2010/02/18 12:03:23 1.3
@@ -1,7 +1,11 @@ @@ -1,7 +1,11 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:19:01 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/02/18 12:03:23 obache Exp $
2bin/scrotwm 2bin/scrotwm
 3lib/libswmhack.so.0.0
3man/man1/scrotwm.1 4man/man1/scrotwm.1
 5man/man1/scrotwm_es.1
 6man/man1/scrotwm_it.1
 7man/man1/scrotwm_ru.1
4share/examples/scrotwm/baraction.sh 8share/examples/scrotwm/baraction.sh
5share/examples/scrotwm/initscreen.sh 9share/examples/scrotwm/initscreen.sh
6share/examples/scrotwm/screenshot.sh 10share/examples/scrotwm/screenshot.sh
7share/examples/scrotwm/scrotwm.conf 11share/examples/scrotwm/scrotwm.conf
cvs diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/scrotwm/Attic/distinfo 2009/03/11 20:01:43 1.2
+++ pkgsrc/wm/scrotwm/Attic/distinfo 2010/02/18 12:03:23 1.3
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.2 2009/03/11 20:01:43 hasso Exp $ 1$NetBSD: distinfo,v 1.3 2010/02/18 12:03:23 obache Exp $
2 2
3SHA1 (scrotwm-0.9.1.tgz) = bc01e3be45274a1f439ae5ff910736c403ffbc96 3SHA1 (scrotwm-0.9.22.tgz) = 71bce198280bd329d3c32bd76e8f5e069fa3f1b9
4RMD160 (scrotwm-0.9.1.tgz) = e9d8af1cb077f6f5d9e2f50ffb8efa7177efae05 4RMD160 (scrotwm-0.9.22.tgz) = 1087432b9a95b4bc0e1d34acc33d6f19048ab540
5Size (scrotwm-0.9.1.tgz) = 31428 bytes 5Size (scrotwm-0.9.22.tgz) = 54396 bytes
6SHA1 (patch-aa) = 1f3eb5a0be03ea10105575397e26983622436008 6SHA1 (patch-aa) = 2e278b58d4f81793e3ba8b8a88ea28ac8969f99c
7SHA1 (patch-ab) = 58309fbcf514bcb3a9acd9b8b5028fb988e6dd8e 7SHA1 (patch-ab) = 0118d318dc7c223fda1150d53b8ef4e712c0ee2a
 8SHA1 (patch-ac) = 244dcbcb3f8fcc37db26646d086dd150c31c7277
cvs diff -r1.2 -r1.3 pkgsrc/wm/scrotwm/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/scrotwm/patches/Attic/patch-aa 2009/03/11 20:01:43 1.2
+++ pkgsrc/wm/scrotwm/patches/Attic/patch-aa 2010/02/18 12:03:23 1.3
@@ -1,25 +1,17 @@ @@ -1,25 +1,17 @@
1$NetBSD: patch-aa,v 1.2 2009/03/11 20:01:43 hasso Exp $ 1$NetBSD: patch-aa,v 1.3 2010/02/18 12:03:23 obache Exp $
2 2
3--- Makefile.orig 2009-02-18 22:40:10 +0200 3--- Makefile.orig 2010-01-11 21:02:08.000000000 +0000
4+++ Makefile 2009-03-11 21:33:20 +0200 4+++ Makefile
5@@ -1,13 +1,13 @@ 5@@ -1,5 +1,4 @@
6 # $scrotwm: Makefile,v 1.8 2009/01/24 17:57:26 mcbride Exp $ 6 # $scrotwm: Makefile,v 1.13 2009/10/25 00:32:33 marco Exp $
7-.include <bsd.xconf.mk> 7-.include <bsd.xconf.mk>
8  8
9 SUBDIR= lib 9 PREFIX?=/usr/local
10  10
11 PROG=scrotwm 11@@ -17,5 +16,5 @@ MANDIR= ${PREFIX}/man/cat
12+SRCS=scrotwm.c linux.c 
13 MAN=scrotwm.1 
14  12
15 CFLAGS+=-Wall -Wno-uninitialized -ggdb3 
16-CPPFLAGS+= -I${X11BASE}/include 
17+CPPFLAGS+= -I${X11BASE}/include -I./linux 
18 LDADD+=-lutil -L${X11BASE}/lib -lX11 -lXrandr 
19  
20 MANDIR= ${X11BASE}/man/cat 
21@@ -15,4 +15,3 @@ MANDIR= ${X11BASE}/man/cat 
22 obj: _xenocara_obj 13 obj: _xenocara_obj
23  14
 15+.include <bsd.subdir.mk>
24 .include <bsd.prog.mk> 16 .include <bsd.prog.mk>
25-.include <bsd.xorg.mk> 17-.include <bsd.xorg.mk>
cvs diff -r1.1.1.1 -r1.2 pkgsrc/wm/scrotwm/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/wm/scrotwm/patches/Attic/patch-ab 2009/02/21 15:15:29 1.1.1.1
+++ pkgsrc/wm/scrotwm/patches/Attic/patch-ab 2010/02/18 12:03:23 1.2
@@ -1,16 +1,21 @@ @@ -1,16 +1,21 @@
1$NetBSD: patch-ab,v 1.1.1.1 2009/02/21 15:15:29 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2010/02/18 12:03:23 obache Exp $
2 2
3--- lib/Makefile.orig 2009-02-18 20:40:29.000000000 +0000 3--- lib/Makefile.orig 2010-01-11 21:02:08.000000000 +0000
4+++ lib/Makefile 4+++ lib/Makefile
5@@ -1,6 +1,5 @@ 5@@ -1,7 +1,5 @@
6 # $scrotwm: Makefile,v 1.1 2009/01/24 17:57:26 mcbride Exp $ 6 # $scrotwm: Makefile,v 1.3 2009/10/02 19:23:48 marco Exp $
7  7
8-.include <bsd.xconf.mk> 8-.include <bsd.xconf.mk>
 9-
 10 PREFIX?=/usr/local
9  11
10 LIB= swmhack 12 LIB= swmhack
11 NOMAN= yes 13@@ -18,7 +16,6 @@ CFLAGS+= -I${X11BASE}/include
12@@ -19,4 +18,3 @@ install: 14 install:
13 ${X11BASE}/lib/swmhack.so 15 ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 16 lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 17- ${PREFIX}/lib/
 18+ ${DESTDIR}${PREFIX}/lib/
14  19
15 .include <bsd.lib.mk> 20 .include <bsd.lib.mk>
16-.include <bsd.xorg.mk> 21-.include <bsd.xorg.mk>
File Added: pkgsrc/wm/scrotwm/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2010/02/18 12:03:23 obache Exp $

--- linux/Makefile.orig	2010-01-11 21:02:08.000000000 +0000
+++ linux/Makefile
@@ -28,7 +28,7 @@ scrotwm: scrotwm.o linux.o
 	$(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
 
 libswmhack.so.$(LVERS): swm_hack.so
-	$(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
+	$(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDFLAGS) $(LDADD)
 
 install: all
 	install -m 755 -d $(DESTDIR)$(BINDIR)