ports/147546: Update Port: editors/emacs-devel to a snapshot of 24.x

Ashish SHUKLA wahjava at gmail.com
Sun Jun 6 22:50:04 UTC 2010


The following reply was made to PR ports/147546; it has been noted by GNATS.

From: wahjava at gmail.com (Ashish SHUKLA)
To: keramida at freebsd.org (Giorgos Keramidas)
Cc: Anonymous <swell.k at gmail.com>,  bug-followup at freebsd.org
Subject: Re: ports/147546: Update Port: editors/emacs-devel to a snapshot of 24.x
Date: Mon, 07 Jun 2010 04:18:54 +0530

 --=-=-=
 
 Hi Giorgos,
 
 Refer to the attached diff which is final AFAICS.
 
 Thanks to Anonymous (swell.k@)for the compilation fixes for 6.x and 9.x when DBUS is
 enabled.
 
 -- 
 Ashish SHUKLA
 
 Sent via Gnus from GNU Emacs
 
 --=-=-=
 Content-Type: text/x-diff
 Content-Disposition: attachment; filename=emacs-devel.diff
 Content-Description: diff file
 
 diff -urN /usr/ports/editors/emacs-devel/Makefile emacs-devel/Makefile
 --- /usr/ports/editors/emacs-devel/Makefile	2010-05-31 07:28:29.000000000 +0530
 +++ emacs-devel/Makefile	2010-06-07 04:18:29.000000000 +0530
 @@ -7,63 +7,35 @@
  
  PORTNAME=	emacs
  PORTVERSION=	${EMACS_VER}
 -PORTREVISION=	6
 +PORTREVISION=	${EMACS_REV}
 +PORTEPOCH=	1
  CATEGORIES=	editors ipv6
 -MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 -MASTER_SITE_SUBDIR=	emacs/pretest
 +MASTER_SITES=	http://wahjava.users.sourceforge.net/
 +MASTER_SITE_SUBDIR=	${PORTNAME}
 +DISTNAME=	${PORTNAME}-${PORTVERSION}_${EMACS_REV}
  
  MAINTAINER=	wahjava at gmail.com
  COMMENT=	GNU editing macros
  
 -.if !defined(WITHOUT_X11)
 -USE_XORG=	x11
 -.if defined(WITHOUT_GTK)
 -USE_XORG+=	xaw xft xpm
 -.else
 -USE_GNOME=	gtk20
 -.endif
 -LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 -		tiff.4:${PORTSDIR}/graphics/tiff \
 -		ungif.5:${PORTSDIR}/graphics/libungif \
 -		png.6:${PORTSDIR}/graphics/png
 -.endif
 -
  MAKE_JOBS_UNSAFE=	yes
  
 -CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 +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]*
 +		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 +		emacs-nox11-[0-9]*
  
  INSTALLS_ICONS=	yes
  
 -EMACS_VER=	23.0.95
 +EMACS_VER=	24.0.50
 +EMACS_REV=	20100605
  GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -ALL_TARGET=	bootstrap
 -
 -CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 -.if defined(WITHOUT_X11)
 -CONFIGURE_ARGS=		--with-x=no
 -.else
 -.if !defined(WITHOUT_GTK)
 -CONFIGURE_ARGS=		--with-x-toolkit=gtk
 -.else
 -CONFIGURE_ARGS=		--with-x-toolkit=athena
 -.endif
 -CONFIGURE_ARGS+=	--enable-font-backend
 -LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
 -			m17n.4:${PORTSDIR}/devel/m17n-lib
 -# also libotf, which is pulled in by m17n
 -
 -# m17n depends on libintl.so too
 -CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 -		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 -USE_GETTEXT=	yes
 -.endif
 +USE_BZIP2=	yes
 +CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 +WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
  
 -.if defined(WITHOUT_XIM)
 -CONFIGURE_ARGS+=	--without-xim
 -.endif
 +LICENSE=	GPLv3
 +LICENSE_FILE=	${WRKSRC}/COPYING
  
  MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
  		grep-changelog.1 rcs-checkin.1
 @@ -72,48 +44,184 @@
  MAKE_ENV=	LC_ALL=C
  
  INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
 -		ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
 +		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 ses sieve \
 +		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
  		smtpmail speedbar tramp url vip viper widget woman
  
  LATEST_LINK=	emacs-devel
 +OPTIONS=	DBUS	"DBus support"			ON \
 +		GCONF	"GConf support"			ON \
 +		GIF	"GIF Images support"		ON \
 +		JPEG	"JPEG images support"		ON \
 +		M17N	"M17N support for text-shaping"	ON \
 +		MOTIF	"Use Motif widgets"		OFF \
 +		OTF	"Opentype Font Support"		ON \
 +		PNG	"PNG images support"		ON \
 +		SOUND	"Sound support"			ON \
 +		SOURCES	"Install source code"		ON \
 +		SVG	"SVG images support"		ON \
 +		TIFF	"TIFF images support"		ON \
 +		XAW	"Use Athena widgets"		OFF \
 +		XAW3D	"Use Athena3D widgets"		OFF \
 +		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
 +		SCROLLBARS	"Without toolkit scroll-bars"			ON \
 +		XFT	"Freetype fonts support"	ON \
 +		XIM	"X Input Method support"	ON \
 +		XPM	"XPM images support"		ON
  
 -OPTIONS=	SOURCES	"Install source code"	ON
 +.include <bsd.port.options.mk>
  
 -.include <bsd.port.pre.mk>
 +DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
  
 -.if ${OSVERSION} > 900007
 -BROKEN=		fails to build with new utmpx
 +.if defined(WITHOUT_X11)
 +CONFIGURE_ARGS+=	--without-x
 +.else
 +USE_XORG=	x11
 +USE_GNOME=
 +
 +.if defined(WITHOUT_SVG)
 +CONFIGURE_ARGS+=	--without-rsvg
 +.else
 +USE_GNOME+=	librsvg2
  .endif
  
 -.if defined(WITH_SOURCES)
 -PLIST_SUB+=	SOURCES=""
 +.if defined(WITHOUT_GTK2)
 +.if defined(WITH_XAW)
 +.if defined(WITH_XAW3D) || defined(WITH_MOTIF)
 +IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
 +.endif
 +USE_XORG=	xaw
 +CONFIGURE_ARGS+=	--with-x-toolkit=athena --without-xaw3d
 +.elif defined(WITH_XAW3D)
 +.if defined(WITH_MOTIF)
 +IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
 +.endif
 +LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 +CONFIGURE_ARGS+=	--with-x-toolkit=athena
 +.elif defined(WITH_MOTIF)
 +USE_MOTIF=	yes
 +CONFIGURE_ARGS+=	--with-x-toolkit=motif
  .else
 -PLIST_SUB+=	SOURCES="@comment "
 +IGNORE=	please choose a toolkit: GTK+/Motif/Xaw/Xaw3d, or build without X11 support
 +.endif
 +.else
 +.if defined(WITH_XAW) || defined(WITH_XAW3D) || defined(WITH_MOTIF)
 +IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
 +.endif
 +USE_GNOME+=	gtk20
 +CONFIGURE_ARGS+=	--with-x-toolkit=gtk
  .endif
  
 -.if ${ARCH} == "ia64"
 -BROKEN=	Emacs 22.X and later does not currently build on ia64
 +.if defined(WITHOUT_SCROLLBARS)
 +CONFIGURE_ARGS+=	--without-toolkit-scroll-bars
  .endif
  
 -pre-everything::
 -.if !defined(WITHOUT_X11) && !defined(WITHOUT_GTK)
 -	@${ECHO_MSG} "====>"
 -	@${ECHO_MSG} "====> To disable GTK+ interface support, define WITHOUT_X11 or WITHOUT_GTK"
 -	@${ECHO_MSG} "====>"
 -.endif
 -.if !defined(WITHOUT_X11) && !defined(WITHOUT_XIM)
 -	@${ECHO_MSG} "====>"
 -	@${ECHO_MSG} "====> To disable X11 Input Method support, define WITHOUT_XIM"
 -	@${ECHO_MSG} "====>"
 +.if defined(WITHOUT_SYNC_INPUT)
 +CONFIGURE_ARGS+=	--without-sync-input
 +.endif
 +
 +.if defined(WITHOUT_JPEG)
 +CONFIGURE_ARGS+=	--without-jpeg
 +.else
 +LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 +.endif
 +
 +.if defined(WITHOUT_TIFF)
 +CONFIGURE_ARGS+=	--without-tiff
 +.else
 +LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 +.endif
 +
 +.if defined(WITHOUT_GIF)
 +CONFIGURE_ARGS+=	--without-gif
 +.else
 +LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
 +.endif
 +
 +.if defined(WITHOUT_PNG)
 +CONFIGURE_ARGS+=	--without-png
 +.else
 +LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 +.endif
 +
 +.if defined(WITHOUT_XPM)
 +CONFIGURE_ARGS+=	--without-xpm
 +.else
 +USE_XORG+=	xpm
 +.endif
 +
 +.if defined(WITHOUT_XFT)
 +.if defined(WITH_M17N)
 +IGNORE=	m17n support requires Xft. Please run 'make config'
 +.elif defined(WITH_OTF)
 +IGNORE=	otf support requires Xft. Please run 'make config'
 +.else
 +CONFIGURE_ARGS+=	--without-xft
 +.endif
 +.else
 +USE_XORG+=	xft
 +LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 +.endif
 +
 +.if defined(WITHOUT_M17N)
 +CONFIGURE_ARGS+=	--without-m17n-flt
 +.else
 +.if !defined(WITHOUT_XFT)
 +LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
 +.endif
 +.endif
 +
 +.if defined(WITHOUT_OTF)
 +CONFIGURE_ARGS+=	--without-libotf
 +.else
 +.if !defined(WITHOUT_XFT)
 +LIB_DEPENDS+=	otf.0:${PORTSDIR}/print/libotf
 +.endif
 +.endif
 +
 +.if defined(WITHOUT_GCONF)
 +CONFIGURE_ARGS+=	--without-gconf
 +.else
 +USE_GNOME+=	gconf2
 +.endif
 +
 +.if defined(WITHOUT_XIM)
 +CONFIGURE_ARGS+=	--without-xim
 +.endif
 +
 +.endif
 +
 +.if defined(WITHOUT_SOUND)
 +CONFIGURE_ARGS+=	--without-sound
 +.endif
 +
 +.if defined(WITHOUT_DBUS)
 +CONFIGURE_ARGS+=	--without-dbus
 +.else
 +LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 +.endif
 +
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WITHOUT_SOURCES)
 +PLIST_SUB+=	SOURCES="@comment "
 +.else
 +PLIST_SUB+=	SOURCES=""
 +.endif
 +
 +.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
  
 +post-configure:
 +	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile
 +
  .if defined(WITH_SOURCES)
  post-install:
  	@${MKDIR} ${DATADIR}/${EMACS_VER}/src
 @@ -121,4 +229,11 @@
  	@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
  .endif
  
 +.if !defined(WITHOUT_X11)
 +pre-everything::
 +	@${ECHO_MSG}
 +	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
 +	@${ECHO_MSG}
 +.endif
 +
  .include <bsd.port.post.mk>
 diff -urN /usr/ports/editors/emacs-devel/distinfo emacs-devel/distinfo
 --- /usr/ports/editors/emacs-devel/distinfo	2009-06-23 20:35:32.000000000 +0530
 +++ emacs-devel/distinfo	2010-06-05 08:49:18.000000000 +0530
 @@ -1,3 +1,3 @@
 -MD5 (emacs-23.0.95.tar.gz) = 82dabe28e28872f0b577f9d292866505
 -SHA256 (emacs-23.0.95.tar.gz) = 703001e949b426f99dcdb65eb563118a3214bd8e057bf930925984dc4d8434cf
 -SIZE (emacs-23.0.95.tar.gz) = 42792970
 +MD5 (emacs-24.0.50_20100605.tar.bz2) = b5e2c05309dab6f44b38600fcd7c89fd
 +SHA256 (emacs-24.0.50_20100605.tar.bz2) = 90d33077cc34b40f9c4bded6ebed9e897ff69ff59acf8e1f077b89de83343d5f
 +SIZE (emacs-24.0.50_20100605.tar.bz2) = 26778894
 diff -urN /usr/ports/editors/emacs-devel/files/patch-configure emacs-devel/files/patch-configure
 --- /usr/ports/editors/emacs-devel/files/patch-configure	1970-01-01 05:30:00.000000000 +0530
 +++ emacs-devel/files/patch-configure	2010-06-05 08:55:05.000000000 +0530
 @@ -0,0 +1,162 @@
 +
 +$FreeBSD$
 +
 +--- configure.orig
 ++++ configure
 +@@ -5985,156 +5985,6 @@
 + 
 + 
 + 
 +-  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
 + 
 diff -urN /usr/ports/editors/emacs-devel/files/patch-sources.el emacs-devel/files/patch-sources.el
 --- /usr/ports/editors/emacs-devel/files/patch-sources.el	2009-06-17 09:21:58.000000000 +0530
 +++ emacs-devel/files/patch-sources.el	2010-06-05 08:42:29.000000000 +0530
 @@ -1,5 +1,5 @@
  
 -$FreeBSD: ports/editors/emacs-devel/files/patch-sources.el,v 1.1 2009/06/17 03:51:58 pgollucci Exp $
 +$FreeBSD: ports/editors/emacs/files/patch-sources.el,v 1.3 2009/12/20 20:19:17 bsam Exp $
  
  --- /dev/null
  +++ sources.el
 diff -urN /usr/ports/editors/emacs-devel/files/patch-src-image.c emacs-devel/files/patch-src-image.c
 --- /usr/ports/editors/emacs-devel/files/patch-src-image.c	2010-03-30 23:45:38.000000000 +0530
 +++ emacs-devel/files/patch-src-image.c	1970-01-01 05:30:00.000000000 +0530
 @@ -1,47 +0,0 @@
 ---- src/image.c.orig	2010-03-29 08:46:39.902587060 +0200
 -+++ src/image.c	2010-03-29 08:51:40.907908128 +0200
 -@@ -5793,7 +5793,7 @@
 - /* PNG library details.  */
 - 
 - DEF_IMGLIB_FN (png_get_io_ptr);
 --DEF_IMGLIB_FN (png_check_sig);
 -+DEF_IMGLIB_FN (png_sig_cmp);
 - DEF_IMGLIB_FN (png_create_read_struct);
 - DEF_IMGLIB_FN (png_create_info_struct);
 - DEF_IMGLIB_FN (png_destroy_read_struct);
 -@@ -5824,7 +5824,7 @@
 -     return 0;
 - 
 -   LOAD_IMGLIB_FN (library, png_get_io_ptr);
 --  LOAD_IMGLIB_FN (library, png_check_sig);
 -+  LOAD_IMGLIB_FN (library, png_sig_cmp);
 -   LOAD_IMGLIB_FN (library, png_create_read_struct);
 -   LOAD_IMGLIB_FN (library, png_create_info_struct);
 -   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
 -@@ -5849,7 +5849,7 @@
 - #else
 - 
 - #define fn_png_get_io_ptr		png_get_io_ptr
 --#define fn_png_check_sig		png_check_sig
 -+#define fn_png_sig_cmp			png_sig_cmp
 - #define fn_png_create_read_struct	png_create_read_struct
 - #define fn_png_create_info_struct	png_create_info_struct
 - #define fn_png_destroy_read_struct	png_destroy_read_struct
 -@@ -5996,7 +5996,7 @@
 - 
 -       /* Check PNG signature.  */
 -       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
 --	  || !fn_png_check_sig (sig, sizeof sig))
 -+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
 - 	{
 - 	  image_error ("Not a PNG file: `%s'", file, Qnil);
 - 	  UNGCPRO;
 -@@ -6013,7 +6013,7 @@
 - 
 -       /* Check PNG signature.  */
 -       if (tbr.len < sizeof sig
 --	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
 -+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
 - 	{
 - 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
 - 	  UNGCPRO;
 diff -urN /usr/ports/editors/emacs-devel/pkg-message emacs-devel/pkg-message
 --- /usr/ports/editors/emacs-devel/pkg-message	2009-06-23 20:35:32.000000000 +0530
 +++ emacs-devel/pkg-message	1970-01-01 05:30:00.000000000 +0530
 @@ -1,22 +0,0 @@
 -This is a pretest snapshot of what will be the Emacs 23.1
 -release.  As a result, there may be packaging errors in the
 -tarball, so please be on the lookout for problems with
 -installation.
 -
 -Pretesters: please send an email to keramida at ceid.upatras.gr
 -reporting success or failure on your systems.  In addition,
 -please report bugs via M-x report-emacs-bugs, or send an email
 -to emacs-pretest-bug at gnu.org.  For questions, please email
 -emacs-devel at gnu.org.
 -
 -Emacs 23 contains many changes relative to Emacs 22.  For
 -details, see the file etc/NEWS.  A few particular notes for
 -those who have not been following Emacs CVS development:
 -
 - - The RMAIL mail package was recently changed to use mbox
 -   instead of Babyl for its internal format.  This part of
 -   Emacs may be less stable than others; for safety, please
 -   back up your mail files before trying the new Rmail.
 -
 - - The default toolkit is now GTK+.  You can use WITHOUT_GTK
 -   to build GNU Emacs with the Lucid toolkit.
 diff -urN /usr/ports/editors/emacs-devel/pkg-plist emacs-devel/pkg-plist
 --- /usr/ports/editors/emacs-devel/pkg-plist	2009-06-23 20:35:32.000000000 +0530
 +++ emacs-devel/pkg-plist	2010-06-05 09:42:59.000000000 +0530
 @@ -7,16 +7,13 @@
  bin/etags
  bin/grep-changelog
  bin/rcs-checkin
 -libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fakemail
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/hexl
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/movemail
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/profile
 -libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/rcs2log
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/sorted-doc
  libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/update-game-score
 -libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
  share/applications/emacs.desktop
  %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
  %%DATADIR%%/%%EMACS_VER%%/etc/BABYL
 @@ -50,6 +47,7 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.20
  %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.21
  %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22
 +%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.23
  %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
  %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
  %%DATADIR%%/%%EMACS_VER%%/etc/PROBLEMS
 @@ -199,7 +197,7 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
  %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
  %%DATADIR%%/%%EMACS_VER%%/etc/echo.msg
 -%%DATADIR%%/%%EMACS_VER%%/etc/edt-user.doc
 +%%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el
  %%DATADIR%%/%%EMACS_VER%%/etc/emacs-buffer.gdb
  %%DATADIR%%/%%EMACS_VER%%/etc/emacs.bash
  %%DATADIR%%/%%EMACS_VER%%/etc/emacs.csh
 @@ -340,6 +338,7 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/README
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/all.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/cont.pbm
 @@ -360,8 +359,16 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/print.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rcont.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstart.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstop.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rfinish.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnext.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnexti.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstep.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstepi.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/step.pbm
 @@ -370,6 +377,7 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stepi.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/thread.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/up.pbm
 @@ -460,6 +468,15 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/add.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/ffwd.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/next.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/pause.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/play.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/prev.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/rewind.xpm
 +%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/stop.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/new.pbm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/new.xpm
  %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.pbm
 @@ -793,6 +810,20 @@
  %%DATADIR%%/%%EMACS_VER%%/etc/ses-example.ses
  %%DATADIR%%/%%EMACS_VER%%/etc/sex.6
  %%DATADIR%%/%%EMACS_VER%%/etc/spook.lines
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/cpp.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/default.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/doc-cpp.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/doc-default.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/doc-java.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/ede-make.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/el.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/getset-cpp.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/java.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/make.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/template.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/test.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/texi.srt
 +%%DATADIR%%/%%EMACS_VER%%/etc/srecode/wisent.srt
  %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL
  %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.bg
  %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.cn
 @@ -1123,6 +1154,297 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/cdl.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-global.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-global.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-idutils.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-idutils.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/data-debug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/data-debug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/autoconf-edit.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/autoconf-edit.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/emacs.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/emacs.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/files.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/files.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/linux.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/linux.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/loaddefs.el
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/locate.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/locate.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/make.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/make.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/makefile-edit.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/makefile-edit.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pconf.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pconf.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pmake.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pmake.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-archive.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-archive.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-aux.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-aux.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-comp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-comp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-elisp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-elisp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-info.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-info.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-misc.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-misc.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-obj.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-obj.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-prog.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-prog.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-scheme.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-scheme.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-shared.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-shared.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/project-am.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/project-am.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/shell.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/shell.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/simple.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/simple.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/source.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/source.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/speedbar.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/speedbar.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/srecode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/srecode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/system.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/system.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/complete.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/complete.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/debug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/debug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/fcn.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/fcn.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/refs.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/refs.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c-by.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c-by.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/debug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/debug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/el.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/el.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/gcc.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/gcc.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make-by.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make-by.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm-by.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm-by.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/chart.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/chart.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/complete.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/complete.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ctxt.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ctxt.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-debug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-debug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ebrowse.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ebrowse.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-el.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-el.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-file.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-file.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-find.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-find.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-global.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-global.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-javascript.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-javascript.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-mode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-mode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ref.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ref.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-typecache.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-typecache.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/debug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/debug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/include.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/include.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/mode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/mode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/dep.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/dep.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/doc.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/doc.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ede-grammar.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ede-grammar.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/edit.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/edit.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/find.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/find.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/format.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/format.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/fw.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/fw.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar-wy.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar-wy.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia-sb.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia-sb.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/idle.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/idle.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/imenu.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/imenu.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/java.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/java.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex-spp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex-spp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/loaddefs.el
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/mru-bookmark.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/mru-bookmark.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sb.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sb.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/scope.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/scope.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/senator.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/senator.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sort.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sort.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/cscope.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/cscope.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/filter.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/filter.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/global.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/global.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/grep.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/grep.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/idutils.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/idutils.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/list.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/list.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-file.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-file.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-ls.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-ls.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-write.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-write.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/texi.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/texi.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util-modes.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util-modes.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/comp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/comp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/java-tags.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/java-tags.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javascript.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javascript.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javat-wy.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javat-wy.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/js-wy.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/js-wy.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python-wy.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python-wy.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/wisent.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/wisent.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/args.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/args.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/compile.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/compile.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/cpp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/cpp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/ctxt.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/ctxt.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/dictionary.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/dictionary.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/document.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/document.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/el.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/el.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/expandproto.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/expandproto.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/extract.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/extract.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/fields.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/fields.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/filters.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/filters.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/find.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/find.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/getset.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/getset.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/insert.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/insert.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/java.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/java.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/loaddefs.el
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/map.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/map.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/mode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/mode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/semantic.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/semantic.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-mode.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-mode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-wy.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-wy.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/table.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/table.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/template.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/template.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/cmuscheme.el.gz
 @@ -1131,8 +1453,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/comint.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/compare-w.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/compare-w.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/complete.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/complete.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/completion.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/completion.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/composite.el.gz
 @@ -1190,6 +1510,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/dos-w32.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/double.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/double.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/dynamic-setting.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/dynamic-setting.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.el.gz
 @@ -1246,6 +1568,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/byte-run.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/chart.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/chart.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/checkdoc.el.gz
 @@ -1282,6 +1606,20 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/easymenu.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-comp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-comp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elint.el.gz
 @@ -1302,8 +1640,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gulp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/levents.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/levents.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mode.el.gz
 @@ -1312,8 +1648,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.el.gz
 @@ -1332,6 +1666,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rx.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/smie.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/smie.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/sregex.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/sregex.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/syntax.el.gz
 @@ -1565,6 +1901,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/ffap.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/filecache.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/filecache.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/files-x.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/files-x.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/files.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/files.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/filesets.el.gz
 @@ -1884,6 +2222,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/hex-util.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/hfy-cmap.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/hfy-cmap.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/hi-lock.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/hi-lock.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/hilit-chg.el.gz
 @@ -1892,6 +2232,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/hippie-exp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
 @@ -1933,8 +2275,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/charprop.el
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el
 -%%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.elc
 @@ -1960,7 +2300,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/latin1-disp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-cmds.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-cmds.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.el
 +%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-diag.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-diag.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-util.el.gz
 @@ -1975,6 +2316,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el
  %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el
 @@ -2237,6 +2580,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-sel.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/mouse.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/mouse.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/mpc.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/mpc.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/msb.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/msb.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/mwheel.el.gz
 @@ -2275,6 +2620,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap-hash.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap-hash.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 @@ -2315,6 +2662,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/secrets.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/secrets.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.el.gz
 @@ -2333,8 +2682,12 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fish.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-imap.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-imap.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-uu.el.gz
 @@ -2404,6 +2757,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xsd-regexp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.el.gz
 @@ -2415,6 +2770,10 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.el.gz
 @@ -2425,12 +2784,16 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnews.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnewspost.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rnewspost.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sc.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sc.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.el.gz
 @@ -2439,10 +2802,14 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ascii.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ascii.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-beamer.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-beamer.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bibtex.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-clock.el.gz
 @@ -2451,26 +2818,54 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-colview.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-crypt.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-crypt.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ctags.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ctags.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docbook.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docbook.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp-blocks.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp-blocks.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-freemind.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-freemind.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-html.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-html.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-icalendar.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-icalendar.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-latex.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-latex.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mac-message.el.gz
 @@ -2481,16 +2876,22 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mew.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.el.gz
 @@ -2501,6 +2902,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-xoxo.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-xoxo.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/outline.el.gz
 @@ -2648,8 +3051,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-mode.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-styles.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-styles.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-subword.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-subword.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-vars.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-vars.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cfengine.el.gz
 @@ -2696,8 +3097,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-ui.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-ui.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/glasses.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/glasses.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/grep.el.gz
 @@ -2722,6 +3123,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlwave.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/js.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/js.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/m4-mode.el.gz
 @@ -2760,8 +3163,8 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/simula.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sql.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sql.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sym-comp.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sym-comp.elc
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/subword.el.gz
 +%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/subword.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vera-mode.el.gz
 @@ -2804,8 +3207,6 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.elc
 -%%DATADIR%%/%%EMACS_VER%%/lisp/s-region.el.gz
 -%%DATADIR%%/%%EMACS_VER%%/lisp/s-region.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.el.gz
  %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.elc
  %%DATADIR%%/%%EMACS_VER%%/lisp/saveplace.el.gz
 @@ -3154,13 +3555,14 @@
  %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
  %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 -%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/Makefile.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bidi.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/blockinput.h
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.h
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buildobj.h
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
 @@ -3324,9 +3726,13 @@
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xfns.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xfont.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xftfont.c
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xgselect.c
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xgselect.h
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xmenu.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xrdb.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xselect.c
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsettings.c
 +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsettings.h
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
  %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
 @@ -3364,6 +3770,15 @@
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/erc
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emulation
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calendar
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calc
  @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp
 @@ -3371,6 +3786,7 @@
  @dirrm %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic
  @dirrm %%DATADIR%%/%%EMACS_VER%%/leim
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tutorials
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/etc/srecode
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/schema
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/refcards
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/nxml
 @@ -3380,6 +3796,7 @@
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies
 + at dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color
  @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/mimetypes
 
 --=-=-=--



More information about the freebsd-ports-bugs mailing list