From 30bac3cc9acaeda04bfe782d009f9b8eadb430e4 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 20 Aug 2009 18:48:02 +0000 Subject: [PATCH] If using the 'VAR = value' contruct instead of 'VAR=value', use it everywhere, for consistency. Set this port SHARED_ONLY because it depends on gstreamer which is SHARED_ONLY. Set configure and libtool flags accordingly. Merge PFRAG.shared into PLIST. Comment uneeded libtool generated files (the gstreamer thingy is a loadable module, not a regular lib). Remove trailing blank line from DESCR. ok jasper@ --- net/libnice/Makefile | 44 ++++++++++++++++++++---------------- net/libnice/pkg/DESCR | 1 - net/libnice/pkg/PFRAG.shared | 3 --- net/libnice/pkg/PLIST | 14 ++++-------- 4 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 net/libnice/pkg/PFRAG.shared diff --git a/net/libnice/Makefile b/net/libnice/Makefile index 11d5d4adf7c..2b6fa4e6b45 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,37 +1,43 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2009/08/20 18:48:02 ajacoutot Exp $ -COMMENT= GLib ICE implementation +SHARED_ONLY = Yes -DISTNAME= libnice-0.0.9 +COMMENT = GLib ICE implementation + +DISTNAME = libnice-0.0.9 +PKGNAME = ${DISTNAME}p0 SHARED_LIBS += nice 0.0 # .5.0 -CATEGORIES= net +CATEGORIES = net -HOMEPAGE= http://nice.freedesktop.org/ +HOMEPAGE = http://nice.freedesktop.org/ -MAINTAINER= Tom +MAINTAINER = Tom # LGPLv2.1/MPLv1.1 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= ${HOMEPAGE}/releases/ +MASTER_SITES = ${HOMEPAGE}/releases/ WANTLIB += c glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pcre WANTLIB += xml2 z -MODULES= devel/gettext +MODULES = devel/gettext -BUILD_DEPENDS= ::textproc/gsed +BUILD_DEPENDS = ::textproc/gsed -LIB_DEPENDS= gstbase-0.10,gstreamer-0.10::multimedia/gstreamer-0.10/core - -CONFIGURE_ARGS= --disable-gupnp \ +LIB_DEPENDS = gstbase-0.10,gstreamer-0.10::multimedia/gstreamer-0.10/core + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --disable-static \ + --disable-gupnp \ --with-gstreamer -USE_GMAKE = yes -USE_LIBTOOL= yes -CONFIGURE_STYLE= gnu +USE_GMAKE = yes +USE_LIBTOOL = yes +LIBTOOL_FLAGS = --tag=disable-static .include diff --git a/net/libnice/pkg/DESCR b/net/libnice/pkg/DESCR index 2ad715c1d85..f915b83dd26 100644 --- a/net/libnice/pkg/DESCR +++ b/net/libnice/pkg/DESCR @@ -8,4 +8,3 @@ provides security against some attacks. Existing standards that use ICE include Session Initiation Protocol (SIP) and XMPP Jingle. - diff --git a/net/libnice/pkg/PFRAG.shared b/net/libnice/pkg/PFRAG.shared deleted file mode 100644 index 2c9543f469f..00000000000 --- a/net/libnice/pkg/PFRAG.shared +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ -lib/gstreamer-0.10/libgstnice.so -@lib lib/libnice.so.${LIBnice_VERSION} diff --git a/net/libnice/pkg/PLIST b/net/libnice/pkg/PLIST index fdec1878b2e..1992fa2686b 100644 --- a/net/libnice/pkg/PLIST +++ b/net/libnice/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.2 2009/08/20 18:48:02 ajacoutot Exp $ @bin bin/stunbdc @bin bin/stund include/nice/ @@ -28,15 +27,12 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -lib/gstreamer-0.10/ -lib/gstreamer-0.10/libgstnice.a -lib/gstreamer-0.10/libgstnice.la -lib/libnice.a +@comment lib/gstreamer-0.10/libgstnice.a +@comment lib/gstreamer-0.10/libgstnice.la +lib/gstreamer-0.10/libgstnice.so lib/libnice.la -lib/pkgconfig/ +@lib lib/libnice.so.${LIBnice_VERSION} lib/pkgconfig/nice.pc -share/gtk-doc/ -share/gtk-doc/html/ share/gtk-doc/html/libnice/ share/gtk-doc/html/libnice/NiceAgent.html share/gtk-doc/html/libnice/ch01.html