diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2016-07-27 07:12:24 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2016-07-27 07:12:24 +0000 |
| commit | 0a2c26daa26b561465d595bc26aeb720d3ac3ffd (patch) | |
| tree | e1ab52e14a09557bc6f53d2c35844fb6f3e9cffe /Mk/bsd.emacs.mk | |
| parent | 539ea053194b03ad43784093bb64cac56cb3ed61 (diff) | |
| download | ports-0a2c26daa26b561465d595bc26aeb720d3ac3ffd.tar.gz ports-0a2c26daa26b561465d595bc26aeb720d3ac3ffd.zip | |
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]
Notes
Notes:
svn path=/head/; revision=419164
Diffstat (limited to 'Mk/bsd.emacs.mk')
| -rw-r--r-- | Mk/bsd.emacs.mk | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk index 52a04643a358..abe28249aca8 100644 --- a/Mk/bsd.emacs.mk +++ b/Mk/bsd.emacs.mk @@ -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 |