CVS commit: pkgsrc/pkgtools/pkg_notify

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 24 13:43:41 UTC 2020

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

Log Message:
pkg_notify: update to 0.4.7.

Improve github release detection.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/pkgtools/pkg_notify/Makefile
cvs rdiff -u -r1.5 -r1.6 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.30 pkgsrc/pkgtools/pkg_notify/Makefile:1.31
--- pkgsrc/pkgtools/pkg_notify/Makefile:1.30    Sun Aug 11 13:22:36 2019
+++ pkgsrc/pkgtools/pkg_notify/Makefile Mon Aug 24 13:43:40 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:22:36 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2020/08/24 13:43:40 wiz Exp $
 
-PKGNAME=       pkg_notify-0.4.6
-PKGREVISION=   2
+PKGNAME=       pkg_notify-0.4.7
 CATEGORIES=    pkgtools
 
 MAINTAINER=    imil%gcu.info@localhost

Index: pkgsrc/pkgtools/pkg_notify/files/pkg_notify
diff -u pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.5 pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.6
--- pkgsrc/pkgtools/pkg_notify/files/pkg_notify:1.5     Mon Oct 10 07:42:53 2016
+++ pkgsrc/pkgtools/pkg_notify/files/pkg_notify Mon Aug 24 13:43:41 2020
@@ -16,7 +16,7 @@
 #
 # $ pkg_notify category/package
 #
-# $Id: pkg_notify,v 1.5 2016/10/10 07:42:53 wiz Exp $
+# $Id: pkg_notify,v 1.6 2020/08/24 13:43:41 wiz Exp $
 
 use Net::FTP;
 use LWP::UserAgent;
@@ -576,23 +576,22 @@ foreach (@packages) {
        $master_site = $master_site."/".$hash."/$sfpkgdir";
     }
 
-    # github - look at releases page
-    if ($master_site =~ /github.com/) {
+    # github
+    if ($master_site =~ /github.com/ || $homepage =~ /github.com/) {
        my $project = `cd $pkgpath && $make show-var VARNAME=GITHUB_PROJECT`;
        chomp($project);
-       $master_site =~ s/(.*github.com\/[^\/]+)\/?/$1\/$project\/releases\//;
-       $distname = "v$version";
-       $dist = "v";
+       if ($master_site =~ /github.com/) {
+           # look at releases page
+           $master_site =~ s/(.*github.com\/[^\/]+)\/?/$1\/$project\/releases\//;
+       } else {
+           # homepage only - look at releases page
+           $master_site = $homepage . "/releases/";
+       }
+       $distname = `cd $pkgpath && $make show-var VARNAME=GITHUB_RELEASE`;
+       chomp($distname);
+       $dist = "";
     }
 
-    # github - homepage only - look at releases page
-    if ($homepage =~ /github.com/) {
-       my $project = `cd $pkgpath && $make show-var VARNAME=GITHUB_PROJECT`;
-       chomp($project);
-       $master_site = $homepage . "/releases/";
-       $distname = "v$version";
-       $dist = "v";
-    }
 
     if (($distname eq "") || ($master_site eq "")) {
        print "missing DISTNAME or MASTER_SITES for package $pkgname\n";