# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1456772543 28800
# Node ID a02d4d12218f2aef4ab7744e82ef264692cc2cbb
# Parent  c47fe0edc2042598e5c6260b8401f1c02852b3c4
22228600 pidgin should be 64-bit

diff -r c47fe0edc204 -r a02d4d12218f components/desktop/pidgin/Makefile
--- a/components/desktop/pidgin/Makefile	Mon Feb 29 10:09:14 2016 -0800
+++ b/components/desktop/pidgin/Makefile	Mon Feb 29 11:02:23 2016 -0800
@@ -66,17 +66,22 @@
 # Needed to get libpurple to link properly.
 LIBS += -lresolv
 CONFIGURE_ENV +=	LIBS="$(LIBS)"
-CONFIGURE_ENV +=	PKG_CONFIG_PATH=/usr/lib/pkgconfig/gnutls-3
+CONFIGURE_ENV +=	PKG_CONFIG_PATH=/usr/lib/64/pkgconfig/gnutls-3
+
+# Version of Perl to use.
+PERL_VERSION =  5.20
+
+CONFIGURE_ENV += "ac_cv_path_perlpath=/usr/perl5/$(PERL_VERSION)/bin/perl"
+
+CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	--disable-binreloc
 CONFIGURE_OPTIONS +=	--enable-cyrus-sasl
-CONFIGURE_OPTIONS +=	--enable-nss=no
-CONFIGURE_OPTIONS +=	--enable-gnutls=yes
+CONFIGURE_OPTIONS +=	--disable-nss
+CONFIGURE_OPTIONS +=	--enable-gnutls
 CONFIGURE_OPTIONS +=	--with-gnutls-includes=/usr/include/gnutls-3
-CONFIGURE_OPTIONS +=	--with-gnutls-libs=/usr/lib/gnutls-3
-CONFIGURE_OPTIONS +=	--with-nspr-includes=/usr/include/mps
-CONFIGURE_OPTIONS +=	--with-nspr-libs=/usr/lib/mps
+CONFIGURE_OPTIONS +=	--with-gnutls-libs=/usr/lib/64/gnutls-3
 CONFIGURE_OPTIONS +=	--enable-gnome-keyring
 CONFIGURE_OPTIONS +=	--disable-gevolution
 CONFIGURE_OPTIONS +=	--enable-cap
@@ -91,11 +96,11 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-configure:	$(CONFIGURE_32)
+configure:	$(CONFIGURE_64)
 
-build:          $(BUILD_32)
+build:          $(BUILD_64)
 
-install:        $(INSTALL_32)
+install:        $(INSTALL_64)
 
 test:           $(NO_TESTS)
 
@@ -114,9 +119,8 @@
 REQUIRED_PACKAGES += library/gnutls-3
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libxml2
-REQUIRED_PACKAGES += library/nspr
 REQUIRED_PACKAGES += library/python/python-dbus-27
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += runtime/tk-8
@@ -125,7 +129,6 @@
 REQUIRED_PACKAGES += system/library/libdbus
 REQUIRED_PACKAGES += system/library/libdbus-glib
 REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 REQUIRED_PACKAGES += system/network/avahi
 REQUIRED_PACKAGES += x11/library/libice
diff -r c47fe0edc204 -r a02d4d12218f components/desktop/pidgin/pidgin.p5m
--- a/components/desktop/pidgin/pidgin.p5m	Mon Feb 29 10:09:14 2016 -0800
+++ b/components/desktop/pidgin/pidgin.p5m	Mon Feb 29 11:02:23 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -166,80 +166,80 @@
 file path=usr/include/pidgin/pidgin.h
 file path=usr/include/pidgin/pidginstock.h
 file path=usr/include/pidgin/pidgintooltip.h
-link path=usr/lib/libpurple-client.so target=libpurple-client.so.0.10.11
-link path=usr/lib/libpurple-client.so.0 target=libpurple-client.so.0.10.11
-file path=usr/lib/libpurple-client.so.0.10.11
-link path=usr/lib/libpurple.so target=libpurple.so.0.10.11
-link path=usr/lib/libpurple.so.0 target=libpurple.so.0.10.11
-file path=usr/lib/libpurple.so.0.10.11
-file path=usr/lib/pidgin/cap.so
-file path=usr/lib/pidgin/convcolors.so
-file path=usr/lib/pidgin/extplacement.so
-file path=usr/lib/pidgin/gestures.so
-file path=usr/lib/pidgin/gtkbuddynote.so
-file path=usr/lib/pidgin/history.so
-file path=usr/lib/pidgin/iconaway.so
-file path=usr/lib/pidgin/markerline.so
-file path=usr/lib/pidgin/musicmessaging.so
-file path=usr/lib/pidgin/notify.so
-file path=usr/lib/pidgin/perl/Pidgin.pm
-file path=usr/lib/pidgin/perl/auto/Pidgin/.packlist
-file path=usr/lib/pidgin/perl/auto/Pidgin/Pidgin.bs
-file path=usr/lib/pidgin/perl/auto/Pidgin/Pidgin.so
-file path=usr/lib/pidgin/pidginrc.so
-file path=usr/lib/pidgin/relnot.so
-file path=usr/lib/pidgin/sendbutton.so
-file path=usr/lib/pidgin/spellchk.so
-file path=usr/lib/pidgin/themeedit.so
-file path=usr/lib/pidgin/ticker.so
-file path=usr/lib/pidgin/timestamp.so
-file path=usr/lib/pidgin/timestamp_format.so
-file path=usr/lib/pidgin/xmppconsole.so
-file path=usr/lib/pidgin/xmppdisco.so
-file path=usr/lib/pkgconfig/pidgin.pc
-file path=usr/lib/pkgconfig/purple.pc
-file path=usr/lib/purple-2/autoaccept.so
-file path=usr/lib/purple-2/buddynote.so
-file path=usr/lib/purple-2/dbus-example.so
-file path=usr/lib/purple-2/idle.so
-file path=usr/lib/purple-2/joinpart.so
-file path=usr/lib/purple-2/libaim.so
-file path=usr/lib/purple-2/libbonjour.so
-file path=usr/lib/purple-2/libgg.so
-file path=usr/lib/purple-2/libicq.so
-file path=usr/lib/purple-2/libirc.so
-link path=usr/lib/purple-2/libjabber.so target=libjabber.so.0.0.0
-link path=usr/lib/purple-2/libjabber.so.0 target=libjabber.so.0.0.0
-file path=usr/lib/purple-2/libjabber.so.0.0.0
-file path=usr/lib/purple-2/libmsn.so
-file path=usr/lib/purple-2/libmxit.so
-file path=usr/lib/purple-2/libmyspace.so
-file path=usr/lib/purple-2/libnovell.so
-link path=usr/lib/purple-2/liboscar.so target=liboscar.so.0.0.0
-link path=usr/lib/purple-2/liboscar.so.0 target=liboscar.so.0.0.0
-file path=usr/lib/purple-2/liboscar.so.0.0.0
-file path=usr/lib/purple-2/libsimple.so
-file path=usr/lib/purple-2/libxmpp.so
-file path=usr/lib/purple-2/libyahoo.so
-file path=usr/lib/purple-2/libyahoojp.so
-link path=usr/lib/purple-2/libymsg.so target=libymsg.so.0.0.0
-link path=usr/lib/purple-2/libymsg.so.0 target=libymsg.so.0.0.0
-file path=usr/lib/purple-2/libymsg.so.0.0.0
-file path=usr/lib/purple-2/libzephyr.so
-file path=usr/lib/purple-2/log_reader.so
-file path=usr/lib/purple-2/newline.so
-file path=usr/lib/purple-2/offlinemsg.so
-file path=usr/lib/purple-2/perl.so
-file path=usr/lib/purple-2/perl/Purple.pm
-file path=usr/lib/purple-2/perl/auto/Purple/.packlist
-file path=usr/lib/purple-2/perl/auto/Purple/Purple.bs
-file path=usr/lib/purple-2/perl/auto/Purple/Purple.so
-file path=usr/lib/purple-2/perl/auto/Purple/autosplit.ix
-file path=usr/lib/purple-2/psychic.so
-file path=usr/lib/purple-2/ssl-gnutls.so
-file path=usr/lib/purple-2/ssl.so
-file path=usr/lib/purple-2/statenotify.so
-file path=usr/lib/purple-2/tcl.so
+link path=usr/lib/$(MACH64)/libpurple-client.so \
+    target=libpurple-client.so.0.10.11
+link path=usr/lib/$(MACH64)/libpurple-client.so.0 \
+    target=libpurple-client.so.0.10.11
+file path=usr/lib/$(MACH64)/libpurple-client.so.0.10.11
+link path=usr/lib/$(MACH64)/libpurple.so target=libpurple.so.0.10.11
+link path=usr/lib/$(MACH64)/libpurple.so.0 target=libpurple.so.0.10.11
+file path=usr/lib/$(MACH64)/libpurple.so.0.10.11
+file path=usr/lib/$(MACH64)/pidgin/cap.so
+file path=usr/lib/$(MACH64)/pidgin/convcolors.so
+file path=usr/lib/$(MACH64)/pidgin/extplacement.so
+file path=usr/lib/$(MACH64)/pidgin/gestures.so
+file path=usr/lib/$(MACH64)/pidgin/gtkbuddynote.so
+file path=usr/lib/$(MACH64)/pidgin/history.so
+file path=usr/lib/$(MACH64)/pidgin/iconaway.so
+file path=usr/lib/$(MACH64)/pidgin/markerline.so
+file path=usr/lib/$(MACH64)/pidgin/musicmessaging.so
+file path=usr/lib/$(MACH64)/pidgin/notify.so
+file path=usr/lib/$(MACH64)/pidgin/perl/Pidgin.pm
+file path=usr/lib/$(MACH64)/pidgin/perl/auto/Pidgin/.packlist
+file path=usr/lib/$(MACH64)/pidgin/perl/auto/Pidgin/Pidgin.so
+file path=usr/lib/$(MACH64)/pidgin/pidginrc.so
+file path=usr/lib/$(MACH64)/pidgin/relnot.so
+file path=usr/lib/$(MACH64)/pidgin/sendbutton.so
+file path=usr/lib/$(MACH64)/pidgin/spellchk.so
+file path=usr/lib/$(MACH64)/pidgin/themeedit.so
+file path=usr/lib/$(MACH64)/pidgin/ticker.so
+file path=usr/lib/$(MACH64)/pidgin/timestamp.so
+file path=usr/lib/$(MACH64)/pidgin/timestamp_format.so
+file path=usr/lib/$(MACH64)/pidgin/xmppconsole.so
+file path=usr/lib/$(MACH64)/pidgin/xmppdisco.so
+file path=usr/lib/$(MACH64)/pkgconfig/pidgin.pc
+file path=usr/lib/$(MACH64)/pkgconfig/purple.pc
+file path=usr/lib/$(MACH64)/purple-2/autoaccept.so
+file path=usr/lib/$(MACH64)/purple-2/buddynote.so
+file path=usr/lib/$(MACH64)/purple-2/dbus-example.so
+file path=usr/lib/$(MACH64)/purple-2/idle.so
+file path=usr/lib/$(MACH64)/purple-2/joinpart.so
+file path=usr/lib/$(MACH64)/purple-2/libaim.so
+file path=usr/lib/$(MACH64)/purple-2/libbonjour.so
+file path=usr/lib/$(MACH64)/purple-2/libgg.so
+file path=usr/lib/$(MACH64)/purple-2/libicq.so
+file path=usr/lib/$(MACH64)/purple-2/libirc.so
+link path=usr/lib/$(MACH64)/purple-2/libjabber.so target=libjabber.so.0.0.0
+link path=usr/lib/$(MACH64)/purple-2/libjabber.so.0 target=libjabber.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/libjabber.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/libmsn.so
+file path=usr/lib/$(MACH64)/purple-2/libmxit.so
+file path=usr/lib/$(MACH64)/purple-2/libmyspace.so
+file path=usr/lib/$(MACH64)/purple-2/libnovell.so
+link path=usr/lib/$(MACH64)/purple-2/liboscar.so target=liboscar.so.0.0.0
+link path=usr/lib/$(MACH64)/purple-2/liboscar.so.0 target=liboscar.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/liboscar.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/libsimple.so
+file path=usr/lib/$(MACH64)/purple-2/libxmpp.so
+file path=usr/lib/$(MACH64)/purple-2/libyahoo.so
+file path=usr/lib/$(MACH64)/purple-2/libyahoojp.so
+link path=usr/lib/$(MACH64)/purple-2/libymsg.so target=libymsg.so.0.0.0
+link path=usr/lib/$(MACH64)/purple-2/libymsg.so.0 target=libymsg.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/libymsg.so.0.0.0
+file path=usr/lib/$(MACH64)/purple-2/libzephyr.so
+file path=usr/lib/$(MACH64)/purple-2/log_reader.so
+file path=usr/lib/$(MACH64)/purple-2/newline.so
+file path=usr/lib/$(MACH64)/purple-2/offlinemsg.so
+file path=usr/lib/$(MACH64)/purple-2/perl.so
+file path=usr/lib/$(MACH64)/purple-2/perl/Purple.pm
+file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/.packlist
+file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/Purple.so
+file path=usr/lib/$(MACH64)/purple-2/perl/auto/Purple/autosplit.ix
+file path=usr/lib/$(MACH64)/purple-2/psychic.so
+file path=usr/lib/$(MACH64)/purple-2/ssl-gnutls.so
+file path=usr/lib/$(MACH64)/purple-2/ssl.so
+file path=usr/lib/$(MACH64)/purple-2/statenotify.so
+file path=usr/lib/$(MACH64)/purple-2/tcl.so
 file path=usr/share/aclocal/purple.m4
 file path=usr/share/applications/pidgin.desktop \
     restart_fmri=svc:/application/desktop-cache/desktop-mime-cache:default