GNU Emacs updates

editors/emacs:
 - Update to 24.3
 - Update CANNA patchset[1]
 - Unbreak ARM support by using the patch from emacs-devel port
 - Add missing INSTALLS_ICONS[2]
 - Remove a patch which is already integrated upstream
 - Fix Makefile header

editors/emacs-devel:
 - Update to bzr revision 112178
 - Fix Makefile header
 - Add missing INSTALLS_ICONS[2]

editors/emacs23:
 - Remove ABI versions from LIB_DEPENDS
 - Fix Makefile header
 - Add missing INSTALLS_ICONS[2]

Mk/bsd.emacs.mk:
 - Update major version for editors/emacs port

*:
 - Bump PORTREVISION to chase Emacs updates

PR:		ports/177428[2]
Submitted by:	Yuji TAKANO[1] (via private email), bdrewery[2]

24 files changed, 84 insertions, 196 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 69872324d4e4..bf2bcb7f7e91 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/apel/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index bde3a4e85afc..15ae01543bae 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    emacs22
-# Date created:				April 12 2005
-# Whom:	      				Kenneth Vestergaard Schmidt <kvs@pil.dk>
-#
+# Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
 # $FreeBSD$
-#
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
@@ -27,7 +23,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 		emacs-nox11-[0-9]*
 
 EMACS_VER=	24.3.50
-EMACS_REV=	111818
+EMACS_REV=	112178
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
@@ -37,6 +33,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env aclocal:env autoheader:env
+INSTALLS_ICONS=	yes
 
 EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
 		${PREFIX}/libexec/${PORTNAME}
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index e8a0f7439f5b..ccba8a7a960c 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.3.50.111818.tar.xz) = 81078efd9313414c86bcd4352d11b0ee309d17f413eaf0a4643e09669febac73
-SIZE (emacs-24.3.50.111818.tar.xz) = 31767196
+SHA256 (emacs-24.3.50.112178.tar.xz) = 872ed1ad563c054e9e648d4506dd79e8e3bc9d4924356751d7a51c18fa7d454f
+SIZE (emacs-24.3.50.112178.tar.xz) = 31457968
diff --git a/editors/emacs-devel/files/patch-configure.ac b/editors/emacs-devel/files/patch-configure.ac
index c0c4c23f37d1..a744d3f3d94d 100644
--- a/editors/emacs-devel/files/patch-configure.ac
+++ b/editors/emacs-devel/files/patch-configure.ac
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- configure.ac.orig
 +++ configure.ac
-@@ -1240,39 +1240,10 @@
+@@ -1150,39 +1150,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -44,10 +44,10 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
-@@ -1289,7 +1260,7 @@
+@@ -1199,7 +1170,7 @@
    linux/version.h sys/systeminfo.h
    coff.h pty.h
-   sys/vlimit.h sys/resource.h
+   sys/resource.h
 -  sys/utsname.h pwd.h utmp.h util.h)
 +  sys/utsname.h pwd.h utmp.h util.h libutil.h)
  
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index ee0943c7dc93..313720c65293 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		11 October 2001
-# Whom:			MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 # $FreeBSD$
-#
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	1
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -25,7 +20,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-EMACS_VER=	24.2
+EMACS_VER=	24.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
@@ -34,9 +29,10 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+INSTALLS_ICONS=	yes
 
 MAN1=		ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-		grep-changelog.1 rcs-checkin.1
+		grep-changelog.1
 MANCOMPRESSED=	yes
 PLIST_SUB=	EMACS_VER=${EMACS_VER}
 
@@ -45,12 +41,12 @@ EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
+INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \
-		erc ert eshell eudc flymake forms gnus idlwave info \
+		erc ert eshell eudc flymake forms gnus htmlfontify idlwave info \
 		mairix-el message mh-e newsticker nxml-mode \
 		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
-		smtpmail speedbar tramp url vip viper widget woman
+		smtpmail speedbar srecode tramp url vip viper widget wisent woman
 
 .if !defined(EMACS_NO_X11_SLAVE)
 CONFLICTS+=	emacs-nox11-[0-9]*
@@ -84,7 +80,7 @@ DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{
 .if ${PORT_OPTIONS:MCANNA}
 PATCH_SITES+=	http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR+=	ashish
-PATCHFILES+=	emacs24.1canna-20120614.diff.gz
+PATCHFILES+=	emacs24.3canna-20130321.diff.gz
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
@@ -246,9 +242,7 @@ CONFIGURE_ARGS+=	--without-gnutls
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "arm"
-BROKEN=	Emacs 24.X does not currently build on arm
-.elif ${ARCH} == "ia64"
+.if ${ARCH} == "ia64"
 BROKEN=	Emacs 24.X does not currently build on ia64
 .endif
 
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 6bd98c93c30f..2730da561989 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-SHA256 (emacs-24.2.tar.xz) = 1f11b65520611d108eceea886cc1d2573704e18b19aded8a09b75fdea7eb0ddd
-SIZE (emacs-24.2.tar.xz) = 34712012
-SHA256 (emacs24.1canna-20120614.diff.gz) = 276bbaae3b2adca9b1598653ea24986c29564afdea4b6741cbaee71db4f52bbe
-SIZE (emacs24.1canna-20120614.diff.gz) = 31907
+SHA256 (emacs-24.3.tar.xz) = 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d
+SIZE (emacs-24.3.tar.xz) = 35565352
+SHA256 (emacs24.3canna-20130321.diff.gz) = 9031dcda23f0a289a3318f3437fecb132b4e755f79cd832bf45cee5258b11e71
+SIZE (emacs24.3canna-20130321.diff.gz) = 31492
diff --git a/editors/emacs/files/patch-Makefile.in b/editors/emacs/files/patch-Makefile.in
index 6ec4e27d04c9..a957d9e3c943 100644
--- a/editors/emacs/files/patch-Makefile.in
+++ b/editors/emacs/files/patch-Makefile.in
@@ -3,41 +3,12 @@ $FreeBSD$
 
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -518,14 +518,6 @@
- 
- install-arch-indep: mkdir info install-etc
- 	-set ${COPYDESTS} ; \
--	unset CDPATH; \
--	for dir in ${COPYDIR} ; do \
--	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
--	    rm -rf $$1 ; \
--	  fi ; \
--	  shift ; \
--	done
--	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
-@@ -625,10 +617,10 @@
+@@ -610,7 +610,7 @@
  	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
+ 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
  	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
 -	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
-+  	      for f in `ls $$elt 2>/dev/null`; do \
++   	      for f in `ls $$elt 2>/dev/null`; do \
  	       (cd $${thisdir}; \
--	        ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
--	        chmod a+r $(DESTDIR)${infodir}/$$f; \
-+  	        ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f.info); \
-+  	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- 	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
- 	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
- 	          ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -643,7 +635,7 @@
- 	  for elt in $(INFO_FILES); do \
- 	    test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
- 	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
+ 	        ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
+ 	        ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
diff --git a/editors/emacs/files/patch-configure b/editors/emacs/files/patch-configure
index 014058cf4714..dbe02b62c6da 100644
--- a/editors/emacs/files/patch-configure
+++ b/editors/emacs/files/patch-configure
@@ -3,7 +3,15 @@ $FreeBSD$
 
 --- configure.orig
 +++ configure
-@@ -8283,159 +8283,6 @@
+@@ -3238,6 +3238,7 @@
+ as_fn_append ac_header_list " utmp.h"
+ as_fn_append ac_header_list " dirent.h"
+ as_fn_append ac_header_list " util.h"
++as_fn_append ac_header_list " libutil.h"
+ as_fn_append ac_header_list " sys/socket.h"
+ as_fn_append ac_header_list " stdlib.h"
+ as_fn_append ac_header_list " unistd.h"
+@@ -8627,116 +8628,6 @@
    LIBSOUND=
  fi
  
@@ -14,48 +22,6 @@ $FreeBSD$
 -
 -  succeeded=no
 -
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_PKG_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
 -  if test "$PKG_CONFIG" = "no" ; then
 -     HAVE_ALSA=no
 -  else
@@ -64,30 +30,29 @@ $FreeBSD$
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5
 -$as_echo_n "checking for $ALSA_MODULES... " >&6; }
 -
--        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5 &&
+-	   ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES" 2>&5` &&
+-	   ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES" 2>&5`; then
+-	    edit_cflags="
+-	      s,///*,/,g
+-	      s/^/ /
+-	      s/ -I/ $isystem/g
+-	      s/^ //
+-	    "
+-	    ALSA_CFLAGS=`$as_echo "$ALSA_CFLAGS" | sed -e "$edit_cflags"`
+-	    ALSA_LIBS=`$as_echo "$ALSA_LIBS" | sed -e 's,///*,/,g'`
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&5
+-$as_echo "yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&6; }
 -            succeeded=yes
--
--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5
--$as_echo_n "checking ALSA_CFLAGS... " >&6; }
--            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5
--$as_echo "$ALSA_CFLAGS" >&6; }
--
--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5
--$as_echo_n "checking ALSA_LIBS... " >&6; }
--            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
--$as_echo "$ALSA_LIBS" >&6; }
 -        else
 -            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -            ALSA_CFLAGS=""
 -            ALSA_LIBS=""
 -            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
+-	    ## do set a variable so people can do so.  Do it in a subshell
+-	    ## to capture any diagnostics in invoking pkg-config.
+-	    ALSA_PKG_ERRORS=`($PKG_CONFIG --print-errors "$ALSA_MODULES") 2>&1`
 -
 -        fi
 -
@@ -163,12 +128,3 @@ $FreeBSD$
          if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
       case "$opsys" in
                gnu-linux|freebsd|netbsd)
-@@ -8453,7 +8300,7 @@
-   linux/version.h sys/systeminfo.h \
-   stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
-   sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
--  sys/utsname.h pwd.h utmp.h dirent.h util.h
-+  sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/editors/emacs/files/patch-src_s_freebsd.h b/editors/emacs/files/patch-src_s_freebsd.h
deleted file mode 100644
index 9dcdd97755b6..000000000000
--- a/editors/emacs/files/patch-src_s_freebsd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/s/freebsd.h.orig
-+++ src/s/freebsd.h
-@@ -58,3 +58,17 @@
- /* Tell that garbage collector that setjmp is known to save all
-    registers relevant for conservative garbage collection in the jmp_buf.  */
- #define GC_SETJMP_WORKS 1
-+
-+#define PTY_ITERATION	int i; for (i = 0; i < 1; i++)
-+#define PTY_NAME_SPRINTF	/* none */
-+#define PTY_TTY_NAME_SPRINTF	/* none */
-+#define PTY_OPEN						\
-+  do								\
-+    {								\
-+      int slave;						\
-+      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)	\
-+	fd = -1;						\
-+      else							\
-+	emacs_close (slave);					\
-+    }								\
-+  while (0)
diff --git a/editors/emacs/files/patch-src_sysdep.c b/editors/emacs/files/patch-src_sysdep.c
index a5c26fd702f7..7b03201d37e5 100644
--- a/editors/emacs/files/patch-src_sysdep.c
+++ b/editors/emacs/files/patch-src_sysdep.c
@@ -9,12 +9,12 @@ $FreeBSD$
  
 +#ifdef __FreeBSD__
 +#include <sys/sysctl.h>
-+/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
-+#ifdef __sparc__ 
++/* machine/frame.h in Sparc/ARM has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
++#if defined(__sparc__) || defined(__arm__)
 +#define frame freebsd_sparc_frame
 +#endif
 +#include <sys/user.h>
-+#ifdef __sparc__ 
++#if defined(__sparc__) || defined(__arm__)
 +#undef frame
 +#endif
 +#include <sys/resource.h>
diff --git a/editors/emacs/files/patch-src_term.c b/editors/emacs/files/patch-src_term.c
index f1b25cfa417f..a623a1861d8a 100644
--- a/editors/emacs/files/patch-src_term.c
+++ b/editors/emacs/files/patch-src_term.c
@@ -1,22 +1,23 @@
+
 $FreeBSD$
 
 $NetBSD: patch-ag,v 1.13 2010/05/15 10:00:57 roy Exp $
-
+ 
 When running terminfo but compiled for termcap, we cannot assume
 that we actually have anything useable in termcap_term_buffer so just
 use the terminfo fixed size defined ealier.
 
---- src/term.c	2010-01-06 10:11:04.000000000 +0000
-+++ src/term.c	2010-01-06 10:11:53.000000000 +0000
-@@ -3590,11 +3590,6 @@
- #endif
+--- src/term.c.orig
++++ src/term.c
+@@ -3111,11 +3111,6 @@
+                    terminal_type);
      }
  
 -#ifndef TERMINFO
 -  if (strlen (tty->termcap_term_buffer) >= buffer_size)
--    abort ();
+-    emacs_abort ();
 -  buffer_size = strlen (tty->termcap_term_buffer);
 -#endif
-   tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size);
+   tty->termcap_strings_buffer = area = xmalloc (buffer_size);
    tty->TS_ins_line = tgetstr ("al", address);
    tty->TS_ins_multi_lines = tgetstr ("AL", address);
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 4c0884921402..9afefdf00a1b 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -5,20 +5,15 @@ bin/emacs-%%EMACS_VER%%
 bin/emacsclient
 bin/etags
 bin/grep-changelog
-bin/rcs-checkin
 share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%DATADIR%%/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/16x16/apps/emacs22.png
 share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/24x24/apps/emacs22.png
 share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/32x32/apps/emacs22.png
 share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/48x48/apps/emacs22.png
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 @dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 3910bcccc02b..8588452be88f 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		11 October 2001
-# Whom:			MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 # $FreeBSD$
-#
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
@@ -36,6 +32,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LATEST_LINK=	emacs23
+INSTALLS_ICONS=	yes
 
 MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 		grep-changelog.1 rcs-checkin.1
@@ -114,19 +111,19 @@ CONFIGURE_ARGS+=	--without-sync-input
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 .else
 CONFIGURE_ARGS+=	--without-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
 .else
 CONFIGURE_ARGS+=	--without-tiff
 .endif
 
 .if ${PORT_OPTIONS:MGIF}
-LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+=	gif:${PORTSDIR}/graphics/giflib
 .else
 CONFIGURE_ARGS+=	--without-gif
 .endif
@@ -145,17 +142,17 @@ CONFIGURE_ARGS+=	--without-xpm
 
 .if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=	--with-xft
 .if ${PORT_OPTIONS:MM17N}
 CONFIGURE_ARGS+=	--with-m17n-flt
-LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
+LIB_DEPENDS+=	m17n:${PORTSDIR}/devel/m17n-lib
 .else
 CONFIGURE_ARGS+=	--without-m17n-flt
 .endif
 .if ${PORT_OPTIONS:MOTF}
 CONFIGURE_ARGS+=	--with-otf
-LIB_DEPENDS+=	otf.0:${PORTSDIR}/print/libotf
+LIB_DEPENDS+=	otf:${PORTSDIR}/print/libotf
 .else
 CONFIGURE_ARGS+=	--without-libotf
 .endif
@@ -187,7 +184,7 @@ PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
 			--with-canna-libraries=${LOCALBASE}/lib
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
+LIB_DEPENDS+=		canna:${PORTSDIR}/japanese/canna-lib
 .endif
 
 .endif
@@ -199,7 +196,7 @@ CONFIGURE_ARGS+=	--without-sound
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
 CONFIGURE_ARGS+=	--with-dbus
 .else
 CONFIGURE_ARGS+=	--without-dbus
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index b7b743bd77a6..fc570b0272eb 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/flim/flim-1.14/
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index ceae14a6a6bf..3f343b983748 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuserv
 PORTVERSION=	3.12.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	editors
 MASTER_SITES=	http://meltin.net/hacks/emacs/src/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 487373bb6cb5..bb64631e04fb 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mode-info
 PORTVERSION=	0.8.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/elisp/
 
diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile
index 6d7c9809767b..4c6f800d364a 100644
--- a/editors/nxml/Makefile
+++ b/editors/nxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nxml-mode
 PORTVERSION=	${NXML_VER}
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.thaiopensource.com/download/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index 871a28ea6500..034e4dcb567c 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	paredit-mode.el
 PORTVERSION=	22
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://mumble.net/~campbell/emacs/
 DISTNAME=	paredit-22.el
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 0ba4b597d238..2efa4c08daa2 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.3.2
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 874fc394e60f..9b47590c1cf8 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 5acb7f90c637..2424f68dd57c 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slime
 PORTVERSION=	20110714
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 8300acfd08ed..2120e8ab89cf 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index 1cbd33a97a2a..36b1c7828a09 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tree-widget
 PORTVERSION=	2.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/emhacks/${PORTNAME}/${PORTVERSION} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile
index de73276fbdb2..0d8d990b20c1 100644
--- a/editors/yasnippet/Makefile
+++ b/editors/yasnippet/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	yasnippet
 PORTVERSION=	0.6.1c
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \