kdm tidy up...

Don't try and build a "shared" greeter library:

	- it never managed it anyway.
	- the libtool workaround produces a binary 10x bigger than the
	  static build.
	- its more resilient method to different versions of X.

Enable login_cap(3) support.

9 files changed, 57 insertions, 94 deletions

diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 08438c0d942..f42a0f3ee38 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/19 09:57:01 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/24 13:42:04 skrll Exp $
 
 DISTNAME=	kdebase-2.1
 CATEGORIES=	x11 kde
@@ -15,6 +15,7 @@ USE_XPM=	yes
 USE_MOTIF=	yes
 .include "../../x11/kde2/Makefile.part2"
 
+CONFIGURE_ARGS+=	--disable-greet-lib
 CONFIGURE_ENV+=	LIBS="-Wl,--export-dynamic"
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/x11/kdebase2/files/patch-sum b/x11/kdebase2/files/patch-sum
index 3a69b3b37e2..45301cc8cac 100644
--- a/x11/kdebase2/files/patch-sum
+++ b/x11/kdebase2/files/patch-sum
@@ -1,10 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2001/03/15 17:58:48 skrll Exp $
+$NetBSD: patch-sum,v 1.5 2001/03/24 13:42:04 skrll Exp $
 
-SHA1 (patch-aa) = 69618f1b6542f66b99922f6f0c00ea777597a6f8
+SHA1 (patch-aa) = 909f6d2d26275df4bddaf395a28542bb732a6d9c
 SHA1 (patch-ab) = 06386d9f87a4782265b00375f4847517be48c1fc
-SHA1 (patch-ac) = f2e200c76a2e77c9666de19ffbeb4388969eaeba
-SHA1 (patch-ad) = fec43e52f595b687f1dcbf4fec05b5c74fb419ab
-SHA1 (patch-ae) = 1d39b67f5d2a4cc23cf0cc4a74622adb86ec3492
 SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f
 SHA1 (patch-ag) = 1666f52f9d31f972c49879d8f314c7f93fd992d4
 SHA1 (patch-ah) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502
@@ -24,3 +21,5 @@ SHA1 (patch-au) = 7e82964090089b37f2e4e1a4ca0f2201506b8303
 SHA1 (patch-av) = edd6bb62a65f7569907d26bf76a65beecc434670
 SHA1 (patch-aw) = 6510c6e55f619778c318a96cd5120bb07d9aa6d9
 SHA1 (patch-ax) = bd3a8494663da789fffd1a9d5340b0f44819f26c
+SHA1 (patch-ay) = 287912fd2f3ff04f0239545a1d215b36cb8c1d0f
+SHA1 (patch-az) = 5af89343863ed55268c9ef22dee394665270cb8b
diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa
index 95207740c35..80216e497eb 100644
--- a/x11/kdebase2/patches/patch-aa
+++ b/x11/kdebase2/patches/patch-aa
@@ -1,8 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/24 13:42:04 skrll Exp $
 
 --- configure.orig	Thu Feb 22 13:17:34 2001
 +++ configure
-@@ -11108,7 +11108,7 @@
+@@ -9944,7 +9944,9 @@
+ 
+ 
+ 
+-for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok
++ac_save_LIBS="$LIBS"
++LIBS="$LIBS -lutil"
++for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok setusercontext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:9951: checking for $ac_func" >&5
+@@ -10001,6 +10003,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
++LIBS="$ac_save_LIBS"
+ 
+ 
+ # Extract the first word of "X", so it can be a program name with args.
+@@ -11108,7 +11111,7 @@
  
      ac_save_ldflags="$LDFLAGS"
      ac_save_cflags="$CFLAGS"
@@ -11,7 +30,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
      CFLAGS="$CFLAGS $X_INCLUDES"
      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
      cat > conftest.$ac_ext <<EOF
-@@ -11173,13 +11173,13 @@
+@@ -11173,13 +11176,13 @@
  
      if test "$GL_LDFLAGS" = ""; then
         if test "$ac_cv_have_gl" = "mesa"; then
@@ -27,7 +46,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
         else
            GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
         fi
-@@ -11576,6 +11576,7 @@
+@@ -11576,6 +11579,7 @@
  case "$host" in 
    *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
    *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac
deleted file mode 100644
index 73234624e6e..00000000000
--- a/x11/kdebase2/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/03/14 20:12:18 skrll Exp $
-
---- kdm/Makefile.am.orig	Mon Feb 19 11:21:43 2001
-+++ kdm/Makefile.am
-@@ -12,7 +12,7 @@
- EXTRA_PROGRAMS = greetest
- greetest_SOURCES = greetest.c
- 
--AM_CFLAGS = $(STD_DEFINES) $(CONN_FLAGS)
-+AM_CFLAGS = $(STD_DEFINES) $(CONN_FLAGS) -DGREETERLIB_DIR=\"@kde_libraries@\"
- 
- # this is for static linking - inserted into KDM_GREET_LIBS by configure
- KDM_KDE_LIBS  = $(LIB_KDEUI) -lXau $(PASSLIB) \
-@@ -24,7 +24,8 @@
- LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSLIB) \
-     $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET) \
-     $(LIBCRYPT) $(LIBUCB) $(LIBDL) $(LIBUTIL) $(LIBRESOLV)
--kdm_LDADD = $(LDADD) $(KDM_GREET_LIBS)
-+kdm_LDADD = "-dlopen" greeter/libKdmGreet.la $(LDADD) $(KDM_GREET_LIBS)
-+kdm_DEPENDENCIES = greeter/libKdmGreet.la
- 
- # Sources for kdm:
- kdm_SOURCES = access.c \
diff --git a/x11/kdebase2/patches/patch-ad b/x11/kdebase2/patches/patch-ad
deleted file mode 100644
index ecd9aa3ef9a..00000000000
--- a/x11/kdebase2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
-
---- kdm/resource.c.orig	Mon Jan 22 12:10:47 2001
-+++ kdm/resource.c
-@@ -140,7 +140,7 @@
- #define DEF_RANDOM_FILE _PATH_MEM
- #endif
- #ifndef DEF_GREETER_LIB
--#define DEF_GREETER_LIB "libKdmGreet.so"
-+#define DEF_GREETER_LIB "libKdmGreet.la"
- #endif
- #ifndef DEF_PID_FILE
- #  if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/x11/kdebase2/patches/patch-ae b/x11/kdebase2/patches/patch-ae
deleted file mode 100644
index 6b0dbec2343..00000000000
--- a/x11/kdebase2/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/03/14 20:12:18 skrll Exp $
-
---- kdm/session.c.orig	Sun Feb 18 15:28:17 2001
-+++ kdm/session.c
-@@ -77,10 +77,7 @@
- #endif
- 
- #ifndef GREET_USER_STATIC
--# include <dlfcn.h>
--# ifndef RTLD_NOW
--#  define RTLD_NOW 1
--# endif
-+#  include <ltdl.h>
- #endif
- 
- #ifdef CSRG_BASED
-@@ -293,7 +290,7 @@
-     greet_user_rtn	greet_stat;
-     static GreetUserProc greet_user_proc = NULL;
- #ifndef GREET_USER_STATIC
--    void		*greet_lib_handle;
-+    lt_dlhandle		greet_lib_handle;
- #endif
- 
-     Debug ("ManageSession %s\n", d->name);
-@@ -309,12 +306,16 @@
-     greet_user_proc = GreetUser;
- #else
-     Debug("ManageSession: loading greeter library %s\n", greeterLib);
--    greet_lib_handle = dlopen(greeterLib, RTLD_NOW);
-+    LTDL_SET_PRELOADED_SYMBOLS();
-+    lt_dlinit();
-+    lt_dladdsearchdir(GREETERLIB_DIR);
-+    greet_lib_handle = lt_dlopen(greeterLib);
-     if (greet_lib_handle != NULL)
--	greet_user_proc = (GreetUserProc)dlsym(greet_lib_handle, "GreetUser");
-+	greet_user_proc = (GreetUserProc)lt_dlsym(greet_lib_handle, "GreetUser");
-     if (greet_user_proc == NULL)
-     {
--	LogError("%s while loading %s\n", dlerror(), greeterLib);
-+        Debug("ManageSession: lt_dlsym returned null\n");
-+	LogError("%s while loading %s\n", lt_dlerror(), greeterLib);
- 	exit(UNMANAGE_DISPLAY);
-     }
- #endif
diff --git a/x11/kdebase2/patches/patch-ay b/x11/kdebase2/patches/patch-ay
new file mode 100644
index 00000000000..a479150755d
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2001/03/24 13:42:05 skrll Exp $
+
+--- kdm/greeter/verify.c.orig	Sun Feb 18 15:28:18 2001
++++ kdm/greeter/verify.c
+@@ -74,7 +74,7 @@
+ static char krbtkfile[MAXPATHLEN];
+ #endif
+ 
+-#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
++#if defined(HAVE_LOGIN_CAP_H)
+ # define USE_LOGIN_CAP 1
+ # include <login_cap.h>
+ #endif
diff --git a/x11/kdebase2/patches/patch-az b/x11/kdebase2/patches/patch-az
new file mode 100644
index 00000000000..2bfe72e75ca
--- /dev/null
+++ b/x11/kdebase2/patches/patch-az
@@ -0,0 +1,14 @@
+$NetBSD: patch-az,v 1.1 2001/03/24 13:42:05 skrll Exp $
+
+--- config.h.in.orig	Thu Feb 22 13:15:14 2001
++++ config.h.in
+@@ -110,6 +110,9 @@
+ /* Define if you have the setpriority function.  */
+ #undef HAVE_SETPRIORITY
+ 
++/* Define if you have the setusercontext function.  */
++#undef HAVE_SETUSERCONTEXT
++
+ /* Define if you have the snprintf function.  */
+ #undef HAVE_SNPRINTF
+ 
diff --git a/x11/kdebase2/pkg/PLIST b/x11/kdebase2/pkg/PLIST
index 5433cf49caa..62ffe4d5832 100644
--- a/x11/kdebase2/pkg/PLIST
+++ b/x11/kdebase2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/03/19 09:57:01 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/03/24 13:42:05 skrll Exp $
 bin/appletproxy
 bin/chooser
 bin/conttest
@@ -376,8 +376,6 @@ lib/kxkb.so
 lib/kxmlrpcd.a
 lib/kxmlrpcd.la
 lib/kxmlrpcd.so
-lib/libKdmGreet.a
-lib/libKdmGreet.la
 lib/libccont.a
 lib/libchildpanelextension.a
 lib/libchildpanelextension.la