- Update to 1.3.1

PR:		127852
Submitted by:	Tobias Roth <ports@fsck.ch> (maintainer)

6 files changed, 24 insertions, 44 deletions

diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 2916f1ace16..5bede772b54 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	slim
-PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTVERSION=	1.3.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://depot.fsck.ch/mirror/distfiles/
diff --git a/x11/slim/distinfo b/x11/slim/distinfo
index fa0b635c554..998b8fc224e 100644
--- a/x11/slim/distinfo
+++ b/x11/slim/distinfo
@@ -1,3 +1,3 @@
-MD5 (slim-1.3.0.tar.gz) = 1c1a87f3cbd3c334c874585e42701961
-SHA256 (slim-1.3.0.tar.gz) = b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b
-SIZE (slim-1.3.0.tar.gz) = 218646
+MD5 (slim-1.3.1.tar.gz) = 727d0acb24c0fbf0751134c37a9c895f
+SHA256 (slim-1.3.1.tar.gz) = acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
+SIZE (slim-1.3.1.tar.gz) = 219446
diff --git a/x11/slim/files/patch-Makefile.freebsd b/x11/slim/files/patch-Makefile.freebsd
index 50f75850d6c..069550dc5d0 100644
--- a/x11/slim/files/patch-Makefile.freebsd
+++ b/x11/slim/files/patch-Makefile.freebsd
@@ -1,13 +1,13 @@
---- Makefile.freebsd.orig	2007-07-15 17:09:28.000000000 +0300
-+++ Makefile.freebsd	2008-05-13 11:56:53.000000000 +0300
+--- 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/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
+-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
@@ -35,7 +35,7 @@
 -.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 
++OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o PAM.o
  
  all: slim
  
diff --git a/x11/slim/files/patch-PAM.cpp b/x11/slim/files/patch-PAM.cpp
deleted file mode 100644
index a32d7d8dea4..00000000000
--- a/x11/slim/files/patch-PAM.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- PAM.cpp.orig	2008-05-13 12:04:37.000000000 +0300
-+++ PAM.cpp	2008-05-13 12:04:45.000000000 +0300
-@@ -6,7 +6,7 @@
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- */
--#include <PAM.h>
-+#include "PAM.h"
- #include <string>
- #include <iostream>
- 
diff --git a/x11/slim/files/patch-app.cpp b/x11/slim/files/patch-app.cpp
index 257d5950f70..239ce63480d 100644
--- a/x11/slim/files/patch-app.cpp
+++ b/x11/slim/files/patch-app.cpp
@@ -1,19 +1,11 @@
---- 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;
- 
-     // Parse command line
-@@ -858,7 +859,7 @@
+--- 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 @@
      }
  
      if (!hasVtSet && daemonmode) {
--        server[argc++] = "vt07";
-+        server[argc++] = "vt09";
+-        server[argc++] = (char*)"vt07";
++        server[argc++] = (char*)"vt09";
      }
      server[argc] = NULL;
  
diff --git a/x11/slim/files/patch-slim.conf b/x11/slim/files/patch-slim.conf
index 892d48b4b46..1a572adc21f 100644
--- a/x11/slim/files/patch-slim.conf
+++ b/x11/slim/files/patch-slim.conf
@@ -1,10 +1,10 @@
---- slim.conf.orig	Thu Nov 16 17:59:38 2006
-+++ slim.conf	Thu Nov 16 18:14:31 2006
+--- 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:/usr/X11R6/bin
--default_xserver     /usr/X11R6/bin/X
+-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
@@ -16,13 +16,13 @@
 -halt_cmd            /sbin/shutdown -h now
 +halt_cmd            /sbin/shutdown -p now
  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"
+-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         %%LOCALBASE%%/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         /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/X11R6/bin/xauth 
+-xauth_path         /usr/bin/xauth 
 +xauth_path         %%LOCALBASE%%/bin/xauth
  
  # Xauth file for server
@@ -38,8 +38,8 @@
  
  # 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
+@@ -63,7 +65,7 @@
+ # session_msg         Session: 
  
  # shutdown / reboot messages
 -shutdown_msg       The system is halting...
@@ -47,7 +47,7 @@
  reboot_msg         The system is rebooting...
  
  # default user, leave blank or remove this line
-@@ -72,7 +74,7 @@
+@@ -84,7 +86,7 @@
  current_theme       default
  
  # Lock file