diff options
author | Koop Mast <kwm@FreeBSD.org> | 2005-04-11 08:12:57 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2005-04-11 08:12:57 +0000 |
commit | 4a8351ae742edecd934f29aeed4e7f39e1923a73 (patch) | |
tree | 343f05cce3e28e26540b135d61d044bceff3f0c5 /x11/gdm | |
parent | Update to version 1.25. (diff) |
Install a rcNG startup script, instead of the old one.
Remove some comment about a bug in pam for FreeBSD < 5.1-Release.
Notes
Notes:
svn path=/head/; revision=132995
Diffstat (limited to 'x11/gdm')
-rw-r--r-- | x11/gdm/Makefile | 8 | ||||
-rw-r--r-- | x11/gdm/files/gdm.sh.in | 30 | ||||
-rw-r--r-- | x11/gdm/files/gdm.sh.sample | 21 | ||||
-rw-r--r-- | x11/gdm/pkg-message | 18 | ||||
-rw-r--r-- | x11/gdm/pkg-plist | 1 |
5 files changed, 34 insertions, 44 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 2c4ff8a2bb28..16888547046c 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdm PORTVERSION= 2.6.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 @@ -19,6 +19,7 @@ COMMENT= GNOME 2 version of xdm display manager USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_RC_SUBR= gdm.sh USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui librsvg2 USE_LIBTOOL_VER=15 @@ -49,10 +50,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -post-extract: - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" \ - ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample - post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) @@ -66,7 +63,6 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${MKDIR} ${PREFIX}/etc/gdm/Sessions - @${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ | /usr/bin/fmt 75 79 > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.sh.in new file mode 100644 index 000000000000..6f5f15052cd6 --- /dev/null +++ b/x11/gdm/files/gdm.sh.in @@ -0,0 +1,30 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: gdm +# REQUIRE: DAEMON +# KEYWORD: FreeBSD shutdown + +gdm_enable=${gdm_enable-"NO"} + +. %%RC_SUBR%% + +name=gdm +rcvar=`set_rcvar` +start_cmd=gdm_start +stop_cmd=gdm_stop +command="%%PREFIX%%/bin/${name}" +pidfile="/var/run/${name}.pid" + +gdm_start() { + checkyesno gdm_enable && echo "Starting GDM " && \ + ${command} +} + +gdm_stop() { + checkyesno gdm_enable && echo " Stopping GDM. " && \ + /usr/bin/killall -m ${name} 2>/dev/null +} + +load_rc_config ${name} +run_rc_command "$1" diff --git a/x11/gdm/files/gdm.sh.sample b/x11/gdm/files/gdm.sh.sample deleted file mode 100644 index 1b9f904996e0..000000000000 --- a/x11/gdm/files/gdm.sh.sample +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -PREFIX=%%PREFIX%% - -case "$1" in -start) - ${PREFIX}/bin/gdm - ;; -stop) - /usr/bin/killall -m gdm 2>/dev/null - ;; -*) - echo "Usage: `basename $0` start | stop" - exit 64 - ;; - -esac - -exit 0 diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message index 0cb31d808339..9131c3eb44c6 100644 --- a/x11/gdm/pkg-message +++ b/x11/gdm/pkg-message @@ -1,9 +1,8 @@ GDM is installed. Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm -hanging or restarting constantly. Instead, copy the included gdm.sh.sample -script to gdm.sh, and restart. This script is found in -%%PREFIX%%/etc/rc.d. +hanging or restarting constantly. Instead, add gdm_enable="YES" to +/etc/rc.conf. GDM will be started automatic on the next reboot. GDM uses its own locale.alias file to determine its language and especially the GNOME 2 fontencoding. This file is located in @@ -11,16 +10,3 @@ the GNOME 2 fontencoding. This file is located in country using the EURO currency is set to ISO8859-15 in order to enable the EURO sign. If you do not feel comfortable with this, edit this file according to your preferences. - -If you are running 5.X and you are running 5.1-RELEASE or earlier, GDM will -fail to work due to a bug in OpenPAM. You can download a patch from -http://www.FreeBSD.org/~marcus/pam_get_user.c.diff. You must also have the -FreeBSD src tree on your system. Do the following to apply the patch: - -# cd /usr - -# patch -p < /path/to/pam_get_user.c.diff - - -Then rebuild and install world. Note, this bug does _NOT_ affect FreeBSD -4.X. diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 3ad26a32b649..6c71328e2b44 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -25,7 +25,6 @@ etc/gdm/modules/factory-AccessDwellMouseEvents @unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi etc/gdm/modules/factory-AccessKeyMouseEvents @exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents -etc/rc.d/gdm.sh.sample lib/gtk-2.0/modules/libdwellmouselistener.so lib/gtk-2.0/modules/libkeymouselistener.so %%PAM_MISC%%libexec/gdmaskpass |