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

Collapse All | Expand All

(-)Makefile (-9 / +9 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	emacs
4
PORTNAME=	emacs
5
PORTVERSION=	${EMACS_VER}
5
DISTVERSION=	25.1-rc1
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 20-38 Link Here
20
19
21
CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
20
CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
22
21
23
EMACS_VER=	25.0.95
22
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
23
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
25
USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
26
INFO_PATH=	${DATADIR_REL}/info
26
INFO_PATH=	${DATADIR_REL}/info
27
CPE_VENDOR=	gnu
27
CPE_VENDOR=	gnu
28
28
29
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
29
SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${PORTVERSION:R}/\
30
		${CONFIGURE_TARGET}
30
		${CONFIGURE_TARGET}
31
31
32
CONFIGURE_ARGS=	--localstatedir=/var \
32
CONFIGURE_ARGS=	--localstatedir=/var \
33
		--with-gameuser=games:games
33
		--with-gameuser=games:games
34
34
35
PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
35
PLIST_SUB=	EMACS_VER=${PORTVERSION:R} GNU_HOST=${CONFIGURE_TARGET}
36
36
37
MAKE_ENV=	LC_ALL=C
37
MAKE_ENV=	LC_ALL=C
38
38
Lines 237-243 Link Here
237
237
238
post-patch:
238
post-patch:
239
	@${RM} -f ${WRKSRC}/info/*
239
	@${RM} -f ${WRKSRC}/info/*
240
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
240
	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${PORTVERSION:R}/g" -e \
241
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
241
		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
242
## stage-qa will give a warning, but don't pull in desktop-file-utils
242
## stage-qa will give a warning, but don't pull in desktop-file-utils
243
## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
243
## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
Lines 249-259 Link Here
249
249
250
post-install:
250
post-install:
251
.if ${PORT_OPTIONS:MSOURCES}
251
.if ${PORT_OPTIONS:MSOURCES}
252
	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
252
	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTVERSION:R}/src
253
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
253
	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
254
		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
254
		${STAGEDIR}${DATADIR}/${PORTVERSION:R}/src
255
	${INSTALL_DATA} ${WRKSRC}/sources.el \
255
	${INSTALL_DATA} ${WRKSRC}/sources.el \
256
		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
256
		${STAGEDIR}${DATADIR}/${PORTVERSION:R}/site-lisp/site-start.el
257
.endif
257
.endif
258
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
258
	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
259
		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
259
		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1465722255
1
TIMESTAMP = 1469420565
2
SHA256 (emacs-25.0.95.tar.xz) = 1438c51268250344739c31752d9292fc51cab0d8384b9f574ecaf1bcd879bb2e
2
SHA256 (emacs-25.1-rc1.tar.xz) = c00c50e66474359d1e24baa2a0703bc64207caffc31d0808d8b4ffa4b3826133
3
SIZE (emacs-25.0.95.tar.xz) = 42536908
3
SIZE (emacs-25.1-rc1.tar.xz) = 42309372

Return to bug 211356