cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.10.1

Browse Source 
from maintainer
This commit is contained in:
jasper 2011-12-13 14:42:55 +00:00
parent f910a87c26
commit d0be48be4a
6 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.101 2011/12/03 23:04:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.102 2011/12/13 14:42:55 jasper Exp $
SHARED_ONLY= Yes
@ -6,19 +6,18 @@ COMMENT-main= multi-protocol instant messaging client
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.10.0
VERSION= 2.10.1
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
PKGNAME-libpurple= libpurple-${VERSION}
REVISION-main= 1
REVISION-libpurple= 0
.for i in -finch -libpurple
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
.endfor
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
@ -37,19 +36,16 @@ 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 \
drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
png pthread-stubs purple stdc++ xcb-render xcb-shm xcb \
${WANTLIB}
WANTLIB-libpurple= crypto gadu>=5 meanwhile ssl silc>=7 silcclient>=5 \
${WANTLIB}
WANTLIB-finch= X11 ncursesw panelw purple xcb ${WANTLIB} ${MODPY_WANTLIB}
MODULES= devel/gettext \
@ -70,6 +66,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
@ -81,14 +78,13 @@ SEPARATE_BUILD= simple
USE_LIBTOOL= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.67
AUTOCONF_VERSION= 2.68
CONFIGURE_ARGS+= --disable-avahi \
--disable-cap \
--disable-doxygen \
--disable-farsight \
--disable-gevolution \
--disable-gnutls \
--disable-idn \
--disable-nm \
--disable-nss \
--disable-perl \
@ -149,7 +145,7 @@ post-install:
${PREFIX}/share/dbus-1/services
.for dir in ${ARCHIVE_DIR_LIST}
@find ${PREFIX}/lib/${dir} -name '*.a' -print | xargs rm
@find ${PREFIX}/lib/${dir} -name '*.la' -print | xargs rm
.endfor
@find ${PREFIX}/lib -name '*.la' -print | xargs rm
.include <bsd.port.mk>

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.10.0.tar.gz) = uS+D9vB12c2BTTzP+f1srA==
RMD160 (pidgin-2.10.0.tar.gz) = aXpQwh7nVGzpMSd3YLKYIAxBOMY=
SHA1 (pidgin-2.10.0.tar.gz) = 1/xl+x+MfR3mP84Psznh0AjbLaQ=
SHA256 (pidgin-2.10.0.tar.gz) = 8lllX2kEj4TgoL0o5TitPSu45tAJW3ulZVBIJvWhWkE=
SIZE (pidgin-2.10.0.tar.gz) = 14072477
MD5 (pidgin-2.10.1.tar.bz2) = 6vsGtAg6IB/iLTEOiXoZ3Q==
RMD160 (pidgin-2.10.1.tar.bz2) = 9zxVQP0B9irioK4jZDbwZ3Colu8=
SHA1 (pidgin-2.10.1.tar.bz2) = BF7Q/X3+2tpuCC56RWRki1WVAGQ=
SHA256 (pidgin-2.10.1.tar.bz2) = Lyi93F7c1xTWB9dBJsiViufCWGArOSnj5ueD08sb6sg=
SIZE (pidgin-2.10.1.tar.bz2) = 9961580

16
net/pidgin/files/ssl-openssl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssl-openssl.c,v 1.6 2011/10/10 17:17:08 jasper Exp $ */
/* $OpenBSD: ssl-openssl.c,v 1.7 2011/12/13 14:42:55 jasper Exp $ */
/*
* OpenSSL SSL-plugin for purple
@ -274,13 +274,25 @@ ssl_openssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
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

18
net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jasper Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Thu Mar 10 21:20:43 2011
+++ libpurple/plugins/ssl/Makefile.in Fri Mar 11 18:59:03 2011
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.26 2011/12/13 14:42:55 jasper Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Tue Dec 6 03:45:17 2011
+++ libpurple/plugins/ssl/Makefile.in Sun Dec 11 03:18:55 2011
@@ -69,6 +69,12 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -214,6 +220,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
@@ -215,6 +221,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
GNT_VERSION = @GNT_VERSION@
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -398,6 +406,7 @@ EXTRA_DIST = \
@@ -400,6 +408,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
@@ -411,19 +420,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@@ -413,19 +422,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -435,6 +450,7 @@ AM_CPPFLAGS = \
@@ -437,6 +452,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -74,7 +74,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -502,6 +518,8 @@ clean-pluginLTLIBRARIES:
@@ -504,6 +520,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -83,7 +83,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.25 2011/03/13 17:27:11 jas
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(AM_V_CCLD)$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -516,6 +534,7 @@ distclean-compile:
@@ -518,6 +536,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@

3
net/pidgin/pkg/PLIST-finch
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-finch,v 1.6 2011/07/22 06:44:45 jasper Exp $
@comment $OpenBSD: PLIST-finch,v 1.7 2011/12/13 14:42:55 jasper Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@bin bin/finch
@ -62,6 +62,7 @@ lib/gnt/
lib/gnt/irssi.so
lib/gnt/s.so
lib/libgnt.a
lib/libgnt.la
@lib lib/libgnt.so.${LIBgnt_VERSION}
lib/pkgconfig/finch.pc
lib/pkgconfig/gnt.pc

4
net/pidgin/pkg/PLIST-libpurple
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-libpurple,v 1.17 2011/08/22 07:35:34 jasper Exp $
@comment $OpenBSD: PLIST-libpurple,v 1.18 2011/12/13 14:42:55 jasper Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@pkgpath net/pidgin,-libpurple,gtkspell
@ -82,8 +82,10 @@ include/libpurple/version.h
include/libpurple/whiteboard.h
include/libpurple/xmlnode.h
lib/libpurple-client.a
lib/libpurple-client.la
@lib lib/libpurple-client.so.${LIBpurple-client_VERSION}
lib/libpurple.a
lib/libpurple.la
@lib lib/libpurple.so.${LIBpurple_VERSION}
lib/pkgconfig/purple.pc
lib/purple-2/