pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnat-glade: lint package, change dist source

Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By:	dkazankov
Date:		Tue May 20 06:20:49 2025 +0300
Changeset:	4447afca9cfd6c43768aec23cd15776b8ef548f6

Modified Files:
	gnat-glade/DESCR
	gnat-glade/Makefile
	gnat-glade/buildlink3.mk
	gnat-glade/distinfo
	gnat-glade/patches/patch-Dist_gnatdist-config.in
	gnat-glade/patches/patch-configure

Log Message:
gnat-glade: lint package, change dist source

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

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

diffstat:
 gnat-glade/DESCR                                 |  2 +-
 gnat-glade/Makefile                              | 31 ++++++++++++++++--------
 gnat-glade/buildlink3.mk                         |  5 +---
 gnat-glade/distinfo                              | 10 ++++----
 gnat-glade/patches/patch-Dist_gnatdist-config.in |  5 ++--
 gnat-glade/patches/patch-configure               | 19 +++++++++------
 6 files changed, 42 insertions(+), 30 deletions(-)

diffs:
diff --git a/gnat-glade/DESCR b/gnat-glade/DESCR
index 8a2f8744aa..503af731b9 100644
--- a/gnat-glade/DESCR
+++ b/gnat-glade/DESCR
@@ -1,4 +1,4 @@
 GNAT Library for Ada Distributed Environment
 
 Provides implementations of Annex E (Distributed Systems)
-of the ISO standard ISO/IEC 8652:1995/COR1:2000 for GNAT.
\ No newline at end of file
+of the ISO standard ISO/IEC 8652:1995/COR1:2000 for GNAT.
diff --git a/gnat-glade/Makefile b/gnat-glade/Makefile
index 1208067273..0b34d769f1 100644
--- a/gnat-glade/Makefile
+++ b/gnat-glade/Makefile
@@ -1,16 +1,23 @@
 # $NetBSD: Makefile,v 1.0 2024/12/05 14:00:00 dkazankov Exp $
 
+#DISTNAME=	${PKG_DISTNAME}
+DISTNAME=	gnat-glade-${PKGVERSION_NOREV}
 PKGNAME=	gnat-glade-6.0.1
 CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dkazankov/}
+GITHUB_PROJECT=	gnat-glade
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+# Original sourceforge site periodically loses the snapshot,
+# so we use github clone
+#DISTFILES=	${PKG_DISTNAME}.zip
+#SITES.${PKG_DISTNAME}.zip=	-https://sourceforge.net/code-snapshots/svn/g/gn/gnat-glade/code/${PKG_DISTNAME}.zip
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://sourceforge.net/projects/gnat-glade/
 COMMENT=	GNAT Library for Ada Distributed Environment
 LICENSE=	gnu-gpl-v2
 
-DISTNAME=	gnat-glade-code-r135-trunk
-DISTFILES=	${DISTNAME}.zip
-
-SITES.${DISTNAME}.zip=	-https://sourceforge.net/code-snapshots/svn/g/gn/gnat-glade/code/gnat-glade-code-r135-trunk.zip
+#PKG_DISTNAME=	gnat-glade-code-r135-trunk
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
@@ -19,18 +26,22 @@ CHECK_PIE_SKIP+=	bin/*
 CHECK_RELRO_SKIP+=	bin/*
 
 USE_LANGUAGES=	c ada
-
+# This component now throws an error when compiled with GNAT 6 or 10
 GCC_REQD+=	13
 
-GENERATE_PLIST+= \
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} bin include lib \( -type f -or -type l \) -print | ${SORT};
-
 .include "../../mk/bsd.prefs.mk"
 
+SUBST_CLASSES+=			replace-shell
+SUBST_MESSAGE.replace-shell=	Replace shell in ${SUBST_FILES.replace-shell}
+SUBST_STAGE.replace-shell=	pre-configure
+SUBST_FILES.replace-shell=	Dist/gnatdist-config.in
+SUBST_VARS.replace-shell=	SHELL
+
 post-patch:
 	chmod +x ${WRKSRC}/Dist/config.sdefault
 
-.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
+GENERATE_PLIST+= \
+	cd ${DESTDIR}${PREFIX} && \
+	${FIND} bin include lib \( -type f -or -type l \) -print | ${SORT};
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnat-glade/buildlink3.mk b/gnat-glade/buildlink3.mk
index cf59f6dba9..b2c0b12354 100644
--- a/gnat-glade/buildlink3.mk
+++ b/gnat-glade/buildlink3.mk
@@ -6,12 +6,9 @@ BUILDLINK_TREE+=	gnat-glade
 GNAT_GLADE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnat-glade+=	gnat-glade>=6.0.1
-BUILDLINK_PKGSRCDIR.gnat-glade=	../../wip/gnat-glade
+BUILDLINK_PKGSRCDIR.gnat-glade?=	../../wip/gnat-glade
 BUILDLINK_DEPMETHOD.gnat-glade?=	build
 
-BUILDLINK_AUTO_VARS.gnat-glade=	no
-BUILDLINK_AUTO_DIRS.gnat-glade=	no
-
 .endif
 
 BUILDLINK_TREE+=	-gnat-glade
diff --git a/gnat-glade/distinfo b/gnat-glade/distinfo
index 014d820187..a3f72bd2e0 100644
--- a/gnat-glade/distinfo
+++ b/gnat-glade/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.3 2024/05/02 14:00:00 dkazankov Exp $
 
-BLAKE2s (gnat-glade-code-r135-trunk.zip) = f2458d3696ce885fd2356461038b1bba102006aa5f24680cf601a1ba2da4865b
-SHA512 (gnat-glade-code-r135-trunk.zip) = feea72177d405c02378f32aff22f673cf57b9f629e5e82a0c51d537309507ff80e450838c3d19e1ba26fc90c6eccac8b1b7a2ee34ec98be0993d2462adc89b13
-Size (gnat-glade-code-r135-trunk.zip) = 3885324 bytes
+BLAKE2s (gnat-glade-6.0.1.tar.gz) = c975f8e27eab2eaec271f8d82a01eb4cb7edb99fcb7851960ce094448fb364b0
+SHA512 (gnat-glade-6.0.1.tar.gz) = d99852b7c1ef209a06b50b187db8ab5d4527722a52ea3234c727638e5680f1db867b37d6a49ce28e29d8f207c016d4c6bc7f190f8163833933327d079fd9660c
+Size (gnat-glade-6.0.1.tar.gz) = 3004733 bytes
 SHA1 (patch-Dist_Makefile.in) = 1c9a63dbe5e17e80c81647519d215b8887b544a4
 SHA1 (patch-Dist_config.sdefault) = 7fb3e662a2d565f0c40ad627cda74574ed3ebddd
-SHA1 (patch-Dist_gnatdist-config.in) = fa477f338c01ba6a9f81e0c3af84dbe2c8b1e76b
+SHA1 (patch-Dist_gnatdist-config.in) = 058e96f15d5642092ace7855274521d52fafedbe
 SHA1 (patch-Dist_xe.adb) = 163bf676015a40f5fc4187159c7e16086db22359
 SHA1 (patch-Dist_xe__back-garlic.adb) = 9a66d461624621843abba99f8e8f5df4aa75e457
 SHA1 (patch-Dist_xe__back-polyorb.adb) = b2ee5226af5d51af7ca0236fc02d7bcf0489a716
@@ -45,4 +45,4 @@ SHA1 (patch-Garlic_s-shasto.adb) = 2e76771ee23baa7a0cd5b24863fbe39ba89653f9
 SHA1 (patch-Garlic_s-shasto.ads) = f086c4f186143093b85f66fd5d5d7b88958d75d2
 SHA1 (patch-Garlic_s-stratt.adb) = 0684c2df09d7d74eb3f0141585875e13c31e2a6c
 SHA1 (patch-Garlic_select.c) = 0db5132fcc2184cc685cd6886b87645f73e31e04
-SHA1 (patch-configure) = 382ee31ce75432160186899ff81a18fba65ee245
+SHA1 (patch-configure) = d4486e11d338df24b573a5dc299f11ff49e9a0ca
diff --git a/gnat-glade/patches/patch-Dist_gnatdist-config.in b/gnat-glade/patches/patch-Dist_gnatdist-config.in
index b61968edb6..b873684ab9 100644
--- a/gnat-glade/patches/patch-Dist_gnatdist-config.in
+++ b/gnat-glade/patches/patch-Dist_gnatdist-config.in
@@ -4,8 +4,8 @@ Create configuration helper for building applications
 
 --- /dev/null
 +++ Dist/gnatdist-config.in
-@@ -0,0 +1,165 @@
-+#!/bin/sh
+@@ -0,0 +1,164 @@
++#!@SHELL@
 +
 +# This script provides tool chain command line switches used to build
 +# applications that use garlic.
@@ -169,4 +169,3 @@ Create configuration helper for building applications
 +if test x"$echo_exec_prefix" = x"true" ; then
 +  echo $exec_prefix
 +fi
-+
diff --git a/gnat-glade/patches/patch-configure b/gnat-glade/patches/patch-configure
index 0da58989cf..04f1575403 100644
--- a/gnat-glade/patches/patch-configure
+++ b/gnat-glade/patches/patch-configure
@@ -26,19 +26,24 @@ Add configuration helper
  #
  # Check for maintainer mode
  #
-@@ -3522,7 +3521,10 @@
+@@ -3521,8 +3520,14 @@
+ 
  echo "$as_me:$LINENO: checking if the Ada compiler is recent enough" >&5
  echo $ECHO_N "checking if the Ada compiler is recent enough... $ECHO_C" >&6
- am_gnatls_date=`$GNATLS -v | $SED -ne 's/^GNATLS .*(\(........\).*$/\1/p'`
+-am_gnatls_date=`$GNATLS -v | $SED -ne 's/^GNATLS .*(\(........\).*$/\1/p'`
 -if test "20041007" -le "$am_gnatls_date"; then
++am_gnatls_date=`$GNATLS -v | $SED -ne 's/^GNATLS .*(\(........\)).*$/\1/p'`
 +if test -z "$am_gnatls_date"; then
 +  echo "$as_me:$LINENO: result: yes" >&5
 +  echo "${ECHO_T}yes" >&6
++elif test "release" -le "$am_gnatls_date"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++  echo "${ECHO_T}yes" >&6
 +elif test "20041007" -le "$am_gnatls_date"; then
    echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
-@@ -3559,6 +3561,7 @@
+@@ -3559,6 +3564,7 @@
      *-linux*)          PLATFORM_SPECIFIC=l;;
      *-*-solaris2*)     PLATFORM_SPECIFIC=s;;
      sparc-sun-sunos4*) PLATFORM_SPECIFIC=u;;
@@ -46,7 +51,7 @@ Add configuration helper
      *)                 ;;
    esac
  
-@@ -3574,6 +3577,7 @@
+@@ -3574,6 +3580,7 @@
      g) PSNAME="SGI";;
      h) PSNAME="HP";;
      b) PSNAME="AIX";;
@@ -54,7 +59,7 @@ Add configuration helper
      e) PSNAME="Empty";;
      *) PSNAME="Unknown target (${target})";;
    esac
-@@ -3596,8 +3600,8 @@
+@@ -3596,8 +3603,8 @@
  
    PROCESS_BLOCKING_IO="no";
    case ${PLATFORM_SPECIFIC} in
@@ -65,7 +70,7 @@ Add configuration helper
      if ./isthrbio; then
        PROCESS_BLOCKING_IO="yes";
      fi;
-@@ -4054,7 +4058,7 @@
+@@ -4054,7 +4061,7 @@
  #
  # Output
  #
@@ -74,7 +79,7 @@ Add configuration helper
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -4633,6 +4639,7 @@
+@@ -4633,6 +4640,7 @@
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "Dist/Makefile" ) CONFIG_FILES="$CONFIG_FILES Dist/Makefile" ;;
    "Dist/xe_defs-defaults.ads" ) CONFIG_FILES="$CONFIG_FILES Dist/xe_defs-defaults.ads" ;;
Home | Main Index | Thread Index | Old Index