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

Collapse All | Expand All

(-)Makefile (-20 / +33 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	emacs
4
PORTNAME=	emacs
5
PORTVERSION=	${EMACS_VER}
5
PORTVERSION=	${EMACS_VER}
6
PORTREVISION=	1
6
PORTEPOCH=	2
7
PORTEPOCH=	2
7
CATEGORIES=	editors ipv6
8
CATEGORIES=	editors ipv6
8
MASTER_SITES=	GNU_ALPHA/emacs/pretest
9
MASTER_SITES=	GNU_ALPHA/emacs/pretest
Lines 21-27 Link Here
21
22
22
EMACS_VER=	25.0.95
23
EMACS_VER=	25.0.95
23
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
24
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
25
USES=		cpe gmake makeinfo ncurses tar:xz
25
INFO_PATH=	${DATADIR_REL}/info
26
INFO_PATH=	${DATADIR_REL}/info
26
CPE_VENDOR=	gnu
27
CPE_VENDOR=	gnu
27
28
Lines 42-49 Link Here
42
	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
43
	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
43
	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
44
	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
44
45
45
OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB LTO MODULES SOURCES X11 XML
46
# CAIRO and LTO options break build, so disable them for now
46
47
48
OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML
49
47
OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
50
OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
48
OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
51
OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
49
OPTIONS_RADIO_SOUND=		ALSA OSS
52
OPTIONS_RADIO_SOUND=		ALSA OSS
Lines 50-61 Link Here
50
OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
53
OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
51
54
52
OPTIONS_GROUP=			GRAPHICS NEEDX11
55
OPTIONS_GROUP=			GRAPHICS NEEDX11
53
OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
56
OPTIONS_GROUP_GRAPHICS=		GIF JPEG MAGICK PNG SVG TIFF XPM
54
OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
57
OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
55
				XWIDGETS
58
				XWIDGETS
56
59
57
ACL_DESC=	Access control list support
60
ACL_DESC=	Access control list support
58
CAIRO_DESC=	Cairo library support         (experimental)
61
#CAIRO_DESC=	Cairo library support         (experimental) # BROKEN
59
FILENOTIFY_DESC=File notification support
62
FILENOTIFY_DESC=File notification support
60
GCONF_DESC=	GConf configuration support
63
GCONF_DESC=	GConf configuration support
61
GFILE_DESC=	File notification via gfile
64
GFILE_DESC=	File notification via gfile
Lines 63-74 Link Here
63
GSETTINGS_DESC=	GSettings support             (implies DBUS)
66
GSETTINGS_DESC=	GSettings support             (implies DBUS)
64
KQUEUE_DESC=	File notification via kqueue
67
KQUEUE_DESC=	File notification via kqueue
65
LLDB_DESC=	Enable LLDB support for GUD
68
LLDB_DESC=	Enable LLDB support for GUD
66
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
69
#LTO_DESC=	Enable link-time optimization (requires GCC 4.6+) # BROKEN
67
MAGICK_DESC=	ImageMagick support
70
MAGICK_DESC=	ImageMagick support
68
M17N_DESC=	M17N support for text-shaping
71
M17N_DESC=	M17N support for text-shaping (implies XFT)
69
MODULES_DESC=	Dynamic modules support
72
MODULES_DESC=	Dynamic modules support
70
NEEDX11_DESC=	Other X11-dependent (each implies X11)
73
NEEDX11_DESC=	Other X11-dependent (each implies X11)
71
OTF_DESC=	Opentype fonts support
74
OTF_DESC=	Opentype fonts support        (implies XFT)
72
SCROLLBARS_DESC=Toolkit scroll-bars
75
SCROLLBARS_DESC=Toolkit scroll-bars
73
SOURCES_DESC=	Install sources
76
SOURCES_DESC=	Install sources
74
X11_DESC=	X11 support                   (choose toolkit below)
77
X11_DESC=	X11 support                   (choose toolkit below)
Lines 78-84 Link Here
78
XIM_DESC=	X Input Method Support
81
XIM_DESC=	X Input Method Support
79
XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
82
XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
80
83
81
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG	\
84
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG LLDB	\
82
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
85
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
83
		TIFF X11 XFT XIM XML XPM
86
		TIFF X11 XFT XIM XML XPM
84
87
Lines 89-97 Link Here
89
ALSA_CONFIGURE_ON=	--with-sound=alsa
92
ALSA_CONFIGURE_ON=	--with-sound=alsa
90
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
93
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
91
94
92
CAIRO_USE=		GNOME=cairo
95
#CAIRO_USE=		GNOME=cairo
93
CAIRO_CONFIGURE_WITH=	cairo
96
#CAIRO_CONFIGURE_WITH=	cairo
94
CAIRO_IMPLIES=		X11
97
#CAIRO_IMPLIES=		X11
95
98
96
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
99
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
97
DBUS_CONFIGURE_WITH=	dbus
100
DBUS_CONFIGURE_WITH=	dbus
Lines 113-123 Link Here
113
GSETTINGS_CONFIGURE_WITH=gsettings
116
GSETTINGS_CONFIGURE_WITH=gsettings
114
GSETTINGS_IMPLIES=	DBUS X11
117
GSETTINGS_IMPLIES=	DBUS X11
115
118
116
GTK2_USE=		GNOME=gtk20
119
GTK2_USE=		GNOME=cairo,gtk20
120
GTK2_USES=		gettext
117
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
121
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
118
GTK2_IMPLIES=		X11
122
GTK2_IMPLIES=		X11
123
GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
124
			libfontconfig.so:x11-fonts/fontconfig
119
125
120
GTK3_USE=		GNOME=gtk30
126
GTK3_USE=		GNOME=cairo,gtk30
127
GTK3_USES=		gettext
121
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
128
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
122
GTK3_IMPLIES=		X11
129
GTK3_IMPLIES=		X11
123
130
Lines 129-136 Link Here
129
136
130
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
137
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
131
138
132
LTO_CONFIGURE_ON=	--enable-link-time-optimization
139
#LTO_CONFIGURE_ON=	--enable-link-time-optimization
133
LTO_USE=		GCC=4.6+
140
#LTO_USE=		GCC=4.6+
134
141
135
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
142
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
136
M17N_CONFIGURE_WITH=	m17n-flt
143
M17N_CONFIGURE_WITH=	m17n-flt
Lines 145-156 Link Here
145
MOTIF_USES=		motif
152
MOTIF_USES=		motif
146
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
153
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
147
MOTIF_IMPLIES=		X11
154
MOTIF_IMPLIES=		X11
155
MOTIF_LIB_DEPENDS=	libXp.so:x11/libXp
148
156
149
OSS_CONFIGURE_ON=	--with-sound=oss
157
OSS_CONFIGURE_ON=	--with-sound=oss
150
158
151
OTF_LIB_DEPENDS=	libotf.so:print/libotf
159
OTF_LIB_DEPENDS=	libotf.so:print/libotf
152
OTF_CONFIGURE_WITH=	libotf
160
OTF_CONFIGURE_WITH=	libotf
153
OTF_IMPLIES=		XFT
161
OTF_IMPLIES=		X11 XFT
154
162
155
PNG_LIB_DEPENDS=	libpng.so:graphics/png
163
PNG_LIB_DEPENDS=	libpng.so:graphics/png
156
PNG_CONFIGURE_WITH=	png
164
PNG_CONFIGURE_WITH=	png
Lines 159-167 Link Here
159
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
167
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
160
SCROLLBARS_IMPLIES=	X11
168
SCROLLBARS_IMPLIES=	X11
161
169
162
SVG_USE=		GNOME=librsvg2
170
SVG_USE=		GNOME=cairo,librsvg2
163
SVG_CONFIGURE_WITH=	rsvg
171
SVG_CONFIGURE_WITH=	rsvg
164
SVG_IMPLIES=		X11
172
SVG_IMPLIES=		X11
173
SVG_USES=		gettext
165
174
166
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
175
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
167
TIFF_CONFIGURE_WITH=	tiff
176
TIFF_CONFIGURE_WITH=	tiff
Lines 169-175 Link Here
169
178
170
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
179
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
171
X11_CONFIGURE_ON=	--with-x
180
X11_CONFIGURE_ON=	--with-x
172
X11_USE=		XORG=x11
181
X11_USE=		XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt
173
X11_USES=		desktop-file-utils
182
X11_USES=		desktop-file-utils
174
X11_VARS=		installs_icons=yes
183
X11_VARS=		installs_icons=yes
175
X11_VARS_OFF=		without_x11=yes
184
X11_VARS_OFF=		without_x11=yes
Lines 182-191 Link Here
182
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
191
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
183
XAW3D_IMPLIES=		X11
192
XAW3D_IMPLIES=		X11
184
193
185
XFT_USE=		XORG=xft
194
XFT_USE=		XORG=xft,xrender
186
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
195
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
187
XFT_CONFIGURE_WITH=	xft
196
XFT_CONFIGURE_WITH=	xft
188
XFT_IMPLIES=		X11
197
XFT_IMPLIES=		X11
198
XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
199
			libfreetype.so:print/freetype2
189
200
190
XIM_CONFIGURE_WITH=	xim
201
XIM_CONFIGURE_WITH=	xim
191
XIM_IMPLIES=		X11
202
XIM_IMPLIES=		X11
Lines 197-204 Link Here
197
XPM_CONFIGURE_WITH=	xpm
208
XPM_CONFIGURE_WITH=	xpm
198
XPM_IMPLIES=		X11
209
XPM_IMPLIES=		X11
199
210
211
XWIDGETS_USE=		XORG=xcomposite
200
XWIDGETS_CONFIGURE_WITH=xwidgets
212
XWIDGETS_CONFIGURE_WITH=xwidgets
201
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
213
XWIDGETS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
214
			libwebkitgtk-3.0.so:www/webkit-gtk3
202
XWIDGETS_IMPLIES=	X11
215
XWIDGETS_IMPLIES=	X11
203
216
204
.include <bsd.port.options.mk>
217
.include <bsd.port.options.mk>

Return to bug 210291