Attachment #90650 for bug #127852

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

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= slim	8	PORTNAME= slim
9	PORTVERSION= 1.3.0	9	PORTVERSION= 1.3.1
10	PORTREVISION= 2
11	CATEGORIES= x11	10	CATEGORIES= x11
12	MASTER_SITES= ${MASTER_SITE_BERLIOS} \	11	MASTER_SITES= ${MASTER_SITE_BERLIOS} \
13	http://depot.fsck.ch/mirror/distfiles/	12	http://depot.fsck.ch/mirror/distfiles/

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (slim-1.3.0.tar.gz) = 1c1a87f3cbd3c334c874585e42701961	1	MD5 (slim-1.3.1.tar.gz) = 727d0acb24c0fbf0751134c37a9c895f
2	SHA256 (slim-1.3.0.tar.gz) = b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b	2	SHA256 (slim-1.3.1.tar.gz) = acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
3	SIZE (slim-1.3.0.tar.gz) = 218646	3	SIZE (slim-1.3.1.tar.gz) = 219446




--- Makefile.freebsd.orig	2008-10-04 13:37:07.000000000 +0200
+++ Makefile.freebsd	2008-10-04 13:40:07.000000000 +0200
@@ -3,18 +3,14 @@
 # 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/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
-LDFLAGS= -L/usr/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
-CUSTOM=-DNEEDS_BASENAME
-.ifdef(USE_PAM)
-  LDFLAGS+= -lpam

-.ifdef USE_PAM
-  OBJECTS+=PAM.o 
-.endif
+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o PAM.o
 
 all: slim
 

Removed Link Here

(-)files/patch-PAM.cpp (-11 lines)
1	--- PAM.cpp.orig 2008-05-13 12:04:37.000000000 +0300
2	+++ PAM.cpp 2008-05-13 12:04:45.000000000 +0300
3	@@ -6,7 +6,7 @@
4	the Free Software Foundation; either version 2 of the License, or
5	(at your option) any later version.
6	*/
7	-#include <PAM.h>
8	+#include "PAM.h"
9	#include <string>
10	#include <iostream>
11




--- app.cpp.orig	2008-10-04 13:45:58.000000000 +0200
+++ app.cpp	2008-10-04 13:46:07.000000000 +0200
@@ -887,7 +887,7 @@
     ServerPID = -1;
     testing = false;
     mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    daemonmode = false;
     Dpy = NULL;
 
     // Parse command line
@@ -858,7 +859,7 @@
     }
 
     if (!hasVtSet && daemonmode) {
-        server[argc++] = (char*)"vt07";
+        server[argc++] = (char*)"vt09";
     }
     server[argc] = NULL;
 




--- slim.conf.orig	2008-10-04 13:49:03.000000000 +0200
+++ slim.conf	2008-10-04 13:52:44.000000000 +0200
@@ -1,17 +1,19 @@
 # Path, X server and arguments (if needed)
 # Note: -xauth $authfile is automatically appended
-default_path        ./:/bin:/usr/bin:/usr/local/bin
-default_xserver     /usr/bin/X
-#xserver_arguments   -dpi 75
+default_path        ./:/bin:/usr/bin:%%LOCALBASE%%/bin:%%LOCALBASE%%/bin
+default_xserver     %%LOCALBASE%%/bin/X

-halt_cmd            /sbin/shutdown -h now
+halt_cmd            /sbin/shutdown -p now
 reboot_cmd          /sbin/shutdown -r now
-console_cmd         /usr/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/issue; exec /bin/login"
+suspend_cmd        /usr/sbin/acpiconf -s 3
 
 # Full path to the xauth binary
-xauth_path         /usr/bin/xauth 
+xauth_path         %%LOCALBASE%%/bin/xauth
 
 # Xauth file for server

 
 # Commands executed when starting and exiting a session.
 # They can be used for registering a X11 session with
@@ -63,7 +65,7 @@
 # session_msg         Session: 
 
 # shutdown / reboot messages
-shutdown_msg       The system is halting...

 reboot_msg         The system is rebooting...
 
 # default user, leave blank or remove this line
@@ -84,7 +86,7 @@
 current_theme       default
 
 # Lock file

Return to bug 127852

Lines 1-13 Link Here

(-)files/patch-Makefile.freebsd (-5 / +5 lines)
1	--- Makefile.freebsd.orig 2007-07-15 17:09:28.000000000 +0300	1	--- Makefile.freebsd.orig 2008-10-04 13:37:07.000000000 +0200
2	+++ Makefile.freebsd 2008-05-13 11:56:53.000000000 +0300	2	+++ Makefile.freebsd 2008-10-04 13:40:07.000000000 +0200
3	@@ -3,18 +3,14 @@	3	@@ -3,18 +3,14 @@
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/local/include/freetype2 -I/usr/local/include/freetype2/config -I/usr/local/include/libpng -I/usr/local/include -I/usr/include
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/local/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng -lz -lm -lcrypt -lXmu -lpng -ljpeg
11	-CUSTOM=-DNEEDS_BASENAME	11	-CUSTOM=-DNEEDS_BASENAME
12	-.ifdef(USE_PAM)	12	-.ifdef(USE_PAM)
13	- LDFLAGS+= -lpam	13	- LDFLAGS+= -lpam
Lines 35-41 Link Here
35	-.ifdef USE_PAM	35	-.ifdef USE_PAM
36	- OBJECTS+=PAM.o	36	- OBJECTS+=PAM.o
37	-.endif	37	-.endif
38	+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o PAM.o	38	+OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o PAM.o
39		39
40	all: slim	40	all: slim
41		41

Lines 1-19 Link Here

(-)files/patch-app.cpp (-13 / +5 lines)
1	--- app.cpp.orig Sun Jul 15 16:09:28 2007	1	--- app.cpp.orig 2008-10-04 13:45:58.000000000 +0200
2	+++ app.cpp Wed Jul 18 20:28:27 2007	2	+++ app.cpp 2008-10-04 13:46:07.000000000 +0200
3	@@ -135,6 +135,7 @@	3	@@ -887,7 +887,7 @@
4	ServerPID = -1;
5	testing = false;
6	mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
7	+ daemonmode = false;
8	Dpy = NULL;
9
10	// Parse command line
11	@@ -858,7 +859,7 @@
12	}	4	}
13		5
14	if (!hasVtSet && daemonmode) {	6	if (!hasVtSet && daemonmode) {
15	- server[argc++] = "vt07";	7	- server[argc++] = (char*)"vt07";
16	+ server[argc++] = "vt09";	8	+ server[argc++] = (char*)"vt09";
17	}	9	}
18	server[argc] = NULL;	10	server[argc] = NULL;
19		11

Lines 1-10 Link Here

(-)files/patch-slim.conf (-10 / +10 lines)
1	--- slim.conf.orig Thu Nov 16 17:59:38 2006	1	--- slim.conf.orig 2008-10-04 13:49:03.000000000 +0200
2	+++ slim.conf Thu Nov 16 18:14:31 2006	2	+++ slim.conf 2008-10-04 13:52:44.000000000 +0200
3	@@ -1,17 +1,19 @@	3	@@ -1,17 +1,19 @@
4	# Path, X server and arguments (if needed)	4	# Path, X server and arguments (if needed)
5	# Note: -xauth $authfile is automatically appended	5	# Note: -xauth $authfile is automatically appended
6	-default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin	6	-default_path ./:/bin:/usr/bin:/usr/local/bin
7	-default_xserver /usr/X11R6/bin/X	7	-default_xserver /usr/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
Lines 16-28 Link Here
16	-halt_cmd /sbin/shutdown -h now	16	-halt_cmd /sbin/shutdown -h now
17	+halt_cmd /sbin/shutdown -p now	17	+halt_cmd /sbin/shutdown -p now
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/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 /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /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/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
Lines 38-45 Link Here
38		38
39	# Commands executed when starting and exiting a session.	39	# Commands executed when starting and exiting a session.
40	# They can be used for registering a X11 session with	40	# They can be used for registering a X11 session with
41	@@ -60,7 +62,7 @@	41	@@ -63,7 +65,7 @@
42	welcome_msg Welcome to %host	42	# session_msg Session:
43		43
44	# shutdown / reboot messages	44	# shutdown / reboot messages
45	-shutdown_msg The system is halting...	45	-shutdown_msg The system is halting...
Lines 47-53 Link Here
47	reboot_msg The system is rebooting...	47	reboot_msg The system is rebooting...
48		48
49	# default user, leave blank or remove this line	49	# default user, leave blank or remove this line
50	@@ -72,7 +74,7 @@	50	@@ -84,7 +86,7 @@
51	current_theme default	51	current_theme default
52		52
53	# Lock file	53	# Lock file