svn commit: r405222 - head/editors/emacs-devel
Ashish SHUKLA
ashish at FreeBSD.org
Mon Jan 4 07:57:01 UTC 2016
Author: ashish
Date: Mon Jan 4 07:56:59 2016
New Revision: 405222
URL: https://svnweb.freebsd.org/changeset/ports/405222
Log:
- Update to git revision 0a7ad07[1]
- Cosmetic changes to Makefile[1]
- Update pkg-plist[1]
- Remove incorrect "tar:xz" from USES as the distfile is gzip-ed
since r402637
- Add MODULES option to add dynamic module support
PR: 205656
Submitted by: Joseph Mingrone <jrm at ftfl.ca>[1]
Modified:
head/editors/emacs-devel/Makefile
head/editors/emacs-devel/distinfo
head/editors/emacs-devel/pkg-plist
Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile Mon Jan 4 07:55:31 2016 (r405221)
+++ head/editors/emacs-devel/Makefile Mon Jan 4 07:56:59 2016 (r405222)
@@ -3,7 +3,6 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}.${EMACS_REV}
-PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= editors ipv6
PKGNAMESUFFIX= -devel
@@ -14,30 +13,31 @@ COMMENT= GNU editing macros
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_FreeBSD_9= does not build
+BROKEN_FreeBSD_9=does not build
BROKEN_sparc64= fails to compile at bootstrap phase
-BROKEN_ia64= Emacs 24.X does not currently build on ia64
+BROKEN_ia64= Emacs 24.X does not currently build on ia64
-CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
- emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \
- xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
- emacs-nox11-[0-9]*
+CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* \
+ emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]* \
+ xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
+ xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= af40b76
+GH_TAGNAME= 0a7ad07
EMACS_VER= 25.0.50
-EMACS_REV= 20151126
+EMACS_REV= 20160102
GNU_CONFIGURE= yes
-USES= autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz
+USES= autoreconf cpe gmake makeinfo ncurses pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INFO_PATH= ${DATADIR_REL}/info
WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
CPE_VENDOR= gnu
-SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
+ ${CONFIGURE_TARGET}
CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games
@@ -45,21 +45,24 @@ PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HO
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= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
- XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO
+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= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \
+ SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \
+ GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES
OPTIONS_SINGLE= X11 SOUND
ACL_DESC= ACL support
-GSETTINGS_DESC= GSettings support
+GSETTINGS_DESC= GSettings support
SCROLLBARS_DESC=Toolkit scroll-bars
SOUND_DESC= Sound support
SOURCES_DESC= Install sources
@@ -71,15 +74,16 @@ OTF_DESC= Opentype fonts suport
FILENOTIFY_DESC=File notification support
LTO_DESC= Enable link-time optimization (requires GCC 4.6+)
LLDB_DESC= Enable lldb support for GUD (from llvm.org)
+MODULES_DESC= Dynamic modules support
OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF
OPTIONS_SINGLE_SOUND= ALSA OSS
-OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 JPEG M17N \
- MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES SVG TIFF X11 XFT XIM \
- XML XPM
+OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 \
+ JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \
+ SOURCES SVG TIFF X11 XFT XIM XML XPM
-OPTIONS_SUB= YES
+OPTIONS_SUB= YES
LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
@@ -105,7 +109,7 @@ X11_USE= XORG=x11
X11_USES= desktop-file-utils
GTK2_USE= GNOME=gtk20
-GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
+GTK2_CONFIGURE_ON= -with-x-toolkit=gtk2
GTK3_USE= GNOME=gtk30
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
@@ -119,9 +123,9 @@ XAW_CONFIGURE_ON+= --with-x-toolkit=athe
MOTIF_USES= motif
MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif
-SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
+SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
-SYNC_INPUT_CONFIGURE_WITH= sync-input
+SYNC_INPUT_CONFIGURE_WITH=sync-input
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
@@ -148,11 +152,11 @@ M17N_CONFIGURE_WITH= m17n-flt
OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf
OTF_CONFIGURE_WITH= libotf
-MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
GSETTINGS_USE= gnome=glib20
-GSETTINGS_CONFIGURE_WITH= gsettings
+GSETTINGS_CONFIGURE_WITH=gsettings
GCONF_USE= gnome=gconf2
GCONF_CONFIGURE_WITH= gconf
@@ -165,38 +169,39 @@ LTO_USE= GCC=4.6+
ACL_CONFIGURE_OFF= --disable-acl
FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
-FILENOTIFY_CONFIGURE_OFF= --without-file-notification
+FILENOTIFY_CONFIGURE_OFF=--without-file-notification
FILENOTIFY_USE= GNOME=glib20
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_ON= --with-cairo
+MODULES_CONFIGURE_ON= --with-modules
+
.include <bsd.port.options.mk>
-# 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)
+# 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
+.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \
+${OSVERSION} < 1100015)
+USE_GCC= any
.endif
.endif
-DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
-
.if ${PORT_OPTIONS:MX11}
INSTALLS_ICONS= yes
.if !${PORT_OPTIONS:MXFT}
.if ${PORT_OPTIONS:MM17N}
-IGNORE= m17n support for text-shaping requires Xft. Please run 'make config'
+IGNORE= m17n requires Xft. Please run 'make config'
.elif ${PORT_OPTIONS:MOTF}
-IGNORE= opentype fonts support requires Xft. Please run 'make config'
+IGNORE= Opentype fonts require Xft. Please run 'make config'
.endif
.endif
.else
-.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF PNG \
- SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
+.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF \
+ PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
.if ${PORT_OPTIONS:M${OPT}}
IGNORE= option ${OPT} requires X11 option
.endif
@@ -205,7 +210,7 @@ IGNORE= option ${OPT} requires X11 opti
.if !${PORT_OPTIONS:MDBUS}
.if ${PORT_OPTIONS:MGSETTINGS}
-IGNORE= support for GSettings requires DBUS. Please run 'make config'
+IGNORE= GSettings requires DBUS. Please run 'make config'
.endif
.endif
@@ -218,31 +223,31 @@ LDFLAGS+= -ltinfo
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
+ @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
+ "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if empty(PORT_OPTIONS:MX11)
- @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
+ @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
+ ${WRKSRC}/etc/emacs.desktop
.endif
-post-configure:
- @${REINPLACE_CMD} -e \
- "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
- ${WRKSRC}/src/Makefile
-
pre-configure:
@cd ${WRKSRC} && ./autogen.sh
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
+ ${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} '{}' \;
+ @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
+ '*.gz' -exec ${GUNZIP_CMD} '{}' \;
.if !defined(WITHOUT_X11)
pre-everything::
@${ECHO_MSG}
- @${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
+ @${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
@${ECHO_MSG}
.endif
Modified: head/editors/emacs-devel/distinfo
==============================================================================
--- head/editors/emacs-devel/distinfo Mon Jan 4 07:55:31 2016 (r405221)
+++ head/editors/emacs-devel/distinfo Mon Jan 4 07:56:59 2016 (r405222)
@@ -1,2 +1,2 @@
-SHA256 (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 432b7359f5c798c4294d17661071e20dc4d8b6e7058105ab20a431619712ae77
-SIZE (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 37709547
+SHA256 (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 0883118a6399a3934c15f765535c7dc353a32b5ad1e72d4cf6370acd470b9e73
+SIZE (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 37743615
Modified: head/editors/emacs-devel/pkg-plist
==============================================================================
--- head/editors/emacs-devel/pkg-plist Mon Jan 4 07:55:31 2016 (r405221)
+++ head/editors/emacs-devel/pkg-plist Mon Jan 4 07:56:59 2016 (r405222)
@@ -2543,6 +2543,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/lrt.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/programmer-dvorak.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/programmer-dvorak.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/py-punct.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/py-punct.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/pypunct-b5.el.gz
@@ -2770,8 +2772,6 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz
@@ -2953,6 +2953,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz
More information about the svn-ports-head
mailing list