CVS commit: pkgsrc/net/miniupnpc

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Wed May  3 20:13:17 UTC 2023

Modified Files:
        pkgsrc/net/miniupnpc: Makefile distinfo
        pkgsrc/net/miniupnpc/patches: patch-Makefile

Log Message:
miniupnpc: update to version 2.2.4

Changelog:

miniUPnP client Changelog.

2022/02/20:
  upnpc: use of @ to replace local lan address

2021/11/09:
  python module : Allow to specify the root description url


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/miniupnpc/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/miniupnpc/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/miniupnpc/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/net/miniupnpc/Makefile
diff -u pkgsrc/net/miniupnpc/Makefile:1.8 pkgsrc/net/miniupnpc/Makefile:1.9
--- pkgsrc/net/miniupnpc/Makefile:1.8   Mon Apr 11 10:04:38 2022
+++ pkgsrc/net/miniupnpc/Makefile       Wed May  3 20:13:17 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2022/04/11 10:04:38 nikita Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/03 20:13:17 nikita Exp $
 
-DISTNAME=      miniupnpc-2.2.3
+DISTNAME=      miniupnpc-2.2.4
 CATEGORIES=    net
 MASTER_SITES=  http://miniupnp.free.fr/files/download.php?file=
 

Index: pkgsrc/net/miniupnpc/distinfo
diff -u pkgsrc/net/miniupnpc/distinfo:1.10 pkgsrc/net/miniupnpc/distinfo:1.11
--- pkgsrc/net/miniupnpc/distinfo:1.10  Mon Apr 11 10:04:38 2022
+++ pkgsrc/net/miniupnpc/distinfo       Wed May  3 20:13:17 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2022/04/11 10:04:38 nikita Exp $
+$NetBSD: distinfo,v 1.11 2023/05/03 20:13:17 nikita Exp $
 
-BLAKE2s (miniupnpc-2.2.3.tar.gz) = 24b937140e5d792c9a1df1f2ff62a8a144d429214888a87609c4294fdc644c42
-SHA512 (miniupnpc-2.2.3.tar.gz) = 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
-Size (miniupnpc-2.2.3.tar.gz) = 101360 bytes
-SHA1 (patch-Makefile) = 0d518bc727c3ae474d51c6872502ba3f1a819f47
+BLAKE2s (miniupnpc-2.2.4.tar.gz) = ca2006c345695a6218435615b08df40488861f456a2c92ad22aab3fc0624219e
+SHA512 (miniupnpc-2.2.4.tar.gz) = f6515bda86405114016474fef6332c0c09a56b9293cf4391113f549444bab67e7d031af7b94dacff5e7c96d6508527204498c00fb67d6067685ef606b2152595
+Size (miniupnpc-2.2.4.tar.gz) = 102932 bytes
+SHA1 (patch-Makefile) = c9dd195250db498db75ea81e1020b735c379900f
 SHA1 (patch-minissdpc.c) = bb2e5cd4c4cebceb39ad11496ce0d6bf3a1557a4
 SHA1 (patch-miniwget.c) = c4463b91540378c911a1b46db50c3ac4c6efd59e
 SHA1 (patch-upnpc.c) = 2eb87b306095950e6c4f2e599b645a5d876e8ae6

Index: pkgsrc/net/miniupnpc/patches/patch-Makefile
diff -u pkgsrc/net/miniupnpc/patches/patch-Makefile:1.5 pkgsrc/net/miniupnpc/patches/patch-Makefile:1.6
--- pkgsrc/net/miniupnpc/patches/patch-Makefile:1.5     Mon Apr 11 10:04:38 2022
+++ pkgsrc/net/miniupnpc/patches/patch-Makefile Wed May  3 20:13:16 2023
@@ -1,12 +1,11 @@
-$NetBSD: patch-Makefile,v 1.5 2022/04/11 10:04:38 nikita Exp $
+$NetBSD: patch-Makefile,v 1.6 2023/05/03 20:13:16 nikita Exp $
 
 Do not pick pkgsrc libtool on Darwin.
 Use correct installation dirs.
-Avoid non-portable sed in updateversion.
-Fix Makefile rules to account for $(BUILD) (fixed in upstream).
+Build the miniupnpc.pc file
 
---- Makefile.orig      2021-09-28 23:11:31.000000000 +0200
-+++ Makefile   2022-04-11 11:58:41.017331131 +0200
+--- Makefile.orig      2022-10-20 00:49:03.000000000 +0200
++++ Makefile   2023-05-03 22:07:39.354561821 +0200
 @@ -15,7 +15,7 @@
  
  ifneq (, $(findstring darwin, $(OS)))
@@ -16,7 +15,7 @@ Fix Makefile rules to account for $(BUIL
  endif
  ifneq (, $(findstring linux, $(OS)))
  JARSUFFIX=linux
-@@ -157,12 +157,12 @@
+@@ -157,10 +157,11 @@
  INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
  INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin
@@ -25,13 +24,11 @@ Fix Makefile rules to account for $(BUIL
  PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
  
  FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
++FILESTOINSTALL += $(BUILD)/miniupnpc.pc
  ifeq (, $(findstring amiga, $(OS)))
--FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
-+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
+ FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
  endif
- 
- 
-@@ -244,22 +244,22 @@
+@@ -244,7 +245,7 @@
        cp $< $<.bak
        sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $<
  
@@ -40,22 +37,3 @@ Fix Makefile rules to account for $(BUIL
        $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
        $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)$(INSTALLDIRINC)
        $(INSTALL) -d $(DESTDIR)$(INSTALLDIRLIB)
-       $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
- ifeq (, $(findstring amiga, $(OS)))
-       $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
--      ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
-+      ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
-       $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
--      $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
-+      $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
- endif
-       $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
- ifneq (, $(findstring amiga, $(OS)))
--      $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
-+      $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
- else
--      $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
-+      $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
- endif
-       $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
- ifeq (, $(findstring amiga, $(OS)))