1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

editors/emacs-devel:

- Update to 25.1-rc1[1]
 - Add IMPLIES condition for XWIDGETS option[1]

Mk/bsd.emacs.mk:
 - Add block for emacs-nox11[2]
 - Update emacs-devel block with new EMACS_VER

PR:		211356 [1]
Submitted by:	Joseph Mingrone <jrm@ftfl.ca> [1],
		matthew (via private email) [2]
This commit is contained in:
Ashish SHUKLA 2016-07-27 07:12:24 +00:00
parent 539ea05319
commit 0a2c26daa2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419164
3 changed files with 26 additions and 9 deletions

View File

@ -83,7 +83,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
# Emacs-24.x (development version)
.elif (${EMACS_PORT_NAME} == "emacs-devel")
EMACS_NAME= emacs
EMACS_VER= 25.0.95
EMACS_VER= 25.1
EMACS_MAJOR_VER= 25
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
@ -97,11 +97,27 @@ DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.endif
.elif (${EMACS_PORT_NAME} == "emacs-nox11")
EMACS_NAME= emacs
EMACS_VER= 24.5
EMACS_MAJOR_VER= 24
EMACS_LIBDIR= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
EMACS_PORTDIR= editors/emacs-nox11
EMACS_COMMON_PORT= NO
EMACS_HAS_MULE= YES
EMACS_NO_SUBDIRSEL= NO
.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
COMMENTFILE?= ${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.endif
.else
check-makevars::
@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
@${ECHO} "Valid values are:"
@${ECHO} " Emacs family: emacs24 emacs-devel"
@${ECHO} " Emacs family: emacs24 emacs-devel emacs-nox11"
@${FALSE}
.endif

View File

@ -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,7 +19,9 @@ BROKEN_ia64= Emacs does not currently build on ia64
CONFLICTS= emacs24-[0-9]* emacs-nox11-[0-9]*
EMACS_VER= 25.0.95
EMACS_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${EMACS_VER}
GNU_CONFIGURE= yes
USES= cpe gmake makeinfo ncurses pkgconfig tar:xz
INFO_PATH= ${DATADIR_REL}/info
@ -208,7 +209,7 @@ XPM_IMPLIES= X11
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH=xwidgets
XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
XWIDGETS_IMPLIES= X11
XWIDGETS_IMPLIES= GTK3
.include <bsd.port.options.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1465722255
SHA256 (emacs-25.0.95.tar.xz) = 1438c51268250344739c31752d9292fc51cab0d8384b9f574ecaf1bcd879bb2e
SIZE (emacs-25.0.95.tar.xz) = 42536908
TIMESTAMP = 1469588656
SHA256 (emacs-25.1-rc1.tar.xz) = c00c50e66474359d1e24baa2a0703bc64207caffc31d0808d8b4ffa4b3826133
SIZE (emacs-25.1-rc1.tar.xz) = 42309372