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

Collapse All | Expand All

(-)Makefile (-136 / +131 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	emacs
4
PORTNAME=	emacs
5
PORTVERSION=	${EMACS_VER}
5
PORTVERSION=	${EMACS_VER}
6
PORTREVISION=	1
7
PORTEPOCH=	2
6
PORTEPOCH=	2
8
CATEGORIES=	editors ipv6
7
CATEGORIES=	editors ipv6
9
MASTER_SITES=	GNU_ALPHA/emacs/pretest
8
MASTER_SITES=	GNU_ALPHA/emacs/pretest
Lines 15-29 Link Here
15
LICENSE=	GPLv3
14
LICENSE=	GPLv3
16
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
17
16
18
BROKEN_sparc64=	fails to compile at bootstrap phase
17
BROKEN_sparc64=	Emacs does not currently build on sparc64
19
BROKEN_ia64=	Emacs 24.X does not currently build on ia64
18
BROKEN_ia64=	Emacs does not currently build on ia64
20
19
21
CONFLICTS=	emacs-19.* emacs21-[0-9]* emacs22-[0-9]*              \
20
CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
22
		emacs23-[0-9]* emacs24-[0-9]* xemacs-[0-9]*           \
23
		xemacs-devel-[0-9]* xemacs-mule-[0-9]*                \
24
		xemacs-devel-mule-[0-9]* emacs-nox11-[0-9]*
25
21
26
EMACS_VER=	25.0.92
22
EMACS_VER=	25.0.93
27
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
28
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
24
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
29
INFO_PATH=	${DATADIR_REL}/info
25
INFO_PATH=	${DATADIR_REL}/info
Lines 32-107 Link Here
32
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
28
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
33
		${CONFIGURE_TARGET}
29
		${CONFIGURE_TARGET}
34
30
35
CONFIGURE_ARGS=	--localstatedir=/var --with-gameuser=games:games
31
CONFIGURE_ARGS=	--localstatedir=/var \
32
		--with-gameuser=games:games \
36
33
37
PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
34
PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
38
35
39
MAKE_ENV=	LC_ALL=C
36
MAKE_ENV=	LC_ALL=C
40
37
41
INFO=		ada-mode auth autotype bovine calc ccmode cl dbus     \
38
INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede	\
42
		dired-x ebrowse ede ediff edt efaq eieio eintr elisp  \
39
	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc	\
43
		emacs emacs-gnutls emacs-mime epa erc ert eshell eudc \
40
	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info	\
44
		eww flymake forms gnus htmlfontify idlwave ido info   \
41
	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg	\
45
		mairix-el message mh-e newsticker nxml-mode           \
42
	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
46
		octave-mode org pcl-cvs pgg rcirc reftex remember     \
43
	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
47
		sasl sc semantic ses sieve smtpmail speedbar srecode  \
48
		todo-mode tramp url vhdl-mode vip viper widget wisent \
49
		woman
50
44
51
OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
45
OPTIONS_DEFINE=	ACL DBUS GNUTLS LLDB LTO MODULES SOURCES X11 XML
52
		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
53
		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS
54
46
55
OPTIONS_SINGLE=	X11 SOUND
47
OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
48
OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
49
OPTIONS_RADIO_SOUND=		ALSA OSS
50
OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
56
51
57
ACL_DESC=	ACL support
52
OPTIONS_GROUP=			GRAPHICS NEEDX11
58
GSETTINGS_DESC= GSettings support
53
OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
54
OPTIONS_GROUP_NEEDX11= 		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
55
				XWIDGETS
56
57
ACL_DESC=	Access control list support
58
CAIRO_DESC=	Cairo library support         (experimental)
59
FILENOTIFY_DESC=File notification support
60
GCONF_DESC=	GConf configuration support
61
GFILE_DESC=	File notification via gfile
62
GRAPHICS_DESC=	Graphics support (each implies X11)
63
GSETTINGS_DESC=	GSettings support             (implies DBUS)
64
KQUEUE_DESC=	File notification via kqueue
65
LLDB_DESC=	Enable LLDB support for GUD
66
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
67
MAGICK_DESC=	ImageMagick support
68
M17N_DESC=	M17N support for text-shaping
69
MODULES_DESC=	Dynamic modules support
70
NEEDX11_DESC=	Other X11-dependent (each implies X11)
71
OTF_DESC=	Opentype fonts support
59
SCROLLBARS_DESC=Toolkit scroll-bars
72
SCROLLBARS_DESC=Toolkit scroll-bars
60
SOUND_DESC=	Sound support
61
SOURCES_DESC=	Install sources
73
SOURCES_DESC=	Install sources
74
X11_DESC=	X11 support                   (choose toolkit below)
75
X11TOOLKIT_DESC=X11 toolkit (each implies X11)
76
XAW3D_DESC=	Athena3D widgets
62
XAW_DESC=	Athena widgets
77
XAW_DESC=	Athena widgets
63
XAW3D_DESC=	Athena3D widgets
64
XIM_DESC=	X Input Method Support
78
XIM_DESC=	X Input Method Support
65
M17N_DESC=	M17N support for text-shaping
79
XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
66
OTF_DESC=	Opentype fonts suport
67
FILENOTIFY_DESC=File notification support
68
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
69
LLDB_DESC=	Enable lldb support for GUD (from llvm.org)
70
MODULES_DESC=	Dynamic modules support
71
XWIDGETS_DESC=  Enable use of some GTK widgets in Emacs buffers
72
80
73
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
81
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG	\
74
OPTIONS_SINGLE_SOUND=	ALSA OSS
82
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
83
		TIFF X11 XFT XIM XML XPM
75
84
76
OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2   \
85
OPTIONS_SUB=		YES
77
		JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \
78
		SOURCES SVG TIFF X11 XFT XIM XML XPM
79
86
80
OPTIONS_SUB=	YES
87
ACL_CONFIGURE_ENABLE=	acl
81
88
82
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
83
84
SOUND_CONFIGURE_OFF=	--with-sound=no
85
ALSA_CONFIGURE_ON=	--with-sound=alsa
89
ALSA_CONFIGURE_ON=	--with-sound=alsa
86
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
90
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
87
OSS_CONFIGURE_ON=	--with-sound=oss
88
91
92
CAIRO_USE=		GNOME=cairo
93
CAIRO_CONFIGURE_WITH=	cairo
94
CAIRO_IMPLIES=		X11
95
89
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
96
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
90
DBUS_CONFIGURE_WITH=	dbus
97
DBUS_CONFIGURE_WITH=	dbus
91
98
99
GCONF_USE=		gnome=gconf2
100
GCONF_CONFIGURE_WITH=	gconf
101
GCONF_IMPLIES=		X11
102
103
GFILE_CONFIGURE_ON=	--with-file-notification=gfile
104
105
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
106
GIF_CONFIGURE_WITH=	gif
107
GIF_IMPLIES=		X11
108
92
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
109
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
93
GNUTLS_CONFIGURE_WITH=	gnutls
110
GNUTLS_CONFIGURE_WITH=	gnutls
94
111
95
XML_USE=		GNOME=libxml2
112
GSETTINGS_USE=		gnome=glib20
96
XML_CONFIGURE_WITH=	xml2
113
GSETTINGS_CONFIGURE_WITH=gsettings
114
GSETTINGS_IMPLIES=	DBUS X11
97
115
98
SVG_USE=		GNOME=librsvg2
99
SVG_CONFIGURE_WITH=	rsvg
100
101
X11_CONFIGURE_WITH=	x
102
X11_USE=		XORG=x11
103
X11_USES=		desktop-file-utils
104
105
GTK2_USE=		GNOME=gtk20
116
GTK2_USE=		GNOME=gtk20
106
GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
117
GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
107
118
Lines 108-178 Link Here
108
GTK3_USE=		GNOME=gtk30
119
GTK3_USE=		GNOME=gtk30
109
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
120
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
110
121
111
XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
122
JPEG_USES=		jpeg
112
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
123
JPEG_CONFIGURE_WITH=	jpeg
124
JPEG_IMPLIES=		X11
113
125
114
XAW_USE=		XORG=xaw
126
KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
115
XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
116
127
128
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
129
130
LTO_CONFIGURE_ON=	--enable-link-time-optimization
131
LTO_USE=		GCC=4.6+
132
133
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
134
M17N_CONFIGURE_WITH=	m17n-flt
135
M17N_IMPLIES=		XFT X11
136
137
MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
138
MAGICK_CONFIGURE_WITH=	imagemagick
139
MAGICK_IMPLIES=		X11
140
141
MODULES_CONFIGURE_WITH=	modules
142
117
MOTIF_USES=		motif
143
MOTIF_USES=		motif
118
MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
144
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
119
145
146
OSS_CONFIGURE_ON=	--with-sound=oss
147
148
OTF_LIB_DEPENDS=	libotf.so:print/libotf
149
OTF_CONFIGURE_WITH=	libotf
150
OTF_IMPLIES=		XFT
151
152
PNG_LIB_DEPENDS=	libpng.so:graphics/png
153
PNG_CONFIGURE_WITH=	png
154
PNG_IMPLIES=		X11
155
120
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
156
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
157
SCROLLBARS_IMPLIES=	X11
121
158
122
SYNC_INPUT_CONFIGURE_WITH=sync-input
159
SVG_USE=		GNOME=librsvg2
160
SVG_CONFIGURE_WITH=	rsvg
161
SVG_IMPLIES=		X11
123
162
124
JPEG_USES=		jpeg
125
JPEG_CONFIGURE_WITH=	jpeg
126
127
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
163
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
128
TIFF_CONFIGURE_WITH=	tiff
164
TIFF_CONFIGURE_WITH=	tiff
165
TIFF_IMPLIES=		X11
129
166
130
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
167
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
131
GIF_CONFIGURE_WITH=	gif
168
X11_CONFIGURE_ON=	--with-x
169
X11_USE=		XORG=x11
170
X11_USES=		desktop-file-utils
171
X11_VARS=		installs_icons=yes
172
X11_VARS_OFF=		without_x11=yes
132
173
133
PNG_LIB_DEPENDS+=	libpng.so:graphics/png
174
XAW_USE=		XORG=xaw
134
PNG_CONFIGURE_WITH=	png
175
XAW_CONFIGURE_ON=	--with-x-toolkit=athena --without-xaw3d
135
176
136
XPM_USE=		XORG=xpm
177
XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
137
XPM_CONFIGURE_WITH=	xpm
178
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
138
179
139
XFT_USE=		XORG=xft
180
XFT_USE=		XORG=xft
140
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
181
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
141
XFT_CONFIGURE_WITH=	xft
182
XFT_CONFIGURE_WITH=	xft
183
XFT_IMPLIES=		X11
142
184
143
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
144
M17N_CONFIGURE_WITH=	m17n-flt
145
146
OTF_LIB_DEPENDS=	libotf.so:print/libotf
147
OTF_CONFIGURE_WITH=	libotf
148
149
MAGICK_LIB_DEPENDS=libMagickCore-6.so:graphics/ImageMagick
150
MAGICK_CONFIGURE_WITH=	imagemagick
151
152
GSETTINGS_USE=		gnome=glib20
153
GSETTINGS_CONFIGURE_WITH=gsettings
154
155
GCONF_USE=		gnome=gconf2
156
GCONF_CONFIGURE_WITH=	gconf
157
158
XIM_CONFIGURE_WITH=	xim
185
XIM_CONFIGURE_WITH=	xim
186
XIM_IMPLIES=		X11
159
187
160
LTO_CONFIGURE_ON=	--enable-link-time-optimization
188
XML_USE=		GNOME=libxml2
161
LTO_USE=		GCC=4.6+
189
XML_CONFIGURE_WITH=	xml2
162
190
163
ACL_CONFIGURE_OFF=	--disable-acl
191
XPM_USE=		XORG=xpm
192
XPM_CONFIGURE_WITH=	xpm
193
XPM_IMPLIES=		X11
164
194
165
FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
166
FILENOTIFY_CONFIGURE_OFF=--without-file-notification
167
FILENOTIFY_USE=		GNOME=glib20
168
169
CAIRO_USE=		GNOME=cairo
170
CAIRO_CONFIGURE_ON=	--with-cairo
171
172
MODULES_CONFIGURE_ON=	--with-modules
173
174
XWIDGETS_CONFIGURE_ON=	--with-xwidgets
195
XWIDGETS_CONFIGURE_ON=	--with-xwidgets
175
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
196
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
197
XWIDGETS_IMPLIES=	X11
176
198
177
.include <bsd.port.options.mk>
199
.include <bsd.port.options.mk>
178
200
Lines 181-235 Link Here
181
# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
203
# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
182
# (11-CURRENT), and fixed in r263765 (10-STABLE)
204
# (11-CURRENT), and fixed in r263765 (10-STABLE)
183
.if ${ARCH} == "i386"
205
.if ${ARCH} == "i386"
184
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 &&           \
206
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && \
185
${OSVERSION} < 1100015)
207
${OSVERSION} < 1100015)
186
USE_GCC=	any
208
USE_GCC=any
187
.endif
209
.endif
188
.endif
210
.endif
189
211
190
.if ${PORT_OPTIONS:MX11}
212
.if ${PORT_OPTIONS:MX11}
191
INSTALLS_ICONS=	yes
213
.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \
192
.if !${PORT_OPTIONS:MXFT}
214
! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D}
193
.if ${PORT_OPTIONS:MM17N}
215
IGNORE=option X11 requires an X11 toolkit
194
IGNORE=		m17n requires Xft. Please run 'make config'
195
.elif ${PORT_OPTIONS:MOTF}
196
IGNORE=		support for Opentype fonts require Xft. Please run 'make config'
197
.endif
216
.endif
198
.endif
217
.endif
199
.else
200
.for OPT in 	GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF  \
201
		PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
202
.if ${PORT_OPTIONS:M${OPT}}
203
IGNORE=		option ${OPT} requires X11 option
204
.endif
205
.endfor
206
.endif
207
218
208
.if !${PORT_OPTIONS:MDBUS}
209
.if ${PORT_OPTIONS:MGSETTINGS}
210
IGNORE=		support for GSettings requires DBUS. Please run 'make config'
211
.endif
212
.endif
213
214
.if !${PORT_OPTIONS:MGTK3}
215
.if ${PORT_OPTIONS:MXWIDGETS}
216
IGNORE=		support for XWidgets requires GTK3. Please run 'make config'
217
.endif
218
.endif
219
220
.include <bsd.port.pre.mk>
219
.include <bsd.port.pre.mk>
221
220
222
# Building with GCC 4.6+ requires it
221
# Building with GCC 4.6+ requires it
223
.if ${ncurses_ARGS} == "port"
222
.if ${ncurses_ARGS} == "port"
224
LDFLAGS+=	-ltinfo
223
LDFLAGS+=-ltinfo
225
.endif
224
.endif
226
225
227
post-patch:
226
post-patch:
228
	@${RM} -f ${WRKSRC}/info/*
227
	@${RM} -f ${WRKSRC}/info/*
229
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e      \
228
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
230
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
229
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
231
.if empty(PORT_OPTIONS:MX11)
230
## stage-qa will give a warning, but don't pull in desktop-file-utils
232
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/'        \
231
## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
232
## dependencies
233
.if ! ${PORT_OPTIONS:MX11}
234
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
233
		${WRKSRC}/etc/emacs.desktop
235
		${WRKSRC}/etc/emacs.desktop
234
.endif
236
.endif
235
237
Lines 236-254 Link Here
236
post-install:
238
post-install:
237
.if ${PORT_OPTIONS:MSOURCES}
239
.if ${PORT_OPTIONS:MSOURCES}
238
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
240
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
239
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch]                          \
241
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
240
		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
242
		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
241
	${INSTALL_DATA} ${WRKSRC}/sources.el                          \
243
	${INSTALL_DATA} ${WRKSRC}/sources.el \
242
		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
244
		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
243
.endif
245
.endif
244
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name      \
246
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
245
		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
247
		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
246
248
247
.if !defined(WITHOUT_X11)
248
pre-everything::
249
	@${ECHO_MSG}
250
	@${ECHO_MSG} "====> Define WITHOUT_X11 to disable X11 support."
251
	@${ECHO_MSG}
252
.endif
253
254
.include <bsd.port.post.mk>
249
.include <bsd.port.post.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (emacs-25.0.92.tar.xz) = c29733959ae2c6a7c1d5f9465b4d06c93977cc1f3905313d992051a16590568e
1
SHA256 (emacs-25.0.93.tar.xz) = b39199a491ce53f8b8a5b74fe6f1f191257e424f3ba047b3098ff9218e1579f1
2
SIZE (emacs-25.0.92.tar.xz) = 42264752
2
SIZE (emacs-25.0.93.tar.xz) = 42515636
(-)pkg-plist (-9 / +1 lines)
Lines 1548-1554 Link Here
1548
%%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
1548
%%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
1549
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
1549
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
1550
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
1550
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
1551
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el
1552
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
1551
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
1553
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
1552
%%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
1554
%%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
1553
%%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
Lines 1658-1664 Link Here
1658
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
1657
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
1659
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
1658
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
1660
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
1659
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
1661
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-loaddefs.el
1662
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
1660
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
1663
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
1661
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
1664
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
1662
%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
Lines 2278-2284 Link Here
2278
%%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
2276
%%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
2279
%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
2277
%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
2280
%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
2278
%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
2281
%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
2282
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
2279
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
2283
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
2280
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
2284
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
2281
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
Lines 2285-2291 Link Here
2285
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
2282
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
2286
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
2283
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
2287
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
2284
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
2288
%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
2289
%%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
2285
%%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
2290
%%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
2286
%%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
2291
%%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
2287
%%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
Lines 2294-2299 Link Here
2294
%%DATADIR%%/%%EMACS_VER%%/lisp/ielm.elc
2290
%%DATADIR%%/%%EMACS_VER%%/lisp/ielm.elc
2295
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.el.gz
2291
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.el.gz
2296
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.elc
2292
%%DATADIR%%/%%EMACS_VER%%/lisp/iimage.elc
2293
@dir %%DATADIR%%/%%EMACS_VER%%/lisp/image
2297
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.el.gz
2294
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.el.gz
2298
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.elc
2295
%%DATADIR%%/%%EMACS_VER%%/lisp/image-dired.elc
2299
%%DATADIR%%/%%EMACS_VER%%/lisp/image-file.el.gz
2296
%%DATADIR%%/%%EMACS_VER%%/lisp/image-file.el.gz
Lines 2652-2658 Link Here
2652
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
2649
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
2653
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
2650
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
2654
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
2651
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
2655
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
2656
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
2652
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
2657
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
2653
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
2658
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
2654
%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
Lines 3064-3071 Link Here
3064
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
3060
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc
3065
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz
3061
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz
3066
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
3062
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
3067
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
3068
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
3069
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
3063
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
3070
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
3064
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
3071
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
3065
%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
Lines 3543-3549 Link Here
3543
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
3537
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
3544
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
3538
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
3545
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
3539
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
3546
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
3547
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
3540
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
3548
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
3541
%%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
3549
%%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
3542
%%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
Lines 3716-3722 Link Here
3716
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
3709
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
3717
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
3710
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
3718
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
3711
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
3719
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el
3720
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
3712
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
3721
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
3713
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
3722
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz
3714
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz

Return to bug 209054