[pkgsrc/trunk]: pkgsrc/net/gupnp-igd * let to use selected PYTHONBIN and PYTH...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9fc1a8f0b9d7
branches:  trunk
changeset: 583650:9fc1a8f0b9d7
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Dec 25 06:33:11 2010 +0000

description:
* let to use selected PYTHONBIN and PYTHONCONFIG exactly.
* set TEST_TARGET
* fixes for DragonFly.

diffstat:

 net/gupnp-igd/Makefile         |  11 ++++++++++-
 net/gupnp-igd/distinfo         |   6 +++---
 net/gupnp-igd/patches/patch-aa |  13 -------------
 net/gupnp-igd/patches/patch-ab |  14 ++++++++++++--
 net/gupnp-igd/patches/patch-ac |  18 ++++++++++++++++++
 5 files changed, 43 insertions(+), 19 deletions(-)

diffs (103 lines):

diff -r 0e9ac1a4df5b -r 9fc1a8f0b9d7 net/gupnp-igd/Makefile
--- a/net/gupnp-igd/Makefile    Sat Dec 25 06:25:37 2010 +0000
+++ b/net/gupnp-igd/Makefile    Sat Dec 25 06:33:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/15 11:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/25 06:33:11 obache Exp $
 #
 
 DISTNAME=      gupnp-igd-0.1.7
@@ -19,6 +19,15 @@
 PKGCONFIG_OVERRIDE+=   gupnp-igd-1.0.pc.in
 PY_PATCHPLIST= yes
 
+CONFIGURE_ENV+=        PYTHON=${PYTHONBIN:Q}
+
+SUBST_CLASSES+=                pyconfig
+SUBST_STAGE.pyconfig=  pre-configure
+SUBST_VARS.pyconfig=   PYTHONCONFIG
+SUBST_FILES.pyconfig=  python/Makefile.in
+
+TEST_TARGET=   check
+
 .include "../../net/gupnp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.14.0
 .include "../../devel/glib2/buildlink3.mk"
diff -r 0e9ac1a4df5b -r 9fc1a8f0b9d7 net/gupnp-igd/distinfo
--- a/net/gupnp-igd/distinfo    Sat Dec 25 06:25:37 2010 +0000
+++ b/net/gupnp-igd/distinfo    Sat Dec 25 06:33:11 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/08/08 21:10:36 wiz Exp $
+$NetBSD: distinfo,v 1.5 2010/12/25 06:33:11 obache Exp $
 
 SHA1 (gupnp-igd-0.1.7.tar.gz) = b37d44af7172af3e4d0c7f331519bba7e31f752b
 RMD160 (gupnp-igd-0.1.7.tar.gz) = 7176e7bc65b513b41c191366f728c9819a22f8ef
 Size (gupnp-igd-0.1.7.tar.gz) = 362614 bytes
-SHA1 (patch-aa) = 8a503f45207cdf3093b27eb7f8cc8f835cb7d510
-SHA1 (patch-ab) = cfbc76203361b1071f413320f9277472bc214888
+SHA1 (patch-ab) = efbe075328d3d84b39f39727ea4fbabd763b7af8
+SHA1 (patch-ac) = 76cae0ce8589f1f2b8edbffdbeaf4ab668d21691
diff -r 0e9ac1a4df5b -r 9fc1a8f0b9d7 net/gupnp-igd/patches/patch-aa
--- a/net/gupnp-igd/patches/patch-aa    Sat Dec 25 06:25:37 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/06/15 11:48:07 wiz Exp $
-
---- configure.orig     2010-05-19 23:20:58.000000000 +0000
-+++ configure
-@@ -11726,7 +11726,7 @@ if test "x$WANT_PYTHON" = "xyes"; then
- 
-         # Find any Python interpreter.
-     if test -z "$PYTHON"; then
--      for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+      for ac_prog in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff -r 0e9ac1a4df5b -r 9fc1a8f0b9d7 net/gupnp-igd/patches/patch-ab
--- a/net/gupnp-igd/patches/patch-ab    Sat Dec 25 06:25:37 2010 +0000
+++ b/net/gupnp-igd/patches/patch-ab    Sat Dec 25 06:33:11 2010 +0000
@@ -1,9 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2010/08/08 21:10:37 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2010/12/25 06:33:11 obache Exp $
 
-No code outside of targets.
+* Replace bare python-config.
+* No code outside of targets.
 
 --- python/Makefile.in.orig    2010-05-19 23:20:57.000000000 +0000
 +++ python/Makefile.in
+@@ -276,7 +276,7 @@ igd_la_LIBADD = \
+       $(top_builddir)/libgupnp-igd/libgupnp-igd-1.0.la
+ 
+ igd_la_LDFLAGS = \
+-      `python-config --libs`                          \
++      `@PYTHONCONFIG@ --libs`                         \
+       -module -avoid-version
+ 
+ EXTRA_DIST = \
 @@ -640,7 +640,7 @@ uninstall-am: uninstall-pygupnpigdLTLIBR
        pdf pdf-am ps ps-am tags uninstall uninstall-am \
        uninstall-pygupnpigdLTLIBRARIES uninstall-pygupnpigdPYTHON
diff -r 0e9ac1a4df5b -r 9fc1a8f0b9d7 net/gupnp-igd/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gupnp-igd/patches/patch-ac    Sat Dec 25 06:33:11 2010 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2010/12/25 06:33:11 obache Exp $
+
+* DragonFly require additional headers for inet_pton(3).
+
+--- libgupnp-igd/gupnp-simple-igd.c.orig       2010-04-05 17:54:17.000000000 +0000
++++ libgupnp-igd/gupnp-simple-igd.c
+@@ -36,6 +36,11 @@
+ #include "gupnp-simple-igd-marshal.h"
+ 
+ #include <string.h>
++#ifdef __DragonFly__
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#endif
+ #include <arpa/inet.h>
+ 
+ #include <libgupnp/gupnp.h>