diff options
Diffstat (limited to 'x11-wm/spectrwm')
| -rw-r--r-- | x11-wm/spectrwm/Makefile | 14 | ||||
| -rw-r--r-- | x11-wm/spectrwm/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/spectrwm/files/startscrotwm | 10 |
3 files changed, 20 insertions, 10 deletions
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile index f6d1dc6acc1d..9c1dd174a1e7 100644 --- a/x11-wm/spectrwm/Makefile +++ b/x11-wm/spectrwm/Makefile @@ -6,11 +6,10 @@ # PORTNAME= scrotwm -PORTVERSION= 0.9.19 +PORTVERSION= 0.9.22 CATEGORIES= x11-wm -MASTER_SITES= http://www.peereboom.us/scrotwm/snapshot/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= dhn +MASTER_SITES= http://scrotwm.org/snapshot/ \ + http://www.peereboom.us/scrotwm/snapshot/ EXTRACT_SUFX= .tgz MAINTAINER= aragon@phat.za.net @@ -26,10 +25,10 @@ USE_XORG= x11 xproto xrandr 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 +RUN_DEPENDS+= dmenu:${PORTSDIR}/x11/dmenu .endif .if defined(WITH_DMENU_BOTTOM) EXTRA_PATCHES+= ${FILESDIR}/spawn_menu_atbottom.patch @@ -39,7 +38,7 @@ EXTRA_PATCHES+= ${FILESDIR}/clock_format.patch .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 +46,7 @@ do-build: 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 --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo index ac3399ac5aa1..8f033459fa0a 100644 --- a/x11-wm/spectrwm/distinfo +++ b/x11-wm/spectrwm/distinfo @@ -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 --git a/x11-wm/spectrwm/files/startscrotwm b/x11-wm/spectrwm/files/startscrotwm new file mode 100644 index 000000000000..34721b34da5b --- /dev/null +++ b/x11-wm/spectrwm/files/startscrotwm @@ -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 |