7 files changed, 44 insertions, 30 deletions

diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index 2986f34824f7..c86457352277 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -11,6 +11,8 @@ USE_EMACS=	yes
 EMACS_PORT_NAME=	xemacs21-mule
 COMMENT=	Simple front-end to w3m for xemacs21-mule
 
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages
+
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aclocal.m4
 CONFIGURE_ARGS=		--with-xemacs=${EMACS_CMD} \
 			--with-packagedir=${PREFIX}/${EMACS_PACKAGESDIR}
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 0e768546d3bf..13e42263c1fb 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -317,6 +317,7 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.elc
 %%SHIMBUN%%%%LISPDIR%%/shimbun.el
 %%SHIMBUN%%%%LISPDIR%%/shimbun.elc
+%%LISPDIR%%/bookmark-w3m.el
 %%LISPDIR%%/w3m-antenna.el
 %%LISPDIR%%/w3m-antenna.elc
 %%LISPDIR%%/w3m-bookmark.el
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index ba740067b872..1cdd1aca1574 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.4.423.b.${SNAPDATE}
-PORTREVISION=	4
+PORTVERSION=	1.4.471.b.${SNAPDATE}
 CATEGORIES=	www elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nobutaka
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-1.4.423-${SNAPDATE}
+DISTNAME=	${PORTNAME}-1.4.471-${SNAPDATE}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Simple front-end to w3m for emacs
@@ -23,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_EMACS=	yes
 
-SNAPDATE=	20101224
+SNAPDATE=	20120306
 
 CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
 			--with-lispdir=${PREFIX}/${LISPDIR} \
@@ -58,7 +57,7 @@ SHIMBUN=	""
 
 .include <bsd.port.pre.mk>
 
-.if (${EMACS_PORT_NAME} == "emacs23")
+.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} >= 23
 FLIM_PORT=	${PORTSDIR}/editors/flim
 SEMI_PORT=	${PORTSDIR}/editors/semi
 INSTALL_TARGET= install install-icons
@@ -67,11 +66,11 @@ PLIST_SUB+=	EMACS23=""
 PLIST_SUB+= EMACS23="@comment "
 .endif
 
-.if (${EMACS_PORT_NAME} == "emacs22")
+.if ${EMACS_PORT_NAME} == "emacs22"
 INSTALL_TARGET= install install-icons
 .endif
 
-.if (${EMACS_PORT_NAME} == "emacs21")
+.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
 MULE_UCS_PORT=	${PORTSDIR}/converters/mule-ucs
 INSTALL_TARGET= install install-icons
 .endif
@@ -87,8 +86,8 @@ 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
-RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n
+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}
@@ -97,8 +96,7 @@ RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
 RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
 		wvHtml:${PORTSDIR}/textproc/wv \
 		xlhtml:${PORTSDIR}/textproc/xlhtml
-
-.if (${EMACS_PORT_NAME} != "emacs22") && (${EMACS_PORT_NAME} != "emacs23")
+.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
 RUN_DEPENDS+=	${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
 .endif
 .endif
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 909d5bf80425..c20eee286741 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-w3m-1.4.423-20101224.tar.bz2) = a6bc2e3f9f2d33292959cb8cad17182bf6e7a513e56b48cf8f07bac076e6729c
-SIZE (emacs-w3m-1.4.423-20101224.tar.bz2) = 755585
+SHA256 (emacs-w3m-1.4.471-20120306.tar.bz2) = 26820c7011432fecb1c9ec514612207d9dba1bd624c312bfe9bd6c3d862aad36
+SIZE (emacs-w3m-1.4.471-20120306.tar.bz2) = 767706
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..5b2dd2c6580e
--- /dev/null
+++ b/www/emacs-w3m/files/extra-patch-Makefile.in
@@ -0,0 +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 @@
+ 	      $(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";\
+-	  done;\
+-	  for p in `cd shimbun && echo *.elc`; do\
+-	    echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\
+-	    $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\
+-	  done;\
+ 	fi
+ 
+ install-icons:
diff --git a/www/emacs-w3m/files/extra-patch-aclocal.m4 b/www/emacs-w3m/files/extra-patch-aclocal.m4
index 5f0937b19e62..789cba752f63 100644
--- a/www/emacs-w3m/files/extra-patch-aclocal.m4
+++ b/www/emacs-w3m/files/extra-patch-aclocal.m4
@@ -1,5 +1,5 @@
---- aclocal.m4.orig	2008-02-06 11:24:18.000000000 +0900
-+++ aclocal.m4	2010-01-28 00:57:56.000000000 +0900
+--- aclocal.m4.orig	2012-01-06 11:02:58.000000000 +0900
++++ aclocal.m4	2012-03-11 22:40:26.000000000 +0900
 @@ -13,7 +13,7 @@
    dnl XEmacs 21.5 starts, in order to suppress warnings for Lisp shadows
    dnl when XEmacs 21.5 starts.
@@ -9,10 +9,10 @@
    else
  	XEMACSDEBUG=
    fi
-@@ -296,6 +296,7 @@
+@@ -263,6 +263,7 @@
        fi
      fi])
-   retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status'`
+   retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | $EGREP -v '\''^$'\'`
 +  retval=`echo $retval | tr -d "\n"`
    if test x"$retval" != xOK; then
      AC_MSG_ERROR([Process couldn't proceed.  See the above messages.])
diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in
index cf97c31944b6..0e7bc9980b98 100644
--- a/www/emacs-w3m/files/patch-Makefile.in
+++ b/www/emacs-w3m/files/patch-Makefile.in
@@ -1,24 +1,20 @@
---- Makefile.in.orig	2008-02-06 11:24:18.000000000 +0900
-+++ Makefile.in	2010-01-25 00:55:21.000000000 +0900
-@@ -63,7 +63,7 @@
+--- Makefile.in.orig	2012-03-07 00:42:29.000000000 +0900
++++ Makefile.in	2012-03-07 00:45:51.000000000 +0900
+@@ -64,7 +64,7 @@
  
  install-lisp: lisp
- 	@$(SHELL) $(srcdir)/mkinstalldirs "$(lispdir)";\
+ 	@$(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)";\
 -	for p in ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9] *.el; do\
 +	for p in *.el; do\
  	  if test -f "$$p"; then\
  	    case "$$p" in\
  	      $(IGNORES)) ;;\
-@@ -85,12 +85,6 @@
+@@ -86,7 +86,7 @@
  	  fi;\
  	done;\
  	if test -f shimbun/shimbun.elc; then\
 -	  for p in `cd shimbun && echo ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9]`; do\
--	    if test -f "shimbun/$$p"; then\
--	      echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/s$$p\"";\
--	      $(INSTALL_DATA) shimbun/$$p "$(lispdir)/s$$p";\
--	    fi;\
--	  done;\
- 	  for p in `cd shimbun && echo *.el`; do\
- 	    echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/$$p\"";\
- 	    $(INSTALL_DATA) shimbun/$$p "$(lispdir)/$$p";\
++	  for p in `cd shimbun`; do\
+ 	    if test -f "shimbun/$$p"; then\
+ 	      echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/s$$p\"";\
+ 	      $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\