Attachment 166701 Details for Bug 206813 – editors/emacs-devel diff updated with GNU mirror/tarballs

[patch] editors/emacs-devel diff updated with GNU mirror/tarballs

emacs-devel.diff (text/plain), 6.91 KB, created by Ashish SHUKLA on 2016-02-07 11:52:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2016-02-07 11:52:35 UTC

Size: 6.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 408379)
>+++ Makefile	(working copy)
>@@ -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 @@
> 		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 @@
> 
> 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 @@
> 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 @@
> 
> MODULES_CONFIGURE_ON=	--with-modules
> 
>+XWIDGETS_CONFIGURE_ON=	--with-xwidgets
>+XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
>+
> .include <bsd.port.options.mk>
> 
> # clang is broken on i386 platform in -O2, due to use of alloca, and
>@@ -196,7 +195,7 @@
> .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,10 +209,16 @@
> 
> .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
>+
> .include <bsd.port.pre.mk>
> 
> # Building with GCC 4.6+ requires it
>@@ -230,9 +235,6 @@
> 		${WRKSRC}/etc/emacs.desktop
> .endif
> 
>-pre-configure:
>-	@cd ${WRKSRC} && ./autogen.sh
>-
> post-install:
> .if ${PORT_OPTIONS:MSOURCES}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>Index: distinfo
>===================================================================
>--- distinfo	(revision 408379)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-sources.el
>===================================================================
>--- files/patch-sources.el	(revision 408379)
>+++ files/patch-sources.el	(working copy)
>@@ -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.
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 408379)
>+++ pkg-plist	(working copy)
>@@ -893,6 +893,22 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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

Actions: View | Diff

Attachments on bug 206813: 166378 | 166380 | 166701