- Update to 10.7.

- Eliminate codes and files for emacs19 and xemacs.

9 files changed, 12 insertions, 251 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index da8e3ffee199..d91396ed6750 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -16,114 +16,31 @@ MAINTAINER?=	nobutaka@FreeBSD.org
 COMMENT?=	A Portable Emacs Library for emacs21
 
 # distfile version
-APEL_VER=	10.6
-# setupel filename
-APEL_SETUPEL=	apel-setupel.el
-# document install directory by install-doc target
-APELDOCDIR?=	share/doc/apel
+APEL_VER=	10.7
 # apel lispdir
 APEL_LISPDIR?=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
-# This is a master port.
-PORTCLASS?=	master
-
 # emacs port setup
 USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
-EMACS_MASTERDIR_PKGFILES=YES
 DESCR=		${PKGDIR}/pkg-descr
 
 # target name for make build
 ALL_TARGET?=	elc
 # environments
-SCRIPTS_ENV+=	TARGETS="${APEL_SETUPEL}"
-PLIST_SUB+=	APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
 MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 		LISPDIR="${APEL_LISPDIR}" \
 		VERSION_SPECIFIC_LISPDIR="${APEL_VERSION_SPECIFIC_LISPDIR}"
 
-.include <bsd.port.pre.mk>
-
-.if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22")
-PLIST=		${PKGDIR}/pkg-plist.emacs20
-.endif
-# depends on custom: emacs-19.34 or mule-19.34
-.if (${EMACS_VER} == "19.34")
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
-.endif
-.if (${EMACS_NAME} == "xemacs")
-.BEGIN:
-	@${ECHO} "Please use apel from editors/xemacs-packages port."
-	@${ECHO} "This port only for GNU Emacs."
-	@${FALSE}
-.endif
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-pre-configure:
-.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
-	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
-.endif
-
-pre-install:
-.if defined(EMACS_PACKAGESDIR) && defined(EMACS_PACKAGES_SUBDIRS)
-	@${MAKE} mkdir-site-packages
-.endif
-.if defined(EMACS_PACKAGESDIR) && defined(XEMACS_PKGNAME)
-	@${MAKE} pkg-el-install
-.endif
-
 post-install:
-.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
-	@${MAKE} setupel-install
-.endif
-.if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
-	@${MAKE} manifest-install
-.endif
 .if !defined(NOPORTDOCS)
-	@${MAKE} doc-install
-.endif
-
-###############################################################################
-#
-# local functions
-#
-mkdir-site-packages:
-	@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
-	    ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
-	done)
-
-pkg-el-install:
-	@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
-	${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
-	${INSTALL_DATA} ${FILESDIR}/_pkg.el \
-	    ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
-	fi)
-
-doc-install:
-	@${MKDIR} ${LOCALBASE}/${APELDOCDIR}
+	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog README.* ; do \
-	    ${INSTALL_DATA} $${i} ${LOCALBASE}/${APELDOCDIR}/ ; \
+	    ${INSTALL_DATA} $${i} ${DOCSDIR} ; \
 	done)
+.endif
 
-setupel-install:
-	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
-			${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-
-manifest-install:
-	@${RM} -f ${WRKDIR}/${MANIFEST}
-	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
-		${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/apel/distinfo b/editors/apel/distinfo
index ae8388871198..b156b8d3f2cf 100644
--- a/editors/apel/distinfo
+++ b/editors/apel/distinfo
@@ -1,3 +1,3 @@
-MD5 (apel-10.6.tar.gz) = a770333c50a4bb79c0923dee78d5e358
-SHA256 (apel-10.6.tar.gz) = 9e7023a4b838b83d40d0f3e0df401b0ddee8880df7939a9a0b98f3b66af02e38
-SIZE (apel-10.6.tar.gz) = 131279
+MD5 (apel-10.7.tar.gz) = fadc7823f2bc22c7b25cb5185232820d
+SHA256 (apel-10.7.tar.gz) = c2ed634798fbdf1d9498815c929561cd75bea86e9bb4d19697477f6939a35366
+SIZE (apel-10.7.tar.gz) = 125811
diff --git a/editors/apel/files/_pkg.el b/editors/apel/files/_pkg.el
deleted file mode 100644
index d3d55387912f..000000000000
--- a/editors/apel/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'apel
-                 :version 1.16
-                 :type 'regular)
diff --git a/editors/apel/files/apel-setupel.el.in b/editors/apel/files/apel-setupel.el.in
deleted file mode 100644
index 79c57db20a2b..000000000000
--- a/editors/apel/files/apel-setupel.el.in
+++ /dev/null
@@ -1,9 +0,0 @@
-;;
-;; @(#)apel-setupel.el -- apel emacs load-path setup elisp file.
-;;                                            --  by shige@FreeBSD.ORG
-
-(setq load-path (append '(
-	"@@LOCALBASE@@/@@EMACS_VERSION_SITE_LISPDIR@@/apel"
-	"@@LOCALBASE@@/@@EMACS_VERSION_SITE_LISPDIR@@/emu"
- ) load-path))
-(provide 'apel-setupel)
diff --git a/editors/apel/files/patch-aa b/editors/apel/files/patch-aa
deleted file mode 100644
index d8595b1a9a38..000000000000
--- a/editors/apel/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	Tue Oct 27 23:58:27 1998
-+++ Makefile	Sun Nov  1 20:44:21 1998
-@@ -17,6 +17,7 @@
- PACKAGEDIR = NONE
- VERSION_SPECIFIC_LISPDIR = NONE
- 
-+all:	elc
- 
- elc:
- 	$(EMACS) $(FLAGS) -f compile-apel
diff --git a/editors/apel/pkg-plist.emacs20 b/editors/apel/pkg-plist
index b4d0ceb85ce0..156252f72cd7 100644
--- a/editors/apel/pkg-plist.emacs20
+++ b/editors/apel/pkg-plist
@@ -56,7 +56,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
-%%APELDOCDIR%%/ChangeLog
-%%APELDOCDIR%%/README.en
-%%APELDOCDIR%%/README.ja
-@dirrm %%APELDOCDIR%%
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.en
+%%DOCSDIR%%/README.ja
+@dirrm %%DOCSDIR%%
diff --git a/editors/apel/pkg-plist.emacs19 b/editors/apel/pkg-plist.emacs19
deleted file mode 100644
index cd7e901adf4a..000000000000
--- a/editors/apel/pkg-plist.emacs19
+++ /dev/null
@@ -1,57 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-ltn1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-ltn1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-raw.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-raw.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-ltn1.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-ltn1.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/%%APEL_SETUPEL%%
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
-%%APELDOCDIR%%/ChangeLog
-%%APELDOCDIR%%/README.en
-%%APELDOCDIR%%/README.ja
-@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/pkg-plist.mule b/editors/apel/pkg-plist.mule
deleted file mode 100644
index 299f2b82f7a8..000000000000
--- a/editors/apel/pkg-plist.mule
+++ /dev/null
@@ -1,61 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu-mule.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu-mule.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-om.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-om.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-om.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-om.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-om.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-om.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-om.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-om.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.el
-%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/%%APEL_SETUPEL%%
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
-%%APELDOCDIR%%/ChangeLog
-%%APELDOCDIR%%/README.en
-%%APELDOCDIR%%/README.ja
-@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/scripts/configure b/editors/apel/scripts/configure
deleted file mode 100644
index ffe214ba26f5..000000000000
--- a/editors/apel/scripts/configure
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-for i in ${TARGETS}
-do
-	if [ -f ${WRKDIR}/${i}.in ]; then
-	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-	-e "s;@@LOCALBASE@@;${LOCALBASE};g" \
-	-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-	-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
-	-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
-	-e "s;@@EMACS_SITE_LISPDIR@@;${EMACS_SITE_LISPDIR};g" \
-	-e "s;@@EMACS_VERSION_SITE_LISPDIR@@;${EMACS_VERSION_SITE_LISPDIR};g" \
-	> ${WRKDIR}/${i}
-	fi
-done