CVS commit: pkgsrc/databases/gnats

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jan 15 08:23:57 UTC 2024

Modified Files:
        pkgsrc/databases/gnats: Makefile distinfo
        pkgsrc/databases/gnats/patches: patch-aa

Log Message:
databases/gnats: fix reference to temporary destdir, bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/gnats/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/gnats/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/gnats/patches/patch-aa

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

Modified files:

Index: pkgsrc/databases/gnats/Makefile
diff -u pkgsrc/databases/gnats/Makefile:1.46 pkgsrc/databases/gnats/Makefile:1.47
--- pkgsrc/databases/gnats/Makefile:1.46        Sat Apr 25 16:57:23 2020
+++ pkgsrc/databases/gnats/Makefile     Mon Jan 15 08:23:57 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2020/04/25 16:57:23 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2024/01/15 08:23:57 rillig Exp $
 
 DISTNAME=      gnats-4.2.0
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GNU:=gnats/}
-PKGREVISION=   4
+PKGREVISION=   5
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.gnu.org/software/gnats/
@@ -87,6 +87,7 @@ SUBST_CLASSES+=               gnats
 SUBST_STAGE.gnats=     pre-configure
 SUBST_FILES.gnats=     gnats/Makefile.in gnats/ds-file/mkdb.sh
 SUBST_SED.gnats=       -e "s,%%EGDIR%%,${DESTDIR}${EGDIR},g"
-SUBST_SED.gnats+=      -e "s,%%GNATS_DEFAULTS%%,${DESTDIR}${PREFIX}/share/gnats/defaults,g"
+SUBST_SED.gnats+=      -e "s,%%DESTDIR_GNATS_DEFAULTS%%,${DESTDIR}${PREFIX}/share/gnats/defaults,g"
+SUBST_SED.gnats+=      -e "s,%%GNATS_DEFAULTS%%,${PREFIX}/share/gnats/defaults,g"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/gnats/distinfo
diff -u pkgsrc/databases/gnats/distinfo:1.19 pkgsrc/databases/gnats/distinfo:1.20
--- pkgsrc/databases/gnats/distinfo:1.19        Tue Oct 26 10:09:18 2021
+++ pkgsrc/databases/gnats/distinfo     Mon Jan 15 08:23:57 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 10:09:18 nia Exp $
+$NetBSD: distinfo,v 1.20 2024/01/15 08:23:57 rillig Exp $
 
 BLAKE2s (gnats-4.2.0.tar.gz) = b02dc2a4ab9220469eee6d88de21a81a62097963bf9bd0df980b57df6a29791f
 SHA512 (gnats-4.2.0.tar.gz) = 650faa87206889912e27a27daba4c86292fac90250a88e7e6272cc8488fc19dfd6098bdd450553cd6c2c1d446072a8da9395f1ce7b1cd284596994ce53744152
 Size (gnats-4.2.0.tar.gz) = 1264845 bytes
-SHA1 (patch-aa) = 484254c68f456cc78986af3cefaea6724c4eff81
+SHA1 (patch-aa) = bdbfb76857a4be774490f30bf895929138e46f27
 SHA1 (patch-configure) = e31b335643fa2b2cfbbdd11e299183b3e93ce59c
 SHA1 (patch-gnats_ds-file_mkcat.sh) = b3eff03ae12e9bf3e4e33c3fa8f6d62dbe9ec49c
 SHA1 (patch-gnats_ds-file_mkdb.sh) = 40dd8276d9e43cd48c7ef1011f84049c29670a79

Index: pkgsrc/databases/gnats/patches/patch-aa
diff -u pkgsrc/databases/gnats/patches/patch-aa:1.5 pkgsrc/databases/gnats/patches/patch-aa:1.6
--- pkgsrc/databases/gnats/patches/patch-aa:1.5 Sun Apr 19 19:35:00 2015
+++ pkgsrc/databases/gnats/patches/patch-aa     Mon Jan 15 08:23:57 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2015/04/19 19:35:00 spz Exp $
+$NetBSD: patch-aa,v 1.6 2024/01/15 08:23:57 rillig Exp $
 
 pkgsrcification
 
@@ -24,12 +24,12 @@ pkgsrcification
  install-dist_lispDATA: $(dist_lisp_DATA)
        @$(NORMAL_INSTALL)
 -      @list='$(dist_lisp_DATA)'; test -n "$(lispdir)" || list=; \
-+      @list='$(dist_lisp_DATA)'; test -n "%%GNATS_DEFAULTS%%" || list=; \
++      @list='$(dist_lisp_DATA)'; test -n "%%DESTDIR_GNATS_DEFAULTS%%" || list=; \
        if test -n "$$list"; then \
 -        echo " $(MKDIR_P) '$(DESTDIR)$(lispdir)'"; \
 -        $(MKDIR_P) "$(DESTDIR)$(lispdir)" || exit 1; \
-+        echo " $(MKDIR_P) '%%GNATS_DEFAULTS%%'"; \
-+        $(MKDIR_P) "%%GNATS_DEFAULTS%%" || exit 1; \
++        echo " $(MKDIR_P) '%%DESTDIR_GNATS_DEFAULTS%%'"; \
++        $(MKDIR_P) "%%DESTDIR_GNATS_DEFAULTS%%" || exit 1; \
        fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -38,8 +38,8 @@ pkgsrcification
        while read files; do \
 -        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(lispdir)'"; \
 -        $(INSTALL_DATA) $$files "$(DESTDIR)$(lispdir)" || exit $$?; \
-+        echo " $(INSTALL_DATA) $$files '%%GNATS_DEFAULTS%%/..'"; \
-+        $(INSTALL_DATA) $$files "%%GNATS_DEFAULTS%%/.." || exit $$?; \
++        echo " $(INSTALL_DATA) $$files '%%DESTDIR_GNATS_DEFAULTS%%/..'"; \
++        $(INSTALL_DATA) $$files "%%DESTDIR_GNATS_DEFAULTS%%/.." || exit $$?; \
        done
  
  uninstall-dist_lispDATA:
@@ -48,12 +48,12 @@ pkgsrcification
  install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
        @$(NORMAL_INSTALL)
 -      @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-+      @list='$(dist_pkgdata_DATA)'; test -n "%%GNATS_DEFAULTS%%" || list=; \
++      @list='$(dist_pkgdata_DATA)'; test -n "%%DESTDIR_GNATS_DEFAULTS%%" || list=; \
        if test -n "$$list"; then \
 -        echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
 -        $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
-+        echo " $(MKDIR_P) '%%GNATS_DEFAULTS%%'"; \
-+        $(MKDIR_P) "%%GNATS_DEFAULTS%%" || exit 1; \
++        echo " $(MKDIR_P) '%%DESTDIR_GNATS_DEFAULTS%%'"; \
++        $(MKDIR_P) "%%DESTDIR_GNATS_DEFAULTS%%" || exit 1; \
        fi; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -62,8 +62,8 @@ pkgsrcification
        while read files; do \
 -        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
 -        $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-+        echo " $(INSTALL_DATA) $$files '%%GNATS_DEFAULTS%%'"; \
-+        $(INSTALL_DATA) $$files "%%GNATS_DEFAULTS%%" || exit $$?; \
++        echo " $(INSTALL_DATA) $$files '%%DESTDIR_GNATS_DEFAULTS%%'"; \
++        $(INSTALL_DATA) $$files "%%DESTDIR_GNATS_DEFAULTS%%" || exit $$?; \
        done
  
  uninstall-dist_pkgdataDATA: