Add WITHOUT_SHIMBUN knob.

Submitted by:	NIIMI Satoshi <sa2c@sa2c.net>

3 files changed, 176 insertions, 143 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index c17f17688ef4..e190bfde562c 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -37,7 +37,8 @@ PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
 		ETCDIR=${ETCDIR} \
 		PKGINFODIR=${PKGINFODIR} \
 		ICONS=${ICONS} \
-		ETC=${ETC}
+		ETC=${ETC} \
+		SHIMBUN=${SHIMBUN}
 
 DOCS=		FAQ README
 DOCS_JA=	FAQ.ja README.ja README.namazu.ja README.shimbun.ja TIPS.ja
@@ -71,7 +72,13 @@ INSTALL_TARGET=	install install-icons
 .endif
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_SHIMBUN)
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
+SHIMBUN=	"@comment "
+WITHOUT_OCTET_VIEWER=	yes
+.else
+SHIMBUN=	""
+.endif
 
 .if (${EMACS_PORT_NAME} == "emacs21")
 FLIM_PORT=	${PORTSDIR}/editors/flim
@@ -90,11 +97,13 @@ SEMI_PORT?=	${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}
 MULE_UCS_PORT?=	${PORTSDIR}/converters/mule-ucs-${EMACS_PORT_NAME}
 MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
 
-BUILD_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n \
-		${FLIM_COOKIE}:${FLIM_PORT}
-RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n \
-		${FLIM_COOKIE}:${FLIM_PORT}
-.if (${EMACS_PORT_NAME} != "xemacs21-mule" && !defined(WITHOUT_OCTET_VIEWER))
+BUILD_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n
+RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n
+.if !defined(WITHOUT_SHIMBUN)
+BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
+RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
+.endif
+.if !defined(WITHOUT_OCTET_VIEWER)
 RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
 		wvHtml:${PORTSDIR}/textproc/wv \
 		xlhtml:${PORTSDIR}/textproc/xlhtml \
@@ -102,9 +111,14 @@ RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
 .endif
 
 pre-everything::
-.if (${EMACS_PORT_NAME} != "xemacs21-mule" || !defined(WITHOUT_OCTET_VIEWER))
+.if !defined(WITHOUT_SHIMBUN)
+	@${ECHO_MSG} "===>"
+	@${ECHO_MSG} "===>  If you don't use the shimbun modules, please define WITHOUT_SHIMBUN."
+	@${ECHO_MSG} "===>"
+.endif
+.if !defined(WITHOUT_OCTET_VIEWER)
 	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===>  If you don't use octet stream viewer,"
+	@${ECHO_MSG} "===>  If you don't use the octet stream viewer,"
 	@${ECHO_MSG} "===>  please define WITHOUT_OCTET_VIEWER."
 	@${ECHO_MSG} "===>"
 .endif
@@ -127,4 +141,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/emacs-w3m/files/extra-patch-Makefile.in b/www/emacs-w3m/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..86f0eae03094
--- /dev/null
+++ b/www/emacs-w3m/files/extra-patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Sat Jul 27 19:04:35 2002
++++ Makefile.in	Sat Jul 27 19:04:39 2002
+@@ -42,16 +42,6 @@
+ 	    $(INSTALL_DATA) $$p $(lispdir)/$$p;\
+ 	  fi;\
+ 	done;\
+-	if test -f shimbun/shimbun.elc; then\
+-	  for p in `cd shimbun && echo *.el`; do\
+-	    echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
+-	    $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+-	  done;\
+-	  for p in `cd shimbun && echo *.elc`; do\
+-	    echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
+-	    $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+-	  done;\
+-	fi
+ 
+ install-icons:
+ 	@if test $(ICONDIR) = NONE; then\
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index dd28df1f9036..c173783f1d3a 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -24,144 +24,144 @@
 %%XEMACS%%%%LISPDIR%%/custom-load.el
 %%XEMACS%%%%LISPDIR%%/custom-load.elc
 %%XEMACS%%%%LISPDIR%%/w3m-xmas.elc
-%%LISPDIR%%/mew-shimbun.el
-@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
+%%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
+%%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.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
 %%LISPDIR%%/octet.el
-%%LISPDIR%%/octet.elc
-%%LISPDIR%%/sb-2ch.el
-%%LISPDIR%%/sb-2ch.elc
-%%LISPDIR%%/sb-airs.el
-%%LISPDIR%%/sb-airs.elc
-%%LISPDIR%%/sb-asahi-html.el
-%%LISPDIR%%/sb-asahi-html.elc
-%%LISPDIR%%/sb-asahi.el
-%%LISPDIR%%/sb-asahi.elc
-%%LISPDIR%%/sb-bbdb-ml.el
-%%LISPDIR%%/sb-bbdb-ml.elc
-%%LISPDIR%%/sb-cnet.el
-%%LISPDIR%%/sb-cnet.elc
-%%LISPDIR%%/sb-debian-jp.el
-%%LISPDIR%%/sb-debian-jp.elc
-%%LISPDIR%%/sb-debian.el
-%%LISPDIR%%/sb-debian.elc
-%%LISPDIR%%/sb-digiko.el
-%%LISPDIR%%/sb-digiko.elc
-%%LISPDIR%%/sb-ding.el
-%%LISPDIR%%/sb-ding.elc
-%%LISPDIR%%/sb-f1express.el
-%%LISPDIR%%/sb-f1express.elc
-%%LISPDIR%%/sb-f1fan.el
-%%LISPDIR%%/sb-f1fan.elc
-%%LISPDIR%%/sb-fml.el
-%%LISPDIR%%/sb-fml.elc
-%%LISPDIR%%/sb-geocrawler.el
-%%LISPDIR%%/sb-geocrawler.elc
-%%LISPDIR%%/sb-glimpse.el
-%%LISPDIR%%/sb-glimpse.elc
-%%LISPDIR%%/sb-gnome.el
-%%LISPDIR%%/sb-gnome.elc
-%%LISPDIR%%/sb-gyve.el
-%%LISPDIR%%/sb-gyve.elc
-%%LISPDIR%%/sb-h14m.el
-%%LISPDIR%%/sb-h14m.elc
-%%LISPDIR%%/sb-hns.el
-%%LISPDIR%%/sb-hns.elc
-%%LISPDIR%%/sb-ibm-dev.el
-%%LISPDIR%%/sb-ibm-dev.elc
-%%LISPDIR%%/sb-impress.el
-%%LISPDIR%%/sb-impress.elc
-%%LISPDIR%%/sb-isize-sports.el
-%%LISPDIR%%/sb-isize-sports.elc
-%%LISPDIR%%/sb-japantimes.el
-%%LISPDIR%%/sb-japantimes.elc
-%%LISPDIR%%/sb-javaconf.el
-%%LISPDIR%%/sb-javaconf.elc
-%%LISPDIR%%/sb-kantei.el
-%%LISPDIR%%/sb-kantei.elc
-%%LISPDIR%%/sb-kde.el
-%%LISPDIR%%/sb-kde.elc
-%%LISPDIR%%/sb-linuxce-jp.el
-%%LISPDIR%%/sb-linuxce-jp.elc
-%%LISPDIR%%/sb-lump.el
-%%LISPDIR%%/sb-lump.elc
-%%LISPDIR%%/sb-m17n.el
-%%LISPDIR%%/sb-m17n.elc
-%%LISPDIR%%/sb-mailarc.el
-%%LISPDIR%%/sb-mailarc.elc
-%%LISPDIR%%/sb-mailman.el
-%%LISPDIR%%/sb-mailman.elc
-%%LISPDIR%%/sb-mainichi.el
-%%LISPDIR%%/sb-mainichi.elc
-%%LISPDIR%%/sb-makanai.el
-%%LISPDIR%%/sb-makanai.elc
-%%LISPDIR%%/sb-marc-aims.el
-%%LISPDIR%%/sb-marc-aims.elc
-%%LISPDIR%%/sb-meadow.el
-%%LISPDIR%%/sb-meadow.elc
-%%LISPDIR%%/sb-mew.el
-%%LISPDIR%%/sb-mew.elc
-%%LISPDIR%%/sb-mhonarc.el
-%%LISPDIR%%/sb-mhonarc.elc
-%%LISPDIR%%/sb-muchy.el
-%%LISPDIR%%/sb-muchy.elc
-%%LISPDIR%%/sb-namazu.el
-%%LISPDIR%%/sb-namazu.elc
-%%LISPDIR%%/sb-netbsd.el
-%%LISPDIR%%/sb-netbsd.elc
-%%LISPDIR%%/sb-nikkansports.el
-%%LISPDIR%%/sb-nikkansports.elc
-%%LISPDIR%%/sb-nikkei.el
-%%LISPDIR%%/sb-nikkei.elc
-%%LISPDIR%%/sb-orca.el
-%%LISPDIR%%/sb-orca.elc
-%%LISPDIR%%/sb-palmfan.el
-%%LISPDIR%%/sb-palmfan.elc
-%%LISPDIR%%/sb-pcweb-column.el
-%%LISPDIR%%/sb-pcweb-column.elc
-%%LISPDIR%%/sb-pilot-link.el
-%%LISPDIR%%/sb-pilot-link.elc
-%%LISPDIR%%/sb-quickml.el
-%%LISPDIR%%/sb-quickml.elc
-%%LISPDIR%%/sb-ruby.el
-%%LISPDIR%%/sb-ruby.elc
-%%LISPDIR%%/sb-savannah.el
-%%LISPDIR%%/sb-savannah.elc
-%%LISPDIR%%/sb-security-memo.el
-%%LISPDIR%%/sb-security-memo.elc
-%%LISPDIR%%/sb-slashdot-jp.el
-%%LISPDIR%%/sb-slashdot-jp.elc
-%%LISPDIR%%/sb-sponichi.el
-%%LISPDIR%%/sb-sponichi.elc
-%%LISPDIR%%/sb-tcup.el
-%%LISPDIR%%/sb-tcup.elc
-%%LISPDIR%%/sb-texfaq.el
-%%LISPDIR%%/sb-texfaq.elc
-%%LISPDIR%%/sb-text.el
-%%LISPDIR%%/sb-text.elc
-%%LISPDIR%%/sb-toshiba.el
-%%LISPDIR%%/sb-toshiba.elc
-%%LISPDIR%%/sb-vinelinux.el
-%%LISPDIR%%/sb-vinelinux.elc
-%%LISPDIR%%/sb-w3m-dev.el
-%%LISPDIR%%/sb-w3m-dev.elc
-%%LISPDIR%%/sb-wired.el
-%%LISPDIR%%/sb-wired.elc
-%%LISPDIR%%/sb-xemacs.el
-%%LISPDIR%%/sb-xemacs.elc
-%%LISPDIR%%/sb-yahoo.el
-%%LISPDIR%%/sb-yahoo.elc
-%%LISPDIR%%/sb-yomiuri-html.el
-%%LISPDIR%%/sb-yomiuri-html.elc
-%%LISPDIR%%/sb-yomiuri.el
-%%LISPDIR%%/sb-yomiuri.elc
-%%LISPDIR%%/sb-zdnet.el
-%%LISPDIR%%/sb-zdnet.elc
-%%LISPDIR%%/shimbun.el
-%%LISPDIR%%/shimbun.elc
+@unexec rm -f %D/%%LISPDIR%%/octet.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.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-debian-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.el
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ding.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ding.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-f1express.el
+%%SHIMBUN%%%%LISPDIR%%/sb-f1express.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-fml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.el
+%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.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-ibm-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-impress.el
+%%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-isize-sports.el
+%%SHIMBUN%%%%LISPDIR%%/sb-isize-sports.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
+%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.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-mailarc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.el
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.el
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.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-muchy.el
+%%SHIMBUN%%%%LISPDIR%%/sb-muchy.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
+%%SHIMBUN%%%%LISPDIR%%/sb-namazu.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.el
+%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.el
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
+%%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el
+%%SHIMBUN%%%%LISPDIR%%/sb-security-memo.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-texfaq.el
+%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.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-html.el
+%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.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-bitmap.el