- Add japanese/lookup-emacs21 as a slave to japanese/lookup

PR:		ports/114670
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org>

7 files changed, 4 insertions, 118 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 3e8c7e695257..2638f1e61f7a 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -182,6 +182,7 @@
     SUBDIR += lipsf
     SUBDIR += lookup
     SUBDIR += lookup-emacs20
+    SUBDIR += lookup-emacs21
     SUBDIR += lsd-fpw
     SUBDIR += lynx
     SUBDIR += lynx-current
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index 16410b9b3735..47c0d5793a46 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -5,47 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lookup
-PORTVERSION=	1.4.1
-PORTREVISION=	1
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-CATEGORIES=	japanese elisp
-MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
+MASTERDIR=	${.CURDIR}/../lookup
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
-
-FILESDIR=	${.CURDIR}/../lookup/files
-PKGDIR=		${.CURDIR}/../lookup
-PLIST=		${.CURDIR}/pkg-plist
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-
-INFO?=		lookup lookup-guide
-
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
-ELISPDIR=	${EMACSDIR}/lisp/lookup
-PORTINFODIR=	${EMACSDIR}/info
-MANIFEST=	MANIFEST.lookup
-.else
-ELISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/lookup
-PORTINFODIR=	${PREFIX}/info
-PLIST_SUB=	ELISPDIR=${EMACS_VERSION_SITE_LISPDIR}
-.endif
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
-		--with-lispdir=${ELISPDIR}
-
-post-install:
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-	${RM} -f ${WRKDIR}/${MANIFEST}
-	emacsdir=`${ECHO_CMD} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
-	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
-		${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST}
-	${MKDIR} ${EMACSDIR}/pkginfo
-	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${EMACSDIR}/pkginfo/
-.endif
+EMACS_PORT_NAME=	emacs21
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/lookup-emacs21/distinfo b/japanese/lookup-emacs21/distinfo
deleted file mode 100644
index b93975b3d8d8..000000000000
--- a/japanese/lookup-emacs21/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (lookup-1.4.1.tar.gz) = 5f66507835f8636bd3a91243d0760a46
-SHA256 (lookup-1.4.1.tar.gz) = 13ab02652e322773f279db1862e4423c24da0da0b662dd6a29dbd95aca729bfa
-SIZE (lookup-1.4.1.tar.gz) = 346391
diff --git a/japanese/lookup-emacs21/files/patch-ab b/japanese/lookup-emacs21/files/patch-ab
deleted file mode 100644
index 24ab23124c51..000000000000
--- a/japanese/lookup-emacs21/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- lisp/lookup-vars.el.in~	Sat Jun 17 09:55:39 2000
-+++ lisp/lookup-vars.el.in	Wed Jun 21 16:57:28 2000
-@@ -167,8 +167,9 @@
-   :type 'boolean
-   :group 'lookup-general-options)
- 
--(defcustom lookup-use-kakasi (or (locate-library "kakasi" nil exec-path)
--				 (locate-library "kakasi.exe" nil exec-path))
-+(defcustom lookup-use-kakasi (let ((load-path exec-path))
-+			       (or (locate-library "kakasi")
-+				   (locate-library "kakasi.exe")))
-   "*Non-nil を指定すると、いくつかの局面で KAKASI が利用される。
- これは現在、具体的には日本語のデフォルトの検索語の切り出しに用いている。"
-   :type 'boolean
diff --git a/japanese/lookup-emacs21/pkg-descr b/japanese/lookup-emacs21/pkg-descr
deleted file mode 100644
index d338b090eea3..000000000000
--- a/japanese/lookup-emacs21/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Lookup is a search interface to electronic dictionaries within Emacs.
-You can use various sources (such as CD-ROM books, dictionary server on
-the network, and so on) as dictionaries by the simple operation.
-
-Lookup works on GNU Emacs 19.28 or later, XEmacs 20.3 or later, Mule
-2.3, and Meadow 1.0 or later.
-
-WWW: http://openlab.ring.gr.jp/edict/lookup/index.html
diff --git a/japanese/lookup-emacs21/pkg-plist b/japanese/lookup-emacs21/pkg-plist
deleted file mode 100644
index 1218740e6db4..000000000000
--- a/japanese/lookup-emacs21/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-%%ELISPDIR%%/lookup/evi.el
-%%ELISPDIR%%/lookup/evi.elc
-%%ELISPDIR%%/lookup/evi-mule.el
-%%ELISPDIR%%/lookup/evi-mule.elc
-%%ELISPDIR%%/lookup/lookup.el
-%%ELISPDIR%%/lookup/lookup.elc
-%%ELISPDIR%%/lookup/lookup-utils.el
-%%ELISPDIR%%/lookup/lookup-utils.elc
-%%ELISPDIR%%/lookup/lookup-types.el
-%%ELISPDIR%%/lookup/lookup-types.elc
-%%ELISPDIR%%/lookup/lookup-vse.el
-%%ELISPDIR%%/lookup/lookup-vse.elc
-%%ELISPDIR%%/lookup/lookup-package.el
-%%ELISPDIR%%/lookup/lookup-package.elc
-%%ELISPDIR%%/lookup/lookup-kanji.el
-%%ELISPDIR%%/lookup/lookup-kanji.elc
-%%ELISPDIR%%/lookup/lookup-entry.el
-%%ELISPDIR%%/lookup/lookup-entry.elc
-%%ELISPDIR%%/lookup/lookup-content.el
-%%ELISPDIR%%/lookup/lookup-content.elc
-%%ELISPDIR%%/lookup/lookup-select.el
-%%ELISPDIR%%/lookup/lookup-select.elc
-%%ELISPDIR%%/lookup/ndic.el
-%%ELISPDIR%%/lookup/ndic.elc
-%%ELISPDIR%%/lookup/ndeb.el
-%%ELISPDIR%%/lookup/ndeb.elc
-%%ELISPDIR%%/lookup/ndeb-binary.el
-%%ELISPDIR%%/lookup/ndeb-binary.elc
-%%ELISPDIR%%/lookup/ndtp.el
-%%ELISPDIR%%/lookup/ndtp.elc
-%%ELISPDIR%%/lookup/ndict.el
-%%ELISPDIR%%/lookup/ndict.elc
-%%ELISPDIR%%/lookup/ndkks.el
-%%ELISPDIR%%/lookup/ndkks.elc
-%%ELISPDIR%%/lookup/ndspell.el
-%%ELISPDIR%%/lookup/ndspell.elc
-%%ELISPDIR%%/lookup/ndcookie.el
-%%ELISPDIR%%/lookup/ndcookie.elc
-%%ELISPDIR%%/lookup/ndmisc.el
-%%ELISPDIR%%/lookup/ndmisc.elc
-%%ELISPDIR%%/lookup/ndsrd.el
-%%ELISPDIR%%/lookup/ndsrd.elc
-%%ELISPDIR%%/lookup/sdicf.el
-%%ELISPDIR%%/lookup/sdicf.elc
-%%ELISPDIR%%/lookup/stem-english.el
-%%ELISPDIR%%/lookup/stem-english.elc
-%%ELISPDIR%%/lookup/lookup-vars.el
-%%ELISPDIR%%/lookup/lookup-vars.elc
-@dirrm %%ELISPDIR%%/lookup
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 1e6542c77beb..0dee4a105bc8 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -15,9 +15,6 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
 
-FILESDIR=	${.CURDIR}/../lookup/files
-PKGDIR=		${.CURDIR}/../lookup
-PLIST=		${.CURDIR}/pkg-plist
 USE_EMACS=	yes
 
 INFO?=		lookup lookup-guide