View | Details | Raw Unified | Return to bug 137956 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.emacs.mk (-2 / +19 lines)
Lines 7-13 Link Here
7
Emacs_Include=			bsd.emacs.mk
7
Emacs_Include=			bsd.emacs.mk
8
Emacs_Include_MAINTAINER=	ports@FreeBSD.org
8
Emacs_Include_MAINTAINER=	ports@FreeBSD.org
9
9
10
EMACS_PORT_NAME?=	emacs22
10
EMACS_PORT_NAME?=	emacs23
11
11
12
#
12
#
13
# This file for ports which depend on emacs family.
13
# This file for ports which depend on emacs family.
Lines 87-92 Link Here
87
EMACS_MAJOR_VER=	22
87
EMACS_MAJOR_VER=	22
88
EMACS_LIBDIR?=		share/${EMACS_NAME}
88
EMACS_LIBDIR?=		share/${EMACS_NAME}
89
EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
89
EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
90
EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs22
91
EMACS_COMMON_PORT=	NO
92
EMACS_HAS_MULE=		YES
93
EMACS_NO_SUBDIRSEL=	NO
94
.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
95
COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
96
DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
97
PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
98
.endif
99
100
# Emacs-23.x
101
.elif (${EMACS_PORT_NAME} == "emacs23")
102
EMACS_NAME=		emacs
103
EMACS_VER=		23.1
104
EMACS_MAJOR_VER=	23
105
EMACS_LIBDIR?=		share/${EMACS_NAME}
106
EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
90
EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
107
EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
91
EMACS_COMMON_PORT=	NO
108
EMACS_COMMON_PORT=	NO
92
EMACS_HAS_MULE=		YES
109
EMACS_HAS_MULE=		YES
Lines 191-197 Link Here
191
check-makevars::
208
check-makevars::
192
	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
209
	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
193
	@${ECHO} "Valid values are:"
210
	@${ECHO} "Valid values are:"
194
	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs-devel"
211
	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs-devel"
195
	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
212
	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
196
	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
213
	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
197
	@${FALSE}
214
	@${FALSE}

Return to bug 137956