Update to 0.1.4.

Break out the gstreamer plugins out in slave ports.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18496 df743ca5-7f9a-e211-a948-0013205c9059

12 files changed, 109 insertions, 9 deletions

diff --git a/net-im/libnice-gst010/Makefile b/net-im/libnice-gst010/Makefile
new file mode 100644
index 000000000..680fa45a7
--- /dev/null
+++ b/net-im/libnice-gst010/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+#    $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-gst010
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GStreamer 0.10 plugin from libnice
+
+LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
+
+MASTERDIR=	${.CURDIR}/../libnice
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+BUILD_WRKSRC=	${WRKSRC}/gst
+INSTALL_WRKSRC=	${WRKSRC}/gst
+
+LIBNICE_SLAVE=	gstreamer010
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-im/libnice-gst010/pkg-descr b/net-im/libnice-gst010/pkg-descr
new file mode 100644
index 000000000..7eeae1737
--- /dev/null
+++ b/net-im/libnice-gst010/pkg-descr
@@ -0,0 +1,3 @@
+Gstreamer 0.10 plugin from the libnice port.
+
+WWW: http://nice.freedesktop.org/
diff --git a/net-im/libnice-gst010/pkg-plist b/net-im/libnice-gst010/pkg-plist
new file mode 100644
index 000000000..4ff1e977a
--- /dev/null
+++ b/net-im/libnice-gst010/pkg-plist
@@ -0,0 +1,3 @@
+lib/gstreamer-0.10/libgstnice010.a
+lib/gstreamer-0.10/libgstnice010.la
+lib/gstreamer-0.10/libgstnice010.so
diff --git a/net-im/libnice-gst1/Makefile b/net-im/libnice-gst1/Makefile
new file mode 100644
index 000000000..5fb43aba8
--- /dev/null
+++ b/net-im/libnice-gst1/Makefile
@@ -0,0 +1,22 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD$
+#    $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-gst1
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GStreamer 1 plugin from libnice
+
+LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
+
+MASTERDIR=	${.CURDIR}/../libnice
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+BUILD_WRKSRC=	${WRKSRC}/gst
+INSTALL_WRKSRC=	${WRKSRC}/gst
+
+LIBNICE_SLAVE=	gstreamer1
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-im/libnice-gst1/pkg-descr b/net-im/libnice-gst1/pkg-descr
new file mode 100644
index 000000000..b34b5273d
--- /dev/null
+++ b/net-im/libnice-gst1/pkg-descr
@@ -0,0 +1,3 @@
+Gstreamer 1 plugin from the libnice port.
+
+WWW: http://nice.freedesktop.org/
diff --git a/net-im/libnice-gst1/pkg-plist b/net-im/libnice-gst1/pkg-plist
new file mode 100644
index 000000000..c2cc512a2
--- /dev/null
+++ b/net-im/libnice-gst1/pkg-plist
@@ -0,0 +1,3 @@
+lib/gstreamer-1.0/libgstnice.a
+lib/gstreamer-1.0/libgstnice.la
+lib/gstreamer-1.0/libgstnice.so
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 32392a2c6..b2bb8a09f 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/libnice/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	libnice
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://nice.freedesktop.org/releases/
 
@@ -14,12 +14,34 @@ USE_GMAKE=	yes
 USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 ltverhack
-USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS=	--without-gstreamer --with-gstreamer-0.10
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GETIFADDRS
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	GUPNP
+GUPNP_DESC=	UPnP IGD port mapping support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUPNP}
+LIB_DEPENDS+=	gupnp-igd-1.0:${PORTSDIR}/net/gupnp-igd
+.else
+CONFIGURE_ARGS+=--disable-gupnp
+.endif
+
+.if defined(LIBNICE_SLAVE)
+. if ${LIBNICE_SLAVE}==gstreamer010
+USE_GSTREAMER=	yes
+CONFIGURE_ARGS+=--without-gstreamer --with-gstreamer-0.10
+. endif
+. if ${LIBNICE_SLAVE}==gstreamer1
+USE_GSTREAMER1=	yes
+CONFIGURE_ARGS+=--with-gstreamer --without-gstreamer-0.10
+. endif
+.else
+CONFIGURE_ARGS=	--without-gstreamer --without-gstreamer-0.10
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 	    	's|-Wno-missing-field-initializers|#|g'
diff --git a/net-im/libnice/distinfo b/net-im/libnice/distinfo
index fbc6a2d7b..f24e8fa45 100644
--- a/net-im/libnice/distinfo
+++ b/net-im/libnice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libnice-0.1.3.tar.gz) = 046ce11f66638b54f2e042e7b1fbcc537ec99c27185fb006edbfd80d7f990074
-SIZE (libnice-0.1.3.tar.gz) = 672174
+SHA256 (libnice-0.1.4.tar.gz) = 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57
+SIZE (libnice-0.1.4.tar.gz) = 712256
diff --git a/net-im/libnice/files/patch-Makefile.in b/net-im/libnice/files/patch-Makefile.in
new file mode 100644
index 000000000..1b43415d2
--- /dev/null
+++ b/net-im/libnice/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2013-05-22 07:47:08.000000000 +0000
++++ Makefile.in	2013-05-22 07:47:23.000000000 +0000
+@@ -311,9 +311,7 @@
+ 	agent \
+ 	nice \
+ 	gst \
+-	docs \
+-	tests \
+-	examples
++	docs
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --disable-assert -enable-gtk-doc
+ EXTRA_DIST = \
diff --git a/net-im/libnice/files/patch-gst_Makefile.in b/net-im/libnice/files/patch-gst_Makefile.in
new file mode 100644
index 000000000..43f4f8475
--- /dev/null
+++ b/net-im/libnice/files/patch-gst_Makefile.in
@@ -0,0 +1,11 @@
+--- gst/Makefile.in.orig	2013-05-22 07:56:38.000000000 +0000
++++ gst/Makefile.in	2013-05-22 07:58:56.000000000 +0000
+@@ -319,7 +319,7 @@
+ 	-I $(top_srcdir)/stun
+ 
+ COMMON_LIBADD = \
+-	$(top_builddir)/nice/libnice.la
++	-lnice
+ 
+ 
+ # libgstnice
diff --git a/net-im/libnice/pkg-descr b/net-im/libnice/pkg-descr
index 93cfe2b54..754fbb177 100644
--- a/net-im/libnice/pkg-descr
+++ b/net-im/libnice/pkg-descr
@@ -1,2 +1,4 @@
 Libnice is a library and a transmitter that does ICE (as defined in the ICE-19
 draft), as well as Google Talk and MSN compatible ICE-like protocols.
+
+WWW: http://nice.freedesktop.org/
diff --git a/net-im/libnice/pkg-plist b/net-im/libnice/pkg-plist
index fd0cae2d3..24ce0c3e5 100644
--- a/net-im/libnice/pkg-plist
+++ b/net-im/libnice/pkg-plist
@@ -16,9 +16,6 @@ include/stun/usages/ice.h
 include/stun/usages/timer.h
 include/stun/usages/turn.h
 include/stun/win32_common.h
-lib/gstreamer-0.10/libgstnice010.a
-lib/gstreamer-0.10/libgstnice010.la
-lib/gstreamer-0.10/libgstnice010.so
 lib/libnice.a
 lib/libnice.la
 lib/libnice.so