On Mon, Mar 19, 2007 at 12:29:00AM +0100, Joachim Schipper wrote:
> Therefore, I propose the patch at the end.
There's more fuckup, like DEBUG not woking.
> diff -Nurd slim.old/pkg/PLIST slim/pkg/PLIST
> --- slim.old/pkg/PLIST Mon Mar 19 00:26:15 2007
> +++ slim/pkg/PLIST Mon Mar 19 00:13:34 2007
> @@ -1,11 +1,11 @@
> @comment $OpenBSD$
> -bin/${BASE_PKGPATH}
> [EMAIL PROTECTED] man/man1/${BASE_PKGPATH}.1
[...]
I really don't know where this come from. Either Tom has some
seriously broken ports infrastructure or something else went wrong.
Anyway, here's my (unfinished) attempt to make this a usable port:
(this is work in progress). The sample configuration file still is
insane.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# slim/pkg/PLIST
# slim/pkg/MESSAGE
# slim/pkg/DESCR
# slim/Makefile
# slim/distinfo
# slim/patches/patch-Makefile_openbsd
# slim/patches/patch-slim_conf
#
echo x - slim/pkg/PLIST
sed 's/^X//' >slim/pkg/PLIST << 'END-of-slim/pkg/PLIST'
[EMAIL PROTECTED] $OpenBSD$
Xbin/slim
[EMAIL PROTECTED] man/man1/slim.1
Xshare/examples/slim/
Xshare/examples/slim/slim.conf
Xshare/slim/
Xshare/slim/themes/
Xshare/slim/themes/default/
Xshare/slim/themes/default/background.jpg
Xshare/slim/themes/default/panel.png
Xshare/slim/themes/default/slim.theme
END-of-slim/pkg/PLIST
echo x - slim/pkg/MESSAGE
sed 's/^X//' >slim/pkg/MESSAGE << 'END-of-slim/pkg/MESSAGE'
XAn example slim.conf can be found in ${PREFIX}/share/examples/slim
Xconfigure this to your needs and copy it to ${SYSCONFDIR}.
X
Xslim can be started at boot time by adding the following to
X${SYSCONFDIR}/rc.local
X
Xif [ -x ${PREFIX}/local/bin/slim ]; then
X echo -n ' slim'; ${PREFIX}/bin/slim -d
Xfi
X
END-of-slim/pkg/MESSAGE
echo x - slim/pkg/DESCR
sed 's/^X//' >slim/pkg/DESCR << 'END-of-slim/pkg/DESCR'
X SLiM is a Desktop-independent graphical login manager for X11,
X derived from Login.app.
X
XIt aims to be light and simple, although completely configurable
Xthrough themes and an option file; is suitable for machines on which
Xremote login functionalities are not needed.
END-of-slim/pkg/DESCR
echo x - slim/Makefile
sed 's/^X//' >slim/Makefile << 'END-of-slim/Makefile'
X# $OpenBSD$
X
XCOMMENT= "simple login manager"
X
XDISTNAME= slim-1.2.6
XCATEGORIES= x11
XHOMEPAGE= http://slim.berlios.de/
X
XMAINTAINER= Tom Doherty <[EMAIL PROTECTED]>
X
X# GPL
XPERMIT_PACKAGE_CDROM= Yes
XPERMIT_PACKAGE_FTP= Yes
XPERMIT_DISTFILES_CDROM= Yes
XPERMIT_DISTFILES_FTP= Yes
XWANTLIB= X11 Xft Xmu c m stdc++ z freetype
X
XMASTER_SITES= ${MASTER_SITE_BERLIOS:=slim/}
X
XLIB_DEPENDS= jpeg::graphics/jpeg \
X png::graphics/png
X
XUSE_X11= Yes
X
X
XCFLAGS+= \
X -I${LOCALBASE}/include \
X -I${X11BASE}/include \
X `freetype-config --cflags` \
X `libpng-config --cflags`
X
XLDFLAGS+= \
X -L${LOCALBASE}/lib \
X -L${X11BASE}/lib \
X -lX11 \
X -lXft \
X -lXmu \
X -ljpeg \
X `freetype-config --libs` \
X `libpng-config --libs` \
X
XMAKE_FILE= Makefile.openbsd
XMAKE_FLAGS= CC="${CC}" \
X CFLAGS="${CFLAGS}" \
X CXX="${CXX}" \
X PREFIX="${PREFIX}" \
X LDFLAGS="${LDFLAGS}" \
X SYSCONFDIR="${SYSCONFDIR}"
XFAKE_FLAGS+= ${DESTDIRNAME}=${WRKINST} \
X PREFIX="${PREFIX}" \
X MANDIR="${LOCALBASE}/man" \
X CFGDIR="${LOCALBASE}/share/examples/slim"
X
Xpost-extract:
X perl -pi -e 's!/usr/!${PREFIX}/!' ${WRKSRC}/slim.1
X
X.include <bsd.port.mk>
END-of-slim/Makefile
echo x - slim/distinfo
sed 's/^X//' >slim/distinfo << 'END-of-slim/distinfo'
XMD5 (slim-1.2.6.tar.gz) = 1bf891f046014a03236c21ce6cbe455b
XRMD160 (slim-1.2.6.tar.gz) = 81b2d230857dd1b3b2fb6e41b2a81a3ed7207bfd
XSHA1 (slim-1.2.6.tar.gz) = df6d4c0a58709d7f8080ee378c1d86991112b93e
XSHA256 (slim-1.2.6.tar.gz) =
4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e
XSIZE (slim-1.2.6.tar.gz) = 219003
END-of-slim/distinfo
echo x - slim/patches/patch-Makefile_openbsd
sed 's/^X//' >slim/patches/patch-Makefile_openbsd <<
'END-of-slim/patches/patch-Makefile_openbsd'
X$OpenBSD$
X--- Makefile.openbsd.orig Fri Sep 15 23:00:37 2006
X+++ Makefile.openbsd Sat Mar 17 15:53:34 2007
X@@ -18,7 +18,7 @@ NAME=slim
X VERSION=1.2.6
X
X DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
X- -DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
X+ -DPKGDATADIR=\"$(PREFIX)/share/slim\"
-DSYSCONFDIR=\"$(SYSCONFDIR)\"
X
X OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o input.o
app.o panel.o
X
END-of-slim/patches/patch-Makefile_openbsd
echo x - slim/patches/patch-slim_conf
sed 's/^X//' >slim/patches/patch-slim_conf <<
'END-of-slim/patches/patch-slim_conf'
X$OpenBSD$
X--- slim.conf.orig Fri Sep 15 22:00:38 2006
X+++ slim.conf Tue Mar 13 21:09:59 2007
X@@ -7,11 +7,11 @@ default_xserver /usr/X11R6/bin/X
X # Commands for halt, login, etc.
X halt_cmd /sbin/shutdown -h now
X reboot_cmd /sbin/shutdown -r now
X-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"
X+console_cmd /usr/X11R6/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"
X #suspend_cmd /usr/sbin/suspend
X
X # Full path to the xauth binary
X-xauth_path /usr/X11R6/bin/xauth
X+xauth_path /usr/X11R6/bin/xauth
X
X # Xauth file for server
X authfile /var/run/slim.auth
X@@ -33,7 +33,7 @@ authfile /var/run/slim.auth
X # to adjust the command according to your preferred shell,
X # i.e. for freebsd use:
X # login_cmd exec /bin/sh - ~/.xinitrc %session
X-login_cmd exec /bin/bash -login ~/.xinitrc %session
X+login_cmd exec /bin/sh - ~/.xinitrc %session
X
X # Commands executed when starting and exiting a session.
X # They can be used for registering a X11 session with
END-of-slim/patches/patch-slim_conf
exit
