Date: Tue, 13 Apr 2010 22:54:59 +0200 From: "Aragon Gouveia" <aragon@aragon.homeip.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/145680: [patch] x11-wm/scrotwm version upgrade Message-ID: <20100413205459.D45353982E@mail.geek.sh> Resent-Message-ID: <201004132120.o3DLK508046955@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145680 >Category: ports >Synopsis: [patch] x11-wm/scrotwm version upgrade >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 13 21:20:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Aragon Gouveia >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD igor.geek.sh 8.0-STABLE FreeBSD 8.0-STABLE #0: Mon Mar 8 01:27:41 SAST 2010 toor@igor.geek.sh:/usr/obj/usr/src/sys/IGOR amd64 >Description: Attached patch updates x11-wm/scrotwm to latest version. >How-To-Repeat: >Fix: --- scrotwm-0.9.22.txt begins here --- diff -uNr scrotwm.old/Makefile scrotwm/Makefile --- scrotwm.old/Makefile 2010-04-05 22:17:30.000000000 +0200 +++ scrotwm/Makefile 2010-04-05 23:00:34.000000000 +0200 @@ -6,9 +6,10 @@ # PORTNAME= scrotwm -PORTVERSION= 0.9.19 +PORTVERSION= 0.9.22 CATEGORIES= x11-wm -MASTER_SITES= http://www.peereboom.us/scrotwm/snapshot/ \ +MASTER_SITES= http://scrotwm.org/snapshot/ \ + http://www.peereboom.us/scrotwm/snapshot/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dhn EXTRACT_SUFX= .tgz @@ -26,7 +27,7 @@ USE_XLIB= yes MAN1= scrotwm.1 -PLIST_FILES= bin/scrotwm lib/libswmhack.so etc/scrotwm.conf +PLIST_FILES= bin/scrotwm bin/startscrotwm lib/libswmhack.so etc/scrotwm.conf .if defined(WITH_DMENU) RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu @@ -39,7 +40,7 @@ .endif do-build: - ${CC} ${CFLAGS} -I${X11BASE}/include -DSWM_DEBUG \ + ${CC} ${CFLAGS} -I${X11BASE}/include \ -I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr \ -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c ${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \ @@ -47,6 +48,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${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 diff -uNr scrotwm.old/distinfo scrotwm/distinfo --- scrotwm.old/distinfo 2010-04-05 22:17:30.000000000 +0200 +++ scrotwm/distinfo 2010-04-05 22:20:27.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (scrotwm-0.9.19.tgz) = a7af5038fac7e42e8d8cf5ed2d4a6da2 -SHA256 (scrotwm-0.9.19.tgz) = ea150eac5fe71f6e5c6284bfb9b96d94f0c1e05b3998d124218de84f1c49aee1 -SIZE (scrotwm-0.9.19.tgz) = 48706 +MD5 (scrotwm-0.9.22.tgz) = bc66c66d300b3176c119bfdae43b6a42 +SHA256 (scrotwm-0.9.22.tgz) = a3952d6a27f0c08dac05cb28226d70e611a8051cdc2735f04e7d64f122fb2943 +SIZE (scrotwm-0.9.22.tgz) = 54396 diff -uNr scrotwm.old/files/startscrotwm scrotwm/files/startscrotwm --- scrotwm.old/files/startscrotwm 1970-01-01 02:00:00.000000000 +0200 +++ scrotwm/files/startscrotwm 2010-04-05 22:53:31.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -z "${DISPLAY}" ] +then + echo "$0: Starting X server" + exec xinit $( which scrotwm ) +else + echo "$0: X server already running on display ${DISPLAY}" + $( which scrotwm ) +fi --- scrotwm-0.9.22.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100413205459.D45353982E>