Hello.

I have a patch which I'm merging into the Pkgsrc tree.  I want to see
if this patch affects Emacs 20 (editors/emacs) on NetBSD/pmax.

According to the log of pkgsrc/editors/emacs/patches/patch-af
Rev. 1.4, NetBSD/pmax can't use the dump (unexec) feature, and some
tricks are needed to build/link a temacs executable.  I don't really
understand the details of the problem, but I wonder if Buildlink2 will
implicitly resolve a part of the fix.

The test procedure is,

		 1) Update whole Pkgsrc tree.
		 2) Move to pkgsrc/editors/emacs.
		 3) Do `make clean'.
		 4) Do `patch -p0 < .../the-patch-below'.
		 5) Do `make >log 2>errlog'.
		 6) Check if `./work/emacs-20.7/src/emacs -q -nw'
                    works.
		 7) Send me the `log' and `errlog' files.

Note that Emacs don't work with X if the executable is linked with
ld(1) Ver. 2.13.2.1 or later.

Masao

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile	2003/03/01 06:18:21	1.51
+++ Makefile	2003/03/27 04:06:14
@@ -28,7 +28,7 @@
 USE_LIBTOOL=	yes
 GNU_ARCH.mipsbe= mips
 
-BUILD_DEFS+=	USE_INET6 EMACS_USE_POP EMACS_USE_X EMACS_USE_X_TOOLKIT
+BUILD_DEFS+=	USE_INET6 EMACS_USE_POP
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,11 +37,21 @@
     (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES))
 CONFIGURE_ARGS+=--with-pop
 .endif
-USE_X11=	yes
-CONFIGURE_ARGS+=--with-x=yes
+
+.if defined(EMACS_USE_X)
+BUILD_DEFS+=		EMACS_USE_X EMACS_USE_X_TOOLKIT
+USE_X11=		yes
+CONFIGURE_ARGS+=	--with-x=yes
 .if defined(EMACS_USE_X_TOOLKIT)
-CONFIGURE_ARGS+=--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
+CONFIGURE_ARGS+=	--with-x-toolkit=${EMACS_USE_X_TOOLKIT}
+.if ${EMACS_USE_X_TOOLKIT} == "athena"
+.include "../../mk/xaw.buildlink2.mk"
+.elif ${EMACS_USE_X_TOOLKIT} == "motif"
+.include "../../mk/motif.buildlink2.mk"
 .endif
+.endif
+.endif	# EMACS_USE_X
+
 .if defined(USE_INET6) && ${USE_INET6} == YES
 CONFIGURE_ARGS+=--with-ipv6
 .else
@@ -58,13 +68,6 @@
 
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
-
-.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "athena"
-.include "../../mk/xaw.buildlink2.mk"
-.endif
-.if defined(EMACS_USE_X_TOOLKIT) && ${EMACS_USE_X_TOOLKIT} == "motif"
-.include "../../mk/motif.buildlink2.mk"
-.endif
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	2003/03/01 06:18:21	1.10
+++ distinfo	2003/03/27 04:06:14
@@ -13,7 +13,7 @@
 SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
-SHA1 (patch-af) = c35816b47a46d4a3d8381a20e593fa29297e1f4d
+SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
 SHA1 (patch-ah) = 2cfb03c57fad97db9eaaf9cda610f5d6c906aa4a
 SHA1 (patch-ai) = d1e5bb8fe797761f63fad42dbfb48834284f4533
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/patches/patch-af,v
retrieving revision 1.7
diff -u -r1.7 patch-af
--- patches/patch-af	2003/03/01 06:18:22	1.7
+++ patches/patch-af	2003/03/27 04:06:14
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2003/03/01 06:18:22 uebayasi Exp $
+$NetBSD$
 
---- src/Makefile.in.orig	Thu Jan 16 19:08:48 2003
+--- src/Makefile.in.orig	Thu Mar 27 12:43:25 2003
 +++ src/Makefile.in
 @@ -329,7 +329,7 @@
  #ifdef USE_X_TOOLKIT
@@ -20,15 +20,6 @@
  #endif
  
  #ifndef LIB_GCC
-@@ -457,7 +457,7 @@
- #endif /* not ORDINARY_LINK */
- 
- ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
--	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)
-+	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
- 
- /* A macro which other sections of Makefile can redefine to munge the
-    flags before they're passed to LD.  This is helpful if you have
 @@ -804,14 +804,7 @@
  #define OBJECTS_MACHINE
  #endif