Use MASTER_SITE_LOCAL for hosting distfiles since the master site was vanished[*].

Utilize INFO and PORTDOCS.
Use EMACS_BASE instead of LOCALBASE for emacs library dependencies.
Use target dependency instead of sub make invocation for running post-install rules.

Notified by: kris[*]

3 files changed, 21 insertions, 22 deletions

diff --git a/devel/pcl-cvs-emacs/Makefile b/devel/pcl-cvs-emacs/Makefile
index d3b712aedf29..24b5bc70c5d4 100644
--- a/devel/pcl-cvs-emacs/Makefile
+++ b/devel/pcl-cvs-emacs/Makefile
@@ -9,12 +9,13 @@ PORTNAME=	pcl-cvs
 PORTVERSION=	2.9.9
 PORTREVISION=	1
 CATEGORIES=	devel elisp
-MASTER_SITES=	ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	okazaki/pcl-cvs
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DIST_SUBDIR=	pcl-cvs
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= okazaki/pcl-cvs
+PATCH_SITE_SUBDIR=	okazaki/pcl-cvs
 PATCHFILES=	pcl-cvs-2.9.9-compat.patch
 
 MAINTAINER?=	okazaki@FreeBSD.org
@@ -38,8 +39,14 @@ ALL_TARGET?=		elcfiles info
 INSTALL_TARGET?=	install_el install_elc install_info
 INSTALL_TARGET+=	install_startup
 
+INFO=	pcl-cvs
+
 .include <bsd.port.pre.mk>
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	ChangeLog FAQ NEWS README TODO
+.endif
+
 .if ${EMACS_VER} == "19.34"
 EASY_MMODE=	easy-mmode.el
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -58,16 +65,16 @@ MAKE_ARGS+=	EMACS="${EMACS_CMD} -q --no-site-file" \
 
 .if defined(EMACS_PORT_NAME)
 ELIB_PORTDIR=	${PORTSDIR}/devel/elib${ELIB_PORT_SUFFIX}
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
+BUILD_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
+RUN_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
 .if (${EMACS_VER} == "19.34")
 CUSTOM_PORTDIR=	${PORTSDIR}/editors/custom${CUSTOM_PORT_SUFFIX}
 # depends on custom: emacs-19.34 or mule-2.3 based on emacs-19.34
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/custom.el:${CUSTOM_PORTDIR}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/custom.el:${CUSTOM_PORTDIR}
+BUILD_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/custom.el:${CUSTOM_PORTDIR}
+RUN_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/custom.el:${CUSTOM_PORTDIR}
 .else
 # diff-mode.el does not run on emacs-19.34
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/diff-mode.el:${PORTSDIR}/textproc/diff-mode.el
+RUN_DEPENDS+=	${EMACS_BASE}/${EMACS_SITE_LISPDIR}/diff-mode.el:${PORTSDIR}/textproc/diff-mode.el
 .endif
 .else
 .BEGIN:
@@ -88,26 +95,28 @@ post-build:
 	${ECHO_CMD} "(provide 'pcl-cvs-startup)" >> ${WRKSRC}/pcl-cvs-startup.el
 
 pre-install:
+	-${RM} ${INSTALL_WRKSRC}/${PORT_SETUPEL}
 .if defined(ELIB_SETUP) && !empty(ELIB_SETUP)
 	${ECHO_CMD} ${ELIB_SETUP} >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
 .endif
 
-post-install:
-	${ECHO_CMD} "(provide 'pcl-cvs-setup)" >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
-	@${MAKE} setupel-install
+POST_INSTALL_SEQ+=	setupel-install
 .if !defined(NOPORTDOCS)
-	@${MAKE} doc-install
+POST_INSTALL_SEQ+=	doc-install
 .endif
+
+post-install: ${POST_INSTALL_SEQ}
 	@${CAT} ${PKGMESSAGE}
 
 doc-install:
 	${MKDIR} ${DOCSDIR}
 	cd ${INSTALL_WRKSRC} && \
-	for i in ChangeLog FAQ NEWS README TODO; do \
+	for i in ${PORTDOCS}; do \
 		${INSTALL_DATA} $${i} ${DOCSDIR} ; \
 	done
 
 setupel-install:
+	${ECHO_CMD} "(provide 'pcl-cvs-setup)" >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORT_SETUPEL} \
 		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/
 
diff --git a/devel/pcl-cvs-emacs/pkg-message b/devel/pcl-cvs-emacs/pkg-message
index c79ec570fe5a..311ace634ff4 100644
--- a/devel/pcl-cvs-emacs/pkg-message
+++ b/devel/pcl-cvs-emacs/pkg-message
@@ -1,4 +1,3 @@
 To use pcl-cvs, put the following setup into your ~/.emacs:
 
         (require 'pcl-cvs-setup)
-
diff --git a/devel/pcl-cvs-emacs/pkg-plist b/devel/pcl-cvs-emacs/pkg-plist
index 7e4c858bb07c..a13f79105bd0 100644
--- a/devel/pcl-cvs-emacs/pkg-plist
+++ b/devel/pcl-cvs-emacs/pkg-plist
@@ -19,12 +19,3 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/%%PORT_SETUPEL%%
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs
-%%PORTDOCS%%share/doc/pcl-cvs/ChangeLog
-%%PORTDOCS%%share/doc/pcl-cvs/FAQ
-%%PORTDOCS%%share/doc/pcl-cvs/NEWS
-%%PORTDOCS%%share/doc/pcl-cvs/README
-%%PORTDOCS%%share/doc/pcl-cvs/TODO
-%%PORTDOCS%%@dirrm share/doc/pcl-cvs
-@unexec install-info --delete %D/info/pcl-cvs.info %D/info/dir
-info/pcl-cvs.info
-@exec install-info %D/info/pcl-cvs.info %D/info/dir