gnatcoll-bindings,gnatcoll-db: remove packages moved to main tree

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnatcoll-bindings,gnatcoll-db: remove packages moved to main tree
From: Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 11 Jul 2025 18:21:44 +0000
Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By:	dkazankov
Date:		Fri Jul 11 21:13:25 2025 +0300
Changeset:	959651d97e50bc51cca9a332105a81485c37e377

Modified Files:
	Makefile
Removed Files:
	gnatcoll-bindings/DESCR
	gnatcoll-bindings/Makefile
	gnatcoll-bindings/buildlink3.mk
	gnatcoll-bindings/distinfo
	gnatcoll-bindings/options.mk
	gnatcoll-bindings/patches/patch-Makefile
	gnatcoll-bindings/patches/patch-setup__support.py
	gnatcoll-db/COMMIT_MSG
	gnatcoll-db/DESCR
	gnatcoll-db/Makefile
	gnatcoll-db/buildlink3.mk
	gnatcoll-db/distinfo
	gnatcoll-db/options.mk
	gnatcoll-db/patches/patch-Makefile
	gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
	gnatcoll-db/patches/patch-gnatinspect_Makefile
	gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
	gnatcoll-db/patches/patch-postgres_Makefile
	gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
	gnatcoll-db/patches/patch-sql_Makefile
	gnatcoll-db/patches/patch-sqlite_Makefile
	gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
	gnatcoll-db/patches/patch-xref_Makefile
	gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr

Log Message:
gnatcoll-bindings,gnatcoll-db: remove packages moved to main tree

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=959651d97e50bc51cca9a332105a81485c37e377

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

diffstat:
 Makefile                                           |   2 -
 gnatcoll-bindings/DESCR                            |   4 -
 gnatcoll-bindings/Makefile                         |  56 -----------
 gnatcoll-bindings/buildlink3.mk                    |  21 ----
 gnatcoll-bindings/distinfo                         |   7 --
 gnatcoll-bindings/options.mk                       |  61 -----------
 gnatcoll-bindings/patches/patch-Makefile           |  76 --------------
 gnatcoll-bindings/patches/patch-setup__support.py  |  42 --------
 gnatcoll-db/COMMIT_MSG                             |   3 -
 gnatcoll-db/DESCR                                  |   4 -
 gnatcoll-db/Makefile                               |  64 ------------
 gnatcoll-db/buildlink3.mk                          |  20 ----
 gnatcoll-db/distinfo                               |  20 ----
 gnatcoll-db/options.mk                             |  63 ------------
 gnatcoll-db/patches/patch-Makefile                 | 111 ---------------------
 .../patches/patch-gnatcoll__db2ada_Makefile        |  31 ------
 .../patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr   |  19 ----
 .../patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr    |  15 ---
 ...tch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr |  17 ----
 ...patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr |  17 ----
 gnatcoll-db/patches/patch-gnatinspect_Makefile     |  31 ------
 .../patches/patch-gnatinspect_gnatinspect.gpr      |  19 ----
 gnatcoll-db/patches/patch-postgres_Makefile        |  31 ------
 .../patches/patch-postgres_gnatcoll__postgres.gpr  |  15 ---
 gnatcoll-db/patches/patch-sql_Makefile             |  31 ------
 gnatcoll-db/patches/patch-sqlite_Makefile          |  31 ------
 .../patches/patch-sqlite_gnatcoll__sqlite.gpr      |  15 ---
 gnatcoll-db/patches/patch-xref_Makefile            |  31 ------
 gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr  |  17 ----
 29 files changed, 874 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 76265f4b23..3ba47b484c 100644
--- a/Makefile
+++ b/Makefile
@@ -1307,8 +1307,6 @@ SUBDIR+=	gmpc-lyricsplugin
 SUBDIR+=	gmrender-resurrect-git
 SUBDIR+=	gmrun
 SUBDIR+=	gn-git
-SUBDIR+=	gnatcoll-bindings
-SUBDIR+=	gnatcoll-db
 SUBDIR+=	gnocchi
 SUBDIR+=	gnochm
 SUBDIR+=	gnokii
diff --git a/gnatcoll-bindings/DESCR b/gnatcoll-bindings/DESCR
deleted file mode 100644
index a4d0cfca76..0000000000
--- a/gnatcoll-bindings/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The GNAT Components Collection (GNATcoll) - Bindings
-
-This is the bindings module of the GNAT Components Collection.
-Please refer to individual components for more details.
diff --git a/gnatcoll-bindings/Makefile b/gnatcoll-bindings/Makefile
deleted file mode 100644
index a40feeb8e4..0000000000
--- a/gnatcoll-bindings/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.0 2024/05/13 13:00:00 dkazankov Exp $
-
-DISTNAME=	gnatcoll-bindings-${PKGVERSION_NOREV}
-PKGNAME=	gnatcoll-bindings-25.0.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
-GITHUB_PROJECT=	gnatcoll-bindings
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-HOMEPAGE=	https://github.com/AdaCore/gnatcoll-bindings
-COMMENT=	The GNAT Components Collection (GNATcoll) - Bindings
-LICENSE=	gnu-gpl-v3
-
-USE_TOOLS+=	gmake grep
-
-USE_LANGUAGES=	c c++ ada
-
-GCC_REQD+=	13
-
-USE_GCC_RUNTIME=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
-SUBST_CLASSES+=		fixver
-SUBST_STAGE.fixver=	pre-configure
-SUBST_FILES.fixver=	version_information
-SUBST_SED.fixver=	-e 's,0.0,25.0,g'
-SUBST_MESSAGE.fixver=	Fix version information
-
-MAKE_FLAGS+=	BINDINGS=${BINDINGS:Q}
-MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} BUILD=PROD
-
-USE_PKGSRC_GCC_RUNTIME?=		no
-.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
-MAKE_FLAGS+=				ENABLE_SHARED=yes
-BUILDLINK_DEPMETHOD.xmlada=		full
-BUILDLINK_DEPMETHOD.gprlib=		full
-BUILDLINK_DEPMETHOD.gnatcoll-core=	full
-.else
-MAKE_FLAGS+=				ENABLE_SHARED=no
-.endif
-
-GENERATE_PLIST+= \
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
-
-.include "../../devel/gprbuild/buildlink3.mk"
-.include "../../wip/xmlada/buildlink3.mk"
-.include "../../wip/gprlib/buildlink3.mk"
-.include "../../wip/gnatcoll-core/buildlink3.mk"
-
-.include "../../lang/python/tool.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/gnatcoll-bindings/buildlink3.mk b/gnatcoll-bindings/buildlink3.mk
deleted file mode 100644
index edc3e2dfeb..0000000000
--- a/gnatcoll-bindings/buildlink3.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.0 2024/05/14 09:30:00 dkazankov Exp $
-
-BUILDLINK_TREE+=	gnatcoll-bindings
-
-.if !defined(GNATCOLL_BINDINGS_BUILDLINK3_MK)
-GNATCOLL_BINDINGS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnatcoll-bindings+=	gnatcoll-bindings>=24.0.0
-BUILDLINK_ABI_DEPENDS.gnatcoll-bindings+=	gnatcoll-bindings>=25.0.0
-BUILDLINK_PKGSRCDIR.gnatcoll-bindings?=		../../wip/gnatcoll-bindings
-BUILDLINK_DEPMETHOD.gnatcoll-bindings?=		build
-
-BUILDLINK_CONTENTS_FILTER.gnatcoll-bindings=	\
-	${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr)'
-
-pkgbase := gnatcoll-bindings
-.include "../../mk/pkg-build-options.mk"
-
-.endif
-
-BUILDLINK_TREE+=	-gnatcoll-bindings
diff --git a/gnatcoll-bindings/distinfo b/gnatcoll-bindings/distinfo
deleted file mode 100644
index 4068166cb8..0000000000
--- a/gnatcoll-bindings/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-BLAKE2s (gnatcoll-bindings-25.0.0.tar.gz) = 9b494fc8ac73012d939a6b8764242dd94462e1d3253aabd809ebb5e275e8e08d
-SHA512 (gnatcoll-bindings-25.0.0.tar.gz) = 0cc5b4a1e966b6e05dcfa15e60cb3960894ffe73b9348f0642a972f4d517e535c617893a4080d33095ee62779b14aeb6cdd8a8f0a8b5a6c8e81c94df132420b2
-Size (gnatcoll-bindings-25.0.0.tar.gz) = 299443 bytes
-SHA1 (patch-Makefile) = 26846a3ea97049f543e7c35bdf0565c94ea6afc4
-SHA1 (patch-setup__support.py) = c91171307d3d7781111c89ba3a38ced019eab4e2
diff --git a/gnatcoll-bindings/options.mk b/gnatcoll-bindings/options.mk
deleted file mode 100644
index 845ee29b6a..0000000000
--- a/gnatcoll-bindings/options.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD: options.mk,v 1.0 2024/05/13 15:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.gnatcoll-bindings
-PKG_SUPPORTED_OPTIONS=		gnatcoll-cpp gnatcoll-gmp gnatcoll-iconv gnatcoll-lzma gnatcoll-omp \
-				gnatcoll-python gnatcoll-python3 gnatcoll-readline gnatcoll-syslog gnatcoll-zlib
-PKG_SUGGESTED_OPTIONS=		gnatcoll-cpp gnatcoll-gmp gnatcoll-iconv gnatcoll-lzma gnatcoll-omp \
-				gnatcoll-python3 gnatcoll-readline gnatcoll-syslog gnatcoll-zlib
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-cpp)
-BINDINGS+=	cpp
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-gmp)
-.  include "../../devel/gmp/buildlink3.mk"
-BINDINGS+=	gmp
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-iconv)
-USE_GNU_ICONV=	yes
-.  include "../../converters/libiconv/buildlink3.mk"
-BINDINGS+=		iconv
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-lzma)
-BINDINGS+=	lzma
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-omp)
-BINDINGS+=	omp
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-python)
-# Python 2 only binding
-PYTHON_VERSIONS_ACCEPTED+=		27
-.  include "../../lang/python/pyversion.mk"
-BINDINGS+=	python
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-python3)
-# Python 3 only binding
-PYTHON_VERSIONS_INCOMPATIBLE+=		27
-.  include "../../lang/python/pyversion.mk"
-BINDINGS+=	python3
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-readline)
-.  include "../../devel/readline/buildlink3.mk"
-BINDINGS+=	readline
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-syslog)
-BINDINGS+=	syslog
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-zlib)
-.  include "../../devel/zlib/buildlink3.mk"
-BINDINGS+=	zlib
-.endif
diff --git a/gnatcoll-bindings/patches/patch-Makefile b/gnatcoll-bindings/patches/patch-Makefile
deleted file mode 100644
index d7166c4d34..0000000000
--- a/gnatcoll-bindings/patches/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-Makefile,v 1.0 2024/05/13 21:00:00 dkazankov Exp $
-
-Create Makefile for build
-
---- /dev/null
-+++ Makefile
-@@ -0,0 +1,69 @@
-+prefix ?= $(dir $(shell $(WHICH) gnatls))..
-+ENABLE_SHARED ?= yes
-+BUILD         ?= PROD
-+PROCESSORS    ?= 0
-+TARGET ?= $(shell gcc -dumpmachine)
-+INTEGRATED    ?= no
-+
-+BINDINGS ?= gmp iconv lzma omp python python3 readline syslog zlib
-+
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
-+ifeq ($(NORMALIZED_TARGET),)
-+  $(error No toolchain found for target "$(TARGET)")
-+endif
-+
-+BUILD_DIR     =
-+ifeq ($(ENABLE_SHARED), yes)
-+   LIBRARY_TYPES=static,static-pic,relocatable
-+else
-+   LIBRARY_TYPES=static
-+endif
-+
-+# Used to pass extra options to GPRBUILD, like -d for instance
-+GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
-+
-+all: build
-+
-+.PHONY: build $(BINDINGS)
-+build: $(BINDINGS:%=build-%)
-+
-+build-%:
-+	cd $* && python3 ./setup.py build \
-+	    --jobs=$(PROCESSORS) \
-+	    --library-types=$(LIBRARY_TYPES) \
-+	    --target=$(NORMALIZED_TARGET) \
-+	    --prefix=$(prefix) \
-+	    $(if $(filter yes, $(INTEGRATED)),--integrated,) \
-+	    $(if $(filter DEBUG, $(BUILD_OPTIONS)),--debug,) \
-+	    $(if $(filter readline, $*),--accept-gpl,) \
-+	    $(if $(GPRBUILD_OPTIONS),--gpr-opts $(GPRBUILD_OPTIONS),)
-+	cd ..
-+
-+.PHONY: install
-+install: $(BINDINGS:%=install-%)
-+
-+install-%:
-+	cd $* && python3 ./setup.py install \
-+	    $(if $(GPRINSTALL_OPTIONS),--gpr-opts $(GPRINSTALL_OPTIONS),)
-+	cd ..
-+
-+.PHONY: uninstall
-+uninstall: $(BINDINGS:%=uninstall-%)
-+
-+uninstall-%:
-+	cd $* && python3 ./setup.py uninstall
-+	cd ..
-+
-+.PHONY: clean
-+clean: $(BINDINGS:%=clean-%)
-+
-+clean-%:
-+	cd $* && python3 ./setup.py clean
-+	cd ..
-+
-+.PHONY: test
-+test:
-+	sh testsuite/run-tests
-+
-+.NOTPARALLEL:
diff --git a/gnatcoll-bindings/patches/patch-setup__support.py b/gnatcoll-bindings/patches/patch-setup__support.py
deleted file mode 100644
index bb0c23dd75..0000000000
--- a/gnatcoll-bindings/patches/patch-setup__support.py
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-setup__support.py,v 1.0 2025/02/10 19:00:00 dkazankov Exp $
-
-Fix gprconfig calls
-
---- setup_support.py.orig	2024-07-11 14:49:55.000000000 +0300
-+++ setup_support.py
-@@ -135,24 +135,25 @@
-             if args.target is None:
-                 self.data['target'] = self.run('gcc', '-dumpmachine',
-                                                grab=True)
-+                self.data['canonical_target'] = self.run(
-+                    'gprconfig', '--config=ada',
-+                    '--target=%s' % self.data['target'],
-+                    '--mi-show-compilers',
-+                    grab=r' 1 normalized_target:(\S*)')
-             else:
-                 self.data['target'] = args.target
-+                self.data['canonical_target'] = args.target
- 
-             self.data['jobs'] = args.jobs
-             self.data['integrated'] = args.integrated
--            self.data['canonical_target'] = self.run(
--                'gprconfig', '--config=ada',
--                '--target=%s' % self.data['target'],
--                '--mi-show-compilers',
--                grab=r' 1 normalized_target:(\S*)')
--
--            default_prefix = os.path.dirname(
--                os.path.dirname(
--                    self.run('gprconfig', '--config=ada',
-+
-+            if args.prefix == 'auto':
-+                default_prefix = os.path.dirname(
-+                    os.path.dirname(
-+                        self.run('gprconfig', '--config=ada',
-                              '--target=%s' % self.data['target'],
-                              '--mi-show-compilers',
-                              grab=r' 1 path:(.*)')))
--            if args.prefix == 'auto':
-                 self.data['prefix'] = default_prefix
-             else:
-                 self.data['prefix'] = args.prefix
diff --git a/gnatcoll-db/COMMIT_MSG b/gnatcoll-db/COMMIT_MSG
deleted file mode 100644
index b708a80ab7..0000000000
--- a/gnatcoll-db/COMMIT_MSG
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-GNATCOLL Db - database connectivity for Ada
diff --git a/gnatcoll-db/DESCR b/gnatcoll-db/DESCR
deleted file mode 100644
index 9cfc21f5cb..0000000000
--- a/gnatcoll-db/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The GNAT Components Collection (GNATcoll) - Database packages
-
-This is the DB module of the GNAT Components Collection.
-Please refer to individual components for more details.
diff --git a/gnatcoll-db/Makefile b/gnatcoll-db/Makefile
deleted file mode 100644
index d2324a0124..0000000000
--- a/gnatcoll-db/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.0 2024/05/13 13:00:00 dkazankov Exp $
-
-DISTNAME=	gnatcoll-db-${PKGVERSION_NOREV}
-PKGNAME=	gnatcoll-db-25.0.0
-CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
-GITHUB_PROJECT=	gnatcoll-db
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	dkazankov%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/AdaCore/gnatcoll-db
-COMMENT=	The GNAT Components Collection (GNATcoll) - Database packages
-LICENSE=	gnu-gpl-v3
-
-USE_TOOLS+=	gmake grep
-
-CHECK_PIE_SKIP+=	bin/*
-
-USE_LANGUAGES=	c ada
-
-GCC_REQD+=	13
-
-USE_GCC_RUNTIME=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
-SUBST_CLASSES+=		fixver
-SUBST_STAGE.fixver=	pre-configure
-SUBST_FILES.fixver=	version_information
-SUBST_SED.fixver=	-e 's,0.0,25.0,g'
-SUBST_MESSAGE.fixver=	Fix version information
-
-CONFIGURE_ARGS+=	prefix=${DESTDIR}${PREFIX} BUILD=PROD BUILD_DIRS=${PKG_BUILD_DIRS:Q} \
-			DB_BACKENDS=${DB_BACKENDS:Q}
-MAKE_FLAGS+=		BUILD_DIRS=${PKG_BUILD_DIRS:Q} DB_BACKENDS=${DB_BACKENDS:Q}
-
-USE_PKGSRC_GCC_RUNTIME?=		no
-.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
-CONFIGURE_ARGS+=			ENABLE_SHARED=yes
-BUILDLINK_DEPMETHOD.xmlada=		full
-BUILDLINK_DEPMETHOD.gprlib=		full
-BUILDLINK_DEPMETHOD.gnatcoll-core=	full
-.else
-CONFIGURE_ARGS+=			ENABLE_SHARED=no
-.endif
-
-do-configure:
-	${RUN}${_ULIMIT_CMD} \
-	cd ${WRKSRC} && \
-	${PKGSRC_SETENV} ${CONFIGURE_ENV} \
-	${MAKE_PROGRAM} ${CONFIGURE_ARGS} setup
-
-GENERATE_PLIST+= \
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} bin include lib share \( -type f -or -type l \) -print | ${SORT};
-
-.include "../../devel/gprbuild/buildlink3.mk"
-.include "../../wip/xmlada/buildlink3.mk"
-.include "../../wip/gprlib/buildlink3.mk"
-.include "../../wip/gnatcoll-core/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/gnatcoll-db/buildlink3.mk b/gnatcoll-db/buildlink3.mk
deleted file mode 100644
index 601150ec7d..0000000000
--- a/gnatcoll-db/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.0 2024/05/14 09:30:00 dkazankov Exp $
-
-BUILDLINK_TREE+=	gnatcoll-db
-
-.if !defined(GNATCOLL_DB_BUILDLINK3_MK)
-GNATCOLL_DB_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnatcoll-db+=	gnatcoll-db>=24.0.0
-BUILDLINK_ABI_DEPENDS.gnatcoll-db+=	gnatcoll-db>=25.0.0
-BUILDLINK_PKGSRCDIR.gnatcoll-db?=	../../wip/gnatcoll-db
-BUILDLINK_DEPMETHOD.gnatcoll-db?=	build
-
-BUILDLINK_CONTENTS_FILTER.gnatcoll-db=	\
-	${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|bin/gnatcoll_.*2ada$$|bin/gnatinspect$$)'
-
-pkgbase := gnatcoll-db
-.include "../../mk/pkg-build-options.mk"
-.endif
-
-BUILDLINK_TREE+=	-gnatcoll-db
diff --git a/gnatcoll-db/distinfo b/gnatcoll-db/distinfo
deleted file mode 100644
index 87c99b0b19..0000000000
--- a/gnatcoll-db/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-BLAKE2s (gnatcoll-db-25.0.0.tar.gz) = 644f89eca578ab538daf7c90317a89cfa4736632f141e2d7db5a413d39c0c297
-SHA512 (gnatcoll-db-25.0.0.tar.gz) = 7cd37d33650a16fd72796adda375a62a6368c11b369209686194fe96ad72a8e49094076679824266f88aeb7b1bc592ac1be678fcfaad10b59c7e05f7dd512cf3
-Size (gnatcoll-db-25.0.0.tar.gz) = 2688678 bytes
-SHA1 (patch-Makefile) = 4df53d429089876b42358726fbae55dd4ea90ffd
-SHA1 (patch-gnatcoll__db2ada_Makefile) = dbcec198253c682b952ecdbac4e839eb335c97ec
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr) = e6198437023047531952e4e2c785d84b310382b3
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr) = 4e14ba5302d45b5999e536071fddabebc8066711
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr) = efbc99b713ce6d61fecd5e2971fb51dc7177c7cb
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr) = fb3b09094980a73dc010a5e685604b97e228658d
-SHA1 (patch-gnatinspect_Makefile) = cdf67afd640ca9d42f7c35045caed60c5d16c303
-SHA1 (patch-gnatinspect_gnatinspect.gpr) = e50ec2270c6cd416d3d425cba78f34b9db9fe79f
-SHA1 (patch-postgres_Makefile) = 6077a40aaa5d06a36d95503288ebba0419b7cfd9
-SHA1 (patch-postgres_gnatcoll__postgres.gpr) = 159b99904d4346ce019085f72c731aeadbc4fced
-SHA1 (patch-sql_Makefile) = ac8399e101ae63a32697c9796ea42abd4389555a
-SHA1 (patch-sqlite_Makefile) = fb4ef3d7b91b65bff749818ff6422789876fa7ca
-SHA1 (patch-sqlite_gnatcoll__sqlite.gpr) = 5e6d0831c12ee6e3ee68206da38c2f85dce86a81
-SHA1 (patch-xref_Makefile) = f7216b19eb2ce1d8d85b5668285e79e1a729d571
-SHA1 (patch-xref_gnatcoll__xref.gpr) = 5edb779e6a6067b009c0d284f07965465b097da9
diff --git a/gnatcoll-db/options.mk b/gnatcoll-db/options.mk
deleted file mode 100644
index bac87aeaaa..0000000000
--- a/gnatcoll-db/options.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: options.mk,v 1.0 2024/05/13 15:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.gnatcoll-db
-PKG_SUPPORTED_OPTIONS=		gnatcoll-db2ada gnatcoll-postgres2ada gnatcoll-sqlite2ada gnatcoll-all2ada \
-				gnatcoll-gnatinspect gnatcoll-postgres gnatcoll-sql gnatcoll-sqlite gnatcoll-xref
-PKG_SUGGESTED_OPTIONS=		gnatcoll-db2ada gnatcoll-postgres2ada gnatcoll-sqlite2ada gnatcoll-all2ada \
-				gnatcoll-gnatinspect gnatcoll-postgres gnatcoll-sql gnatcoll-sqlite gnatcoll-xref
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-# Build order is important
-.if !empty(PKG_OPTIONS:Mgnatcoll-sql)
-PKG_BUILD_DIRS+=		sql
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-sqlite)
-#.  include "../../databases/sqlite3/buildlink3.mk"
-PKG_BUILD_DIRS+=		sqlite
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-postgres)
-PKG_BUILD_DIRS+=		postgres
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-xref)
-PKG_BUILD_DIRS+=		xref
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-gnatinspect)
-PKG_BUILD_DIRS+=		gnatinspect
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-postgres) || !empty(PKG_OPTIONS:Mgnatcoll-xref) || \
-    !empty(PKG_OPTIONS:Mgnatcoll-gnatinspect)
-.  include "../../wip/gnatcoll-bindings/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-db2ada) || !empty(PKG_OPTIONS:Mgnatcoll-postgres2ada) || \
-    !empty(PKG_OPTIONS:Mgnatcoll-sqlite2ada) || !empty(PKG_OPTIONS:Mgnatcoll-all2ada)
-PKG_BUILD_DIRS+=		gnatcoll_db2ada
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-postgres) || \
-    !empty(PKG_OPTIONS:Mgnatcoll-postgres2ada) || !empty(PKG_OPTIONS:Mgnatcoll-all2ada)
-.  include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-db2ada)
-DB_BACKENDS+=			db
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-postgres2ada)
-DB_BACKENDS+=			postgres
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-sqlite2ada)
-DB_BACKENDS+=			sqlite
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnatcoll-all2ada)
-DB_BACKENDS+=			all
-.endif
diff --git a/gnatcoll-db/patches/patch-Makefile b/gnatcoll-db/patches/patch-Makefile
deleted file mode 100644
index b98de435d5..0000000000
--- a/gnatcoll-db/patches/patch-Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2025/05/13 21:00:00 dkazankov Exp $
-
-Create single common Makefile to control all components.
-Makefile in gnatcoll_db2ada can build and install four different apps,
-but one at a time. So we need special build and install process for
-this directory.
-
---- /dev/null
-+++ Makefile
-@@ -0,0 +1,101 @@
-+prefix ?= $(dir $(shell $(WHICH) gnatls))..
-+ENABLE_SHARED ?= yes
-+BUILD         ?= PROD
-+PROCESSORS    ?= 0
-+TARGET ?= $(shell gcc -dumpmachine)
-+
-+BUILD_DIRS    ?= sql sqlite postgres xref gnatinspect gnatcoll_db2ada
-+DB_BACKENDS   ?= db postgres sqlite all
-+
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
-+ifeq ($(NORMALIZED_TARGET),)
-+  $(error No toolchain found for target "$(TARGET)")
-+endif
-+
-+ifeq ($(ENABLE_SHARED), yes)
-+   LIBRARY_TYPES=static,static-pic,relocatable
-+else
-+   LIBRARY_TYPES=static
-+endif
-+
-+# Used to pass extra options to GPRBUILD, like -d for instance
-+GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
-+
-+.PHONY: setup
-+setup: $(BUILD_DIRS:%=setup-%)
-+
-+setup-%:
-+	cd $* && \
-+	make prefix=$(prefix) BUILD=$(BUILD) ENABLE_SHARED=$(ENABLE_SHARED) \
-+	    PROCESSORS=$(PROCESSORS) \
-+	    setup
-+	cd ..
-+
-+all: build
-+
-+.PHONY: build $(BUILD_DIRS)
-+build: $(BUILD_DIRS:%=build-%)
-+
-+build-gnatcoll_db2ada: $(DB_BACKENDS:%=build-db2ada-%)
-+
-+build-db2ada-%:
-+	cd gnatcoll_db2ada && \
-+	make GPRBUILD_OPTIONS="$(subst $$,\$$\$$,$(GPRBUILD_OPTIONS))" DB_BACKEND=$* all
-+	cd ..
-+
-+build-%:
-+	cd $* && \
-+	make GPRBUILD_OPTIONS="$(subst $$,\$$\$$,$(GPRBUILD_OPTIONS))" all
-+	cd ..
-+
-+.PHONY: install
-+install: $(BUILD_DIRS:%=install-%)
-+
-+install-gnatcoll_db2ada: $(DB_BACKENDS:%=install-db2ada-%)
-+
-+install-db2ada-%:
-+	cd gnatcoll_db2ada && \
-+	make GPRINSTALL_OPTIONS='$(subst ','',$(GPRINSTALL_OPTIONS))' DB_BACKEND=$* install
-+	cd ..
-+
-+install-%:
-+	cd $* && \
-+	make GPRINSTALL_OPTIONS='$(subst ','',$(GPRINSTALL_OPTIONS))' install
-+	cd ..
-+
-+.PHONY: uninstall
-+uninstall: $(BINDINGS:%=uninstall-%)
-+
-+uninstall-gnatcoll_db2ada: $(DB_BACKENDS:%=uninstall-db2ada-%)
-+
-+uninstall-db2ada-%:
-+	cd gnatcoll_db2ada && \
-+	make GPRINSTALL_OPTIONS='$(subst ','',$(GPRINSTALL_OPTIONS))' DB_BACKEND=$* uninstall
-+	cd ..
-+
-+uninstall-%:
-+	cd $* && \
-+	make GPRINSTALL_OPTIONS='$(subst ','',$(GPRINSTALL_OPTIONS))' uninstall
-+	cd ..
-+
-+.PHONY: clean
-+clean: $(BINDINGS:%=clean-%)
-+
-+clean-gnatcoll_db2ada: $(DB_BACKENDS:%=clean-db2ada-%)
-+
-+clean-db2ada-%:
-+	cd gnatcoll_db2ada && \
-+	make DBBACKEND=$* clean
-+	cd ..
-+
-+clean-%:
-+	cd $* && \
-+	make clean
-+	cd ..
-+
-+.PHONY: test
-+test:
-+	sh testsuite/run-tests
-+
-+.NOTPARALLEL:
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile b/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
deleted file mode 100644
index 269e276f15..0000000000
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-gnatcoll__db2ada_Makefile,v 1.0 2025/02/10 21:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- gnatcoll_db2ada/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ gnatcoll_db2ada/Makefile
-@@ -75,7 +75,7 @@
- # Load current setup if any
- -include makefile.setup
- 
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -91,11 +91,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --mode=usage --no-project --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --mode=usage --no-project --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(GPR_VARS) $(RBD)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
deleted file mode 100644
index 319efa138a..0000000000
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- gnatcoll_db2ada/gnatcoll_all2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_all2ada.gpr
-@@ -23,9 +23,9 @@
- 
- with "../gnatcoll_db_shared.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
--with "gnatcoll_sqlite";
--with "gnatcoll_postgres";
-+with "../sql/gnatcoll_sql";
-+with "../sqlite/gnatcoll_sqlite";
-+with "../postgres/gnatcoll_postgres";
- 
- standard project gnatcoll_all2ada is
- 
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
deleted file mode 100644
index 7dc4016c71..0000000000
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- gnatcoll_db2ada/gnatcoll_db2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_db2ada.gpr
-@@ -23,7 +23,7 @@
- 
- with "../gnatcoll_db_shared.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
-+with "../sql/gnatcoll_sql";
- 
- standard project GNATCOLL_DB2Ada is
- 
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
deleted file mode 100644
index 1b75e61d9b..0000000000
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- gnatcoll_db2ada/gnatcoll_postgres2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_postgres2ada.gpr
-@@ -23,8 +23,8 @@
- 
- with "../gnatcoll_db_shared.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
--with "gnatcoll_postgres";
-+with "../sql/gnatcoll_sql";
-+with "../postgres/gnatcoll_postgres";
- 
- standard project gnatcoll_Postgres2ada is
- 
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
deleted file mode 100644
index 87b46ba367..0000000000
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr
-@@ -23,8 +23,8 @@
- 
- with "../gnatcoll_db_shared.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
--with "gnatcoll_sqlite";
-+with "../sql/gnatcoll_sql";
-+with "../sqlite/gnatcoll_sqlite";
- 
- standard project gnatcoll_sqlite2ada is
- 
diff --git a/gnatcoll-db/patches/patch-gnatinspect_Makefile b/gnatcoll-db/patches/patch-gnatinspect_Makefile
deleted file mode 100644
index 55b564fbdd..0000000000
--- a/gnatcoll-db/patches/patch-gnatinspect_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-gnatinspect_Makefile,v 1.0 2025/02/10 21:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- gnatinspect/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ gnatinspect/Makefile
-@@ -58,7 +58,7 @@
- endif
- 
- TARGET := $(shell gcc -dumpmachine)
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -88,11 +88,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --no-project --mode=usage --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --no-project --mode=usage --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(GPR_VARS) $(RBD)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr b/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
deleted file mode 100644
index cf10ed5a78..0000000000
--- a/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gnatinspect_gnatinspect.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- gnatinspect/gnatinspect.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatinspect/gnatinspect.gpr
-@@ -23,9 +23,9 @@
- 
- with "../gnatcoll_db_shared.gpr";
- with "gnatcoll";
--with "gnatcoll_xref";
--with "gnatcoll_sql";
--with "gnatcoll_sqlite";
-+with "../xref/gnatcoll_xref";
-+with "../sql/gnatcoll_sql";
-+with "../sqlite/gnatcoll_sqlite";
- 
- standard project Gnatinspect is
- 
diff --git a/gnatcoll-db/patches/patch-postgres_Makefile b/gnatcoll-db/patches/patch-postgres_Makefile
deleted file mode 100644
index 242c3235a3..0000000000
--- a/gnatcoll-db/patches/patch-postgres_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-postgres_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- postgres/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ postgres/Makefile	2025-06-06 18:41:18.733713631 +0300
-@@ -66,7 +66,7 @@
- endif
- 
- TARGET := $(shell gcc -dumpmachine)
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -105,11 +105,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(RBD) $(GPR_VARS)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr b/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
deleted file mode 100644
index 019e74a60d..0000000000
--- a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-postgres_gnatcoll__postgres.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- postgres/gnatcoll_postgres.gpr.orig	2023-11-06 12:21:17.000000000 +0200
-+++ postgres/gnatcoll_postgres.gpr
-@@ -23,7 +23,7 @@
- 
- with "gnatcoll_postgres_conf.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
-+with "../sql/gnatcoll_sql";
- 
- library project GnatColl_Postgres is
- 
diff --git a/gnatcoll-db/patches/patch-sql_Makefile b/gnatcoll-db/patches/patch-sql_Makefile
deleted file mode 100644
index 640c13f1c0..0000000000
--- a/gnatcoll-db/patches/patch-sql_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-sql_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- sql/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ sql/Makefile
-@@ -61,7 +61,7 @@
- endif
- 
- TARGET := $(shell gcc -dumpmachine)
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -98,11 +98,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(RBD) $(GPR_VARS)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-sqlite_Makefile b/gnatcoll-db/patches/patch-sqlite_Makefile
deleted file mode 100644
index 768aeff4e3..0000000000
--- a/gnatcoll-db/patches/patch-sqlite_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-sqlite_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- sqlite/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ sqlite/Makefile
-@@ -66,7 +66,7 @@
- endif
- 
- TARGET := $(shell gcc -dumpmachine)
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -106,11 +106,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(RBD)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr b/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
deleted file mode 100644
index 48f3b986c1..0000000000
--- a/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sqlite_gnatcoll__sqlite.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- sqlite/gnatcoll_sqlite.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ sqlite/gnatcoll_sqlite.gpr
-@@ -23,7 +23,7 @@
- 
- with "gnatcoll_sqlite_conf.gpr";
- with "gnatcoll";
--with "gnatcoll_sql";
-+with "../sql/gnatcoll_sql";
- 
- library project GnatColl_Sqlite is
- 
diff --git a/gnatcoll-db/patches/patch-xref_Makefile b/gnatcoll-db/patches/patch-xref_Makefile
deleted file mode 100644
index 4ce9e70257..0000000000
--- a/gnatcoll-db/patches/patch-xref_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-sql_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix target calculation
-Add extra options to gprinstall
-
---- xref/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
-+++ xref/Makefile
-@@ -76,7 +76,7 @@
- # Load current setup if any
- -include makefile.setup
- 
--NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers)))
-+NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig  --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
- ifeq ($(NORMALIZED_TARGET),)
-   $(error No toolchain found for target "$(TARGET)")
- endif
-@@ -99,11 +99,13 @@
- 
- # Used to pass extra options to GPRBUILD, like -d for instance
- GPRBUILD_OPTIONS=
-+GPRINSTALL_OPTIONS=
- 
- BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
- 	$(GPRBUILD_OPTIONS)
- INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
--	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
-+	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
-+	$(GPRINSTALL_OPTIONS)
- CLEANER=gprclean -q $(RBD) $(GPR_VARS)
- UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
- 
diff --git a/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr b/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
deleted file mode 100644
index d1068e3878..0000000000
--- a/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xref_gnatcoll__xref.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
-
-Fix project paths
-
---- xref/gnatcoll_xref.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ xref/gnatcoll_xref.gpr
-@@ -24,8 +24,8 @@
- with "gnatcoll_xref_conf.gpr";
- with "gnatcoll";
- with "gnatcoll_iconv";
--with "gnatcoll_sql";
--with "gnatcoll_sqlite";
-+with "../sql/gnatcoll_sql";
-+with "../sqlite/gnatcoll_sqlite";
- 
- library project GnatColl_Xref is
-
Prev by Date: ndevd: initial experimental import
Next by Date: wip/py-isal: import py313-isal-1.7.2
Previous by Thread: ndevd: initial experimental import
Next by Thread: wip/py-isal: import py313-isal-1.7.2
Indexes:
Home | Main Index | Thread Index | Old Index