The standards.info provided by XEmacs conflicts with the one installed

by devel/autoconf, which is probably newer.

4 files changed, 21 insertions, 8 deletions

diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common
index ccd9c8948d7..ef18f9a0ba6 100644
--- a/editors/xemacs-current/Makefile.common
+++ b/editors/xemacs-current/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2017/11/16 15:07:04 hauke Exp $
+# $NetBSD: Makefile.common,v 1.7 2017/11/17 13:06:03 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -6,7 +6,7 @@
 DISTNAME=	xemacs-21.5.34
 EMACSVERSION=	21.5-b34
 EMACS_DISTNAME=	xemacs-${EMACSVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index 4fb67283a6f..55418f215f9 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2017/11/15 14:46:31 hauke Exp $
+@comment $NetBSD: PLIST,v 1.23 2017/11/17 13:06:03 hauke Exp $
 bin/ellcc
 bin/gnuattach
 bin/gnuclient
@@ -18,7 +18,6 @@ info/info.info
 info/internals.info
 info/lispref.info
 info/new-users-guide.info
-info/standards.info
 info/termcap.info
 info/texinfo.info
 info/widget.info
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 8ae613cb003..95b702b553a 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2017/11/16 15:07:04 hauke Exp $
+$NetBSD: distinfo,v 1.31 2017/11/17 13:06:03 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
 SHA512 (xemacs-21.5.34.tar.gz) = b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 Size (xemacs-21.5.34.tar.gz) = 15816932 bytes
-SHA1 (patch-Makefile.in.in) = 113ba387173c3ac18754f74297f63cd92648428b
+SHA1 (patch-Makefile.in.in) = e1e18f8555195a53fee44cbbb33a6d1a49fd368b
 SHA1 (patch-configure) = 0f576275a42b883f4502fbe5156aa2d84f17f6a8
 SHA1 (patch-lib-src_Makefile.in.in) = 6e9c2b9e4cd9e63fbdc88ff4792e74a57ed925ae
 SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b
diff --git a/editors/xemacs-current/patches/patch-Makefile.in.in b/editors/xemacs-current/patches/patch-Makefile.in.in
index a49b2007cac..7d27c537fed 100644
--- a/editors/xemacs-current/patches/patch-Makefile.in.in
+++ b/editors/xemacs-current/patches/patch-Makefile.in.in
@@ -1,4 +1,11 @@
-$NetBSD: patch-Makefile.in.in,v 1.1 2017/11/15 14:49:32 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.2 2017/11/17 13:06:03 hauke Exp $
+
+Sprinkle DESTDIR dust.
+
+Avoid installing backup~ files.
+
+The standards.info provided by XEmacs conflicts with the one installed by
+devel/autoconf, which is probably newer.
 
 Prefix {c,e}tags to avoid conflicts.
 
@@ -25,7 +32,14 @@ was patch-aa
  #endif
  
  install-arch-indep: mkdir info
-@@ -471,8 +472,12 @@ install-arch-indep: mkdir info
+@@ -465,14 +466,19 @@ install-arch-indep: mkdir info
+ 	    ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
+ 	  fi ; \
+ 	  for file in *.info* ; do \
++	    test $${file} = "standards.info" && continue ; \
+ 	    ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \
+ 	    chmod 0644 $(DESTDIR)${infodir}/$${file}; \
+ 	  done ; \
  	fi
  	cd ${srcdir}/etc && \
  	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \