3 files changed, 73 insertions, 67 deletions
diff --git a/mail/pm-lib/Makefile b/mail/pm-lib/Makefile
index 66a541625845..20bd2dc9d842 100644
--- a/mail/pm-lib/Makefile
+++ b/mail/pm-lib/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	pm-lib
-PORTVERSION=	20010728
+PORTVERSION=	20020102
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-2001.0728
+DISTNAME=	procmail-lib-2002.0102
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A collection of procmail plug-in modules
 
 RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
 
-USE_ZIP=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
 LIBS=		pm-jaaddr.rc pm-jabup.rc pm-jacookie.rc \
@@ -33,20 +31,27 @@ LIBS=		pm-jaaddr.rc pm-jabup.rc pm-jacookie.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.html README.txt index.html pm-lib-body.html \
-		pm-lib-toc.html pm-lib.html pm-lib.txt
+DOCS=		README.txt pm-lib.txt
+HTMLS=		README.html index.html pm-lib-body.html \
+		pm-lib-toc.html pm-lib.html
+
+.include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${PREFIX}/share/${PORTNAME}
+	${MKDIR} ${DATADIR}
 .for i in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${PREFIX}/share/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${DATADIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/lib/ChangeLog ${PREFIX}/share/doc/${PORTNAME}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/ChangeLog ${DOCSDIR}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/doc/source/${i} ${DOCSDIR}
+.endfor
+.for i in ${HTMLS}
+	${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${DOCSDIR}/html
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/pm-lib/distinfo b/mail/pm-lib/distinfo
index dacfaca20199..47fbe3cf9ecc 100644
--- a/mail/pm-lib/distinfo
+++ b/mail/pm-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (pm-lib-2001.0728.zip) = 13f18a6484c9cdc03a07ef8a1edf8ebd
-SIZE (pm-lib-2001.0728.zip) = 252274
+MD5 (procmail-lib-2002.0102.tar.gz) = ec02daacabe90627c0c194dd209ad606
+SIZE (procmail-lib-2002.0102.tar.gz) = 262460
diff --git a/mail/pm-lib/pkg-plist b/mail/pm-lib/pkg-plist
index 4672c224b9ab..d27e5153acfa 100644
--- a/mail/pm-lib/pkg-plist
+++ b/mail/pm-lib/pkg-plist
@@ -1,54 +1,55 @@
 @comment $FreeBSD$
-%%PORTDOCS%%share/doc/pm-lib/ChangeLog
-%%PORTDOCS%%share/doc/pm-lib/README.html
-%%PORTDOCS%%share/doc/pm-lib/README.txt
-%%PORTDOCS%%share/doc/pm-lib/index.html
-%%PORTDOCS%%share/doc/pm-lib/pm-lib-body.html
-%%PORTDOCS%%share/doc/pm-lib/pm-lib-toc.html
-%%PORTDOCS%%share/doc/pm-lib/pm-lib.html
-%%PORTDOCS%%share/doc/pm-lib/pm-lib.txt
-share/pm-lib/pm-jaaddr.rc
-share/pm-lib/pm-jabup.rc
-share/pm-lib/pm-jacookie.rc
-share/pm-lib/pm-jacookie1.rc
-share/pm-lib/pm-jacron.rc
-share/pm-lib/pm-jadaemon.rc
-share/pm-lib/pm-jadate.rc
-share/pm-lib/pm-jadate1.rc
-share/pm-lib/pm-jadate2.rc
-share/pm-lib/pm-jadate3.rc
-share/pm-lib/pm-jadate4.rc
-share/pm-lib/pm-jadate5.rc
-share/pm-lib/pm-jadup.rc
-share/pm-lib/pm-jaempty.rc
-share/pm-lib/pm-jafrom.rc
-share/pm-lib/pm-jafwd.rc
-share/pm-lib/pm-jalist.rc
-share/pm-lib/pm-jamime-decode.rc
-share/pm-lib/pm-jamime-kill.rc
-share/pm-lib/pm-jamime-save.rc
-share/pm-lib/pm-jamime.rc
-share/pm-lib/pm-janetmind.rc
-share/pm-lib/pm-janslookup.rc
-share/pm-lib/pm-jaorig.rc
-share/pm-lib/pm-japing.rc
-share/pm-lib/pm-japop3.rc
-share/pm-lib/pm-jarandf.rc
-share/pm-lib/pm-jasrv-check.rc
-share/pm-lib/pm-jasrv-daemon.rc
-share/pm-lib/pm-jasrv-err.rc
-share/pm-lib/pm-jasrv-from.rc
-share/pm-lib/pm-jasrv-msg.rc
-share/pm-lib/pm-jasrv-multi.rc
-share/pm-lib/pm-jasrv-req.rc
-share/pm-lib/pm-jasrv-send.rc
-share/pm-lib/pm-jasrv.rc
-share/pm-lib/pm-jastore.rc
-share/pm-lib/pm-jasubject.rc
-share/pm-lib/pm-jatime.rc
-share/pm-lib/pm-jaube.rc
-share/pm-lib/pm-jaube1.rc
-share/pm-lib/pm-javac.rc
-share/pm-lib/pm-javar.rc
-%%PORTDOCS%%@dirrm share/doc/pm-lib
-@dirrm share/pm-lib
+%%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%%