Attachment 79893 Details for Bug 114708 – slim-1.3.0.patch

[patch] slim-1.3.0.patch

slim-1.3.0.patch (text/plain), 10.03 KB, created by Tobias Roth on 2007-07-18 20:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Roth

Created: 2007-07-18 20:40:01 UTC

Size: 10.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/Makefile,v
>retrieving revision 1.8
>diff -u -u -r1.8 Makefile
>--- Makefile	19 May 2007 20:27:20 -0000	1.8
>+++ Makefile	18 Jul 2007 19:24:15 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	slim
>-PORTVERSION=	1.2.6
>-PORTREVISION=	2
>+PORTVERSION=	1.3.0
> CATEGORIES=	x11
> MASTER_SITES=	${MASTER_SITE_BERLIOS} \
> 		http://depot.fsck.ch/mirror/distfiles/
>@@ -18,12 +17,12 @@
> 
> LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		png.5:${PORTSDIR}/graphics/png \
>-		freetype:${PORTSDIR}/print/freetype2
>-RUN_DEPENDS=	${X11BASE}/bin/X:${X_SERVER_PORT}
>-BUILD_DEPENDS=	${X11BASE}/include/X11/Xft/Xft.h:${PORTSDIR}/x11-fonts/libXft
>+		freetype:${PORTSDIR}/print/freetype2 \
>+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
> 
>-USE_XLIB=	yes
>+USE_XORG=	x11 xft xmu xorg-server xrender
> USE_RC_SUBR=	slim.sh
>+SUB_FILES=	pkg-message
> 
> MAN1=		slim.1
> 
>@@ -31,29 +30,21 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} < 500000
>-BROKEN=		does not compile on FreeBSD 4.x
>-.endif
>-
>-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
>+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
>+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/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 ; \
>+	@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \
>+		${CP} -p ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \
> 	fi
>+	@${ECHO_MSG} ""
>+	@${CAT} ${PKGMESSAGE}
>+	@${ECHO_MSG} ""
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/distinfo,v
>retrieving revision 1.3
>diff -u -u -r1.3 distinfo
>--- distinfo	11 Dec 2006 13:01:20 -0000	1.3
>+++ distinfo	18 Jul 2007 19:24:15 -0000
>@@ -1,3 +1,3 @@
>-MD5 (slim-1.2.6.tar.gz) = 1bf891f046014a03236c21ce6cbe455b
>-SHA256 (slim-1.2.6.tar.gz) = 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e
>-SIZE (slim-1.2.6.tar.gz) = 219003
>+MD5 (slim-1.3.0.tar.gz) = 1c1a87f3cbd3c334c874585e42701961
>+SHA256 (slim-1.3.0.tar.gz) = b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b
>+SIZE (slim-1.3.0.tar.gz) = 218646
>Index: files/patch-Makefile.freebsd
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/files/patch-Makefile.freebsd,v
>retrieving revision 1.2
>diff -u -u -r1.2 patch-Makefile.freebsd
>--- files/patch-Makefile.freebsd	11 Dec 2006 13:01:21 -0000	1.2
>+++ files/patch-Makefile.freebsd	18 Jul 2007 19:24:15 -0000
>@@ -1,6 +1,6 @@
>---- Makefile.freebsd.orig	Thu Nov 16 17:47:00 2006
>-+++ Makefile.freebsd	Thu Nov 16 17:57:34 2006
>-@@ -3,14 +3,15 @@
>+--- Makefile.freebsd.orig	Sun Jul 15 16:09:28 2007
>++++ Makefile.freebsd	Wed Jul 18 20:23:58 2007
>+@@ -3,18 +3,18 @@
>  # Edit the following section to adjust the options
>  # to fit into your operating system / distribution
>  #######################################################
>@@ -10,16 +10,19 @@
> -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 -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
>+   CUSTOM+= -DUSE_PAM
>+ .endif
> -PREFIX=/usr
> -CFGDIR=/etc
> -MANDIR=/usr/share/man
>-+PREFIX=%%LOCALBASE%%
>-+CFGDIR=%%LOCALBASE%%/etc
>-+MANDIR=%%LOCALBASE%%/man
>++PREFIX=$(LOCALBASE)
>++CFGDIR=$(PREFIX)/etc
>++MANDIR=$(PREFIX)/man
>  DESTDIR=
>  #######################################################
>  
>Index: files/patch-app.cpp
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/files/patch-app.cpp,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-app.cpp
>--- files/patch-app.cpp	11 Dec 2006 13:01:21 -0000	1.1
>+++ files/patch-app.cpp	18 Jul 2007 19:24:15 -0000
>@@ -1,34 +1,16 @@
>---- 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;
>+--- app.cpp.orig	Sun Jul 15 16:09:28 2007
>++++ app.cpp	Wed Jul 18 20:28:27 2007
>+@@ -135,6 +135,7 @@
>+     ServerPID = -1;
>+     testing = false;
>+     mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
>++    daemonmode = false;
>+     Dpy = NULL;
>  
>-         if (argc+1 >= MAX_XSERVER_ARGS) {
>-@@ -576,8 +569,19 @@ int App::StartServer() {
>-             break;
>-         }
>+     // Parse command line
>+@@ -858,7 +859,7 @@
>      }
>-+
>-+    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";
>Index: files/patch-cfg.cpp
>===================================================================
>RCS file: files/patch-cfg.cpp
>diff -N files/patch-cfg.cpp
>--- files/patch-cfg.cpp	9 Apr 2007 11:57:24 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,12 +0,0 @@
>---- cfg.cpp.orig	Sat Sep 16 05:00:37 2006
>-+++ cfg.cpp	Mon Apr  9 19:52:17 2007
>-@@ -211,8 +211,7 @@
>-     int n = -1;
>-     n = position.find("%");
>-     if (n>0) { // X Position expressed in percentage
>--        const char* tmp =  position.substr(0, n).c_str();
>--        int result = (max*string2int(tmp)/100) - (width / 2);
>-+        int result = (max*string2int(position.substr(0, n).c_str())/100) - (width / 2);
>-         return result < 0 ? 0 : result ;
>-     } else { // Absolute X position
>-         return string2int(position.c_str());
>Index: files/patch-slim.conf
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/files/patch-slim.conf,v
>retrieving revision 1.3
>diff -u -u -r1.3 patch-slim.conf
>--- files/patch-slim.conf	11 Dec 2006 13:01:21 -0000	1.3
>+++ files/patch-slim.conf	18 Jul 2007 19:24:15 -0000
>@@ -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:%%X11BASE%%/bin
>-+default_xserver     %%X11BASE%%/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         %%X11BASE%%/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         %%X11BASE%%/bin/xauth
>++xauth_path         $(LOCALBASE)/bin/xauth
>  
>  # Xauth file for server
>  authfile           /var/run/slim.auth
>Index: files/pkg-message.in
>===================================================================
>RCS file: files/pkg-message.in
>diff -N files/pkg-message.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-message.in	18 Jul 2007 19:24:15 -0000
>@@ -0,0 +1,7 @@
>+*************************************************************************
>+
>+Thanks to Nikos Ntarmos, it is now possible to start slim from /etc/ttys.
>+Please see %%PREFIX%%/etc/rc.d/slim for instructions on how to do that.
>+
>+*************************************************************************
>+
>Index: files/slim.sh.in
>===================================================================
>RCS file: /home/ncvs/ports/x11/slim/files/slim.sh.in,v
>retrieving revision 1.2
>diff -u -u -r1.2 slim.sh.in
>--- files/slim.sh.in	11 Dec 2006 13:01:21 -0000	1.2
>+++ files/slim.sh.in	18 Jul 2007 19:24:15 -0000
>@@ -8,6 +8,10 @@
> # slim_enable (bool):      Set to "NO" by default.
> #                          Set it to "YES" to enable slim
> #
>+# Alternatively, edit /etc/ttys and change the line below
>+#   ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure
>+# to this:
>+#   ttyv8   "/usr/local/bin/slim"   xterm   on secure
> 
> . %%RC_SUBR%%
> 
>@@ -18,7 +22,7 @@
> 
> : ${slim_enable="NO"}
> 
>-command=%%LOCALBASE%%/bin/slim
>+command=%%PREFIX%%/bin/slim
> command_args="-d"
> pidfile=/var/run/slim.pid

Actions: View | Diff

Attachments on bug 114708: 79893