Attachment #72711 for bug #105634

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




#

PORTNAME=	slim
PORTVERSION=	1.2.6
CATEGORIES=	x11
MASTER_SITES=	http://download.berlios.de/slim/ \
		http://depot.fsck.ch/mirror/distfiles/

RUN_DEPENDS=	${X11BASE}/bin/X:${X_SERVER_PORT}
BUILD_DEPENDS=	${X11BASE}/include/X11/Xft/Xft.h:${PORTSDIR}/x11-fonts/libXft

USE_X_PREFIX=	yes
USE_XLIB=	yes
USE_RC_SUBR=	slim.sh


MAKEFILE=	Makefile.freebsd

pre-build:
	@${REINPLACE_CMD} \
			-e 's|%%X11BASE%%|${X11BASE}|g' \
			-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
			${WRKSRC}/Makefile.freebsd \
			${WRKSRC}/slim.conf

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${LOCALBASE}/bin
	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${LOCALBASE}/etc/${PORTNAME}.conf.sample
	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${LOCALBASE}/man/man1
	@${MKDIR} ${DATADIR}/themes/default
	@${INSTALL_DATA} ${WRKSRC}/themes/default/${PORTNAME}.theme ${DATADIR}/themes/default
	@${INSTALL_DATA} ${WRKSRC}/themes/default/panel.png ${DATADIR}/themes/default
	@${INSTALL_DATA} ${WRKSRC}/themes/default/background.jpg ${DATADIR}/themes/default

post-install:
	@if [ ! -f ${LOCALBASE}/etc/slim.conf ]; then \
		${CP} -p ${LOCALBASE}/etc/slim.conf.sample ${LOCALBASE}/etc/slim.conf ; \
	fi

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11/slim/distinfo (-3 / +3 lines)
1	MD5 (slim-1.2.4.tar.gz) = b4aec9724050cf0fd582f8a39bf30f1e	1	MD5 (slim-1.2.6.tar.gz) = 1bf891f046014a03236c21ce6cbe455b
2	SHA256 (slim-1.2.4.tar.gz) = 84d0fbbd39d012821de195ee3a14af421a40afc0fb68aaa06dc6c5996ace2a62	2	SHA256 (slim-1.2.6.tar.gz) = 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e
3	SIZE (slim-1.2.4.tar.gz) = 214449	3	SIZE (slim-1.2.6.tar.gz) = 219003




--- Makefile.freebsd.orig	Thu Nov 16 17:47:00 2006
+++ Makefile.freebsd	Thu Nov 16 17:57:34 2006
@@ -3,14 +3,15 @@
 # Edit the following section to adjust the options
 # to fit into your operating system / distribution
 #######################################################
-CXX=/usr/bin/g++
-CC=/usr/bin/gcc
-CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
+CXX?=/usr/bin/g++
+CC?=/usr/bin/gcc
+CFLAGS+=-I%%X11BASE%%/include `freetype-config --cflags` `libpng-config --cflags`
+CXXLAGS+=$(CFLAGS)
+LDFLAGS=-L%%X11BASE%%/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg
 CUSTOM=-DNEEDS_BASENAME
-PREFIX=/usr
-CFGDIR=/etc
-MANDIR=/usr/share/man
+PREFIX=%%LOCALBASE%%
+CFGDIR=%%LOCALBASE%%/etc
+MANDIR=%%LOCALBASE%%/man
 DESTDIR=
 #######################################################
 

Lines 1-10 Link Here

(-)x11/slim/files/patch-slim.conf (-13 / +20 lines)
1	--- slim.conf.orig Sun Sep 11 18:50:36 2005	1	--- slim.conf.orig Thu Nov 16 17:59:38 2006
2	+++ slim.conf Sun Jan 8 14:32:02 2006	2	+++ slim.conf Thu Nov 16 18:14:31 2006
3	@@ -1,13 +1,15 @@	3	@@ -1,17 +1,19 @@
4	# Path, X server and arguments (if needed)	4	# Path, X server and arguments (if needed)
5	default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin	5	# Note: -xauth $authfile is automatically appended
6	default_xserver /usr/X11R6/bin/X	6	-default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
		7	-default_xserver /usr/X11R6/bin/X
7	-#xserver_arguments -dpi 75	8	-#xserver_arguments -dpi 75
		9	+default_path ./:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin
		10	+default_xserver %%X11BASE%%/bin/X
8	+# 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,
9	+# 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
10	+xserver_arguments vt09	13	+xserver_arguments vt09
Lines 15-26 Link Here
15	reboot_cmd /sbin/shutdown -r now	18	reboot_cmd /sbin/shutdown -r now
16	-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"
17	-#suspend_cmd /usr/sbin/suspend	20	-#suspend_cmd /usr/sbin/suspend
18	+console_cmd /usr/X11R6/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 %%X11BASE%%/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login"
19	+suspend_cmd /usr/sbin/acpiconf -s 3	22	+suspend_cmd /usr/sbin/acpiconf -s 3
20		23
21	# This command is executed after a succesful login.	24	# Full path to the xauth binary
22	# you can place the %session and %theme variables	25	-xauth_path /usr/X11R6/bin/xauth
23	@@ -17,8 +19,8 @@	26	+xauth_path %%X11BASE%%/bin/xauth
		27
		28	# Xauth file for server
		29	authfile /var/run/slim.auth
		30	@@ -32,8 +34,8 @@
24	# NOTE: if your system does not have bash you need	31	# NOTE: if your system does not have bash you need
25	# to adjust the command according to your preferred shell,	32	# to adjust the command according to your preferred shell,
26	# i.e. for freebsd use:	33	# i.e. for freebsd use:
Lines 29-37 Link Here
29	+login_cmd exec /bin/sh - ~/.xinitrc %session	36	+login_cmd exec /bin/sh - ~/.xinitrc %session
30	+#login_cmd exec /bin/bash -login ~/.xinitrc %session	37	+#login_cmd exec /bin/bash -login ~/.xinitrc %session
31		38
32	# Available sessions (first one is the default).	39	# Commands executed when starting and exiting a session.
33	# The current chosen session name is replaced in the login_cmd	40	# They can be used for registering a X11 session with
34	@@ -33,7 +35,7 @@	41	@@ -60,7 +62,7 @@
35	welcome_msg Welcome to %host	42	welcome_msg Welcome to %host
36		43
37	# shutdown / reboot messages	44	# shutdown / reboot messages
Lines 40-46 Link Here
40	reboot_msg The system is rebooting...	47	reboot_msg The system is rebooting...
41		48
42	# default user, leave blank or remove this line	49	# default user, leave blank or remove this line
43	@@ -45,7 +47,7 @@	50	@@ -72,7 +74,7 @@
44	current_theme default	51	current_theme default
45		52
46	# Lock file	53	# Lock file

Lines 18-24 load_rc_config $name Link Here

(-)x11/slim/files/slim.sh.in (-1 / +1 lines)
18		18
19	: ${slim_enable="NO"}	19	: ${slim_enable="NO"}
20		20
21	command=%%X11BASE%%/bin/slim	21	command=%%LOCALBASE%%/bin/slim
22	command_args="-d"	22	command_args="-d"
23	pidfile=/var/run/slim.pid	23	pidfile=/var/run/slim.pid

Return to bug 105634

Lines 6-12 Link Here

(-)x11/slim/Makefile (-8 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= slim	8	PORTNAME= slim
9	PORTVERSION= 1.2.4	9	PORTVERSION= 1.2.6
10	CATEGORIES= x11	10	CATEGORIES= x11
11	MASTER_SITES= http://download.berlios.de/slim/ \	11	MASTER_SITES= http://download.berlios.de/slim/ \
12	http://depot.fsck.ch/mirror/distfiles/	12	http://depot.fsck.ch/mirror/distfiles/
Lines 20-26 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics Link Here
20	RUN_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT}	20	RUN_DEPENDS= ${X11BASE}/bin/X:${X_SERVER_PORT}
21	BUILD_DEPENDS= ${X11BASE}/include/X11/Xft/Xft.h:${PORTSDIR}/x11-fonts/libXft	21	BUILD_DEPENDS= ${X11BASE}/include/X11/Xft/Xft.h:${PORTSDIR}/x11-fonts/libXft
22		22
23	USE_X_PREFIX= yes
24	USE_XLIB= yes	23	USE_XLIB= yes
25	USE_RC_SUBR= slim.sh	24	USE_RC_SUBR= slim.sh
26		25
Lines 29-50 MAN1= slim.1 Link Here
29	MAKEFILE= Makefile.freebsd	28	MAKEFILE= Makefile.freebsd
30		29
31	pre-build:	30	pre-build:
32	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' \	31	@${REINPLACE_CMD} \
		32	-e 's\|%%X11BASE%%\|${X11BASE}\|g' \
		33	-e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
33	${WRKSRC}/Makefile.freebsd \	34	${WRKSRC}/Makefile.freebsd \
34	${WRKSRC}/slim.conf	35	${WRKSRC}/slim.conf
35		36
36	do-install:	37	do-install:
37	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${X11BASE}/bin	38	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${LOCALBASE}/bin
38	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${X11BASE}/etc/${PORTNAME}.conf.sample	39	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${LOCALBASE}/etc/${PORTNAME}.conf.sample
39	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${X11BASE}/man/man1	40	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${LOCALBASE}/man/man1
40	@${MKDIR} ${DATADIR}/themes/default	41	@${MKDIR} ${DATADIR}/themes/default
41	@${INSTALL_DATA} ${WRKSRC}/themes/default/${PORTNAME}.theme ${DATADIR}/themes/default	42	@${INSTALL_DATA} ${WRKSRC}/themes/default/${PORTNAME}.theme ${DATADIR}/themes/default
42	@${INSTALL_DATA} ${WRKSRC}/themes/default/panel.png ${DATADIR}/themes/default	43	@${INSTALL_DATA} ${WRKSRC}/themes/default/panel.png ${DATADIR}/themes/default
43	@${INSTALL_DATA} ${WRKSRC}/themes/default/background.jpg ${DATADIR}/themes/default	44	@${INSTALL_DATA} ${WRKSRC}/themes/default/background.jpg ${DATADIR}/themes/default
44		45
45	post-install:	46	post-install:
46	@if [ ! -f ${X11BASE}/etc/slim.conf ]; then \	47	@if [ ! -f ${LOCALBASE}/etc/slim.conf ]; then \
47	${CP} -p ${X11BASE}/etc/slim.conf.sample ${X11BASE}/etc/slim.conf ; \	48	${CP} -p ${LOCALBASE}/etc/slim.conf.sample ${LOCALBASE}/etc/slim.conf ; \
48	fi	49	fi
49		50
50	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-26 Link Here

(-)x11/slim/files/patch-Makefile.freebsd (-9 / +8 lines)
1	--- Makefile.freebsd.orig Sun Sep 11 18:50:36 2005	1	--- Makefile.freebsd.orig Thu Nov 16 17:47:00 2006
2	+++ Makefile.freebsd Sun Jan 8 12:17:45 2006	2	+++ Makefile.freebsd Thu Nov 16 17:57:34 2006
3	@@ -3,15 +3,15 @@	3	@@ -3,14 +3,15 @@
4	# Edit the following section to adjust the options	4	# Edit the following section to adjust the options
5	# to fit into your operating system / distribution	5	# to fit into your operating system / distribution
6	#######################################################	6	#######################################################
7	-CXX=/usr/bin/g++	7	-CXX=/usr/bin/g++
8	-CC=/usr/bin/gcc	8	-CC=/usr/bin/gcc
9	-CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include	9	-CFLAGS=-I. -I/usr/X11R6/include -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
10	-CXXLAGS=$(CFLAGS)	10	-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
11	-LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
12	+CXX?=/usr/bin/g++	11	+CXX?=/usr/bin/g++
13	+CC?=/usr/bin/gcc	12	+CC?=/usr/bin/gcc
14	+CFLAGS+=-I%%X11BASE%%/include `freetype-config --cflags` `libpng-config --cflags`	13	+CFLAGS+=-I%%X11BASE%%/include `freetype-config --cflags` `libpng-config --cflags`
15	+CXXLAGS+=$(CFLAGS)	14	+CXXLAGS+=$(CFLAGS)
16	+LDFLAGS=-L%%X11BASE%%/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXpm -lXmu -ljpeg	15	+LDFLAGS=-L%%X11BASE%%/lib `freetype-config --libs` `libpng-config --libs` -lXft -lX11 -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -ljpeg
17	CUSTOM=-DNEEDS_BASENAME	16	CUSTOM=-DNEEDS_BASENAME
18	-PREFIX=/usr	17	-PREFIX=/usr
19	-CFGDIR=/etc	18	-CFGDIR=/etc
20	-MANDIR=/usr/share/man	19	-MANDIR=/usr/share/man
21	+PREFIX=%%X11BASE%%	20	+PREFIX=%%LOCALBASE%%
22	+CFGDIR=%%X11BASE%%/etc	21	+CFGDIR=%%LOCALBASE%%/etc
23	+MANDIR=%%X11BASE%%/man	22	+MANDIR=%%LOCALBASE%%/man
24	DESTDIR=	23	DESTDIR=
25	#######################################################	24	#######################################################
26		25