Update to 10.7; no change summary available but some new functions added,

minor bug fixes.

While here teach emacs22{,nox}.

4 files changed, 21 insertions, 51 deletions

diff --git a/devel/apel/Makefile b/devel/apel/Makefile
index 2393ce49c1d..0f264510f68 100644
--- a/devel/apel/Makefile
+++ b/devel/apel/Makefile
@@ -1,45 +1,31 @@
-# $NetBSD: Makefile,v 1.16 2007/01/30 23:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/20 14:20:54 uebayasi Exp $
 
-DISTNAME=	apel-10.6
+DISTNAME=	apel-10.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/apel/
+MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/
 
-MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
+MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
-COMMENT=	Portable Emacs Library
-
-#CONFLICTS+=	apel-*
-#CONFLICTS+=	xemacs-apel-*
+COMMENT=	Portable Emacs library
 
 PLIST_SRC=	${PKGDIR}/PLIST.${EMACS_FLAVOR}
-
+BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
+INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
+MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
+INSTALLATION_DIRS+=	${DOCDIR}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs22 emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=emacs22 emacs22nox emacs21 emacs21nox emacs20
+BUILD_TARGET.emacs=	elc
+INSTALL_TARGET.emacs=	install
+MAKE_FLAGS.emacs=
+BUILD_TARGET.xemacs=	package
+INSTALL_TARGET.xemacs=	install-package
+MAKE_FLAGS.xemacs=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 
 .include "../../mk/emacs.mk"
-
-.if ${EMACS_FLAVOR} == "emacs"
-BUILD_TARGET=	elc
-INSTALL_TARGET=	install
-.else	# ${EMACS_FLAVOR} == "xemacs"
-BUILD_TARGET=	package
-INSTALL_TARGET=	install-package
-MAKE_FLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
-.endif
-
-DOCDIR=		${PREFIX}/share/doc/apel
-
-.if ${EMACS_FLAVOR} == "emacs"
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.en ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCDIR}
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apel/PLIST.emacs b/devel/apel/PLIST.emacs
index eee42fa7e50..c3b3252c545 100644
--- a/devel/apel/PLIST.emacs
+++ b/devel/apel/PLIST.emacs
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.emacs,v 1.2 2003/01/11 09:28:47 uebayasi Exp $
-share/doc/apel/README.en
-share/doc/apel/README.ja
+@comment $NetBSD: PLIST.emacs,v 1.3 2007/02/20 14:20:54 uebayasi Exp $
 ${EMACS_LISPPREFIX}/emu/apel-ver.el
 ${EMACS_LISPPREFIX}/emu/apel-ver.elc
 ${EMACS_LISPPREFIX}/emu/broken.el
diff --git a/devel/apel/distinfo b/devel/apel/distinfo
index 2ea0d4486e6..8930cceeb72 100644
--- a/devel/apel/distinfo
+++ b/devel/apel/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:09 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/02/20 14:20:54 uebayasi Exp $
 
-SHA1 (apel-10.6.tar.gz) = 47db5ec3bdbb822571714b8dc60c3ba9eb12211b
-RMD160 (apel-10.6.tar.gz) = 846cc960dec111da195ad7cb38d513cc8b18cdd7
-Size (apel-10.6.tar.gz) = 131279 bytes
-SHA1 (patch-aa) = fcbbad6b59177b2e8532da2cc665a9271fca0830
+SHA1 (apel-10.7.tar.gz) = e68169ec8d539f014b086296aa8cb08517aad5e9
+RMD160 (apel-10.7.tar.gz) = 3ab1286f0862bca79b92f142c499f68e37ca8cf1
+Size (apel-10.7.tar.gz) = 125811 bytes
diff --git a/devel/apel/patches/patch-aa b/devel/apel/patches/patch-aa
deleted file mode 100644
index cad21814f8e..00000000000
--- a/devel/apel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/20 08:33:59 jun Exp $
-
---- Makefile.orig	Thu Feb  8 18:52:49 2001
-+++ Makefile
-@@ -21,6 +21,8 @@
- 
- ARCHIVE_DIR_PREFIX = /pub/mule
- 
-+all: what-where
-+
- what-where:
- 	$(EMACS) $(FLAGS) -f what-where-apel \
- 		$(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR)