From 1947e8c722806056da6bb93e02efb1595840f0df Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 18 Feb 2010 12:03:23 +0000 Subject: 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). --- wm/scrotwm/Makefile | 40 ++++++++++++++++++++++++++++++---------- wm/scrotwm/PLIST | 6 +++++- wm/scrotwm/distinfo | 13 +++++++------ wm/scrotwm/patches/patch-aa | 24 ++++++++---------------- wm/scrotwm/patches/patch-ab | 19 ++++++++++++------- wm/scrotwm/patches/patch-ac | 13 +++++++++++++ 6 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 wm/scrotwm/patches/patch-ac (limited to 'wm') diff --git a/wm/scrotwm/Makefile b/wm/scrotwm/Makefile index 26e1a006f2a..7c6044df1b4 100644 --- a/wm/scrotwm/Makefile +++ b/wm/scrotwm/Makefile @@ -1,30 +1,50 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/02/21 15:15:29 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/18 12:03:23 obache Exp $ # -DISTNAME= scrotwm-0.9.1 +DISTNAME= scrotwm-0.9.22 CATEGORIES= wm -MASTER_SITES= http://www.peereboom.us/scrotwm/snapshot/ +MASTER_SITES= http://scrotwm.org/snapshot/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.peereboom.us/scrotwm/html/scrotwm.html +HOMEPAGE= http://www.scrotwm.org/ COMMENT= Small dynamic tiling window manager for X11 +DEPENDS+= dmenu-[0-9]*:../../x11/dmenu + BUILDLINK_TRANSFORM+= rm:-Werror PKG_DESTDIR_SUPPORT= user-destdir -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/scrotwm +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "OpenBSD" +USE_BSD_MAKEFILE= yes +INSTALLATION_DIRS+= bin lib ${PKGMANDIR}/man1 +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} +MAKE_FLAGS+= MANINSTALL=maninstall +# sync with major.minor from ${WRKSRC}/lib/shlib_version. +CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\" +.else +USE_TOOLS+= gmake +CFLAGS+= -I${X11BASE}/include +LDFLAGS+= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} +. if ${OPSYS} == "Darwin" +BUILD_DIRS= osx +. else +BUILD_DIRS= linux +. endif +.endif -post-extract: - ${MV} ${WRKSRC}/linux/linux.c ${WRKSRC} +INSTALLATION_DIRS+= share/examples/scrotwm -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/scrotwm ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/scrotwm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +post-install: ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/scrotwm ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/scrotwm .include "../../x11/libX11/buildlink3.mk" +BUILDLINK_DEPMETHOD.libXt= build +.include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/scrotwm/PLIST b/wm/scrotwm/PLIST index 93ee82c3d49..d8a5d4be65a 100644 --- a/wm/scrotwm/PLIST +++ b/wm/scrotwm/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:19:01 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2010/02/18 12:03:23 obache Exp $ bin/scrotwm +lib/libswmhack.so.0.0 man/man1/scrotwm.1 +man/man1/scrotwm_es.1 +man/man1/scrotwm_it.1 +man/man1/scrotwm_ru.1 share/examples/scrotwm/baraction.sh share/examples/scrotwm/initscreen.sh share/examples/scrotwm/screenshot.sh diff --git a/wm/scrotwm/distinfo b/wm/scrotwm/distinfo index 6b17493f09b..416c9e447ef 100644 --- a/wm/scrotwm/distinfo +++ b/wm/scrotwm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2009/03/11 20:01:43 hasso Exp $ +$NetBSD: distinfo,v 1.3 2010/02/18 12:03:23 obache Exp $ -SHA1 (scrotwm-0.9.1.tgz) = bc01e3be45274a1f439ae5ff910736c403ffbc96 -RMD160 (scrotwm-0.9.1.tgz) = e9d8af1cb077f6f5d9e2f50ffb8efa7177efae05 -Size (scrotwm-0.9.1.tgz) = 31428 bytes -SHA1 (patch-aa) = 1f3eb5a0be03ea10105575397e26983622436008 -SHA1 (patch-ab) = 58309fbcf514bcb3a9acd9b8b5028fb988e6dd8e +SHA1 (scrotwm-0.9.22.tgz) = 71bce198280bd329d3c32bd76e8f5e069fa3f1b9 +RMD160 (scrotwm-0.9.22.tgz) = 1087432b9a95b4bc0e1d34acc33d6f19048ab540 +Size (scrotwm-0.9.22.tgz) = 54396 bytes +SHA1 (patch-aa) = 2e278b58d4f81793e3ba8b8a88ea28ac8969f99c +SHA1 (patch-ab) = 0118d318dc7c223fda1150d53b8ef4e712c0ee2a +SHA1 (patch-ac) = 244dcbcb3f8fcc37db26646d086dd150c31c7277 diff --git a/wm/scrotwm/patches/patch-aa b/wm/scrotwm/patches/patch-aa index 18c4132b8f5..12e3336d77e 100644 --- a/wm/scrotwm/patches/patch-aa +++ b/wm/scrotwm/patches/patch-aa @@ -1,25 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2009/03/11 20:01:43 hasso Exp $ +$NetBSD: patch-aa,v 1.3 2010/02/18 12:03:23 obache Exp $ ---- Makefile.orig 2009-02-18 22:40:10 +0200 -+++ Makefile 2009-03-11 21:33:20 +0200 -@@ -1,13 +1,13 @@ - # $scrotwm: Makefile,v 1.8 2009/01/24 17:57:26 mcbride Exp $ +--- Makefile.orig 2010-01-11 21:02:08.000000000 +0000 ++++ Makefile +@@ -1,5 +1,4 @@ + # $scrotwm: Makefile,v 1.13 2009/10/25 00:32:33 marco Exp $ -.include - SUBDIR= lib + PREFIX?=/usr/local - PROG=scrotwm -+SRCS=scrotwm.c linux.c - MAN=scrotwm.1 +@@ -17,5 +16,5 @@ MANDIR= ${PREFIX}/man/cat - CFLAGS+=-Wall -Wno-uninitialized -ggdb3 --CPPFLAGS+= -I${X11BASE}/include -+CPPFLAGS+= -I${X11BASE}/include -I./linux - LDADD+=-lutil -L${X11BASE}/lib -lX11 -lXrandr - - MANDIR= ${X11BASE}/man/cat -@@ -15,4 +15,3 @@ MANDIR= ${X11BASE}/man/cat obj: _xenocara_obj ++.include .include -.include diff --git a/wm/scrotwm/patches/patch-ab b/wm/scrotwm/patches/patch-ab index 6f512eb3428..cbba668cbbb 100644 --- a/wm/scrotwm/patches/patch-ab +++ b/wm/scrotwm/patches/patch-ab @@ -1,16 +1,21 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/02/21 15:15:29 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/18 12:03:23 obache Exp $ ---- lib/Makefile.orig 2009-02-18 20:40:29.000000000 +0000 +--- lib/Makefile.orig 2010-01-11 21:02:08.000000000 +0000 +++ lib/Makefile -@@ -1,6 +1,5 @@ - # $scrotwm: Makefile,v 1.1 2009/01/24 17:57:26 mcbride Exp $ +@@ -1,7 +1,5 @@ + # $scrotwm: Makefile,v 1.3 2009/10/02 19:23:48 marco Exp $ -.include +- + PREFIX?=/usr/local LIB= swmhack - NOMAN= yes -@@ -19,4 +18,3 @@ install: - ${X11BASE}/lib/swmhack.so +@@ -18,7 +16,6 @@ CFLAGS+= -I${X11BASE}/include + install: + ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +- ${PREFIX}/lib/ ++ ${DESTDIR}${PREFIX}/lib/ .include -.include diff --git a/wm/scrotwm/patches/patch-ac b/wm/scrotwm/patches/patch-ac new file mode 100644 index 00000000000..d091c3f61ba --- /dev/null +++ b/wm/scrotwm/patches/patch-ac @@ -0,0 +1,13 @@ +$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) -- cgit v1.2.3