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

Collapse All | Expand All

(-)Makefile (-140 / +130 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
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 XWIDGETS
55
56
ACL_DESC=	Access control list support
57
CAIRO_DESC=	Cairo library support         (experimental)
58
FILENOTIFY_DESC=File notification support
59
GCONF_DESC=	GConf configuration support
60
GFILE_DESC=	File notification via gfile
61
GRAPHICS_DESC=	Graphics support (each implies X11)
62
GSETTINGS_DESC=	GSettings support             (implies DBUS)
63
KQUEUE_DESC=	File notification via kqueue
64
LLDB_DESC=	Enable LLDB support for GUD
65
LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
66
MAGICK_DESC=	ImageMagick support
67
M17N_DESC=	M17N support for text-shaping
68
MODULES_DESC=	Dynamic modules support
69
NEEDX11_DESC=	Other X11-dependent (each implies X11)
70
OTF_DESC=	Opentype fonts support
59
SCROLLBARS_DESC=Toolkit scroll-bars
71
SCROLLBARS_DESC=Toolkit scroll-bars
60
SOUND_DESC=	Sound support
61
SOURCES_DESC=	Install sources
72
SOURCES_DESC=	Install sources
73
X11_DESC=	X11 support                   (choose toolkit below)
74
X11TOOLKIT_DESC=X11 toolkit (each implies X11)
75
XAW3D_DESC=	Athena3D widgets
62
XAW_DESC=	Athena widgets
76
XAW_DESC=	Athena widgets
63
XAW3D_DESC=	Athena3D widgets
64
XIM_DESC=	X Input Method Support
77
XIM_DESC=	X Input Method Support
65
M17N_DESC=	M17N support for text-shaping
78
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
79
73
OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
80
OPTIONS_DEFAULT=ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2 JPEG	\
74
OPTIONS_SINGLE_SOUND=	ALSA OSS
81
		KQUEUE M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG	\
82
		TIFF X11 XFT XIM XML XPM
75
83
76
OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2   \
84
OPTIONS_SUB=		YES
77
		JPEG M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOUND \
78
		SOURCES SVG TIFF X11 XFT XIM XML XPM
79
85
80
OPTIONS_SUB=	YES
86
ACL_CONFIGURE_ENABLE=	acl
81
87
82
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
83
84
SOUND_CONFIGURE_OFF=	--with-sound=no
85
ALSA_CONFIGURE_ON=	--with-sound=alsa
88
ALSA_CONFIGURE_ON=	--with-sound=alsa
86
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
89
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
87
OSS_CONFIGURE_ON=	--with-sound=oss
88
90
91
CAIRO_USE=		GNOME=cairo
92
CAIRO_CONFIGURE_WITH=	cairo
93
CAIRO_IMPLIES=		X11
94
89
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
95
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
90
DBUS_CONFIGURE_WITH=	dbus
96
DBUS_CONFIGURE_WITH=	dbus
91
97
98
GCONF_USE=		gnome=gconf2
99
GCONF_CONFIGURE_WITH=	gconf
100
GCONF_IMPLIES=		X11
101
102
GFILE_CONFIGURE_ON=	--with-file-notification=gfile
103
104
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
105
GIF_CONFIGURE_WITH=	gif
106
GIF_IMPLIES=		X11
107
92
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
108
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
93
GNUTLS_CONFIGURE_WITH=	gnutls
109
GNUTLS_CONFIGURE_WITH=	gnutls
94
110
95
XML_USE=		GNOME=libxml2
111
GSETTINGS_USE=		gnome=glib20
96
XML_CONFIGURE_WITH=	xml2
112
GSETTINGS_CONFIGURE_WITH=gsettings
113
GSETTINGS_IMPLIES=	DBUS X11
97
114
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
115
GTK2_USE=		GNOME=gtk20
106
GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
116
GTK2_CONFIGURE_ON=	-with-x-toolkit=gtk2
107
117
Lines 108-178 Link Here
108
GTK3_USE=		GNOME=gtk30
118
GTK3_USE=		GNOME=gtk30
109
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
119
GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
110
120
111
XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
121
JPEG_USES=		jpeg
112
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
122
JPEG_CONFIGURE_WITH=	jpeg
123
JPEG_IMPLIES=		X11
113
124
114
XAW_USE=		XORG=xaw
125
KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
115
XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
116
126
127
LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
128
129
LTO_CONFIGURE_ON=	--enable-link-time-optimization
130
LTO_USE=		GCC=4.6+
131
132
M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
133
M17N_CONFIGURE_WITH=	m17n-flt
134
M17N_IMPLIES=		XFT X11
135
136
MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
137
MAGICK_CONFIGURE_WITH=	imagemagick
138
MAGICK_IMPLIES=		X11
139
140
MODULES_CONFIGURE_WITH=	modules
141
117
MOTIF_USES=		motif
142
MOTIF_USES=		motif
118
MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
143
MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
119
144
145
OSS_CONFIGURE_ON=	--with-sound=oss
146
147
OTF_LIB_DEPENDS=	libotf.so:print/libotf
148
OTF_CONFIGURE_WITH=	libotf
149
OTF_IMPLIES=		XFT
150
151
PNG_LIB_DEPENDS=	libpng.so:graphics/png
152
PNG_CONFIGURE_WITH=	png
153
PNG_IMPLIES=		X11
154
120
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
155
SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
156
SCROLLBARS_IMPLIES=	X11
121
157
122
SYNC_INPUT_CONFIGURE_WITH=sync-input
158
SVG_USE=		GNOME=librsvg2
159
SVG_CONFIGURE_WITH=	rsvg
160
SVG_IMPLIES=		X11
123
161
124
JPEG_USES=		jpeg
125
JPEG_CONFIGURE_WITH=	jpeg
126
127
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
162
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
128
TIFF_CONFIGURE_WITH=	tiff
163
TIFF_CONFIGURE_WITH=	tiff
164
TIFF_IMPLIES=		X11
129
165
130
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
166
X11_CONFIGURE_OFF=	--without-x --with-x-toolkit=no
131
GIF_CONFIGURE_WITH=	gif
167
X11_CONFIGURE_ON=	--with-x
168
X11_USE=		XORG=x11
169
X11_USES=		desktop-file-utils
170
X11_VARS=		installs_icons=yes
171
X11_VARS_OFF=		without_x11=yes
132
172
133
PNG_LIB_DEPENDS+=	libpng.so:graphics/png
173
XAW_USE=		XORG=xaw
134
PNG_CONFIGURE_WITH=	png
174
XAW_CONFIGURE_ON=	--with-x-toolkit=athena --without-xaw3d
135
175
136
XPM_USE=		XORG=xpm
176
XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
137
XPM_CONFIGURE_WITH=	xpm
177
XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
138
178
139
XFT_USE=		XORG=xft
179
XFT_USE=		XORG=xft
140
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
180
XFT_LIB_DEPENDS=	libfreetype.so:print/freetype2
141
XFT_CONFIGURE_WITH=	xft
181
XFT_CONFIGURE_WITH=	xft
182
XFT_IMPLIES=		X11
142
183
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
184
XIM_CONFIGURE_WITH=	xim
185
XIM_IMPLIES=		X11
159
186
160
LTO_CONFIGURE_ON=	--enable-link-time-optimization
187
XML_USE=		GNOME=libxml2
161
LTO_USE=		GCC=4.6+
188
XML_CONFIGURE_WITH=	xml2
162
189
163
ACL_CONFIGURE_OFF=	--disable-acl
190
XPM_USE=		XORG=xpm
191
XPM_CONFIGURE_WITH=	xpm
192
XPM_IMPLIES=		X11
164
193
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
194
XWIDGETS_CONFIGURE_ON=	--with-xwidgets
175
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
195
XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
196
XWIDGETS_IMPLIES=	X11
176
197
177
.include <bsd.port.options.mk>
198
.include <bsd.port.options.mk>
178
199
Lines 181-235 Link Here
181
# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
202
# http://llvm.org/bugs/show_bug.cgi?id=18171 fixed in r263312
182
# (11-CURRENT), and fixed in r263765 (10-STABLE)
203
# (11-CURRENT), and fixed in r263765 (10-STABLE)
183
.if ${ARCH} == "i386"
204
.if ${ARCH} == "i386"
184
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 &&           \
205
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)
185
${OSVERSION} < 1100015)
206
USE_GCC=any
186
USE_GCC=	any
187
.endif
207
.endif
188
.endif
208
.endif
189
209
190
.if ${PORT_OPTIONS:MX11}
210
.if ${PORT_OPTIONS:MX11}
191
INSTALLS_ICONS=	yes
211
.if ! ${PORT_OPTIONS:MGTK2} && ! ${PORT_OPTIONS:MGTK3} && \
192
.if !${PORT_OPTIONS:MXFT}
212
! ${PORT_OPTIONS:MMOTIF} && ! ${PORT_OPTIONS:MXAW} && ! ${PORT_OPTIONS:MXAW3D}
193
.if ${PORT_OPTIONS:MM17N}
213
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
214
.endif
198
.endif
215
.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
216
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>
217
.include <bsd.port.pre.mk>
221
218
222
# Building with GCC 4.6+ requires it
219
# Building with GCC 4.6+ requires it
223
.if ${ncurses_ARGS} == "port"
220
.if ${ncurses_ARGS} == "port"
224
LDFLAGS+=	-ltinfo
221
LDFLAGS+=-ltinfo
225
.endif
222
.endif
226
223
227
post-patch:
224
post-patch:
228
	@${RM} -f ${WRKSRC}/info/*
225
	@${RM} -f ${WRKSRC}/info/*
229
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e      \
226
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
230
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
227
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
231
.if empty(PORT_OPTIONS:MX11)
228
## stage-qa will give a warning, but don't pull in desktop-file-utils
232
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/'        \
229
## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
230
## dependencies
231
.if ! ${PORT_OPTIONS:MX11}
232
	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
233
		${WRKSRC}/etc/emacs.desktop
233
		${WRKSRC}/etc/emacs.desktop
234
.endif
234
.endif
235
235
Lines 236-254 Link Here
236
post-install:
236
post-install:
237
.if ${PORT_OPTIONS:MSOURCES}
237
.if ${PORT_OPTIONS:MSOURCES}
238
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
238
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
239
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch]                          \
239
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
240
		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
240
	${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
241
	${INSTALL_DATA} ${WRKSRC}/sources.el                          \
242
		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
243
.endif
241
.endif
244
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name      \
242
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
245
		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
246
243
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>
244
.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