[Midnightbsd-cvs] mports: net-im/libpurple: Update libpurple to 2.2.1 from pidgin.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 17 00:39:29 EDT 2007
Log Message:
-----------
Update libpurple to 2.2.1 from pidgin.
This is not being used as a MASTER port for pidgin anymore. The PIDGIN_SLAVE concept was seriously broken with our current ports system. This will be fixed at a later time. We're disabling it with gaim or pidgin installed and leaving the port in case we want it for another program.
We should revisit the slave problem later.
Modified Files:
--------------
mports/net-im/libpurple:
Makefile (r1.3 -> r1.4)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
Removed Files:
-------------
mports/net-im/libpurple/files:
patch-Makefile.in
patch-libpurple_plugins_ssl_ssl-nss.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net-im/libpurple/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lnet-im/libpurple/pkg-plist -Lnet-im/libpurple/pkg-plist -u -r1.1 -r1.2
--- net-im/libpurple/pkg-plist
+++ net-im/libpurple/pkg-plist
@@ -15,10 +15,12 @@
include/libpurple/core.h
%%DBUS%%include/libpurple/dbus-bindings.h
%%DBUS%%include/libpurple/dbus-define-api.h
-%%DBUS%%include/libpurple/dbus-maybe.h
+include/libpurple/dbus-maybe.h
%%DBUS%%include/libpurple/dbus-purple.h
%%DBUS%%include/libpurple/dbus-server.h
+%%DBUS%%include/libpurple/dbus-types.h
%%DBUS%%include/libpurple/dbus-useful.h
+include/libpurple/certificate.h
include/libpurple/debug.h
include/libpurple/desktopitem.h
include/libpurple/dnsquery.h
@@ -87,8 +89,8 @@
lib/purple-2/liboscar.la
lib/purple-2/liboscar.so
lib/purple-2/liboscar.so.0
-%%SILC%%lib/purple-2/libsilcpidgin.la
-%%SILC%%lib/purple-2/libsilcpidgin.so
+%%SILC%%lib/purple-2/libsilcpurple.la
+%%SILC%%lib/purple-2/libsilcpurple.so
lib/purple-2/libqq.la
lib/purple-2/libqq.so
%%SAMETIME%%lib/purple-2/libsametime.la
@@ -128,17 +130,27 @@
%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Purple.pm
%%DBUS%%lib/libpurple-client.la
%%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.0
+%%DBUS%%lib/libpurple-client.so.2
lib/libpurple.la
lib/libpurple.so
-lib/libpurple.so.0
+lib/libpurple.so.2
libdata/pkgconfig/purple.pc
share/aclocal/purple.m4
share/gnome/applications/pidgin.desktop
+share/gnome/purple/ca-certs/Equifax_Secure_CA.pem
+share/gnome/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/gnome/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/gnome/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
+share/gnome/sounds/purple/alert.wav
+share/gnome/sounds/purple/login.wav
+share/gnome/sounds/purple/logout.wav
+share/gnome/sounds/purple/receive.wav
+share/gnome/sounds/purple/send.wav
share/locale/af/LC_MESSAGES/pidgin.mo
share/locale/am/LC_MESSAGES/pidgin.mo
share/locale/ar/LC_MESSAGES/pidgin.mo
share/locale/az/LC_MESSAGES/pidgin.mo
+share/locale/be at latin/LC_MESSAGES/pidgin.mo
share/locale/bg/LC_MESSAGES/pidgin.mo
share/locale/bn/LC_MESSAGES/pidgin.mo
share/locale/bs/LC_MESSAGES/pidgin.mo
@@ -171,6 +183,7 @@
share/locale/ko/LC_MESSAGES/pidgin.mo
share/locale/kn/LC_MESSAGES/pidgin.mo
share/locale/ku/LC_MESSAGES/pidgin.mo
+share/locale/lo/LC_MESSAGES/pidgin.mo
share/locale/lt/LC_MESSAGES/pidgin.mo
share/locale/mk/LC_MESSAGES/pidgin.mo
share/locale/my_MM/LC_MESSAGES/pidgin.mo
@@ -189,7 +202,7 @@
share/locale/sl/LC_MESSAGES/pidgin.mo
share/locale/sq/LC_MESSAGES/pidgin.mo
share/locale/sr/LC_MESSAGES/pidgin.mo
-share/locale/sr at Latn/LC_MESSAGES/pidgin.mo
+share/locale/sr at latin/LC_MESSAGES/pidgin.mo
share/locale/sv/LC_MESSAGES/pidgin.mo
share/locale/ta/LC_MESSAGES/pidgin.mo
share/locale/te/LC_MESSAGES/pidgin.mo
@@ -213,6 +226,8 @@
@dirrmtry share/locale/uk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+ at dirrmtry share/locale/sr at latin/LC_MESSAGES
+ at dirrmtry share/locale/sr at latin
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
@dirrmtry share/locale/sl/LC_MESSAGES
@@ -233,6 +248,8 @@
@dirrmtry share/locale/ne
@dirrmtry share/locale/my_MM/LC_MESSAGES
@dirrmtry share/locale/my_MM
+ at dirrmtry share/locale/lo/LC_MESSAGES
+ at dirrmtry share/locale/lo
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@@ -241,8 +258,6 @@
@dirrmtry share/locale/gl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
- at dirrmtry share/locale/en_AU/LC_MESSAGES
- at dirrmtry share/locale/en_AU
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@@ -253,6 +268,11 @@
@dirrmtry share/locale/ca at valencia
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+ at dirrmtry share/locale/be at latin/LC_MESSAGES
+ at dirrmtry share/locale/be at latin
+ at dirrm share/gnome/sounds/purple
+ at dirrm share/gnome/purple/ca-certs
+ at dirrm share/gnome/purple
%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Purple
@dirrm lib/purple-2
@dirrm include/libpurple
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-im/libpurple/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lnet-im/libpurple/Makefile -Lnet-im/libpurple/Makefile -u -r1.3 -r1.4
--- net-im/libpurple/Makefile
+++ net-im/libpurple/Makefile
@@ -8,17 +8,16 @@
#
PORTNAME= libpurple
-PORTVERSION= 2.0.0.b7
-PORTREVISION?= 2
+PORTVERSION= 2.2.1
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pidgin
-DISTNAME= pidgin-2.0.0beta7
+DISTNAME= pidgin-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Backend library for the Pidgin multi-protocol messaging client
-CONFLICTS?= ja-gaim-[0-9]* gaim-1*
+CONFLICTS?= gaim-1* pidgin-2*
USE_BZIP2= yes
USE_GMAKE= yes
@@ -27,8 +26,8 @@
CONFIGURE_ARGS?=--disable-gtkui \
--disable-consoleui \
--with-dynamic_prpls=${PRPL_MODULES}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
.if !defined(PIDGIN_SLAVE)
@@ -52,8 +51,8 @@
PRPL_MODULES= gg,irc,jabber,msn,novell,oscar,qq,simple,yahoo,zephyr
OPTIONS= SILC "Secure Internet Live Conferencing support" off \
- GNUTLS "GNUTLS encryption support" off \
- NSS "Mozilla NSS encryption support" on \
+ GNUTLS "GNUTLS encryption support" on \
+ NSS "Mozilla NSS encryption support" off \
SASL "Cyrus SASL support (for jabberd)" off \
DBUS "Enable DBUS bindings" on \
PERL "Perl scripting" off \
@@ -100,14 +99,14 @@
PLIST_SUB+= CAP="@comment not installed: "
.endif
-.if defined(WITH_GNUTLS)
+.if !defined(WITHOUT_GNUTLS)
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+= --enable-gnutls=yes
.else
CONFIGURE_ARGS+= --enable-gnutls=no
.endif
-.if !defined(WITHOUT_NSS)
+.if defined(WITH_NSS)
LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
CONFIGURE_ARGS+= --enable-nss=yes \
--with-nspr-includes=${LOCALBASE}/include/nspr \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net-im/libpurple/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lnet-im/libpurple/distinfo -Lnet-im/libpurple/distinfo -u -r1.1 -r1.2
--- net-im/libpurple/distinfo
+++ net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.0.0beta7.tar.bz2) = c99250bb52453beff56c3ec1c5dac853
-SHA256 (pidgin-2.0.0beta7.tar.bz2) = ee154b61c59d23d0977a0339d749db5f64cb91f38d22356403bc413eaf9200eb
-SIZE (pidgin-2.0.0beta7.tar.bz2) = 7465941
+MD5 (pidgin-2.2.1.tar.bz2) = f1703430d4b8ffc96b493fc36cd46131
+SHA256 (pidgin-2.2.1.tar.bz2) = 6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
+SIZE (pidgin-2.2.1.tar.bz2) = 8882043
--- net-im/libpurple/files/patch-libpurple_plugins_ssl_ssl-nss.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpurple/plugins/ssl/ssl-nss.c.orig Thu May 3 14:58:39 2007
-+++ libpurple/plugins/ssl/ssl-nss.c Thu May 3 15:05:59 2007
-@@ -108,7 +108,7 @@ ssl_nss_init_nss(void)
- {
- char *lib;
- PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
-- NSS_NoDB_Init(NULL);
-+ NSS_NoDB_Init(".");
-
- /* TODO: Fix this so autoconf does the work trying to find this lib. */
- #ifndef _WIN32
--- net-im/libpurple/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.bak Mon Apr 30 00:17:52 2007
-+++ doc/Makefile.in Sun May 6 23:47:35 2007
-@@ -473,7 +473,7 @@
- uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "${DESTDIR}$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
More information about the Midnightbsd-cvs
mailing list