The following diff replaces the audio FLAVOR with a Voice/Video FLAVOR. I have received a handul of requests for this so I thought it's about time I actually add an appropriate FLAVOR for it.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/pidgin/Makefile,v retrieving revision 1.100 diff -u -p -r1.100 Makefile --- Makefile 10 Oct 2011 17:17:08 -0000 1.100 +++ Makefile 19 Oct 2011 11:39:36 -0000 @@ -11,8 +11,9 @@ DISTNAME= pidgin-${VERSION} PKGNAME-main= pidgin-${VERSION} PKGNAME-finch= finch-${VERSION} PKGNAME-libpurple= libpurple-${VERSION} -REVISION-main= 0 -REVISION-libpurple= 0 +REVISION-main= 1 +REVISION-libpurple= 1 +REVISION-finch= 0 .for i in -finch -libpurple FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//} FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g} @@ -37,8 +38,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ - gthread-2.0 m pcre pthread util xml2 z +WANTLIB= c dbus-1 dbus-glib-1 ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ + gthread-2.0 idn m pcre pthread util xml2 z WANTLIB-main= GL X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \ Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm atk-1.0 cairo \ @@ -69,6 +70,7 @@ LIB_DEPENDS-finch= ${LIB_DEPENDS} \ ${MODPY_LIB_DEPENDS} RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS} LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \ + devel/libidn \ devel/silc-toolkit \ net/meanwhile \ net/libgadu>=1.11.0 @@ -84,16 +86,13 @@ AUTOCONF_VERSION= 2.67 CONFIGURE_ARGS+= --disable-avahi \ --disable-cap \ --disable-doxygen \ - --disable-farsight \ --disable-gevolution \ --disable-gnutls \ - --disable-idn \ --disable-nm \ --disable-nss \ --disable-perl \ --disable-tcl \ --disable-tk \ - --disable-vv \ --with-python=${MODPY_BIN} # XXX prevent a fatal error at install phase CONFIGURE_ARGS+= --disable-schemas-install @@ -101,23 +100,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_lib_db_dbopen=no -FLAVORS= audio debug gtkspell +FLAVORS= debug gtkspell vv FLAVOR?= MULTI_PACKAGES= -main -finch -libpurple -.if ${FLAVOR:L:Maudio} -LIB_DEPENDS+= multimedia/gstreamer-0.10/core>=0.10,<=0.11 \ - multimedia/gstreamer-0.10/plugins-base -WANTLIB+= gstreamer-0.10 gstinterfaces-0.10 -LIB_DEPENDS-main+= libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple -LIB_DEPENDS-finch+= libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple -.else -CONFIGURE_ARGS+= --disable-gstreamer -LIB_DEPENDS-main+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple -LIB_DEPENDS-finch+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple -.endif - .if ${FLAVOR:L:Mdebug} CONFIGURE_ARGS+= --enable-debug DEBUG= -O0 -g @@ -128,6 +115,21 @@ LIB_DEPENDS-main+= textproc/gtkspell WANTLIB-main+= enchant gtkspell .else CONFIGURE_ARGS+= --disable-gtkspell +.endif + +.if ${FLAVOR:L:Mvv} +LIB_DEPENDS+= net/farsight2 \ + multimedia/gstreamer-0.10/core>=0.10,<=0.11 \ + multimedia/gstreamer-0.10/plugins-base +WANTLIB+= gstbase-0.10 gstfarsight-0.10 gstinterfaces-0.10 gstreamer-0.10 +LIB_DEPENDS-main+= libpurple-${VERSION}-vv:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-finch+= libpurple-${VERSION}-vv:${BUILD_PKGPATH},-libpurple +PKG_ARGS+= -Dvv=1 +.else +CONFIGURE_ARGS+= --disable-farsight --disable-gstreamer --disable-vv +LIB_DEPENDS-main+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-finch+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple +PKG_ARGS+= -Dvv=0 .endif ARCHIVE_DIR_LIST= finch gnt pidgin purple-2 Index: files/ssl-openssl.c =================================================================== RCS file: /home/cvs/ports/net/pidgin/files/ssl-openssl.c,v retrieving revision 1.6 diff -u -p -r1.6 ssl-openssl.c --- files/ssl-openssl.c 10 Oct 2011 17:17:08 -0000 1.6 +++ files/ssl-openssl.c 11 Oct 2011 03:29:45 -0000 @@ -274,13 +274,25 @@ ssl_openssl_write(PurpleSslConnection *g return (s); } +static GList * +ssl_openssl_peer_certs(PurpleSslConnection *gsc) +{ + return (NULL); +} + static PurpleSslOps ssl_ops = { ssl_openssl_init, ssl_openssl_uninit, ssl_openssl_connect, ssl_openssl_close, ssl_openssl_read, - ssl_openssl_write + ssl_openssl_write, + ssl_openssl_peer_certs, + + /* padding */ + NULL, + NULL, + NULL }; static gboolean Index: pkg/DESCR-main =================================================================== RCS file: /home/cvs/ports/net/pidgin/pkg/DESCR-main,v retrieving revision 1.1 diff -u -p -r1.1 DESCR-main --- pkg/DESCR-main 16 Jun 2009 17:19:41 -0000 1.1 +++ pkg/DESCR-main 19 Oct 2011 11:49:43 -0000 @@ -16,5 +16,5 @@ you to work with Pidgin without requirin be up at all times. Flavors: - audio - Build with gstreamer support - gtkspell - Build with spell checking support + gtkspell - Build with spell checking support + vv - Build with Voice/Video and GStreamer support Index: pkg/PFRAG.vv-main =================================================================== RCS file: pkg/PFRAG.vv-main diff -N pkg/PFRAG.vv-main --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.vv-main 19 Oct 2011 03:54:22 -0000 @@ -0,0 +1,2 @@ +@comment $OpenBSD$ +lib/pidgin/vvconfig.so Index: pkg/PLIST-libpurple =================================================================== RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-libpurple,v retrieving revision 1.17 diff -u -p -r1.17 PLIST-libpurple --- pkg/PLIST-libpurple 22 Aug 2011 07:35:34 -0000 1.17 +++ pkg/PLIST-libpurple 19 Oct 2011 04:00:18 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST-libpurple,v 1.17 2011/08/22 07:35:34 jasper Exp $ @conflict pidgin-<2.5.6p3 @pkgpath net/pidgin +@pkgpath net/pidgin,-libpurple,audio @pkgpath net/pidgin,-libpurple,gtkspell @pkgpath net/pidgin,-libpurple,audio,gtkspell @bin bin/purple-client-example Index: pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-main,v retrieving revision 1.14 diff -u -p -r1.14 PLIST-main --- pkg/PLIST-main 22 Aug 2011 07:35:34 -0000 1.14 +++ pkg/PLIST-main 19 Oct 2011 07:11:14 -0000 @@ -2,6 +2,8 @@ @conflict gaim-* @conflict pidgin-facebookchat-<1.68p0 @pkgpath net/pidgin +@pkgpath net/pidgin,audio +%%vv%% @bin bin/pidgin include/pidgin/ include/pidgin/gtkaccount.h @@ -100,8 +102,6 @@ share/locale/da/LC_MESSAGES/pidgin.mo share/locale/de/LC_MESSAGES/pidgin.mo share/locale/dz/LC_MESSAGES/pidgin.mo share/locale/el/LC_MESSAGES/pidgin.mo -share/locale/en_AU/ -share/locale/en_AU/LC_MESSAGES/ share/locale/en_AU/LC_MESSAGES/pidgin.mo share/locale/en_CA/LC_MESSAGES/pidgin.mo share/locale/en_GB/LC_MESSAGES/pidgin.mo -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.