diff options
| author | wiz <wiz> | 2016-01-13 22:25:38 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-01-13 22:25:38 +0000 |
| commit | 099b1fec56d1e07e99cf13939f795c2ad1f3f914 (patch) | |
| tree | 4c5aeb37bb8bdb3c2e5cdb27d7938e9198981ee3 /chat/pidgin | |
| parent | cc79c09b32eca5e37f86ca3c7454abeb530a1f55 (diff) | |
| download | pkgsrc-099b1fec56d1e07e99cf13939f795c2ad1f3f914.tar.gz | |
Update pidgin/finch/libpurple to 2.10.12.
gstreamer is not an option any longer.
version 2.10.12 (MM/DD/YY):
Windows-Specific Changes:
* Updates to dependencies:
* Cyrus SASL 2.1.26
* libxml2 2.9.2
* NSS 3.17.3 and NSPR 4.10.7
* Perl 5.20.1
* SILC 1.1.12
* Remove support for Tcl plugins
Gadu-Gadu:
* Updated internal libgadu to version 1.12.1.
Diffstat (limited to 'chat/pidgin')
| -rw-r--r-- | chat/pidgin/Makefile | 9 | ||||
| -rw-r--r-- | chat/pidgin/options.mk | 20 |
2 files changed, 13 insertions, 16 deletions
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile index 7703d204340..ab3f5a0caea 100644 --- a/chat/pidgin/Makefile +++ b/chat/pidgin/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.64 2015/04/25 14:20:28 tnn Exp $ +# $NetBSD: Makefile,v 1.65 2016/01/13 22:25:38 wiz Exp $ COMMENT= Multi-protocol Instant Messaging client GTK frontend -PKGREVISION= 1 .include "../../chat/libpurple/Makefile.common" @@ -18,12 +17,16 @@ CHECK_WRKREF_SKIP= bin/pidgin .include "options.mk" pre-build: - # XXX Find a cleaner way. +# XXX Find a cleaner way. ${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \ ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/. INSTALL_DIRS= pidgin doc +# was an option, but is not as of 2.10.12 +. include "../../multimedia/gstreamer1/buildlink3.mk" +. include "../../multimedia/gst-plugins1-base/buildlink3.mk" + .include "../../chat/libpurple/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk index f71cb1295b7..50a6c30ba6f 100644 --- a/chat/pidgin/options.mk +++ b/chat/pidgin/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.13 2012/08/01 15:26:54 drochner Exp $ +# $NetBSD: options.mk,v 1.14 2016/01/13 22:25:38 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin -PKG_SUPPORTED_OPTIONS+= dbus debug gstreamer gtkspell farsight x11 -PKG_SUGGESTED_OPTIONS+= dbus gstreamer gtkspell farsight x11 +PKG_SUPPORTED_OPTIONS+= dbus debug gtkspell farstream x11 +#PKG_SUGGESTED_OPTIONS+= dbus gtkspell farstream x11 .include "../../mk/bsd.options.mk" @@ -15,17 +15,17 @@ PLIST.dbus= yes . include "../../sysutils/dbus-glib/buildlink3.mk" .endif -# voice/video support requires both farsight and gstreamer -.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer) +# voice/video support requires both farstream +.if !empty(PKG_OPTIONS:Mfarstream) CONFIGURE_ARGS+= --enable-vv PLIST.vv= yes .else CONFIGURE_ARGS+= --disable-vv .endif -.if !empty(PKG_OPTIONS:Mfarsight) +.if !empty(PKG_OPTIONS:Mfarstream) CONFIGURE_ARGS+= --enable-farstream -. include "../../multimedia/farsight2/buildlink3.mk" +. include "../../multimedia/farstream/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mgtkspell) @@ -35,12 +35,6 @@ CONFIGURE_ARGS+= --enable-gtkspell CONFIGURE_ARGS+= --disable-gtkspell .endif -.if !empty(PKG_OPTIONS:Mgstreamer) -CONFIGURE_ARGS+= --enable-gstreamer -. include "../../multimedia/gstreamer0.10/buildlink3.mk" -. include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug .endif |