Attachment #166380 for bug #206813





USE_GITHUB=	yes
GH_ACCOUNT=	emacs-mirror
GH_TAGNAME=	43cb9f8

EMACS_VER=	25.0.90
EMACS_REV=	20160201
GNU_CONFIGURE=	yes
USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig
CPPFLAGS+=	-I${LOCALBASE}/include


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 XWIDGETS

OPTIONS_SINGLE=	X11 SOUND


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


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

.if ${PORT_OPTIONS:MM17N}
IGNORE=		m17n requires Xft. Please run 'make config'
.elif ${PORT_OPTIONS:MOTF}
IGNORE=		support for Opentype fonts require Xft. Please run 'make config'
.endif
.endif
.else


.if !${PORT_OPTIONS:MDBUS}
.if ${PORT_OPTIONS:MGSETTINGS}
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

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 0883118a6399a3934c15f765535c7dc353a32b5ad1e72d4cf6370acd470b9e73	1	SHA256 (emacs-mirror-emacs-25.0.90.20160201-43cb9f8_GH0.tar.gz) = 5482721c63b3ebdc787f72c072bec778fdc62682159e7c2fdc245188d68b547e
2	SIZE (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 37743615	2	SIZE (emacs-mirror-emacs-25.0.90.20160201-43cb9f8_GH0.tar.gz) = 37903227

Lines 1-4 Link Here

(-)files/patch-sources.el (-1 / +1 lines)
1	--- /dev/null	1	--- sources.el.orig 2016-02-01 06:06:37 UTC
2	+++ sources.el	2	+++ sources.el
3	@@ -0,0 +1,4 @@	3	@@ -0,0 +1,4 @@
4	+;;; Path to Emacs C Sources.	4	+;;; Path to Emacs C Sources.

Return to bug 206813

Lines 24-33 Link Here

(-)Makefile (-6 / +16 lines)
24		24
25	USE_GITHUB= yes	25	USE_GITHUB= yes
26	GH_ACCOUNT= emacs-mirror	26	GH_ACCOUNT= emacs-mirror
27	GH_TAGNAME= 0a7ad07	27	GH_TAGNAME= 43cb9f8
28		28
29	EMACS_VER= 25.0.50	29	EMACS_VER= 25.0.90
30	EMACS_REV= 20160102	30	EMACS_REV= 20160201
31	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
32	USES= autoreconf cpe gmake makeinfo ncurses pkgconfig	32	USES= autoreconf cpe gmake makeinfo ncurses pkgconfig
33	CPPFLAGS+= -I${LOCALBASE}/include	33	CPPFLAGS+= -I${LOCALBASE}/include
Lines 57-63 Link Here
57		57
58	OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \	58	OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \
59	SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \	59	SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \
60	GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES	60	GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS
61		61
62	OPTIONS_SINGLE= X11 SOUND	62	OPTIONS_SINGLE= X11 SOUND
63		63
Lines 75-80 Link Here
75	LTO_DESC= Enable link-time optimization (requires GCC 4.6+)	75	LTO_DESC= Enable link-time optimization (requires GCC 4.6+)
76	LLDB_DESC= Enable lldb support for GUD (from llvm.org)	76	LLDB_DESC= Enable lldb support for GUD (from llvm.org)
77	MODULES_DESC= Dynamic modules support	77	MODULES_DESC= Dynamic modules support
		78	XWIDGETS_DESC= Enable use of some GTK widgets in Emacs buffers
78		79
79	OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF	80	OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF
80	OPTIONS_SINGLE_SOUND= ALSA OSS	81	OPTIONS_SINGLE_SOUND= ALSA OSS
Lines 177-182 Link Here
177		178
178	MODULES_CONFIGURE_ON= --with-modules	179	MODULES_CONFIGURE_ON= --with-modules
179		180
		181	XWIDGETS_CONFIGURE_ON= --with-xwidgets
		182	XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
		183
180	.include <bsd.port.options.mk>	184	.include <bsd.port.options.mk>
181		185
182	# clang is broken on i386 platform in -O2, due to use of alloca, and	186	# clang is broken on i386 platform in -O2, due to use of alloca, and
Lines 196-202 Link Here
196	.if ${PORT_OPTIONS:MM17N}	200	.if ${PORT_OPTIONS:MM17N}
197	IGNORE= m17n requires Xft. Please run 'make config'	201	IGNORE= m17n requires Xft. Please run 'make config'
198	.elif ${PORT_OPTIONS:MOTF}	202	.elif ${PORT_OPTIONS:MOTF}
199	IGNORE= Opentype fonts require Xft. Please run 'make config'	203	IGNORE= support for Opentype fonts require Xft. Please run 'make config'
200	.endif	204	.endif
201	.endif	205	.endif
202	.else	206	.else
Lines 210-219 Link Here
210		214
211	.if !${PORT_OPTIONS:MDBUS}	215	.if !${PORT_OPTIONS:MDBUS}
212	.if ${PORT_OPTIONS:MGSETTINGS}	216	.if ${PORT_OPTIONS:MGSETTINGS}
213	IGNORE= GSettings requires DBUS. Please run 'make config'	217	IGNORE= support for GSettings requires DBUS. Please run 'make config'
214	.endif	218	.endif
215	.endif	219	.endif
216		220
		221	.if !${PORT_OPTIONS:MGTK3}
		222	.if ${PORT_OPTIONS:MXWIDGETS}
		223	IGNORE= support for XWidgets requires GTK3. Please run 'make config'
		224	.endif
		225	.endif
		226
217	.include <bsd.port.pre.mk>	227	.include <bsd.port.pre.mk>
218		228
219	# Building with GCC 4.6+ requires it	229	# Building with GCC 4.6+ requires it

Lines 2756-2763 Link Here

(-)pkg-plist (-2 / +7 lines)
2756	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc	2756	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
2757	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz	2757	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
2758	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc	2758	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
2759	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
2760	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
2761	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz	2759	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
2762	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc	2760	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
2763	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz	2761	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
Lines 2768-2773 Link Here
2768	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc	2766	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
2769	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz	2767	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
2770	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc	2768	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
		2769	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
		2770	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
2771	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz	2771	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
2772	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc	2772	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
2773	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz	2773	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
Lines 3942-3947 Link Here
3942	%%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc	3942	%%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
3943	%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz	3943	%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
3944	%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc	3944	%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
		3945	%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
		3946	%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
3945	%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el	3947	%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
3946	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el	3948	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
3947	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c	3949	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
Lines 4035-4040 Link Here
4035	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h	4037	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
4036	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c	4038	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
4037	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h	4039	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
		4040	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
4038	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c	4041	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
4039	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h	4042	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
4040	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c	4043	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
Lines 4094-4099 Link Here
4094	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c	4097	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
4095	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c	4098	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
4096	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c	4099	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
		4100	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
		4101	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
4097	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c	4102	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
4098	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c	4103	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
4099	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h	4104	%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h