[Midnightbsd-cvs] mports: x11/gdm: update gdm
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 13 21:20:02 EDT 2008
Log Message:
-----------
update gdm
Modified Files:
--------------
mports/x11/gdm:
Makefile (r1.3 -> r1.4)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.2 -> r1.3)
mports/x11/gdm/files:
gdm.in (r1.2 -> r1.3)
patch-config_locale.alias (r1.1 -> r1.2)
Added Files:
-----------
mports/x11/gdm/files:
patch-config_Xsession.in (r1.1)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11/gdm/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11/gdm/pkg-plist -L x11/gdm/pkg-plist -u -r1.2 -r1.3
--- x11/gdm/pkg-plist
+++ x11/gdm/pkg-plist
@@ -238,7 +238,6 @@
@dirrm etc/gdm
@dirrmtry etc/dm/Sessions
@dirrmtry etc/dm
- at dirrmtry sbin
@dirrmtry share/log/gdm
@dirrmtry share/log
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/gdm/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L x11/gdm/Makefile -L x11/gdm/Makefile -u -r1.3 -r1.4
--- x11/gdm/Makefile
+++ x11/gdm/Makefile
@@ -8,35 +8,37 @@
#
PORTNAME= gdm
-PORTVERSION= 2.20.3
+PORTVERSION= 2.20.6
CATEGORIES= x11 gnome ipv6
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= ports at MidnightBSD.org
COMMENT= GNOME 2 version of xdm display manager
+LICENSE= gpl2
BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity
-RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ ck-connector.0:${PORTSDIR}/sysutils/consolekit
+RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
+ xrdb:${PORTSDIR}/x11/xrdb
USE_BZIP2= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_XLIB= yes
USE_XORG= dmx dmxproto
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomedocutils \
gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
-
+CONFIGURE_ARGS=--with-console-kit=yes
GDMDIR?= ${PREFIX}/etc/gdm
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -45,8 +47,7 @@
MAN1= gdm.1
OPTIONS= IPV6 "Enable IPv6 support" on \
- LOG_LIMIT "Limit ~/.xsession-errors size" on \
- CONSOLEKIT "Enable ConsoleKit support" off
+ LOG_LIMIT "Limit ~/.xsession-errors size" on
.include <bsd.port.pre.mk>
@@ -66,21 +67,14 @@
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c
.endif
-.if defined(WITH_CONSOLEKIT)
-CONFIGURE_ARGS+=--with-console-kit=yes
-LIB_DEPENDS+= ck-connector.0:${PORTSDIR}/sysutils/consolekit
-.else
-CONFIGURE_ARGS+=--with-console-kit=no
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
${WRKSRC}/config/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
- ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.xml
+ ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
@${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
- ${WRKSRC}/docs/gdm.1
+ ${WRKSRC}/docs/gdm.1
post-install:
.if !defined(PACKAGE_BUILDING)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/gdm/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11/gdm/distinfo -L x11/gdm/distinfo -u -r1.2 -r1.3
--- x11/gdm/distinfo
+++ x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.20.3.tar.bz2) = 0074b163986cfe48d3998518084c4d00
-SHA256 (gnome2/gdm-2.20.3.tar.bz2) = 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
-SIZE (gnome2/gdm-2.20.3.tar.bz2) = 3891861
+MD5 (gnome2/gdm-2.20.6.tar.bz2) = ca7df60065099887c455ab39919dfad0
+SHA256 (gnome2/gdm-2.20.6.tar.bz2) = bd7ed0be76ddf718d885e4081ea0180a1cb4d4ab588743fb4c4ea349892cb036
+SIZE (gnome2/gdm-2.20.6.tar.bz2) = 3912940
--- /dev/null
+++ x11/gdm/files/patch-config_Xsession.in
@@ -0,0 +1,39 @@
+--- config/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
++++ config/Xsession.in 2008-06-09 01:29:59.000000000 -0400
+@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
+ fi
+ fi
+
++is_gnome=0
++if [ "x$command" = "xgnome-session" ]; then
++ is_gnome=1
++fi
++
++# add seahorse-agent if found
++if [ ${is_gnome} = 1 ]; then
++ seahorseagent="`gdmwhich seahorse-agent`"
++ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
++ command="dbus-launch --exit-with-session $seahorseagent --execute $command"
++ elif [ -z "$seahorseagent" ] ; then
++ echo "$0: seahorse-agent not found!"
++ fi
++fi
++
+ # add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+- command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+- echo "$0: ssh-agent not found!"
++# ssh-agent functionality is handled by gnome-keyring-daemon which is launched
++# from gnome-session
++if [ ${is_gnome} != 1 ]; then
++ sshagent="`gdmwhich ssh-agent`"
++ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
++ command="$sshagent -- $command"
++ elif [ -z "$sshagent" ] ; then
++ echo "$0: ssh-agent not found!"
++ fi
+ fi
+
+ echo "$0: Setup done, will execute: $command"
Index: gdm.in
===================================================================
RCS file: /home/cvs/mports/x11/gdm/files/gdm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11/gdm/files/gdm.in -L x11/gdm/files/gdm.in -u -r1.2 -r1.3
--- x11/gdm/files/gdm.in
+++ x11/gdm/files/gdm.in
@@ -1,9 +1,8 @@
#!/bin/sh
-# $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.6 2007/12/12 04:52:30 mezz Exp $
-# $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.1 2007/12/02 01:41:21 marcus Exp $
+# $MidnightBSD$
# PROVIDE: gdm
-# REQUIRE: LOGIN cleanvar moused
+# REQUIRE: LOGIN cleanvar moused syscons dbus
#
# Add the following to /etc/rc.conf to start GDM at boot time:
#
@@ -15,11 +14,32 @@
gdm_enable=${gdm_enable-${gnome_enable}}
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
+
name=gdm
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
procname="%%PREFIX%%/sbin/gdm-binary"
+start_cmd="gdm_start"
+
+gdm_start()
+{
+ if ! checkyesno gdm_enable ; then
+ return 0
+ fi
+ echo "Starting ${name}."
+
+ ( iter=0
+ while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
+ if [ ${iter} -eq 60 ]; then
+ break
+ fi
+ sleep 1
+ iter=$(expr ${iter} + 1)
+ done
+ ${command} ) &
+}
load_rc_config ${name}
run_rc_command "$1"
Index: patch-config_locale.alias
===================================================================
RCS file: /home/cvs/mports/x11/gdm/files/patch-config_locale.alias,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gdm/files/patch-config_locale.alias -L x11/gdm/files/patch-config_locale.alias -u -r1.1 -r1.2
--- x11/gdm/files/patch-config_locale.alias
+++ x11/gdm/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig Sat Jun 11 02:01:45 2005
-+++ config/locale.alias Sat Jun 11 03:34:22 2005
-@@ -14,132 +14,57 @@
+--- config/locale.alias.orig 2008-03-10 21:53:02.000000000 -0500
++++ config/locale.alias 2008-03-10 21:53:37.000000000 -0500
+@@ -14,133 +14,57 @@
#
# - George
@@ -16,6 +16,7 @@
-Azerbaijani(Iran) az_IR.UTF-8,az_IR
-Basque eu_ES.UTF-8,eu_ES
-Belarusian be_BY.UTF-8,be_BY
+-Belarusian(Latin) be_BY.UTF-8 at latin,be_BY at latin
-Bengali bn_BD.UTF-8,bn_BD
-Bengali(India) bn_IN.UTF-8,bn_IN
-Bosnian bs_BA.UTF-8,bs_BA
More information about the Midnightbsd-cvs
mailing list