Build with the portable dumper, following advice from upstream. This

fixes spurious SIGSEV breakage during build on (at least) netbsd-6
amd64. Do a little GENERATE_PLIST dance to accomodate for the dynamic
filename of the (separate) dump file.

Add a handy option for a debug build.

Install the "Installation" protocol of build parameters, it is helpful
for reporting issues upstream.

3 files changed, 25 insertions, 11 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b221b4544ac..77bad26998d 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.112 2015/02/04 09:19:20 hauke Exp $
+# $NetBSD: Makefile,v 1.113 2015/02/15 13:13:24 hauke Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	XEmacs text editor version 21
 
 DISTNAME=	xemacs-21.4.23
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
@@ -26,7 +26,13 @@ DIST_SUBDIR=		xemacs
 PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 FILES_SUBST+=		DISTNAME=${DISTNAME:Q}
 MESSAGE_SUBST+=		DISTNAME=${DISTNAME:Q}
-INFO_FILES=	yes
+INFO_FILES=		yes
+
+.if defined(MANZ)
+PLIST_SUBST+=		ELSUFX='.gz'
+.else
+PLIST_SUBST+=		ELSUFX=''
+.endif
 
 .include "options.mk"
 
@@ -36,6 +42,7 @@ CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 CONFIGURE_ARGS+=	--with-clash-detection
 CONFIGURE_ARGS+=	--with-mule=yes
 CONFIGURE_ARGS+=	--with-msw=no
+CONFIGURE_ARGS+=	--pdump
 CFLAGS+=		-Dunix
 
 # Use terminfo on NetBSD-6 and newer.
@@ -69,6 +76,9 @@ REPLACE_SH=		etc/check_cygwin_setup.sh
 LIBDIR=			${PREFIX}/lib/${DISTNAME}
 ARCHLIBDIR=		${LIBDIR}/${MACHINE_GNU_PLATFORM}
 
+# The portable dumper creates a dump file with a build ID in its name
+GENERATE_PLIST+=	${ECHO} bin/${DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ;
+
 # This list overrides variables used in the source Makefiles at install
 # time to allow for ${DESTDIR}-style installation.  This variables list
 # is pulled from the ``mkdir'' target of Makefile.in.in.
@@ -95,13 +105,10 @@ post-extract:
 pre-build:
 	rm -f ${WRKSRC}/etc/ctags.1.orig
 
-.if defined(MANZ)
-PLIST_SUBST+=		ELSUFX='.gz'
-
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
+.if defined(MANZ)
 	find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
-.else
-PLIST_SUBST+=		ELSUFX=''
 .endif
 
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index dd99cfacf3d..2fc4b1e7e37 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2011/12/08 20:43:28 marino Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/02/15 13:13:24 hauke Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -26,6 +26,7 @@ lib/${DISTNAME}/etc/FTP
 lib/${DISTNAME}/etc/GNU
 lib/${DISTNAME}/etc/HELLO
 lib/${DISTNAME}/etc/InstallGuide
+lib/${DISTNAME}/etc/Installation
 lib/${DISTNAME}/etc/LPF
 lib/${DISTNAME}/etc/MACHINES
 lib/${DISTNAME}/etc/MAILINGLISTS
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index 284c15d2a6c..1ef91a23efd 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.10 2010/12/23 11:44:29 dsainty Exp $
+# $NetBSD: options.mk,v 1.11 2015/02/15 13:13:24 hauke Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
-PKG_SUPPORTED_OPTIONS=		ldap xface canna x11
+PKG_SUPPORTED_OPTIONS=		ldap xface canna x11 debug
 PKG_OPTIONS_OPTIONAL_GROUPS=	toolkit
 PKG_OPTIONS_GROUP.toolkit=	lucid
 
@@ -139,3 +139,9 @@ CONFIGURE_ARGS+=	--with-widgets=athena
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
 .endif
+
+PLIST_VARS+=            debug
+.if !empty(PKG_OPTIONS:Mdebug)
+CFLAGS+=                -g3
+INSTALL_UNSTRIPPED=     yes
+.endif