adasat: change dependencies

* Dependencies changed to updated main pkgsrc's gcc13-gnat and gprbuild
* GPRBuild related issues solved

diff --git a/adasat/Makefile b/adasat/Makefile
index 0be3f23c81b7998a84d85f35199cbfe3ee766261..c6af434c4eb0f56e3e13d8360202a4c63dc349a8 100644 (file)
--- a/adasat/Makefile
+++ b/adasat/Makefile
@@ -20,6 +20,8 @@ CHECK_RELRO_SUPPORTED=        no
 
 USE_LANGUAGES= ada
 
+GCC_REQD+=     13
+
 MAKE_FLAGS=    BUILD_MODE=prod
 BUILD_TARGET=  all-libs
 
@@ -29,10 +31,7 @@ GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
 
-.include "../../wip/gcc14-gnat-libs/buildlink3.mk"
-
-.include "../../wip/gprbuild/buildlink3.mk"
-
-.include "../../wip/gcc14-gnat/gcc.mk"
+.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
+.include "../../devel/gprbuild/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

diff --git a/adasat/distinfo b/adasat/distinfo
index eea878eb5ffa11f833c7ccdbc8c369a27835f738..0e8bb09743191f31d64d0d03e4c39c2838e95954 100644 (file)
--- a/adasat/distinfo
+++ b/adasat/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (AdaSAT-25.0.0.tar.gz) = 82395941685f2006742a211de0129b62097c90c87a47a93da9adbf1ca951f55a
 SHA512 (AdaSAT-25.0.0.tar.gz) = 7781a683c5aef9efa9a6b57e82070184c02d734fcf448aa5aa79d9aaa3b40d181d87d7487d9c204f7dcd584a3d2dc1c9ebc027e82b2532c3418c25a2395fd9af
 Size (AdaSAT-25.0.0.tar.gz) = 30707 bytes
-SHA1 (patch-Makefile) = f8986867042693ce6bacaaec240c73935376ac6b
+SHA1 (patch-Makefile) = cb83a09545fc09ff39e3ce42cbf0c4c64627106d

diff --git a/adasat/patches/patch-Makefile b/adasat/patches/patch-Makefile
index 8620f2d7a2c31d131155803cc81d58106696b6d6..678659ad1f86735b606062ffee493d0627a381d7 100644 (file)
--- a/adasat/patches/patch-Makefile
+++ b/adasat/patches/patch-Makefile
@@ -1,19 +1,27 @@
 $NetBSD: patch-Makefile,v 1.0 2024/08/12 23:00:00 dkazankov Exp $
 
-Add gprbuild options
+Add gprbuild and gprinstall options
 
---- Makefile.orig      2023-09-26 17:17:06.000000000 +0300
-+++ Makefile   2024-08-12 23:37:48.256042496 +0300
-@@ -4,6 +4,8 @@
+--- Makefile.orig      2024-01-03 19:00:52.000000000 +0200
++++ Makefile
+@@ -4,6 +4,9 @@
  BUILD_DIR ?= .
  INSTALL_DIR ?= .
  
 +GPRBUILD_OPTIONS ?= -p -j$(PROCESSORS)
++GPRINSTALL_OPTIONS =
 +
  ALL_LIBRARY_TYPES = static static-pic relocatable
  
  .PHONY: lib
-@@ -16,7 +18,7 @@
+@@ -11,12 +14,13 @@
+       gprbuild -k -P adasat.gpr -p -j$(PROCESSORS) \
+               --relocate-build-tree="$(BUILD_DIR)" \
+               -XLIBRARY_TYPE=$(LIBRARY_TYPE) \
+-              -XBUILD_MODE=$(BUILD_MODE)
++              -XBUILD_MODE=$(BUILD_MODE) \
++              $(GPRBUILD_OPTIONS)
+ 
  .PHONY: all-libs
  all-libs:
        for kind in $(ALL_LIBRARY_TYPES) ; do \
@@ -22,3 +30,11 @@ Add gprbuild options
                        --relocate-build-tree="$(BUILD_DIR)" \
                        -XLIBRARY_TYPE=$$kind \
                        -XBUILD_MODE=$(BUILD_MODE) ; \
+@@ -32,6 +36,7 @@
+                       --prefix="$(INSTALL_DIR)" \
+                       --build-name=$$kind \
+                       --build-var=LIBRARY_TYPE ; \
++                      $(GPRINSTALL_OPTIONS) \
+       done
+ 
+ .PHONY: test