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

Collapse All | Expand All

(-)editors/emacs-nox11/Makefile (-2 / +3 lines)
Lines 1-14 Link Here
1
# Created by: phoffman@proper.com
1
# Created by: phoffman@proper.com
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PKGNAMESUFFIX=	-nox11
4
PKGNAMESUFFIX=	-nox11
5
5
6
CONFLICTS_INSTALL=	emacs[0-9]*
7
6
OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
8
OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
7
		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
9
		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
8
		XAW XAW3D MOTIF
10
		XAW XAW3D MOTIF
9
11
OPTIONS_DEFAULT?=SOURCES GNUTLS XML
10
EMACS_NO_X11_SLAVE=	yes
11
12
12
MASTERDIR=	${.CURDIR}/../emacs
13
MASTERDIR=	${.CURDIR}/../emacs
13
14
14
.include "${MASTERDIR}/Makefile"
15
.include "${MASTERDIR}/Makefile"
(-)editors/emacs/Makefile (-81 / +42 lines)
Lines 10-44 MASTER_SITES= GNU Link Here
10
PKGNAMESUFFIX?= 24
10
PKGNAMESUFFIX?= 24
11
11
12
PATCH_SITE_SUBDIR+=	ashish
12
PATCH_SITE_SUBDIR+=	ashish
13
PATCH_DIST_STRIP=	-p1
13
PATCH_DIST_STRIP=	-p1
14
14
15
MAINTAINER=	ashish@FreeBSD.org
15
MAINTAINER=	ashish@FreeBSD.org
16
COMMENT=	GNU editing macros
16
COMMENT=	GNU editing macros
17
17
18
LICENSE=	GPLv3
18
LICENSE=	GPLv3+
19
LICENSE_FILE=	${WRKSRC}/COPYING
19
LICENSE_FILE=	${WRKSRC}/COPYING
20
20
21
CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
21
CONFLICTS_INSTALL?=	emacs-nox11-[0-9]*
22
CONFLICTS_INSTALL+=	\
23
		emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
22
		xemacs-[0-9]* xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
24
		xemacs-[0-9]* xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
23
		xemacs-devel-mule-[0-9]* \
25
		xemacs-devel-mule-[0-9]* \
24
		emacs-devel-[0-9]*
26
		emacs-devel-[0-9]*
25
27
28
BROKEN_ia64=	Emacs 24.X does not currently build on ia64
29
26
EMACS_VER=	24.5
30
EMACS_VER=	24.5
27
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
28
USES=		cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz
32
USES=		cpe gmake localbase makeinfo ncurses pkgconfig shebangfix tar:xz
29
CPPFLAGS+=	-I${LOCALBASE}/include
33
# Building with GCC 4.6+ requires it
30
LDFLAGS+=	-L${LOCALBASE}/lib
34
LDFLAGS+=	${ncurses_ARGS:Mport:C/.+/-ltinfo/}
31
INFO_PATH=	${DATADIR_REL}/info
35
INFO_PATH=	${DATADIR_REL}/info
32
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
33
CPE_VENDOR=	gnu
36
CPE_VENDOR=	gnu
34
37
35
SUB_FILES=	pkg-install
38
SUB_FILES=	pkg-install sources.el
36
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
39
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
40
SUB_LIST+=	EMACS_VER=${EMACS_VER} # sources.el
37
SHEBANG_FILES=	lib-src/grep-changelog
41
SHEBANG_FILES=	lib-src/grep-changelog
38
42
39
CONFIGURE_ARGS=	--localstatedir=/var
43
CONFIGURE_ARGS=	--localstatedir=/var
40
44
41
PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
45
PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
42
46
43
MAKE_ENV=	LC_ALL=C
47
MAKE_ENV=	LC_ALL=C
44
48
Lines 67-255 XIM_DESC= X Input Method Support Link Here
67
M17N_DESC=		M17N support for text-shaping
71
M17N_DESC=		M17N support for text-shaping
68
OTF_DESC=		Opentype fonts suport
72
OTF_DESC=		Opentype fonts suport
69
FILENOTIFY_DESC=	File notification support
73
FILENOTIFY_DESC=	File notification support
70
LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
74
LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
71
75
72
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
76
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
73
OPTIONS_SINGLE_SOUND=	ALSA OSS
77
OPTIONS_SINGLE_SOUND=	ALSA OSS
74
78
75
.if !defined(EMACS_NO_X11_SLAVE)
79
OPTIONS_DEFAULT?=	DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOURCES SVG TIFF \
76
OPTIONS_DEFAULT=DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \
80
			SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS OSS X11
77
		SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS OSS X11
78
CONFLICTS+=	emacs-nox11-[0-9]*
79
.else
80
OPTIONS_DEFAULT=SOURCES GNUTLS XML
81
CONFLICTS+=	emacs24-[0-9]*
82
.endif
83
81
84
OPTIONS_SUB=		SOURCES
82
OPTIONS_SUB=		SOURCES
85
83
86
CANNA_CONFIGURE_ON=	--with-canna \
84
CANNA_CONFIGURE_ON=	--with-canna \
87
			--with-canna-includes=${LOCALBASE}/include \
85
			--with-canna-includes=${LOCALBASE}/include \
88
			--with-canna-libraries=${LOCALBASE}/lib
86
			--with-canna-libraries=${LOCALBASE}/lib
89
CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
87
CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
90
CANNA_PATCHFILES=	emacs24.4canna-20141030.diff.gz
88
CANNA_PATCHFILES=	emacs24.4canna-20141030.diff.gz
91
CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
89
CANNA_LIB_DEPENDS=	libcanna.so:${PORTSDIR}/japanese/canna-lib
92
90
93
SOUND_CONFIGURE_OFF=	--with-sound=no
91
SOUND_CONFIGURE_OFF=	--with-sound=no
94
ALSA_CONFIGURE_ON=	--with-sound=alsa
92
ALSA_CONFIGURE_ON=	--with-sound=alsa
95
ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
93
ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
94
ALSA_IMPLIES=		SOUND
96
OSS_CONFIGURE_ON=	--with-sound=oss
95
OSS_CONFIGURE_ON=	--with-sound=oss
96
OSS_IMPLIES=		SOUND
97
97
98
DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
98
DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
99
DBUS_CONFIGURE_WITH=	dbus
99
DBUS_CONFIGURE_WITH=	dbus
100
100
101
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
101
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
102
GNUTLS_CONFIGURE_WITH=	gnutls
102
GNUTLS_CONFIGURE_WITH=	gnutls
103
103
104
XML_USE=		GNOME=libxml2
104
XML_USE=		GNOME=libxml2
105
XML_CONFIGURE_WITH=	xml2
105
XML_CONFIGURE_WITH=	xml2
106
106
107
SVG_USE=		GNOME=librsvg2
107
SVG_USE=		GNOME=librsvg2
108
SVG_CONFIGURE_WITH=	rsvg
108
SVG_CONFIGURE_WITH=	rsvg
109
SVG_IMPLIES=		X11
109
110
110
X11_CONFIGURE_WITH=	x
111
X11_CONFIGURE_WITH=	x
111
X11_USE=		XORG=x11
112
X11_USE=		XORG=x11
112
X11_USES=		desktop-file-utils
113
X11_USES=		desktop-file-utils
114
X11_VARS=		INSTALLS_ICONS=yes
113
115
114
GTK2_USE=		GNOME=gtk20
116
GTK2_USE=		GNOME=gtk20
115
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
117
GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
118
GTK2_IMPLIES=		X11
116
119
117
GTK3_USE=		GNOME=gtk30
120
GTK3_USE=		GNOME=gtk30
118
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
121
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
122
GTK3_IMPLIES=		X11
119
123
120
XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
124
XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
121
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
125
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
126
XAW3D_IMPLIES=		X11
122
127
123
XAW_USE=		XORG=xaw
128
XAW_USE=		XORG=xaw
124
XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
129
XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
130
XAW_IMPLIES=		X11
125
131
126
MOTIF_USES=		motif
132
MOTIF_USES=		motif
127
MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
133
MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
134
MOTIF_IMPLIES=		X11
128
135
129
SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
136
SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
137
SCROLLBARS_IMPLIES=	X11
130
138
131
JPEG_USES=		jpeg
139
JPEG_USES=		jpeg
132
JPEG_CONFIGURE_WITH=	jpeg
140
JPEG_CONFIGURE_WITH=	jpeg
141
JPEG_IMPLIES=		X11
133
142
134
TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
143
TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
135
TIFF_CONFIGURE_WITH=	tiff
144
TIFF_CONFIGURE_WITH=	tiff
145
TIFF_IMPLIES=		X11
136
146
137
GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
147
GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
138
GIF_CONFIGURE_WITH=	gif
148
GIF_CONFIGURE_WITH=	gif
149
GIF_IMPLIES=		X11
139
150
140
PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
151
PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
141
PNG_CONFIGURE_WITH=	png
152
PNG_CONFIGURE_WITH=	png
153
PNG_IMPLIES=		X11
142
154
143
XPM_USE=		XORG=xpm
155
XPM_USE=		XORG=xpm
144
XPM_CONFIGURE_WITH=	xpm
156
XPM_CONFIGURE_WITH=	xpm
157
XPM_IMPLIES=		X11
145
158
146
XFT_USE=		XORG=xft
159
XFT_USE=		XORG=xft
147
XFT_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
160
XFT_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
148
XFT_CONFIGURE_WITH=	xft
161
XFT_CONFIGURE_WITH=	xft
162
XFT_IMPLIES=		X11
149
163
150
M17N_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
164
M17N_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
151
M17N_CONFIGURE_WITH=	m17n-flt
165
M17N_CONFIGURE_WITH=	m17n-flt
166
M17N_IMPLIES=		XFT
152
167
153
OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
168
OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
154
OTF_CONFIGURE_WITH=	libotf
169
OTF_CONFIGURE_WITH=	libotf
170
OTF_IMPLIES=		XFT
155
171
156
MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
172
MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
157
MAGICK_CONFIGURE_WITH=	imagemagick
173
MAGICK_CONFIGURE_WITH=	imagemagick
174
MAGICK_IMPLIES=		X11
158
175
159
GSETTINGS_USE=		gnome=glib20
176
GSETTINGS_USE=		gnome=glib20
160
GSETTINGS_CONFIGURE_WITH=	gsettings
177
GSETTINGS_CONFIGURE_WITH=	gsettings
178
GSETTINGS_IMPLIES=	X11 DBUS
161
179
162
GCONF_USE=		gnome=gconf2
180
GCONF_USE=		gnome=gconf2
163
GCONF_CONFIGURE_WITH=	gconf
181
GCONF_CONFIGURE_WITH=	gconf
182
GCONF_IMPLIES=		X11
164
183
165
XIM_CONFIGURE_WITH=	xim
184
XIM_CONFIGURE_WITH=	xim
185
XIM_IMPLIES=		X11
166
186
167
LTO_CONFIGURE_ON=	--enable-link-time-optimization
187
LTO_CONFIGURE_ON=	--enable-link-time-optimization
168
LTO_USE=		GCC=4.6+
188
LTO_USE=		GCC=4.6+
169
189
170
ACL_CONFIGURE_OFF=	--disable-acl
190
ACL_CONFIGURE_OFF=	--disable-acl
171
191
172
FILENOTIFY_CONFIGURE_ON=	--with-file-notification=gfile
192
FILENOTIFY_CONFIGURE_ON=	--with-file-notification=gfile
173
FILENOTIFY_CONFIGURE_OFF=	--without-file-notification
193
FILENOTIFY_CONFIGURE_OFF=	--without-file-notification
174
FILENOTIFY_USE=		GNOME=glib20
194
FILENOTIFY_USE=		GNOME=glib20
175
195
176
.include <bsd.port.options.mk>
196
post-patch-X11-off:
177
178
# clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment
179
# and %esi as frame pointer register
180
# http://llvm.org/bugs/show_bug.cgi?id=18171
181
# fixed in r263312 (11-CURRENT), and fixed in r263765 (10-STABLE)
182
.if ${ARCH} == "i386"
183
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)
184
USE_GCC=		any
185
.endif
186
.endif
187
188
DBUS_PTHREAD_LIBS=	${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
189
190
.if ${PORT_OPTIONS:MX11}
191
192
INSTALLS_ICONS=	yes
193
194
.if !${PORT_OPTIONS:MXFT}
195
.if ${PORT_OPTIONS:MM17N}
196
IGNORE=	m17n support for text-shaping requires Xft. Please run 'make config'
197
.elif ${PORT_OPTIONS:MOTF}
198
IGNORE=	opentype fonts support requires Xft. Please run 'make config'
199
.endif
200
.endif
201
202
.else
203
204
.for OPT in SVG GTK2 GTK3 XAW3D XAW MOTIF SCROLLBARS JPEG TIFF GIF PNG XPM XFT M17N MAGICK GCONF GSETTINGS XIM
205
.if ${PORT_OPTIONS:M${OPT}}
206
IGNORE=	option ${OPT} requires requires X11 option
207
.endif
208
.endfor
209
210
.endif
211
212
.if !${PORT_OPTIONS:MDBUS}
213
.if ${PORT_OPTIONS:MGSETTINGS}
214
IGNORE=	support for GSettings requires DBUS. Please run 'make config'
215
.endif
216
.endif
217
218
.include <bsd.port.pre.mk>
219
220
# Building with GCC 4.6+ requires it
221
.if ${ncurses_ARGS} == "port"
222
LDFLAGS+=	-ltinfo
223
.endif
224
225
.if ${ARCH} == "ia64"
226
BROKEN=	Emacs 24.X does not currently build on ia64
227
.endif
228
229
post-patch:
230
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
231
.if empty(PORT_OPTIONS:MX11)
232
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
197
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
233
.endif
234
235
post-configure:
236
	@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
237
	 ${WRKSRC}/src/Makefile
238
198
239
post-install:
199
post-install:
240
	@${RM} -rf ${STAGEDIR}/var/games/emacs
200
	@${RM} -rf ${STAGEDIR}/var/games/emacs
241
.if ${PORT_OPTIONS:MSOURCES}
201
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
202
203
post-install-SOURCES-on:
242
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
204
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
243
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
205
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
244
	${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
206
	${INSTALL_DATA} ${WRKDIR}/sources.el \
245
.endif
207
		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
246
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
247
208
248
.if !defined(WITHOUT_X11)
209
.if !defined(WITHOUT_X11)
249
pre-everything::
210
pre-everything::
250
	@${ECHO_MSG}
211
	@${ECHO_MSG}
251
	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
212
	@${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
252
	@${ECHO_MSG}
213
	@${ECHO_MSG}
253
.endif
214
.endif
254
215
255
.include <bsd.port.post.mk>
216
.include <bsd.port.mk>
(-)editors/emacs/files/patch-sources.el (-7 lines)
Removed Link Here
1
--- /dev/null
2
+++ sources.el
3
@@ -0,0 +1,4 @@
4
+;;; Path to Emacs C Sources.
5
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
6
+  (setq find-function-C-source-directory
7
+        "%%DATADIR%%/%%EMACS_VER%%/src"))
(-)editors/emacs/files/sources.el.in (+4 lines)
Added Link Here
1
;;; Path to Emacs C Sources.
2
(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
3
  (setq find-function-C-source-directory
4
        "%%DATADIR%%/%%EMACS_VER%%/src"))

Return to bug 208217