Update for Emacs21 after the repocopy from `elib-emacs'.

 - install elisp files under the version specific site-lisp directory
   instead of the version independent site-lisp directory.
 - use ${DOCSDIR}.

Bump PORTREVISION.

3 files changed, 36 insertions, 41 deletions

diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index f82474ccfc84..30fadee7577b 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	Elib for GNU Emacs 19
+# New ports collection makefile for:	Elib for GNU Emacs 21
 # Date created:		24 Feb 2000
 # Whom:			OKAZAKI Tetsurou
 #
@@ -7,6 +7,7 @@
 
 PORTNAME=	elib
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -16,15 +17,13 @@ MAINTAINER?=	okazaki@FreeBSD.org
 
 # setupel filename
 PORT_SETUPEL=	elib-startup.el
-# document install directory by install-doc target
-PORTDOCDIR=	share/doc/elib
 
 # This is a master port.
 PORTCLASS?=	master
 
 # emacs port setup
 .if (${PORTCLASS} == "master")
-EMACS_PORT_NAME=	emacs
+EMACS_PORT_NAME=	emacs21
 .endif
 
 # target name for make build
@@ -33,14 +32,13 @@ ALL_TARGET?=	all
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		PORTDOCDIR=${PORTDOCDIR} \
 		PORT_SETUPEL=${PORT_SETUPEL}
 MAKE_ARGS+=	EMACS="${EMACS_CMD} -q --no-site-file" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		MAKEINFO="makeinfo --no-split" \
 		MKDIR="${MKDIR}" \
 		prefix="${PREFIX}" \
-		locallisppath="${PREFIX}/${EMACS_SITE_LISPDIR}"
+		locallisppath="${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 
 .if defined(EMACS_PORT_NAME)
 .if ${EMACS_MAJOR_VER} <= 19
@@ -72,10 +70,10 @@ post-install:
 .endif
 
 doc-install:
-	${MKDIR} ${PREFIX}/${PORTDOCDIR}
+	${MKDIR} ${DOCSDIR}
 	cd ${INSTALL_WRKSRC} && \
 	for i in ChangeLog NEWS README ; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${PORTDOCDIR}/ ; \
+		${INSTALL_DATA} $${i} ${DOCSDIR} ; \
 	done
 
 setupel-install:
diff --git a/devel/elib/pkg-descr b/devel/elib/pkg-descr
index e1d707615440..8cef3d3e307a 100644
--- a/devel/elib/pkg-descr
+++ b/devel/elib/pkg-descr
@@ -8,7 +8,4 @@ Elib provides features of:
    - minibuffer handling functions missing in standard Emacs
    - routines for handling lists of so-called cookies in a buffer.
 
-ELIB is installed into the following directory tree:
-        PREFIX/share/emacs/site-lisp/elib/		--- elib
-
 WWW: http://www.gnu.org/software/elib/elib.html
diff --git a/devel/elib/pkg-plist b/devel/elib/pkg-plist
index bbb7eb0aac89..beb58f2deb7f 100644
--- a/devel/elib/pkg-plist
+++ b/devel/elib/pkg-plist
@@ -1,33 +1,33 @@
-%%EMACS_LIBDIR%%/site-lisp/elib/avltree.el
-%%EMACS_LIBDIR%%/site-lisp/elib/avltree.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/bintree.el
-%%EMACS_LIBDIR%%/site-lisp/elib/bintree.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/cookie.el
-%%EMACS_LIBDIR%%/site-lisp/elib/cookie.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/dll-debug.el
-%%EMACS_LIBDIR%%/site-lisp/elib/dll-debug.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/dll.el
-%%EMACS_LIBDIR%%/site-lisp/elib/dll.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/elib-node.el
-%%EMACS_LIBDIR%%/site-lisp/elib/elib-node.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/queue-f.el
-%%EMACS_LIBDIR%%/site-lisp/elib/queue-f.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/queue-m.el
-%%EMACS_LIBDIR%%/site-lisp/elib/queue-m.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/read.el
-%%EMACS_LIBDIR%%/site-lisp/elib/read.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/stack-f.el
-%%EMACS_LIBDIR%%/site-lisp/elib/stack-f.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/stack-m.el
-%%EMACS_LIBDIR%%/site-lisp/elib/stack-m.elc
-%%EMACS_LIBDIR%%/site-lisp/elib/string.el
-%%EMACS_LIBDIR%%/site-lisp/elib/string.elc
-%%LOADPATHSETUP:%%%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%PORT_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/elib
-%%PORTDOCDIR%%/ChangeLog
-%%PORTDOCDIR%%/NEWS
-%%PORTDOCDIR%%/README
-@dirrm %%PORTDOCDIR%%
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/avltree.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/avltree.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/bintree.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/bintree.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/cookie.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/cookie.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/dll-debug.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/dll-debug.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/dll.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/dll.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/elib-node.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/elib-node.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/queue-f.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/queue-f.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/queue-m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/queue-m.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/read.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/read.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/stack-f.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/stack-f.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/stack-m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/stack-m.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/string.el
+%%EMACS_VERSION_SITE_LISPDIR%%/elib/string.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/elib
+%%LOADPATHSETUP:%%%%EMACS_VERSION_SITE_LISPDIR%%/%%PORT_SETUPEL%%
+%%PORTDOCS%%share/doc/elib/ChangeLog
+%%PORTDOCS%%share/doc/elib/NEWS
+%%PORTDOCS%%share/doc/elib/README
+%%PORTDOCS%%@dirrm share/doc/elib
 @unexec install-info --delete %D/info/elib.info %D/info/dir
 info/elib.info
 @exec install-info %D/info/elib.info %D/info/dir