New master/slave scheme for emacs-w3m ports.

Update master port to emacs21.
Update slave ports to stub port:
    emacs-w3m-emacs20, emacs-w3m-xemacs21-mule
Install el/elc files to version specific site-lisp directory (Gnu Emacsen).

11 files changed, 23 insertions, 279 deletions

diff --git a/www/emacs-w3m-emacs20/Makefile b/www/emacs-w3m-emacs20/Makefile
index 8d25ab688ca..534ace23967 100644
--- a/www/emacs-w3m-emacs20/Makefile
+++ b/www/emacs-w3m-emacs20/Makefile
@@ -5,91 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	emacs-w3m
-PORTVERSION=	1.1.100
-CATEGORIES=	www elisp
-MASTER_SITES=	http://emacs-w3m.namazu.org/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	w3m_el-${PORTVERSION}
+MASTERDIR=	${.CURDIR}/../emacs-w3m
 
-MAINTAINER=	nobutaka@FreeBSD.org
+PORTCLASS=	slave
 
-EMACS_PORT_NAME?=	emacs20
+EMACS_PORT_NAME=	emacs20
 
-CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD}
-LISPDIR?=	${EMACS_LIBDIR}/site-lisp/w3m
-ETCDIR?=	share/w3m
-PKGINFODIR?=	"@comment "
-
-USE_AUTOCONF=	yes
-ALL_TARGET=	default
-
-PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
-		LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		SHIMBUN=${SHIMBUN}
-
-DOCS=		README
-DOCS_JA=	README.ja TIPS.ja
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
-DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-.if (${EMACS_NAME} == "xemacs")
-XEMACS_ONLY?=		""
-EMACS_ONLY?=		"@comment "
-SEMI_FILE=		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el
-.else
-XEMACS_ONLY?=		"@comment "
-EMACS_ONLY?=		""
-SEMI_FILE=		${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el
-.endif
-
-.if defined(WITH_SHIMBUN)
-HAVE_SEMI=yes
-SHIMBUN=		""
-.else 
-.if exists(${SEMI_FILE})
-HAVE_SEMI=yes
-SHIMBUN=		""
-.else
-SHIMBUN=		"@comment "
-.endif
-.endif
-
-.if defined(HAVE_SEMI) 
-BUILD_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
-.endif
-
-.if !defined(HAVE_SEMI)
-pre-fetch:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "NOTE: You can have shimbun support by adding \"WITH_SHIMBUN=yes\" to argument of make."
-	@${ECHO_MSG}
-.endif
-
-post-extract:
-.if defined(EMACS_PACKAGESDIR)
-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR_JA}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR_JA}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/www/emacs-w3m-emacs20/distinfo b/www/emacs-w3m-emacs20/distinfo
deleted file mode 100644
index 0965665d923..00000000000
--- a/www/emacs-w3m-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (w3m_el-1.1.100.tar.gz) = cd773d62b828dabe6560efe9859b424c
diff --git a/www/emacs-w3m-emacs20/files/_pkg.el b/www/emacs-w3m-emacs20/files/_pkg.el
deleted file mode 100644
index 772e0722933..00000000000
--- a/www/emacs-w3m-emacs20/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'w3m
-                 :version 0.2
-                 :type 'regular)
diff --git a/www/emacs-w3m-emacs20/files/patch-Makefile.in b/www/emacs-w3m-emacs20/files/patch-Makefile.in
deleted file mode 100644
index c83dad7b004..00000000000
--- a/www/emacs-w3m-emacs20/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Mar 24 03:52:13 2001
-+++ Makefile.in	Sat Mar 24 03:52:22 2001
-@@ -41,7 +41,7 @@
- 
- install: default
- 	@$(SHELL) ./mkinstalldirs $(lispdir);\
--	for p in ChangeLog *.el; do\
-+	for p in *.el; do\
- 	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- 	  $(INSTALL_DATA) $$p $(lispdir)/$$p;\
- 	done;\
diff --git a/www/emacs-w3m-emacs20/pkg-comment b/www/emacs-w3m-emacs20/pkg-comment
deleted file mode 100644
index 2d746a12268..00000000000
--- a/www/emacs-w3m-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple front-end to w3m for emacs20
diff --git a/www/emacs-w3m-emacs20/pkg-descr b/www/emacs-w3m-emacs20/pkg-descr
deleted file mode 100644
index 766df1ee54a..00000000000
--- a/www/emacs-w3m-emacs20/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Emacs-w3m is a simple interface program of w3m for Emacs.
-
-WWW: http://emacs-w3m.namazu.org/
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/www/emacs-w3m-emacs20/pkg-message b/www/emacs-w3m-emacs20/pkg-message
deleted file mode 100644
index 770112a4002..00000000000
--- a/www/emacs-w3m-emacs20/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
-********************************************************************
-* Before using emacs-w3m, you must add this to your own .emacs:    *
-*                                                                  *
-* (autoload 'w3m "w3m" "Interface for w3m on Emacs." t)            *
-*                                                                  *
-* To use emacs-w3m on Wanderlust, add this to your own .emacs:     *
-*                                                                  *
-* (setq mime-setup-enable-inline-html nil)                         *
-* (eval-after-load "mime-view"                                     *
-*   '(progn                                                        *
-*     (autoload 'mime-w3m-preview-text/html "mime-w3m")            *
-*     (ctree-set-calist-strictly                                   *
-*      'mime-preview-condition                                     *
-*      '((type . text) (subtype . html) (body . visible)           *
-*	 (body-presentation-method . mime-w3m-preview-text/html))) *
-*     (set-alist 'mime-view-type-subtype-score-alist               *
-*		 '(text . html) 3)))                               *
-*                                                                  *
-* And to use emacs-w3m on Mew, add this to your own .mew:          *
-*                                                                  *
-* (require 'mew-w3m)                                               *
-* (setq mew-prog-html '(mew-mime-text/html-w3m nil nil))           *
-********************************************************************
diff --git a/www/emacs-w3m-emacs20/pkg-plist b/www/emacs-w3m-emacs20/pkg-plist
deleted file mode 100644
index e8d7339fc5a..00000000000
--- a/www/emacs-w3m-emacs20/pkg-plist
+++ /dev/null
@@ -1,141 +0,0 @@
-%%PKGINFODIR%%/MANIFEST.w3m
-%%XEMACS_ONLY%%%%ETCDIR%%/antenna-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/back-disabled.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/back-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/copy-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/db-history-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/forward-disabled.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/forward-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/history-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/home-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/image-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/open-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/parent-disabled.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/parent-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/reload-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/search-up.xpm
-%%XEMACS_ONLY%%%%ETCDIR%%/weather-up.xpm
-%%XEMACS_ONLY%%@dirrm %%ETCDIR%%
-%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.el
-%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/w3m-xmas.elc
-%%LISPDIR%%/mew-w3m.el
-@unexec rm -f %D/%%LISPDIR%%/mew-w3m.elc
-%%LISPDIR%%/mime-w3m.el
-@unexec rm -f %D/%%LISPDIR%%/mime-w3m.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ding.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ding.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-gyve.el
-%%SHIMBUN%%%%LISPDIR%%/sb-gyve.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.el
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-hns.el
-%%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-impress.el
-%%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.el
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.el
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-rika.el
-%%SHIMBUN%%%%LISPDIR%%/sb-rika.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-text.el
-%%SHIMBUN%%%%LISPDIR%%/sb-text.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.el
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.el
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun.elc
-%%LISPDIR%%/w3m-antenna.el
-%%LISPDIR%%/w3m-antenna.elc
-%%LISPDIR%%/w3m-bookmark.el
-%%LISPDIR%%/w3m-bookmark.elc
-%%LISPDIR%%/w3m-dtree.el
-%%LISPDIR%%/w3m-dtree.elc
-%%LISPDIR%%/w3m-e20.el
-%%EMACS_ONLY%%%%LISPDIR%%/w3m-e20.elc
-%%LISPDIR%%/w3m-e21.el
-%%LISPDIR%%/w3m-filter.el
-%%LISPDIR%%/w3m-filter.elc
-%%LISPDIR%%/w3m-form.el
-%%LISPDIR%%/w3m-form.elc
-%%LISPDIR%%/w3m-hist.el
-%%LISPDIR%%/w3m-hist.elc
-%%LISPDIR%%/w3m-macro.el
-%%LISPDIR%%/w3m-macro.elc
-%%LISPDIR%%/w3m-om.el
-%%LISPDIR%%/w3m-search.el
-%%LISPDIR%%/w3m-search.elc
-%%LISPDIR%%/w3m-weather.el
-%%LISPDIR%%/w3m-weather.elc
-%%LISPDIR%%/w3m-xmas.el
-%%LISPDIR%%/w3m.elc
-%%LISPDIR%%/w3mhack.el
-%%LISPDIR%%/w3m.el
-@dirrm %%LISPDIR%%
-share/doc/ja/emacs-w3m/TIPS.ja
-share/doc/ja/emacs-w3m/README.ja
-share/doc/emacs-w3m/README
-@dirrm share/doc/ja/emacs-w3m
-@dirrm share/doc/emacs-w3m
diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index 880c0da362f..a6985092e21 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -5,7 +5,9 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../emacs-w3m-emacs20
+MASTERDIR=	${.CURDIR}/../emacs-w3m
+
+PORTCLASS=	slave
 
 EMACS_PORT_NAME=	xemacs21-mule
 
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 8d25ab688ca..9e7f311e439 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -14,10 +14,18 @@ DISTNAME=	w3m_el-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-EMACS_PORT_NAME?=	emacs20
+PORTCLASS?=		master
 
-CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD}
-LISPDIR?=	${EMACS_LIBDIR}/site-lisp/w3m
+.if (${PORTCLASS} == "master")
+EMACS_PORT_NAME?=	emacs21
+DEPPORT_SUFFIX=		
+.else
+DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
+.endif
+
+CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
+			--with-lispdir=${LOCALBASE}/${LISPDIR}
+LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
 ETCDIR?=	share/w3m
 PKGINFODIR?=	"@comment "
 
@@ -47,7 +55,7 @@ SEMI_FILE=		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el
 .else
 XEMACS_ONLY?=		"@comment "
 EMACS_ONLY?=		""
-SEMI_FILE=		${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el
+SEMI_FILE=		${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semi/mime-setup.el
 .endif
 
 .if defined(WITH_SHIMBUN)
@@ -63,8 +71,8 @@ SHIMBUN=		"@comment "
 .endif
 
 .if defined(HAVE_SEMI) 
-BUILD_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
-RUN_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
+BUILD_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
+RUN_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
 .endif
 
 .if !defined(HAVE_SEMI)
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index e8d7339fc5a..fa11c11aaf0 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -114,8 +114,9 @@
 %%LISPDIR%%/w3m-dtree.el
 %%LISPDIR%%/w3m-dtree.elc
 %%LISPDIR%%/w3m-e20.el
-%%EMACS_ONLY%%%%LISPDIR%%/w3m-e20.elc
+%%EMACS_ONLY%%@unexec rm -f %D/%%LISPDIR%%/w3m-e20.elc
 %%LISPDIR%%/w3m-e21.el
+%%EMACS_ONLY%%@unexec rm -f %D/%%LISPDIR%%/w3m-e21.elc
 %%LISPDIR%%/w3m-filter.el
 %%LISPDIR%%/w3m-filter.elc
 %%LISPDIR%%/w3m-form.el