Attachment #164751 for bug #205656

View | Details | Raw Unified | Return to bug 205656
Collapse All | Expand All




LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_FreeBSD_9=does not build
BROKEN_sparc64=	fails to compile at bootstrap phase
BROKEN_ia64=	Emacs 24.X does not currently build on ia64

CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]*              \
		emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]*           \
		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*

USE_GITHUB=	yes
GH_ACCOUNT=	emacs-mirror
GH_TAGNAME=	ff5f37e

EMACS_VER=	25.0.50
EMACS_REV=	20151227
GNU_CONFIGURE=	yes
USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz
CPPFLAGS+=	-I${LOCALBASE}/include

WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
CPE_VENDOR=	gnu

SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
		${CONFIGURE_TARGET}

CONFIGURE_ARGS=	--localstatedir=/var --with-gameuser=games:games



MAKE_ENV=	LC_ALL=C

INFO=		ada-mode auth autotype bovine calc ccmode cl dbus     \
		dired-x ebrowse ede ediff edt efaq eieio eintr elisp  \
		emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \
		eww flymake forms gnus htmlfontify idlwave ido info   \
		mairix-el message mh-e newsticker nxml-mode           \
		octave-mode org pcl-cvs pgg rcirc reftex remember     \
		sasl sc semantic ses sieve smtpmail speedbar srecode  \
		todo-mode tramp url vhdl-mode vip viper widget wisent \
		woman

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

OPTIONS_SINGLE=	X11 SOUND

ACL_DESC=	ACL support
GSETTINGS_DESC= GSettings support
SCROLLBARS_DESC=Toolkit scroll-bars
SOUND_DESC=	Sound support
SOURCES_DESC=	Install sources

OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
OPTIONS_SINGLE_SOUND=	ALSA OSS

OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2   \
		JPEG M17N MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES \
		SVG TIFF X11 XFT XIM XML XPM

OPTIONS_SUB=	YES

LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el


X11_USES=		desktop-file-utils

GTK2_USE=		GNOME=gtk20
GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2

GTK3_USE=		GNOME=gtk30
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3

MOTIF_USES=		motif
MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif

SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars

SYNC_INPUT_CONFIGURE_WITH=sync-input

JPEG_USES=		jpeg
JPEG_CONFIGURE_WITH=	jpeg

OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
OTF_CONFIGURE_WITH=	libotf

MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
MAGICK_CONFIGURE_WITH=	imagemagick

GSETTINGS_USE=		gnome=glib20
GSETTINGS_CONFIGURE_WITH=gsettings

GCONF_USE=		gnome=gconf2
GCONF_CONFIGURE_WITH=	gconf

ACL_CONFIGURE_OFF=	--disable-acl

FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
FILENOTIFY_CONFIGURE_OFF=--without-file-notification
FILENOTIFY_USE=		GNOME=glib20

CAIRO_USE=		GNOME=cairo


.include <bsd.port.options.mk>

# clang is broken on i386 platform in -O2, due to use of alloca, and
# stack realignment and %esi as frame pointer register
# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
# (11-CURRENT), and fixed in r263765 (10-STABLE)
.if ${ARCH} == "i386"
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 &&           \
${OSVERSION} < 1100015)
USE_GCC=	any
.endif
.endif

DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}

.if ${PORT_OPTIONS:MX11}
INSTALLS_ICONS=	yes
.if !${PORT_OPTIONS:MXFT}
.if ${PORT_OPTIONS:MM17N}
IGNORE=		m17n requires Xft. Please run 'make config'
.elif ${PORT_OPTIONS:MOTF}
IGNORE=		Opentype fonts require Xft. Please run 'make config'
.endif
.endif
.else
.for OPT in 	GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF  \
		PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
.if ${PORT_OPTIONS:M${OPT}}
IGNORE=		option ${OPT} requires X11 option
.endif


.if !${PORT_OPTIONS:MDBUS}
.if ${PORT_OPTIONS:MGSETTINGS}
IGNORE=		GSettings requires DBUS. Please run 'make config'
.endif
.endif



post-patch:
	@${RM} -f ${WRKSRC}/info/*
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e      \
	"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
.if empty(PORT_OPTIONS:MX11)
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/'        \
	${WRKSRC}/etc/emacs.desktop
.endif

post-configure:
	@${REINPLACE_CMD} -e \
	"s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
	${WRKSRC}/src/Makefile

pre-configure:
	@cd ${WRKSRC} && ./autogen.sh


post-install:
.if ${PORT_OPTIONS:MSOURCES}
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch]                          \
	${STAGEDIR}${DATADIR}/${EMACS_VER}/src
	${INSTALL_DATA} ${WRKSRC}/sources.el                          \
	${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name      \
	'*.gz' -exec ${GUNZIP_CMD} '{}' \;

.if !defined(WITHOUT_X11)
pre-everything::
	@${ECHO_MSG}
	@${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
	@${ECHO_MSG}
.endif


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 432b7359f5c798c4294d17661071e20dc4d8b6e7058105ab20a431619712ae77	1	SHA256 (emacs-mirror-emacs-25.0.50.20151227-ff5f37e_GH0.tar.xz) = 0462b156c200c3f25353bb21e1d778a8788e0383df6ae6acf717118dffd48665
2	SIZE (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 37709547	2	SIZE (emacs-mirror-emacs-25.0.50.20151227-ff5f37e_GH0.tar.xz) = 37739117




%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz

%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz

Return to bug 205656

Lines 14-34 Link Here

(-)Makefile (-53 / +56 lines)
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	BROKEN_FreeBSD_9= does not build	17	BROKEN_FreeBSD_9=does not build
18	BROKEN_sparc64= fails to compile at bootstrap phase	18	BROKEN_sparc64= fails to compile at bootstrap phase
19	BROKEN_ia64= Emacs 24.X does not currently build on ia64	19	BROKEN_ia64= Emacs 24.X does not currently build on ia64
20		20
21	CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \	21	CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* \
22	emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \	22	emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]* \
23	xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \	23	xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
24	emacs-nox11-[0-9]*	24	xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
25		25
26	USE_GITHUB= yes	26	USE_GITHUB= yes
27	GH_ACCOUNT= emacs-mirror	27	GH_ACCOUNT= emacs-mirror
28	GH_TAGNAME= af40b76	28	GH_TAGNAME= ff5f37e
29		29
30	EMACS_VER= 25.0.50	30	EMACS_VER= 25.0.50
31	EMACS_REV= 20151126	31	EMACS_REV= 20151227
32	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
33	USES= autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz	33	USES= autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz
34	CPPFLAGS+= -I${LOCALBASE}/include	34	CPPFLAGS+= -I${LOCALBASE}/include
Lines 37-43 Link Here
37	WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}	37	WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
38	CPE_VENDOR= gnu	38	CPE_VENDOR= gnu
39		39
40	SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}	40	SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
		41	${CONFIGURE_TARGET}
41		42
42	CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games	43	CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games
43		44
Lines 45-65 Link Here
45		46
46	MAKE_ENV= LC_ALL=C	47	MAKE_ENV= LC_ALL=C
47		48
48	INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \	49	INFO= ada-mode auth autotype bovine calc ccmode cl dbus \
49	ebrowse ede ediff edt efaq eieio eintr elisp emacs \	50	dired-x ebrowse ede ediff edt efaq eieio eintr elisp \
50	emacs-gnutls emacs-mime epa erc ert eshell eudc eww flymake \	51	emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \
51	forms gnus htmlfontify idlwave ido info mairix-el message mh-e \	52	eww flymake forms gnus htmlfontify idlwave ido info \
52	newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex \	53	mairix-el message mh-e newsticker nxml-mode \
53	remember sasl sc semantic ses sieve smtpmail speedbar srecode \	54	octave-mode org pcl-cvs pgg rcirc reftex remember \
54	todo-mode tramp url vhdl-mode vip viper widget wisent woman	55	sasl sc semantic ses sieve smtpmail speedbar srecode \
		56	todo-mode tramp url vhdl-mode vip viper widget wisent \
		57	woman
55		58
56	OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \	59	OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND \
57	XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO	60	SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK \
		61	GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO
58		62
59	OPTIONS_SINGLE= X11 SOUND	63	OPTIONS_SINGLE= X11 SOUND
60		64
61	ACL_DESC= ACL support	65	ACL_DESC= ACL support
62	GSETTINGS_DESC= GSettings support	66	GSETTINGS_DESC= GSettings support
63	SCROLLBARS_DESC=Toolkit scroll-bars	67	SCROLLBARS_DESC=Toolkit scroll-bars
64	SOUND_DESC= Sound support	68	SOUND_DESC= Sound support
65	SOURCES_DESC= Install sources	69	SOURCES_DESC= Install sources
Lines 75-85 Link Here
75	OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF	79	OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF
76	OPTIONS_SINGLE_SOUND= ALSA OSS	80	OPTIONS_SINGLE_SOUND= ALSA OSS
77		81
78	OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 JPEG M17N \	82	OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 \
79	MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES SVG TIFF X11 XFT XIM \	83	JPEG M17N MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES \
80	XML XPM	84	SVG TIFF X11 XFT XIM XML XPM
81		85
82	OPTIONS_SUB= YES	86	OPTIONS_SUB= YES
83		87
84	LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el	88	LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
85		89
Lines 105-111 Link Here
105	X11_USES= desktop-file-utils	109	X11_USES= desktop-file-utils
106		110
107	GTK2_USE= GNOME=gtk20	111	GTK2_USE= GNOME=gtk20
108	GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2	112	GTK2_CONFIGURE_ON= -with-x-toolkit=gtk2
109		113
110	GTK3_USE= GNOME=gtk30	114	GTK3_USE= GNOME=gtk30
111	GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3	115	GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
Lines 119-127 Link Here
119	MOTIF_USES= motif	123	MOTIF_USES= motif
120	MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif	124	MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif
121		125
122	SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars	126	SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
123		127
124	SYNC_INPUT_CONFIGURE_WITH= sync-input	128	SYNC_INPUT_CONFIGURE_WITH=sync-input
125		129
126	JPEG_USES= jpeg	130	JPEG_USES= jpeg
127	JPEG_CONFIGURE_WITH= jpeg	131	JPEG_CONFIGURE_WITH= jpeg
Lines 148-158 Link Here
148	OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf	152	OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf
149	OTF_CONFIGURE_WITH= libotf	153	OTF_CONFIGURE_WITH= libotf
150		154
151	MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick	155	MAGICK_LIB_DEPENDS=libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
152	MAGICK_CONFIGURE_WITH= imagemagick	156	MAGICK_CONFIGURE_WITH= imagemagick
153		157
154	GSETTINGS_USE= gnome=glib20	158	GSETTINGS_USE= gnome=glib20
155	GSETTINGS_CONFIGURE_WITH= gsettings	159	GSETTINGS_CONFIGURE_WITH=gsettings
156		160
157	GCONF_USE= gnome=gconf2	161	GCONF_USE= gnome=gconf2
158	GCONF_CONFIGURE_WITH= gconf	162	GCONF_CONFIGURE_WITH= gconf
Lines 165-171 Link Here
165	ACL_CONFIGURE_OFF= --disable-acl	169	ACL_CONFIGURE_OFF= --disable-acl
166		170
167	FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile	171	FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
168	FILENOTIFY_CONFIGURE_OFF= --without-file-notification	172	FILENOTIFY_CONFIGURE_OFF=--without-file-notification
169	FILENOTIFY_USE= GNOME=glib20	173	FILENOTIFY_USE= GNOME=glib20
170		174
171	CAIRO_USE= GNOME=cairo	175	CAIRO_USE= GNOME=cairo
Lines 173-202 Link Here
173		177
174	.include <bsd.port.options.mk>	178	.include <bsd.port.options.mk>
175		179
176	# clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment	180	# clang is broken on i386 platform in -O2, due to use of alloca, and
177	# and %esi as frame pointer register	181	# stack realignment and %esi as frame pointer register
178	# http://llvm.org/bugs/show_bug.cgi?id=18171	182	# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
179	# fixed in r263312 (11-CURRENT), and fixed in r263765 (10-STABLE)	183	# (11-CURRENT), and fixed in r263765 (10-STABLE)
180	.if ${ARCH} == "i386"	184	.if ${ARCH} == "i386"
181	.if (${OSVERSION} < 1000706) \|\| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)	185	.if (${OSVERSION} < 1000706) \|\| (${OSVERSION} >= 1100000 && \
182	USE_GCC= any	186	${OSVERSION} < 1100015)
		187	USE_GCC= any
183	.endif	188	.endif
184	.endif	189	.endif
185		190
186	DBUS_PTHREAD_LIBS= ${CC} -dumpspecs \| ${GREP} -m 1 pthread: \| ${SED} -e 's\|^.%{\!pg: %{pthread:\|\|' -e 's\|}.$$\|\|' \|\| ${TRUE}
187
188	.if ${PORT_OPTIONS:MX11}	191	.if ${PORT_OPTIONS:MX11}
189	INSTALLS_ICONS= yes	192	INSTALLS_ICONS= yes
190	.if !${PORT_OPTIONS:MXFT}	193	.if !${PORT_OPTIONS:MXFT}
191	.if ${PORT_OPTIONS:MM17N}	194	.if ${PORT_OPTIONS:MM17N}
192	IGNORE= m17n support for text-shaping requires Xft. Please run 'make config'	195	IGNORE= m17n requires Xft. Please run 'make config'
193	.elif ${PORT_OPTIONS:MOTF}	196	.elif ${PORT_OPTIONS:MOTF}
194	IGNORE= opentype fonts support requires Xft. Please run 'make config'	197	IGNORE= Opentype fonts require Xft. Please run 'make config'
195	.endif	198	.endif
196	.endif	199	.endif
197	.else	200	.else
198	.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF PNG \	201	.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF \
199	SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM	202	PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
200	.if ${PORT_OPTIONS:M${OPT}}	203	.if ${PORT_OPTIONS:M${OPT}}
201	IGNORE= option ${OPT} requires X11 option	204	IGNORE= option ${OPT} requires X11 option
202	.endif	205	.endif
Lines 205-211 Link Here
205		208
206	.if !${PORT_OPTIONS:MDBUS}	209	.if !${PORT_OPTIONS:MDBUS}
207	.if ${PORT_OPTIONS:MGSETTINGS}	210	.if ${PORT_OPTIONS:MGSETTINGS}
208	IGNORE= support for GSettings requires DBUS. Please run 'make config'	211	IGNORE= GSettings requires DBUS. Please run 'make config'
209	.endif	212	.endif
210	.endif	213	.endif
211		214
Lines 218-233 Link Here
218		221
219	post-patch:	222	post-patch:
220	@${RM} -f ${WRKSRC}/info/*	223	@${RM} -f ${WRKSRC}/info/*
221	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el	224	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
		225	"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
222	.if empty(PORT_OPTIONS:MX11)	226	.if empty(PORT_OPTIONS:MX11)
223	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop	227	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
		228	${WRKSRC}/etc/emacs.desktop
224	.endif	229	.endif
225		230
226	post-configure:
227	@${REINPLACE_CMD} -e \
228	"s/^\(DBUS_LIBS.\)-pthread\(.\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
229	${WRKSRC}/src/Makefile
230
231	pre-configure:	231	pre-configure:
232	@cd ${WRKSRC} && ./autogen.sh	232	@cd ${WRKSRC} && ./autogen.sh
233		233
Lines 234-248 Link Here
234	post-install:	234	post-install:
235	.if ${PORT_OPTIONS:MSOURCES}	235	.if ${PORT_OPTIONS:MSOURCES}
236	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src	236	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
237	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src	237	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
238	${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el	238	${STAGEDIR}${DATADIR}/${EMACS_VER}/src
		239	${INSTALL_DATA} ${WRKSRC}/sources.el \
		240	${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
239	.endif	241	.endif
240	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;	242	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
		243	'*.gz' -exec ${GUNZIP_CMD} '{}' \;
241		244
242	.if !defined(WITHOUT_X11)	245	.if !defined(WITHOUT_X11)
243	pre-everything::	246	pre-everything::
244	@${ECHO_MSG}	247	@${ECHO_MSG}
245	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."	248	@${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
246	@${ECHO_MSG}	249	@${ECHO_MSG}
247	.endif	250	.endif
248		251

Lines 2754-2761 Link Here

(-)pkg-plist (-4 / +4 lines)
2754	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc	2754	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
2755	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz	2755	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
2756	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc	2756	%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
2757	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
2758	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
2759	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz	2757	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
2760	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc	2758	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
2761	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz	2759	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
Lines 2766-2777 Link Here
2766	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc	2764	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
2767	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz	2765	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
2768	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc	2766	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
		2767	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
		2768	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
2769	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz	2769	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
2770	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc	2770	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
2771	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz	2771	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
2772	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc	2772	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc
2773	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.el.gz
2774	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.elc
2775	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz	2773	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz
2776	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc	2774	%%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc
2777	%%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz	2775	%%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz
Lines 2953-2958 Link Here
2953	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc	2951	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc
2954	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz	2952	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz
2955	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.elc	2953	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.elc
		2954	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.el.gz
		2955	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
2956	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz	2956	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
2957	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc	2957	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
2958	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz	2958	%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz