CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 10 20:03:49 UTC 2017

Modified Files:
        pkgsrc/lang/clisp: Makefile options.mk
        pkgsrc/lang/gforth: Makefile

Log Message:
Switch from ffcall to libffcall (newer version of same).

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/lang/clisp/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/clisp/options.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/gforth/Makefile

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

Modified files:

Index: pkgsrc/lang/clisp/Makefile
diff -u pkgsrc/lang/clisp/Makefile:1.109 pkgsrc/lang/clisp/Makefile:1.110
--- pkgsrc/lang/clisp/Makefile:1.109    Sun Oct  9 21:41:59 2016
+++ pkgsrc/lang/clisp/Makefile  Sun Sep 10 20:03:49 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2016/10/09 21:41:59 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2017/09/10 20:03:49 wiz Exp $
 
 DISTNAME=              clisp-2.49
-PKGREVISION=           23
+PKGREVISION=           24
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=clisp/}
 #EXTRACT_SUFX=         .tar.bz2

Index: pkgsrc/lang/clisp/options.mk
diff -u pkgsrc/lang/clisp/options.mk:1.12 pkgsrc/lang/clisp/options.mk:1.13
--- pkgsrc/lang/clisp/options.mk:1.12   Tue Sep 20 14:10:25 2016
+++ pkgsrc/lang/clisp/options.mk        Sun Sep 10 20:03:49 2017
@@ -1,16 +1,12 @@
-# $NetBSD: options.mk,v 1.12 2016/09/20 14:10:25 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2017/09/10 20:03:49 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.clisp
 
+PKG_SUPPORTED_OPTIONS+=                doc
 # this option is essential for some others to work:
 PKG_SUPPORTED_OPTIONS+=                ffcall
-
-PKG_SUPPORTED_OPTIONS+=                readline
-
 PKG_SUPPORTED_OPTIONS+=                gmalloc
-
-PKG_SUPPORTED_OPTIONS+=                doc
-
+PKG_SUPPORTED_OPTIONS+=                readline
 PKG_SUGGESTED_OPTIONS+=                ffcall readline doc
 
 # CLISP doesn't work with jemalloc:
@@ -37,7 +33,7 @@ CONFIGURE_ARGS+=      --with-gmalloc
 
 .if !empty(PKG_OPTIONS:Mffcall)
 CONFIGURE_ARGS+=       --with-dynamic-ffi
-.  include "../../devel/ffcall/buildlink3.mk"
+.  include "../../devel/libffcall/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mreadline)
@@ -120,7 +116,7 @@ CONFIGURE_ENV+=             PS2PDF= ac_cv_prog_PS2P
 # .include "../../devel/zlib/buildlink3.mk"
 # .endif
 
-## ffcall is required for some other options to work:
+## libffcall is required for some other options to work:
 # .if !empty(PKG_OPTIONS:Mpgsql) && empty(PKG_OPTIONS:Mffcall)
 # PKG_OPTIONS+=  ffcall
 # .endif

Index: pkgsrc/lang/gforth/Makefile
diff -u pkgsrc/lang/gforth/Makefile:1.40 pkgsrc/lang/gforth/Makefile:1.41
--- pkgsrc/lang/gforth/Makefile:1.40    Sat Jul  9 06:38:25 2016
+++ pkgsrc/lang/gforth/Makefile Sun Sep 10 20:03:49 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/09/10 20:03:49 wiz Exp $
 
 DISTNAME=              gforth-0.7.3
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=gforth/}
 MASTER_SITES+=         http://www.complang.tuwien.ac.at/forth/gforth/
@@ -69,5 +69,5 @@ GCC_REQD+=    4.3
 #.include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
-.include "../../devel/ffcall/buildlink3.mk"
+.include "../../devel/libffcall/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"