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

Revert crash-prone update to pidgin 2.1.0 and silc-toolkit 1.1.2.

Browse Source 
Discussed with brad, martynas and steven, ok pval
This commit is contained in:
ckuethe 2007-08-11 22:14:27 +00:00
parent a807a43f41
commit ec3e503aa2
24 changed files with 342 additions and 788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/silc-toolkit/Makefile
View File

@ -1,16 +1,19 @@
# $OpenBSD: Makefile,v 1.11 2007/08/02 06:04:20 steven Exp $
# $OpenBSD: Makefile,v 1.12 2007/08/11 22:14:27 ckuethe Exp $
COMMENT= "toolkit for the development of SILC applications"
DISTNAME= silc-toolkit-1.1.2
SHARED_LIBS= silc 7.0 \
silcclient 5.0
DISTNAME= silc-toolkit-1.0.2
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= silc 6.1 \
silc-1.0 6.1 \
silcclient 4.2 \
silcclient-1.0 4.2
CATEGORIES= devel
MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/
HOMEPAGE= http://www.silcnet.org/software/developers/toolkit/
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -21,7 +24,7 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-ipv6 \
--docdir=${PREFIX}/share/doc/silc \
--with-docdir=${PREFIX}/share/doc/silc \
--includedir=${PREFIX}/include/silc \
--without-libtoolfix

10
devel/silc-toolkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (silc-toolkit-1.1.2.tar.gz) = N1f2TSQcobij92Fw5Eq8ow==
RMD160 (silc-toolkit-1.1.2.tar.gz) = 4DBFroJnn5Bi5OlOj7Ex8akEOkg=
SHA1 (silc-toolkit-1.1.2.tar.gz) = emiswugZ1vTwK/KNAtrxkdQWk+Q=
SHA256 (silc-toolkit-1.1.2.tar.gz) = rZkU8LTzJAGY6KXZaTZ72U062+wnjxLM/mTJgbOvEGo=
SIZE (silc-toolkit-1.1.2.tar.gz) = 2678868
MD5 (silc-toolkit-1.0.2.tar.gz) = AofSFpcoHaYnC6tUitoJgg==
RMD160 (silc-toolkit-1.0.2.tar.gz) = GCXujzY05RUVnZkzNxFi817tNus=
SHA1 (silc-toolkit-1.0.2.tar.gz) = zPhnr5O8b1r1eE7bvDXTPgW6Mr8=
SHA256 (silc-toolkit-1.0.2.tar.gz) = MFf6wSj7cjD7dw2Fnn28Z3cpvkLc29Nmm0GyDlGHdfA=
SIZE (silc-toolkit-1.0.2.tar.gz) = 3499747

12
devel/silc-toolkit/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.5 2007/08/11 22:14:27 ckuethe Exp $
--- Makefile.in.orig Tue May 10 11:03:08 2005
+++ Makefile.in Mon Jul 4 21:16:22 2005
@@ -782,7 +782,7 @@ uninstall-info: uninstall-info-recursive
@with_irssi_TRUE@etc-install-client:
@with_irssi_TRUE@ -@if test '!' -d $(srcdir)/apps/irssi ; then if test '!' -f $(etcdir)/silc.conf ; then $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(etcdir)/silc.conf; fi; fi
-@with_irssi_TRUE@install-data-hook: install-dirs-client doc-install-client etc-install-client
+@with_irssi_TRUE@install-data-hook: install-dirs-client doc-install-client
@INCLUDE_DEFINES_INT@

12
devel/silc-toolkit/patches/patch-lib_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2007/08/02 06:04:20 steven Exp $
--- lib/Makefile.in.orig Sun Jun 24 11:35:23 2007
+++ lib/Makefile.in Sun Jun 24 17:05:54 2007
@@ -281,7 +281,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
# SILC Library dirs
SILCLIB_DIRS = contrib silccore silcutil silcapputil silccrypt silcskr silcmath silcsim silcasn1 silcske silchttp silcsftp silcvcard
@SILC_ENABLE_SHARED_FALSE@LIBTOOL_OPTS =
-@SILC_ENABLE_SHARED_TRUE@LIBTOOL_OPTS = -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+@SILC_ENABLE_SHARED_TRUE@LIBTOOL_OPTS = -rpath $(DESTDIR)$(libdir)
@SILC_ENABLE_SHARED_FALSE@LIBTOOL_SILC_VERSION =
@SILC_ENABLE_SHARED_TRUE@LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
@SILC_ENABLE_SHARED_FALSE@LIBTOOL_SILCCLIENT_VERSION =

8
devel/silc-toolkit/patches/patch-lib_silcmath_tma_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_silcmath_tma_h,v 1.2 2007/08/02 06:04:20 steven Exp $
--- lib/silcmath/tma.h.orig Thu May 31 02:47:04 2007
+++ lib/silcmath/tma.h Fri Jun 15 14:12:27 2007
@@ -51,7 +51,7 @@ extern "C" {
$OpenBSD: patch-lib_silcmath_tma_h,v 1.3 2007/08/11 22:14:27 ckuethe Exp $
--- lib/silcmath/tma.h.orig Tue May 10 12:02:57 2005
+++ lib/silcmath/tma.h Tue Jul 26 01:13:52 2005
@@ -48,7 +48,7 @@ extern "C" {
/* detect 64-bit mode if possible */

4
devel/silc-toolkit/pkg/PFRAG.shared
View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2007/08/02 06:04:20 steven Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2007/08/11 22:14:27 ckuethe Exp $
@lib lib/libsilc-1.0.so.${LIBsilc-1.0_VERSION}
@lib lib/libsilc.so.${LIBsilc_VERSION}
@lib lib/libsilcclient-1.0.so.${LIBsilcclient-1.0_VERSION}
@lib lib/libsilcclient.so.${LIBsilcclient_VERSION}

857
devel/silc-toolkit/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff

18
net/pidgin/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.7 2007/08/02 08:31:34 steven Exp $
# $OpenBSD: Makefile,v 1.8 2007/08/11 22:15:46 ckuethe Exp $
SHARED_ONLY= Yes
COMMENT= "multi-protocol instant messaging client"
DISTNAME= pidgin-2.1.0
DISTNAME= pidgin-2.0.1
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 1.0 # .1.0
SHARED_LIBS += purple-client 1.0 # .1.0
SHARED_LIBS += gnt 1.0 # .0.0
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 0.0 # .0.0
SHARED_LIBS += purple-client 0.0 # .0.0
SHARED_LIBS += gnt 0.0 # .0.0
CATEGORIES= net
HOMEPAGE= http://pidgin.im/
@ -38,7 +38,7 @@ RUN_DEPENDS+= :dbus-python-*:x11/dbus-python \
:py-gtk2-*:x11/py-gtk2
LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
startup-notification-1::devel/startup-notification \
silc.>=7,silcclient.>=5::devel/silc-toolkit \
silc,silcclient::devel/silc-toolkit \
meanwhile::net/meanwhile \
gadu::net/libgadu \
xml2::textproc/libxml \
@ -50,7 +50,7 @@ LIBTOOL_FLAGS+= --tag=disable-static
USE_GMAKE= Yes
SEPARATE_BUILD= simple
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= --disable-gevolution \
--disable-gnutls \
--disable-nss \

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.1.0.tar.gz) = QLuBhnsZ7v3EE1Hh09VbRg==
RMD160 (pidgin-2.1.0.tar.gz) = rFbY1Ry16vjkaLyvPuFgEZCigL8=
SHA1 (pidgin-2.1.0.tar.gz) = pHqwgnCK5HdioauYGLE12HGbgMQ=
SHA256 (pidgin-2.1.0.tar.gz) = izoUkAwoyzFaHfHetdv/j7/Mziqrz1sBQXPyPJazV34=
SIZE (pidgin-2.1.0.tar.gz) = 11061958
MD5 (pidgin-2.0.1.tar.gz) = ZWkTFtgVfLXBEdeG/YVTMg==
RMD160 (pidgin-2.0.1.tar.gz) = A4EijmDx1lywbq8DE/+56h+FDyc=
SHA1 (pidgin-2.0.1.tar.gz) = CVTxqnuO5iTha90Ac6yfC2J8Nq0=
SHA256 (pidgin-2.0.1.tar.gz) = gg+3GoWF8EgVaGa7AGpC9BPe9u0xEFM0gdkvFTOufo4=
SIZE (pidgin-2.0.1.tar.gz) = 10836164

8
net/pidgin/patches/patch-config_h_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- config.h.in.orig Sun Jul 29 08:34:20 2007
+++ config.h.in Tue Jul 31 17:43:25 2007
@@ -154,6 +154,12 @@
$OpenBSD: patch-config_h_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- config.h.in.orig Fri May 25 12:28:50 2007
+++ config.h.in Mon May 28 01:57:22 2007
@@ -150,6 +150,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.3 2007/08/02 06:06:13 steven Exp $
--- configure.ac.orig Thu Jun 14 23:11:46 2007
+++ configure.ac Fri Jun 15 13:53:22 2007
$OpenBSD: patch-configure_ac,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- configure.ac.orig Fri May 25 12:28:21 2007
+++ configure.ac Mon May 28 01:57:22 2007
@@ -521,6 +521,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@ -9,16 +9,16 @@ $OpenBSD: patch-configure_ac,v 1.3 2007/08/02 06:06:13 steven Exp $
AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
if test x"$ac_ncurses_includes" != "x"; then
@@ -695,7 +696,7 @@ else
@@ -683,7 +684,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread $LIBDL"
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1360,8 +1361,13 @@ dnl ##################################################
fi
AC_SUBST(SILC_LIBS)
@@ -1312,8 +1313,13 @@ dnl ##################################################
dnl These two are inverses of each other <-- stolen from evolution!
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2007/08/02 06:06:13 steven Exp $
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
@@ -1373,6 +1379,90 @@ AC_ARG_ENABLE(nss,
@@ -1325,6 +1331,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None (MSN and Google Talk will not work without SSL!)"
dnl #
@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2007/08/02 06:06:13 steven Exp $
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
@@ -1727,12 +1817,20 @@ fi
@@ -1679,12 +1769,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

8
net/pidgin/patches/patch-finch_libgnt_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- finch/libgnt/Makefile.in.orig Sun Jul 29 08:33:32 2007
+++ finch/libgnt/Makefile.in Tue Jul 31 17:43:25 2007
@@ -435,7 +435,7 @@ target_cpu = @target_cpu@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- finch/libgnt/Makefile.in.orig Fri May 25 12:29:19 2007
+++ finch/libgnt/Makefile.in Mon May 28 01:57:22 2007
@@ -429,7 +429,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = genmarshal

12
net/pidgin/patches/patch-finch_libgnt_gntmain_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_libgnt_gntmain_c,v 1.1 2007/08/02 06:06:13 steven Exp $
--- finch/libgnt/gntmain.c.orig Tue Jul 31 18:31:35 2007
+++ finch/libgnt/gntmain.c Tue Jul 31 18:31:48 2007
@@ -21,7 +21,7 @@
*/
#define _GNU_SOURCE
-#if defined(__APPLE__) || defined(__unix__)
+#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
#define _XOPEN_SOURCE_EXTENDED
#endif

12
net/pidgin/patches/patch-finch_libgnt_gntwm_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.1 2007/08/02 06:06:13 steven Exp $
--- finch/libgnt/gntwm.c.orig Tue Jul 31 18:31:26 2007
+++ finch/libgnt/gntwm.c Tue Jul 31 18:31:58 2007
@@ -21,7 +21,7 @@
*/
#define _GNU_SOURCE
-#if defined(__APPLE__) || defined(__unix__)
+#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
#define _XOPEN_SOURCE_EXTENDED
#endif

20
net/pidgin/patches/patch-finch_plugins_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- finch/plugins/Makefile.in.orig Sun Jul 29 08:33:32 2007
+++ finch/plugins/Makefile.in Tue Jul 31 17:44:10 2007
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- finch/plugins/Makefile.in.orig Fri May 25 12:29:19 2007
+++ finch/plugins/Makefile.in Mon May 28 01:57:22 2007
@@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c
@PLUGINS_TRUE@am_gnthistory_la_OBJECTS = gnthistory.lo
gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS)
@ -11,12 +11,12 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
@@ -455,7 +456,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@gntclipboard_la_CFLAGS = $(X11_CFLAGS)
@PLUGINS_TRUE@gntgf_la_CFLAGS = $(X11_CFLAGS)
@@ -452,7 +453,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
-@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
+@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
@PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)
@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS)
EXTRA_DIST = pietray.py
-@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
EXTRA_DIST =
AM_CPPFLAGS = \
-DDATADIR=\"$(datadir)\" \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Sun Jul 29 08:33:34 2007
+++ libpurple/plugins/ssl/Makefile.in Tue Jul 31 17:43:25 2007
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Fri May 25 12:29:21 2007
+++ libpurple/plugins/ssl/Makefile.in Mon May 28 01:57:22 2007
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -31,8 +31,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.3 2007/08/02 06:06:13 stev
+OPENSSL_LIBS = @OPENSSL_LIBS@
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -342,6 +350,8 @@ TCL_LIBS = @TCL_LIBS@
GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -341,6 +349,8 @@ TCL_LIBS = @TCL_LIBS@
TK_LIBS = @TK_LIBS@
USE_GCONFTOOL_FALSE = @USE_GCONFTOOL_FALSE@
USE_GCONFTOOL_TRUE = @USE_GCONFTOOL_TRUE@
@ -41,7 +41,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.3 2007/08/02 06:06:13 stev
USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@
@@ -434,17 +444,21 @@ EXTRA_DIST = \
@@ -429,17 +439,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -63,7 +63,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.3 2007/08/02 06:06:13 stev
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -518,6 +532,8 @@ clean-pluginLTLIBRARIES:
@@ -513,6 +527,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -72,7 +72,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.3 2007/08/02 06:06:13 stev
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -532,6 +548,7 @@ distclean-compile:
@@ -527,6 +543,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@

8
net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- libpurple/protocols/gg/Makefile.in.orig Sun Jul 29 08:33:35 2007
+++ libpurple/protocols/gg/Makefile.in Tue Jul 31 17:43:26 2007
@@ -504,7 +504,7 @@ libgg_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- libpurple/protocols/gg/Makefile.in.orig Fri May 25 12:29:22 2007
+++ libpurple/protocols/gg/Makefile.in Mon May 28 01:57:22 2007
@@ -499,7 +499,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS)
@STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS)
@STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)

8
net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_am,v 1.2 2007/08/02 06:06:13 steven Exp $
--- libpurple/protocols/oscar/Makefile.am.orig Thu Jun 14 23:11:58 2007
+++ libpurple/protocols/oscar/Makefile.am Fri Jun 15 13:53:22 2007
@@ -65,10 +65,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES)
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_am,v 1.3 2007/08/11 22:15:46 ckuethe Exp $
--- libpurple/protocols/oscar/Makefile.am.orig Thu Jan 18 23:28:23 2007
+++ libpurple/protocols/oscar/Makefile.am Fri Jan 19 22:02:01 2007
@@ -70,10 +70,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES)
liboscar_la_LIBADD = $(GLIB_LIBS)
libaim_la_SOURCES = libaim.c

8
net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.3 2007/08/02 06:06:13 steven Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Sun Jul 29 08:33:36 2007
+++ libpurple/protocols/oscar/Makefile.in Tue Jul 31 17:43:26 2007
@@ -550,9 +550,9 @@ libicq_la_LDFLAGS = -module -avoid-version
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Fri May 25 12:29:24 2007
+++ libpurple/protocols/oscar/Makefile.in Mon May 28 01:57:22 2007
@@ -559,9 +559,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES)
@STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
@STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c

8
net/pidgin/patches/patch-pidgin_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.2 2007/08/02 06:06:14 steven Exp $
--- pidgin/Makefile.in.orig Sun Jul 29 08:33:39 2007
+++ pidgin/Makefile.in Tue Jul 31 17:43:26 2007
@@ -106,7 +106,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$OpenBSD: patch-pidgin_Makefile_in,v 1.3 2007/08/11 22:15:46 ckuethe Exp $
--- pidgin/Makefile.in.orig Mon Apr 30 06:17:59 2007
+++ pidgin/Makefile.in Tue May 1 23:11:28 2007
@@ -104,7 +104,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)

8
net/pidgin/patches/patch-pidgin_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.3 2007/08/02 06:06:14 steven Exp $
--- pidgin/gtkdialogs.c.orig Sat Jul 28 07:12:36 2007
+++ pidgin/gtkdialogs.c Tue Jul 31 17:43:26 2007
@@ -563,6 +563,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- pidgin/gtkdialogs.c.orig Fri May 25 12:28:22 2007
+++ pidgin/gtkdialogs.c Mon May 28 01:57:23 2007
@@ -560,6 +560,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

8
net/pidgin/patches/patch-pidgin_gtkmain_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.2 2007/08/02 06:06:14 steven Exp $
--- pidgin/gtkmain.c.orig Thu Jun 14 23:12:03 2007
+++ pidgin/gtkmain.c Fri Jun 15 13:53:06 2007
$OpenBSD: patch-pidgin_gtkmain_c,v 1.3 2007/08/11 22:15:46 ckuethe Exp $
--- pidgin/gtkmain.c.orig Mon Apr 30 05:37:55 2007
+++ pidgin/gtkmain.c Tue May 1 23:11:28 2007
@@ -86,6 +86,7 @@ static SnDisplay *sn_display = NULL;
#endif
@ -9,7 +9,7 @@ $OpenBSD: patch-pidgin_gtkmain_c,v 1.2 2007/08/02 06:06:14 steven Exp $
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -181,6 +182,8 @@ clean_pid()
@@ -186,6 +187,8 @@ clean_pid()
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);

8
net/pidgin/patches/patch-pidgin_gtknotify_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtknotify_c,v 1.3 2007/08/02 06:06:14 steven Exp $
--- pidgin/gtknotify.c.orig Sat Jul 21 20:45:34 2007
+++ pidgin/gtknotify.c Tue Jul 31 17:43:26 2007
@@ -980,7 +980,16 @@ uri_command(const char *command, gboolean sync)
$OpenBSD: patch-pidgin_gtknotify_c,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
--- pidgin/gtknotify.c.orig Fri May 25 12:28:22 2007
+++ pidgin/gtknotify.c Mon May 28 01:57:23 2007
@@ -967,7 +967,16 @@ uri_command(const char *command, gboolean sync)
g_error_free(error);
}
else

34
net/pidgin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2007/08/02 06:06:14 steven Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/08/11 22:15:46 ckuethe Exp $
@conflict gaim-*
bin/finch
bin/pidgin
@ -21,7 +21,6 @@ include/finch/gntplugin.h
include/finch/gntpounce.h
include/finch/gntprefs.h
include/finch/gntrequest.h
include/finch/gntsound.h
include/finch/gntstatus.h
include/finch/gntui.h
include/gnt/
@ -42,7 +41,6 @@ include/gnt/gntmarshal.h
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntmenuitemcheck.h
include/gnt/gntslider.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
include/gnt/gnttree.h
@ -50,7 +48,6 @@ include/gnt/gntutils.h
include/gnt/gntwidget.h
include/gnt/gntwindow.h
include/gnt/gntwm.h
include/gnt/gntws.h
include/libpurple/
include/libpurple/account.h
include/libpurple/accountopt.h
@ -145,8 +142,6 @@ include/pidgin/gtkscrollbook.h
include/pidgin/gtksession.h
include/pidgin/gtksound.h
include/pidgin/gtksourceiter.h
include/pidgin/gtksourceundomanager.h
include/pidgin/gtksourceview-marshal.h
include/pidgin/gtkstatusbox.h
include/pidgin/gtkthemes.h
include/pidgin/gtkutils.h
@ -180,8 +175,6 @@ lib/pidgin/extplacement.la
lib/pidgin/extplacement.so
lib/pidgin/gestures.la
lib/pidgin/gestures.so
lib/pidgin/gtkbuddynote.la
lib/pidgin/gtkbuddynote.so
lib/pidgin/history.la
lib/pidgin/history.so
lib/pidgin/iconaway.la
@ -423,7 +416,6 @@ share/pixmaps/pidgin/emotes/default/alien.png
share/pixmaps/pidgin/emotes/default/angel.png
share/pixmaps/pidgin/emotes/default/angry.png
share/pixmaps/pidgin/emotes/default/arrogant.png
share/pixmaps/pidgin/emotes/default/at-wits-end.png
share/pixmaps/pidgin/emotes/default/bad.png
share/pixmaps/pidgin/emotes/default/bashful.png
share/pixmaps/pidgin/emotes/default/beat-up.png
@ -474,7 +466,6 @@ share/pixmaps/pidgin/emotes/default/eat.png
share/pixmaps/pidgin/emotes/default/embarrassed.png
share/pixmaps/pidgin/emotes/default/excruciating.png
share/pixmaps/pidgin/emotes/default/eyeroll.png
share/pixmaps/pidgin/emotes/default/female-fighter.png
share/pixmaps/pidgin/emotes/default/film.png
share/pixmaps/pidgin/emotes/default/fingers-crossed.png
share/pixmaps/pidgin/emotes/default/flag.png
@ -523,7 +514,6 @@ share/pixmaps/pidgin/emotes/default/msn_online.png
share/pixmaps/pidgin/emotes/default/musical-note.png
share/pixmaps/pidgin/emotes/default/nailbiting.png
share/pixmaps/pidgin/emotes/default/neutral.png
share/pixmaps/pidgin/emotes/default/on-the-phone.png
share/pixmaps/pidgin/emotes/default/party.png
share/pixmaps/pidgin/emotes/default/peace.png
share/pixmaps/pidgin/emotes/default/phone.png
@ -577,7 +567,6 @@ share/pixmaps/pidgin/emotes/default/terror.png
share/pixmaps/pidgin/emotes/default/theme
share/pixmaps/pidgin/emotes/default/thinking.png
share/pixmaps/pidgin/emotes/default/thunder.png
share/pixmaps/pidgin/emotes/default/time-out.png
share/pixmaps/pidgin/emotes/default/tongue.png
share/pixmaps/pidgin/emotes/default/tremble.png
share/pixmaps/pidgin/emotes/default/turtle.png
@ -707,7 +696,6 @@ share/pixmaps/pidgin/toolbar/16/font-size-down.png
share/pixmaps/pidgin/toolbar/16/font-size-up.png
share/pixmaps/pidgin/toolbar/16/insert-image.png
share/pixmaps/pidgin/toolbar/16/insert-link.png
share/pixmaps/pidgin/toolbar/16/insert.png
share/pixmaps/pidgin/toolbar/16/message-new.png
share/pixmaps/pidgin/toolbar/16/plugins.png
share/pixmaps/pidgin/toolbar/16/send-file.png
@ -722,7 +710,6 @@ share/pixmaps/pidgin/tray/16/tray-connecting.png
share/pixmaps/pidgin/tray/16/tray-extended-away.png
share/pixmaps/pidgin/tray/16/tray-invisible.png
share/pixmaps/pidgin/tray/16/tray-message.png
share/pixmaps/pidgin/tray/16/tray-new-im.png
share/pixmaps/pidgin/tray/16/tray-offline.png
share/pixmaps/pidgin/tray/16/tray-online.png
share/pixmaps/pidgin/tray/22/
@ -732,27 +719,8 @@ share/pixmaps/pidgin/tray/22/tray-connecting.png
share/pixmaps/pidgin/tray/22/tray-extended-away.png
share/pixmaps/pidgin/tray/22/tray-invisible.png
share/pixmaps/pidgin/tray/22/tray-message.png
share/pixmaps/pidgin/tray/22/tray-new-im.png
share/pixmaps/pidgin/tray/22/tray-offline.png
share/pixmaps/pidgin/tray/22/tray-online.png
share/pixmaps/pidgin/tray/32/
share/pixmaps/pidgin/tray/32/tray-away.png
share/pixmaps/pidgin/tray/32/tray-busy.png
share/pixmaps/pidgin/tray/32/tray-connecting.png
share/pixmaps/pidgin/tray/32/tray-extended-away.png
share/pixmaps/pidgin/tray/32/tray-invisible.png
share/pixmaps/pidgin/tray/32/tray-new-im.png
share/pixmaps/pidgin/tray/32/tray-offline.png
share/pixmaps/pidgin/tray/32/tray-online.png
share/pixmaps/pidgin/tray/48/
share/pixmaps/pidgin/tray/48/tray-away.png
share/pixmaps/pidgin/tray/48/tray-busy.png
share/pixmaps/pidgin/tray/48/tray-connecting.png
share/pixmaps/pidgin/tray/48/tray-extended-away.png
share/pixmaps/pidgin/tray/48/tray-invisible.png
share/pixmaps/pidgin/tray/48/tray-new-im.png
share/pixmaps/pidgin/tray/48/tray-offline.png
share/pixmaps/pidgin/tray/48/tray-online.png
share/pixmaps/purple/
share/pixmaps/purple/buddy_icons/
share/pixmaps/purple/buddy_icons/qq/