6 files changed, 23 insertions, 61 deletions

diff --git a/security/pam_smb/Makefile b/security/pam_smb/Makefile
index 3ceb80d35e71..6c318d4340a7 100644
--- a/security/pam_smb/Makefile
+++ b/security/pam_smb/Makefile
@@ -5,23 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	pam_smb
-PORTVERSION=	1.9.9
-PORTREVISION=	3
+PORTVERSION=	2.0.0.r5
 CATEGORIES=	security
-MASTER_SITES=   http://www.csn.ul.ie/~airlied/pam_smb/devel/
+MASTER_SITES=	http://samba.org/~airlied/ \
+		http://www.csn.ul.ie/~airlied/pam_smb/devel/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NetBIOS domain logon PAM module
 
-USE_AUTOCONF_VER=213
+INSTALLS_SHLIB=	yes
+HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 STARTUP_SCRIPT=	pam_smbd.sh.sample
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-.include <bsd.port.pre.mk>
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e s,%%PREFIX%%,${PREFIX}, ${WRKSRC}/pamsmbd/pam_read_conf.c
@@ -29,12 +29,14 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pamsmbd/pamsmbd ${PREFIX}/sbin/
 	${INSTALL_DATA} ${WRKSRC}/pamsmbm/pam_smb_auth.so ${PREFIX}/lib/
-	${MKDIR} ${PREFIX}/share/doc/pam_smb/
-	${INSTALL_DATA} ${WRKSRC}/BUGS ${PREFIX}/share/doc/pam_smb/
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/pam_smb/
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/pam_smb/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pam_smb/
-	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/pam_smb/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/BUGS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+.endif
 	${INSTALL_DATA} ${WRKSRC}/pam_smb.conf.example ${PREFIX}/etc/
 	${INSTALL_DATA} ${WRKSRC}/pam_smb.conf.example2 ${PREFIX}/etc/
 	${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d/
@@ -44,4 +46,4 @@ do-install:
 post-install:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pam_smb/distinfo b/security/pam_smb/distinfo
index 1d3a9281771e..847a90c04fec 100644
--- a/security/pam_smb/distinfo
+++ b/security/pam_smb/distinfo
@@ -1 +1 @@
-MD5 (pam_smb-1.9.9.tar.gz) = 571ea74593c80a723331e207cbd09cb4
+MD5 (pam_smb-2.0.0-rc5.tar.gz) = 48cd4986cdf2cc36f668fe177d932d9f
diff --git a/security/pam_smb/files/patch-aa b/security/pam_smb/files/patch-aa
deleted file mode 100644
index 83b7dc0e1983..000000000000
--- a/security/pam_smb/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- pamsmbd/pam_read_conf.c.orig	Mon Dec 17 10:15:16 2001
-+++ pamsmbd/pam_read_conf.c	Mon Dec 17 10:15:40 2001
-@@ -25,7 +25,7 @@
- #include "constants.h"
- #include "cache.h"
- 
--#define CONFFILE "/etc/pam_smb.conf"
-+#define CONFFILE "%%PREFIX%%/etc/pam_smb.conf"
- 
- int smb_readpamconf(domain_list *);
- 
diff --git a/security/pam_smb/files/patch-smbval::smbencrypt.c b/security/pam_smb/files/patch-smbval::smbencrypt.c
deleted file mode 100644
index 44d7e0d54fa4..000000000000
--- a/security/pam_smb/files/patch-smbval::smbencrypt.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- smbval/smbencrypt.c.orig	Sat Aug 19 12:58:07 2000
-+++ smbval/smbencrypt.c	Thu Feb 21 07:11:09 2002
-@@ -21,6 +21,7 @@
- */
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <arpa/inet.h>
- #include <dirent.h>
- #include <string.h>
diff --git a/security/pam_smb/files/patch-smbval::smblib.c b/security/pam_smb/files/patch-smbval::smblib.c
deleted file mode 100644
index 62ad5a129199..000000000000
--- a/security/pam_smb/files/patch-smbval::smblib.c
+++ /dev/null
@@ -1,19 +0,0 @@
-*** smbval/smblib.c.orig	Sat Aug 16 09:42:32 2003
---- smbval/smblib.c	Sat Aug 16 09:43:34 2003
-***************
-*** 338,344 ****
-  
-    }
-  
-!   strcpy(pword, PassWord);
-  #ifdef PAM_SMB_ENC_PASS
-    if (Con_Handle -> encrypt_passwords)
-    {
---- 338,344 ----
-  
-    }
-  
-!   (void)strlcpy(pword, PassWord, sizeof(pword));
-  #ifdef PAM_SMB_ENC_PASS
-    if (Con_Handle -> encrypt_passwords)
-    {
diff --git a/security/pam_smb/pkg-plist b/security/pam_smb/pkg-plist
index 25c0b2e3a198..c3f14d29e4fc 100644
--- a/security/pam_smb/pkg-plist
+++ b/security/pam_smb/pkg-plist
@@ -3,9 +3,9 @@ lib/pam_smb_auth.so
 etc/pam_smb.conf.example
 etc/pam_smb.conf.example2
 etc/rc.d/pam_smbd.sh.sample
-share/doc/pam_smb/README
-share/doc/pam_smb/INSTALL
-share/doc/pam_smb/TODO
-share/doc/pam_smb/BUGS
-share/doc/pam_smb/CHANGES
-@dirrm share/doc/pam_smb
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%