[102011] trunk/dports/x11/xdm

[jeremyhu at macports.org]

Revision: 102011
          https://trac.macports.org/changeset/102011
Author:   jeremyhu at macports.org
Date:     2013-01-24 10:19:50 -0800 (Thu, 24 Jan 2013)
Log Message:
-----------
xdm: Fix build on Tiger and Leopard (#37771)

Modified Paths:
--------------
    trunk/dports/x11/xdm/Portfile

Added Paths:
-----------
    trunk/dports/x11/xdm/files/
    trunk/dports/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch

Modified: trunk/dports/x11/xdm/Portfile
===================================================================
--- trunk/dports/x11/xdm/Portfile	2013-01-24 15:04:52 UTC (rev 102010)
+++ trunk/dports/x11/xdm/Portfile	2013-01-24 18:19:50 UTC (rev 102011)
@@ -28,6 +28,12 @@
 depends_lib         port:xorg-libXinerama \
                     port:xorg-libXaw
 
+patchfiles          0001-Look-for-pam-in-both-pam-and-security-paths.patch
+patch.pre_args      -p1
+
+use_autoreconf      yes
+autoreconf.args     -fvi
+
 configure.env-append \
 		    RAWCPP=${configure.cpp}
 

Added: trunk/dports/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch
===================================================================
--- trunk/dports/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch	                        (rev 0)
+++ trunk/dports/x11/xdm/files/0001-Look-for-pam-in-both-pam-and-security-paths.patch	2013-01-24 18:19:50 UTC (rev 102011)
@@ -0,0 +1,61 @@
+From fa8adede758e2b1e8ae38c84d032b354f0250f49 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 24 Jan 2013 10:11:28 -0800
+Subject: [PATCH] Look for pam in both pam/ and security/ paths
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ configure.ac     | 4 ++++
+ greeter/verify.c | 1 -
+ include/dm.h     | 8 +++++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d20ae28..f0ea150 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,6 +120,10 @@ AC_ARG_WITH(pam, AS_HELP_STRING([--with-pam],
+ 	[Use PAM for authentication (default is autodetected)]),
+ 	[USE_PAM=$withval], [USE_PAM=auto])
+ if test "x$USE_PAM" != "xno" ; then
++    AC_CHECK_HEADERS([security/pam_appl.h pam/pam_appl.h],
++                     [found=yes ; break ;], [found=no])
++    AS_IF([test "x$USE_PAM" = "xyes" -a  "x$found" = "xno"],
++	[AC_MSG_ERROR([PAM support requested, but we could not find the pam headers.])])
+     AC_SEARCH_LIBS([pam_open_session], [pam],
+ 	[AC_CHECK_FUNC([pam_open_session],
+ 	    [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])]
+diff --git a/greeter/verify.c b/greeter/verify.c
+index 1221874..db3cb7d 100644
+--- a/greeter/verify.c
++++ b/greeter/verify.c
+@@ -41,7 +41,6 @@ from The Open Group.
+ #include	<pwd.h>
+ 
+ #if defined(USE_PAM)
+-# include	<security/pam_appl.h>
+ # include	<stdlib.h>
+ #elif defined(HAVE_GETSPNAM)
+ # include	<shadow.h>
+diff --git a/include/dm.h b/include/dm.h
+index 2512e37..cd60f4b 100644
+--- a/include/dm.h
++++ b/include/dm.h
+@@ -105,7 +105,13 @@ typedef union wait	waitType;
+ # endif /* X_NOT_POSIX */
+ 
+ # ifdef USE_PAM
+-#  include <security/pam_appl.h>
++#  ifdef HAVE_SECURITY_PAM_APPL_H
++#   include <security/pam_appl.h>
++#  elif defined(HAVE_PAM_PAM_APPL_H)
++#   include <pam/pam_appl.h>
++#  else
++#   error "Unable to determine pam headers"
++#  endif
+ # endif
+ 
+ # ifdef CSRG_BASED
+-- 
+1.8.1.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130124/66265e01/attachment.html>