From dd3c1972ee194d4beaa39c21c10dc77dd46c979c Mon Sep 17 00:00:00 2001 From: pea Date: Wed, 5 Nov 2008 13:36:41 +0000 Subject: [PATCH] Upgrade to 1.3.1 Initial diff by me with tweaks by landry@ and ajacoutot@ OK landry@ ajacoutot@ --- x11/slim/Makefile | 17 +++++++---------- x11/slim/distinfo | 15 +++++---------- x11/slim/files/README.OpenBSD | 10 +++++----- x11/slim/patches/patch-slim_1 | 12 ++++++++++++ x11/slim/patches/patch-slim_conf | 25 +++++++++++++------------ x11/slim/pkg/PLIST | 4 ++-- 6 files changed, 44 insertions(+), 39 deletions(-) create mode 100644 x11/slim/patches/patch-slim_1 diff --git a/x11/slim/Makefile b/x11/slim/Makefile index b305b7af3d6..594d4730546 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:38 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2008/11/05 13:36:41 pea Exp $ COMMENT= simple login manager -DISTNAME= slim-1.3.0 -PKGNAME= ${DISTNAME}p1 +DISTNAME= slim-1.3.1 CATEGORIES= x11 HOMEPAGE= http://slim.berlios.de/ @@ -30,15 +29,13 @@ FAKE_FLAGS+= PREFIX=${PREFIX} \ CFGDIR=${PREFIX}/share/examples/slim pre-configure: - perl -pi -e 's!/usr/!${PREFIX}/!' ${WRKSRC}/slim.1 - perl -pi -e 's!%%X11BASE%%!${X11BASE}!' ${WRKSRC}/slim.conf - perl -pi -e 's!%%LOCALBASE%%!${LOCALBASE}!' ${WRKSRC}/slim.conf + ${SUBST_CMD} ${WRKSRC}/slim.1 ${WRKSRC}/slim.conf post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/slim - @sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \ - -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \ - < ${FILESDIR}/README.OpenBSD \ - > ${PREFIX}/share/doc/slim/README.OpenBSD + ${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \ + ${PREFIX}/share/doc/slim/README.OpenBSD + chown ${SHAREOWN}:${SHAREGRP} \ + ${PREFIX}/share/doc/slim/README.OpenBSD .include diff --git a/x11/slim/distinfo b/x11/slim/distinfo index 5227deacdc1..1943ea8cf0c 100644 --- a/x11/slim/distinfo +++ b/x11/slim/distinfo @@ -1,10 +1,5 @@ -MD5 (slim-1.2.3-themepack1a.tar.gz) = /RKV06JghJeQ3BcIHaSjTw== -MD5 (slim-1.3.0.tar.gz) = HBqH88vTwzTIdFheQnAZYQ== -RMD160 (slim-1.2.3-themepack1a.tar.gz) = k67+R9QurLk/sO5SwhnU7Ooyt+c= -RMD160 (slim-1.3.0.tar.gz) = gCBdjnV8dvnA4hJj7DhiT2BdlYY= -SHA1 (slim-1.2.3-themepack1a.tar.gz) = 0B5A/OpAgpC3bTUlWvNO7txBhBg= -SHA1 (slim-1.3.0.tar.gz) = 8n9AxzovdX8a4yFVvwQ4yXviwBk= -SHA256 (slim-1.2.3-themepack1a.tar.gz) = JEtzJhV+7pRzSM5LSKHWJYdgCv+t7ZvErUGZotbxgls= -SHA256 (slim-1.3.0.tar.gz) = s8tzbOVnFG6b214IH86V1Oxp1kzMMNAE6SGCO1TETps= -SIZE (slim-1.2.3-themepack1a.tar.gz) = 1919561 -SIZE (slim-1.3.0.tar.gz) = 218646 +MD5 (slim-1.3.1.tar.gz) = cn0KyyTA+/B1ETTDepyJXw== +RMD160 (slim-1.3.1.tar.gz) = 3Ax8clffqMK+5H/6Xsjd8X/Tj3A= +SHA1 (slim-1.3.1.tar.gz) = MBUrKAck2vdSmajuFlhQQfJT7U8= +SHA256 (slim-1.3.1.tar.gz) = rNekAkv9fCpPPNXXf/7UlW0TcnqPVUBCEm0FaN7+D3c= +SIZE (slim-1.3.1.tar.gz) = 219446 diff --git a/x11/slim/files/README.OpenBSD b/x11/slim/files/README.OpenBSD index 79ef42cbabd..28f37c33042 100644 --- a/x11/slim/files/README.OpenBSD +++ b/x11/slim/files/README.OpenBSD @@ -1,18 +1,18 @@ -$OpenBSD: README.OpenBSD,v 1.2 2007/10/25 09:30:13 landry Exp $ +$OpenBSD: README.OpenBSD,v 1.3 2008/11/05 13:36:41 pea Exp $ Slim can be started at boot time by adding the following to /etc/rc.local: -if [ -x !!PREFIX!!/bin/slim ]; then - echo -n ' slim'; ( sleep 5; !!PREFIX!!/bin/slim -d ) & +if [ -x ${TRUEPREFIX}/bin/slim ]; then + echo -n ' slim'; ( sleep 5; ${TRUEPREFIX}/bin/slim -d ) & fi The sleep 5 is here to be sure tty flags are correctly set, you can try -to directly run !!PREFIX!!/bin/slim -d instead. +to directly run ${TRUEPREFIX}/bin/slim -d instead. On i386, amd64 and VGA-based alpha, slim is launched on vt05 like xdm. If you're on a zaurus you'll have to change this setting to vt01 in -!!SYSCONFDIR!!/slim.conf. +${SYSCONFDIR}/slim.conf. If you're on an arch which doesn't handle virtual terminals (like macppc, sparc, sparc64, TGA-based alpha, hp300 or vax), you will have to diff --git a/x11/slim/patches/patch-slim_1 b/x11/slim/patches/patch-slim_1 new file mode 100644 index 00000000000..cdcdbc5b206 --- /dev/null +++ b/x11/slim/patches/patch-slim_1 @@ -0,0 +1,12 @@ +$OpenBSD: patch-slim_1,v 1.1 2008/11/05 13:36:41 pea Exp $ +--- slim.1.orig Tue Nov 4 13:50:39 2008 ++++ slim.1 Tue Nov 4 13:50:58 2008 +@@ -37,7 +37,7 @@ display version information + run \fBslim\fP in daemon mode + .TP + .B +-\fBslim\fP \fB-p\fP /usr/share/\fBslim\fP/themes/default ++\fBslim\fP \fB-p\fP ${PREFIX}/share/\fBslim\fP/themes/default + preview of the default theme + .SH STARTING SLIM AT BOOT + Please refer to documentation of your Operating System to make \fBslim\fP diff --git a/x11/slim/patches/patch-slim_conf b/x11/slim/patches/patch-slim_conf index 10ecc9f7816..32caf0b120a 100644 --- a/x11/slim/patches/patch-slim_conf +++ b/x11/slim/patches/patch-slim_conf @@ -1,26 +1,27 @@ -$OpenBSD: patch-slim_conf,v 1.2 2007/12/30 10:46:49 landry Exp $ ---- slim.conf.orig Wed Oct 24 17:03:14 2007 -+++ slim.conf Wed Oct 24 17:06:03 2007 -@@ -1,13 +1,13 @@ +$OpenBSD: patch-slim_conf,v 1.3 2008/11/05 13:36:41 pea Exp $ +--- slim.conf.orig Fri Sep 26 02:54:15 2008 ++++ slim.conf Mon Nov 3 22:14:42 2008 +@@ -1,13 +1,14 @@ # Path, X server and arguments (if needed) # Note: -xauth $authfile is automatically appended --default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --default_xserver /usr/X11R6/bin/X +-default_path ./:/bin:/usr/bin:/usr/local/bin +-default_xserver /usr/bin/X -#xserver_arguments -dpi 75 -+default_path ./:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin -+default_xserver %%X11BASE%%/bin/X ++default_path ./:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin ++default_xserver ${X11BASE}/bin/X +xserver_arguments vt05 ++ # Commands for halt, login, etc. -halt_cmd /sbin/shutdown -h now +halt_cmd /sbin/shutdown -ph now reboot_cmd /sbin/shutdown -r now --console_cmd /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" -+console_cmd %%X11BASE%%/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/usr/bin/head -1 /etc/motd; exec /usr/bin/login" +-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" ++console_cmd ${X11BASE}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/usr/bin/head -1 /etc/motd; exec /usr/bin/login" #suspend_cmd /usr/sbin/suspend # Full path to the xauth binary -@@ -32,8 +32,8 @@ authfile /var/run/slim.auth +@@ -32,8 +33,8 @@ authfile /var/run/slim.auth # NOTE: if your system does not have bash you need # to adjust the command according to your preferred shell, # i.e. for freebsd use: @@ -31,7 +32,7 @@ $OpenBSD: patch-slim_conf,v 1.2 2007/12/30 10:46:49 landry Exp $ # Commands executed when starting and exiting a session. # They can be used for registering a X11 session with -@@ -72,7 +72,7 @@ reboot_msg The system is rebooting... +@@ -84,7 +85,7 @@ reboot_msg The system is rebooting... current_theme default # Lock file diff --git a/x11/slim/pkg/PLIST b/x11/slim/pkg/PLIST index ce7c2113e0c..bbbb382c832 100644 --- a/x11/slim/pkg/PLIST +++ b/x11/slim/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.1 2007/10/25 09:30:13 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/11/05 13:36:41 pea Exp $ @pkgpath x11/slim,-main -bin/slim +@bin bin/slim @man man/man1/slim.1 share/doc/slim/ share/doc/slim/README.OpenBSD