6 files changed, 130 insertions, 195 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index a8d1a62eb4d3..b56b48a29768 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -27,8 +26,8 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 
-EMACS_VER=	24.0.93
-EMACS_REV=	107364
+EMACS_VER=	24.1.50
+EMACS_REV=	109364
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NCURSES=	yes
@@ -43,45 +42,40 @@ EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}
 		${PREFIX}/libexec/${PORTNAME}
 
 MAN1=		ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
-		grep-changelog.1 rcs-checkin.1
+		grep-changelog.1
 MANCOMPRESSED=	yes
 PLIST_SUB=	EMACS_VER=${EMACS_VER}
 
 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 \
+		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \
 		erc ert 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
 
 LATEST_LINK=	emacs-devel
-OPTIONS=	DBUS	"DBus support"			ON \
-		GCONF	"GConf support"			ON \
-		GIF	"GIF Images support"		ON \
-		GTK2	"Use GTK+ widgets"		ON \
-		GTK3	"Use GTK+ 3 widgets"		OFF \
-		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 \
-		XML	"XML Parser support"		ON \
-		XPM	"XPM images support"		ON \
-		IMAGEMAGICK	"ImageMagick support"	ON \
-		GNUTLS	"GNUTLS support"		ON \
-		GSETTINGS	"GSettings support"	ON
+OPTIONS_DEFINE=	DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS XFT \
+		XIM XML XPM MAGICK GNUTLS GSETTINGS
+
+OPTIONS_SINGLE=	X11TOOLKIT
+
+GSETTINGS_DESC=		GSettings 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_X11TOOLKIT=	GTK2 GTK3 XAW XAW3D MOTIF
+
+OPTIONS_DEFAULT=DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT \
+		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS
 
 .include <bsd.port.options.mk>
 
@@ -93,158 +87,147 @@ CONFIGURE_ARGS+=	--without-x
 USE_XORG=	x11
 USE_GNOME=
 
-.if defined(WITHOUT_SVG)
-CONFIGURE_ARGS+=	--without-rsvg
-.else
+.if ${PORT_OPTIONS:MSVG}
 USE_GNOME+=	librsvg2
+.else
+CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
-.if defined(WITHOUT_GTK2) && defined(WITHOUT_GTK3)
-.if defined(WITH_XAW)
-.if defined(WITH_XAW3D) || defined(WITH_MOTIF)
-IGNORE=	please choose only one toolkit: GTK+/GTK+3/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+/GTK+3/Motif/Xaw/Xaw3d
-.endif
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk
+.elif ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	gtk30
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
+.elif ${PORT_OPTIONS:MXAW3D}
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 CONFIGURE_ARGS+=	--with-x-toolkit=athena
-.elif defined(WITH_MOTIF)
+.elif ${PORT_OPTIONS:MXAW}
+USE_XORG=	xaw
+CONFIGURE_ARGS+=	--with-x-toolkit=athena --without-xaw3d
+.elif ${PORT_OPTIONS:MMOTIF}
 USE_MOTIF=	yes
 CONFIGURE_ARGS+=	--with-x-toolkit=motif
-.else
-IGNORE=	please choose a toolkit: GTK+/GTK+3/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+/GTK+3/Motif/Xaw/Xaw3d
-.endif
-INSTALLS_ICONS=	yes
-.if defined(WITH_GTK3) && defined(WITHOUT_GTK2)
-USE_GNOME+=	gtk30
-CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
-.elif defined(WITH_GTK2) && defined(WITHOUT_GTK3)
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--with-x-toolkit=gtk
-.else
-IGNORE=	please choose only one toolkit: GTK+/GTK+3/Motif/Xaw/Xaw3d
-.endif
 .endif
 
-.if defined(WITHOUT_SCROLLBARS)
+.if !${PORT_OPTIONS:MSCROLLBARS}
 CONFIGURE_ARGS+=	--without-toolkit-scroll-bars
 .endif
 
-.if defined(WITHOUT_SYNC_INPUT)
+.if !${PORT_OPTIONS:MSYNC_INPUT}
 CONFIGURE_ARGS+=	--without-sync-input
 .endif
 
-.if defined(WITHOUT_JPEG)
-CONFIGURE_ARGS+=	--without-jpeg
-.else
+.if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
-.endif
-
-.if defined(WITHOUT_TIFF)
-CONFIGURE_ARGS+=	--without-tiff
 .else
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+CONFIGURE_ARGS+=	--without-jpeg
 .endif
 
-.if defined(WITHOUT_GIF)
-CONFIGURE_ARGS+=	--without-gif
+.if ${PORT_OPTIONS:MTIFF}
+LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
-LIB_DEPENDS+=   gif.5:${PORTSDIR}/graphics/giflib
+CONFIGURE_ARGS+=	--without-tiff
 .endif
 
-.if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=	--without-png
+.if ${PORT_OPTIONS:MGIF}
+LIB_DEPENDS+=   gif.5:${PORTSDIR}/graphics/giflib
 .else
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+CONFIGURE_ARGS+=	--without-gif
 .endif
 
-.if defined(WITHOUT_XPM)
-CONFIGURE_ARGS+=	--without-xpm
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .else
-USE_XORG+=	xpm
+CONFIGURE_ARGS+=	--without-png
 .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'
+.if ${PORT_OPTIONS:MXPM}
+USE_XORG+=	xpm
 .else
-CONFIGURE_ARGS+=	--without-xft
+CONFIGURE_ARGS+=	--without-xpm
 .endif
-.else
+
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+CONFIGURE_ARGS+=	--with-xft
+.if ${PORT_OPTIONS:MM17N}
+CONFIGURE_ARGS+=	--with-m17n-flt
+LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
+.else
+CONFIGURE_ARGS+=	--without-m17n-flt
 .endif
-
-.if defined(WITHOUT_IMAGEMAGICK)
-CONFIGURE_ARGS+=	--without-imagemagick
+.if ${PORT_OPTIONS:MOTF}
+CONFIGURE_ARGS+=	--with-otf
+LIB_DEPENDS+=	otf.0:${PORTSDIR}/print/libotf
 .else
-LIB_DEPENDS+=		MagickCore.5:${PORTSDIR}/graphics/ImageMagick
+CONFIGURE_ARGS+=	--without-libotf
 .endif
-
-.if defined(WITHOUT_M17N)
-CONFIGURE_ARGS+=	--without-m17n-flt
 .else
-.if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
+CONFIGURE_ARGS+=	--without-xft
+.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
+CONFIGURE_ARGS+=	--without-otf --without-m17n-flt
 .endif
 
-.if defined(WITHOUT_OTF)
-CONFIGURE_ARGS+=	--without-libotf
+.if ${PORT_OPTIONS:MMAGICK}
+LIB_DEPENDS+=		MagickCore.5:${PORTSDIR}/graphics/ImageMagick
+CONFIGURE_ARGS+=	--with-imagemagick
 .else
-.if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	otf.0:${PORTSDIR}/print/libotf
-.endif
+CONFIGURE_ARGS+=	--without-imagemagick
 .endif
 
-.if defined(WITHOUT_GSETTINGS)
-CONFIGURE_ARGS+=	--without-gsettings
-.else
+.if ${PORT_OPTIONS:MGSETTINGS}
 USE_GNOME+=	glib20
+CONFIGURE_ARGS+=	--with-gsettings
+.else
+CONFIGURE_ARGS+=	--without-gsettings
 .endif
 
-.if defined(WITHOUT_GCONF)
-CONFIGURE_ARGS+=	--without-gconf
-.else
+.if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	gconf2
+CONFIGURE_ARGS+=	--with-gconf
+.else
+CONFIGURE_ARGS+=	--without-gconf
 .endif
 
-.if defined(WITHOUT_XIM)
+.if ${PORT_OPTIONS:MXIM}
+CONFIGURE_ARGS+=	--with-xim
+.else
 CONFIGURE_ARGS+=	--without-xim
 .endif
 
 .endif
 
-.if defined(WITHOUT_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
+CONFIGURE_ARGS+=	--with-sound
+.else
 CONFIGURE_ARGS+=	--without-sound
 .endif
 
-.if defined(WITHOUT_DBUS)
-CONFIGURE_ARGS+=	--without-dbus
-.else
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--with-dbus
+.else
+CONFIGURE_ARGS+=	--without-dbus
 .endif
 
-.if defined(WITHOUT_XML)
-CONFIGURE_ARGS+=	--without-xml2
-.else
+.if ${PORT_OPTIONS:MXML}
 USE_GNOME+=		libxml2
+CONFIGURE_ARGS+=	--with-xml2
+.else
+CONFIGURE_ARGS+=	--without-xml2
 .endif
 
-.if defined(WITHOUT_GNUTLS)
-CONFIGURE_ARGS+=	--without-gnutls
-.else
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=		gnutls.47:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-gnutls
+.else
+CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 3256cd3fbef8..aa2186062ce5 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.0.93.107364.tar.xz) = 51ce2b1fefbf7db5e5927dc6d956f37851b06682af459e82267f05119c9805db
-SIZE (emacs-24.0.93.107364.tar.xz) = 23549876
+SHA256 (emacs-24.1.50.109364.tar.xz) = dc24def5dc368a33ac2dbb388bbd9e9f292d71bcf64e6712b72a899b07f138c9
+SIZE (emacs-24.1.50.109364.tar.xz) = 31119924
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
deleted file mode 100644
index 1f96cbac47c3..000000000000
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -517,14 +517,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; \
-@@ -624,9 +616,9 @@
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
- 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
--	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
--	        ${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; \
- 	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
- 	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
- 	          ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -641,7 +633,7 @@
- 	  for elt in $(INFO_FILES); do \
- 	    test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
- 	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.ac
index 05dbf8d39a9a..38a808a6bffb 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.in.orig
-+++ configure.in
-@@ -1169,39 +1169,10 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1166,39 +1166,10 @@
    AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
    AC_SUBST(LIBSOUND)
  
@@ -44,12 +44,30 @@ $FreeBSD$
       case "$opsys" in
         dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
         gnu-linux|freebsd|netbsd)
-@@ -1218,7 +1189,7 @@
-   linux/version.h sys/systeminfo.h \
-   stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
-   sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
+@@ -1215,7 +1186,7 @@
+   linux/version.h sys/systeminfo.h
+   stdio_ext.h fcntl.h coff.h pty.h
+   sys/vlimit.h sys/resource.h
 -  sys/utsname.h pwd.h utmp.h dirent.h util.h)
 +  sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h)
-
+ 
  AC_MSG_CHECKING(if personality LINUX32 can be set)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
+@@ -3378,7 +3349,7 @@
+     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
+     ;;
+ 
+-  darwin )
++  darwin | freebsd )
+     AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] )
+     dnl Not used, because PTY_ITERATION is defined.
+     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
+@@ -3390,7 +3361,7 @@
+     AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
+     ;;
+ 
+-  gnu | freebsd | netbsd | openbsd )
++  gnu | netbsd | openbsd )
+     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
+     ;;
+ 
diff --git a/editors/emacs-devel/files/patch-src_s_freebsd.h b/editors/emacs-devel/files/patch-src_s_freebsd.h
deleted file mode 100644
index a53230309c40..000000000000
--- a/editors/emacs-devel/files/patch-src_s_freebsd.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/s/freebsd.h.orig
-+++ src/s/freebsd.h
-@@ -61,3 +61,17 @@
- 
- /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
- #define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
-+
-+#define PTY_ITERATION	int i; for (i = 0; i < 1; i++)
-+#define PTY_NAME_SPRINTF	/* none */
-+#define PTY_TTY_NAME_SPRINTF	/* none */
-+#define PTY_OPEN						\
-+  do								\
-+    {								\
-+      int slave;						\
-+      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)	\
-+	fd = -1;						\
-+      else							\
-+	emacs_close (slave);					\
-+    }								\
-+  while (0)
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 4c0884921402..d1cb27e36fce 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -5,7 +5,6 @@ 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