Change from master to slave.

New master port is editors/flim-emacs.

3 files changed, 12 insertions, 53 deletions

diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index 2f0cf2f472f3..5aab1724fec3 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -1,66 +1,25 @@
 # New ports collection makefile for:	flim for emacs20
 # Version required:	1.9.2
 # Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1999/03/09 04:27:15 shige Exp $
+# $Id: Makefile,v 1.7 1999/04/18 05:01:13 sada Exp $
 #
 
-DISTNAME=	flim-${FLIM_VER}
-PKGNAME=	flim-${EMACS_PORT}-${FLIM_VER}
-CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.09/
-
 MAINTAINER=	shige@FreeBSD.ORG
 
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
-		nkf:${PORTSDIR}/japanese/nkf \
-		${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT} \
-		${PREFIX}/${EMACS_LIBDIR}/${EMACS_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT}
-
-ALL_TARGET?=	elc
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		FLIMDOCDIR=${FLIMDOCDIR}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+# This is a slave port.
+PORTCLASS=	slave
 
-# distfile version
-FLIM_VER=	1.9.2
-FLIMDOCDIR=	share/doc/flim
+MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 
-# emacs20
+# emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.3
 EMACS_LIBDIR=	share/${EMACS_NAME}
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-
-.include <bsd.port.pre.mk>
-
-MAKEINFO=	makeinfo --no-split --no-validate
-
-post-build:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.texi mime-ja.texi; do \
-		${MV} $${i} $${i}.jis ; \
-		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${ECHO_MSG} "===>   Please ignore the following errors." ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
-	done)
 
-post-install:
-	@(cd ${WRKSRC} ; \
-	for i in mime-en.info mime-ja.info; do \
-		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/info ; \
-		install-info ${PREFIX}/info/$${i} ${PREFIX}/info/dir ; \
-	done)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${FLIMDOCDIR}
-	@(cd ${WRKSRC} ; \
-	for i in ChangeLog README.* ; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${FLIMDOCDIR}/ ; \
-	done)
-.endif
+# use pkg/* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}/pkg
 
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-emacs20/pkg-descr b/editors/flim-emacs20/pkg-descr
index 77781b919f18..0390a7448775 100644
--- a/editors/flim-emacs20/pkg-descr
+++ b/editors/flim-emacs20/pkg-descr
@@ -1,4 +1,4 @@
-FLIM, message representation or encoding emacs lisp library.
+FLIM, message representation or encoding emacs lisp library for emacs20.
 
   FLIM is a library to provide basic features about message
   representation or encoding.  It consists of following
@@ -10,4 +10,4 @@ FLIM, message representation or encoding emacs lisp library.
   FLIM is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/flim/	--- FLIM
 
---- Porting by shige <shige@kuis.kyoto-u.ac.jp>
+--- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-emacs20/pkg-plist b/editors/flim-emacs20/pkg-plist
index cf78cb509d79..bbd6c04d516d 100644
--- a/editors/flim-emacs20/pkg-plist
+++ b/editors/flim-emacs20/pkg-plist
@@ -30,10 +30,10 @@
 %%FLIMDOCDIR%%/ChangeLog
 %%FLIMDOCDIR%%/README.en
 @dirrm %%FLIMDOCDIR%%
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @unexec install-info --delete %D/info/mime-en.info %D/info/dir
 @unexec install-info --delete %D/info/mime-ja.info %D/info/dir
 info/mime-en.info
 info/mime-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/mime-en.info %D/info/dir
 @exec install-info %D/info/mime-ja.info %D/info/dir