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.

5 files changed, 5 insertions, 91 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-descr b/editors/bitmap-emacs20/pkg-descr
deleted file mode 100644
index 9073ffc9d4db..000000000000
--- a/editors/bitmap-emacs20/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Bitmap-mule, Package to use bitmap in Emacs20.
-
-   Bitmap-mule is a package to use bitmap in Emacs20.
-  Bitmap-mule has following modules:
-
-	- bitmap.el:		kernel of bitmap-mule
-	- bitmap-ci.el:		functions for Emacs 20.3 or later
-	- 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:
-	${LOCALBASE}/share/emacs/site-lisp/bitmap/	--- Bitmap-mule
-
---- Porting by shige <shige@FreeBSD.org>
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%%