From 446fa529a82806eb4b5d0ca9ca52199ddae3860c Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 23 Jul 2005 21:34:55 +0000 Subject: Remove some obsolete packages using gnome[1]-libs. List posted to tech-pkg by jmmv on June 15, no negative comments. --- x11/Makefile | 4 +- x11/gdm1/DEINSTALL | 15 ----- x11/gdm1/DESCR | 23 ------- x11/gdm1/INSTALL | 16 ----- x11/gdm1/Makefile | 127 ------------------------------------- x11/gdm1/PLIST | 80 ----------------------- x11/gdm1/distinfo | 22 ------- x11/gdm1/files/gdm | 20 ------ x11/gdm1/patches/patch-aa | 42 ------------ x11/gdm1/patches/patch-ab | 50 --------------- x11/gdm1/patches/patch-ac | 10 --- x11/gdm1/patches/patch-ae | 13 ---- x11/gdm1/patches/patch-af | 32 ---------- x11/gdm1/patches/patch-ah | 14 ---- x11/gdm1/patches/patch-ai | 19 ------ x11/gdm1/patches/patch-ba | 12 ---- x11/gdm1/patches/patch-bb | 13 ---- x11/gdm1/patches/patch-bc | 77 ---------------------- x11/gdm1/patches/patch-bd | 24 ------- x11/gnome-gkrellm/DESCR | 4 -- x11/gnome-gkrellm/Makefile | 20 ------ x11/gnome-gkrellm/PLIST | 2 - x11/gnome-gkrellm/distinfo | 6 -- x11/gnome-gkrellm/patches/patch-aa | 37 ----------- 24 files changed, 1 insertion(+), 681 deletions(-) delete mode 100644 x11/gdm1/DEINSTALL delete mode 100644 x11/gdm1/DESCR delete mode 100644 x11/gdm1/INSTALL delete mode 100644 x11/gdm1/Makefile delete mode 100644 x11/gdm1/PLIST delete mode 100644 x11/gdm1/distinfo delete mode 100755 x11/gdm1/files/gdm delete mode 100644 x11/gdm1/patches/patch-aa delete mode 100644 x11/gdm1/patches/patch-ab delete mode 100644 x11/gdm1/patches/patch-ac delete mode 100644 x11/gdm1/patches/patch-ae delete mode 100644 x11/gdm1/patches/patch-af delete mode 100644 x11/gdm1/patches/patch-ah delete mode 100644 x11/gdm1/patches/patch-ai delete mode 100644 x11/gdm1/patches/patch-ba delete mode 100644 x11/gdm1/patches/patch-bb delete mode 100644 x11/gdm1/patches/patch-bc delete mode 100644 x11/gdm1/patches/patch-bd delete mode 100644 x11/gnome-gkrellm/DESCR delete mode 100644 x11/gnome-gkrellm/Makefile delete mode 100644 x11/gnome-gkrellm/PLIST delete mode 100644 x11/gnome-gkrellm/distinfo delete mode 100644 x11/gnome-gkrellm/patches/patch-aa (limited to 'x11') diff --git a/x11/Makefile b/x11/Makefile index 5b9848d1d90..02ef4b7b026 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.398 2005/07/22 21:22:45 adam Exp $ +# $NetBSD: Makefile,v 1.399 2005/07/23 21:34:55 wiz Exp $ # COMMENT= Packages to support the X window system @@ -41,10 +41,8 @@ SUBDIR+= fspanel SUBDIR+= fvwm-wharf SUBDIR+= gdkxft SUBDIR+= gdm -SUBDIR+= gdm1 SUBDIR+= ggiterm SUBDIR+= gnome-desktop -SUBDIR+= gnome-gkrellm SUBDIR+= gnome-libs SUBDIR+= gnome-mag SUBDIR+= gnome-panel diff --git a/x11/gdm1/DEINSTALL b/x11/gdm1/DEINSTALL deleted file mode 100644 index 6f96097cf6d..00000000000 --- a/x11/gdm1/DEINSTALL +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2004/01/20 13:33:06 xtraeme Exp $ - -if [ "$2" = DEINSTALL ] -then - cd @GDMCFGDIR@ - @RM@ -f Sessions/Default - for SOURCE in @GDMCFGFILES@ - do - TARGET=${SOURCE%.default*}${SOURCE##*.default} - if cmp -s $SOURCE $TARGET - then - @RM@ -f $TARGET - fi - done -fi diff --git a/x11/gdm1/DESCR b/x11/gdm1/DESCR deleted file mode 100644 index a9642e94e74..00000000000 --- a/x11/gdm1/DESCR +++ /dev/null @@ -1,23 +0,0 @@ -The Gnome Display Manager is a re-implementation of the well known xdm -program. gdm 2.0beta4 implements all significant features required for -managing local and remote displays. - -gdm daemon: - o X Authentication - o Default and per-display initialization scripts - o Pre and post session scripts - o Pluggable Authentication Modules - o XDMCP - o TCP Wrappers for access control - -gdmlogin: - o Logo image - o Halt and reboot - o Iconified login window - o Session selection support - o Language selection support - o Face browser - -gdmchooser: - o Visual host browser - o Customizable icons diff --git a/x11/gdm1/INSTALL b/x11/gdm1/INSTALL deleted file mode 100644 index 67cb90bbaaa..00000000000 --- a/x11/gdm1/INSTALL +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: INSTALL,v 1.1.1.1 2004/01/20 13:33:06 xtraeme Exp $ - -if [ "$2" = POST-INSTALL ] -then - cd @GDMCFGDIR@ - for SOURCE in @GDMCFGFILES@ - do - TARGET=${SOURCE%.default*}${SOURCE##*.default} - if [ ! -f $TARGET ] - then - @MKDIR@ `dirname $TARGET` - @CP@ -p $SOURCE $TARGET - fi - done - @LN@ -fs Gnome Sessions/Default -fi diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile deleted file mode 100644 index 11018b9cde6..00000000000 --- a/x11/gdm1/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2005/05/31 11:24:33 dillo Exp $ - -DISTNAME= gdm-2.2.0 -PKGREVISION= 7 -CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.2/} \ - ${MASTER_SITE_LOCAL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png - -MAINTAINER= mjl@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= Gnome Display Manager - a re-implementation of the xdm program - -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - - -USE_PKGINSTALL= YES -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - -USE_DIRS+= xdg-1.1 -USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES -USE_X11BASE= YES - -LOCALSTATEDIR= ${VARBASE}/gnome - -EVAL_PREFIX+= KDEBASEDIR=kdebase -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ - GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} - -MAKE_ENV+= GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} -MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN} -PLIST_SUBST+= GDMOWN=${GDMOWN} GDMGRP=${GDMGRP} \ - INSTALL="${INSTALL}" LOCALSTATEDIR="${LOCALSTATEDIR}" - -GDMCFGDIR= ${PREFIX}/etc/gdm -GDMCFGFILES= Default:Init.default/Default \ - PostSession:PostSession.default/Default \ - PreSession:PreSession.default/Default \ - Gnome:Sessions.default/Gnome \ - KDE:Sessions.default/KDE \ - Xsession:Sessions.default/Xsession \ - gdm.conf:gdm.conf.default \ - locale.alias:locale.alias.default \ - gnomerc:../gnomerc.default - -FILES_SUBST+= GDMCFGDIR=${GDMCFGDIR:Q} -FILES_SUBST+= GDMCFGFILES=${GDMCFGFILES:C/.*://g:Q} - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CFLAGS+= -DSunOS -GDMOWN= daemon -GDMGRP= other -.else -GDMOWN= daemon -GDMGRP= daemon -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.gdm1 -PKG_SUPPORTED_OPTIONS= pam -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mpam) -. include "../../mk/pam.buildlink3.mk" -.else -SUBST_CLASSES+= pam -SUBST_MESSAGE.pam= "Disabling PAM support." -SUBST_STAGE.pam= pre-configure -SUBST_FILES.pam= configure -SUBST_SED.pam= -e 's:security/pam_appl.h:nopam:g' -.endif - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" -.include "../../x11/gnome-libs/buildlink3.mk" - -post-build: - cd ${WRKSRC}/config; \ - for f in Default PostSession PreSession; do \ - ${SED} -e 's#/usr/bin/X11#${X11BASE}/bin#g' $$f >$$f.new; \ - ${MV} $$f.new $$f; \ - ${CHMOD} +x $$f; \ - done - cd ${WRKSRC}/config; \ - ${RM} -f KDE Xsession; \ - ${ECHO} '#! ${SH}' >KDE; \ - ${ECHO} "export KDEDIR=${KDEBASEDIR}" >>KDE; \ - ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ - ${ECHO} '#! ${SH}' >Xsession; \ - ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ - ${CHMOD} +x KDE Xsession - ${SED} "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/gdm > ${WRKDIR}/gdm - -post-install: - ${CHMOD} +x ${WRKSRC}/config/gnomerc -.for FILE in ${GDMCFGFILES} - @cd ${WRKSRC}/config; \ - SOURCE=${FILE:C/:.*//}; \ - TARGET=${GDMCFGDIR}/${FILE:C/.*://:S/.default//}; \ - if [ ! -f $$TARGET ]; then \ - ${ECHO} "installing $$SOURCE as $$TARGET"; \ - if [ -x $$SOURCE ]; then \ - ${INSTALL_SCRIPT} $$SOURCE $$TARGET; \ - else \ - ${INSTALL_DATA} $$SOURCE $$TARGET; \ - fi; \ - fi; \ - TARGET=${GDMCFGDIR}/${FILE:C/.*://}; \ - ${INSTALL_DATA_DIR} `dirname $$TARGET`; \ - ${ECHO} "installing $$SOURCE as $$TARGET"; \ - if [ -x $$SOURCE ]; then \ - ${INSTALL_SCRIPT} $$SOURCE $$TARGET; \ - else \ - ${INSTALL_DATA} $$SOURCE $$TARGET; \ - fi -.endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gdm - ${INSTALL_DATA} ${DISTDIR}/Daemon.README ${PREFIX}/share/doc/gdm - ${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps - ${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default - ${INSTALL_SCRIPT} ${WRKDIR}/gdm ${PREFIX}/etc/rc.d/ - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/gdm1/PLIST b/x11/gdm1/PLIST deleted file mode 100644 index 868cad1f41a..00000000000 --- a/x11/gdm1/PLIST +++ /dev/null @@ -1,80 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/20 13:33:08 xtraeme Exp $ -bin/gdm -bin/gdmchooser -bin/gdmconfig -bin/gdmlogin -etc/gdm/Init.default/Default -etc/gdm/PostSession.default/Default -etc/gdm/PreSession.default/Default -etc/gdm/Sessions.default/Gnome -etc/gdm/Sessions.default/KDE -etc/gdm/Sessions.default/Xsession -etc/gdm/gdm.conf.default -etc/gdm/locale.alias.default -etc/gnomerc.default -etc/gdm/Sessions/Failsafe -etc/gdm/gnomerc -etc/rc.d/gdm -share/doc/gdm/Daemon.README -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/f21.html -share/gnome/help/gdm/C/gdm.html -@exec ${MKDIR} %D/share/gnome/help/gdm/C/images -share/gnome/help/gdm/C/index.html -share/gnome/help/gdm/C/intro.html -share/gnome/help/gdm/C/ln15.html -share/gnome/help/gdm/C/x60.html -share/gnome/help/gdm/C/x69.html -share/gnome/help/gdm/C/x135.html -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo -${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gdm.mo -share/gnome/apps/System/gdmconfig.desktop -share/gdm/gdmconfig.glade -share/gdm/gdmchooser.glade -share/pixmaps/Daemon.png -share/pixmaps/gdm.xpm -share/pixmaps/nobody.png -share/pixmaps/nohost.png -@dirrm share/gnome/help/gdm/C/images -@dirrm share/gnome/help/gdm/C -@dirrm share/gnome/help/gdm -@dirrm share/gdm -@dirrm share/doc/gdm -@dirrm etc/gdm/Sessions.default -@dirrm etc/gdm/PreSession.default -@dirrm etc/gdm/PostSession.default -@dirrm etc/gdm/Init.default -@unexec ${RMDIR} %D/etc/gdm/Sessions %D/etc/gdm/PreSession %D/etc/gdm/PostSession %D/etc/gdm/Init %D/etc/gdm 2>/dev/null || ${TRUE} -@exec ${INSTALL} -d -o ${GDMOWN} -g ${GDMGRP} -m 750 ${LOCALSTATEDIR}/gdm -@unexec ${RM} -rf ${LOCALSTATEDIR}/gdm diff --git a/x11/gdm1/distinfo b/x11/gdm1/distinfo deleted file mode 100644 index 7bb79365999..00000000000 --- a/x11/gdm1/distinfo +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 17:36:10 wiz Exp $ - -SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1 -RMD160 (gdm-2.2.0.tar.gz) = 6b6b930847a34bca368a066bbe86ee43b581978b -Size (gdm-2.2.0.tar.gz) = 810976 bytes -SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b -RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 -Size (Daemon.README) = 2191 bytes -SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d -RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7 -Size (Daemon.png) = 15725 bytes -SHA1 (patch-aa) = 3c060965959e0605c87e19ce23243d90cd2a8f9a -SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1 -SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c -SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5 -SHA1 (patch-af) = b1e863e414de026e77eb0f24810d7aa811011c15 -SHA1 (patch-ah) = c5f5d5456945a8a2e27c12a811e257195b67b93a -SHA1 (patch-ai) = ae0181bc4b6f4c554b564744f410b7899dc8b7e6 -SHA1 (patch-ba) = 35e1ac11945b2e72270fcf2fb5be60e3168a48d9 -SHA1 (patch-bb) = 0a3b2d0013e6abee732e4f66677f2c916691f49f -SHA1 (patch-bc) = 2c110458e84110d75a4384484bf17458595aedaf -SHA1 (patch-bd) = 9bee6d79104058ab4bb67892c72f846bd270d2ce diff --git a/x11/gdm1/files/gdm b/x11/gdm1/files/gdm deleted file mode 100755 index cc6eda8fb3e..00000000000 --- a/x11/gdm1/files/gdm +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# $NetBSD: gdm,v 1.1.1.1 2004/01/20 13:33:08 xtraeme Exp $ -# - -# PROVIDE: gdm -# REQUIRE: DAEMON LOGIN wscons -# KEYWORD: shutdown - -. /etc/rc.subr - -name="gdm" -rcvar=$name -command="@PREFIX@/bin/${name}" -pidfile="/var/run/${name}.pid" -required_files="@PREFIX@/etc/gdm/gdm.conf" -extra_commands="reload" - -load_rc_config $name -run_rc_command "$1" diff --git a/x11/gdm1/patches/patch-aa b/x11/gdm1/patches/patch-aa deleted file mode 100644 index ca3d8e4ed1e..00000000000 --- a/x11/gdm1/patches/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2004/07/03 10:37:24 jmmv Exp $ - ---- configure.orig 2001-03-13 00:23:59.000000000 +0000 -+++ configure 2004-07-03 10:09:16.000000000 +0000 -@@ -4620,7 +4620,7 @@ - < $srcdir/po/POTFILES.in > po/POTFILES - - --for ac_func in setenv unsetenv -+for ac_func in setenv unsetenv setlogin - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:4627: checking for $ac_func" >&5 -@@ -4976,7 +4976,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lXinerama $GTK_LIBS $LIBS" -+LIBS="-lXinerama -lXext $GTK_LIBS $LIBS" - cat > conftest.$ac_ext <&6 -@@ -5289,6 +5289,10 @@ - s%@LIBGLADE_LIBS@%$LIBGLADE_LIBS%g - s%@CONSOLE_HELPER_TRUE@%$CONSOLE_HELPER_TRUE%g - s%@CONSOLE_HELPER_FALSE@%$CONSOLE_HELPER_FALSE%g -+s%@GDMOWN@%$GDMOWN%g -+s%@GDMGRP@%$GDMGRP%g -+s%@X11BASE@%$X11BASE%g -+s%@LOCALBASE@%$LOCALBASE%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g - s%@MSGFMT@%$MSGFMT%g diff --git a/x11/gdm1/patches/patch-ab b/x11/gdm1/patches/patch-ab deleted file mode 100644 index 022d5f62261..00000000000 --- a/x11/gdm1/patches/patch-ab +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/20 13:33:13 xtraeme Exp $ - ---- config/gdm.conf.in.orig Sun Mar 4 15:27:12 2001 -+++ config/gdm.conf.in Fri Jul 26 19:51:41 2002 -@@ -1,10 +1,10 @@ - [daemon] - AutomaticLogin= - Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog --DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@ -+DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin - DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init - Greeter=@EXPANDED_BINDIR@/gdmlogin --disable-sound --disable-crash-dialog --Group=gdm -+Group=@GDMGRP@ - HaltCommand=/sbin/shutdown -h now - KillInitClients=true - LogDir=@EXPANDED_AUTHDIR@ -@@ -12,10 +12,10 @@ - PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ - PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ - 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/local/bin:@X11BASE@/bin:@LOCALBASE@/bin - ServAuthDir=@EXPANDED_AUTHDIR@ - SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/ --User=gdm -+User=@GDMOWN@ - UserAuthDir= - UserAuthFBDir=/tmp - UserAuthFile=.Xauthority -@@ -51,7 +51,7 @@ - GlobalFaceDir=@EXPANDED_DATADIR@/faces/ - Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm - LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias --Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png -+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png - Quiver=true - SystemMenu=true - Welcome=Welcome to %n -@@ -75,8 +75,8 @@ - Enable=false - - [servers] --0=/usr/bin/X11/X --#1=/usr/bin/X11/X -+0=@X11BASE@/bin/X -+#1=@X11BASE@/bin/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 diff --git a/x11/gdm1/patches/patch-ac b/x11/gdm1/patches/patch-ac deleted file mode 100644 index 93e88510125..00000000000 --- a/x11/gdm1/patches/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/01/20 13:33:13 xtraeme Exp $ - ---- config/Gnome.in.orig Tue Mar 20 02:24:39 2001 -+++ config/Gnome.in Tue Mar 20 02:25:08 2001 -@@ -1,4 +1,4 @@ --#!/bin/bash -login -+#!/bin/sh - - for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER" - do diff --git a/x11/gdm1/patches/patch-ae b/x11/gdm1/patches/patch-ae deleted file mode 100644 index f9dbb414070..00000000000 --- a/x11/gdm1/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/20 13:33:13 xtraeme Exp $ - ---- po/Makefile.in.in.orig Tue Mar 20 02:30:22 2001 -+++ po/Makefile.in.in Tue Mar 20 02:30:39 2001 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/x11/gdm1/patches/patch-af b/x11/gdm1/patches/patch-af deleted file mode 100644 index e899ff3c2e0..00000000000 --- a/x11/gdm1/patches/patch-af +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- daemon/slave.c.orig Mon Mar 5 01:29:54 2001 -+++ daemon/slave.c Tue Oct 22 20:28:04 2002 -@@ -457,11 +457,14 @@ - gdm_setenv ("DISPLAY", d->name); - gdm_setenv ("LOGNAME", login); - gdm_setenv ("USER", login); -+#ifndef HAVE_SETLOGIN - gdm_setenv ("USERNAME", login); -+#endif - gdm_setenv ("HOME", pwent->pw_dir); - gdm_setenv ("GDMSESSION", session); - gdm_setenv ("SHELL", pwent->pw_shell); - gdm_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */ -+ gdm_unsetenv ("GROUP"); - - /* Special PATH for root */ - if (pwent->pw_uid == 0) -@@ -517,7 +520,11 @@ - if (setgid (pwent->pw_gid) < 0) - gdm_slave_exit (DISPLAY_REMANAGE, - _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid); -- -+#ifdef HAVE_SETLOGIN -+ if (setlogin (login) < 0) -+ gdm_slave_exit (DISPLAY_REMANAGE, -+ _("gdm_slave_session_start: Could not set login name %s. Aborting."), login); -+#endif - if (initgroups (login, pwent->pw_gid) < 0) - gdm_slave_exit (DISPLAY_REMANAGE, - _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login); diff --git a/x11/gdm1/patches/patch-ah b/x11/gdm1/patches/patch-ah deleted file mode 100644 index 7fd9dcf9bba..00000000000 --- a/x11/gdm1/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- config.h.in.orig Tue Oct 22 20:34:02 2002 -+++ config.h.in Tue Oct 22 20:34:28 2002 -@@ -102,6 +102,9 @@ - /* Define if you have the unsetenv function. */ - #undef HAVE_UNSETENV - -+/* Define if you have the setlogin function. */ -+#undef HAVE_SETLOGIN -+ - /* Define if you have the header file. */ - #undef HAVE_X11_SM_SMLIB_H - diff --git a/x11/gdm1/patches/patch-ai b/x11/gdm1/patches/patch-ai deleted file mode 100644 index 069e98781f8..00000000000 --- a/x11/gdm1/patches/patch-ai +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- gui/gdmchooser.c Tue Oct 22 20:48:21 2002 -+++ gui/gdmchooser.c.orig Tue Oct 22 20:47:33 2002 -@@ -47,7 +47,14 @@ - #include - #include - #include -+#ifdef SunOS -+#define BSD_COMP - #include -+#undef BSD_COMP -+#else -+#include -+#endif -+ - #include - - #include "gdmchooser.h" diff --git a/x11/gdm1/patches/patch-ba b/x11/gdm1/patches/patch-ba deleted file mode 100644 index 20881a29a6e..00000000000 --- a/x11/gdm1/patches/patch-ba +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- daemon/gdm.c.orig Tue Mar 20 02:55:01 2001 -+++ daemon/gdm.c Tue Mar 20 02:55:20 2001 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "gdm.h" - #include "misc.h" diff --git a/x11/gdm1/patches/patch-bb b/x11/gdm1/patches/patch-bb deleted file mode 100644 index 2a2cba6e3aa..00000000000 --- a/x11/gdm1/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- daemon/verify-crypt.c.orig Tue Mar 20 02:56:33 2001 -+++ daemon/verify-crypt.c Tue Mar 20 02:57:04 2001 -@@ -113,7 +113,7 @@ - * Unregister the user's session */ - - void --gdm_verify_check (void) -+gdm_verify_cleanup (void) - { - } - diff --git a/x11/gdm1/patches/patch-bc b/x11/gdm1/patches/patch-bc deleted file mode 100644 index 6ea1e7f9a9b..00000000000 --- a/x11/gdm1/patches/patch-bc +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2004/01/20 13:33:14 xtraeme Exp $ - ---- config/Makefile.in.orig Tue Mar 13 11:24:39 2001 -+++ config/Makefile.in -@@ -257,7 +257,7 @@ mostlyclean distclean maintainer-clean - install-data-hook: gdm.conf gnomerc Gnome Failsafe - if test '!' -d $(confdir); then \ - $(mkinstalldirs) $(confdir); \ -- chmod 755 $(confdir); \ -+ ${CHMOD} 755 $(confdir); \ - fi - if test '!' -f $(confdir)/gdm.conf; then \ - $(INSTALL_DATA) gdm.conf $(confdir)/gdm.conf; \ -@@ -269,7 +269,7 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(sessdir); then \ - $(mkinstalldirs) $(sessdir); \ -- chmod 755 $(sessdir); \ -+ ${CHMOD} 755 $(sessdir); \ - fi - if test '!' -f $(sessdir)/Xsession; then \ - $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ -@@ -283,7 +283,7 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(initdir); then \ - $(mkinstalldirs) $(initdir); \ -- chmod 755 $(initdir); \ -+ ${CHMOD} 755 $(initdir); \ - fi - if test '!' -f $(initdir)/Default; then \ - $(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default; \ -@@ -291,7 +291,7 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(predir); then \ - $(mkinstalldirs) $(predir); \ -- chmod 755 $(predir); \ -+ ${CHMOD} 755 $(predir); \ - fi - if test '!' -f $(predir)/Default; then \ - $(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default; \ -@@ -299,7 +299,7 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(postdir); then \ - $(mkinstalldirs) $(postdir); \ -- chmod 755 $(postdir); \ -+ ${CHMOD} 755 $(postdir); \ - fi - if test '!' -f $(postdir)/Default; then \ - $(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default; \ -@@ -307,7 +307,7 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(gnomercdir); then \ - $(mkinstalldirs) $(gnomercdir); \ -- chmod 755 $(gnomercdir); \ -+ ${CHMOD} 755 $(gnomercdir); \ - fi - if test '!' -f $(gnomercdir)/gnomerc; then \ - $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \ -@@ -315,15 +315,15 @@ install-data-hook: gdm.conf gnomerc Gnom - - if test '!' -d $(authdir); then \ - $(mkinstalldirs) $(authdir); \ -- chown gdm.gdm $(authdir); \ -- chmod 750 $(authdir); \ -+ ${CHOWN} ${GDMOWN}:${GDMGRP} $(authdir); \ -+ ${CHMOD} 750 $(authdir); \ - fi - - system=`uname`; \ - if test -f /usr/include/security/pam_appl.h; then \ - if test '!' -d $(sysconfdir)/pam.d; then \ - $(mkinstalldirs) $(sysconfdir)/pam.d; \ -- chmod 755 $(sysconfdir)/pam.d; \ -+ ${CHMOD} 755 $(sysconfdir)/pam.d; \ - fi; \ - if test $$system = Linux && test '!' -f $(sysconfdir)/pam.d/gdm; then \ - $(INSTALL_DATA) gdm $(sysconfdir)/pam.d/gdm; \ diff --git a/x11/gdm1/patches/patch-bd b/x11/gdm1/patches/patch-bd deleted file mode 100644 index e46143ca9fd..00000000000 --- a/x11/gdm1/patches/patch-bd +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bd,v 1.1.1.1 2004/01/20 13:33:15 xtraeme Exp $ - ---- gui/gdmlogin.c.orig Sun Mar 11 23:24:07 2001 -+++ gui/gdmlogin.c Sat Jul 27 11:07:27 2002 -@@ -1971,11 +1971,19 @@ - const char * const lockout_passes[] = { "*", "!!", NULL }; - gint i; - -+ /* -+ * pw_passwd is set to "*" on NetBSD as well as when shadow passwords are -+ * used; in these cases, the following code effectively eliminates any -+ * functionality from the 'faces browser'. -+ * (pointed out by Cliff in PR pkg/17184) -+ */ -+#ifdef broken - for (i=0 ; lockout_passes[i] != NULL ; i++) { - if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) { - return TRUE; - } - } -+#endif - - if (GdmExclude != NULL && - GdmExclude[0] != '\0') { diff --git a/x11/gnome-gkrellm/DESCR b/x11/gnome-gkrellm/DESCR deleted file mode 100644 index 5a3c124f302..00000000000 --- a/x11/gnome-gkrellm/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -This plugin will interface GKrellM to Gnome and give you session management. -For Gnome compliant window managers, you can set the options: ontop, sticky, -skip winlist, and skip focus. For the Gnome panel, you can set the option: -don't put on the tasklist. diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile deleted file mode 100644 index 12233f93f76..00000000000 --- a/x11/gnome-gkrellm/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:47 jlam Exp $ - -DISTNAME= gkrellm-gnome -PKGNAME= gnome-gkrellm-0.1 -PKGREVISION= 6 -CATEGORIES= gnome sysutils -MASTER_SITES= http://web.wt.net/~billw/gkrellm/Plugins/ - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://web.wt.net/~billw/gkrellm/Plugins.html -COMMENT= gkrellm gnome plugin - -USE_TOOLS+= gmake - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../x11/gnome-libs/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-gkrellm/PLIST b/x11/gnome-gkrellm/PLIST deleted file mode 100644 index 3bd14036a6a..00000000000 --- a/x11/gnome-gkrellm/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:49 zuntum Exp $ -lib/gkrellm/plugins/gkrellm-gnome.so diff --git a/x11/gnome-gkrellm/distinfo b/x11/gnome-gkrellm/distinfo deleted file mode 100644 index a8f476e1b9d..00000000000 --- a/x11/gnome-gkrellm/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 17:36:10 wiz Exp $ - -SHA1 (gkrellm-gnome.tar.gz) = d8d18ebdf09a4b314ac305e37c9412f44f722bc5 -RMD160 (gkrellm-gnome.tar.gz) = a2028e2c8498ea86a060622a5c4921156fa768d7 -Size (gkrellm-gnome.tar.gz) = 5825 bytes -SHA1 (patch-aa) = 02414b2eb6d2697b295870a8827d9e626367f4e8 diff --git a/x11/gnome-gkrellm/patches/patch-aa b/x11/gnome-gkrellm/patches/patch-aa deleted file mode 100644 index 5a4adb0bf28..00000000000 --- a/x11/gnome-gkrellm/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/30 13:25:49 damon Exp $ - ---- src/Makefile.orig Sun Jan 14 17:03:48 2001 -+++ src/Makefile -@@ -1,4 +1,4 @@ --PLUGIN_INSTALLDIR ?= /usr/local/share/gkrellm/plugins -+PLUGIN_INSTALLDIR = ${PREFIX}/lib/gkrellm/plugins - - - GNOME_INCLUDE = `gnome-config --cflags gnome gnomeui` -@@ -7,7 +7,7 @@ - GTK_INCLUDE = `gtk-config --cflags` - GTK_LIB = `gtk-config --libs` - --FLAGS = -O2 -Wall -fPIC $(GNOME_INCLUDE) $(GTK_INCLUDE) -+CFLAGS += -fPIC $(GNOME_INCLUDE) $(GTK_INCLUDE) -I${PREFIX}/include - LIBS = $(GNOME_LIB) $(GTK_LIB) - LFLAGS = -shared - -@@ -20,7 +20,7 @@ - endif - - --CC = gcc $(FLAGS) $(CFLAGS) -+CC = gcc $(CFLAGS) - - OBJS = gkrellm-gnome.o - -@@ -31,7 +31,6 @@ - rm -f *.o core *.so* *.bak *~ - - install: -- install -d -m 755 $(PLUGIN_INSTALLDIR) -- install -c -s -m 755 gkrellm-gnome.so $(PLUGIN_INSTALLDIR) -+ install -c -s -m 644 gkrellm-gnome.so $(PLUGIN_INSTALLDIR) - - gkrellm-gnome.c.o: gkrellm-gnome.c -- cgit v1.2.3