>Number:         29609
>Category:       pkg
>Synopsis:       pkgsrc/mk/emacs.mk has no support for xemacs-nox11 package
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Mar 06 04:14:00 +0000 2005
>Originator:     Kailash Sethuraman
>Release:        NetBSD 2.0_RC1
>Organization:
	
>Environment:
	
	
System: NetBSD kasba 2.0_RC1 NetBSD 2.0_RC1 (MYKERN) #0: Sun Oct 17 18:17:47 SGT 2004 hsaliak@kasba:/usr/src/sys/arch/i386/compile/MYKERN i386
Architecture: i386
Machine: i386
>Description:
	pkgsrc/mk/emacs.mk has no support for xemacs-nox11
package. This means means that addon packages for xemacs-nox11 cannot
be installed from pkgsrc. Therefore, by default xemacs-nox11 is just a
barebones install with little functionality, and is hence, crippled!   
>How-To-Repeat:
	Install xemacs-nox11, try to then install any package which
uses emacs.mk
>Fix:
Apply the following patch to emacs.mk. Packages such as
pkgsrc/editors/xemacs-packages can then be patched easily to use
emacs.mk, which will be able to recognise the existance of
xemacs-nox11, and hence work correctly.

-------------------------------------------------->8------------------

--- emacs.mk.orig	2005-03-05 10:03:37.000000000 +0800
+++ emacs.mk	2005-03-05 10:02:52.000000000 +0800
@@ -31,7 +31,7 @@
 EMACS_VERSIONS_ACCEPTED?=	emacs21 emacs21nox emacs20
 #EMACS_VERSIONS_ACCEPTED?=	emacs21 emacs21nox xemacs214 emacs20 xemacs215
 .else
-EMACS_VERSIONS_ACCEPTED?=	xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED?=	xemacs214 xemacs215 xemacs214nox
 .endif
 
 # Actually BUILDLINK_ means little here...
@@ -40,6 +40,7 @@
 BUILDLINK_DEPENDS.emacs21?=	emacs>=21.2
 BUILDLINK_DEPENDS.emacs21nox?=	emacs-nox11>=21.2
 BUILDLINK_DEPENDS.xemacs214?=	xemacs>=21.4
+BUILDLINK_DEPENDS.xemacs214nox?=	xemacs-nox11>=21.4
 BUILDLINK_DEPENDS.xemacs215?=	xemacs>=21.5
 BUILDLINK_DEPENDS.leim20?=	leim>=20.7
 BUILDLINK_DEPENDS.leim21?=	leim>=21.2
@@ -89,6 +90,18 @@
 .endif
 .endif
 
+_TMP!=	${PKG_INFO} -e xemacs-nox11 || ${ECHO}
+.if ${_TMP} != ""
+_EMACS_VERSION_XEMACS_FULL:=	${_TMP:C/^.*-//}
+_EMACS_VERSION_XEMACS=	${_EMACS_VERSION_XEMACS_FULL:C/^.*-//}
+_EMACS_VERSION_XEMACS_MAJOR=	${_EMACS_VERSION_XEMACS:C/\..*//}
+_EMACS_VERSION_XEMACS_MINOR=	${_EMACS_VERSION_XEMACS:C/^[0-9]*\.//:C/[^0-9].*//}
+.if ${_EMACS_VERSION_XEMACS_MAJOR} == "21" && \
+	${_EMACS_VERSION_XEMACS_MINOR} == "4"
+_EMACS_VERSION_xemacs214nox_INSTALLED=	yes
+.endif
+.endif
+
 # Determine the Emacs version to be used.
 #
 .if defined(EMACS_VERSION_REQD)
@@ -126,6 +139,7 @@
 FOR.emacs20=		"@comment "
 FOR.xemacs215=		"@comment "
 FOR.xemacs214=		"@comment "
+FOR.xemacs214nox=		"@comment "
 .if ${_EMACS_VERSION} == "emacs21"
 EMACS_DEPENDENCY=	${BUILDLINK_DEPENDS.emacs21}:../../editors/emacs
 FOR.emacs21=		""
@@ -150,6 +164,9 @@
 .elif ${_EMACS_VERSION} == "xemacs214"
 EMACS_DEPENDENCY=	${BUILDLINK_DEPENDS.xemacs214}:../../editors/xemacs
 FOR.xemacs214=		""
+.elif ${_EMACS_VERSION} == "xemacs214nox"
+EMACS_DEPENDENCY=  ${BUILDLINK_DEPENDS.xemacs214nox}:../../editors/xemacs-nox11
+FOR.xemacs214nox=		""
 .else
 PKG_SKIP_REASON+=	"Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}"
 PKG_SKIP_REASON+=	"No valid Emacs version installed found"
@@ -187,6 +204,7 @@
 PLIST_SUBST+=	FOR_emacs20=${FOR.emacs20}
 PLIST_SUBST+=	FOR_xemacs215=${FOR.xemacs215}
 PLIST_SUBST+=	FOR_xemacs214=${FOR.xemacs214}
+PLIST_SUBST+=	FOR_xemacs214nox=${FOR.xemacs214nox}
 
 _REPLACE_EMACS_SED=	-e "1s;^\#!.*emacs;\#!${EMACS_BIN};"
 

>Unformatted: