Date: Sun, 05 Aug 2007 10:17:50 +0900 (JST) From: KIMURA Yasuhiro <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, sem@FreeBSD.org Subject: Re: ports/114670: [REPOCOPY] japanese/lookup -> japanese/lookup-emacs21 Message-ID: <20070805.101750.194128015.yasu@utahime.org> In-Reply-To: <200707171800.l6HI09qO012216@freefall.freebsd.org> References: <20070717175257.607C762@eastasia.home.utahime.org> <200707171800.l6HI09qO012216@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Please apply following patch.
Regards.
Index: japanese/Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/japanese/Makefile,v
retrieving revision 1.661
diff -u -r1.661 Makefile
--- japanese/Makefile 4 Aug 2007 08:05:03 -0000 1.661
+++ japanese/Makefile 4 Aug 2007 23:41:46 -0000
@@ -182,6 +182,7 @@
SUBDIR += lipsf
SUBDIR += lookup
SUBDIR += lookup-emacs20
+ SUBDIR += lookup-emacs21
SUBDIR += lsd-fpw
SUBDIR += lynx
SUBDIR += lynx-current
Index: japanese/lookup/Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/japanese/lookup/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- japanese/lookup/Makefile 23 Jul 2007 09:36:03 -0000 1.29
+++ japanese/lookup/Makefile 5 Aug 2007 00:05:53 -0000
@@ -8,9 +8,9 @@
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/
+PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
@@ -19,10 +19,11 @@
PKGDIR= ${.CURDIR}/../lookup
PLIST= ${.CURDIR}/pkg-plist
USE_EMACS= yes
-EMACS_PORT_NAME?= emacs21
INFO?= lookup lookup-guide
+.include <bsd.port.pre.mk>
+
.if (${EMACS_PORT_NAME} == "xemacs21-mule")
EMACSDIR= ${PREFIX}/lib/xemacs/site-packages
ELISPDIR= ${EMACSDIR}/lisp/lookup
@@ -34,7 +35,7 @@
PLIST_SUB= ELISPDIR=${EMACS_VERSION_SITE_LISPDIR}
.endif
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
+CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
--with-lispdir=${ELISPDIR}
post-install:
@@ -48,4 +49,4 @@
${EMACSDIR}/pkginfo/
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: japanese/lookup-emacs21/Makefile
===================================================================
RCS file: /usr1/freebsd/cvsroot/ports/japanese/lookup-emacs21/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- japanese/lookup-emacs21/Makefile 23 Jul 2007 09:36:03 -0000 1.29
+++ japanese/lookup-emacs21/Makefile 4 Aug 2007 23:36:12 -0000
@@ -5,47 +5,9 @@
# $FreeBSD: ports/japanese/lookup-emacs21/Makefile,v 1.29 2007/07/23 09:36:03 rafan Exp $
#
-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"
Index: japanese/lookup-emacs21/distinfo
===================================================================
RCS file: japanese/lookup-emacs21/distinfo
diff -N japanese/lookup-emacs21/distinfo
--- japanese/lookup-emacs21/distinfo 2 Feb 2007 06:59:58 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: japanese/lookup-emacs21/pkg-descr
===================================================================
RCS file: japanese/lookup-emacs21/pkg-descr
diff -N japanese/lookup-emacs21/pkg-descr
--- japanese/lookup-emacs21/pkg-descr 31 Jul 2004 12:51:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: japanese/lookup-emacs21/pkg-plist
===================================================================
RCS file: japanese/lookup-emacs21/pkg-plist
diff -N japanese/lookup-emacs21/pkg-plist
--- japanese/lookup-emacs21/pkg-plist 4 Dec 2005 08:59:03 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: japanese/lookup-emacs21/files/patch-ab
===================================================================
RCS file: japanese/lookup-emacs21/files/patch-ab
diff -N japanese/lookup-emacs21/files/patch-ab
--- japanese/lookup-emacs21/files/patch-ab 10 Jul 2000 17:36:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070805.101750.194128015.yasu>