Make pcl-cvs buildable again for Emacs19 and Emacs20.

- catch up with elib port(s) restructurings.
- install elisp files under a version dependent site-lisp directory.
- use DOCSDIR.

PORTREVISION bumped.

3 files changed, 41 insertions, 44 deletions

diff --git a/devel/pcl-cvs-emacs/Makefile b/devel/pcl-cvs-emacs/Makefile
index 4ecab8d25558..68f6d0e43d81 100644
--- a/devel/pcl-cvs-emacs/Makefile
+++ b/devel/pcl-cvs-emacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcl-cvs
 PORTVERSION=	2.9.9
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -18,19 +19,18 @@ PATCHFILES=	pcl-cvs-2.9.9-compat.patch
 
 MAINTAINER?=	okazaki@FreeBSD.org
 
-IGNORE=	"is broken until restructuring of the elib port finishes"
 # startup el filename
 PORT_SETUPEL=	pcl-cvs-setup.el
-# document install directory by install-doc target
-PORTDOCDIR?=	share/doc/pcl-cvs
 
 # This is a master port.
 PORTCLASS?=	master
 
 # emacs port setup
 .if (${PORTCLASS} == "master")
-EMACS_PORT_NAME=	emacs
+EMACS_PORT_NAME=	emacs19
+CUSTOM_PORT_SUFFIX=	-emacs
 .endif
+ELIB_PORT_SUFFIX?=	-${EMACS_PORT_NAME}
 
 # target name for make build
 ALL_TARGET?=		elcfiles info
@@ -46,24 +46,24 @@ DISTFILES=	${EXTRACT_ONLY} ${EASY_MMODE}
 ELIB_SETUP=	'(if (locate-library "elib-startup") (require '\''elib-startup))'
 .endif
 
-PLIST_SUB+=	PORTDOCDIR=${PORTDOCDIR} \
-		PORT_SETUPEL=${PORT_SETUPEL}
+PLIST_SUB+=	PORT_SETUPEL=${PORT_SETUPEL}
 MAKE_ARGS+=	EMACS="${EMACS_CMD} -q --no-site-file" \
 		CP="${INSTALL_DATA}" \
 		MAKEINFO="makeinfo --no-split" \
 		MKDIR="${MKDIR}" \
 		prefix="${PREFIX}" \
-		lispdir="${PREFIX}/${EMACS_SITE_LISPDIR}" \
+		lispdir="${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
 		startupfile="${PORT_SETUPEL}"
 
 .if defined(EMACS_PORT_NAME)
-ELIB_PORTDIR=	${PORTSDIR}/devel/elib-${EMACS_PORT_NAME}
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
+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}
 .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_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/custom.el:${CUSTOM_PORTDIR}
+RUN_DEPENDS+=	${LOCALBASE}/${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
@@ -100,10 +100,10 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 
 doc-install:
-	${MKDIR} ${PREFIX}/${PORTDOCDIR}
+	${MKDIR} ${DOCSDIR}
 	cd ${INSTALL_WRKSRC} && \
 	for i in ChangeLog FAQ NEWS README TODO; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${PORTDOCDIR}/ ; \
+		${INSTALL_DATA} $${i} ${DOCSDIR} ; \
 	done
 
 setupel-install:
diff --git a/devel/pcl-cvs-emacs/pkg-descr b/devel/pcl-cvs-emacs/pkg-descr
index e4cecd631c03..ae924c4a6f91 100644
--- a/devel/pcl-cvs-emacs/pkg-descr
+++ b/devel/pcl-cvs-emacs/pkg-descr
@@ -5,6 +5,3 @@ For VC users, PCL-CVS can be thought of as a VC-dired specially designed
 for CVS.  PCL-CVS is not a replacement for VC and is supposed to interact
 well with it.  It provides a global view of your project and allows
 execution of cvs commands on several files at a time.
-
-  PCL-CVS is installed the following directory tree:
-	PREFIX/share/emacs/site-lisp/pcl-cvs/	--- pcl-cvs
diff --git a/devel/pcl-cvs-emacs/pkg-plist b/devel/pcl-cvs-emacs/pkg-plist
index b115a7a68caf..7e4c858bb07c 100644
--- a/devel/pcl-cvs-emacs/pkg-plist
+++ b/devel/pcl-cvs-emacs/pkg-plist
@@ -1,30 +1,30 @@
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-compat.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-compat.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-edit.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-log.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-log.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-status.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/cvs-status.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-defs.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-defs.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-info.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-info.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-parse.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-startup.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-util.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs-util.elc
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs.el
-%%EMACS_LIBDIR%%/site-lisp/pcl-cvs/pcl-cvs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%PORT_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/pcl-cvs
-%%PORTDOCDIR%%/ChangeLog
-%%PORTDOCDIR%%/FAQ
-%%PORTDOCDIR%%/NEWS
-%%PORTDOCDIR%%/README
-%%PORTDOCDIR%%/TODO
-@dirrm %%PORTDOCDIR%%
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-compat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-compat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-log.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-log.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-status.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-status.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-defs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-defs.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-info.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-info.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-startup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs.el
+%%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