6 files changed, 37 insertions, 25 deletions

diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index be5d6298ff93..6aaae6702df3 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -11,7 +11,8 @@ BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/texinfo/texinf
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aclocal.m4
 CONFIGURE_ARGS=		--with-xemacs=${EMACS_CMD} \
-			--with-packagedir=${PREFIX}/${EMACS_PACKAGESDIR}
+			--with-packagedir=${PREFIX}/${EMACS_PACKAGESDIR} \
+			--without-compress-install
 EMACS_PACKAGESDIR=	lib/xemacs/site-packages
 LISPDIR=		${EMACS_PACKAGESDIR}/lisp/w3m
 ICONDIR=		${EMACS_PACKAGESDIR}/etc/images/w3m
@@ -24,7 +25,6 @@ INFO_PATH=		${INFODIR}
 PLIST=			${.CURDIR}/pkg-plist
 PLIST_SUB+=		PKGINFODIR=${PKGINFODIR} EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
 
-WITHOUT_OCTET_VIEWER=	yes
+OPTIONS_UNSET=	OCTET_VIEWER
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 13e42263c1fb..9bf6bd59f311 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -1,4 +1,3 @@
-%%PKGINFODIR%%/MANIFEST.w3m
 %%ICONDIR%%/antenna-up.png
 %%ICONDIR%%/antenna-up.xpm
 %%ICONDIR%%/back-disabled.png
@@ -52,9 +51,9 @@
 %%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%%/mime-w3m.elc
 %%LISPDIR%%/octet.el
-@unexec rm -f %D/%%LISPDIR%%/octet.elc
+%%OCTET_VIEWER%%%%LISPDIR%%/octet.elc
 %%SHIMBUN%%%%LISPDIR%%/nnshimbun.el
 %%SHIMBUN%%%%LISPDIR%%/nnshimbun.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
@@ -81,6 +80,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-chise.el
+%%SHIMBUN%%%%LISPDIR%%/sb-chise.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
 %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
@@ -346,6 +347,7 @@
 %%LISPDIR%%/w3m-lnum.el
 %%LISPDIR%%/w3m-lnum.elc
 %%LISPDIR%%/w3m-load.el
+%%LISPDIR%%/w3m-load.elc
 %%LISPDIR%%/w3m-mail.el
 %%LISPDIR%%/w3m-mail.elc
 %%LISPDIR%%/w3m-namazu.el
@@ -365,7 +367,7 @@
 %%LISPDIR%%/w3m-tabmenu.el
 %%LISPDIR%%/w3m-tabmenu.elc
 %%LISPDIR%%/w3m-ucs.el
-@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
+%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-util.el
 %%LISPDIR%%/w3m-util.elc
 %%LISPDIR%%/w3m-weather.el
@@ -378,4 +380,5 @@
 %%PORTDOCS%%@dirrm share/doc/emacs-w3m
 @dirrm %%ICONDIR%%
 @dirrmtry %%EMACS_PACKAGESDIR%%/etc/images
+@dirrmtry %%EMACS_PACKAGESDIR%%/etc
 @dirrm %%LISPDIR%%
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index cc35e988161e..4fd3c69cc936 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.4.471.b.${SNAPDATE}
-PORTREVISION=	5
+PORTVERSION=	1.4.533.b.${SNAPDATE}
 CATEGORIES=	www elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nobutaka
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-1.4.471-${SNAPDATE}
+DISTNAME=	${PORTNAME}-1.4.533-${SNAPDATE}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Simple front-end to w3m for emacs
@@ -19,13 +18,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_EMACS=	yes
 
-SNAPDATE=	20120306
+SNAPDATE=	20140622
 
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
 			--with-lispdir=${PREFIX}/${LISPDIR} \
-			--with-icondir=${PREFIX}/${ICONDIR}
+			--with-icondir=${PREFIX}/${ICONDIR} \
+			--without-compress-install
 LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
 ICONDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
 ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
@@ -52,7 +52,6 @@ OPTIONS_DEFAULT=	DOCS OCTET_VIEWER SHIMBUN
 OCTET_VIEWER_DESC=	Octet stream viewer support
 SHIMBUN_DESC=	Build and/or install Shimbun
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MSHIMBUN}
@@ -103,6 +102,9 @@ RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
 RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
 		wvHtml:${PORTSDIR}/textproc/wv \
 		xlhtml:${PORTSDIR}/textproc/xlhtml
+PLIST_SUB+=	OCTET_VIEWER=""
+.else
+PLIST_SUB+=	OCTET_VIEWER="@comment "
 .if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
 RUN_DEPENDS+=	${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
 .endif
@@ -115,15 +117,14 @@ post-extract:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR_JA}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR_JA}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR_JA}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index c20eee286741..45e70e6dbef5 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-w3m-1.4.471-20120306.tar.bz2) = 26820c7011432fecb1c9ec514612207d9dba1bd624c312bfe9bd6c3d862aad36
-SIZE (emacs-w3m-1.4.471-20120306.tar.bz2) = 767706
+SHA256 (emacs-w3m-1.4.533-20140622.tar.bz2) = bee17d0ed43c65eeb0899a9dc183a1e9e4ee96b88a49edc6de2e3fb402738a12
+SIZE (emacs-w3m-1.4.533-20140622.tar.bz2) = 807112
diff --git a/www/emacs-w3m/files/extra-patch-Makefile.in b/www/emacs-w3m/files/extra-patch-Makefile.in
index 5b2dd2c6580e..15883fceeefa 100644
--- a/www/emacs-w3m/files/extra-patch-Makefile.in
+++ b/www/emacs-w3m/files/extra-patch-Makefile.in
@@ -1,12 +1,17 @@
---- Makefile.in.orig	2012-03-07 00:42:29.000000000 +0900
-+++ Makefile.in	2012-03-07 00:42:39.000000000 +0900
-@@ -92,14 +92,6 @@
+--- Makefile.in.orig	2014-06-28 14:59:34.000000000 +0900
++++ Makefile.in	2014-06-28 15:02:17.000000000 +0900
+@@ -99,19 +99,6 @@
  	      $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\
  	    fi;\
  	  done;\
 -	  for p in `cd shimbun && echo *.el`; do\
 -	    echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\
 -	    $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\
+-	    if test $(COMPRESS_INSTALL) = yes -a -n "$(GZIP_PROG)"\
+-		-a -f "shimbun/$$p"c; then\
+-		rm -f "$(DESTDIR)$(lispdir)/$$p".gz;\
+-		$(GZIP_PROG) -9n "$(DESTDIR)$(lispdir)/$$p";\
+-	    fi;\
 -	  done;\
 -	  for p in `cd shimbun && echo *.elc`; do\
 -	    echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index eb65bc15b35c..0f81a1d9c031 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -46,9 +46,9 @@
 %%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%%/mime-w3m.elc
 %%LISPDIR%%/octet.el
-@unexec rm -f %D/%%LISPDIR%%/octet.elc
+%%OCTET_VIEWER%%%%LISPDIR%%/octet.elc
 %%SHIMBUN%%%%LISPDIR%%/nnshimbun.el
 %%SHIMBUN%%%%LISPDIR%%/nnshimbun.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
@@ -75,6 +75,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-chise.el
+%%SHIMBUN%%%%LISPDIR%%/sb-chise.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
 %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
@@ -340,6 +342,7 @@
 %%LISPDIR%%/w3m-lnum.el
 %%LISPDIR%%/w3m-lnum.elc
 %%LISPDIR%%/w3m-load.el
+%%LISPDIR%%/w3m-load.elc
 %%LISPDIR%%/w3m-mail.el
 %%LISPDIR%%/w3m-mail.elc
 %%LISPDIR%%/w3m-namazu.el