aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/slim/Makefile17
-rw-r--r--x11/slim/distinfo6
-rw-r--r--x11/slim/files/patch-Makefile.freebsd17
-rw-r--r--x11/slim/files/patch-app.cpp37
-rw-r--r--x11/slim/files/patch-slim.conf33
-rw-r--r--x11/slim/files/slim.sh.in2
6 files changed, 78 insertions, 34 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 07db8d08938d..52209467bebe 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= slim
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.6
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/slim/ \
http://depot.fsck.ch/mirror/distfiles/
@@ -20,7 +20,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
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
@@ -29,22 +28,24 @@ MAN1= slim.1
MAKEFILE= Makefile.freebsd
pre-build:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+ @${REINPLACE_CMD} \
+ -e 's|%%X11BASE%%|${X11BASE}|g' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/Makefile.freebsd \
${WRKSRC}/slim.conf
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${X11BASE}/bin
- @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${X11BASE}/etc/${PORTNAME}.conf.sample
- @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${X11BASE}/man/man1
+ @${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 ${X11BASE}/etc/slim.conf ]; then \
- ${CP} -p ${X11BASE}/etc/slim.conf.sample ${X11BASE}/etc/slim.conf ; \
+ @if [ ! -f ${LOCALBASE}/etc/slim.conf ]; then \
+ ${CP} -p ${LOCALBASE}/etc/slim.conf.sample ${LOCALBASE}/etc/slim.conf ; \
fi
.include <bsd.port.mk>
diff --git a/x11/slim/distinfo b/x11/slim/distinfo
index 0f9044cbe853..ceccaa78bcf9 100644
--- a/x11/slim/distinfo
+++ b/x11/slim/distinfo
@@ -1,3 +1,3 @@
-MD5 (slim-1.2.4.tar.gz) = b4aec9724050cf0fd582f8a39bf30f1e
-SHA256 (slim-1.2.4.tar.gz) = 84d0fbbd39d012821de195ee3a14af421a40afc0fb68aaa06dc6c5996ace2a62
-SIZE (slim-1.2.4.tar.gz) = 214449
+MD5 (slim-1.2.6.tar.gz) = 1bf891f046014a03236c21ce6cbe455b
+SHA256 (slim-1.2.6.tar.gz) = 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e
+SIZE (slim-1.2.6.tar.gz) = 219003
diff --git a/x11/slim/files/patch-Makefile.freebsd b/x11/slim/files/patch-Makefile.freebsd
index 20f9fd87e32e..692acf3ff1e9 100644
--- a/x11/slim/files/patch-Makefile.freebsd
+++ b/x11/slim/files/patch-Makefile.freebsd
@@ -1,26 +1,25 @@
---- Makefile.freebsd.orig Sun Sep 11 18:50:36 2005
-+++ Makefile.freebsd Sun Jan 8 12:17:45 2006
-@@ -3,15 +3,15 @@
+--- 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
--CXXLAGS=$(CFLAGS)
--LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg
+-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%%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 -lXpm -lXmu -ljpeg
++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=%%X11BASE%%
-+CFGDIR=%%X11BASE%%/etc
-+MANDIR=%%X11BASE%%/man
++PREFIX=%%LOCALBASE%%
++CFGDIR=%%LOCALBASE%%/etc
++MANDIR=%%LOCALBASE%%/man
DESTDIR=
#######################################################
diff --git a/x11/slim/files/patch-app.cpp b/x11/slim/files/patch-app.cpp
new file mode 100644
index 000000000000..3e48b7b4db91
--- /dev/null
+++ b/x11/slim/files/patch-app.cpp
@@ -0,0 +1,37 @@
+--- app.cpp.orig Fri Nov 24 16:36:58 2006
++++ app.cpp Sun Nov 26 23:14:35 2006
+@@ -560,13 +560,6 @@ int App::StartServer() {
+ } else if (pos == 0) {
+ server[argc++] = args+pos;
+ }
+- if (server[argc-1][0] == 'v' && server[argc-1][1] == 't') {
+- bool ok = false;
+- Cfg::string2int(server[argc-1]+2, &ok);
+- if (ok) {
+- hasVtSet = true;
+- }
+- }
+ ++pos;
+
+ if (argc+1 >= MAX_XSERVER_ARGS) {
+@@ -576,8 +569,19 @@ int App::StartServer() {
+ break;
+ }
+ }
++
++ for (int i=0; i<argc; i++) {
++ if (server[i][0] == 'v' && server[i][1] == 't') {
++ bool ok = false;
++ Cfg::string2int(server[i]+2, &ok);
++ if (ok) {
++ hasVtSet = true;
++ }
++ }
++ }
++
+ if (!hasVtSet && daemonmode) {
+- server[argc++] = "vt07";
++ server[argc++] = "vt09";
+ }
+ server[argc] = NULL;
+
diff --git a/x11/slim/files/patch-slim.conf b/x11/slim/files/patch-slim.conf
index f2eab9b611de..bdf6c7a31af1 100644
--- a/x11/slim/files/patch-slim.conf
+++ b/x11/slim/files/patch-slim.conf
@@ -1,10 +1,13 @@
---- slim.conf.orig Sun Sep 11 18:50:36 2005
-+++ slim.conf Sun Jan 8 14:32:02 2006
-@@ -1,13 +1,15 @@
+--- slim.conf.orig Thu Nov 16 17:59:38 2006
++++ slim.conf Thu Nov 16 18:14:31 2006
+@@ -1,17 +1,19 @@
# Path, X server and arguments (if needed)
- default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
- default_xserver /usr/X11R6/bin/X
+ # Note: -xauth $authfile is automatically appended
+-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:%%X11BASE%%/bin
++default_xserver %%X11BASE%%/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
@@ -15,12 +18,16 @@
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 /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"
++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"
+suspend_cmd /usr/sbin/acpiconf -s 3
- # This command is executed after a succesful login.
- # you can place the %session and %theme variables
-@@ -17,8 +19,8 @@
+ # Full path to the xauth binary
+-xauth_path /usr/X11R6/bin/xauth
++xauth_path %%X11BASE%%/bin/xauth
+
+ # Xauth file for server
+ authfile /var/run/slim.auth
+@@ -32,8 +34,8 @@
# NOTE: if your system does not have bash you need
# to adjust the command according to your preferred shell,
# i.e. for freebsd use:
@@ -29,9 +36,9 @@
+login_cmd exec /bin/sh - ~/.xinitrc %session
+#login_cmd exec /bin/bash -login ~/.xinitrc %session
- # Available sessions (first one is the default).
- # The current chosen session name is replaced in the login_cmd
-@@ -33,7 +35,7 @@
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -60,7 +62,7 @@
welcome_msg Welcome to %host
# shutdown / reboot messages
@@ -40,7 +47,7 @@
reboot_msg The system is rebooting...
# default user, leave blank or remove this line
-@@ -45,7 +47,7 @@
+@@ -72,7 +74,7 @@
current_theme default
# Lock file
diff --git a/x11/slim/files/slim.sh.in b/x11/slim/files/slim.sh.in
index c4cf8348df00..8f1eac6828d5 100644
--- a/x11/slim/files/slim.sh.in
+++ b/x11/slim/files/slim.sh.in
@@ -18,7 +18,7 @@ load_rc_config $name
: ${slim_enable="NO"}
-command=%%X11BASE%%/bin/slim
+command=%%LOCALBASE%%/bin/slim
command_args="-d"
pidfile=/var/run/slim.pid
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 04:31:26 +0000