CVS commit: pkgsrc/editors/xemacs

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Sun Jan 22 14:06:07 UTC 2017

Modified Files:
        pkgsrc/editors/xemacs: distinfo
Added Files:
        pkgsrc/editors/xemacs/patches: patch-src_emacs.c patch-src_sound.c

Log Message:
Fix build for non HPUX on HP PA platforms

Thanks to Riccardo Mottola for testing

No PKGREVISION bump as should not affect build on any previously working platform


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/editors/xemacs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/xemacs/patches/patch-src_emacs.c \
    pkgsrc/editors/xemacs/patches/patch-src_sound.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs/distinfo
diff -u pkgsrc/editors/xemacs/distinfo:1.25 pkgsrc/editors/xemacs/distinfo:1.26
--- pkgsrc/editors/xemacs/distinfo:1.25 Sat Apr 23 10:43:02 2016
+++ pkgsrc/editors/xemacs/distinfo      Sun Jan 22 14:06:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2016/04/23 10:43:02 wiz Exp $
+$NetBSD: distinfo,v 1.26 2017/01/22 14:06:07 abs Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@@ -12,6 +12,8 @@ SHA1 (patch-man_lispref_intro.texi) = 58
 SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
 SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
 SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
+SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f
 SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
+SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20
 SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
 SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448

Added files:

Index: pkgsrc/editors/xemacs/patches/patch-src_emacs.c
diff -u /dev/null pkgsrc/editors/xemacs/patches/patch-src_emacs.c:1.1
--- /dev/null   Sun Jan 22 14:06:07 2017
+++ pkgsrc/editors/xemacs/patches/patch-src_emacs.c     Sun Jan 22 14:06:07 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_emacs.c,v 1.1 2017/01/22 14:06:07 abs Exp $
+
+Fix build for non HPUX on HP PA platforms 
+
+--- src/emacs.c.orig   2015-03-25 11:25:33.000000000 +0000
++++ src/emacs.c
+@@ -2368,7 +2368,7 @@ main_1 (int argc, char **argv, char **en
+ #if defined (WIN32_NATIVE) || defined (CYGWIN)
+   init_win32 ();
+ #endif
+-#if defined (HAVE_NATIVE_SOUND) && defined (hp9000s800)
++#if defined (HAVE_NATIVE_SOUND) && defined (HPUX) && defined (hp9000s800)
+   init_hpplay ();
+ #endif
+ #ifdef HAVE_TTY
Index: pkgsrc/editors/xemacs/patches/patch-src_sound.c
diff -u /dev/null pkgsrc/editors/xemacs/patches/patch-src_sound.c:1.1
--- /dev/null   Sun Jan 22 14:06:07 2017
+++ pkgsrc/editors/xemacs/patches/patch-src_sound.c     Sun Jan 22 14:06:07 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_sound.c,v 1.1 2017/01/22 14:06:07 abs Exp $
+
+Fix build for non HPUX on HP PA platforms 
+
+--- src/sound.c.orig   2015-03-25 11:25:33.000000000 +0000
++++ src/sound.c
+@@ -653,7 +653,7 @@ This variable only applies to native sou
+ */ );
+   Vnative_sound_only_on_console = Qt;
+ 
+-#if defined (HAVE_NATIVE_SOUND) && defined (hp9000s800)
++#if defined (HAVE_NATIVE_SOUND) && defined (HPUX) && defined (hp9000s800)
+   {
+     void vars_of_hpplay (void);
+     vars_of_hpplay ();