Attachment #81359 for bug #116522

View | Details | Raw Unified | Return to bug 116522
Collapse All | Expand All

Lines 30-35 Link Here

(-)slim/Makefile (-1 / +5 lines)
30		30
31	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
32		32
		33	post-patch:
		34	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
		35	${WRKSRC}/${PORTNAME}.conf
		36
33	do-install:	37	do-install:
34	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	38	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
35	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample	39	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
Lines 41-47 Link Here
41		45
42	post-install:	46	post-install:
43	@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \	47	@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \
44	${CP} -p ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \	48	${INSTALL_DATA} -p ${WRKSRC}/slim.conf ${PREFIX}/etc/slim.conf ; \
45	fi	49	fi
46	@${ECHO_MSG} ""	50	@${ECHO_MSG} ""
47	@${CAT} ${PKGMESSAGE}	51	@${CAT} ${PKGMESSAGE}

Lines 10-17 Link Here

(-)slim/files/patch-Makefile.freebsd (-3 / +3 lines)
10	-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg	10	-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
11	+CXX?=/usr/bin/g++	11	+CXX?=/usr/bin/g++
12	+CC?=/usr/bin/gcc	12	+CC?=/usr/bin/gcc
13	+CFLAGS+=-I$(LOCALBASE)/include `freetype-config --cflags` `libpng-config --cflags`	13	+CFLAGS+=-I${LOCALBASE}/include `freetype-config --cflags` `libpng-config --cflags`
14	+LDFLAGS=-L$(LOCALBASE)/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg	14	+LDFLAGS=-L${LOCALBASE}/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg
15	CUSTOM=-DNEEDS_BASENAME	15	CUSTOM=-DNEEDS_BASENAME
16	.ifdef(USE_PAM)	16	.ifdef(USE_PAM)
17	LDFLAGS+= -lpam	17	LDFLAGS+= -lpam
Lines 20-26 Link Here
20	-PREFIX=/usr	20	-PREFIX=/usr
21	-CFGDIR=/etc	21	-CFGDIR=/etc
22	-MANDIR=/usr/share/man	22	-MANDIR=/usr/share/man
23	+PREFIX?=$(LOCALBASE)	23	+PREFIX?=${LOCALBASE}
24	+CFGDIR=$(PREFIX)/etc	24	+CFGDIR=$(PREFIX)/etc
25	+MANDIR=$(MANPREFIX)/man	25	+MANDIR=$(MANPREFIX)/man
26	DESTDIR=	26	DESTDIR=




-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
+# 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

 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"
+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 file for server
 authfile           /var/run/slim.auth

Return to bug 116522

Lines 6-13 Link Here

(-)slim/files/patch-slim.conf (-4 / +4 lines)
6	-default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin	6	-default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
7	-default_xserver /usr/X11R6/bin/X	7	-default_xserver /usr/X11R6/bin/X
8	-#xserver_arguments -dpi 75	8	-#xserver_arguments -dpi 75
9	+default_path ./:/bin:/usr/bin:$(LOCALBASE)/bin:$(LOCALBASE)/bin	9	+default_path ./:/bin:/usr/bin:%%LOCALBASE%%/bin:%%LOCALBASE%%/bin
10	+default_xserver $(LOCALBASE)/bin/X	10	+default_xserver %%LOCALBASE%%/bin/X
11	+# The X server needs to be started on an unused virtual terminal,	11	+# The X server needs to be started on an unused virtual terminal,
12	+# for FreeBSD in a default configuration, the first one of those is #09	12	+# for FreeBSD in a default configuration, the first one of those is #09
13	+xserver_arguments vt09	13	+xserver_arguments vt09
Lines 18-29 Link Here
18	reboot_cmd /sbin/shutdown -r now	18	reboot_cmd /sbin/shutdown -r now
19	-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"	19	-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"
20	-#suspend_cmd /usr/sbin/suspend	20	-#suspend_cmd /usr/sbin/suspend
21	+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"	21	+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"
22	+suspend_cmd /usr/sbin/acpiconf -s 3	22	+suspend_cmd /usr/sbin/acpiconf -s 3
23		23
24	# Full path to the xauth binary	24	# Full path to the xauth binary
25	-xauth_path /usr/X11R6/bin/xauth	25	-xauth_path /usr/X11R6/bin/xauth
26	+xauth_path $(LOCALBASE)/bin/xauth	26	+xauth_path %%LOCALBASE%%/bin/xauth
27		27
28	# Xauth file for server	28	# Xauth file for server
29	authfile /var/run/slim.auth	29	authfile /var/run/slim.auth