From owner-svn-ports-head@freebsd.org Sun Feb 7 22:46:57 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 497EEAA1067; Sun, 7 Feb 2016 22:46:57 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07B22160C; Sun, 7 Feb 2016 22:46:56 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u17MktxV042154; Sun, 7 Feb 2016 22:46:55 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u17MktZH042150; Sun, 7 Feb 2016 22:46:55 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201602072246.u17MktZH042150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sun, 7 Feb 2016 22:46:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408458 - in head/editors/emacs-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2016 22:46:57 -0000 Author: ashish Date: Sun Feb 7 22:46:55 2016 New Revision: 408458 URL: https://svnweb.freebsd.org/changeset/ports/408458 Log: - Update to latest pretest 25.0.90[1] - Switch to GNU mirrors - Add XWIDGET option[1] - Fix portlint warnings[1] PR: 206813 Submitted by: Joseph Mingrone [1] Modified: head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo head/editors/emacs-devel/files/patch-sources.el head/editors/emacs-devel/pkg-plist Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Sun Feb 7 21:57:57 2016 (r408457) +++ head/editors/emacs-devel/Makefile Sun Feb 7 22:46:55 2016 (r408458) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= emacs -PORTVERSION= ${EMACS_VER}.${EMACS_REV} +PORTVERSION= ${EMACS_VER} PORTEPOCH= 2 CATEGORIES= editors ipv6 +MASTER_SITES= GNU_ALPHA/emacs/pretest PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org @@ -22,18 +23,12 @@ CONFLICTS= emacs-19.* emacs21-[0-9]* ema 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= 0a7ad07 - -EMACS_VER= 25.0.50 -EMACS_REV= 20160102 +EMACS_VER= 25.0.90 GNU_CONFIGURE= yes -USES= autoreconf cpe gmake makeinfo ncurses pkgconfig +USES= cpe gmake makeinfo ncurses pkgconfig tar:xz 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}/\ @@ -57,7 +52,7 @@ INFO= ada-mode auth autotype bovine cal 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 + GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS OPTIONS_SINGLE= X11 SOUND @@ -75,6 +70,7 @@ FILENOTIFY_DESC=File notification suppor 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 +XWIDGETS_DESC= Enable use of some GTK widgets in Emacs buffers OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF OPTIONS_SINGLE_SOUND= ALSA OSS @@ -177,6 +173,9 @@ CAIRO_CONFIGURE_ON= --with-cairo MODULES_CONFIGURE_ON= --with-modules +XWIDGETS_CONFIGURE_ON= --with-xwidgets +XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 + .include # clang is broken on i386 platform in -O2, due to use of alloca, and @@ -196,7 +195,7 @@ INSTALLS_ICONS= yes .if ${PORT_OPTIONS:MM17N} IGNORE= m17n requires Xft. Please run 'make config' .elif ${PORT_OPTIONS:MOTF} -IGNORE= Opentype fonts require Xft. Please run 'make config' +IGNORE= support for Opentype fonts require Xft. Please run 'make config' .endif .endif .else @@ -210,7 +209,13 @@ IGNORE= option ${OPT} requires X11 opti .if !${PORT_OPTIONS:MDBUS} .if ${PORT_OPTIONS:MGSETTINGS} -IGNORE= GSettings requires DBUS. Please run 'make config' +IGNORE= support for GSettings requires DBUS. Please run 'make config' +.endif +.endif + +.if !${PORT_OPTIONS:MGTK3} +.if ${PORT_OPTIONS:MXWIDGETS} +IGNORE= support for XWidgets requires GTK3. Please run 'make config' .endif .endif @@ -230,9 +235,6 @@ post-patch: ${WRKSRC}/etc/emacs.desktop .endif -pre-configure: - @cd ${WRKSRC} && ./autogen.sh - post-install: .if ${PORT_OPTIONS:MSOURCES} @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Sun Feb 7 21:57:57 2016 (r408457) +++ head/editors/emacs-devel/distinfo Sun Feb 7 22:46:55 2016 (r408458) @@ -1,2 +1,2 @@ -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 +SHA256 (emacs-25.0.90.tar.xz) = 325f275b64eee106ad9aaadb42243619822e5e59bee35645f15e015176adb626 +SIZE (emacs-25.0.90.tar.xz) = 42218556 Modified: head/editors/emacs-devel/files/patch-sources.el ============================================================================== --- head/editors/emacs-devel/files/patch-sources.el Sun Feb 7 21:57:57 2016 (r408457) +++ head/editors/emacs-devel/files/patch-sources.el Sun Feb 7 22:46:55 2016 (r408458) @@ -1,4 +1,4 @@ ---- /dev/null +--- sources.el.orig 2016-02-01 06:06:37 UTC +++ sources.el @@ -0,0 +1,4 @@ +;;; Path to Emacs C Sources. Modified: head/editors/emacs-devel/pkg-plist ============================================================================== --- head/editors/emacs-devel/pkg-plist Sun Feb 7 21:57:57 2016 (r408457) +++ head/editors/emacs-devel/pkg-plist Sun Feb 7 22:46:55 2016 (r408458) @@ -893,6 +893,22 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf +%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt %%DATADIR%%/%%EMACS_VER%%/etc/schema/README %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc @@ -2756,8 +2772,6 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz @@ -2768,6 +2782,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz @@ -3942,6 +3958,8 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c @@ -4035,6 +4053,7 @@ share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c @@ -4094,6 +4113,8 @@ share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h