CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Jun 20 20:45:42 UTC 2023

Modified Files:
        pkgsrc/editors/xemacs-current: Makefile Makefile.common
        pkgsrc/editors/xemacs-current-nox11: Makefile

Log Message:
Carry forward the SunOS sound setup from editors/xemacs (21.4).

I cannot test this right now, but it should at least unbreak the build
on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/xemacs-current-nox11/Makefile

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-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.116 pkgsrc/editors/xemacs-current/Makefile:1.117
--- pkgsrc/editors/xemacs-current/Makefile:1.116        Wed May 24 11:40:11 2023
+++ pkgsrc/editors/xemacs-current/Makefile      Tue Jun 20 20:45:42 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2023/05/24 11:40:11 hauke Exp $
+# $NetBSD: Makefile,v 1.117 2023/06/20 20:45:42 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 .include "Makefile.common"

Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.20 pkgsrc/editors/xemacs-current/Makefile.common:1.21
--- pkgsrc/editors/xemacs-current/Makefile.common:1.20  Sun May 21 00:13:55 2023
+++ pkgsrc/editors/xemacs-current/Makefile.common       Tue Jun 20 20:45:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2023/05/21 00:13:55 hauke Exp $
+# $NetBSD: Makefile.common,v 1.21 2023/06/20 20:45:42 hauke Exp $
 #
 # used by editors/xemacs-current/Makefile
 # used by editors/xemacs-current-nox11/Makefile
@@ -56,6 +56,13 @@ INSTALL_MAKE_FLAGS+= TAR=${TOOLS_PATH.gt
 CPPFLAGS+=     -DTERMINFO
 .endif
 
+.if ${OPSYS} == "SunOS"
+.  if !exists(/usr/demo/SOUND/libaudio.a) && \
+      !exists(/usr/demo/SOUND/lib/libaudio.a)
+CONFIGURE_ARGS+=       --with_sound=none
+.  endif
+.endif
+
 pre-patch:
 .for ci in etc lisp lisp/mule
        rm ${WRKSRC}/${ci}/.cvsignore

Index: pkgsrc/editors/xemacs-current-nox11/Makefile
diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.16 pkgsrc/editors/xemacs-current-nox11/Makefile:1.17
--- pkgsrc/editors/xemacs-current-nox11/Makefile:1.16   Wed May 24 11:40:11 2023
+++ pkgsrc/editors/xemacs-current-nox11/Makefile        Tue Jun 20 20:45:42 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2023/05/24 11:40:11 hauke Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/20 20:45:42 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       *BETA* XEmacs text editor version 21.5 (no X11 support)
 
 .include "../../editors/xemacs-current/Makefile.common"