Update to 8.4.p200109201221.

Apply new master/slave scheme.
Update master port (editors/bitmap) for emacs21.
Update slave ports (editors/bitmap-mule and editors/bitmap-emacs20)
 to stub ports.
Install el/elc files to version specific site-lisp directory.
Change some style.

22 files changed, 128 insertions, 266 deletions

diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index e2234ddc6754..01b1ed13b876 100644
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@@ -5,59 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bitmap
-PORTVERSION=	${BITMAP_VER}
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
-		ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
-DISTNAME=	bitmap-mule-${BITMAP_DISTVER}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
 MAINTAINER=	shige@FreeBSD.org
 
-# ports version
-BITMAP_VER=		${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
-# distfile version
-BITMAP_MVER=		8.4
-BITMAP_DISTVER=		${BITMAP_MVER}
-# variables for snapshots version
-BITMAP_SNAP_PREFIX=	.p
-BITMAP_SNAP=		200102280240
-BITMAP_DISTVER=		${BITMAP_SNAP}
+# This is a slave port.
+PORTCLASS=	slave
 
-BITMAPDOCDIR=	share/doc/bitmap
-BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz
+MASTERDIR=	${.CURDIR}/../../editors/bitmap
 
-# emacs20
+# Setup EMACS_PORT_NAME variable.
 EMACS_PORT_NAME=	emacs20
 
-# target name for make build
-ALL_TARGET=	elc
-
-BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
-RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-fonts
-PLIST_SUB=	BITMAPDOCDIR=${BITMAPDOCDIR}
-
-.include <bsd.port.pre.mk>
-
-.if defined(EMACS_PORT_NAME)
-# depends on apel
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
-	@(cd ${WRKSRC} ; \
-	for i in ChangeLog NEWS README.* ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${BITMAPDOCDIR}/ ; \
-	done)
-.endif
-
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/bitmap-emacs20/distinfo b/editors/bitmap-emacs20/distinfo
deleted file mode 100644
index e989933c8386..000000000000
--- a/editors/bitmap-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bitmap-mule-200102280240.tar.gz) = c17eb6b7e9a71b188a135b528121f2a4
diff --git a/editors/bitmap-emacs20/pkg-comment b/editors/bitmap-emacs20/pkg-comment
deleted file mode 100644
index a528f7da5134..000000000000
--- a/editors/bitmap-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bitmap-mule, Package to use bitmap in Emacs20
diff --git a/editors/bitmap-emacs20/pkg-plist b/editors/bitmap-emacs20/pkg-plist
deleted file mode 100644
index 7704f170ad3a..000000000000
--- a/editors/bitmap-emacs20/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
-%%BITMAPDOCDIR%%/ChangeLog
-%%BITMAPDOCDIR%%/NEWS
-%%BITMAPDOCDIR%%/README.en
-@dirrm %%BITMAPDOCDIR%%
diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile
index d0ab60b00ef5..2d8c2129ed7c 100644
--- a/editors/bitmap-mule/Makefile
+++ b/editors/bitmap-mule/Makefile
@@ -5,68 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bitmap
-PORTVERSION=	${BITMAP_VER}
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
-		ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
-DISTNAME=	${PORTNAME}-mule-${BITMAP_DISTVER}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
 MAINTAINER=	shige@FreeBSD.org
 
-# ports version
-BITMAP_VER=		${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
-# distfile version
-BITMAP_MVER=		8.4
-BITMAP_DISTVER=		${BITMAP_MVER}
-# variables for snapshots version
-BITMAP_SNAP_PREFIX=	.p
-BITMAP_SNAP=		200102280240
-BITMAP_DISTVER=		${BITMAP_SNAP}
+# This is a slave port.
+PORTCLASS=	slave
 
-BITMAPDOCDIR=	share/doc/bitmap
-BITMAP_SETUPEL=	bitmap-setupel.el
-BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz
+MASTERDIR=	${.CURDIR}/../../editors/bitmap
 
-# mule-19.34
+# Setup EMACS_PORT_NAME variable.
 EMACS_PORT_NAME=	mule
 
-
-# target name for make build
-ALL_TARGET?=	elc
-
-BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
-RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-fonts
-SCRIPTS_ENV=	TARGETS=${BITMAP_SETUPEL}
-PLIST_SUB=	BITMAP_SETUPEL=${BITMAP_SETUPEL} \
-		BITMAPDOCDIR=${BITMAPDOCDIR}
-
-.include <bsd.port.pre.mk>
-
-.if defined(EMACS_PORT_NAME)
-# depends on apel
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-pre-configure:
-	@${CP} ${FILESDIR}/${BITMAP_SETUPEL}.in ${WRKDIR}
-
-post-install:
-	@${INSTALL_DATA} ${WRKDIR}/${BITMAP_SETUPEL} \
-		${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
-	@(cd ${WRKSRC} ; \
-	for i in ChangeLog NEWS README.* ; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/${BITMAPDOCDIR}/ ; \
-	done)
-.endif
-
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/bitmap-mule/distinfo b/editors/bitmap-mule/distinfo
deleted file mode 100644
index e989933c8386..000000000000
--- a/editors/bitmap-mule/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bitmap-mule-200102280240.tar.gz) = c17eb6b7e9a71b188a135b528121f2a4
diff --git a/editors/bitmap-mule/files/bitmap-setupel.el.in b/editors/bitmap-mule/files/bitmap-setupel.el.in
deleted file mode 100644
index 925e7dd2bed3..000000000000
--- a/editors/bitmap-mule/files/bitmap-setupel.el.in
+++ /dev/null
@@ -1,8 +0,0 @@
-;;
-;; @(#)bitmap-setupel.el -- bitmap mule load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/bitmap"
- ) load-path))
-(provide 'bitmap-setupel)
diff --git a/editors/bitmap-mule/files/patch-ab b/editors/bitmap-mule/files/patch-ab
deleted file mode 100644
index 3e8c3defc3e5..000000000000
--- a/editors/bitmap-mule/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- BITMAP-CFG.orig	Tue Apr 18 18:11:56 2000
-+++ BITMAP-CFG	Sat May 13 04:23:13 2000
-@@ -6,6 +6,11 @@
- 
- (defvar default-load-path load-path)
- 
-+(if (not (fboundp 'normal-top-level-add-subdirs-to-load-path))
-+    (progn 
-+      (require 'apel-setupel)
-+      ))
-+
- (require 'poe);; Pickup `add-to-list' for old mule.
- 
- (add-to-list 'load-path
diff --git a/editors/bitmap-mule/pkg-comment b/editors/bitmap-mule/pkg-comment
deleted file mode 100644
index 14026f9a0004..000000000000
--- a/editors/bitmap-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Package to use bitmap in MULE
diff --git a/editors/bitmap-mule/pkg-descr b/editors/bitmap-mule/pkg-descr
deleted file mode 100644
index a67933c35c4d..000000000000
--- a/editors/bitmap-mule/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-Bitmap-mule, Package to use bitmap in MULE or Emacs/mule.
-
-   Bitmap-mule is a package to use bitmap in MULE or Emacs/mule.
-  Bitmap-mule has following modules:
-
-	- bitmap.el:		kernel of bitmap-mule
-	- bitmap-bi.el:		functions for Emacs 20.2 or earlier
-	- bm-utils.el:		utility functions.
-	- po.el:		tiny BDF font editor
-	- smiley-mule.el:	smiley-mark encoder/decoder
-	- x-face-mule.el:	inline X-Face decoder
-	- gnus-bitmap.el:	Gnus/gnus related functions for x-face-mule.el
-	- vm-bitmap.el:		VM related functions for x-face-mule.el
-
-  Bitmap-mule is installed the following directory tree:
-	${PREFIX}/share/mule/site-lisp/bitmap/	--- Bitmap-mule
-
-To use bitmap-mule, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-	(require 'bitmap-setupel)
-
---- Porting by shige <shige@FreeBSD.org>
diff --git a/editors/bitmap-mule/pkg-plist b/editors/bitmap-mule/pkg-plist
deleted file mode 100644
index e2371438f8d1..000000000000
--- a/editors/bitmap-mule/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%BITMAP_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
-%%BITMAPDOCDIR%%/ChangeLog
-%%BITMAPDOCDIR%%/NEWS
-%%BITMAPDOCDIR%%/README.en
-@dirrm %%BITMAPDOCDIR%%
diff --git a/editors/bitmap-mule/scripts/configure b/editors/bitmap-mule/scripts/configure
deleted file mode 100644
index 04796ae5df87..000000000000
--- a/editors/bitmap-mule/scripts/configure
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for i in ${TARGETS}
-do
-	if [ -f ${WRKDIR}/${i}.in ]; then
-	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-		-e "s;@@PREFIX@@;${PREFIX};g" \
-		-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-		-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-		-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
-	> ${WRKDIR}/${i}
-	fi
-done
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index e2234ddc6754..309def7cc4c3 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	bitmap for emacs20
+# New ports collection makefile for:	bitmap for emacs21
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
 DISTNAME=	bitmap-mule-${BITMAP_DISTVER}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	shige@FreeBSD.org
+MAINTAINER?=	shige@FreeBSD.org
 
 # ports version
 BITMAP_VER=		${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
@@ -22,28 +22,48 @@ BITMAP_MVER=		8.4
 BITMAP_DISTVER=		${BITMAP_MVER}
 # variables for snapshots version
 BITMAP_SNAP_PREFIX=	.p
-BITMAP_SNAP=		200102280240
+BITMAP_SNAP=		200109201221
 BITMAP_DISTVER=		${BITMAP_SNAP}
 
 BITMAPDOCDIR=	share/doc/bitmap
+BITMAP_SETUPEL=	bitmap-setupel.el
 BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz
 
-# emacs20
-EMACS_PORT_NAME=	emacs20
+# bitmap install lispdir
+BITMAP_LISPDIR?=		${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+BITMAP_VERSION_SPECIFIC_LISPDIR?=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+
+# This is MASTER port.
+PORTCLASS?=	master
+
+# Setup EMACS_PORT_NAME variable.
+.if (${PORTCLASS} == "master")
+EMACS_PORT_NAME=	emacs21
+DEPPORT_SUFFIX=		
+.else
+DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
+.endif
+
+EMACS_MASTERDIR_PKGFILES=	YES
 
 # target name for make build
 ALL_TARGET=	elc
 
 BUILD_DEPENDS=	uncompface:${PORTSDIR}/mail/faces
 RUN_DEPENDS=	${BITMAP_FONT}:${PORTSDIR}/x11-fonts/bitmap-fonts
-PLIST_SUB=	BITMAPDOCDIR=${BITMAPDOCDIR}
+PLIST_SUB=	BITMAPDOCDIR=${BITMAPDOCDIR} \
+		BITMAP_SETUPEL=${BITMAP_SETUPEL}
+SCRIPTS_ENV=	TARGETS=${BITMAP_SETUPEL}
+MAKE_ARGS=	PREFIX="${LOCALBASE}" \
+		LISPDIR="${BITMAP_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${BITMAP_VERSION_SPECIFIC_LISPDIR}"
 
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
 # depends on apel
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
@@ -51,7 +71,16 @@ RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${P
 	@${FALSE}
 .endif
 
+pre-configure:
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
+	@${CP} ${FILESDIR}/${BITMAP_SETUPEL}.in ${WRKDIR}
+.endif
+
 post-install:
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
+	@${INSTALL_DATA} ${WRKDIR}/${BITMAP_SETUPEL} \
+		${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/${BITMAP_SETUPEL}
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${LOCALBASE}/${BITMAPDOCDIR}
 	@(cd ${WRKSRC} ; \
diff --git a/editors/bitmap/distinfo b/editors/bitmap/distinfo
index e989933c8386..ce69f77693eb 100644
--- a/editors/bitmap/distinfo
+++ b/editors/bitmap/distinfo
@@ -1 +1 @@
-MD5 (bitmap-mule-200102280240.tar.gz) = c17eb6b7e9a71b188a135b528121f2a4
+MD5 (bitmap-mule-200109201221.tar.gz) = cfdee57b9a75d8639a7a7ed3b67fa612
diff --git a/editors/bitmap/pkg-comment.emacs21 b/editors/bitmap/pkg-comment.emacs21
new file mode 100644
index 000000000000..a923bbab194f
--- /dev/null
+++ b/editors/bitmap/pkg-comment.emacs21
@@ -0,0 +1 @@
+Bitmap-mule, Package to use bitmap in Emacs21
diff --git a/editors/bitmap/pkg-descr.emacs20 b/editors/bitmap/pkg-descr.emacs20
index 9073ffc9d4db..b43e6f886f61 100644
--- a/editors/bitmap/pkg-descr.emacs20
+++ b/editors/bitmap/pkg-descr.emacs20
@@ -13,6 +13,6 @@ Bitmap-mule, Package to use bitmap in Emacs20.
 	- vm-bitmap.el:		VM related functions for x-face-mule.el
 
   Bitmap-mule is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
+	${LOCALBASE}/share/emacs/20.7/site-lisp/bitmap/
 
---- Porting by shige <shige@FreeBSD.org>
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap-emacs20/pkg-descr b/editors/bitmap/pkg-descr.emacs21
index 9073ffc9d4db..ff431f24b422 100644
--- a/editors/bitmap-emacs20/pkg-descr
+++ b/editors/bitmap/pkg-descr.emacs21
@@ -1,6 +1,6 @@
-Bitmap-mule, Package to use bitmap in Emacs20.
+Bitmap-mule, Package to use bitmap in Emacs21.
 
-   Bitmap-mule is a package to use bitmap in Emacs20.
+   Bitmap-mule is a package to use bitmap in Emacs21.
   Bitmap-mule has following modules:
 
 	- bitmap.el:		kernel of bitmap-mule
@@ -13,6 +13,6 @@ Bitmap-mule, Package to use bitmap in Emacs20.
 	- vm-bitmap.el:		VM related functions for x-face-mule.el
 
   Bitmap-mule is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
+	${LOCALBASE}/share/emacs/21.1/site-lisp/bitmap/
 
---- Porting by shige <shige@FreeBSD.org>
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap/pkg-descr.mule b/editors/bitmap/pkg-descr.mule
index a67933c35c4d..f5e26c6ccfb4 100644
--- a/editors/bitmap/pkg-descr.mule
+++ b/editors/bitmap/pkg-descr.mule
@@ -13,11 +13,11 @@ Bitmap-mule, Package to use bitmap in MULE or Emacs/mule.
 	- vm-bitmap.el:		VM related functions for x-face-mule.el
 
   Bitmap-mule is installed the following directory tree:
-	${PREFIX}/share/mule/site-lisp/bitmap/	--- Bitmap-mule
+	${PREFIX}/share/mule/19.34/site-lisp/bitmap/
 
 To use bitmap-mule, put the following setup into your ~/.emacs:
 
 	(require 'apel-setupel)
 	(require 'bitmap-setupel)
 
---- Porting by shige <shige@FreeBSD.org>
+Ported by shige@FreeBSD.org.
diff --git a/editors/bitmap/pkg-plist.emacs20 b/editors/bitmap/pkg-plist.emacs20
index 7704f170ad3a..5e3b456f3c7d 100644
--- a/editors/bitmap/pkg-plist.emacs20
+++ b/editors/bitmap/pkg-plist.emacs20
@@ -1,20 +1,20 @@
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-ci.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/bitmap
 %%BITMAPDOCDIR%%/ChangeLog
 %%BITMAPDOCDIR%%/NEWS
 %%BITMAPDOCDIR%%/README.en
diff --git a/editors/bitmap/pkg-plist.emacs21 b/editors/bitmap/pkg-plist.emacs21
new file mode 100644
index 000000000000..5e3b456f3c7d
--- /dev/null
+++ b/editors/bitmap/pkg-plist.emacs21
@@ -0,0 +1,21 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-ci.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/bitmap
+%%BITMAPDOCDIR%%/ChangeLog
+%%BITMAPDOCDIR%%/NEWS
+%%BITMAPDOCDIR%%/README.en
+@dirrm %%BITMAPDOCDIR%%
diff --git a/editors/bitmap/pkg-plist.mule b/editors/bitmap/pkg-plist.mule
index e2371438f8d1..153106887f97 100644
--- a/editors/bitmap/pkg-plist.mule
+++ b/editors/bitmap/pkg-plist.mule
@@ -1,21 +1,21 @@
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bitmap-bi.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/bm-utils.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/gnus-bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/po.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/smiley-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/bitmap/vm-bitmap.elc
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.el
-%%EMACS_LIBDIR%%/site-lisp/bitmap/x-face-mule.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%BITMAP_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/bitmap
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-bi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bitmap-bi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/bm-utils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/gnus-bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/po.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/smiley-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/vm-bitmap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/bitmap/x-face-mule.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/bitmap
+%%EMACS_VERSION_SITE_LISPDIR%%/%%BITMAP_SETUPEL%%
 %%BITMAPDOCDIR%%/ChangeLog
 %%BITMAPDOCDIR%%/NEWS
 %%BITMAPDOCDIR%%/README.en
diff --git a/editors/bitmap/scripts/configure b/editors/bitmap/scripts/configure
new file mode 100644
index 000000000000..ffe214ba26f5
--- /dev/null
+++ b/editors/bitmap/scripts/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+for i in ${TARGETS}
+do
+	if [ -f ${WRKDIR}/${i}.in ]; then
+	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
+	-e "s;@@LOCALBASE@@;${LOCALBASE};g" \
+	-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
+	-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
+	-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
+	-e "s;@@EMACS_SITE_LISPDIR@@;${EMACS_SITE_LISPDIR};g" \
+	-e "s;@@EMACS_VERSION_SITE_LISPDIR@@;${EMACS_VERSION_SITE_LISPDIR};g" \
+	> ${WRKDIR}/${i}
+	fi
+done