svn commit: r499179 - in head: Mk/Uses editors/emacs editors/emacs/files

Joseph Mingrone jrm at FreeBSD.org
Sun Apr 28 12:23:09 UTC 2019


Hi,

Of the Emacs ports that I tested [1], they all worked fine with this
minor version upgrade.  Are there any Emacs ports that are you aware of
that are having problems and need the bump?

[1] Admittedly, my sample size was only about half a dozen.

Joseph

Nobutaka Mantani <nobutaka at FreeBSD.org> writes:

> Hi,

> Is there any special reason to not bump PORTREVISION of emacs lisp ports
> or just forgotten?

> At the time of the upgrade to 26.1, you bumped PORTREVISION.

> https://svnweb.freebsd.org/ports?view=revision&revision=471191

> --
> Nobutaka Mantani
> nobutaka at FreeBSD.org, nobutaka at nobutaka.org

> On Wed, 17 Apr 2019 23:36:02 +0900,
> Joseph Mingrone wrote:

>> Author: jrm
>> Date: Wed Apr 17 14:36:02 2019
>> New Revision: 499179
>> URL: https://svnweb.freebsd.org/changeset/ports/499179

>> Log:
>>   editors/emacs: Update to version 26.2

>>   Port changes:
>>   Match upstream's default behaviour by not installing the shared game
>>   directory and the auxiliary program update-game-score

>>   Upstream changes:
>>   https://www.gnu.org/software/emacs/news/NEWS.26.2

>>   Reviewed by:	ashish
>>   Differential Revision:	https://reviews.freebsd.org/D18810

>> Deleted:
>>   head/editors/emacs/files/patch-lisp_textmodes_ispell.el
>> Modified:
>>   head/Mk/Uses/emacs.mk
>>   head/editors/emacs/Makefile   (contents, props changed)
>>   head/editors/emacs/distinfo   (contents, props changed)
>>   head/editors/emacs/pkg-plist   (contents, props changed)

>> Modified: head/Mk/Uses/emacs.mk
>> ==============================================================================
>> --- head/Mk/Uses/emacs.mk	Wed Apr 17 14:33:34 2019	(r499178)
>> +++ head/Mk/Uses/emacs.mk	Wed Apr 17 14:36:02 2019	(r499179)
>> @@ -106,7 +106,7 @@ EMACS_FLAVOR=	full
>>  EMACS_VER=			27.0.50
>>  EMACS_PORTDIR=		editors/emacs-devel
>>  .else
>> -EMACS_VER=			26.1
>> +EMACS_VER=		26.2
>>  EMACS_PORTDIR=		editors/emacs
>>  .endif


>> Modified: head/editors/emacs/Makefile
>> ==============================================================================
>> --- head/editors/emacs/Makefile	Wed Apr 17 14:33:34 2019	(r499178)
>> +++ head/editors/emacs/Makefile	Wed Apr 17 14:36:02 2019	(r499179)
>> @@ -2,8 +2,7 @@
>>  # $FreeBSD$

>>  PORTNAME=	emacs
>> -DISTVERSION=	${EMACS_VER}
>> -PORTREVISION=	6
>> +DISTVERSION=	26.2
>>  PORTEPOCH=	3
>>  CATEGORIES=	editors ipv6
>>  MASTER_SITES=	GNU
>> @@ -43,7 +42,7 @@ CPE_VENDOR=	gnu

>>  CONFIGURE_ARGS=	--disable-build-details \
>>  		--localstatedir=/var \
>> -		--with-gameuser=games:games
>> +		--without-gpm
>>  .if ${FLAVOR:U} == canna
>>  CONFIGURE_ARGS+=	--with-canna
>>  .endif
>> @@ -75,14 +74,14 @@ INFO_PATH=	${DATADIR_REL}/info
>>  INSTALLS_ICONS=	yes
>>  .endif
>>  .if ${FLAVOR:U} == canna
>> -PLIST_FILES+=	${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
>> -		${DATADIR}/${EMACS_VER}/lisp/canna.elc \
>> -		${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz	\
>> -		${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc
>> +PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
>> +		${DATADIR}/${DISTVERSION}/lisp/canna.elc \
>> +		${DATADIR}/${DISTVERSION}/lisp/isearch-ext.el.gz	\
>> +		${DATADIR}/${DISTVERSION}/lisp/isearch-ext.elc
>>  .endif
>> -PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
>> +PLIST_SUB=	EMACS_VER=${DISTVERSION} GNU_HOST=${CONFIGURE_TARGET}
>>  SUB_FILES=	sources.el
>> -SUB_LIST=	EMACS_VER=${EMACS_VER} # sources.el
>> +SUB_LIST=	EMACS_VER=${DISTVERSION} # sources.el

>>  OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
>>  		MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
>> @@ -184,7 +183,7 @@ PNG_LIB_DEPENDS=	libpng.so:graphics/png
>>  PNG_CONFIGURE_WITH=	png
>>  SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
>>  .if ${FLAVOR:U} == canna
>> -SOURCES_PLIST_FILES=	${DATADIR}/${EMACS_VER}/src/canna.c
>> +SOURCES_PLIST_FILES=	${DATADIR}/${DISTVERSION}/src/canna.c
>>  .endif
>>  SVG_USES=		gnome
>>  SVG_USE=		GNOME=cairo,librsvg2
>> @@ -213,8 +212,6 @@ XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2
>>  			libsoup-2.4.so:devel/libsoup
>>  XWIDGETS_IMPLIES=	GTK3

>> -EMACS_VER=		26.1
>> -
>>  .include <bsd.port.options.mk>

>>  # has graphics/ImageMagick been compiled with OPENMP?
>> @@ -237,12 +234,12 @@ post-patch:

>>  post-install-MAILUTILS-on:
>>  	${LN} -sf ${PREFIX}/bin/movemail \
>> -		${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
>> +		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}

>>  post-install-SOURCES-on:
>> -	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>> -	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
>> -	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
>> +	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
>> +	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
>> +	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION}/site-lisp/site-start.el

>>  post-install:
>>  	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd

>> Modified: head/editors/emacs/distinfo
>> ==============================================================================
>> --- head/editors/emacs/distinfo	Wed Apr 17 14:33:34 2019	(r499178)
>> +++ head/editors/emacs/distinfo	Wed Apr 17 14:36:02 2019	(r499179)
>> @@ -1,5 +1,5 @@
>> -TIMESTAMP = 1527559243
>> -SHA256 (emacs-26.1.tar.xz) = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
>> -SIZE (emacs-26.1.tar.xz) = 44258932
>> +TIMESTAMP = 1555126448
>> +SHA256 (emacs-26.2.tar.xz) = 151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
>> +SIZE (emacs-26.2.tar.xz) = 44406808
>>  SHA256 (emacs26.1-canna-20180529.diff.gz) = defe94426449a5d48c1b0b92c0a6051816b78dba25c600d38c06ab903d667ecb
>>  SIZE (emacs26.1-canna-20180529.diff.gz) = 30163

>> Modified: head/editors/emacs/pkg-plist
>> ==============================================================================
>> --- head/editors/emacs/pkg-plist	Wed Apr 17 14:33:34 2019	(r499178)
>> +++ head/editors/emacs/pkg-plist	Wed Apr 17 14:36:02 2019	(r499179)
>> @@ -4,18 +4,18 @@ bin/emacs
>>  bin/emacs-%%EMACS_VER%%
>>  bin/emacsclient
>>  bin/etags
>> +include/emacs-module.h
>>  libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
>>  libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
>>  libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
>>  libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
>> -@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
>>  man/man1/ctags.1.gz
>>  man/man1/ebrowse.1.gz
>>  man/man1/emacs.1.gz
>>  man/man1/emacsclient.1.gz
>>  man/man1/etags.1.gz
>> -share/appdata/emacs.appdata.xml
>>  share/applications/emacs.desktop
>> +share/metainfo/emacs.appdata.xml
>>  %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
>>  %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
>>  %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
>> @@ -4122,6 +4122,3 @@ share/icons/hicolor/48x48/apps/emacs.png
>>  share/icons/hicolor/scalable/apps/emacs.svg
>>  share/icons/hicolor/scalable/mimetypes/emacs-document.svg
>>  share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
>> -@(games,games,0664) /var/games/emacs/snake-scores
>> -@(games,games,0664) /var/games/emacs/tetris-scores
>> - at dir(games,games,0755) /var/games/emacs

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 962 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20190428/93e102a2/attachment.sig>


More information about the svn-ports-all mailing list