Date: Wed, 1 Aug 2012 15:20:25 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301832 - in head: . Mk editors editors/emacs editors/emacs-devel editors/emacs-devel/files editors/emacs/files editors/emacs23 Message-ID: <201208011520.q71FKPiH067863@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Wed Aug 1 15:20:25 2012 New Revision: 301832 URL: http://svn.freebsd.org/changeset/ports/301832 Log: GNU Emacs updates editors/emacs - Update to v. 24.1[1] - Update CANNA patch to v. 24.1[2] - Convert OPTIONS to OptionsNG - Remove patch to VC to make it work with Subversion 1.7 - Add patch to implement process support for FreeBSD from Emacs bug# 5243 - Add patch to fix segfault on Terminal (from NetBSD emacs port)[2] editors/emacs23 - Convert OPTIONS to OptionsNG - Bump PORTREVISION of editors/emacs23 port - Remove PORTEPOCH, as port needs to be explicitly installed/upgraded - Connect repocopied editors/emacs23 to build editors/emacs-devel - Update to bzr revision 109364 - Convert OPTIONS to OptionsNG - Remove redundant patches - Add patch to add openpty support for 10-CURRENT from Emacs bug# 12040[3] Mk/bsd.emacs.mk - Add EMACS_PORT_NAME block for Emacs 24 to bsd.emacs.mk - Update major version for emacs-devel port - Take maintainership of bsd.emacs.mk Thanks to everyone who tested these updates, and provided their feedback. Submitted by: http://www.gnu.org/software/emacs/NEWS.24.1[1] Submitted by: Yuji TAKANO[2] (via private email), Jan Beich[3] Added: head/editors/emacs-devel/files/patch-configure.ac (contents, props changed) head/editors/emacs/files/patch-src_process.c (contents, props changed) head/editors/emacs/files/patch-src_s_freebsd.h (contents, props changed) head/editors/emacs/files/patch-src_sysdep.c (contents, props changed) head/editors/emacs/files/patch-src_term.c (contents, props changed) Deleted: head/editors/emacs-devel/files/patch-Makefile.in head/editors/emacs-devel/files/patch-configure.in head/editors/emacs-devel/files/patch-src_s_freebsd.h head/editors/emacs/files/patch-lisp-vc-svn.el Modified: head/Mk/bsd.emacs.mk (contents, props changed) head/UPDATING head/editors/Makefile (contents, props changed) head/editors/emacs-devel/Makefile (contents, props changed) head/editors/emacs-devel/distinfo (contents, props changed) head/editors/emacs-devel/pkg-plist (contents, props changed) head/editors/emacs/Makefile (contents, props changed) head/editors/emacs/distinfo (contents, props changed) head/editors/emacs/files/patch-Makefile.in (contents, props changed) head/editors/emacs/files/patch-configure (contents, props changed) head/editors/emacs/files/patch-doc-emacs-Makefile.in (contents, props changed) head/editors/emacs/files/patch-doc-lispintro-Makefile.in (contents, props changed) head/editors/emacs/files/patch-doc-lispref-Makefile.in (contents, props changed) head/editors/emacs/files/patch-doc-misc-Makefile.in (contents, props changed) head/editors/emacs/files/patch-sources.el (contents, props changed) head/editors/emacs/files/patch-src_coding.c (contents, props changed) head/editors/emacs/files/patch-src_config.in (contents, props changed) head/editors/emacs/pkg-plist (contents, props changed) head/editors/emacs23/Makefile (contents, props changed) Modified: head/Mk/bsd.emacs.mk ============================================================================== --- head/Mk/bsd.emacs.mk Wed Aug 1 15:05:37 2012 (r301831) +++ head/Mk/bsd.emacs.mk Wed Aug 1 15:20:25 2012 (r301832) @@ -1,13 +1,13 @@ # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.89 2012-02-22 13:25:25 ashish Exp $ +# $FreeBSD$ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # Emacs_Include= bsd.emacs.mk -Emacs_Include_MAINTAINER= ports@FreeBSD.org +Emacs_Include_MAINTAINER= ashish@FreeBSD.org -EMACS_PORT_NAME?= emacs23 +EMACS_PORT_NAME?= emacs24 # # This file for ports which depend on emacs family. @@ -114,10 +114,27 @@ DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PO PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} .endif +# Emacs-24.x +.elif (${EMACS_PORT_NAME} == "emacs24") +EMACS_NAME= emacs +EMACS_VER= 24.1 +EMACS_MAJOR_VER= 24 +EMACS_LIBDIR?= share/${EMACS_NAME} +EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} +EMACS_PORTSDIR= ${PORTSDIR}/editors/emacs +EMACS_COMMON_PORT= NO +EMACS_HAS_MULE= YES +EMACS_NO_SUBDIRSEL= NO +.if (${EMACS_MASTERDIR_PKGFILES} == "YES") +COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME} +DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME} +PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} +.endif + # Emacs-24.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 24.0.93 +EMACS_VER= 24.1.50 EMACS_MAJOR_VER= 24 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -208,7 +225,8 @@ PLIST?= ${PKGDIR}/pkg-pl check-makevars:: @${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}." @${ECHO} "Valid values are:" - @${ECHO} " Emacs family: emacs21 emacs22 emacs23 emacs-devel" + @${ECHO} " Emacs family: emacs21 emacs22 emacs23 emacs24" + @${ECHO} " emacs-devel" @${ECHO} " XEmacs family: xemacs21 xemacs21-mule xemacs-devel" @${ECHO} " xemacs-devel-mule xemacs-mule-xft" @${FALSE} Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Aug 1 15:05:37 2012 (r301831) +++ head/UPDATING Wed Aug 1 15:20:25 2012 (r301832) @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20120801: + AFFECTS: users of editors/emacs + AUTHOR: ashish@FreeBSD.org + + GNU Emacs port is updated to 24.1. Emacs 23 is moved to editors/emacs23. + + If you prefer to stick with Emacs 23, please specify EMACS_PORT_NAME=emacs23 + in /etc/make.conf, and do: + + # portmaster -o editors/emacs23 editors/emacs + 20120726: AFFECTS: users of www/firefox, www/seamonkey, mail/thunderbird, www/libxul AUTHOR: gecko@FreeBSD.org Modified: head/editors/Makefile ============================================================================== --- head/editors/Makefile Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/Makefile Wed Aug 1 15:20:25 2012 (r301832) @@ -59,6 +59,7 @@ SUBDIR += emacs-nox11 SUBDIR += emacs21 SUBDIR += emacs22 + SUBDIR += emacs23 SUBDIR += f4l SUBDIR += fb SUBDIR += flim Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs-devel/Makefile Wed Aug 1 15:20:25 2012 (r301832) @@ -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-2 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 ${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> Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs-devel/distinfo Wed Aug 1 15:20:25 2012 (r301832) @@ -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 Added: head/editors/emacs-devel/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/emacs-devel/files/patch-configure.ac Wed Aug 1 15:20:25 2012 (r301832) @@ -0,0 +1,73 @@ + +$FreeBSD$ + +--- configure.ac.orig ++++ configure.ac +@@ -1166,39 +1166,10 @@ + AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) + AC_SUBST(LIBSOUND) + +- ALSA_REQUIRED=1.0.0 +- ALSA_MODULES="alsa >= $ALSA_REQUIRED" +- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no) +- if test $HAVE_ALSA = yes; then +- SAVE_CFLAGS="$CFLAGS" +- SAVE_LIBS="$LIBS" +- CFLAGS="$ALSA_CFLAGS $CFLAGS" +- LIBS="$ALSA_LIBS $LIBS" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])], +- emacs_alsa_normal=yes, +- emacs_alsa_normal=no) +- if test "$emacs_alsa_normal" != yes; then +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]], +- [[snd_lib_error_set_handler (0);]])], +- emacs_alsa_subdir=yes, +- emacs_alsa_subdir=no) +- if test "$emacs_alsa_subdir" != yes; then +- AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.]) +- fi +- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" +- fi +- +- CFLAGS="$SAVE_CFLAGS" +- LIBS="$SAVE_LIBS" +- LIBSOUND="$LIBSOUND $ALSA_LIBS" +- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" +- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.]) +- fi +- + dnl Define HAVE_SOUND if we have sound support. We know it works and + dnl compiles only on the specified platforms. For others, it + dnl probably doesn't make sense to try. +- if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then ++ if test x$have_sound_header = xyes; then + case "$opsys" in + dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ + gnu-linux|freebsd|netbsd) +@@ -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']) + ;; + Modified: head/editors/emacs-devel/pkg-plist ============================================================================== --- head/editors/emacs-devel/pkg-plist Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs-devel/pkg-plist Wed Aug 1 15:20:25 2012 (r301832) @@ -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 Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs/Makefile Wed Aug 1 15:20:25 2012 (r301832) @@ -7,7 +7,6 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION?= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -19,13 +18,13 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_SAFE= yes -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* -EMACS_VER= 23.4 +EMACS_VER= 24.1 GNU_CONFIGURE= yes USE_GMAKE= yes USE_BZIP2= yes @@ -35,8 +34,9 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ +MAN1= 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_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ @@ -45,186 +45,205 @@ EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim 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 \ + 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 .if !defined(EMACS_NO_X11_SLAVE) CONFLICTS+= emacs-nox11-[0-9]* -OPTIONS= CANNA "Canna support" OFF \ - DBUS "DBus support" ON \ - GCONF "GConf support" ON \ - GIF "GIF images support" ON \ - GTK2 "Use GTK+ widgets" ON \ - JPEG "JPEG images support" ON \ - M17N "M17N support for text-shaping" ON \ - MOTIF "Use Motif widgets" OFF \ - OTF "Opentype fonts 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_DEFINE= CANNA DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS XFT \ + XIM XML XPM MAGICK GNUTLS GSETTINGS + +OPTIONS_SINGLE= X11TOOLKIT + +CANNA_DESC= Canna support +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 .endif .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:MCANNA} +PATCH_SITES+= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR+= ashish +PATCHFILES+= emacs24.1canna-20120614.diff.gz +PATCH_DIST_STRIP= -p1 +CONFIGURE_ARGS+= --with-canna \ + --with-canna-includes=${LOCALBASE}/include \ + --with-canna-libraries=${LOCALBASE}/lib +LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib +.endif + .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x - .else 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) -.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 +.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+/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 -INSTALLS_ICONS= yes -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --with-x-toolkit=gtk .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 +.else +CONFIGURE_ARGS+= --without-jpeg .endif -.if defined(WITHOUT_TIFF) -CONFIGURE_ARGS+= --without-tiff -.else +.if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +.else +CONFIGURE_ARGS+= --without-tiff .endif -.if defined(WITHOUT_GIF) -CONFIGURE_ARGS+= --without-gif +.if ${PORT_OPTIONS:MGIF} +LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib .else -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib +CONFIGURE_ARGS+= --without-gif .endif -.if defined(WITHOUT_PNG) -CONFIGURE_ARGS+= --without-png -.else +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +.else +CONFIGURE_ARGS+= --without-png .endif -.if defined(WITHOUT_XPM) -CONFIGURE_ARGS+= --without-xpm -.else +.if ${PORT_OPTIONS:MXPM} USE_XORG+= xpm +.else +CONFIGURE_ARGS+= --without-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' +.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-xft +CONFIGURE_ARGS+= --without-m17n-flt .endif +.if ${PORT_OPTIONS:MOTF} +CONFIGURE_ARGS+= --with-otf +LIB_DEPENDS+= otf.0:${PORTSDIR}/print/libotf .else -USE_XORG+= xft -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +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_GCONF) -CONFIGURE_ARGS+= --without-gconf +.if ${PORT_OPTIONS:MGSETTINGS} +USE_GNOME+= glib20 +CONFIGURE_ARGS+= --with-gsettings .else -USE_GNOME+= gconf2 +CONFIGURE_ARGS+= --without-gsettings .endif -.if defined(WITHOUT_XIM) -CONFIGURE_ARGS+= --without-xim +.if ${PORT_OPTIONS:MGCONF} +USE_GNOME+= gconf2 +CONFIGURE_ARGS+= --with-gconf +.else +CONFIGURE_ARGS+= --without-gconf .endif -.if defined(WITH_CANNA) -PATCH_SITES+= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR+= ashish -PATCHFILES+= emacs23.3canna-20110316.diff.gz -PATCH_DIST_STRIP= -p1 -CONFIGURE_ARGS+= --with-canna \ - --with-canna-includes=${LOCALBASE}/include \ - --with-canna-libraries=${LOCALBASE}/lib -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib +.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) +.if ${PORT_OPTIONS:MDBUS} +LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+= --with-dbus +.else CONFIGURE_ARGS+= --without-dbus +.endif + +.if ${PORT_OPTIONS:MXML} +USE_GNOME+= libxml2 +CONFIGURE_ARGS+= --with-xml2 .else -LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+= --without-xml2 +.endif + +.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> .if ${ARCH} == "ia64" -BROKEN= Emacs 23.X does not currently build on ia64 +BROKEN= Emacs 24.X does not currently build on ia64 .endif post-patch: @@ -260,9 +279,10 @@ PLIST_SUB+= SOURCES="@comment " .endif pre-everything:: - @${ECHO_MSG} .if !defined(WITHOUT_X11) + @${ECHO_MSG} @${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11." + @${ECHO_MSG} .endif .if defined(WITH_CANNA) @${ECHO_MSG} "====> Canna support is not part of standard distribution" Modified: head/editors/emacs/distinfo ============================================================================== --- head/editors/emacs/distinfo Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs/distinfo Wed Aug 1 15:20:25 2012 (r301832) @@ -1,4 +1,4 @@ -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 +SHA256 (emacs-24.1.tar.bz2) = eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c +SIZE (emacs-24.1.tar.bz2) = 41722508 +SHA256 (emacs24.1canna-20120614.diff.gz) = 276bbaae3b2adca9b1598653ea24986c29564afdea4b6741cbaee71db4f52bbe +SIZE (emacs24.1canna-20120614.diff.gz) = 31907 Modified: head/editors/emacs/files/patch-Makefile.in ============================================================================== --- head/editors/emacs/files/patch-Makefile.in Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs/files/patch-Makefile.in Wed Aug 1 15:20:25 2012 (r301832) @@ -1,6 +1,9 @@ ---- 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 @@ + +$FreeBSD$ + +--- Makefile.in.orig ++++ Makefile.in +@@ -518,14 +518,6 @@ install-arch-indep: mkdir info install-etc -set ${COPYDESTS} ; \ @@ -15,25 +18,26 @@ mkdir ${COPYDESTS} ; \ chmod ugo+rx ${COPYDESTS} ; \ unset CDPATH; \ -@@ -570,9 +562,9 @@ +@@ -625,10 +617,10 @@ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ + 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; \ ++ for f in `ls $$elt 2>/dev/null`; do \ + (cd $${thisdir}; \ +- ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ - chmod a+r $(DESTDIR)${infodir}/$$f; \ -+ 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 @@ ++ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f.info); \ ++ chmod a+r $(DESTDIR)${infodir}/$$f.info; \ + if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ + rm -f $(DESTDIR)${infodir}/$$f.gz; \ + ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ +@@ -643,7 +635,7 @@ for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ + 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} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} + -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} Modified: head/editors/emacs/files/patch-configure ============================================================================== --- head/editors/emacs/files/patch-configure Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs/files/patch-configure Wed Aug 1 15:20:25 2012 (r301832) @@ -3,7 +3,7 @@ $FreeBSD$ --- configure.orig +++ configure -@@ -5806,159 +5806,6 @@ +@@ -8276,177 +8276,13 @@ LIBSOUND= fi @@ -18,7 +18,7 @@ $FreeBSD$ -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 : +-if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in @@ -107,9 +107,9 @@ $FreeBSD$ - - if test $HAVE_ALSA = yes; then - SAVE_CFLAGS="$CFLAGS" -- SAVE_LDFLAGS="$LDFLAGS" +- SAVE_LIBS="$LIBS" - CFLAGS="$ALSA_CFLAGS $CFLAGS" -- LDFLAGS="$ALSA_LIBS $LDFLAGS" +- LIBS="$ALSA_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <asoundlib.h> @@ -152,7 +152,7 @@ $FreeBSD$ - fi - - CFLAGS="$SAVE_CFLAGS" -- LDFLAGS="$SAVE_LDFLAGS" +- LIBS="$SAVE_LIBS" - LIBSOUND="$LIBSOUND $ALSA_LIBS" - CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" - @@ -160,6 +160,25 @@ $FreeBSD$ - - fi - +- if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then +- case "$opsys" in +- gnu-linux|freebsd|netbsd) +- +-$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 \ + for ac_header in sys/select.h sys/time.h unistd.h utime.h \ + linux/version.h sys/systeminfo.h \ + stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \ + sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ +- sys/utsname.h pwd.h utmp.h dirent.h util.h ++ sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" Modified: head/editors/emacs/files/patch-doc-emacs-Makefile.in ============================================================================== --- head/editors/emacs/files/patch-doc-emacs-Makefile.in Wed Aug 1 15:05:37 2012 (r301831) +++ head/editors/emacs/files/patch-doc-emacs-Makefile.in Wed Aug 1 15:20:25 2012 (r301832) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208011520.q71FKPiH067863>