Update to version 21.1.8.

This change adds a framework so that xemacs21 can be used as the base
port for the various xemacs-mule incarnations. This functionality has
not been tested by the committer !!!

Fixed up some fatal errors found by portlint.

The submitter added compface.1 to LIB_DEPENDS, but the maintainer did not
agree, so it has been eliminated.

Version 21.1.8 removed all the empty directories which were created by
version 21.1.7, so I had to modify PLIST accordingly. That explains the
large number of changes to PLIST.

This version does not seem to suffer from the "make world under -current
and xemacs core dumps" syndrome.

Submitted by:	kiri@pis.toba-cmt.ac.jp
Approved by:	maintainer

1 files changed, 27 insertions, 12 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 631d91fa0baa..0f3ade21d2b9 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -6,33 +6,36 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xemacs-21.1.7
-PKGNAME=	xemacs-21.1
+DISTNAME=	xemacs-${XEMACS_VER}
+PKGNAME=	${LANGPREFIX}xemacs${PKGNAMEEXT}-21.1
 CATEGORIES=	editors
 MASTER_SITES=	\
-		ftp://ftp.xemacs.org/pub/xemacs/${PKGNAME}/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${PKGNAME}/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/${PKGNAME}/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/${PKGNAME}/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/${PKGNAME}/
+		ftp://ftp.xemacs.org/pub/xemacs/xemacs-${XEMACS_REL}/ \
+		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-${XEMACS_REL}/ \
+		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-${XEMACS_REL}/ \
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-${XEMACS_REL}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}-info${EXTRACT_SUFX}
 
 MAINTAINER=	me@FreeBSD.org
 
-RUN_DEPENDS=    ${PREFIX}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
+.if !defined(MULE_COMMON)
+RUN_DEPENDS+=    ${PREFIX}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
+.endif
 
-XEMACS_VER=	21.1.7
+XEMACS_REL=	21.1
+XEMACS_VER=	21.1.8
 DIST_SUBDIR=	xemacs
 
+USE_XLIB=	yes
 USE_GMAKE=	yes
 STRIP=
 HAS_CONFIGURE=	yes
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
+CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \
 		--with-clash-detection \
 		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
@@ -42,12 +45,18 @@ CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
 		--with-png=yes \
 		--with-tiff=yes \
 		${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX}
+MAKE_ARGS=	prefix=${PREFIX}
+.if !defined(MULE_SLAVE)
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
+.endif
+.if !defined(MULE_PORT)
 ALL_TARGET=	all dist
+.endif
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
+.if !defined(MULE_PORT)
 pre-fetch:
 	@${ECHO_MSG} "If you want the MULE features, please use the xemacs-mule port"
 .if defined(HAVE_MOTIF)
@@ -71,17 +80,23 @@ WITH_DIALOGS=	--with-dialogs=athena
 WITH_XFACE?=	--with-xface=no
 WITH_OFFIX?=	--with-offix=no
 .endif
+.endif
 
-post-install:
+post-install::
+.if !defined(MULE_COMMON)
 	${LN} -sf xemacs-${XEMACS_VER} ${PREFIX}/bin/xemacs21
 .for file in b2m ctags etags gnuclient xemacs-${XEMACS_VER}
 	strip ${PREFIX}/bin/${file}
 .endfor
+.endif
+.if !defined(MULE_SLAVE)
 # ``make install'' does not set the permissions like pkg_add does.
+	${MKDIR} /var/run/emacs/lock
 	${CHMOD} 1777 /var/run/emacs/lock
 	${RM} -f ${PREFIX}/bin/send-pr
 # install xemacs21.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi
 	${INSTALL_SCRIPT} ${FILESDIR}/xemacs21.sh ${PREFIX}/etc/rc.d
+.endif
 
 .include <bsd.port.mk>