Remove expired port:

2014-11-19 editors/emacs23: Unmaintained upstream, use editors/emacs

17 files changed, 1 insertions, 838 deletions

diff --git a/MOVED b/MOVED
index b1a40846a2a6..e24c1590e7d7 100644
--- a/MOVED
+++ b/MOVED
@@ -7236,3 +7236,4 @@ korean/ami||2014-11-19|Does not work anymore
 graphics/xzgv||2014-11-19|Abandonware since at least 2008
 deskutils/gtkjournal||2014-11-19|Abandonware, not working anymore
 deskutils/splashsetter||2014-11-19|Abandonware, useless without gnome2
+editors/emacs23|editors/emacs|2014-11-19|Has expired: Unmaintained upstream, use editors/emacs
diff --git a/editors/Makefile b/editors/Makefile
index 9db17a5fa6a9..ce8ff19c1b6c 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -57,7 +57,6 @@
     SUBDIR += emacs
     SUBDIR += emacs-devel
     SUBDIR += emacs-nox11
-    SUBDIR += emacs23
     SUBDIR += fb
     SUBDIR += flim
     SUBDIR += fpc-ide
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
deleted file mode 100644
index b0b6ab49696f..000000000000
--- a/editors/emacs23/Makefile
+++ /dev/null
@@ -1,219 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
-# $FreeBSD$
-
-PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
-PORTEPOCH=	1
-CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	23
-
-PATCH_SITE_SUBDIR+=	ashish
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	GNU editing macros
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Unmaintained upstream, use editors/emacs
-EXPIRATION_DATE=	2014-11-19
-
-MAKE_JOBS_UNSAFE=	yes
-
-CONFLICTS=	emacs-19.* emacs21-* emacs22-* emacs24-* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
-		emacs-nox11-[0-9]* emacs-devel-*
-
-EMACS_VER=	23.4
-GNU_CONFIGURE=	yes
-USES=		gmake makeinfo ncurses pkgconfig tar:bzip2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INFO_PATH=	${DATADIR_REL}/info
-CONFIGURE_ARGS=	--localstatedir=/var
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-		grep-changelog.1 rcs-checkin.1
-PLIST_SUB=	EMACS_VER=${EMACS_VER} INFODIR=${INFO_PATH}
-
-EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
-		${PREFIX}/libexec/${PORTNAME}
-
-MAKE_ENV=	LC_ALL=C
-
-INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
-		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs epa \
-		erc eshell eudc flymake forms gnus 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
-
-OPTIONS_DEFINE=	CANNA DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS XFT \
-		XIM XPM X11
-
-OPTIONS_SINGLE=	X11
-
-CANNA_DESC=		Canna support
-SCROLLBARS_DESC=	Toolkit scroll-bars
-SOUND_DESC=		Sound support
-SOURCES_DESC=		Install sources
-SYNC_INPUT_DESC=	Synchronously process asynchronous input
-XAW_DESC=		Athena widgets
-XAW3D_DESC=		Athena3D widgets
-XIM_DESC=		X Input Method Support
-M17N_DESC=		M17N support for text-shaping
-OTF_DESC=		Opentype fonts suport
-
-OPTIONS_SINGLE_X11=	GTK2 XAW XAW3D MOTIF
-
-OPTIONS_DEFAULT=DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT \
-		SCROLLBARS XFT XIM XPM X11
-
-OPTIONS_SUB=	SOURCES
-
-DBUS_LIB_DEPENDS=		libdbus-1.so:${PORTSDIR}/devel/dbus
-DBUS_CONFIGURE_WITH=		dbus
-
-SOUND_CONFIGURE_WITH=	sound
-
-SVG_USE=		GNOME=librsvg2
-SVG_CONFIGURE_WITH=	rsvg
-
-GTK2_USE=	GNOME=gtk20
-GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk
-
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
-XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
-
-XAW_USE=	XORG=xaw
-XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
-
-MOTIF_USES=	motif
-MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
-
-SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
-
-SYNC_INPUT_CONFIGURE_WITH=	sync-input
-
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-JPEG_CONFIGURE_WITH=	jpeg
-
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
-TIFF_CONFIGURE_WITH=	tiff
-
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
-GIF_CONFIGURE_WITH=	gif
-
-PNG_LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
-PNG_CONFIGURE_WITH=	png
-
-XPM_USE=		XORG=xpm
-XPM_CONFIGURE_WITH=	xpm
-
-XFT_USE=		XORG=xft
-XFT_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-XFT_CONFIGURE_WITH=	xft
-
-M17N_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
-M17N_CONFIGURE_WITH=	m17n-flt
-
-OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
-OTF_CONFIGURE_WITH=	libotf
-
-GCONF_USE=			gnome=gconf2
-GCONF_CONFIGURE_WITH=		gconf
-
-XIM_CONFIGURE_WITH=		xim
-
-CANNA_CONFIGURE_ON=	--with-canna \
-			--with-canna-includes=${LOCALBASE}/include \
-			--with-canna-libraries=${LOCALBASE}/lib
-CANNA_PATCHFILES=	emacs23.3canna-20110316.diff.gz
-CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL}
-CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
-
-X11_CONFIGURE_WITH=	x
-X11_USE=	XORG=x11
-
-.include <bsd.port.options.mk>
-
-DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
-
-.if ${PORT_OPTIONS:MX11}
-
-CONFIGURE_ARGS+=	--with-x
-USE_XORG=		x11
-
-INSTALLS_ICONS=	yes
-
-.if !${PORT_OPTIONS:MXFT}
-.if ${PORT_OPTIONS:MM17N}
-IGNORE=	m17n support for text-shaping requires Xft. Please run 'make config'
-.elif ${PORT_OPTIONS:MOTF}
-IGNORE=	opentype fonts support requires Xft. Please run 'make config'
-.endif
-.endif
-
-.else
-
-.for OPT in SVG GTK2 XAW3D XAW MOTIF SCROLLBARS JPEG TIFF GIF PNG XPM XFT M17N GCONF XIM
-.if ${PORT_OPTIONS:M${OPT}}
-IGNORE=	${OPT} option depends on X11 option
-.endif
-.endfor
-
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=	Emacs 23.X does not currently build on ia64
-.endif
-
-post-patch:
-	@${RM} -f ${WRKSRC}/info/*
-	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
-.if empty(PORT_OPTIONS:MX11)
-	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
-.endif
-
-post-configure:
-	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile
-
-add-plist-data:
-.for i in ${EMACS_DIRS}
-	@${FIND} ${STAGEDIR}${i} -type f |${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,g'  >>${TMPPLIST}
-.endfor
-	@${FIND} ${WRKSRC}/etc -type f |${SED} -E -e 's,^${WRKSRC},${DATADIR_REL}/${EMACS_VER},g' -e '/etc\/(\..*|ChangeLog|DOC)$$/d' >>${TMPPLIST}
-	@${FIND} ${WRKSRC}/etc -type d -depth |${SED} -E -e 's,^${WRKSRC},@dirrm ${DATADIR_REL}/${EMACS_VER},g' >>${TMPPLIST}
-.for i in ${EMACS_DIRS}
-	@${FIND} ${STAGEDIR}${i} -type d -depth |${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,g' >>${TMPPLIST}
-.endfor
-	@${ECHO} "@unexec rmdir %D/${DATADIR_REL}/${EMACS_VER} 2>/dev/null || true" >>${TMPPLIST}
-
-.if ${PORT_OPTIONS:MSOURCES}
-post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	@${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
-.endif
-
-pre-everything::
-	@${ECHO_MSG}
-.if !defined(WITHOUT_X11)
-	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
-.endif
-.if defined(WITH_CANNA)
-	@${ECHO_MSG} "====> Canna support is not part of standard distribution"
-	@${ECHO_MSG} "====> of GNU Emacs and is therefore not supported by GNU"
-	@${ECHO_MSG} "====> Emacs development team."
-.endif
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
deleted file mode 100644
index edba23746da5..000000000000
--- a/editors/emacs23/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (emacs-23.4.tar.bz2) = 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9
-SIZE (emacs-23.4.tar.bz2) = 38646508
-SHA256 (emacs23.3canna-20110316.diff.gz) = 26cb4bdb88685641e23d3a27953db56e04712caf154963edcaea41f5a403c7d3
-SIZE (emacs23.3canna-20110316.diff.gz) = 33845
diff --git a/editors/emacs23/files/patch-Makefile.in b/editors/emacs23/files/patch-Makefile.in
deleted file mode 100644
index fd303bd3a231..000000000000
--- a/editors/emacs23/files/patch-Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	Tue Jun 23 07:41:36 2009 +0300
-+++ Makefile.in	Tue Jun 23 07:39:33 2009 +0300
-@@ -461,14 +461,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; \
-@@ -570,9 +562,9 @@
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
- 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
--	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
--	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
--	        chmod a+r $(DESTDIR)${infodir}/$$f; \
-+	      for f in `ls $$elt 2>/dev/null`; do \
-+	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
-+	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- 	      done; \
- 	   done); \
- 	else true; fi
-@@ -583,7 +575,7 @@
- 	  for elt in $(INFO_FILES); do \
- 	    test "$(MAKEINFO)" = "off" && ! test -e $$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} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
diff --git a/editors/emacs23/files/patch-configure b/editors/emacs23/files/patch-configure
deleted file mode 100644
index 668668865700..000000000000
--- a/editors/emacs23/files/patch-configure
+++ /dev/null
@@ -1,165 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -5806,159 +5806,6 @@
-   LIBSOUND=
- fi
- 
--
--
--  ALSA_REQUIRED=1.0.0
--  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
--
--  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 test "${ac_cv_path_PKG_CONFIG+set}" = set; 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
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        { $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; }
--            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"`
--
--        fi
--
--
--
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     HAVE_ALSA=yes
--  else
--     HAVE_ALSA=no
--  fi
--
--  if test $HAVE_ALSA = yes; then
--    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
--    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  emacs_alsa_normal=yes
--else
--  emacs_alsa_normal=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--    if test "$emacs_alsa_normal" != yes; then
--      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <alsa/asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  emacs_alsa_subdir=yes
--else
--  emacs_alsa_subdir=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--      if test "$emacs_alsa_subdir" != yes; then
--        as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
--      fi
--      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
--    fi
--
--    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
--    LIBSOUND="$LIBSOUND $ALSA_LIBS"
--    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
--
--$as_echo "#define HAVE_ALSA 1" >>confdefs.h
--
--  fi
--
- fi
- 
- for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
diff --git a/editors/emacs23/files/patch-doc-emacs-Makefile.in b/editors/emacs23/files/patch-doc-emacs-Makefile.in
deleted file mode 100644
index da2f5b8506b8..000000000000
--- a/editors/emacs23/files/patch-doc-emacs-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/emacs/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
-+++ doc/emacs/Makefile.in	2008-12-09 19:25:19.000000000 +0200
-@@ -34,7 +34,7 @@
- 
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 
- INFO_TARGETS = $(infodir)/emacs
- DVI_TARGETS  = emacs.dvi
-@@ -144,7 +144,7 @@
- #	rm -f Makefile
- 
- maintainer-clean: distclean
--	for file in $(INFO_TARGETS); do rm -f $${file}*; done
-+	for file in $(INFO_TARGETS); do rm -f $${file}; done
- 
- 
- # Formerly this directory had texindex.c and getopt.c in it
diff --git a/editors/emacs23/files/patch-doc-lispintro-Makefile.in b/editors/emacs23/files/patch-doc-lispintro-Makefile.in
deleted file mode 100644
index a6266c3bef95..000000000000
--- a/editors/emacs23/files/patch-doc-lispintro-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/lispintro/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
-+++ doc/lispintro/Makefile.in	2008-12-09 19:25:20.000000000 +0200
-@@ -33,7 +33,7 @@
- INFO_TARGETS = ${infodir}/eintr
- DVI_TARGETS = emacs-lisp-intro.dvi
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- 
-@@ -65,7 +65,7 @@
- 
- maintainer-clean: distclean
- 	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
--	cd $(infodir); rm -f eintr eintr-[1-9]
-+	cd $(infodir); rm -f eintr
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/editors/emacs23/files/patch-doc-lispref-Makefile.in b/editors/emacs23/files/patch-doc-lispref-Makefile.in
deleted file mode 100644
index 6d069939164d..000000000000
--- a/editors/emacs23/files/patch-doc-lispref-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/lispref/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
-+++ doc/lispref/Makefile.in	2008-12-09 19:25:20.000000000 +0200
-@@ -32,7 +32,7 @@
- TEXI2DVI = texi2dvi
- SHELL = /bin/sh
- INSTALL_INFO = install-info
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 
- # List of all the texinfo files in the manual:
- 
diff --git a/editors/emacs23/files/patch-doc-misc-Makefile.in b/editors/emacs23/files/patch-doc-misc-Makefile.in
deleted file mode 100644
index 8626784b0f4e..000000000000
--- a/editors/emacs23/files/patch-doc-misc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/misc/Makefile.in.orig	Tue Jun 23 07:39:39 2009 +0300
-+++ doc/misc/Makefile.in	Tue Jun 23 07:39:41 2009 +0300
-@@ -34,7 +34,7 @@
- 
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 
- # Also add new entries to INFO_FILES in the top-level Makefile.in.
- INFO_TARGETS = \
diff --git a/editors/emacs23/files/patch-lisp-vc-svn.el b/editors/emacs23/files/patch-lisp-vc-svn.el
deleted file mode 100644
index 5bb4725b299a..000000000000
--- a/editors/emacs23/files/patch-lisp-vc-svn.el
+++ /dev/null
@@ -1,184 +0,0 @@
-
-$FreeBSD$
-
---- lisp/vc-svn.el.orig
-+++ lisp/vc-svn.el
-@@ -71,9 +71,9 @@
-   t			   ;`svn' doesn't support common args like -c or -b.
-   "String or list of strings specifying extra switches for svn diff under VC.
- If nil, use the value of `vc-diff-switches' (or `diff-switches'),
--together with \"-x --diff-cmd=diff\" (since svn diff does not
--support the default \"-c\" value of `diff-switches').  If you
--want to force an empty list of arguments, use t."
-+together with \"-x --diff-cmd=\"`diff-command' (since 'svn diff'
-+does not support the default \"-c\" value of `diff-switches').
-+If you want to force an empty list of arguments, use t."
-   :type '(choice (const :tag "Unspecified" nil)
- 		 (const :tag "None" t)
- 		 (string :tag "Argument String")
-@@ -83,9 +83,9 @@
-   :version "22.1"
-   :group 'vc)
- 
--(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
-+(defcustom vc-svn-header '("\$Id\$")
-   "Header keywords to be inserted by `vc-insert-headers'."
--  :version "22.1"
-+  :version "24.1"     ; no longer consult the obsolete vc-header-alist
-   :type '(repeat string)
-   :group 'vc)
- 
-@@ -117,17 +117,13 @@
- ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
- ;;;###autoload                           "_svn")
- ;;;###autoload                          (t ".svn"))))
--;;;###autoload     (when (file-readable-p (expand-file-name
--;;;###autoload                             (concat admin-dir "/entries")
--;;;###autoload                             (file-name-directory f)))
-+;;;###autoload     (when (vc-find-root f admin-dir)
- ;;;###autoload       (load "vc-svn")
- ;;;###autoload       (vc-svn-registered f))))
- 
- (defun vc-svn-registered (file)
-   "Check if FILE is SVN registered."
--  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
--						   "/entries")
--					   (file-name-directory file)))
-+  (when (vc-svn-root file)
-     (with-temp-buffer
-       (cd (file-name-directory file))
-       (let* (process-file-side-effects
-@@ -170,15 +166,21 @@
-                      (?? . unregistered)
-                      ;; This is what vc-svn-parse-status does.
-                      (?~ . edited)))
--	(re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)?   \\(.*\\)$"
--	      ;; Subexp 2 is a dummy in this case, so the numbers match.
--	      "^\\(.\\)....\\(.\\) \\(.*\\)$"))
-+	(re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)?   \\(.*\\)$"
-+	      ;; Subexp 3 is a dummy in this case, so the numbers match.
-+	      "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$"))
-        result)
-     (goto-char (point-min))
-     (while (re-search-forward re nil t)
-       (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
--	    (filename (match-string 3)))
--	(and remote (string-equal (match-string 2) "*")
-+            (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
-+            (filename (if (memq system-type '(windows-nt ms-dos))
-+                          (replace-regexp-in-string "\\\\" "/" (match-string 4))
-+                        (match-string 4))))
-+        (and (memq propstat '(conflict edited))
-+             (not (eq state 'conflict)) ; conflict always wins
-+             (setq state propstat))
-+	(and remote (string-equal (match-string 3) "*")
- 	     ;; FIXME are there other possible combinations?
- 	     (cond ((eq state 'edited) (setq state 'needs-merge))
- 		   ((not state) (setq state 'needs-update))))
-@@ -271,18 +273,16 @@
- to the SVN command."
-   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
- 
--(defun vc-svn-responsible-p (file)
--  "Return non-nil if SVN thinks it is responsible for FILE."
--  (file-directory-p (expand-file-name vc-svn-admin-directory
--				      (if (file-directory-p file)
--					  file
--					(file-name-directory file)))))
-+(defun vc-svn-root (file)
-+  (vc-find-root file vc-svn-admin-directory))
- 
--(defalias 'vc-svn-could-register 'vc-svn-responsible-p
-+(defalias 'vc-svn-responsible-p 'vc-svn-root)
-+
-+(defalias 'vc-svn-could-register 'vc-svn-root
-   "Return non-nil if FILE could be registered in SVN.
- This is only possible if SVN is responsible for FILE's directory.")
- 
--(defun vc-svn-checkin (files rev comment)
-+(defun vc-svn-checkin (files rev comment &optional extra-args-ignored)
-   "SVN-specific version of `vc-backend-checkin'."
-   (if rev (error "Committing to a specific revision is unsupported in SVN"))
-   (let ((status (apply
-@@ -518,7 +518,7 @@
-   (let* ((switches
- 	    (if vc-svn-diff-switches
- 		(vc-switches 'SVN 'diff)
--	      (list "--diff-cmd=diff" "-x"
-+	      (list (concat "--diff-cmd=" diff-command) "-x"
- 		    (mapconcat 'identity (vc-switches nil 'diff) " "))))
- 	   (async (and (not vc-disable-async-diff)
-                        (vc-stay-local-p files 'SVN)
-@@ -590,20 +590,10 @@
- 
- (defun vc-svn-repository-hostname (dirname)
-   (with-temp-buffer
--    (let ((coding-system-for-read
--	   (or file-name-coding-system
--	       default-file-name-coding-system)))
--      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
--						"/entries")
--					dirname)))
-+    (let (process-file-side-effects)
-+      (vc-svn-command t t dirname "info" "--xml"))
-     (goto-char (point-min))
--    (when (re-search-forward
--	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
--	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
--		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
--		   "url=\"\\(?1:[^\"]+\\)\""
--                   ;; Yet newer ones don't use XML any more.
--                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
-+    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
-       ;; This is not a hostname but a URL.  This may actually be considered
-       ;; as a feature since it allows vc-svn-stay-local to specify different
-       ;; behavior for different modules on the same server.
-@@ -642,7 +632,7 @@
-   "Parse output of \"svn status\" command in the current buffer.
- Set file properties accordingly.  Unless FILENAME is non-nil, parse only
- information about FILENAME and return its status."
--  (let (file status)
-+  (let (file status propstat)
-     (goto-char (point-min))
-     (while (re-search-forward
-             ;; Ignore the files with status X.
-@@ -652,7 +642,9 @@
-       (setq file (or filename
-                      (expand-file-name
-                       (buffer-substring (point) (line-end-position)))))
--      (setq status (char-after (line-beginning-position)))
-+      (setq status (char-after (line-beginning-position))
-+            ;; Status of the item's properties ([ MC]).
-+            propstat (char-after (1+ (line-beginning-position))))
-       (if (eq status ??)
- 	  (vc-file-setprop file 'vc-state 'unregistered)
- 	;; Use the last-modified revision, so that searching in vc-print-log
-@@ -663,7 +655,7 @@
- 	(vc-file-setprop
- 	 file 'vc-state
- 	 (cond
--	  ((eq status ?\ )
-+	  ((and (eq status ?\ ) (eq propstat ?\ ))
- 	   (if (eq (char-after (match-beginning 1)) ?*)
- 	       'needs-update
-              (vc-file-setprop file 'vc-checkout-time
-@@ -674,9 +666,11 @@
- 	   (vc-file-setprop file 'vc-working-revision "0")
- 	   (vc-file-setprop file 'vc-checkout-time 0)
- 	   'added)
--	  ((eq status ?C)
-+	  ;; Conflict in contents or properties.
-+	  ((or (eq status ?C) (eq propstat ?C))
- 	   (vc-file-setprop file 'vc-state 'conflict))
--	  ((eq status '?M)
-+	  ;; Modified contents or properties.
-+	  ((or (eq status ?M) (eq propstat ?M))
- 	   (if (eq (char-after (match-beginning 1)) ?*)
- 	       'needs-merge
- 	     'edited))
-@@ -743,5 +737,4 @@
- 
- (provide 'vc-svn)
- 
--;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
- ;;; vc-svn.el ends here
diff --git a/editors/emacs23/files/patch-lisp_files.el b/editors/emacs23/files/patch-lisp_files.el
deleted file mode 100644
index 26b91ec6467d..000000000000
--- a/editors/emacs23/files/patch-lisp_files.el
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- lisp/files.el.orig
-+++ lisp/files.el
-@@ -2986,11 +2986,16 @@
- 	      ;; Obey `enable-local-eval'.
- 	      ((eq var 'eval)
- 	       (when enable-local-eval
--		 (push elt all-vars)
--		 (or (eq enable-local-eval t)
--		     (hack-one-local-variable-eval-safep (eval (quote val)))
--		     (safe-local-variable-p var val)
--		     (push elt unsafe-vars))))
-+		 (let ((safe (or (hack-one-local-variable-eval-safep
-+				  (eval (quote val)))
-+				 ;; In case previously marked safe (bug#5636).
-+				 (safe-local-variable-p var val))))
-+		   ;; If not safe and e-l-v = :safe, ignore totally.
-+		   (when (or safe (not (eq enable-local-variables :safe)))
-+		     (push elt all-vars)
-+		     (or (eq enable-local-eval t)
-+			 safe
-+			 (push elt unsafe-vars))))))
- 	      ;; Ignore duplicates (except `mode') in the present list.
- 	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
- 	      ;; Accept known-safe variables.
diff --git a/editors/emacs23/files/patch-sources.el b/editors/emacs23/files/patch-sources.el
deleted file mode 100644
index 659786ce208a..000000000000
--- a/editors/emacs23/files/patch-sources.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/editors/emacs23/files/patch-sources.el,v 1.3 2009-12-20 20:19:17 bsam Exp $
-
---- /dev/null
-+++ sources.el
-@@ -0,0 +1,4 @@
-+;;; Path to Emacs C Sources.
-+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
-+  (setq find-function-C-source-directory
-+        "%%DATADIR%%/%%EMACS_VER%%/src"))
diff --git a/editors/emacs23/files/patch-src_coding.c b/editors/emacs23/files/patch-src_coding.c
deleted file mode 100644
index 9dd1a5e0f45d..000000000000
--- a/editors/emacs23/files/patch-src_coding.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- src/coding.c.orig
-+++ src/coding.c
-@@ -3853,8 +3853,20 @@
- 	      else
- 		charset = CHARSET_FROM_ID (charset_id_2);
- 	      ONE_MORE_BYTE (c1);
--	      if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
--		goto invalid_code;
-+	      /*
-+	       * <ESC>N sequence is recognized as SS2 in some ISO2022
-+	       * encodings.  As a workaround, mark invalid only if
-+	       * <ESC>N + GR in a 7-bit encoding or <ESC>N + GL in an 8-bit
-+	       * encoding.
-+	       */
-+	      if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) {
-+		if (c1 < 0x20 || c1 >= 0x80)
-+		  goto invalid_code;
-+	      }
-+	      else {
-+		if (c1 < 0xA0)
-+		  goto invalid_code;
-+	      }
- 	      break;
- 
- 	    case 'O':		/* invocation of single-shift-3 */
-@@ -3867,8 +3879,20 @@
- 	      else
- 		charset = CHARSET_FROM_ID (charset_id_3);
- 	      ONE_MORE_BYTE (c1);
--	      if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
--		goto invalid_code;
-+	      /*
-+	       * <ESC>O sequence by arrow keys is recognized as SS3 in
-+	       * some ISO2022 encodings.  As a workaround, mark invalid only if
-+	       * <ESC>O + GR in a 7-bit encoding or <ESC>O + GL in an 8-bit
-+	       * encoding.
-+	       */
-+	      if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) {
-+		if (c1 < 0x20 || c1 >= 0x80)
-+		  goto invalid_code;
-+	      }
-+	      else {
-+		if (c1 < 0xA0)
-+		  goto invalid_code;
-+	      }
- 	      break;
- 
- 	    case '0': case '2':	case '3': case '4': /* start composition */
diff --git a/editors/emacs23/files/patch-src_config.in b/editors/emacs23/files/patch-src_config.in
deleted file mode 100644
index 834b77b8c5c2..000000000000
--- a/editors/emacs23/files/patch-src_config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/config.in.orig
-+++ src/config.in
-@@ -1183,6 +1183,8 @@
- #endif
- #ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-+#elif defined __FreeBSD__
-+#include <stdlib.h>
- #elif defined __GNUC__
- # define alloca __builtin_alloca
- #elif defined _AIX
diff --git a/editors/emacs23/pkg-descr b/editors/emacs23/pkg-descr
deleted file mode 100644
index 417949c10234..000000000000
--- a/editors/emacs23/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-Canna support is contributed by Yuji TAKANO (takachan@running-dog.net).
-
-WWW: http://www.gnu.org/software/emacs/
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
deleted file mode 100644
index 4706f9ff9539..000000000000
--- a/editors/emacs23/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/b2m
-bin/ctags
-bin/ebrowse
-bin/emacs
-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
-%%INFODIR%%/dir
-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 %%INFODIR%%
-@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
-@dirrmtry share/icons/hicolor/scalable/mimetypes
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
-@unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
-@unexec rmdir /var/games/emacs 2>/dev/null || true