INDEX build failed for 9.x

[Yasuhiro KIMURA]

From: Ports Index build <indexbuild at FreeBSD.org>
Subject: INDEX build failed for 9.x
Date: Sun, 2 Oct 2016 06:09:47 GMT

> INDEX build failed with errors:
> Generating INDEX-9 - please wait.."/usr/share/mk/bsd.init.mk", line 12: Unknown directive
> Unknown modifier 'U'
> 
> "/usr/share/mk/bsd.compiler.mk", line 38: Malformed conditional (${MK_CCACHE_BUILD:Uno} == "yes" &&  !make(showconfig) &&  (${CC:M*ccache/world/*} == "" || ${CXX:M*ccache/world/*} == ""))
> "/usr/share/mk/bsd.compiler.mk", line 107: missing `in' in for
> X_ in CC $${_empty_var_} XCC X_
> "/usr/share/mk/bsd.compiler.mk", line 108: Malformed conditional (${cc} == "CC" || !empty(XCC))
> Unknown modifier 'h'
> 
> Error expanding embedded variable.
> "Makefile", line 22: warning: "fmake -f "/home/indexbuild/tindex/ports/www/tclhttpd/files/Makefile.lib" -V SHLIB_NAME" returned non-zero status
>  Done.
> make_index: /home/indexbuild/tindex/ports/editors/flim: no entry for /home/indexbuild/tindex/ports/editors/apel-emacs25
> 
> Committers on the hook:
>  ashish 
> 
> Most recent SVN update was:
> Updating '.':
> U    Mk/bsd.emacs.mk
> D    editors/emacs/pkg-deinstall
> U    editors/emacs/Makefile
> U    editors/emacs/distinfo
> D    editors/emacs/files/pkg-install.in
> D    editors/emacs/files/patch-src_unexaix.c
> D    editors/emacs/files/patch-src_unexelf.c
> D    editors/emacs/files/patch-src_unexcoff.c
> A    editors/emacs/files/extrapatch-lldb-gud.el
> U    editors/emacs/pkg-plist
> U    editors/emacs-devel/Makefile
> U    editors/emacs-devel/distinfo
> D    editors/emacs-devel/files/patch-sources.el
> A    editors/emacs-devel/files/sources.el.in
> U    editors/emacs-devel/pkg-plist
> U    editors/emacs-nox11/Makefile
> Updated to revision 423103.
> _______________________________________________
> freebsd-ports at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe at freebsd.org"

Attached patch should fix build failure.

---
Yasuhiro KIMURA
-------------- next part --------------
Index: editors/flim/Makefile
===================================================================
--- editors/flim/Makefile	(revision 423103)
+++ editors/flim/Makefile	(working copy)
@@ -50,12 +50,12 @@
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel")
+.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-devel")
 DEPPORT_SUFFIX=
 .else
 DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 .endif
-.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel")
+.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-devel")
 PLIST=		${PKGDIR}/pkg-plist.emacs21
 .endif
 # depends on apel (case of xemacs-21.x or later)
Index: editors/semi/Makefile
===================================================================
--- editors/semi/Makefile	(revision 423103)
+++ editors/semi/Makefile	(working copy)
@@ -48,12 +48,12 @@
 .include <bsd.port.options.mk>
 
 .if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel")
+.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-devel")
 DEPPORT_SUFFIX=
 .else
 DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 .endif
-.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel")
+.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-devel")
 PLIST=		${PKGDIR}/pkg-plist.emacs20
 .endif
 # depends on flim
Index: graphics/xface.el/Makefile
===================================================================
--- graphics/xface.el/Makefile	(revision 423103)
+++ graphics/xface.el/Makefile	(working copy)
@@ -16,7 +16,7 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	X-Face encoder/decoder/viewer for Emacsen
 
-EMACS_PORT_NAME?=	emacs24
+EMACS_PORT_NAME?=	emacs25
 
 RUN_DEPENDS=	compface:mail/faces