* Take over maintainership of this port.

* Take a shot at fixing the broken PAM support, which could never possibly
  have worked under FreeBSD because it was using the Linux/Solaris
  PAM module path.  Enable PAM by default on 5.0 and install a config
  file derived from /etc/pam.d/xdm.

4 files changed, 64 insertions, 4 deletions

diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index db896a2fc69c..1d163f819fab 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wdm
 PORTVERSION=	1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://www.tcscs.com/wdm/wdm/ \
 		http://www.de.freebsd.org/de/gif/bsd/ \
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	tg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kris@FreeBSD.org
 
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList
@@ -52,13 +52,18 @@ MAN1=	wdm.1 wdmLogin.1
 
 DAEMONPICS=	beastie.xpm daemon1-HQ-1280x960.jpg
 
+.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)
+WITH_PAM=	yes
+.endif
+
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--enable-pam
 LIBPAM=		-lpam
-.endif
+PLIST_SUB+=	PAM=""
+.else
+PLIST_SUB+=	PAM="@comment "
 
 pre-everything::
-.if !defined(WITH_PAM)
 	@${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"."
 .endif
 
@@ -91,5 +96,12 @@ post-install:
 .for file in ${DAEMONPICS}
 	@${INSTALL_DATA} ${_DISTDIR}/${file} ${PREFIX}/lib/X11/wdm/pixmaps
 .endfor
+.if defined(WITH_PAM)
+.if ( ${OSVERSION} >= 500028 )
+	${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm
+.else
+	@${ECHO_CMD} "To finish installing this port, append the contents of ${FILESDIR}/wdm.pam to your /etc/pam.conf file"
+.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/wdm/files/patch-an b/x11/wdm/files/patch-an
new file mode 100644
index 000000000000..571985e4bc40
--- /dev/null
+++ b/x11/wdm/files/patch-an
@@ -0,0 +1,21 @@
+--- ./src/config/Makefile.in.orig	Sun Oct  6 00:26:45 2002
++++ ./src/config/Makefile.in	Sun Oct  6 00:25:36 2002
+@@ -138,7 +138,6 @@
+ CLEANFILES = wdm-config Xsetup_0 Xservers Xservers.ws Xsession Xclients
+ 
+ EXTRA_DIST = \
+-	wdm.pamd \
+ 	$(configfiles_DATA) \
+ 	$(bin_SCRIPTS)
+ 
+@@ -382,10 +381,6 @@
+ 	$(INSTALL) -m 600 $(srcdir)/wdm-config $(DESTDIR)$(configfilesdir)
+ 	$(INSTALL) -m 644 $(srcdir)/Xsession.in $(DESTDIR)$(configfilesdir)
+ 	$(INSTALL) -m 644 $(srcdir)/Xclients.in $(DESTDIR)$(configfilesdir)
+-
+-install-data-local:
+-@INSTALLPAM_TRUE@	$(INSTALL) -d $(DESTDIR)$(PAMDIR)
+-@INSTALLPAM_TRUE@	$(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
+ 
+ uninstall-hook:
+ 	rm -fr $(DESTDIR)$(configfilesdir)/authdir
diff --git a/x11/wdm/files/wdm.pam b/x11/wdm/files/wdm.pam
new file mode 100644
index 000000000000..19b7a767b7f9
--- /dev/null
+++ b/x11/wdm/files/wdm.pam
@@ -0,0 +1,25 @@
+#
+# PAM configuration for the "wdm" service
+#
+
+# auth
+auth		required	pam_nologin.so	no_warn
+#auth		sufficient	pam_kerberosIV.so	no_warn try_first_pass
+#auth		sufficient	pam_krb5.so	no_warn try_first_pass
+#auth		sufficient	pam_ssh.so	no_warn try_first_pass
+#auth		required	pam_unix.so	no_warn try_first_pass
+auth		required	pam_deny.so
+
+# account
+#account	required	pam_kerberosIV.so
+#account	required	pam_krb5.so
+account		required	pam_unix.so
+
+# session
+#session	required	pam_kerberosIV.so
+#session	required	pam_krb5.so
+#session	required	pam_ssh.so
+session		required	pam_permit.so
+
+# password
+password	required	pam_deny.so
diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist
index 306f83b41922..36f99a72d855 100644
--- a/x11/wdm/pkg-plist
+++ b/x11/wdm/pkg-plist
@@ -35,3 +35,5 @@ lib/X11/wdm/wdmReconfig
 @unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true
 @unexec rmdir %D/lib/X11/wdm/authdir 2>/dev/null || true
 @unexec rmdir %D/lib/X11/wdm 2>/dev/null || true
+%%PAM%%@cwd %%LOCALBASE%%
+%%PAM%%etc/pam.d/wdm