3 files changed, 4 insertions, 38 deletions

diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 62e48d16df17..876af8920281 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -123,19 +123,11 @@ CONFIGURE_ARGS+=	--with-sendfile
 CONFIGURE_ARGS+=	--without-sendfile
 .endif
 
-.if ${OSVERSION} > 500000
 PAM_TEMPL?=	${FILESDIR}/pam.conf.5
-.else
-. if ${OSVERSION} > 400000
-PAM_TEMPL?=	${FILESDIR}/pam.conf.4
-. endif
-.endif
-.if defined(PAM_TEMPL)
 PAM_DIR?=	${EXAMPLESDIR}/pam
 PAM_TARGET?=	pure-ftpd
-.endif
 
-DOCS=		AUTHORS CONTACT COPYING HISTORY NEWS \
+PORTDOCS=	AUTHORS CONTACT COPYING HISTORY NEWS \
 		README README.Configuration-File README.Contrib README.LDAP \
 		README.Netfilter README.MySQL README.PGSQL README.Virtual-Users \
 		README.Authentication-Modules THANKS pure-ftpd.png \
@@ -168,14 +160,14 @@ post-install:
 	${CHMOD} 755 ${PREFIX}/sbin/pure-config.pl
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+. for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+. endfor
 .endif
-.if defined(PAM_TEMPL)
 	${MKDIR} ${PAM_DIR}
 	${INSTALL_DATA} ${PAM_TEMPL} ${PAM_DIR}/${PAM_TARGET}
 	@${ECHO_MSG} "Now you need to examine ${PAM_DIR}/${PAM_TARGET}"
 	@${ECHO_MSG} "and add the relevant PAM configuration lines to your /etc/pam.conf file."
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/ftp/pure-ftpd/files/pam.conf.4 b/ftp/pure-ftpd/files/pam.conf.4
deleted file mode 100644
index 3cc0dfb89d69..000000000000
--- a/ftp/pure-ftpd/files/pam.conf.4
+++ /dev/null
@@ -1,7 +0,0 @@
-# pure-ftpd
-pure-ftpd	auth	sufficient	pam_skey.so
-pure-ftpd	auth	requisite	pam_cleartext_pass_ok.so
-#pure-ftpd	auth	sufficient	pam_kerberosIV.so	try_first_pass
-pure-ftpd	auth	required	pam_unix.so		try_first_pass
-pure-ftpd	account	required	pam_permit.so
-pure-ftpd	session	required	pam_permit.so
diff --git a/ftp/pure-ftpd/pkg-plist b/ftp/pure-ftpd/pkg-plist
index aa42fcb858fe..84fc84d56517 100644
--- a/ftp/pure-ftpd/pkg-plist
+++ b/ftp/pure-ftpd/pkg-plist
@@ -12,28 +12,9 @@ sbin/pure-ftpwho
 sbin/pure-mrtginfo
 sbin/pure-quotacheck
 sbin/pure-uploadscript
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CONTACT
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.Authentication-Modules
-%%PORTDOCS%%%%DOCSDIR%%/README.Configuration-File
-%%PORTDOCS%%%%DOCSDIR%%/README.Contrib
-%%PORTDOCS%%%%DOCSDIR%%/README.LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README.MySQL
-%%PORTDOCS%%%%DOCSDIR%%/README.Netfilter
-%%PORTDOCS%%%%DOCSDIR%%/README.PGSQL
-%%PORTDOCS%%%%DOCSDIR%%/README.TLS
-%%PORTDOCS%%%%DOCSDIR%%/README.Virtual-Users
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/pure-ftpd.png
-%%PORTDOCS%%%%DOCSDIR%%/pureftpd.schema
 %%EXAMPLESDIR%%/pam/pure-ftpd
 %%EXAMPLESDIR%%/pure-stat.pl
 %%EXAMPLESDIR%%/pure-vpopauth.pl
 %%EXAMPLESDIR%%/xml_python_processors.txt
 @dirrm %%EXAMPLESDIR%%/pam
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%