CVS commit: pkgsrc/pkgtools/pkg_notify

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May  5 14:59:24 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkg_notify: Makefile
        pkgsrc/pkgtools/pkg_notify/files: pkg_notify

Log Message:
pkg_notify: reduce false positives. Bump version.

For distfiles that are .c, strip .c before transforming version for
comparison. Fixes false positive for qmail-spp-spf.

For distfiles where similarly named debian packaging distfiles are found
in the same directory, don't try to compare against the debian packaging
distfiles. Fixes false positive for ikiwiki.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/pkgtools/pkg_notify/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/pkg_notify/files/pkg_notify

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

Modified files:

Index: pkgsrc/pkgtools/pkg_notify/Makefile
diff -u pkgsrc/pkgtools/pkg_notify/Makefile:1.35 pkgsrc/pkgtools/pkg_notify/Makefile:1.36
--- pkgsrc/pkgtools/pkg_notify/Makefile:1.35    Tue Jun 28 11:35:25 2022
+++ pkgsrc/pkgtools/pkg_notify/Makefile Mon May  5 14:59:23 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2022/06/28 11:35:25 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/05/05 14:59:23 schmonz Exp $
 
-PKGNAME=       pkg_notify-0.4.8
-PKGREVISION=   2
+PKGNAME=       pkg_notify-0.4.9
 CATEGORIES=    pkgtools
 
 MAINTAINER=    imil%gcu.info@localhost
@@ -12,7 +11,6 @@ LICENSE=      modified-bsd
 DEPENDS+=      p5-libwww>=5.76:../../www/p5-libwww
 
 NO_BUILD=              yes
-NO_CONFIGURE=          yes
 USE_TOOLS+=            perl:run
 WRKSRC=                        ${WRKDIR}
 
@@ -23,7 +21,7 @@ CONF_FILES=           ${EGDIR}/${PKGBASE}.list \
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=                        pkg_notify
-SUBST_STAGE.pkg_notify=                build
+SUBST_STAGE.pkg_notify=                do-configure
 SUBST_FILES.pkg_notify=                pkg_notify
 SUBST_FILES.pkg_notify+=       pkg_notify.1
 SUBST_VARS.pkg_notify=         PKGSRCDIR

Index: pkgsrc/pkgtools/pkg_notify/files/pkg_notify
diff -u pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.7 pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.8
--- pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.7     Sun Sep 20 11:25:41 2020
+++ pkgsrc/pkgtools/pkg_notify/files/pkg_notify Mon May  5 14:59:24 2025
@@ -16,7 +16,7 @@
 #
 # $ pkg_notify category/package
 #
-# $Id: pkg_notify,v 1.7 2020/09/20 11:25:41 wiz Exp $
+# $Id: pkg_notify,v 1.8 2025/05/05 14:59:24 schmonz Exp $
 
 use Net::FTP;
 use LWP::UserAgent;
@@ -124,8 +124,9 @@ sub find_version {
        my $line = $_;
        my $wasbad = 0;
 
-       if ($line =~ /([^0-9a-z]$dist|^$dist)([^\/\"<>\@]+)$extract_sufx/) {
+       if ($line =~ /([^0-9a-z]$dist|^$dist)([^\/\"<>\@]+)$extract_sufx/ && $line !~ /\.debian$extract_sufx/) {
            $realdist = $dist.$2.$extract_sufx;
+
            my $lsvers = $2;
 
            # replace alpha|beta|... with .0[num]0.
@@ -162,9 +163,13 @@ sub find_version {
            $lsvers =~ s/[\-\_]/./g;
            $version =~ s/[\-\_]/./g;
 
+           # if file extension is .c, strip it
+           $lsvers =~ s/\.c//g;
+
            # replace remaining chars
            # ex: 3.14a -> 3.14.1, i -> 9
            $lsvers = lc $lsvers;
+
            $lsvers =~ s/([a-z])/.$alnum{$1}/g;
            # numberify official version
            $version = lc $version;