devel/alire: modify alire-2.0.0

Changes:
* Build process is made insensitive to the pkgsrc's installation path
* Source code version increased to 2.0.0-rc1.
  Distfile name changed to mirror github version, so you need to remove alire-2.0.0.tar.gz in pkgsrc/distfiles (if it exists) before building package

diff --git a/alire/Makefile b/alire/Makefile
index ecef23d11918466707a20a3c48f69a36a3af3acf..c9eec6df91ec2057e122a632ebe0af2931d66ae1 100644 (file)
--- a/alire/Makefile
+++ b/alire/Makefile
@@ -13,25 +13,33 @@ USE_LANGUAGES=      ada
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=      ${PKGNAME}
+DISTNAME=      ${PKGNAME}-rc1
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
-GITHUB_TAG=    v${ALIRE_VERSION}-beta1
+GITHUB_TAG=    v${ALIRE_VERSION}-rc1
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alire-project/}
 
 USE_TOOLS+=    git
 
-NO_CONFIGURE=  yes
+#NO_CONFIGURE= yes
 
 GCC_REQD+=     13
 .include "../../wip/gcc13-gnat/gcc.mk"
 
 .include "../../wip/gprbuild/buildlink3.mk"
 
+CGPRDIR=       ${WRKDIR}/.home
+
+SUBST_CLASSES+=                buildlink
+SUBST_STAGE.buildlink= post-configure
+SUBST_FILES.buildlink= ../.home/buildlink.cgpr
+SUBST_MESSAGE.buildlink=Set work directory path in config project
+SUBST_SED.buildlink=   -e 's,@WRKDIR@,${WRKDIR},g'
+
 MAKE_ENV+=             ALIRE_OS=netbsd
 MAKE_PROGRAM=          gprbuild
 MAKE_FILE=             alr_env
 MAKE_FLAGS=            -j0 -p -P
-BUILD_MAKE_FLAGS=      --config=${PKGDIR}/files/buildlink.cgpr
+BUILD_MAKE_FLAGS=      --config=${CGPRDIR}/buildlink.cgpr
 
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
@@ -48,6 +56,9 @@ post-extract:
        && git submodule init \
        && git submodule update
 
+pre-configure:
+       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${CGPRDIR}/
+
 do-build:
        ${RUN} \
        cd ${WRKSRC} \

diff --git a/alire/distinfo b/alire/distinfo
index 7be30ea632eacd7f9da1f6f60cf18c9b395e4fdd..66ab965a1e9de24d09cc249e247ffca01da55d7d 100644 (file)
--- a/alire/distinfo
+++ b/alire/distinfo
@@ -1,13 +1,13 @@
 $NetBSD$
 
-BLAKE2s (alire-2.0.0.tar.gz) = 3007620776346e821b18fc293c2c3819f296d411270b5ca0943225ffb5f4aacc
-SHA512 (alire-2.0.0.tar.gz) = 02740884625791cb1af2492b9953926de89677020f8209de356a91934c60bfb73792824064d0ada6067d1000f2acf8fa2edaf0f87e54870a40dc0c81702070f2
-Size (alire-2.0.0.tar.gz) = 923553 bytes
+BLAKE2s (alire-2.0.0-rc1.tar.gz) = 8f9dee72c3ae67863dc69e5bfa8e39283602fe9ed1269344e8c39ec29c6657e2
+SHA512 (alire-2.0.0-rc1.tar.gz) = ca9f5746f8dba08a7f17a3e99d42889774360461162da20eb88552c5167f7ba26241fbcdf5ef70949fb56312b342f0d89efdcdc2f138095a345bbaa01f6169ab
+Size (alire-2.0.0-rc1.tar.gz) = 962681 bytes
 SHA1 (patch-alire.gpr) = 571c790ca413b971dd5d676ced8188ed1761b687
 SHA1 (patch-alire__common.gpr) = e1cba2d47d48557b3002ad1f8ced0a5ba6af69f2
 SHA1 (patch-alr.gpr) = 5068ad3dc2efef1aa33dbc57debea6e872f9f70f
 SHA1 (patch-alr__env.gpr) = ec6b800d341aff7cf308457f0dda60bb5cc6a508
 SHA1 (patch-src_alire_alire-platforms.ads) = 49c9173a337855e143c4388ca4510054006d4f11
 SHA1 (patch-src_alire_os__netbsd_alire-check__absolute__path.adb) = f7893dabd3d51d64c708aa690d0c46136ffebc67
-SHA1 (patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb) = b2e1ca596d451a365a7cc567447a1590eb8325d7
-SHA1 (patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb) = 8d1b95a40e5073ce090d8e5b715f1192170a5966
+SHA1 (patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb) = 735f37293b1c7fb6c0d95445f879e00da8e624b5
+SHA1 (patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb) = 9b294ef8f2cf109fb8a9687561fc0c03e84fad84

diff --git a/alire/files/buildlink.cgpr b/alire/files/buildlink.cgpr
index 92477f512c611142ce47119c01f6fd357e74a8f9..6f75ccdbfe81bab1d0ed3a5d2a921101c3d6a295 100644 (file)
--- a/alire/files/buildlink.cgpr
+++ b/alire/files/buildlink.cgpr
@@ -12,7 +12,7 @@ configuration project default is
    
    for Symbolic_Link_Supported use "true";
    for Library_Major_Minor_Id_Supported use "true";
-   for Library_Builder  use "/usr/pkgsrc/wip/alire/work/.buildlink/libexec/gprbuild/gprlib";
+   for Library_Builder  use "@WRKDIR@/.buildlink/libexec/gprbuild/gprlib";
    for Library_Support  use "full";
    for Shared_Library_Prefix use "lib";
    for Shared_Library_Minimum_Switches use ("-shared");
@@ -26,16 +26,16 @@ configuration project default is
    for Library_Encapsulated_Options use ("-shared", "-static-libgcc");
    
    for Toolchain_Version ("Ada") use "GNAT 13.2.0";
-   for Runtime_Dir       ("Ada") use "/usr/pkgsrc/wip/alire/work/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0";
+   for Runtime_Dir       ("Ada") use "@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0";
 
    package Builder is
       for Executable_Suffix use "";
    end Builder;
 
    package Compiler is
-      for Driver                   ("Ada") use "/usr/pkgsrc/wip/alire/work/.gcc/bin/gcc";
-      for Driver              ("C") use "/usr/pkgsrc/wip/alire/work/.gcc/bin/gcc";
-      for Driver              ("C++") use "/usr/pkgsrc/wip/alire/work/.gcc/bin/g++";
+      for Driver                   ("Ada") use "@WRKDIR@/.gcc/bin/gcc";
+      for Driver              ("C") use "@WRKDIR@/.gcc/bin/gcc";
+      for Driver              ("C++") use "@WRKDIR@/.gcc/bin/g++";
       for Language_Kind            ("Ada") use "unit_based";
       for Dependency_Kind          ("Ada") use "ALI_File";
       for Leading_Required_Switches        ("Ada") use
@@ -70,7 +70,7 @@ configuration project default is
            "   Dot_Replacement => ""%d"");";
       for Config_File_Unique    ("Ada") use "False";
       for Leading_Required_Switches ("Ada") use
-        Compiler'Leading_Required_Switches ("Ada") & ("--RTS=/usr/pkgsrc/wip/alire/work/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
+        Compiler'Leading_Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
         
       for Leading_Required_Switches   ("C") use
          ("-c", "-x", "c") & Compiler'Leading_Required_Switches ("C");
@@ -113,9 +113,9 @@ configuration project default is
    package Binder is
       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
       for Driver         ("Ada") use
-          "/usr/pkgsrc/wip/alire/work/.buildlink/libexec/gprbuild/gprbind";
+          "@WRKDIR@/.buildlink/libexec/gprbuild/gprbind";
       for Required_Switches ("Ada") use
-        Binder'Required_Switches ("Ada") & ("--RTS=/usr/pkgsrc/wip/alire/work/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
+        Binder'Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
    end Binder;
    
    package Linker is

diff --git a/alire/patches/patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb b/alire/patches/patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb
index e43641503e813ac0bf4f0c8fcfac8368c96a122f..9fccc5bc7b82e437478fe5559b5b29c03e4ebdaf 100644 (file)
--- a/alire/patches/patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb
+++ b/alire/patches/patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb,v 1.0 2023/12/27 22:00:00 dkazankov Exp $
+$NetBSD: patch-src_alire_os__netbsd_alire-platforms-current__netbsd.adb, v 1.1 2024/03/04 23:00:00 dkazankov Exp $
 
 Add NetBSD support
 
---- /dev/null  2023-12-27 21:54:28.155585723 +0200
-+++ src/alire/os_netbsd/alire-platforms-current__netbsd.adb    2023-12-27 21:51:57.420839908 +0200
-@@ -0,0 +1,34 @@
+--- /dev/null  2024-03-04 23:32:58.950570486 +0200
++++ src/alire/os_netbsd/alire-platforms-current__netbsd.adb    2024-03-04 23:47:58.197854852 +0200
+@@ -0,0 +1,40 @@
 +
 +package body Alire.Platforms.Current is
 +
@@ -14,8 +14,8 @@ Add NetBSD support
 +   -- Detected_Distribution --
 +   ---------------------------
 +
-+   function Detected_Distribution return Platforms.Distributions is
-+      (Platforms.Distro_Unknown);
++   function Detected_Distribution return Platforms.Distributions
++   is (Platforms.Distribution_Unknown);
 +
 +   -----------------------
 +   -- Distribution_Root --
@@ -38,4 +38,10 @@ Add NetBSD support
 +   function Operating_System return Alire.Platforms.Operating_Systems
 +   is (Alire.Platforms.NetBSD);
 +
++   ----------------
++   -- Initialize --
++   ----------------
++
++   procedure Initialize is null;
++
 +end Alire.Platforms.Current;

diff --git a/alire/patches/patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb b/alire/patches/patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb
index aa33b291b145d3192245f3f73347f76e746c9714..19dfca4e635ff301f169cd9644ed97b8ece1bb01 100644 (file)
--- a/alire/patches/patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb
+++ b/alire/patches/patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb,v 1.0 2023/12/27 22:00:00 dkazankov Exp $
+$NetBSD: patch-src_alire_os__netbsd_alire-platforms-folders__netbsd.adb,v 1.1 2024/03/04 23:00:00 dkazankov Exp $
 
 Add NetBSD support
 
---- /dev/null  2023-12-27 21:54:28.155585723 +0200
-+++ src/alire/os_netbsd/alire-platforms-folders__netbsd.adb    2023-10-19 18:04:21.000000000 +0300
+--- /dev/null  2024-03-04 23:32:58.950570486 +0200
++++ src/alire/os_netbsd/alire-platforms-folders__netbsd.adb    2024-03-04 23:27:09.298953043 +0200
 @@ -0,0 +1,34 @@
 +with Ada.Directories;
 +
@@ -17,13 +17,13 @@ Add NetBSD support
 +   -- Cache --
 +   -----------
 +
-+   function Cache return Absolute_Path is (Common.XDG_Cache_Folder);
++   function Cache return Absolute_Path is (Common.XDG_Data_Home);
 +
 +   -----------
 +   -- Config--
 +   -----------
 +
-+   function Config return Absolute_Path is (Common.XDG_Config_Folder);
++   function Config return Absolute_Path is (Common.XDG_Config_Home);
 +
 +   ----------
 +   -- Home --