diff options
| -rw-r--r-- | net/gupnp/Makefile | 11 | ||||
| -rw-r--r-- | net/gupnp/distinfo | 3 | ||||
| -rw-r--r-- | net/gupnp/files/uuid.pc | 6 | ||||
| -rw-r--r-- | net/gupnp/patches/patch-ac | 99 |
4 files changed, 17 insertions, 102 deletions
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile index 79c70324183..a61263e399f 100644 --- a/net/gupnp/Makefile +++ b/net/gupnp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/08/16 09:56:22 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2011/01/30 01:45:25 markd Exp $ # DISTNAME= gupnp-0.13.3 @@ -19,6 +19,15 @@ PKG_DESTDIR_SUPPORT= user-destdir PKGCONFIG_OVERRIDE+= gupnp-1.0.pc.in REPLACE_PYTHON= tools/gupnp-binding-tool +.include "../../mk/bsd.prefs.mk" + +.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" +pre-configure: + cp ${FILESDIR}/uuid.pc ${BUILDLINK_DIR}/lib/pkgconfig/ +.else +.include "../../devel/libuuid/buildlink3.mk" +.endif + .include "../../lang/python/application.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../net/libsoup24/buildlink3.mk" diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo index 9d9579f0590..c8eef45df2b 100644 --- a/net/gupnp/distinfo +++ b/net/gupnp/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.5 2010/05/02 11:20:06 wiz Exp $ +$NetBSD: distinfo,v 1.6 2011/01/30 01:45:25 markd Exp $ SHA1 (gupnp-0.13.3.tar.gz) = 4b19ed373d474b6a4b5f303ffc1e871013b693d6 RMD160 (gupnp-0.13.3.tar.gz) = fb43f8fdc6c282509a87ee113c074b969eb55a6d Size (gupnp-0.13.3.tar.gz) = 529546 bytes SHA1 (patch-ab) = e43380eac64d815fff1a1b62f73e35e1bdfb9633 -SHA1 (patch-ac) = 4eba921645db8ae6067bd755fad5002f4cfbb8dd SHA1 (patch-ad) = 4e6066594153e3ca10b32618fc3afb1144d50d54 SHA1 (patch-ae) = 4601bc1d9c56a509241c99e529ea65fe5bf7986c diff --git a/net/gupnp/files/uuid.pc b/net/gupnp/files/uuid.pc new file mode 100644 index 00000000000..461c42e25b9 --- /dev/null +++ b/net/gupnp/files/uuid.pc @@ -0,0 +1,6 @@ +Name: uuid +Description: Universally unique id library +Version: 0 +Requires: +Cflags: +Libs: diff --git a/net/gupnp/patches/patch-ac b/net/gupnp/patches/patch-ac deleted file mode 100644 index 94d603d033a..00000000000 --- a/net/gupnp/patches/patch-ac +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2010/05/02 11:20:06 wiz Exp $ - ---- configure.orig 2010-04-08 12:31:28.000000000 +0000 -+++ configure -@@ -13007,15 +13007,13 @@ if test -n "$LIBGUPNP_CFLAGS"; then - gmodule-2.0 \\ - gssdp-1.0 >= 0.7.1 \\ - libsoup-2.4 >= 2.4.1 \\ -- libxml-2.0 \\ -- uuid\"") >&5 -+ libxml-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.18 \ - gobject-2.0 >= 2.18 \ - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid") 2>&5 -+ libxml-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -13024,8 +13022,7 @@ if test -n "$LIBGUPNP_CFLAGS"; then - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid" 2>/dev/null` -+ libxml-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13041,15 +13038,13 @@ if test -n "$LIBGUPNP_LIBS"; then - gmodule-2.0 \\ - gssdp-1.0 >= 0.7.1 \\ - libsoup-2.4 >= 2.4.1 \\ -- libxml-2.0 \\ -- uuid\"") >&5 -+ libxml-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.18 \ - gobject-2.0 >= 2.18 \ - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid") 2>&5 -+ libxml-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -13058,8 +13053,7 @@ if test -n "$LIBGUPNP_LIBS"; then - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid" 2>/dev/null` -+ libxml-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -13082,16 +13076,14 @@ fi - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid" 2>&1` -+ libxml-2.0" 2>&1` - else - LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.18 \ - gobject-2.0 >= 2.18 \ - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid" 2>&1` -+ libxml-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGUPNP_PKG_ERRORS" >&5 -@@ -13101,8 +13093,7 @@ fi - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid) were not met: -+ libxml-2.0) were not met: - - $LIBGUPNP_PKG_ERRORS - -@@ -13118,8 +13109,7 @@ $as_echo "$as_me: error: Package require - gmodule-2.0 \ - gssdp-1.0 >= 0.7.1 \ - libsoup-2.4 >= 2.4.1 \ -- libxml-2.0 \ -- uuid) were not met: -+ libxml-2.0) were not met: - - $LIBGUPNP_PKG_ERRORS - |