Index: head/Mk/bsd.emacs.mk =================================================================== --- head/Mk/bsd.emacs.mk (revision 419163) +++ head/Mk/bsd.emacs.mk (revision 419164) @@ -1,155 +1,171 @@ # # $FreeBSD$ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # Emacs_Include= bsd.emacs.mk Emacs_Include_MAINTAINER= ashish@FreeBSD.org EMACS_PORT_NAME?= emacs24 # # This file for ports which depend on emacs family. # Define EMACS_PORT_NAME variable before bsd.port.[pre.]mk # and it will automatically include this file. # # This file exports the following common variables: # # EMACS_NAME: # emacsen's command-line basename. # ex.) "emacs" when emacsen is a emacs-20.6. # # EMACS_VER: # emacsen's version. # ex.) "20.6" when emacsen is a emacs-20.6. # # EMACS_MAJOR_VER: # emacsen's major version. # ex.) "20" when emacsen is a emacs-20.6. # # EMACS_LIBDIR: # emacsen's library directory name without ${PREFIX}. # ex.) "share/emacs" when emacsen is a emacs-20.6. # # EMACS_LIBDIR_WITH_VER: # emacsen's version specific library directory name # without ${PREFIX}. # ex.) "share/emacs/20.6" when emacsen is a emacs-20.6. # # EMACS_CMD: # emacsen's command-line filename. (full path) # ex.) "/usr/local/bin/emacs-20.6" when emacsen is a # emacs-20.6 and ${PREFIX} is "/usr/local". # # EMACS_SITE_LISPDIR: # emacsen's site-lisp directory name without ${PREFIX}. # ex.) "share/emacs/site-lisp" when emacsen is a emacs-20.6. # # EMACS_VERSION_SITE_LISPDIR: # emacsen's version specific site-lisp directory name # without ${PREFIX}. # ex.) "share/emacs/20.6/site-lisp" when emacsen is a # emacs-20.6. # # EMACS_NO_BUILD_DEPENDS: # If set "YES" to this variable, port does not # build-depend on EMACS_PORT_NAME's emacsen. # # EMACS_NO_RUN_DEPENDS: # If set "YES" to this variable, port does not # run-depend on EMACS_PORT_NAME's emacsen. # EMACS_MASTERDIR_PKGFILES?= NO # Emacs-24.x .if (${EMACS_PORT_NAME} == "emacs24") EMACS_NAME= emacs EMACS_VER= 24.5 EMACS_MAJOR_VER= 24 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} EMACS_PORTDIR= 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= 25.0.95 +EMACS_VER= 25.1 EMACS_MAJOR_VER= 25 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} EMACS_PORTDIR= editors/emacs-devel 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 +.elif (${EMACS_PORT_NAME} == "emacs-nox11") +EMACS_NAME= emacs +EMACS_VER= 24.5 +EMACS_MAJOR_VER= 24 +EMACS_LIBDIR= share/${EMACS_NAME} +EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} +EMACS_PORTDIR= editors/emacs-nox11 +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 + .else check-makevars:: @${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}." @${ECHO} "Valid values are:" - @${ECHO} " Emacs family: emacs24 emacs-devel" + @${ECHO} " Emacs family: emacs24 emacs-devel emacs-nox11" @${FALSE} .endif # # Common Definitions # # find where emacsen is installed # look for it in PREFIX first and fall back to LOCALBASE then .if exists(/bin/${EMACS_NAME}-${EMACS_VER}) EMACS_BASE?= ${PREFIX} .else EMACS_BASE?= ${LOCALBASE} .endif # emacsen command-line filename EMACS_CMD?= ${EMACS_BASE}/bin/${EMACS_NAME}-${EMACS_VER} # emacsen core elisp filename EMACS_CORE_DIR= ${EMACS_LIBDIR_WITH_VER}/lisp/${EMACS_CORE_SUBDIR} EMACS_COREEL= ${EMACS_BASE}/${EMACS_CORE_DIR}/startup.el # emacsen libdir without ${LOCALBASE} EMACS_SITE_LISPDIR?= ${EMACS_LIBDIR}/site-lisp EMACS_VERSION_SITE_LISPDIR?= ${EMACS_LIBDIR_WITH_VER}/site-lisp # build&run-dependency EMACS_NO_BUILD_DEPENDS?= NO EMACS_NO_RUN_DEPENDS?= NO .if (${EMACS_NO_BUILD_DEPENDS} == "NO") BUILD_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR} .endif .if (${EMACS_NO_RUN_DEPENDS} == "NO") .if defined(EMACS_COMMON_PORT) && (${EMACS_COMMON_PORT} == "YES") RUN_DEPENDS+= ${EMACS_COREEL}:${EMACS_PORTDIR}-common .else RUN_DEPENDS+= ${EMACS_CMD}:${EMACS_PORTDIR} .endif .endif # environments for build MAKE_ARGS+= EMACS=${EMACS_CMD} SCRIPTS_ENV+= EMACS_LIBDIR=${EMACS_LIBDIR} \ EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} # pkg/PLIST substrings PLIST_SUB+= EMACS_LIBDIR=${EMACS_LIBDIR} \ EMACS_VER=${EMACS_VER} \ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \ EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} \ EMACS_VERSION_SITE_LISPDIR=${EMACS_VERSION_SITE_LISPDIR} Index: head/editors/emacs-devel/Makefile =================================================================== --- head/editors/emacs-devel/Makefile (revision 419163) +++ head/editors/emacs-devel/Makefile (revision 419164) @@ -1,261 +1,262 @@ # Created by: Kenneth Vestergaard Schmidt # $FreeBSD$ PORTNAME= emacs -PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 +DISTVERSION= 25.1-rc1 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= GNU_ALPHA/emacs/pretest PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_sparc64= Emacs does not currently build on sparc64 BROKEN_ia64= Emacs does not currently build on ia64 CONFLICTS= emacs24-[0-9]* emacs-nox11-[0-9]* -EMACS_VER= 25.0.95 +EMACS_VER= ${PORTVERSION:R} +WRKSRC= ${WRKDIR}/${PORTNAME}-${EMACS_VER} + GNU_CONFIGURE= yes USES= cpe gmake makeinfo ncurses pkgconfig tar:xz INFO_PATH= ${DATADIR_REL}/info CPE_VENDOR= gnu SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\ ${CONFIGURE_TARGET} CONFIGURE_ARGS= --localstatedir=/var \ --with-gameuser=games:games PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} MAKE_ENV= LC_ALL=C INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \ rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \ srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE OPTIONS_RADIO_SOUND= ALSA OSS OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D OPTIONS_GROUP= GRAPHICS NEEDX11 OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \ XWIDGETS ACL_DESC= Access control list support CAIRO_DESC= Experimental Cairo support (implies PNG, XFT) FILENOTIFY_DESC=File notification support GCONF_DESC= GConf configuration support GFILE_DESC= File notification via gfile GRAPHICS_DESC= Graphics support (each implies X11) GSETTINGS_DESC= GSettings support (implies DBUS) KQUEUE_DESC= File notification via kqueue LLDB_DESC= Enable LLDB support for GUD #LTO_DESC= Enable link-time optimization MAGICK_DESC= ImageMagick support M17N_DESC= M17N support for text-shaping (implies XFT) MODULES_DESC= Dynamic modules support NEEDX11_DESC= Other X11-dependent (each implies X11) OTF_DESC= Opentype fonts support (implies XFT) SCROLLBARS_DESC=Toolkit scroll-bars SOURCES_DESC= Install sources SVG_DESC= SVG support (implies PNG) X11_DESC= X11 support X11TOOLKIT_DESC=X11 toolkit (each implies X11) XAW3D_DESC= Athena3D widgets XAW_DESC= Athena widgets XIM_DESC= X Input Method Support XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3) OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG \ KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \ TIFF X11 XFT XIM XML XPM OPTIONS_SUB= YES ACL_CONFIGURE_ENABLE= acl ALSA_CONFIGURE_ON= --with-sound=alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_WITH= cairo CAIRO_IMPLIES= PNG XFT X11 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_WITH= dbus GCONF_USE= GNOME=gconf2 GCONF_CONFIGURE_WITH= gconf GCONF_IMPLIES= X11 GFILE_CONFIGURE_ON= --with-file-notification=gfile GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_WITH= gif GIF_IMPLIES= X11 GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GSETTINGS_USE= GNOME=glib20 GSETTINGS_CONFIGURE_WITH=gsettings GSETTINGS_IMPLIES= DBUS X11 GTK2_USE= GNOME=cairo,gtk20 GTK2_USES= gettext GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK2_IMPLIES= X11 GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig GTK3_USE= GNOME=cairo,gtk30 GTK3_USES= gettext GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 GTK3_IMPLIES= X11 JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg JPEG_IMPLIES= X11 KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el #LTO_CONFIGURE_ON= --enable-link-time-optimization M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt M17N_IMPLIES= XFT X11 MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick MAGICK_IMPLIES= X11 MODULES_CONFIGURE_WITH= modules MOTIF_USES= motif MOTIF_CONFIGURE_ON= --with-x-toolkit=motif MOTIF_IMPLIES= X11 MOTIF_LIB_DEPENDS= libXp.so:x11/libXp OSS_CONFIGURE_ON= --with-sound=oss OTF_LIB_DEPENDS= libotf.so:print/libotf OTF_CONFIGURE_WITH= libotf OTF_IMPLIES= X11 XFT PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= png PNG_IMPLIES= X11 SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars SCROLLBARS_IMPLIES= X11 SVG_USE= GNOME=cairo,librsvg2 SVG_CONFIGURE_WITH= rsvg SVG_IMPLIES= X11 PNG SVG_USES= gettext TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff TIFF_IMPLIES= X11 X11_CONFIGURE_OFF= --without-x --with-x-toolkit=no X11_CONFIGURE_ON= --with-x X11_USE= XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt X11_USES= desktop-file-utils X11_VARS= installs_icons=yes X11_VARS_OFF= without_x11=yes XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d XAW_IMPLIES= X11 XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW3D_IMPLIES= X11 XFT_USE= XORG=xft,xrender XFT_CONFIGURE_WITH= xft XFT_IMPLIES= X11 XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 XIM_CONFIGURE_WITH= xim XIM_IMPLIES= X11 XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XPM_IMPLIES= X11 XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH=xwidgets XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 -XWIDGETS_IMPLIES= X11 +XWIDGETS_IMPLIES= GTK3 .include # clang is broken on i386 platform in -O2, due to use of alloca, and # stack realignment and %esi as frame pointer register # http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312 # (11-CURRENT), and fixed in r263765 (10-STABLE) .if ${ARCH} == "i386" .if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \ ${OSVERSION} < 1100015) USE_GCC=any .endif .endif .if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \ ! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+= --with-x-toolkit=no .endif .include # Building with GCC 4.6+ requires it .if ${ncurses_ARGS} == "port" LDFLAGS+=-ltinfo .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 ## stage-qa will give a warning, but don't pull in desktop-file-utils ## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those ## dependencies .if ! ${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \ ${WRKSRC}/etc/emacs.desktop .endif post-install: .if ${PORT_OPTIONS:MSOURCES} @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/src ${INSTALL_DATA} ${WRKSRC}/sources.el \ ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el .endif @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \ '*.gz' -exec ${GUNZIP_CMD} '{}' \; .include Index: head/editors/emacs-devel/distinfo =================================================================== --- head/editors/emacs-devel/distinfo (revision 419163) +++ head/editors/emacs-devel/distinfo (revision 419164) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465722255 -SHA256 (emacs-25.0.95.tar.xz) = 1438c51268250344739c31752d9292fc51cab0d8384b9f574ecaf1bcd879bb2e -SIZE (emacs-25.0.95.tar.xz) = 42536908 +TIMESTAMP = 1469588656 +SHA256 (emacs-25.1-rc1.tar.xz) = c00c50e66474359d1e24baa2a0703bc64207caffc31d0808d8b4ffa4b3826133 +SIZE (emacs-25.1-rc1.tar.xz) = 42309372