summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/gdm/Makefile27
-rw-r--r--x11/gdm/PLIST20
-rw-r--r--x11/gdm/distinfo20
-rwxr-xr-xx11/gdm/files/gdm.sh4
-rw-r--r--x11/gdm/patches/patch-aa58
-rw-r--r--x11/gdm/patches/patch-ac6
-rw-r--r--x11/gdm/patches/patch-ad14
-rw-r--r--x11/gdm/patches/patch-ae41
-rw-r--r--x11/gdm/patches/patch-af127
-rw-r--r--x11/gdm/patches/patch-ag20
-rw-r--r--x11/gdm/patches/patch-ai14
-rw-r--r--x11/gdm/patches/patch-aj14
-rw-r--r--x11/gdm/patches/patch-ak16
13 files changed, 109 insertions, 272 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index bb759575d93..0ea10590459 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2006/03/21 06:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.103 2006/03/30 21:25:48 jmmv Exp $
#
-DISTNAME= gdm-2.8.0.7
-PKGREVISION= 4
+DISTNAME= gdm-2.14.0
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.8/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.14/}
EXTRACT_SUFX= .tar.bz2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png
@@ -14,6 +13,8 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
BUILD_USES_MSGFMT= YES
+DEPENDS+= zenity>=2.14.0:../../x11/zenity
+
BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11
SITES_Daemon.README= ${MASTER_SITE_LOCAL}
@@ -35,10 +36,13 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/gdm/custom.conf
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
-OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions
+OWN_DIRS= ${PKG_SYSCONFDIR}/dm
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/Init
+OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PostLogin
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PostSession
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PreSession
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/modules
@@ -46,17 +50,16 @@ OWN_DIRS+= ${VARBASE}/gdm
OWN_DIRS+= ${VARBASE}/log/gdm
EGDIR= ${PREFIX}/share/examples
-CONF_FILES= ${EGDIR}/dm/Sessions/default.desktop \
- ${PKG_SYSCONFDIR}/dm/Sessions/default.desktop
-.for f in gdm.conf locale.alias \
+CONF_FILES=
+.for f in custom.conf locale.alias \
modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
modules/factory-AccessDwellMouseEvents \
modules/factory-AccessKeyMouseEvents
CONF_FILES+= ${EGDIR}/gdm/${f} \
${PKG_SYSCONFDIR}/gdm/${f}
.endfor
-.for f in Init/Default PostSession/Default PreSession/Default \
- XKeepsCrashing Xsession
+.for f in Init/Default PostLogin/Default.sample PostSession/Default \
+ PreSession/Default XKeepsCrashing Xsession
CONF_FILES_PERMS+= ${EGDIR}/gdm/${f} \
${PKG_SYSCONFDIR}/gdm/${f} \
${ROOT_USER} ${ROOT_GROUP} 0755
@@ -120,6 +123,7 @@ PLIST_SUBST+= DMX=""
.else
PLIST_SUBST+= DMX="@comment "
.endif
+PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next }
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gdm
@@ -129,14 +133,13 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 775fb29e43a..658e9164ff2 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2005/10/22 22:11:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.25 2006/03/30 21:25:48 jmmv Exp $
${DMX}bin/gdm-dmx-reconnect-proxy
bin/gdmXnest
bin/gdmXnestchooser
@@ -31,8 +31,7 @@ share/examples/gdm/PostSession/Default
share/examples/gdm/PreSession/Default
share/examples/gdm/XKeepsCrashing
share/examples/gdm/Xsession
-share/examples/gdm/factory-gdm.conf
-share/examples/gdm/gdm.conf
+share/examples/gdm/custom.conf
share/examples/gdm/locale.alias
share/examples/gdm/modules/AccessDwellMouseEvents
share/examples/gdm/modules/AccessKeyMouseEvents
@@ -40,6 +39,8 @@ share/examples/gdm/modules/factory-AccessDwellMouseEvents
share/examples/gdm/modules/factory-AccessKeyMouseEvents
share/examples/rc.d/gdm
share/gdm/BuiltInSessions/default.desktop
+share/gdm/defaults.conf
+share/gdm/factory-defaults.conf
share/gdm/gdmchooser.glade
share/gdm/gdmphotosetup.glade
share/gdm/gdmsetup.glade
@@ -52,22 +53,16 @@ share/gdm/themes/circles/options.png
share/gdm/themes/circles/screenshot.png
share/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
share/gdm/themes/happygnome-list/background.svg
-share/gdm/themes/happygnome-list/disconnect.png
share/gdm/themes/happygnome-list/gnome-logo.png
share/gdm/themes/happygnome-list/happygnome.xml
share/gdm/themes/happygnome-list/options.png
share/gdm/themes/happygnome-list/screenshot.png
-share/gdm/themes/happygnome-list/session.png
-share/gdm/themes/happygnome-list/system.png
share/gdm/themes/happygnome/GdmGreeterTheme.desktop
share/gdm/themes/happygnome/background.svg
-share/gdm/themes/happygnome/disconnect.png
share/gdm/themes/happygnome/gnome-logo.png
share/gdm/themes/happygnome/happygnome.xml
share/gdm/themes/happygnome/options.png
share/gdm/themes/happygnome/screenshot.png
-share/gdm/themes/happygnome/session.png
-share/gdm/themes/happygnome/system.png
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/de/figures/gdm_window.png
@@ -91,6 +86,8 @@ share/gnome/help/gdm/ko/legal.xml
share/gnome/help/gdm/sv/figures/gdm_window.png
share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/sv/legal.xml
+share/gnome/help/gdm/uk/gdm.xml
+share/gnome/help/gdm/uk/legal.xml
share/gnome/help/gdm/zh_CN/figures/gdm_window.png
share/gnome/help/gdm/zh_CN/gdm.xml
share/gnome/help/gdm/zh_CN/legal.xml
@@ -173,6 +170,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gdm.mo
share/omf/gdm/gdm-C.omf
@@ -183,6 +181,7 @@ share/omf/gdm/gdm-it.omf
share/omf/gdm/gdm-ja.omf
share/omf/gdm/gdm-ko.omf
share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
share/omf/gdm/gdm-zh_CN.omf
share/omf/gdm/gdm-zh_HK.omf
share/omf/gdm/gdm-zh_TW.omf
@@ -232,6 +231,7 @@ share/xsessions/gnome.desktop
@dirrm share/gnome/help/gdm/zh_HK
@dirrm share/gnome/help/gdm/zh_CN/figures
@dirrm share/gnome/help/gdm/zh_CN
+@dirrm share/gnome/help/gdm/uk
@dirrm share/gnome/help/gdm/sv/figures
@dirrm share/gnome/help/gdm/sv
@dirrm share/gnome/help/gdm/ko/figures
@@ -261,8 +261,6 @@ share/xsessions/gnome.desktop
@dirrm share/examples/gdm/PostLogin
@dirrm share/examples/gdm/Init
@dirrm share/examples/gdm
-@exec ${MKDIR} %D/share/examples/dm
-@dirrm share/examples/dm
@dirrm share/doc/gdm
@comment in xdg-dirs: @dirrm share/applications
@comment in gtk2: @dirrm lib/gtk-2.0/modules
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 6ad959000fd..38d7da8619b 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.32 2006/01/24 19:43:50 jmmv Exp $
+$NetBSD: distinfo,v 1.33 2006/03/30 21:25:48 jmmv Exp $
-SHA1 (gdm-2.8.0.7.tar.bz2) = 8643faefc7151f38021a83c7986f08e3a4e2d1b6
-RMD160 (gdm-2.8.0.7.tar.bz2) = 1c75d83e1a0f94ec1b927491a0409ea86e12a51f
-Size (gdm-2.8.0.7.tar.bz2) = 2777760 bytes
+SHA1 (gdm-2.14.0.tar.bz2) = 84e2f91e6215bf2e75f70ded6e7b2afb29c28082
+RMD160 (gdm-2.14.0.tar.bz2) = 1a152d4d2dde11f70be24e6dade98721c3d7c5a1
+Size (gdm-2.14.0.tar.bz2) = 2997013 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) = 649f62f21f55822afb17753cacda9a4bc8873595
SHA1 (patch-ab) = 527a77fd79ba47d897bd4693d0ce7c0eae08081e
-SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
-SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
-SHA1 (patch-ae) = 01288c3cff79f957fb616feeb81234e7fb7210ba
-SHA1 (patch-af) = a52aff5bd9656036a205dd9d76960e3d58d33a67
-SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
+SHA1 (patch-ac) = 1870b541791bfbc41ff30b63debcf493782984f7
+SHA1 (patch-ad) = 66659330d6ac66bc88b7fb5f6f08ba8512be73c5
+SHA1 (patch-ae) = 0fb90856c3a85e896633b83cc9197984b8e96422
+SHA1 (patch-ai) = 9123d74db483148ca65d864626723e6b8e3f2444
+SHA1 (patch-aj) = e675f38079ab309064cadf917a4a9442a7a00ef4
+SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
diff --git a/x11/gdm/files/gdm.sh b/x11/gdm/files/gdm.sh
index 1b92850381e..a4f7e395d4a 100755
--- a/x11/gdm/files/gdm.sh
+++ b/x11/gdm/files/gdm.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: gdm.sh,v 1.3 2005/06/26 16:52:14 jmmv Exp $
+# $NetBSD: gdm.sh,v 1.4 2006/03/30 21:25:48 jmmv Exp $
#
# PROVIDE: gdm
@@ -16,7 +16,7 @@ rcvar=${name}
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
procname="@PREFIX@/sbin/gdm-binary"
-required_files="@PKG_SYSCONFDIR@/gdm/gdm.conf"
+required_files="@PKG_SYSCONFDIR@/gdm/custom.conf"
extra_commands="reload"
if [ -f /etc/rc.subr ]; then
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
deleted file mode 100644
index a2785051a1d..00000000000
--- a/x11/gdm/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2005/10/14 21:47:01 jmmv Exp $
-
---- configure.orig 2005-10-04 05:31:08.000000000 +0200
-+++ configure
-@@ -23168,12 +23168,12 @@ else
- if test "x$ac_cv_env_DAEMON_CFLAGS_set" = "xset"; then
- pkg_cv_DAEMON_CFLAGS=$ac_cv_env_DAEMON_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
-- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
-- ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
-+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
-+ ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
-+ pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -23191,12 +23191,12 @@ else
- if test "x$ac_cv_env_DAEMON_LIBS_set" = "xset"; then
- pkg_cv_DAEMON_LIBS=$ac_cv_env_DAEMON_LIBS_value
- elif test -n "$PKG_CONFIG"; then
-- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
-- ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
-+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
-+ ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
-+ pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -23208,18 +23208,18 @@ echo "$as_me:$LINENO: result: $pkg_cv_DA
- echo "${ECHO_T}$pkg_cv_DAEMON_LIBS" >&6
-
- if test $pkg_failed = yes; then
-- DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
-+ DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED"`
- # Put the nasty error message in config.log where it belongs
- echo "$DAEMON_PKG_ERRORS" 1>&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
- Alternatively you may set the DAEMON_CFLAGS and DAEMON_LIBS environment variables
- to avoid the need to call pkg-config. See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
-+echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
diff --git a/x11/gdm/patches/patch-ac b/x11/gdm/patches/patch-ac
index 4b7d6ef2c94..cca6842223b 100644
--- a/x11/gdm/patches/patch-ac
+++ b/x11/gdm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/02/03 13:37:03 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2006/03/30 21:25:48 jmmv Exp $
---- gui/modules/Makefile.in.orig 2005-02-02 18:35:48.000000000 +0100
+--- gui/modules/Makefile.in.orig 2006-03-13 22:42:41.000000000 +0100
+++ gui/modules/Makefile.in
-@@ -269,7 +269,7 @@ prefix = @prefix@
+@@ -323,7 +323,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
index 2f252f98317..50511c88258 100644
--- a/x11/gdm/patches/patch-ad
+++ b/x11/gdm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2005/07/17 22:53:06 kristerw Exp $
+$NetBSD: patch-ad,v 1.6 2006/03/30 21:25:48 jmmv Exp $
---- daemon/xdmcp.c.orig Sun Jul 17 23:22:30 2005
-+++ daemon/xdmcp.c Sun Jul 17 23:41:59 2005
-@@ -1175,6 +1175,7 @@
+--- daemon/xdmcp.c.orig 2006-02-08 00:57:25.000000000 +0100
++++ daemon/xdmcp.c
+@@ -1142,6 +1142,7 @@ gdm_xdmcp_handle_forward_query (struct s
if (clnt_port.length == 2 &&
clnt_addr.length == 4) {
@@ -10,12 +10,12 @@ $NetBSD: patch-ad,v 1.5 2005/07/17 22:53:06 kristerw Exp $
/* Convert IPv4 address to IPv6 if needed */
struct sockaddr_in tmp_disp_sa = {0};
-@@ -1182,7 +1183,7 @@
+@@ -1149,7 +1150,7 @@ gdm_xdmcp_handle_forward_query (struct s
memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_port, clnt_port.data, 2);
memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr.s_addr, clnt_addr.data, 4);
- char * ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
+ ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
- strcpy(buffer6, "::ffff:");
- strncat(buffer6, ipv4_addr, INET_ADDRSTRLEN);
+ strcpy (buffer6, "::ffff:");
+ strncat (buffer6, ipv4_addr, INET_ADDRSTRLEN);
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index cf211885ec9..c34abaee6e0 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,25 +1,19 @@
-$NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
+$NetBSD: patch-ae,v 1.10 2006/03/30 21:25:48 jmmv Exp $
---- config/Makefile.in.orig 2005-10-03 20:31:14.000000000 -0700
+--- config/Makefile.in.orig 2006-03-13 22:42:30.000000000 +0100
+++ config/Makefile.in
-@@ -277,13 +277,13 @@ prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples
- target_alias = @target_alias@
- pixmapdir = $(datadir)/pixmaps
- confdir = $(sysconfdir)/gdm
--gdmconfdir = $(GDM_CONFIGDIR)
-+gdmconfdir = $(confdir)
- crossconfdir = $(sysconfdir)/dm
--localedir = $(sysconfdir)/gdm
-+localedir = /usr/pkg/share/locale
- bisessdir = $(datadir)/gdm/BuiltInSessions
- instsessdir = $(datadir)/xsessions
- initdir = $(sysconfdir)/gdm/Init
-@@ -539,10 +539,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -545,10 +545,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+ $(mkinstalldirs) $(DESTDIR)$(confdir); \
+ chmod 755 $(DESTDIR)$(confdir); \
+ fi
+- if test '!' -d $(DESTDIR)$(crossconfdir); then \
+- $(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
+- chmod 755 $(DESTDIR)$(crossconfdir); \
+- fi
+ if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
+ $(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+ chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+@@ -577,10 +573,7 @@ install-data-hook: gdm.conf gdm.conf-cus
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
@@ -31,7 +25,7 @@ $NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
if test '!' -d $(DESTDIR)$(bisessdir); then \
$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -618,18 +615,6 @@ install-data-hook: gdm.conf Xsession gno
+@@ -658,20 +651,8 @@ install-data-hook: gdm.conf gdm.conf-cus
chmod 755 $(DESTDIR)$(gnomercdir); \
fi
@@ -48,5 +42,8 @@ $NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
- fi
-
system=`uname`; \
- if test -f /usr/include/security/pam_appl.h; then \
+- if test -f /usr/include/security/pam_appl.h; then \
++ if false; then \
if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
+ $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+ chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
deleted file mode 100644
index 67c32a90cd9..00000000000
--- a/x11/gdm/patches/patch-af
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-af,v 1.12 2006/01/20 13:33:19 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=142338
-
---- vicious-extensions/ve-misc.c.orig 2005-11-22 21:23:27.000000000 +0100
-+++ vicious-extensions/ve-misc.c
-@@ -345,120 +345,6 @@ ve_locale_exists (const char *loc)
- return ret;
- }
-
--/**
-- * ve_setenv:
-- * @name: An environment variable name.
-- * @value: The value to assign to the environment variable.
-- * @overwrite: If %TRUE, overwrite the existing @name variable in the
-- * environment.
-- *
-- * Adds "@name=@value" to the environment. Note that on systems without setenv,
-- * this leaks memory so please do not use inside a loop or anything like that.
-- * The semantics are the same as the glibc setenv() (if setenv() exists, it is
-- * used).
-- *
-- * If @overwrite is %FALSE and the variable already exists in the environment,
-- * then %0 is returned and the value is not changed.
-- *
-- * Returns: %0 on success, %-1 on error
-- *
-- **/
--#if ! GLIB_CHECK_VERSION(2,3,1)
--int
--ve_setenv (const char *name, const char *value, gboolean overwrite)
--{
--#if defined (HAVE_SETENV)
-- return setenv (name, value != NULL ? value : "", overwrite);
--#else
-- char *string;
--
-- if (! overwrite && g_getenv (name) != NULL) {
-- return 0;
-- }
--
-- /* This results in a leak when you overwrite existing
-- * settings. It would be fairly easy to fix this by keeping
-- * our own parallel array or hash table.
-- */
-- string = g_strconcat (name, "=", value, NULL);
-- return putenv (string);
--#endif
--}
--#endif
--
--/**
-- * ve_unsetenv:
-- * @name: The environment variable to unset.
-- *
-- * Description: Removes @name from the environment.
-- * In case there is no native implementation of unsetenv,
-- * this could cause leaks depending on the implementation of
-- * environment.
-- *
-- **/
--#if ! GLIB_CHECK_VERSION(2,3,1)
--void
--ve_unsetenv (const char *name)
--{
--#if defined (HAVE_SETENV)
-- unsetenv (name);
--#else
--
--#ifdef HAVE__NSGETENVIRON
--#define environ (*_NSGetEnviron())
--#else
-- extern char **environ;
--#endif
-- int i, len;
--
-- if (environ == NULL)
-- return;
--
-- len = strlen (name);
--
-- /* Mess directly with the environ array.
-- * This seems to be the only portable way to do this.
-- */
-- for (i = 0; environ[i] != NULL; i++) {
-- if (strncmp (environ[i], name, len) == 0
-- && environ[i][len + 1] == '=') {
-- break;
-- }
-- }
-- while (environ[i] != NULL) {
-- environ[i] = environ[i + 1];
-- i++;
-- }
--#endif
--}
--#endif
--
--/**
-- * ve_clearenv:
-- *
-- * Description: Clears out the environment completely.
-- * In case there is no native implementation of clearenv,
-- * this could cause leaks depending on the implementation
-- * of environment.
-- *
-- **/
--void
--ve_clearenv (void)
--{
--#ifdef HAVE_CLEARENV
-- clearenv ();
--#else
--
--#ifdef HAVE__NSGETENVIRON
--#define environ (*_NSGetEnviron())
--#else
-- extern char **environ;
--#endif
-- if (environ != NULL)
-- environ[0] = NULL;
--#endif
--}
--
- char *
- ve_find_prog_in_path (const char *prog, const char *path)
- {
diff --git a/x11/gdm/patches/patch-ag b/x11/gdm/patches/patch-ag
deleted file mode 100644
index d85360c1a1b..00000000000
--- a/x11/gdm/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/05/17 01:17:46 danw Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=142338
-
---- vicious-extensions/ve-misc.h.orig Sun Apr 11 21:38:02 2004
-+++ vicious-extensions/ve-misc.h
-@@ -86,10 +86,10 @@ gboolean ve_locale_exists (const char *l
- #define ve_setenv g_setenv
- #define ve_unsetenv g_unsetenv
- #else
--int ve_setenv (const char *name, const char *value, gboolean overwrite);
--void ve_unsetenv (const char *name);
-+#define ve_setenv gnome_setenv
-+#define ve_unsetenv gnome_unsetenv
- #endif
--void ve_clearenv (void);
-+#define ve_clearenv gnome_clearenv
-
- /* just like gnome_i18n_get_language_list (in fact if you link to
- gnome it uses that */
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
new file mode 100644
index 00000000000..00fdbb4321a
--- /dev/null
+++ b/x11/gdm/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.5 2006/03/30 21:25:48 jmmv Exp $
+
+--- daemon/gdmconfig.c.orig 2006-03-13 22:18:24.000000000 +0100
++++ daemon/gdmconfig.c
+@@ -38,6 +38,9 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#if defined(__NetBSD__)
++#include <sys/resource.h>
++#endif
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <pwd.h>
diff --git a/x11/gdm/patches/patch-aj b/x11/gdm/patches/patch-aj
new file mode 100644
index 00000000000..d5f49b20858
--- /dev/null
+++ b/x11/gdm/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.3 2006/03/30 21:25:48 jmmv Exp $
+
+--- daemon/server.c.orig 2006-01-19 00:32:50.000000000 +0100
++++ daemon/server.c
+@@ -27,6 +27,9 @@
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
++#if defined(__NetBSD__)
++#include <sys/resource.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
diff --git a/x11/gdm/patches/patch-ak b/x11/gdm/patches/patch-ak
new file mode 100644
index 00000000000..33a1df84fb9
--- /dev/null
+++ b/x11/gdm/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.3 2006/03/30 21:25:48 jmmv Exp $
+
+--- gui/greeter/Makefile.in.orig 2006-03-13 22:42:37.000000000 +0100
++++ gui/greeter/Makefile.in
+@@ -386,9 +386,8 @@ gdmgreeter_SOURCES = \
+ greeter_system.h
+
+ gdmgreeter_LDADD = \
+- -L$(top_builddir)/gui \
+- -lgdmwm \
+- -lgdmcommon \
++ $(top_builddir)/gui/libgdmwm.a \
++ $(top_builddir)/gui/libgdmcommon.a \
+ $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
+ $(GLIB_LIBS) \
+ $(GOBJECT_LIBS) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 15:52:50 +0000