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

Collapse All | Expand All

(-)Makefile (-22 / +30 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 42-48 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
OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML
46
47
47
OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
48
OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
48
OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
49
OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
Lines 55-61 Link Here
55
				XWIDGETS
56
				XWIDGETS
56
57
57
ACL_DESC=	Access control list support
58
ACL_DESC=	Access control list support
58
CAIRO_DESC=	Cairo library support         (experimental)
59
CAIRO_DESC=	Experimental Cairo support    (implies MAGICK, PNG, XFT)
59
FILENOTIFY_DESC=File notification support
60
FILENOTIFY_DESC=File notification support
60
GCONF_DESC=	GConf configuration support
61
GCONF_DESC=	GConf configuration support
61
GFILE_DESC=	File notification via gfile
62
GFILE_DESC=	File notification via gfile
Lines 63-77 Link Here
63
GSETTINGS_DESC=	GSettings support             (implies DBUS)
64
GSETTINGS_DESC=	GSettings support             (implies DBUS)
64
KQUEUE_DESC=	File notification via kqueue
65
KQUEUE_DESC=	File notification via kqueue
65
LLDB_DESC=	Enable LLDB support for GUD
66
LLDB_DESC=	Enable LLDB support for GUD
66
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
67
#LTO_DESC=	Enable link-time optimization
67
MAGICK_DESC=	ImageMagick support
68
MAGICK_DESC=	ImageMagick support
68
M17N_DESC=	M17N support for text-shaping
69
M17N_DESC=	M17N support for text-shaping (implies XFT)
69
MODULES_DESC=	Dynamic modules support
70
MODULES_DESC=	Dynamic modules support
70
NEEDX11_DESC=	Other X11-dependent (each implies X11)
71
NEEDX11_DESC=	Other X11-dependent (each implies X11)
71
OTF_DESC=	Opentype fonts support
72
OTF_DESC=	Opentype fonts support        (implies XFT)
72
SCROLLBARS_DESC=Toolkit scroll-bars
73
SCROLLBARS_DESC=Toolkit scroll-bars
73
SOURCES_DESC=	Install sources
74
SOURCES_DESC=	Install sources
74
X11_DESC=	X11 support                   (choose toolkit below)
75
X11_DESC=	X11 support
75
X11TOOLKIT_DESC=X11 toolkit (each implies X11)
76
X11TOOLKIT_DESC=X11 toolkit (each implies X11)
76
XAW3D_DESC=	Athena3D widgets
77
XAW3D_DESC=	Athena3D widgets
77
XAW_DESC=	Athena widgets
78
XAW_DESC=	Athena widgets
Lines 78-84 Link Here
78
XIM_DESC=	X Input Method Support
79
XIM_DESC=	X Input Method Support
79
XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
80
XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
80
81
81
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG	\
82
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG       \
82
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
83
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
83
		TIFF X11 XFT XIM XML XPM
84
		TIFF X11 XFT XIM XML XPM
84
85
Lines 91-102 Link Here
91
92
92
CAIRO_USE=		GNOME=cairo
93
CAIRO_USE=		GNOME=cairo
93
CAIRO_CONFIGURE_WITH=	cairo
94
CAIRO_CONFIGURE_WITH=	cairo
94
CAIRO_IMPLIES=		X11
95
CAIRO_IMPLIES=		MAGICK PNG X11 XFT
95
96
96
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
97
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
97
DBUS_CONFIGURE_WITH=	dbus
98
DBUS_CONFIGURE_WITH=	dbus
98
99
99
GCONF_USE=		gnome=gconf2
100
GCONF_USE=		GNOME=gconf2
100
GCONF_CONFIGURE_WITH=	gconf
101
GCONF_CONFIGURE_WITH=	gconf
101
GCONF_IMPLIES=		X11
102
GCONF_IMPLIES=		X11
102
103
Lines 109-123 Link Here
109
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
110
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
110
GNUTLS_CONFIGURE_WITH=	gnutls
111
GNUTLS_CONFIGURE_WITH=	gnutls
111
112
112
GSETTINGS_USE=		gnome=glib20
113
GSETTINGS_USE=		GNOME=glib20
113
GSETTINGS_CONFIGURE_WITH=gsettings
114
GSETTINGS_CONFIGURE_WITH=gsettings
114
GSETTINGS_IMPLIES=	DBUS X11
115
GSETTINGS_IMPLIES=	DBUS X11
115
116
116
GTK2_USE=		GNOME=gtk20
117
GTK2_USE=		GNOME=cairo,gtk20
118
GTK2_USES=		gettext
117
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
119
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
118
GTK2_IMPLIES=		X11
120
GTK2_IMPLIES=		X11
121
GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
122
			libfontconfig.so:x11-fonts/fontconfig
119
123
120
GTK3_USE=		GNOME=gtk30
124
GTK3_USE=		GNOME=cairo,gtk30
125
GTK3_USES=		gettext
121
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
126
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
122
GTK3_IMPLIES=		X11
127
GTK3_IMPLIES=		X11
123
128
Lines 129-136 Link Here
129
134
130
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
135
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
131
136
132
LTO_CONFIGURE_ON=	--enable-link-time-optimization
137
#LTO_CONFIGURE_ON=	--enable-link-time-optimization
133
LTO_USE=		GCC=4.6+
134
138
135
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
139
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
136
M17N_CONFIGURE_WITH=	m17n-flt
140
M17N_CONFIGURE_WITH=	m17n-flt
Lines 145-156 Link Here
145
MOTIF_USES=		motif
149
MOTIF_USES=		motif
146
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
150
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
147
MOTIF_IMPLIES=		X11
151
MOTIF_IMPLIES=		X11
152
MOTIF_LIB_DEPENDS=	libXp.so:x11/libXp
148
153
149
OSS_CONFIGURE_ON=	--with-sound=oss
154
OSS_CONFIGURE_ON=	--with-sound=oss
150
155
151
OTF_LIB_DEPENDS=	libotf.so:print/libotf
156
OTF_LIB_DEPENDS=	libotf.so:print/libotf
152
OTF_CONFIGURE_WITH=	libotf
157
OTF_CONFIGURE_WITH=	libotf
153
OTF_IMPLIES=		XFT
158
OTF_IMPLIES=		X11 XFT
154
159
155
PNG_LIB_DEPENDS=	libpng.so:graphics/png
160
PNG_LIB_DEPENDS=	libpng.so:graphics/png
156
PNG_CONFIGURE_WITH=	png
161
PNG_CONFIGURE_WITH=	png
Lines 159-167 Link Here
159
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
164
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
160
SCROLLBARS_IMPLIES=	X11
165
SCROLLBARS_IMPLIES=	X11
161
166
162
SVG_USE=		GNOME=librsvg2
167
SVG_USE=		GNOME=cairo,librsvg2
163
SVG_CONFIGURE_WITH=	rsvg
168
SVG_CONFIGURE_WITH=	rsvg
164
SVG_IMPLIES=		X11
169
SVG_IMPLIES=		X11
170
SVG_USES=		gettext
165
171
166
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
172
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
167
TIFF_CONFIGURE_WITH=	tiff
173
TIFF_CONFIGURE_WITH=	tiff
Lines 169-175 Link Here
169
175
170
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
176
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
171
X11_CONFIGURE_ON=	--with-x
177
X11_CONFIGURE_ON=	--with-x
172
X11_USE=		XORG=x11
178
X11_USE=		XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt
173
X11_USES=		desktop-file-utils
179
X11_USES=		desktop-file-utils
174
X11_VARS=		installs_icons=yes
180
X11_VARS=		installs_icons=yes
175
X11_VARS_OFF=		without_x11=yes
181
X11_VARS_OFF=		without_x11=yes
Lines 182-191 Link Here
182
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
188
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
183
XAW3D_IMPLIES=		X11
189
XAW3D_IMPLIES=		X11
184
190
185
XFT_USE=		XORG=xft
191
XFT_USE=		XORG=xft,xrender
186
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
192
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
187
XFT_CONFIGURE_WITH=	xft
193
XFT_CONFIGURE_WITH=	xft
188
XFT_IMPLIES=		X11
194
XFT_IMPLIES=		X11
195
XFT_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
196
			libfreetype.so:print/freetype2
189
197
190
XIM_CONFIGURE_WITH=	xim
198
XIM_CONFIGURE_WITH=	xim
191
XIM_IMPLIES=		X11
199
XIM_IMPLIES=		X11
Lines 197-204 Link Here
197
XPM_CONFIGURE_WITH=	xpm
205
XPM_CONFIGURE_WITH=	xpm
198
XPM_IMPLIES=		X11
206
XPM_IMPLIES=		X11
199
207
208
XWIDGETS_USE=		XORG=xcomposite
200
XWIDGETS_CONFIGURE_WITH=xwidgets
209
XWIDGETS_CONFIGURE_WITH=xwidgets
201
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
210
XWIDGETS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
211
			libwebkitgtk-3.0.so:www/webkit-gtk3
202
XWIDGETS_IMPLIES=	X11
212
XWIDGETS_IMPLIES=	X11
203
213
204
.include <bsd.port.options.mk>
214
.include <bsd.port.options.mk>
Lines 214-225 Link Here
214
.endif
224
.endif
215
.endif
225
.endif
216
226
217
.if ${PORT_OPTIONS:MX11}
218
.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \
227
.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \
219
! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D}
228
! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D}
220
IGNORE=option X11 requires an X11 toolkit
229
CONFIGURE_ARGS+=	--with-x-toolkit=no
221
.endif
230
.endif
222
.endif
223
231
224
.include <bsd.port.pre.mk>
232
.include <bsd.port.pre.mk>
225
233

Return to bug 210291