- Update port to latest snapshot.

- Clean up pkg-plist.
- Add new OPTIONs.

Approved by:	tabthorpe (mentor)

editors/emacs-devel/Makefile

@@ -26,7 +26,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 INSTALLS_ICONS=	yes
 
 EMACS_VER=	24.0.50
-EMACS_REV=	100884
+EMACS_REV=	101606
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XZ=		yes
@@ -42,7 +42,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 		grep-changelog.1 rcs-checkin.1
 MANCOMPRESSED=	yes
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
+PLIST_SUB=	EMACS_VER=${EMACS_VER}
+
+EMACS_DIRS=	${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
 
 MAKE_ENV=	LC_ALL=C
 
@@ -72,7 +74,9 @@ OPTIONS=	DBUS	"DBus support"			ON \
 		SCROLLBARS	"Without toolkit scroll-bars"			ON \
 		XFT	"Freetype fonts support"	ON \
 		XIM	"X Input Method support"	ON \
-		XPM	"XPM images support"		ON
+		XML	"XML Parser support"		ON \
+		XPM	"XPM images support"		ON \
+		IMAGEMAGICK	"ImageMagick support"	OFF
 
 .include <bsd.port.options.mk>
 
@@ -206,24 +210,23 @@ CONFIGURE_ARGS+=	--without-dbus
 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=""
+.if defined(WITH_IMAGEMAGICK)
+CONFIGURE_ARGS+=	--with-imagemagick
+LIB_DEPENDS+=		MagickCore.4:${PORTSDIR}/graphics/ImageMagick
 .endif
 
+.if defined(WITHOUT_XML)
+CONFIGURE_ARGS+=	--without-xml2
+.else
+USE_GNOME+=		libxml2
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == "ia64"
 BROKEN=	Emacs 24.X does not currently build on ia64
 .endif
 
-.if ${OSVERSION} > 900000
-PLIST_SUB+=	9X=""
-.else
-PLIST_SUB+=	9X="@comment "
-.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
@@ -231,6 +234,14 @@ post-patch:
 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} ${i} -type f |${SED} -e 's,${PREFIX}/,,g' >>${TMPPLIST}
+.endfor
+.for i in ${EMACS_DIRS}
+	@${FIND} ${i} -type d -depth |${SED} -e 's,^${PREFIX}/,@dirrm ,g' >>${TMPPLIST}
+.endfor
+
 .if defined(WITH_SOURCES)
 post-install:
 	@${MKDIR} ${DATADIR}/${EMACS_VER}/src

editors/emacs-devel/distinfo

@@ -1,3 +1,3 @@
-MD5 (emacs-24.0.50.100884.tar.xz) = d23fb8b788123816c0f04458b323a4ba
-SHA256 (emacs-24.0.50.100884.tar.xz) = cbe80cab540746cca0ce72f63536a1ea25291ab4960409bd4c5923c4cf25651e
-SIZE (emacs-24.0.50.100884.tar.xz) = 22607296
+MD5 (emacs-24.0.50.101606.tar.xz) = f84afaf4824c7d3226eb2030fd08015c
+SHA256 (emacs-24.0.50.101606.tar.xz) = 3f8a6550f3cea73b3f45af0f9a64b4e4d0067ce30cc5e63caf2a883e81f119da
+SIZE (emacs-24.0.50.101606.tar.xz) = 22709448

editors/emacs-devel/files/patch-configure

@@ -3,10 +3,12 @@ $FreeBSD$
 
 --- configure.orig
 +++ configure
-@@ -5981,160 +5981,10 @@
- 
- 
+@@ -6041,170 +6041,6 @@
+   LIBSOUND=
+ fi
  
+-
+-
 -  ALSA_REQUIRED=1.0.0
 -  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
 -
@@ -157,11 +159,18 @@ $FreeBSD$
 -$as_echo "#define HAVE_ALSA 1" >>confdefs.h
 -
 -  fi
- 
-         if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
-      case "$opsys" in
+-
+-        if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
+-     case "$opsys" in
 -              gnu-linux|freebsd|netbsd)
-+              gnu-linux|freebsd*|netbsd)
- 
- $as_echo "#define HAVE_SOUND 1" >>confdefs.h
+-
+-$as_echo "#define HAVE_SOUND 1" >>confdefs.h
+-
+-         ;;
+-     esac
+-  fi
+-
+-
+ fi
  
+ for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \