4 files changed, 24 insertions, 25 deletions

diff --git a/www/mod_auth_pam/Makefile b/www/mod_auth_pam/Makefile
index 0e5851dcd852..c010ee2176a0 100644
--- a/www/mod_auth_pam/Makefile
+++ b/www/mod_auth_pam/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_auth_pam
-PORTVERSION=	1.0a
+PORTVERSION=	1.1.1
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/ \
 		http://atreides.freenix.no/~anders/
@@ -25,12 +25,11 @@ do-build:
 do-install:
 	${APXS} -i -A -n auth_pam ${WRKSRC}/mod_auth_pam.so
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam
-	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam/samples
-	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${PREFIX}/share/doc/mod_auth_pam/
-	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${PREFIX}/share/doc/mod_auth_pam/
-	${INSTALL_DATA} ${WRKSRC}/samples/dot-htaccess ${PREFIX}/share/doc/mod_auth_pam/samples/
-	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${PREFIX}/share/doc/mod_auth_pam/samples/
+	${MKDIR} -p -m 0755 ${DOCSDIR}/samples
+	${INSTALL_DATA} ${WRKSRC}/doc/configure.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/samples/dot-htaccess ${DOCSDIR}/samples/
+	${INSTALL_DATA} ${WRKSRC}/samples/httpd- ${DOCSDIR}/samples/httpd
 .endif
 	${CAT} ${PKGMESSAGE}
 
diff --git a/www/mod_auth_pam/distinfo b/www/mod_auth_pam/distinfo
index e7354ca9964f..b3cbfa3911f3 100644
--- a/www/mod_auth_pam/distinfo
+++ b/www/mod_auth_pam/distinfo
@@ -1,2 +1,2 @@
-MD5 (mod_auth_pam-1.0a.tar.gz) = 9e971e974de3bef0587f114694d04e47
-SIZE (mod_auth_pam-1.0a.tar.gz) = 8765
+MD5 (mod_auth_pam-1.1.1.tar.gz) = b1e36b5df18a177e671785f7f4c8001c
+SIZE (mod_auth_pam-1.1.1.tar.gz) = 9575
diff --git a/www/mod_auth_pam/files/patch-mod_auth_pam.c b/www/mod_auth_pam/files/patch-mod_auth_pam.c
index 06612ddf23e3..49fefab02c76 100644
--- a/www/mod_auth_pam/files/patch-mod_auth_pam.c
+++ b/www/mod_auth_pam/files/patch-mod_auth_pam.c
@@ -1,15 +1,15 @@
---- mod_auth_pam.c.orig	Sun Feb 13 23:16:57 2000
-+++ mod_auth_pam.c	Mon May 17 11:13:59 2004
-@@ -113,7 +113,7 @@
+--- mod_auth_pam.c.orig	Thu Aug  8 13:47:33 2002
++++ mod_auth_pam.c	Thu Jun  3 11:40:47 2004
+@@ -147,7 +147,7 @@
  #define PAM_STRE_NEEDS_PAMH 1
- #define VERSION "1.0a"
+ #define VERSION "1.1.1"
  
 -module pam_auth_module;
 +module auth_pam_module;
  
  static const char
  *pam_servicename = "httpd",
-@@ -197,13 +197,11 @@
+@@ -231,13 +231,11 @@
  
  static command_rec auth_pam_cmds[] = {
    { "AuthFailDelay", (const char*(*)())auth_fail_delay, 0, OR_AUTHCFG, TAKE1,
@@ -25,7 +25,7 @@
    { "AuthPAM_Enabled", (const char*(*)())auth_enable, NULL, OR_AUTHCFG, FLAG,
      "on|off - determines if PAM authentication is enabled; default is on" },
    { 0 }
-@@ -362,7 +360,7 @@
+@@ -323,7 +321,7 @@
    /* mod_auth_pam specific */
    auth_pam_userinfo userinfo = { NULL, NULL };
    auth_pam_dir_config *conf = (auth_pam_dir_config*)
@@ -34,16 +34,16 @@
    /* PAM specific  */
    struct pam_conv conv_info = { &auth_pam_talker, (void*)&userinfo};
    pam_handle_t *pamh  = NULL;
-@@ -442,7 +440,7 @@
+@@ -402,7 +400,7 @@
+   register int i = 0;
    char method_restricted = 0, *line = 0, *word = 0;
-   table *groups = 0;
    auth_pam_dir_config *conf = (auth_pam_dir_config*)
 -    ap_get_module_config(r->per_dir_config, &pam_auth_module);
 +    ap_get_module_config(r->per_dir_config, &auth_pam_module);
+   struct passwd *pwent;
  
    /* check for allowed users/group */
-   const array_header *reqs_arr = ap_requires (r);
-@@ -505,7 +503,7 @@
+@@ -487,7 +485,7 @@
    return AUTH_REQUIRED;
  }
  
diff --git a/www/mod_auth_pam/pkg-plist b/www/mod_auth_pam/pkg-plist
index f0f99a83561f..1ca4398e1ef1 100644
--- a/www/mod_auth_pam/pkg-plist
+++ b/www/mod_auth_pam/pkg-plist
@@ -1,9 +1,9 @@
 libexec/apache/mod_auth_pam.so
 @exec %D/sbin/apxs -e -A -n auth_pam %D/%F
 @unexec %D/sbin/apxs -e -A -n auth_pam %D/%F
-%%PORTDOCS%%share/doc/mod_auth_pam/configure.html
-%%PORTDOCS%%share/doc/mod_auth_pam/faq.html
-%%PORTDOCS%%share/doc/mod_auth_pam/samples/dot-htaccess
-%%PORTDOCS%%share/doc/mod_auth_pam/samples/httpd
-%%PORTDOCS%%@dirrm share/doc/mod_auth_pam/samples
-%%PORTDOCS%%@dirrm share/doc/mod_auth_pam
+%%PORTDOCS%%%%DOCSDIR%%/configure.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/samples/dot-htaccess
+%%PORTDOCS%%%%DOCSDIR%%/samples/httpd
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%