diff options
| author | miwi <miwi@FreeBSD.org> | 2007-09-24 11:15:43 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-09-24 11:15:43 +0000 |
| commit | ae454a74e5908f0ca4b53af03371d4f17779ce08 (patch) | |
| tree | 44c3db2c2b49e01e46cec47b3b49d8df052c00e5 /x11/slim | |
| parent | 41f3aee6e37fd7cbee8787457400a4ac84cb7e4f (diff) | |
| download | FreeBSD-ports-ae454a74e5908f0ca4b53af03371d4f17779ce08.zip FreeBSD-ports-ae454a74e5908f0ca4b53af03371d4f17779ce08.tar.gz | |
- Respect LOCALBASE
PR: 116522
Submitted by: Carl Johan Gustavsson <cjg@bsdmail.org>
Approved by: maintainer
Diffstat (limited to 'x11/slim')
| -rw-r--r-- | x11/slim/Makefile | 6 | ||||
| -rw-r--r-- | x11/slim/files/patch-Makefile.freebsd | 6 | ||||
| -rw-r--r-- | x11/slim/files/patch-slim.conf | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 144cdbf..0d54744 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -30,6 +30,10 @@ MAKEFILE= Makefile.freebsd .include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/${PORTNAME}.conf + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample @@ -41,7 +45,7 @@ do-install: post-install: @if [ ! -f ${PREFIX}/etc/slim.conf ]; then \ - ${CP} -p ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \ + ${INSTALL_DATA} -p ${WRKSRC}/slim.conf ${PREFIX}/etc/slim.conf ; \ fi @${ECHO_MSG} "" @${CAT} ${PKGMESSAGE} diff --git a/x11/slim/files/patch-Makefile.freebsd b/x11/slim/files/patch-Makefile.freebsd index c336edc..c106209 100644 --- a/x11/slim/files/patch-Makefile.freebsd +++ b/x11/slim/files/patch-Makefile.freebsd @@ -10,8 +10,8 @@ -LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg +CXX?=/usr/bin/g++ +CC?=/usr/bin/gcc -+CFLAGS+=-I$(LOCALBASE)/include `freetype-config --cflags` `libpng-config --cflags` -+LDFLAGS=-L$(LOCALBASE)/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg ++CFLAGS+=-I${LOCALBASE}/include `freetype-config --cflags` `libpng-config --cflags` ++LDFLAGS=-L${LOCALBASE}/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg CUSTOM=-DNEEDS_BASENAME .ifdef(USE_PAM) LDFLAGS+= -lpam @@ -20,7 +20,7 @@ -PREFIX=/usr -CFGDIR=/etc -MANDIR=/usr/share/man -+PREFIX?=$(LOCALBASE) ++PREFIX?=${LOCALBASE} +CFGDIR=$(PREFIX)/etc +MANDIR=$(MANPREFIX)/man DESTDIR= diff --git a/x11/slim/files/patch-slim.conf b/x11/slim/files/patch-slim.conf index c977631..892d48b 100644 --- a/x11/slim/files/patch-slim.conf +++ b/x11/slim/files/patch-slim.conf @@ -6,8 +6,8 @@ -default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin -default_xserver /usr/X11R6/bin/X -#xserver_arguments -dpi 75 -+default_path ./:/bin:/usr/bin:$(LOCALBASE)/bin:$(LOCALBASE)/bin -+default_xserver $(LOCALBASE)/bin/X ++default_path ./:/bin:/usr/bin:%%LOCALBASE%%/bin:%%LOCALBASE%%/bin ++default_xserver %%LOCALBASE%%/bin/X +# The X server needs to be started on an unused virtual terminal, +# for FreeBSD in a default configuration, the first one of those is #09 +xserver_arguments vt09 @@ -18,12 +18,12 @@ 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" -#suspend_cmd /usr/sbin/suspend -+console_cmd $(LOCALBASE)/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login" ++console_cmd %%LOCALBASE%%/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login" +suspend_cmd /usr/sbin/acpiconf -s 3 # Full path to the xauth binary -xauth_path /usr/X11R6/bin/xauth -+xauth_path $(LOCALBASE)/bin/xauth ++xauth_path %%LOCALBASE%%/bin/xauth # Xauth file for server authfile /var/run/slim.auth |
