View | Details | Raw Unified | Return to bug 206813 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-15 / +17 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	emacs
4
PORTNAME=	emacs
5
PORTVERSION=	${EMACS_VER}.${EMACS_REV}
5
PORTVERSION=	${EMACS_VER}
6
PORTEPOCH=	2
6
PORTEPOCH=	2
7
CATEGORIES=	editors ipv6
7
CATEGORIES=	editors ipv6
8
MASTER_SITES=	GNU_ALPHA/emacs/pretest
8
PKGNAMESUFFIX=	-devel
9
PKGNAMESUFFIX=	-devel
9
10
10
MAINTAINER=	ashish@FreeBSD.org
11
MAINTAINER=	ashish@FreeBSD.org
Lines 22-39 Link Here
22
		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
23
		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
23
		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
24
		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
24
25
25
USE_GITHUB=	yes
26
EMACS_VER=	25.0.90
26
GH_ACCOUNT=	emacs-mirror
27
GH_TAGNAME=	0a7ad07
28
29
EMACS_VER=	25.0.50
30
EMACS_REV=	20160102
31
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
32
USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig
28
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
33
CPPFLAGS+=	-I${LOCALBASE}/include
29
CPPFLAGS+=	-I${LOCALBASE}/include
34
LDFLAGS+=	-L${LOCALBASE}/lib
30
LDFLAGS+=	-L${LOCALBASE}/lib
35
INFO_PATH=	${DATADIR_REL}/info
31
INFO_PATH=	${DATADIR_REL}/info
36
WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
37
CPE_VENDOR=	gnu
32
CPE_VENDOR=	gnu
38
33
39
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
34
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
Lines 57-63 Link Here
57
52
58
OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
53
OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
59
		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
54
		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
60
		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES
55
		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS
61
56
62
OPTIONS_SINGLE=	X11 SOUND
57
OPTIONS_SINGLE=	X11 SOUND
63
58
Lines 75-80 Link Here
75
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
70
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
76
LLDB_DESC=	Enable lldb support for GUD (from llvm.org)
71
LLDB_DESC=	Enable lldb support for GUD (from llvm.org)
77
MODULES_DESC=	Dynamic modules support
72
MODULES_DESC=	Dynamic modules support
73
XWIDGETS_DESC=  Enable use of some GTK widgets in Emacs buffers
78
74
79
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
75
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
80
OPTIONS_SINGLE_SOUND=	ALSA OSS
76
OPTIONS_SINGLE_SOUND=	ALSA OSS
Lines 177-182 Link Here
177
173
178
MODULES_CONFIGURE_ON=	--with-modules
174
MODULES_CONFIGURE_ON=	--with-modules
179
175
176
XWIDGETS_CONFIGURE_ON=	--with-xwidgets
177
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
178
180
.include <bsd.port.options.mk>
179
.include <bsd.port.options.mk>
181
180
182
# clang is broken on i386 platform in -O2, due to use of alloca, and
181
# clang is broken on i386 platform in -O2, due to use of alloca, and
Lines 196-202 Link Here
196
.if ${PORT_OPTIONS:MM17N}
195
.if ${PORT_OPTIONS:MM17N}
197
IGNORE=		m17n requires Xft. Please run 'make config'
196
IGNORE=		m17n requires Xft. Please run 'make config'
198
.elif ${PORT_OPTIONS:MOTF}
197
.elif ${PORT_OPTIONS:MOTF}
199
IGNORE=		Opentype fonts require Xft. Please run 'make config'
198
IGNORE=		support for Opentype fonts require Xft. Please run 'make config'
200
.endif
199
.endif
201
.endif
200
.endif
202
.else
201
.else
Lines 210-219 Link Here
210
209
211
.if !${PORT_OPTIONS:MDBUS}
210
.if !${PORT_OPTIONS:MDBUS}
212
.if ${PORT_OPTIONS:MGSETTINGS}
211
.if ${PORT_OPTIONS:MGSETTINGS}
213
IGNORE=		GSettings requires DBUS. Please run 'make config'
212
IGNORE=		support for GSettings requires DBUS. Please run 'make config'
214
.endif
213
.endif
215
.endif
214
.endif
216
215
216
.if !${PORT_OPTIONS:MGTK3}
217
.if ${PORT_OPTIONS:MXWIDGETS}
218
IGNORE=		support for XWidgets requires GTK3. Please run 'make config'
219
.endif
220
.endif
221
217
.include <bsd.port.pre.mk>
222
.include <bsd.port.pre.mk>
218
223
219
# Building with GCC 4.6+ requires it
224
# Building with GCC 4.6+ requires it
Lines 230-238 Link Here
230
		${WRKSRC}/etc/emacs.desktop
235
		${WRKSRC}/etc/emacs.desktop
231
.endif
236
.endif
232
237
233
pre-configure:
234
	@cd ${WRKSRC} && ./autogen.sh
235
236
post-install:
238
post-install:
237
.if ${PORT_OPTIONS:MSOURCES}
239
.if ${PORT_OPTIONS:MSOURCES}
238
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
240
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 0883118a6399a3934c15f765535c7dc353a32b5ad1e72d4cf6370acd470b9e73
1
SHA256 (emacs-25.0.90.tar.xz) = 325f275b64eee106ad9aaadb42243619822e5e59bee35645f15e015176adb626
2
SIZE (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 37743615
2
SIZE (emacs-25.0.90.tar.xz) = 42218556
(-)files/patch-sources.el (-1 / +1 lines)
Lines 1-4 Link Here
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.
(-)pkg-plist (-2 / +23 lines)
Lines 893-898 Link Here
893
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
893
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
894
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
894
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
895
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
895
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
896
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
897
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
898
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
899
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
900
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
901
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
902
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
903
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
904
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
905
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
906
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
907
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
908
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
909
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
910
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
911
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
896
%%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
912
%%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
897
%%DATADIR%%/%%EMACS_VER%%/etc/schema/README
913
%%DATADIR%%/%%EMACS_VER%%/etc/schema/README
898
%%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
914
%%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
Lines 2756-2763 Link Here
2756
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
2772
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
2757
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
2773
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
2758
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
2774
%%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
2775
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
2762
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
2776
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
2763
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
2777
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
Lines 2768-2773 Link Here
2768
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
2782
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
2769
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
2783
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
2770
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
2784
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
2785
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
2786
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
2771
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
2787
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
2772
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
2788
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
2773
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
2789
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
Lines 3942-3947 Link Here
3942
%%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
3958
%%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
3943
%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
3959
%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
3944
%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
3960
%%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
3961
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
3962
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
3945
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
3963
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
3946
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
3964
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
3947
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
3965
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
Lines 4035-4040 Link Here
4035
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
4053
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
4036
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
4054
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
4037
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
4055
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
4056
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
4038
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
4057
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
4039
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
4058
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
4040
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
4059
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
Lines 4094-4099 Link Here
4094
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
4113
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
4095
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
4114
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
4096
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
4115
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
4116
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
4117
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
4097
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
4118
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
4098
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
4119
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
4099
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
4120
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h

Return to bug 206813