diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 2000-03-07 11:52:41 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 2000-03-07 11:52:41 +0000 |
| commit | e1b505174b754db5d2ad08340ed525a1d145f6e3 (patch) | |
| tree | 34bea759b1e82adfd5a5c73cb2eafff7aafc120f /x11/wdm | |
| parent | New port pysol-sound-server. Despite its name, it's a rather generic (diff) | |
Add PAM support to wdm.
Submitted by: ume
Reviewed by: cpiazza
Notes
Notes:
svn path=/head/; revision=26612
Diffstat (limited to 'x11/wdm')
| -rw-r--r-- | x11/wdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/wdm/files/patch-ag | 29 | ||||
| -rw-r--r-- | x11/wdm/files/patch-al | 13 |
3 files changed, 41 insertions, 3 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index b27ad01ef168..0ae23e6f9f54 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -30,6 +30,7 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \ --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm +CONFIGURE_ARGS+=--enable-pam MAN1= wdm.1 wdmLogin.1 @@ -37,6 +38,7 @@ DAEMONPIC= daemon1-HQ-1280x960.jpg post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/*.man + cp ${FILESDIR}/xdm-3.3.2-pamwdm[23].patch ${WRKSRC}/patches pre-configure: @(cd ${WRKSRC}; automake -a --include-deps) diff --git a/x11/wdm/files/patch-ag b/x11/wdm/files/patch-ag index 4727ee5f7e1f..5ee2c69b08c0 100644 --- a/x11/wdm/files/patch-ag +++ b/x11/wdm/files/patch-ag @@ -1,6 +1,29 @@ --- configure.in.orig Tue Sep 21 23:16:21 1999 -+++ configure.in Mon Nov 1 05:26:32 1999 -@@ -183,7 +183,7 @@ ++++ configure.in Wed Feb 23 21:26:13 2000 +@@ -50,9 +50,9 @@ + AM_CONDITIONAL(INSTALLPAM, test x$enable_pam = xyes) + + if test "$enable_pam" = yes; then +- AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl" ++ AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam" + AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)], +- [],-ldl) ++ [],) + fi + + AC_ARG_WITH(pamdir, +@@ -66,6 +66,10 @@ + AC_MSG_CHECKING(for pam directory $PAM_DIR_PATH) + if test -d "$PAM_DIR_PATH"; then + AC_MSG_RESULT(exists) ++ elif test -f "/etc/pam.conf"; then ++ AC_MSG_RESULT(using /etc/pam.conf) ++ PAMDIR=none ++ PAM_DIR_PATH=none + else + AC_MSG_RESULT(does not exist) + AC_MSG_WARN([this may not be a pam system <<--------------]) +@@ -183,7 +187,7 @@ XLFLAGS="$X_LIBS" @@ -9,7 +32,7 @@ XDM_EXTRA_LIBS="-lXmu -lXau -lXdmcp" -@@ -504,7 +504,7 @@ +@@ -504,7 +508,7 @@ AC_DEFINE_UNQUOTED(WDMDIR,"$DMDIR") AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG,"$DMDIR/wdm-config") AC_DEFINE_UNQUOTED(DEF_CHOOSER,"$DMDIR/chooser") diff --git a/x11/wdm/files/patch-al b/x11/wdm/files/patch-al new file mode 100644 index 000000000000..2e53dca3da4b --- /dev/null +++ b/x11/wdm/files/patch-al @@ -0,0 +1,13 @@ +--- src/config/Makefile.am.orig Tue Sep 21 23:16:21 1999 ++++ src/config/Makefile.am Thu Feb 24 01:44:12 2000 +@@ -118,8 +118,8 @@ + + install-data-local: + if INSTALLPAM +- $(INSTALL) -d $(DESTDIR)$(PAMDIR) +- $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm ++ [ x$(PAMDIR) = xnone ] || $(INSTALL) -d $(DESTDIR)$(PAMDIR) ++ [ x$(PAMDIR) = xnone ] || $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm + else + + endif |