Attachment 144470 Details for Bug 191671 – remove settings related to XEmacs

[patch] remove settings related to XEmacs

patch-bsd.emacs.mk (text/plain), 3.29 KB, created by Yasuhiro Kimura on 2014-07-06 20:34:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2014-07-06 20:34:19 UTC

Size: 3.29 KB

patch

obsolete

>Index: bsd.emacs.mk
>===================================================================
>--- bsd.emacs.mk	(revision 360857)
>+++ bsd.emacs.mk	(working copy)
>@@ -114,86 +114,11 @@
> PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
> .endif
> 
>-# XEmacs-21.x
>-.elif (${EMACS_PORT_NAME} == "xemacs21")
>-EMACS_NAME=		xemacs
>-EMACS_VER=		21.4.22
>-EMACS_MAJOR_VER=	21
>-EMACS_LIBDIR?=		lib/${EMACS_NAME}
>-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
>-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs
>-EMACS_COMMON_PORT=	NO
>-EMACS_HAS_MULE=		NO
>-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
>-
>-# XEmacs-21.x with Mule
>-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
>-EMACS_NAME=		xemacs
>-EMACS_VER=		21.4.22
>-EMACS_MAJOR_VER=	21
>-EMACS_LIBDIR?=		lib/${EMACS_NAME}
>-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
>-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs21-mule
>-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
>-
>-# XEmacs-21 development version
>-.elif (${EMACS_PORT_NAME} == "xemacs-devel")
>-EMACS_NAME=		xemacs
>-EMACS_VER=		21.5-b28
>-EMACS_MAJOR_VER=	21
>-EMACS_LIBDIR?=		lib/${EMACS_NAME}
>-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
>-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel
>-EMACS_COMMON_PORT=	NO
>-EMACS_HAS_MULE=		NO
>-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
>-
>-# XEmacs-21 development version with Mule
>-.elif (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
>-	(${EMACS_PORT_NAME} == "xemacs-mule-xft")
>-EMACS_NAME=		xemacs
>-EMACS_VER=		21.5-b28
>-EMACS_MAJOR_VER=	21
>-EMACS_LIBDIR?=		lib/${EMACS_NAME}
>-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
>-.if ${EMACS_PORT_NAME} == "xemacs-mule-xft"
>-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel-mule-xft
> .else
>-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel-mule
>-.endif
>-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: emacs23 emacs24 emacs-devel"
>-	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
>-	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
> 	@${FALSE}
> .endif
> 
>@@ -233,7 +158,7 @@
> .endif
> 
> # environments for build
>-MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
>+MAKE_ARGS+=	EMACS=${EMACS_CMD}
> SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
> 		EMACS_VER=${EMACS_VER} \
> 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \

Actions: View | Diff

Attachments on bug 191671: 144470