Update to version 1.1

4 files changed, 19 insertions, 26 deletions

diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index be1086caa0d9..5a3cc1034250 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for:	lookup for Mule 2.3
-# Version required:	1.0
+# Version required:	1.1
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lookup-1.0
-PKGNAME?=	ja-lookup-mule-1.0
+DISTNAME=	lookup-1.1
+PKGNAME?=	ja-lookup-mule-1.1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 RUN_DEPENDS+=	eblook:${PORTSDIR}/japanese/eblook
 
 FILESDIR=	${.CURDIR}/../lookup-mule/files
@@ -23,42 +22,28 @@ PATCHDIR=	${.CURDIR}/patches
 EMACS?=		mule
 
 .if (${EMACS} == "xemacs")
-BUILD_DEPENDS+=	xemacs:${PORTSDIR}/japanese/xemacs21-canna \
-		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages
 EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
 ELISPDIR=	${EMACSDIR}/lisp/lookup
 PORTINFODIR=	${EMACSDIR}/info
 MANIFEST=	MANIFEST.lookup
-DO_MAKEINFO=	${SETENV} LANG=ja_JP.EUC xemacs -no-site-file -no-init-file \
-		-batch -l texinfmt -f batch-texinfo-format lookup.texi; \
-		${ECHO} "INFO-DIR-SECTION The Emacs editor and associated tools" >> lookup.info; \
-		${ECHO} "START-INFO-DIR-ENTRY" >> lookup.info; \
-		${ECHO} "* Lookup: (lookup).             Lookup, a Search Interface." >> lookup.info; \
-		${ECHO} "END-INFO-DIR-ENTRY" >> lookup.info
 .else
-DO_MAKEINFO=	makeinfo --no-split --no-validate lookup.texi
 EMACSDIR=	${PREFIX}/share/emacs/site-lisp
 ELISPDIR=	${EMACSDIR}/lookup
 PORTINFODIR=	${PREFIX}/info
 .endif
-
-do-build:
-	${RM} ${WRKSRC}/texi/lookup.info*
-	nkf -e ${WRKSRC}/texi/lookup.texi > ${WRKSRC}/texi/lookup.euc.texi
-	${CP} ${WRKSRC}/texi/lookup.euc.texi ${WRKSRC}/texi/lookup.texi
-	(cd ${WRKSRC}/texi/ ; \
-		${DO_MAKEINFO} || ${TRUE} ; \
-	)
+NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
-	${SED} -e 's,@VERSION@,1.0,' -e 's,@pkgemacsdir@,${ELISPDIR},' \
+	${SED} -e 's,@VERSION@,1.1,' -e 's,@pkgemacsdir@,${ELISPDIR},' \
 		${WRKSRC}/lisp/lookup-vars.el.in > ${ELISPDIR}/lookup-vars.el
+	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
+	${INSTALL_DATA} ${WRKSRC}/texi/lookup-guide.info ${PORTINFODIR}
 .if (${EMACS} != "xemacs")
 	install-info ${PORTINFODIR}/lookup.info ${PORTINFODIR}/dir
+	install-info ${PORTINFODIR}/lookup-guide.info ${PORTINFODIR}/dir
 .endif
 	${SED} -e 's,%%ELISPDIR%%,${ELISPDIR},' ${FILESDIR}/lookup-startup.el.tmpl > ${ELISPDIR}/../lookup-startup.el
 
diff --git a/japanese/lookup-emacs21/distinfo b/japanese/lookup-emacs21/distinfo
index 3ce302d72c9a..cadbe57a4106 100644
--- a/japanese/lookup-emacs21/distinfo
+++ b/japanese/lookup-emacs21/distinfo
@@ -1 +1 @@
-MD5 (lookup-1.0.tar.gz) = 51e8d27e38931bf274a82939c3a8d753
+MD5 (lookup-1.1.tar.gz) = 597f7e6e7b70d92b34feb80c135e029a
diff --git a/japanese/lookup-emacs21/pkg-descr b/japanese/lookup-emacs21/pkg-descr
index 6f2a4ddb4787..4d6ca8bbccb4 100644
--- a/japanese/lookup-emacs21/pkg-descr
+++ b/japanese/lookup-emacs21/pkg-descr
@@ -2,7 +2,7 @@ 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.
 
-This is the release of Lookup version 1.0.  It works on GNU Emacs
-19.28 or later, XEmacs 20.3 or later, Mule 2.3, and Meadow 1.0 or later.
+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/lookup/index.html.en
diff --git a/japanese/lookup-emacs21/pkg-plist b/japanese/lookup-emacs21/pkg-plist
index c043e7d8648d..ab5a017f7312 100644
--- a/japanese/lookup-emacs21/pkg-plist
+++ b/japanese/lookup-emacs21/pkg-plist
@@ -3,6 +3,7 @@ share/emacs/site-lisp/lookup/evi-mule.el
 share/emacs/site-lisp/lookup/evi.el
 share/emacs/site-lisp/lookup/lookup-content.el
 share/emacs/site-lisp/lookup/lookup-entry.el
+share/emacs/site-lisp/lookup/lookup-kanji.el
 share/emacs/site-lisp/lookup/lookup-package.el
 share/emacs/site-lisp/lookup/lookup-select.el
 share/emacs/site-lisp/lookup/lookup-types.el
@@ -16,6 +17,7 @@ share/emacs/site-lisp/lookup/ndic.el
 share/emacs/site-lisp/lookup/ndict.el
 share/emacs/site-lisp/lookup/ndkks.el
 share/emacs/site-lisp/lookup/ndmisc.el
+share/emacs/site-lisp/lookup/ndnmz.el
 share/emacs/site-lisp/lookup/ndspell.el
 share/emacs/site-lisp/lookup/ndsrd.el
 share/emacs/site-lisp/lookup/ndtp.el
@@ -23,5 +25,11 @@ share/emacs/site-lisp/lookup/sdicf.el
 share/emacs/site-lisp/lookup/stem-english.el
 @unexec install-info  --delete %D/info/lookup.info %D/info/dir
 info/lookup.info
+info/lookup.info-1
+info/lookup.info-2
+info/lookup.info-3
 @exec install-info %D/info/lookup.info %D/info/dir
+@unexec install-info  --delete %D/info/lookup-guide.info %D/info/dir
+info/lookup-guide.info
+@exec install-info %D/info/lookup-guide.info %D/info/dir
 @dirrm share/emacs/site-lisp/lookup