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

Collapse All | Expand All

(-)emacs/Makefile (-22 / +15 lines)
Lines 27-34 Link Here
27
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
28
USE_GMAKE=	yes
28
USE_GMAKE=	yes
29
USE_BZIP2=	yes
29
USE_BZIP2=	yes
30
30
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
31
USE_GETTEXT=	yes
32
31
33
LICENSE=	GPLv3
32
LICENSE=	GPLv3
34
LICENSE_FILE=	${WRKSRC}/COPYING
33
LICENSE_FILE=	${WRKSRC}/COPYING
Lines 48-72 Link Here
48
47
49
OPTIONS=	DBUS	"DBus support"			ON \
48
OPTIONS=	DBUS	"DBus support"			ON \
50
		GCONF	"GConf support"			ON \
49
		GCONF	"GConf support"			ON \
51
		GIF	"GIF support"			ON \
50
		GIF	"GIF Images support"		ON \
52
		GTK2	"GTK+ support"			ON \
51
		JPEG	"JPEG images support"		ON \
53
		JPEG	"JPEG support"			ON \
54
		M17N	"M17N support for text-shaping"	ON \
52
		M17N	"M17N support for text-shaping"	ON \
55
		MOTIF	"Motif support"			OFF \
53
		MOTIF	"Use Motif widgets"		OFF \
56
		OTF	"Opentype Font"			ON \
54
		OTF	"Opentype Font Support"		ON \
57
		PNG	"PNG support"			ON \
55
		PNG	"PNG images support"		ON \
58
		SOUND	"Sound support"			ON \
56
		SOUND	"Sound support"			ON \
59
		SOURCES	"Install source code"		ON \
57
		SOURCES	"Install source code"		ON \
60
		SVG	"SVG support"			ON \
58
		SVG	"SVG images support"		ON \
61
		TIFF	"TIFF support"			ON \
59
		TIFF	"TIFF images support"		ON \
62
		X11	"X11 support"			ON \
60
		XAW	"Use Athena widgets"		OFF \
63
		XAW	"XAW support"			OFF \
61
		XAW3D	"Use Athena3D widgets"		OFF \
64
		XAW3D	"XAW3D support"			OFF \
65
		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
62
		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
66
		SCROLLBARS	"Without toolkit scroll-bars"			ON \
63
		SCROLLBARS	"Without toolkit scroll-bars"			ON \
67
		XFT	"Xft support"			ON \
64
		XFT	"Freetype fonts support"	ON \
68
		XIM	"XIM support"			ON \
65
		XIM	"X Input Method support"	ON \
69
		XPM	"XPM support"			ON
66
		XPM	"XPM images support"		ON
70
67
71
.include <bsd.port.options.mk>
68
.include <bsd.port.options.mk>
72
69
Lines 171-177 Link Here
171
.if !defined(WITHOUT_XFT)
168
.if !defined(WITHOUT_XFT)
172
LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
169
LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
173
.endif
170
.endif
174
CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib -lintl"
175
.endif
171
.endif
176
172
177
.if defined(WITHOUT_OTF)
173
.if defined(WITHOUT_OTF)
Lines 197-208 Link Here
197
.if defined(WITHOUT_DBUS)
193
.if defined(WITHOUT_DBUS)
198
CONFIGURE_ARGS+=	--without-dbus
194
CONFIGURE_ARGS+=	--without-dbus
199
.else
195
.else
200
LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus \
196
LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
201
		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
202
.endif
197
.endif
203
198
204
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
205
206
.include <bsd.port.pre.mk>
199
.include <bsd.port.pre.mk>
207
200
208
.if defined(WITHOUT_SOURCES)
201
.if defined(WITHOUT_SOURCES)
Lines 216-222 Link Here
216
.endif
209
.endif
217
210
218
.if ${OSVERSION} < 700000 && defined(WITHOUT_X11) && defined(WITH_DBUS)
211
.if ${OSVERSION} < 700000 && defined(WITHOUT_X11) && defined(WITH_DBUS)
219
BROKEN= Does not currently build with dbus support but without X11
212
BROKEN=	Does not currently build with dbus support but without X11
220
.endif
213
.endif
221
214
222
post-patch:
215
post-patch:

Return to bug 147103