CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar  7 20:36:51 UTC 2022

Modified Files:
        pkgsrc/devel/cgen: Makefile
        pkgsrc/editors/TeXmacs: Makefile
        pkgsrc/graphics/denemo: Makefile
        pkgsrc/lang: Makefile
        pkgsrc/math/libmatheval: Makefile
        pkgsrc/print/lilypond: Makefile

Log Message:
*: switch to lang/guile18


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/cgen/Makefile
cvs rdiff -u -r1.149 -r1.150 pkgsrc/editors/TeXmacs/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/graphics/denemo/Makefile
cvs rdiff -u -r1.637 -r1.638 pkgsrc/lang/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/math/libmatheval/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/print/lilypond/Makefile

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

Modified files:

Index: pkgsrc/devel/cgen/Makefile
diff -u pkgsrc/devel/cgen/Makefile:1.2 pkgsrc/devel/cgen/Makefile:1.3
--- pkgsrc/devel/cgen/Makefile:1.2      Sun Nov  3 10:39:08 2019
+++ pkgsrc/devel/cgen/Makefile  Mon Mar  7 20:36:50 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2019/11/03 10:39:08 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2022/03/07 20:36:50 wiz Exp $
 
 DISTNAME=      cgen-20131001
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://sourceware.org/pub/cgen/snapshots/
 EXTRACT_SUFX=  .tar.bz2
@@ -10,7 +11,7 @@ HOMEPAGE=     https://sourceware.org/cgen/
 COMMENT=       CGEN, the Cpu tools GENerator
 LICENSE=       gnu-gpl-v3 # with Red Hat exception
 
-DEPENDS+=      guile-[0-9]*:../../lang/guile
+DEPENDS+=      guile18-[0-9]*:../../lang/guile18
 
 WRKSRC=                ${WRKDIR}/src
 

Index: pkgsrc/editors/TeXmacs/Makefile
diff -u pkgsrc/editors/TeXmacs/Makefile:1.149 pkgsrc/editors/TeXmacs/Makefile:1.150
--- pkgsrc/editors/TeXmacs/Makefile:1.149       Sun Mar  6 13:09:53 2022
+++ pkgsrc/editors/TeXmacs/Makefile     Mon Mar  7 20:36:50 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.149 2022/03/06 13:09:53 gdt Exp $
+# $NetBSD: Makefile,v 1.150 2022/03/07 20:36:50 wiz Exp $
 #
 # changelog at http://www.texmacs.org/tmweb/about/changes.en.html
 
 DISTNAME=              TeXmacs-1.99.13-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            editors
 MASTER_SITES=          ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/
 MASTER_SITES+=         http://www.texmacs.org/Download/ftp/tmftp/source/
@@ -58,7 +58,7 @@ post-install:
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 # Building with guile20 almost succeeds.
 # Building with guile22 fails (apparent use of withdrawn interfaces).
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile18/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/graphics/denemo/Makefile
diff -u pkgsrc/graphics/denemo/Makefile:1.69 pkgsrc/graphics/denemo/Makefile:1.70
--- pkgsrc/graphics/denemo/Makefile:1.69        Wed Dec  8 16:04:50 2021
+++ pkgsrc/graphics/denemo/Makefile     Mon Mar  7 20:36:50 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2021/12/08 16:04:50 adam Exp $
-#
+# $NetBSD: Makefile,v 1.70 2022/03/07 20:36:50 wiz Exp $
 
 DISTNAME=      denemo-0.9.2
-PKGREVISION=   37
+PKGREVISION=   38
 CATEGORIES=    graphics print
 MASTER_SITES=  ${MASTER_SITE_GNU:=denemo/}
 
@@ -36,7 +35,7 @@ post-install:
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 # Depends on lilypond which is still guile 1.8.
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile18/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/lang/Makefile
diff -u pkgsrc/lang/Makefile:1.637 pkgsrc/lang/Makefile:1.638
--- pkgsrc/lang/Makefile:1.637  Thu Feb 24 01:28:12 2022
+++ pkgsrc/lang/Makefile        Mon Mar  7 20:36:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.637 2022/02/24 01:28:12 pho Exp $
+# $NetBSD: Makefile,v 1.638 2022/03/07 20:36:50 wiz Exp $
 #
 
 COMMENT=       Programming languages
@@ -100,7 +100,7 @@ SUBDIR+=    go14
 SUBDIR+=       go19
 SUBDIR+=       gpc
 SUBDIR+=       gprolog
-SUBDIR+=       guile
+SUBDIR+=       guile18
 SUBDIR+=       guile20
 SUBDIR+=       guile22
 SUBDIR+=       gwydion-dylan

Index: pkgsrc/math/libmatheval/Makefile
diff -u pkgsrc/math/libmatheval/Makefile:1.25 pkgsrc/math/libmatheval/Makefile:1.26
--- pkgsrc/math/libmatheval/Makefile:1.25       Sat Mar  5 19:55:53 2022
+++ pkgsrc/math/libmatheval/Makefile    Mon Mar  7 20:36:51 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2022/03/05 19:55:53 gdt Exp $
+# $NetBSD: Makefile,v 1.26 2022/03/07 20:36:51 wiz Exp $
 
 DISTNAME=              libmatheval-1.1.11
+PKGREVISION=           1
 CATEGORIES=            math
 MASTER_SITES=          ${MASTER_SITE_GNU:=libmatheval/}
 
@@ -23,6 +24,6 @@ CONFIGURE_ENV+=               ac_cv_lib_lex="none nee
 # guile 2.0 fails with "matheval.c:33:2: error: #error Neither scm_num2dbl() nor SCM_NUM2DBL available"
 # guile 2.2 fails
 # Upstream has no bugtracker; reported via bug mailinglist 20220305.
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile18/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/lilypond/Makefile
diff -u pkgsrc/print/lilypond/Makefile:1.135 pkgsrc/print/lilypond/Makefile:1.136
--- pkgsrc/print/lilypond/Makefile:1.135        Sat Mar  5 19:53:22 2022
+++ pkgsrc/print/lilypond/Makefile      Mon Mar  7 20:36:51 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.135 2022/03/05 19:53:22 gdt Exp $
+# $NetBSD: Makefile,v 1.136 2022/03/07 20:36:51 wiz Exp $
 
 DISTNAME=      lilypond-2.18.2
-PKGREVISION=   24
+PKGREVISION=   25
 CATEGORIES=    print
 MASTER_SITES=  http://download.linuxaudio.org/lilypond/sources/v2.18/
 
@@ -68,7 +68,7 @@ BUILDLINK_API_DEPENDS.flex+=  flex>=2.6.0
 # maintained versions of guile are not usable, but it does not seem
 # likely that will be fixed.  See e.g.
 #   https://gitlab.com/lilypond/lilypond/-/issues/6163
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile18/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"