3 files changed, 17 insertions, 84 deletions

diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index 20bd2dc9d842..a40e68c90f73 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	pm-lib
-PORTVERSION=	20020102
+PORTVERSION=	20041216
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	procmail-lib-2002.0102
+DISTNAME=	procmail-lib-2004.1216
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A collection of procmail plug-in modules
@@ -19,39 +19,27 @@ RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
 NO_BUILD=	yes
 
-LIBS=		pm-jaaddr.rc pm-jabup.rc pm-jacookie.rc \
-		pm-jacookie1.rc pm-jacron.rc pm-jadaemon.rc pm-jadate.rc \
-		pm-jadate1.rc pm-jadate2.rc pm-jadate3.rc pm-jadate4.rc \
-		pm-jadate5.rc pm-jadup.rc pm-jaempty.rc pm-jafrom.rc \
-		pm-jafwd.rc pm-jalist.rc pm-jamime-decode.rc \
-		pm-jamime-kill.rc pm-jamime-save.rc pm-jamime.rc \
-		pm-janetmind.rc pm-janslookup.rc pm-jaorig.rc pm-japing.rc \
-		pm-japop3.rc pm-jarandf.rc pm-jasrv-check.rc \
-		pm-jasrv-daemon.rc pm-jasrv-err.rc pm-jasrv-from.rc \
-		pm-jasrv-msg.rc pm-jasrv-multi.rc pm-jasrv-req.rc \
-		pm-jasrv-send.rc pm-jasrv.rc pm-jastore.rc pm-jasubject.rc \
-		pm-jatime.rc pm-jaube.rc pm-jaube1.rc pm-javac.rc pm-javar.rc
-DOCS=		README.txt pm-lib.txt
-HTMLS=		README.html index.html pm-lib-body.html \
-		pm-lib-toc.html pm-lib.html
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
 
 .include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${DATADIR}
-.for i in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${DATADIR}
-.endfor
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/pm-*.rc ${DATADIR}
+	@${FIND} ${DATADIR} -type f | \
+		${SED} -e 's,${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
+		${SED} -e 's,${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/ChangeLog ${DOCSDIR}
-.for i in ${DOCS}
+.for i in README.txt pm-lib.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/source/${i} ${DOCSDIR}
 .endfor
-.for i in ${HTMLS}
-	${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${DOCSDIR}/html
-.endfor
+	@${MKDIR} ${DOCSDIR}/html
+	${CP} -R ${WRKSRC}/doc/html/ ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/pm-lib/distinfo b/mail/pm-lib/distinfo
index 47fbe3cf9ecc..f8cd97a24141 100644
--- a/mail/pm-lib/distinfo
+++ b/mail/pm-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (procmail-lib-2002.0102.tar.gz) = ec02daacabe90627c0c194dd209ad606
-SIZE (procmail-lib-2002.0102.tar.gz) = 262460
+MD5 (procmail-lib-2004.1216.tar.gz) = a4cf9262c78ceafb76c0e872d6c3c089
+SIZE (procmail-lib-2004.1216.tar.gz) = 669989
diff --git a/mail/pm-lib/pkg-plist b/mail/pm-lib/pkg-plist
deleted file mode 100644
index d27e5153acfa..000000000000
--- a/mail/pm-lib/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $FreeBSD$
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/README.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pm-lib-body.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pm-lib-toc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pm-lib.html
-%%PORTDOCS%%%%DOCSDIR%%/pm-lib.txt
-%%DATADIR%%/pm-jaaddr.rc
-%%DATADIR%%/pm-jabup.rc
-%%DATADIR%%/pm-jacookie.rc
-%%DATADIR%%/pm-jacookie1.rc
-%%DATADIR%%/pm-jacron.rc
-%%DATADIR%%/pm-jadaemon.rc
-%%DATADIR%%/pm-jadate.rc
-%%DATADIR%%/pm-jadate1.rc
-%%DATADIR%%/pm-jadate2.rc
-%%DATADIR%%/pm-jadate3.rc
-%%DATADIR%%/pm-jadate4.rc
-%%DATADIR%%/pm-jadate5.rc
-%%DATADIR%%/pm-jadup.rc
-%%DATADIR%%/pm-jaempty.rc
-%%DATADIR%%/pm-jafrom.rc
-%%DATADIR%%/pm-jafwd.rc
-%%DATADIR%%/pm-jalist.rc
-%%DATADIR%%/pm-jamime-decode.rc
-%%DATADIR%%/pm-jamime-kill.rc
-%%DATADIR%%/pm-jamime-save.rc
-%%DATADIR%%/pm-jamime.rc
-%%DATADIR%%/pm-janetmind.rc
-%%DATADIR%%/pm-janslookup.rc
-%%DATADIR%%/pm-jaorig.rc
-%%DATADIR%%/pm-japing.rc
-%%DATADIR%%/pm-japop3.rc
-%%DATADIR%%/pm-jarandf.rc
-%%DATADIR%%/pm-jasrv-check.rc
-%%DATADIR%%/pm-jasrv-daemon.rc
-%%DATADIR%%/pm-jasrv-err.rc
-%%DATADIR%%/pm-jasrv-from.rc
-%%DATADIR%%/pm-jasrv-msg.rc
-%%DATADIR%%/pm-jasrv-multi.rc
-%%DATADIR%%/pm-jasrv-req.rc
-%%DATADIR%%/pm-jasrv-send.rc
-%%DATADIR%%/pm-jasrv.rc
-%%DATADIR%%/pm-jastore.rc
-%%DATADIR%%/pm-jasubject.rc
-%%DATADIR%%/pm-jatime.rc
-%%DATADIR%%/pm-jaube.rc
-%%DATADIR%%/pm-jaube1.rc
-%%DATADIR%%/pm-javac.rc
-%%DATADIR%%/pm-javar.rc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%