Attachment 172960 Details for Bug 211356 – svn diff to update editors/emacs-devel to 25.1-rc1

[patch] svn diff to update editors/emacs-devel to 25.1-rc1

emacs-devel-25.1.r1,2.diff (text/plain), 2.40 KB, created by Joseph Mingrone on 2016-07-25 05:05:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2016-07-25 05:05:27 UTC

Size: 2.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419031)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	emacs
>-PORTVERSION=	${EMACS_VER}
>-PORTREVISION=	1
>+DISTVERSION=	25.1-rc1
> PORTEPOCH=	2
> CATEGORIES=	editors ipv6
> MASTER_SITES=	GNU_ALPHA/emacs/pretest
>@@ -20,19 +19,20 @@
> 
> CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
> 
>-EMACS_VER=	25.0.95
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
>+
> GNU_CONFIGURE=	yes
> USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
> INFO_PATH=	${DATADIR_REL}/info
> CPE_VENDOR=	gnu
> 
>-SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
>+SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${PORTVERSION:R}/\
> 		${CONFIGURE_TARGET}
> 
> CONFIGURE_ARGS=	--localstatedir=/var \
> 		--with-gameuser=games:games
> 
>-PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
>+PLIST_SUB=	EMACS_VER=${PORTVERSION:R} GNU_HOST=${CONFIGURE_TARGET}
> 
> MAKE_ENV=	LC_ALL=C
> 
>@@ -237,7 +237,7 @@
> 
> post-patch:
> 	@${RM} -f ${WRKSRC}/info/*
>-	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
>+	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${PORTVERSION:R}/g" -e \
> 		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
> ## stage-qa will give a warning, but don't pull in desktop-file-utils
> ## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
>@@ -249,11 +249,11 @@
> 
> post-install:
> .if ${PORT_OPTIONS:MSOURCES}
>-	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTVERSION:R}/src
> 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
>-		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>+		${STAGEDIR}${DATADIR}/${PORTVERSION:R}/src
> 	${INSTALL_DATA} ${WRKSRC}/sources.el \
>-		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
>+		${STAGEDIR}${DATADIR}/${PORTVERSION:R}/site-lisp/site-start.el
> .endif
> 	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
> 		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
>Index: distinfo
>===================================================================
>--- distinfo	(revision 419031)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1465722255
>-SHA256 (emacs-25.0.95.tar.xz) = 1438c51268250344739c31752d9292fc51cab0d8384b9f574ecaf1bcd879bb2e
>-SIZE (emacs-25.0.95.tar.xz) = 42536908
>+TIMESTAMP = 1469420565
>+SHA256 (emacs-25.1-rc1.tar.xz) = c00c50e66474359d1e24baa2a0703bc64207caffc31d0808d8b4ffa4b3826133
>+SIZE (emacs-25.1-rc1.tar.xz) = 42309372

Actions: View | Diff

Attachments on bug 211356: 172960 | 172962 | 173027