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

upgrade to gaim 2.0.0beta5

Browse Source
This commit is contained in:
brad 2006-11-11 07:49:45 +00:00
parent ca6c31abbf
commit 9e54821f24
10 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/gaim/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.93 2006/10/31 19:32:50 brad Exp $
# $OpenBSD: Makefile,v 1.94 2006/11/11 07:49:45 brad Exp $
SHARED_ONLY= Yes
COMMENT= "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
DISTNAME= gaim-2.0.0beta4
DISTNAME= gaim-2.0.0beta5
SHARED_LIBS= gaim 0.0 \
gnt 0.0
CATEGORIES= net

8
net/gaim/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gaim-2.0.0beta4.tar.gz) = 9bd1d2a9191d4083ff8161b5683cc8a7
RMD160 (gaim-2.0.0beta4.tar.gz) = 1dc6f639ea76e2057bc6b14b99251d54cfd0812b
SHA1 (gaim-2.0.0beta4.tar.gz) = 1cdddf376450f21a329514ef1c24914964191833
SIZE (gaim-2.0.0beta4.tar.gz) = 8780692
MD5 (gaim-2.0.0beta5.tar.gz) = b95158280b54f7c6e61c975ac6a1b2c5
RMD160 (gaim-2.0.0beta5.tar.gz) = dbb1155ed8399357365681ecdd7055e4ac7aadaf
SHA1 (gaim-2.0.0beta5.tar.gz) = 0ccc19d83ffde45188fbcded3f65458602ea9eb2
SIZE (gaim-2.0.0beta5.tar.gz) = 9031658

38
net/gaim/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad Exp $
--- configure.ac.orig Wed Oct 18 19:38:16 2006
+++ configure.ac Sat Oct 28 23:35:23 2006
$OpenBSD: patch-configure_ac,v 1.2 2006/11/11 07:49:45 brad Exp $
--- configure.ac.orig Fri Nov 10 02:24:20 2006
+++ configure.ac Fri Nov 10 22:02:47 2006
@@ -415,6 +415,7 @@ if test "x$enable_consoleui" = "xyes"; t
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@ -9,31 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad 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.])
fi
@@ -456,14 +457,16 @@ dnl ####################################
AC_ARG_ENABLE(gstreamer,
[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
enable_gst="no", enable_gst="yes")
-PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [
- AC_MSG_RESULT(no)
- enable_gst="no"
-])
if test "x$enable_gst" != "xno"; then
- AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
- AC_SUBST(GSTREAMER_CFLAGS)
- AC_SUBST(GSTREAMER_LIBS)
+ PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10],
+ AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
+ AC_SUBST(GSTREAMER_CFLAGS)
+ AC_SUBST(GSTREAMER_LIBS)
+ enable_gst="yes"
+ ], [
+ AC_MSG_RESULT(no)
+ enable_gst="no"
+ ])
fi
dnl #######################################################################
@@ -570,7 +573,7 @@ else
@@ -570,7 +571,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -42,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
fi
AC_SUBST(SILC_LIBS)
@@ -1187,8 +1190,13 @@ dnl ####################################
@@ -1187,8 +1188,13 @@ dnl ####################################
dnl These two are inverses of each other <-- stolen from evolution!
@ -57,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad Exp $
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
@@ -1200,6 +1208,90 @@ AC_ARG_ENABLE(nss,
@@ -1200,6 +1206,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None (MSN will not work without SSL!)"
dnl #
@ -148,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad Exp $
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
@@ -1552,12 +1644,20 @@ fi
@@ -1552,12 +1642,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

12
net/gaim/patches/patch-console_gntdebug_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-console_gntdebug_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/gntdebug.c.orig Sun Oct 29 02:50:41 2006
+++ console/gntdebug.c Sun Oct 29 02:50:44 2006
@@ -193,7 +193,7 @@ gaim_glib_log_handler(const gchar *domai
void gg_debug_window_show()
{
- debug.paused = false;
+ debug.paused = FALSE;
debug.timestamps = gaim_prefs_get_bool("/core/debug/timestamps");
if (debug.window == NULL)
{

8
net/gaim/patches/patch-console_libgnt_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-console_libgnt_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/libgnt/Makefile.in.orig Sun Oct 29 16:14:11 2006
+++ console/libgnt/Makefile.in Sun Oct 29 16:14:12 2006
@@ -414,7 +414,7 @@ target_alias = @target_alias@
$OpenBSD: patch-console_libgnt_Makefile_in,v 1.2 2006/11/11 07:49:45 brad Exp $
--- console/libgnt/Makefile.in.orig Fri Nov 10 02:24:45 2006
+++ console/libgnt/Makefile.in Fri Nov 10 22:02:48 2006
@@ -412,7 +412,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@

8
net/gaim/patches/patch-console_plugins_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-console_plugins_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/plugins/Makefile.in.orig Sun Oct 29 02:39:35 2006
+++ console/plugins/Makefile.in Sun Oct 29 02:40:00 2006
@@ -426,7 +426,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-v
$OpenBSD: patch-console_plugins_Makefile_in,v 1.2 2006/11/11 07:49:45 brad Exp $
--- console/plugins/Makefile.in.orig Fri Nov 10 02:24:46 2006
+++ console/plugins/Makefile.in Fri Nov 10 22:02:48 2006
@@ -423,7 +423,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-v
@PLUGINS_TRUE@gntlastlog_la_SOURCES = lastlog.c
@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la
@PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)

8
net/gaim/patches/patch-gtk_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_gtkdialogs_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- gtk/gtkdialogs.c.orig Fri Oct 20 21:54:24 2006
+++ gtk/gtkdialogs.c Fri Oct 20 21:55:26 2006
@@ -513,6 +513,12 @@ g_string_append(str, "<br/> <b>Library
$OpenBSD: patch-gtk_gtkdialogs_c,v 1.2 2006/11/11 07:49:45 brad Exp $
--- gtk/gtkdialogs.c.orig Fri Nov 10 02:23:00 2006
+++ gtk/gtkdialogs.c Fri Nov 10 22:02:48 2006
@@ -519,6 +519,12 @@ g_string_append(str, "<br/> <b>Library
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

16
net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/plugins/ssl/Makefile.in.orig Wed Oct 18 16:00:20 2006
+++ libgaim/plugins/ssl/Makefile.in Sat Oct 21 01:39:44 2006
$OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.2 2006/11/11 07:49:45 brad Exp $
--- libgaim/plugins/ssl/Makefile.in.orig Fri Nov 10 02:24:50 2006
+++ libgaim/plugins/ssl/Makefile.in Fri Nov 10 22:02:48 2006
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -23,7 +23,7 @@ $OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad E
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -193,6 +199,8 @@ GMOFILES = @GMOFILES@
@@ -192,6 +198,8 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNT_CFLAGS = @GNT_CFLAGS@
GNT_LIBS = @GNT_LIBS@
@ -32,7 +32,7 @@ $OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad E
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -330,6 +338,8 @@ TCL_LIBS = @TCL_LIBS@
@@ -327,6 +335,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-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad E
USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@
@@ -416,17 +426,21 @@ EXTRA_DIST = \
@@ -413,17 +423,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/gaim
ssl_la_LDFLAGS = -module -avoid-version
@ -63,7 +63,7 @@ $OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad E
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -499,6 +513,8 @@ clean-pluginLTLIBRARIES:
@@ -496,6 +510,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -72,7 +72,7 @@ $OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad E
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)
@@ -512,6 +528,7 @@ mostlyclean-compile:
@@ -509,6 +525,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c

8
net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgaim_protocols_gg_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/protocols/gg/Makefile.in.orig Sat Oct 28 13:52:42 2006
+++ libgaim/protocols/gg/Makefile.in Sat Oct 28 13:52:45 2006
@@ -486,7 +486,7 @@ libgg_la_LDFLAGS = -module -avoid-versio
$OpenBSD: patch-libgaim_protocols_gg_Makefile_in,v 1.2 2006/11/11 07:49:45 brad Exp $
--- libgaim/protocols/gg/Makefile.in.orig Fri Nov 10 02:24:51 2006
+++ libgaim/protocols/gg/Makefile.in Fri Nov 10 22:02:48 2006
@@ -483,7 +483,7 @@ libgg_la_LDFLAGS = -module -avoid-versio
@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/gaim/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.46 2006/10/31 19:32:51 brad Exp $
@comment $OpenBSD: PLIST,v 1.47 2006/11/11 07:49:45 brad Exp $
bin/gaim
bin/gaim-text
include/gaim/
@ -108,6 +108,7 @@ include/gaim/whiteboard.h
include/gaim/xmlnode.h
include/gnt/
include/gnt/gnt.h
include/gnt/gntbindable.h
include/gnt/gntbox.h
include/gnt/gntbutton.h
include/gnt/gntcheckbox.h
@ -120,6 +121,7 @@ include/gnt/gntline.h
include/gnt/gntmarshal.h
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntmenuitemcheck.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
include/gnt/gnttree.h
@ -128,8 +130,6 @@ include/gnt/gntwidget.h
include/gnt/gntwindow.h
include/gnt/gntwm.h
lib/gaim/
@comment lib/gaim/docklet.la
lib/gaim/docklet.so
@comment lib/gaim/extplacement.la
lib/gaim/extplacement.so
@comment lib/gaim/gaimrc.la
@ -228,6 +228,7 @@ share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/gaim.mo
share/locale/en_CA/LC_MESSAGES/gaim.mo
share/locale/en_GB/LC_MESSAGES/gaim.mo
share/locale/eo/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/et/LC_MESSAGES/gaim.mo
share/locale/eu/LC_MESSAGES/gaim.mo
@ -761,7 +762,6 @@ share/pixmaps/gaim/typed.png
share/pixmaps/gaim/typing.png
share/sounds/
share/sounds/gaim/
@comment share/sounds/gaim/Makefile.mingw
share/sounds/gaim/alert.wav
share/sounds/gaim/login.wav
share/sounds/gaim/logout.wav