From cf72d9f9829b7f8a4ff5d3a2072f9691f2f0f6b8 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Mon, 5 Jul 2004 09:10:19 +0000
Subject: Instead of patching the configure script, just use an argument it
 provides to disable PAM support (in fact, to select the appropiate
 authentication scheme).  No functional changes.

---
 x11/gdm/Makefile         | 12 +++++++-----
 x11/gdm/distinfo         |  4 ++--
 x11/gdm/patches/patch-aa | 18 +-----------------
 3 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'x11/gdm')

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d5ed05d5e1b..e957648d9cc 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2004/06/20 21:25:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2004/07/05 09:10:19 jmmv Exp $
 #
 
 DISTNAME=	gdm-2.6.0.3
@@ -90,13 +90,15 @@ CONFIGURE_ARGS+=	X_SERVER_ARGS="vt05"
 .endif
 
 BUILD_DEFS+=	USE_PAM
-
 .if defined(USE_PAM)
-.include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ENV+=		USE_PAM=yes
+.  include "../../security/PAM/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-authentication-scheme=pam
 PLIST_SUBST+=		PAM_MISC=""
+.elif exists(/etc/shadow)
+CONFIGURE_ARGS+=	--enable-authentication-scheme=shadow
+PLIST_SUBST+=		PAM_MISC="@comment "
 .else
-CONFIGURE_ENV+=		USE_PAM=no
+CONFIGURE_ARGS+=	--enable-authentication-scheme=crypt
 PLIST_SUBST+=		PAM_MISC="@comment "
 .endif
 
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index c060a7f7fea..bee2de484b1 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2004/06/20 21:25:46 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2004/07/05 09:10:19 jmmv Exp $
 
 SHA1 (gdm-2.6.0.3.tar.bz2) = 03462ee0ac5eb7238e7460fc6c985724500470b1
 Size (gdm-2.6.0.3.tar.bz2) = 3079606 bytes
@@ -6,7 +6,7 @@ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 616ffa7ebfe8fa368d9f45c98905b2c25109d315
+SHA1 (patch-aa) = 2704d70b2ad3b3908749e3423fc60e8815287451
 SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309
 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516
 SHA1 (patch-ae) = f05e3bffbcb1522ac6265869eef52655d35511c2
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 90f5e779017..29240d91a75 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2004/06/20 21:25:46 jmmv Exp $
+$NetBSD: patch-aa,v 1.10 2004/07/05 09:10:19 jmmv Exp $
 
 --- configure.orig	2004-06-11 17:49:13.000000000 +0200
 +++ configure
@@ -28,22 +28,6 @@ $NetBSD: patch-aa,v 1.9 2004/06/20 21:25:46 jmmv Exp $
              echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
  echo "${ECHO_T}$DAEMON_LIBS" >&6
          else
-@@ -24803,6 +24804,7 @@ VRFY="verify-crypt"
- if test x$enable_authentication_scheme != xcrypt -a \
- 	x$enable_authentication_scheme != xshadow ; then
- 
-+if [ "${USE_PAM}" = "yes" ]; then
- for ac_header in security/pam_appl.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -24960,6 +24962,7 @@ fi
- done
- 
- fi
-+fi
- 
- GDMASKPASS=
- EXTRA_GDMASKPASS_LIBS=
 @@ -28015,6 +28018,10 @@ else
     X_SERVER="/usr/X11R6/bin/X"
     X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
-- 
cgit v1.2.3