diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-02 12:18:33 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-02 12:18:33 +0000 |
commit | fe1bd7a63ea88ff97b2d9c08f196c7fd75f3d784 (patch) | |
tree | f2c7eadc5b128a5c41015e98903e9d563750afc1 | |
parent | Updated to 0.7b. (diff) |
Update to 2.2.4.1.
PR: 30955
Submitted by: Stijn Hoop <stjin@win.tue.nl>
Notes
Notes:
svn path=/head/; revision=48344
-rw-r--r-- | x11/gdm/Makefile | 12 | ||||
-rw-r--r-- | x11/gdm/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm/files/patch-ab | 70 | ||||
-rw-r--r-- | x11/gdm/files/patch-ar | 15 | ||||
-rw-r--r-- | x11/gdm/files/patch-as | 14 | ||||
-rw-r--r-- | x11/gdm/files/patch-at | 11 | ||||
-rw-r--r-- | x11/gdm/pkg-descr | 18 | ||||
-rw-r--r-- | x11/gdm/pkg-message | 7 | ||||
-rw-r--r-- | x11/gdm/pkg-plist | 70 | ||||
-rw-r--r-- | x11/gdm/pkg-req | 21 | ||||
-rw-r--r-- | x11/gdm2/Makefile | 12 | ||||
-rw-r--r-- | x11/gdm2/distinfo | 2 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ab | 70 | ||||
-rw-r--r-- | x11/gdm2/files/patch-ar | 15 | ||||
-rw-r--r-- | x11/gdm2/files/patch-as | 14 | ||||
-rw-r--r-- | x11/gdm2/files/patch-at | 11 | ||||
-rw-r--r-- | x11/gdm2/pkg-descr | 18 | ||||
-rw-r--r-- | x11/gdm2/pkg-message | 7 | ||||
-rw-r--r-- | x11/gdm2/pkg-plist | 70 | ||||
-rw-r--r-- | x11/gdm2/pkg-req | 21 |
20 files changed, 322 insertions, 158 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 36416942c8ea..cad200b13be9 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.2.3.2 +PORTVERSION= 2.2.4.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gdm @@ -20,6 +20,8 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +GDMDIR?= ${PREFIX}/etc/gdm + pre-fetch: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -32,8 +34,14 @@ pre-patch: 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +pre-install: + @${SH} ${PKGREQ} ${PKGNAME} INSTALL +.endif + post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm/ + @${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm + @${CHOWN} -R 91:91 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 63e2b62dc3eb..927ccf39112c 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1 +1 @@ -MD5 (gdm-2.2.3.2.tar.gz) = 5e05b0b4722061311121f63e02907b50 +MD5 (gdm-2.2.4.1.tar.gz) = b1ea0aca76480f14ae9eb3175da2a65a diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab index cfb9fb8551e8..17c3e8c3aa16 100644 --- a/x11/gdm/files/patch-ab +++ b/x11/gdm/files/patch-ab @@ -1,6 +1,18 @@ ---- config/gdm.conf.in.orig Mon Mar 5 05:27:12 2001 -+++ config/gdm.conf.in Fri Apr 20 20:42:22 2001 -@@ -7,7 +7,7 @@ + +$FreeBSD$ + +--- config/gdm.conf.in.orig Sat Sep 1 13:03:45 2001 ++++ config/gdm.conf.in Tue Oct 2 15:10:39 2001 +@@ -3,7 +3,7 @@ + AutomaticLogin= + AlwaysRestartServer=false + Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog +-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session ++GnomeDefaultSession=@EXPANDED_DATADIR@/default.session + Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog + DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@ + DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init +@@ -11,7 +11,7 @@ Group=gdm HaltCommand=/sbin/shutdown -h now KillInitClients=true @@ -9,11 +21,41 @@ PidFile=/var/run/gdm.pid PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ -@@ -47,11 +47,11 @@ +@@ -19,7 +19,7 @@ + XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing + XKeepsCrashingConfigurators=/usr/bin/X11/XF86Setup /usr/bin/X11/Xconfigurator + RebootCommand=/sbin/shutdown -r now +-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@ ++RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ + ServAuthDir=@EXPANDED_AUTHDIR@ + SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/ + SuspendCommand= +@@ -30,9 +30,9 @@ + TimedLoginEnable=false + TimedLogin= + TimedLoginDelay=30 +-StandardXServer=/usr/bin/X11/X ++StandardXServer=@EXPANDED_BINDIR@/X + FlexibleXServers=5 +-Xnest=/usr/bin/X11/Xnest -name Xnest ++Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest + + [security] + AllowRoot=true +@@ -57,7 +57,7 @@ + Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling + + [gui] +-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc ++GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk/gtkrc + MaxIconWidth=128 + MaxIconHeight=128 + +@@ -68,11 +68,11 @@ DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png - DefaultLocale=english + DefaultLocale=en_US Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm --Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-* +-Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,* +Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,* GlobalFaceDir=@EXPANDED_DATADIR@/faces/ Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm @@ -23,14 +65,10 @@ Quiver=true SystemMenu=true Welcome=Welcome to %n -@@ -75,8 +75,8 @@ - Enable=false +@@ -117,5 +117,5 @@ - [servers] --0=/usr/bin/X11/X --#1=/usr/bin/X11/X -+0=@EXPANDED_BINDIR@/X -+#1=@EXPANDED_BINDIR@/X - #Note: If you want to make sure X runs on a specific virtual console on linux, - # you can use the following (for console 7): - #0=/usr/bin/X11/X vt7 + [server-Standard] + name=Standard server +-command=/usr/bin/X11/X ++command=@EXPANDED_BINDIR@/X + flexible=true diff --git a/x11/gdm/files/patch-ar b/x11/gdm/files/patch-ar new file mode 100644 index 000000000000..cc0de1e8fe55 --- /dev/null +++ b/x11/gdm/files/patch-ar @@ -0,0 +1,15 @@ +--- daemon/gdm-net.c.orig Mon Oct 1 12:37:53 2001 ++++ daemon/gdm-net.c Mon Oct 1 12:37:34 2001 +@@ -156,7 +156,12 @@ + if ( ! conn->writable) + return FALSE; + ++#ifndef __FreeBSD__ + if (send (conn->fd, str, strlen (str), MSG_NOSIGNAL) < 0) ++#else ++ /* According to send(2), FreeBSD doesn't return SIGPIPE */ ++ if (send (conn->fd, str, strlen (str), 0) < 0) ++#endif + return FALSE; + else + return TRUE; diff --git a/x11/gdm/files/patch-as b/x11/gdm/files/patch-as new file mode 100644 index 000000000000..cf7db5183e5d --- /dev/null +++ b/x11/gdm/files/patch-as @@ -0,0 +1,14 @@ +--- gui/gdmflexiserver.c.orig Mon Oct 1 12:39:52 2001 ++++ gui/gdmflexiserver.c Mon Oct 1 12:40:08 2001 +@@ -59,7 +59,11 @@ + g_print ("Sending command: '%s'\n", command); + + cstr = g_strdup_printf ("%s\n", command); ++#ifndef __FreeBSD__ + if (send (fd, cstr, strlen (cstr), MSG_NOSIGNAL) < 0) ++#else ++ if (send (fd, cstr, strlen (cstr), 0) < 0) ++#endif + return NULL; + + if ( ! get_response) diff --git a/x11/gdm/files/patch-at b/x11/gdm/files/patch-at new file mode 100644 index 000000000000..a965d5f38d3e --- /dev/null +++ b/x11/gdm/files/patch-at @@ -0,0 +1,11 @@ +--- utils/Makefile.in.orig Mon Oct 1 12:42:50 2001 ++++ utils/Makefile.in Mon Oct 1 12:43:00 2001 +@@ -161,7 +161,7 @@ + gdmopen_SOURCES = gdmopen.c + + +-gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam -lpam_misc ++gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam + + + gdmopen_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) diff --git a/x11/gdm/pkg-descr b/x11/gdm/pkg-descr index 7f1182d80bb7..984d666fc463 100644 --- a/x11/gdm/pkg-descr +++ b/x11/gdm/pkg-descr @@ -1,14 +1,6 @@ -GNOME version of xdm display manager +The GNOME version of the xdm display manager. It has support for +face pixmaps, multiple sessions plus clean shutdowns from the login +menu. -- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because - those pam is not stable. - I'm sure this works on 5.0-current, and it may works on 4.x-RELEASE - - You should append those lines to your /etc/pam.conf - -# gdm config -gdm auth requisite pam_unix.so try_first_pass -gdm account requisite pam_unix.so try_first_pass -gdm session required pam_permit.so - -This notes is written by: Yukihiro Nakai <nakai@FreeBSD.org> +For now it only works with the 3.3.x series of XFree86 and a fairly +recent FreeBSD (4.x-STABLE). diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message index 9e2cea3c0699..36a2d11510f5 100644 --- a/x11/gdm/pkg-message +++ b/x11/gdm/pkg-message @@ -1,11 +1,8 @@ GDM is installed. Please note the following: -- Add 'gdm' user and 'gdm' group by handle. -- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because - PAM is not stable. -- This port has been tested on 5.0-CURRENT and 4.1.1-STABLE. - 4.x-RELEASE may or may not work. +- This port has been tested on 5.0-CURRENT and 4.4-STABLE. It only works + with XFree86-3.3.x. It will not work on 3.x. - You should append these lines to your /etc/pam.conf, otherwise GDM will refuse all logins: diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index f02e97e0f0d2..71e99f849bed 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -1,63 +1,44 @@ bin/gdm +bin/gdmXnestchooser bin/gdmchooser bin/gdmconfig +bin/gdmflexiserver bin/gdmlogin bin/gdmphotosetup -sbin/gdm-restart -sbin/gdm-safe-restart etc/gdm/Init/Default etc/gdm/PostSession/Default etc/gdm/PreSession/Default -etc/gdm/Sessions/Xsession etc/gdm/Sessions/Gnome -etc/gdm/factory-gdm.conf +etc/gdm/Sessions/Xsession etc/gdm/XKeepsCrashing +etc/gdm/factory-gdm.conf etc/gdm/gdm.conf etc/gdm/gnomerc etc/gdm/locale.alias -share/gnome/apps/System/gdmconfig.desktop +sbin/gdm-restart +sbin/gdm-safe-restart +sbin/gdmaskpass share/gnome/apps/Settings/gdmphotosetup.desktop +share/gnome/apps/System/gdmconfig.desktop +share/gnome/apps/System/gdmflexiserver-xnest.desktop +share/gnome/apps/System/gdmflexiserver.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmconfig.glade share/gnome/help/gdm/C/configuration.html share/gnome/help/gdm/C/daemonov.html -share/gnome/help/gdm/C/docbook.css share/gnome/help/gdm/C/f39.html share/gnome/help/gdm/C/gdm.html share/gnome/help/gdm/C/index.html share/gnome/help/gdm/C/intro.html -share/gnome/help/gdm/C/x155.html +share/gnome/help/gdm/C/ln33.html +share/gnome/help/gdm/C/x156.html share/gnome/help/gdm/C/x80.html share/gnome/help/gdm/C/x89.html -share/gnome/help/gdmconfig/C/index.html -share/gnome/help/gdmconfig/C/gdmconfig.sgml -share/gnome/help/gdmconfig/C/authors.html share/gnome/help/gdmconfig/C/basic.html -share/gnome/help/gdmconfig/C/bugs.html -share/gnome/help/gdmconfig/C/expert.html -share/gnome/help/gdmconfig/C/license.html -share/gnome/help/gdmconfig/C/ln7.html -share/gnome/help/gdmconfig/C/system.html -share/gnome/help/gdmconfig/C/usage.html -share/gnome/help/gdmconfig/C/docbook.css -share/gnome/help/gdmconfig/C/topic.dat -share/gnome/help/gdmconfig/C/stylesheet-images/caution.gif -share/gnome/help/gdmconfig/C/stylesheet-images/home.gif -share/gnome/help/gdmconfig/C/stylesheet-images/important.gif -share/gnome/help/gdmconfig/C/stylesheet-images/next.gif -share/gnome/help/gdmconfig/C/stylesheet-images/note.gif -share/gnome/help/gdmconfig/C/stylesheet-images/prev.gif -share/gnome/help/gdmconfig/C/stylesheet-images/tip.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-blank.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-minus.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-plus.gif -share/gnome/help/gdmconfig/C/stylesheet-images/up.gif -share/gnome/help/gdmconfig/C/stylesheet-images/warning.gif share/gnome/help/gdmconfig/C/figures/GDM_auto_login.png share/gnome/help/gdmconfig/C/figures/GDM_background.png share/gnome/help/gdmconfig/C/figures/GDM_chooser.png share/gnome/help/gdmconfig/C/figures/GDM_enviro.png -share/gnome/help/gdmconfig/C/figures/GDM_expert_misc.png share/gnome/help/gdmconfig/C/figures/GDM_face_brow.png share/gnome/help/gdmconfig/C/figures/GDM_full.png share/gnome/help/gdmconfig/C/figures/GDM_login_appear.png @@ -69,6 +50,11 @@ share/gnome/help/gdmconfig/C/figures/GDM_paths.png share/gnome/help/gdmconfig/C/figures/GDM_security.png share/gnome/help/gdmconfig/C/figures/GDM_xdmcp.png share/gnome/help/gdmconfig/C/figures/GDM_xserv_setup.png +share/gnome/help/gdmconfig/C/gdmconfig.sgml +share/gnome/help/gdmconfig/C/index.html +share/gnome/help/gdmconfig/C/ln7.html +share/gnome/help/gdmconfig/C/topic.dat +share/gnome/help/gdmconfig/C/usage.html share/gnome/omf/gdm/gdmconfig-C.omf share/gnome/pixmaps/gdm.xpm share/gnome/pixmaps/nobody.png @@ -104,19 +90,19 @@ share/locale/sv/LC_MESSAGES/gdm.mo share/locale/tr/LC_MESSAGES/gdm.mo share/locale/uk/LC_MESSAGES/gdm.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gdm.mo -@dirrm etc/gdm/Init -@dirrm etc/gdm/PostSession -@dirrm etc/gdm/PreSession -@dirrm etc/gdm/Sessions -@dirrm etc/gdm -@dirrm etc/pam.d +share/locale/zh_TW/LC_MESSAGES/gdm.mo @dirrm share/gnome/omf/gdm -@dirrm share/gnome/gdm -@dirrm share/gnome/help/gdm/C/images -@dirrm share/gnome/help/gdm/C -@dirrm share/gnome/help/gdm @dirrm share/gnome/help/gdmconfig/C/stylesheet-images @dirrm share/gnome/help/gdmconfig/C/figures @dirrm share/gnome/help/gdmconfig/C @dirrm share/gnome/help/gdmconfig +@dirrm share/gnome/help/gdm/C/images +@dirrm share/gnome/help/gdm/C +@dirrm share/gnome/help/gdm +@dirrm share/gnome/gdm +@dirrm etc/pam.d +@dirrm etc/gdm/Sessions +@dirrm etc/gdm/PreSession +@dirrm etc/gdm/PostSession +@dirrm etc/gdm/Init +@dirrm etc/gdm diff --git a/x11/gdm/pkg-req b/x11/gdm/pkg-req new file mode 100644 index 000000000000..22dd46c6f7ad --- /dev/null +++ b/x11/gdm/pkg-req @@ -0,0 +1,21 @@ +if [ "$2" != "INSTALL" ]; then + exit 0 +fi +if ! id -u gdm > /dev/null 2>&1; then + echo "You need an account \"gdm\" to install this package." + echo "Please add it by hand (try \"man vipw\") and try again." + echo "" + echo "An example passwd entry is:" + echo "gdm:*:91:91::0:0:GNOME Display Manager:/nonexistent:/nonexistent" + echo "" + exit 1 +fi +if ! grep -s ^gdm: /etc/group > /dev/null 2>&1; then + echo "You need a group \"gdm\" to install this package." + echo "Please add it by hand and try again." + echo "An example /etc/group entry is:" + echo "gdm:*:91:gdm" + echo "" + exit 1 +fi +exit 0 diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 36416942c8ea..cad200b13be9 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gdm -PORTVERSION= 2.2.3.2 +PORTVERSION= 2.2.4.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gdm @@ -20,6 +20,8 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +GDMDIR?= ${PREFIX}/etc/gdm + pre-fetch: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -32,8 +34,14 @@ pre-patch: 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +pre-install: + @${SH} ${PKGREQ} ${PKGNAME} INSTALL +.endif + post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm/ + @${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm + @${CHOWN} -R 91:91 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 63e2b62dc3eb..927ccf39112c 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gdm-2.2.3.2.tar.gz) = 5e05b0b4722061311121f63e02907b50 +MD5 (gdm-2.2.4.1.tar.gz) = b1ea0aca76480f14ae9eb3175da2a65a diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index cfb9fb8551e8..17c3e8c3aa16 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,6 +1,18 @@ ---- config/gdm.conf.in.orig Mon Mar 5 05:27:12 2001 -+++ config/gdm.conf.in Fri Apr 20 20:42:22 2001 -@@ -7,7 +7,7 @@ + +$FreeBSD$ + +--- config/gdm.conf.in.orig Sat Sep 1 13:03:45 2001 ++++ config/gdm.conf.in Tue Oct 2 15:10:39 2001 +@@ -3,7 +3,7 @@ + AutomaticLogin= + AlwaysRestartServer=false + Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog +-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session ++GnomeDefaultSession=@EXPANDED_DATADIR@/default.session + Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog + DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@ + DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init +@@ -11,7 +11,7 @@ Group=gdm HaltCommand=/sbin/shutdown -h now KillInitClients=true @@ -9,11 +21,41 @@ PidFile=/var/run/gdm.pid PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ -@@ -47,11 +47,11 @@ +@@ -19,7 +19,7 @@ + XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing + XKeepsCrashingConfigurators=/usr/bin/X11/XF86Setup /usr/bin/X11/Xconfigurator + RebootCommand=/sbin/shutdown -r now +-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@ ++RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@ + ServAuthDir=@EXPANDED_AUTHDIR@ + SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/ + SuspendCommand= +@@ -30,9 +30,9 @@ + TimedLoginEnable=false + TimedLogin= + TimedLoginDelay=30 +-StandardXServer=/usr/bin/X11/X ++StandardXServer=@EXPANDED_BINDIR@/X + FlexibleXServers=5 +-Xnest=/usr/bin/X11/Xnest -name Xnest ++Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest + + [security] + AllowRoot=true +@@ -57,7 +57,7 @@ + Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling + + [gui] +-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc ++GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk/gtkrc + MaxIconWidth=128 + MaxIconHeight=128 + +@@ -68,11 +68,11 @@ DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png - DefaultLocale=english + DefaultLocale=en_US Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm --Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-* +-Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,* +Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,* GlobalFaceDir=@EXPANDED_DATADIR@/faces/ Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm @@ -23,14 +65,10 @@ Quiver=true SystemMenu=true Welcome=Welcome to %n -@@ -75,8 +75,8 @@ - Enable=false +@@ -117,5 +117,5 @@ - [servers] --0=/usr/bin/X11/X --#1=/usr/bin/X11/X -+0=@EXPANDED_BINDIR@/X -+#1=@EXPANDED_BINDIR@/X - #Note: If you want to make sure X runs on a specific virtual console on linux, - # you can use the following (for console 7): - #0=/usr/bin/X11/X vt7 + [server-Standard] + name=Standard server +-command=/usr/bin/X11/X ++command=@EXPANDED_BINDIR@/X + flexible=true diff --git a/x11/gdm2/files/patch-ar b/x11/gdm2/files/patch-ar new file mode 100644 index 000000000000..cc0de1e8fe55 --- /dev/null +++ b/x11/gdm2/files/patch-ar @@ -0,0 +1,15 @@ +--- daemon/gdm-net.c.orig Mon Oct 1 12:37:53 2001 ++++ daemon/gdm-net.c Mon Oct 1 12:37:34 2001 +@@ -156,7 +156,12 @@ + if ( ! conn->writable) + return FALSE; + ++#ifndef __FreeBSD__ + if (send (conn->fd, str, strlen (str), MSG_NOSIGNAL) < 0) ++#else ++ /* According to send(2), FreeBSD doesn't return SIGPIPE */ ++ if (send (conn->fd, str, strlen (str), 0) < 0) ++#endif + return FALSE; + else + return TRUE; diff --git a/x11/gdm2/files/patch-as b/x11/gdm2/files/patch-as new file mode 100644 index 000000000000..cf7db5183e5d --- /dev/null +++ b/x11/gdm2/files/patch-as @@ -0,0 +1,14 @@ +--- gui/gdmflexiserver.c.orig Mon Oct 1 12:39:52 2001 ++++ gui/gdmflexiserver.c Mon Oct 1 12:40:08 2001 +@@ -59,7 +59,11 @@ + g_print ("Sending command: '%s'\n", command); + + cstr = g_strdup_printf ("%s\n", command); ++#ifndef __FreeBSD__ + if (send (fd, cstr, strlen (cstr), MSG_NOSIGNAL) < 0) ++#else ++ if (send (fd, cstr, strlen (cstr), 0) < 0) ++#endif + return NULL; + + if ( ! get_response) diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at new file mode 100644 index 000000000000..a965d5f38d3e --- /dev/null +++ b/x11/gdm2/files/patch-at @@ -0,0 +1,11 @@ +--- utils/Makefile.in.orig Mon Oct 1 12:42:50 2001 ++++ utils/Makefile.in Mon Oct 1 12:43:00 2001 +@@ -161,7 +161,7 @@ + gdmopen_SOURCES = gdmopen.c + + +-gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam -lpam_misc ++gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam + + + gdmopen_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) diff --git a/x11/gdm2/pkg-descr b/x11/gdm2/pkg-descr index 7f1182d80bb7..984d666fc463 100644 --- a/x11/gdm2/pkg-descr +++ b/x11/gdm2/pkg-descr @@ -1,14 +1,6 @@ -GNOME version of xdm display manager +The GNOME version of the xdm display manager. It has support for +face pixmaps, multiple sessions plus clean shutdowns from the login +menu. -- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because - those pam is not stable. - I'm sure this works on 5.0-current, and it may works on 4.x-RELEASE - - You should append those lines to your /etc/pam.conf - -# gdm config -gdm auth requisite pam_unix.so try_first_pass -gdm account requisite pam_unix.so try_first_pass -gdm session required pam_permit.so - -This notes is written by: Yukihiro Nakai <nakai@FreeBSD.org> +For now it only works with the 3.3.x series of XFree86 and a fairly +recent FreeBSD (4.x-STABLE). diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 9e2cea3c0699..36a2d11510f5 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,11 +1,8 @@ GDM is installed. Please note the following: -- Add 'gdm' user and 'gdm' group by handle. -- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because - PAM is not stable. -- This port has been tested on 5.0-CURRENT and 4.1.1-STABLE. - 4.x-RELEASE may or may not work. +- This port has been tested on 5.0-CURRENT and 4.4-STABLE. It only works + with XFree86-3.3.x. It will not work on 3.x. - You should append these lines to your /etc/pam.conf, otherwise GDM will refuse all logins: diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index f02e97e0f0d2..71e99f849bed 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -1,63 +1,44 @@ bin/gdm +bin/gdmXnestchooser bin/gdmchooser bin/gdmconfig +bin/gdmflexiserver bin/gdmlogin bin/gdmphotosetup -sbin/gdm-restart -sbin/gdm-safe-restart etc/gdm/Init/Default etc/gdm/PostSession/Default etc/gdm/PreSession/Default -etc/gdm/Sessions/Xsession etc/gdm/Sessions/Gnome -etc/gdm/factory-gdm.conf +etc/gdm/Sessions/Xsession etc/gdm/XKeepsCrashing +etc/gdm/factory-gdm.conf etc/gdm/gdm.conf etc/gdm/gnomerc etc/gdm/locale.alias -share/gnome/apps/System/gdmconfig.desktop +sbin/gdm-restart +sbin/gdm-safe-restart +sbin/gdmaskpass share/gnome/apps/Settings/gdmphotosetup.desktop +share/gnome/apps/System/gdmconfig.desktop +share/gnome/apps/System/gdmflexiserver-xnest.desktop +share/gnome/apps/System/gdmflexiserver.desktop share/gnome/gdm/gdmchooser.glade share/gnome/gdm/gdmconfig.glade share/gnome/help/gdm/C/configuration.html share/gnome/help/gdm/C/daemonov.html -share/gnome/help/gdm/C/docbook.css share/gnome/help/gdm/C/f39.html share/gnome/help/gdm/C/gdm.html share/gnome/help/gdm/C/index.html share/gnome/help/gdm/C/intro.html -share/gnome/help/gdm/C/x155.html +share/gnome/help/gdm/C/ln33.html +share/gnome/help/gdm/C/x156.html share/gnome/help/gdm/C/x80.html share/gnome/help/gdm/C/x89.html -share/gnome/help/gdmconfig/C/index.html -share/gnome/help/gdmconfig/C/gdmconfig.sgml -share/gnome/help/gdmconfig/C/authors.html share/gnome/help/gdmconfig/C/basic.html -share/gnome/help/gdmconfig/C/bugs.html -share/gnome/help/gdmconfig/C/expert.html -share/gnome/help/gdmconfig/C/license.html -share/gnome/help/gdmconfig/C/ln7.html -share/gnome/help/gdmconfig/C/system.html -share/gnome/help/gdmconfig/C/usage.html -share/gnome/help/gdmconfig/C/docbook.css -share/gnome/help/gdmconfig/C/topic.dat -share/gnome/help/gdmconfig/C/stylesheet-images/caution.gif -share/gnome/help/gdmconfig/C/stylesheet-images/home.gif -share/gnome/help/gdmconfig/C/stylesheet-images/important.gif -share/gnome/help/gdmconfig/C/stylesheet-images/next.gif -share/gnome/help/gdmconfig/C/stylesheet-images/note.gif -share/gnome/help/gdmconfig/C/stylesheet-images/prev.gif -share/gnome/help/gdmconfig/C/stylesheet-images/tip.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-blank.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-minus.gif -share/gnome/help/gdmconfig/C/stylesheet-images/toc-plus.gif -share/gnome/help/gdmconfig/C/stylesheet-images/up.gif -share/gnome/help/gdmconfig/C/stylesheet-images/warning.gif share/gnome/help/gdmconfig/C/figures/GDM_auto_login.png share/gnome/help/gdmconfig/C/figures/GDM_background.png share/gnome/help/gdmconfig/C/figures/GDM_chooser.png share/gnome/help/gdmconfig/C/figures/GDM_enviro.png -share/gnome/help/gdmconfig/C/figures/GDM_expert_misc.png share/gnome/help/gdmconfig/C/figures/GDM_face_brow.png share/gnome/help/gdmconfig/C/figures/GDM_full.png share/gnome/help/gdmconfig/C/figures/GDM_login_appear.png @@ -69,6 +50,11 @@ share/gnome/help/gdmconfig/C/figures/GDM_paths.png share/gnome/help/gdmconfig/C/figures/GDM_security.png share/gnome/help/gdmconfig/C/figures/GDM_xdmcp.png share/gnome/help/gdmconfig/C/figures/GDM_xserv_setup.png +share/gnome/help/gdmconfig/C/gdmconfig.sgml +share/gnome/help/gdmconfig/C/index.html +share/gnome/help/gdmconfig/C/ln7.html +share/gnome/help/gdmconfig/C/topic.dat +share/gnome/help/gdmconfig/C/usage.html share/gnome/omf/gdm/gdmconfig-C.omf share/gnome/pixmaps/gdm.xpm share/gnome/pixmaps/nobody.png @@ -104,19 +90,19 @@ share/locale/sv/LC_MESSAGES/gdm.mo share/locale/tr/LC_MESSAGES/gdm.mo share/locale/uk/LC_MESSAGES/gdm.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gdm.mo -@dirrm etc/gdm/Init -@dirrm etc/gdm/PostSession -@dirrm etc/gdm/PreSession -@dirrm etc/gdm/Sessions -@dirrm etc/gdm -@dirrm etc/pam.d +share/locale/zh_TW/LC_MESSAGES/gdm.mo @dirrm share/gnome/omf/gdm -@dirrm share/gnome/gdm -@dirrm share/gnome/help/gdm/C/images -@dirrm share/gnome/help/gdm/C -@dirrm share/gnome/help/gdm @dirrm share/gnome/help/gdmconfig/C/stylesheet-images @dirrm share/gnome/help/gdmconfig/C/figures @dirrm share/gnome/help/gdmconfig/C @dirrm share/gnome/help/gdmconfig +@dirrm share/gnome/help/gdm/C/images +@dirrm share/gnome/help/gdm/C +@dirrm share/gnome/help/gdm +@dirrm share/gnome/gdm +@dirrm etc/pam.d +@dirrm etc/gdm/Sessions +@dirrm etc/gdm/PreSession +@dirrm etc/gdm/PostSession +@dirrm etc/gdm/Init +@dirrm etc/gdm diff --git a/x11/gdm2/pkg-req b/x11/gdm2/pkg-req new file mode 100644 index 000000000000..22dd46c6f7ad --- /dev/null +++ b/x11/gdm2/pkg-req @@ -0,0 +1,21 @@ +if [ "$2" != "INSTALL" ]; then + exit 0 +fi +if ! id -u gdm > /dev/null 2>&1; then + echo "You need an account \"gdm\" to install this package." + echo "Please add it by hand (try \"man vipw\") and try again." + echo "" + echo "An example passwd entry is:" + echo "gdm:*:91:91::0:0:GNOME Display Manager:/nonexistent:/nonexistent" + echo "" + exit 1 +fi +if ! grep -s ^gdm: /etc/group > /dev/null 2>&1; then + echo "You need a group \"gdm\" to install this package." + echo "Please add it by hand and try again." + echo "An example /etc/group entry is:" + echo "gdm:*:91:gdm" + echo "" + exit 1 +fi +exit 0 |