[Midnightbsd-cvs] mports: x11/slim: update to 1.3.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 12 23:18:15 EDT 2009


Log Message:
-----------
update to 1.3.1

Modified Files:
--------------
    mports/x11/slim:
        Makefile (r1.9 -> r1.10)
        distinfo (r1.4 -> r1.5)
    mports/x11/slim/files:
        patch-Makefile.freebsd (r1.4 -> r1.5)
        patch-app.cpp (r1.2 -> r1.3)
        patch-slim.conf (r1.4 -> r1.5)
        slim.sh.in (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/slim/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L x11/slim/Makefile -L x11/slim/Makefile -u -r1.9 -r1.10
--- x11/slim/Makefile
+++ x11/slim/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	slim
-# Date created:				8 Jan 2006
-# Whom:					Tobias Roth <ports at fsck.ch>
-#
 # $MidnightBSD$
-# $FreeBSD: ports/x11/slim/Makefile,v 1.6 2007/01/17 04:41:48 clsung Exp $
-#
 
 PORTNAME=	slim
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
@@ -21,10 +15,8 @@
 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
 
-USE_XLIB=	yes
+USE_XORG=	x11 xft xmu xorg-server xrender
 USE_RC_SUBR=	slim.sh
 
 MAN1=		slim.1
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/slim/distinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/slim/distinfo -L x11/slim/distinfo -u -r1.4 -r1.5
--- x11/slim/distinfo
+++ 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
Index: slim.sh.in
===================================================================
RCS file: /home/cvs/mports/x11/slim/files/slim.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/slim/files/slim.sh.in -L x11/slim/files/slim.sh.in -u -r1.4 -r1.5
--- x11/slim/files/slim.sh.in
+++ x11/slim/files/slim.sh.in
@@ -1,9 +1,9 @@
 #!/bin/sh
+# $MidnightBSD$
 
 # PROVIDE: slim
 # REQUIRE: LOGIN
 
-# $MidnightBSD$
 #
 # Add the following lines to /etc/rc.conf to enable slim:
 # slim_enable (bool):      Set to "NO" by default.
Index: patch-slim.conf
===================================================================
RCS file: /home/cvs/mports/x11/slim/files/patch-slim.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/slim/files/patch-slim.conf -L x11/slim/files/patch-slim.conf -u -r1.4 -r1.5
--- x11/slim/files/patch-slim.conf
+++ x11/slim/files/patch-slim.conf
@@ -1,13 +1,13 @@
---- 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:/usr/local/bin:/usr/X11R6/bin
-+default_xserver     /usr/X11R6/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
@@ -16,14 +16,14 @@
 -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         /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         /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/X11R6/bin/xauth
+-xauth_path         /usr/bin/xauth 
++xauth_path         %%LOCALBASE%%/bin/xauth
  
  # Xauth file for server
  authfile           /var/run/slim.auth
@@ -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
Index: patch-app.cpp
===================================================================
RCS file: /home/cvs/mports/x11/slim/files/patch-app.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11/slim/files/patch-app.cpp -L x11/slim/files/patch-app.cpp -u -r1.2 -r1.3
--- x11/slim/files/patch-app.cpp
+++ 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;
  
Index: patch-Makefile.freebsd
===================================================================
RCS file: /home/cvs/mports/x11/slim/files/patch-Makefile.freebsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/slim/files/patch-Makefile.freebsd -L x11/slim/files/patch-Makefile.freebsd -u -r1.4 -r1.5
--- x11/slim/files/patch-Makefile.freebsd
+++ x11/slim/files/patch-Makefile.freebsd
@@ -1,28 +1,41 @@
---- Makefile.freebsd.orig	Sun Jul 15 16:09:28 2007
-+++ Makefile.freebsd	Wed Jul 18 20:23:58 2007
-@@ -3,18 +3,18 @@
+--- 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
-+CXX?=/usr/bin/g++
-+CC?=/usr/bin/gcc
-+CFLAGS+=-I%%X11BASE%%/include `freetype-config --cflags` `libpng-config --cflags`
-+LDFLAGS=-L%%X11BASE%%/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
+-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
+-  CUSTOM+= -DUSE_PAM
+-.endif
 -PREFIX=/usr
 -CFGDIR=/etc
 -MANDIR=/usr/share/man
-+PREFIX?=%%LOCALBASE%%
++CXX?=/usr/bin/g++
++CC?=/usr/bin/gcc
++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 -lpam
++CUSTOM=-DNEEDS_BASENAME -DUSE_PAM
++PREFIX?=${LOCALBASE}
 +CFGDIR=$(PREFIX)/etc
 +MANDIR=$(MANPREFIX)/man
  DESTDIR=
  #######################################################
  
+@@ -24,10 +20,7 @@
+ DEFINES=-DPACKAGE=\"$(NAME)\" -DVERSION=\"$(VERSION)\" \
+ 		-DPKGDATADIR=\"$(PREFIX)/share/slim\" -DSYSCONFDIR=\"$(CFGDIR)\"
+ 
+-OBJECTS=jpeg.o png.o main.o image.o numlock.o cfg.o switchuser.o app.o panel.o
+-.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
+ 


More information about the Midnightbsd-cvs mailing list