Update to gaim 0.44

This commit is contained in:
jcs 2001-09-22 05:45:26 +00:00
parent e81f901670
commit 3debe2d397
20 changed files with 122 additions and 208 deletions

View File

@ -1,9 +1,8 @@
# vim:ts=8
# $OpenBSD: Makefile,v 1.13 2001/07/30 10:41:39 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2001/09/22 05:45:26 jcs Exp $
DISTNAME= gaim-0.11.0pre14
DISTNAME= gaim-0.44
CATEGORIES= net
NEED_VERSION= 1.427
NEED_VERSION= 1.457
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -23,7 +22,7 @@ LIB_DEPENDS= gdk_pixbuf.2::graphics/gdk-pixbuf
RUN_DEPENDS= ispell::textproc/ispell
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --disable-gnome
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --disable-gnome --disable-artsc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,3 +1,3 @@
MD5 (gaim-0.11.0pre14.tar.gz) = 9ceb1b25fdfe59dcb98958ad16532112
RMD160 (gaim-0.11.0pre14.tar.gz) = 0a0f17acde19471e78afa26ca33ee33f75316112
SHA1 (gaim-0.11.0pre14.tar.gz) = 9b43e0d07b1dd8d71f36cc7fb409918c95249431
MD5 (gaim-0.44.tar.gz) = a942433c9dde5184571e9fab5daa4579
RMD160 (gaim-0.44.tar.gz) = 5f5387f7f418ed7ed3349c0007ca99bdb2f6bcaf
SHA1 (gaim-0.44.tar.gz) = b170ade6c5414b588985bf8af56446e4dcacceff

View File

@ -1,53 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- configure.orig Sun Jul 29 21:06:57 2001
+++ configure Sun Jul 29 21:12:41 2001
@@ -3041,6 +3041,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -3445,10 +3448,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -3925,13 +3939,11 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)

View File

@ -1,82 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- ltmain.sh.orig Mon Jun 18 08:40:21 2001
+++ ltmain.sh Sun Jul 29 20:07:38 2001
@@ -1031,12 +1031,27 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
fi
deplibs="$deplibs $arg"
continue
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -2401,6 +2416,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r
+ ;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
@@ -4412,40 +4430,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_icq_Makefile_in,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- plugins/icq/Makefile.in.orig Sun Jul 29 21:37:41 2001
+++ plugins/icq/Makefile.in Sun Jul 29 21:37:52 2001
@@ -157,7 +157,7 @@ LTLIBRARIES = $(pkg_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-libgaimicq_la_LDFLAGS =
+libgaimicq_la_LDFLAGS = -export-dynamic -avoid-version
libgaimicq_la_LIBADD =
libgaimicq_la_OBJECTS = chatsession.lo contacts.lo cyrillic.lo \
eventhandle.lo filesession.lo icqbyteorder.lo icqevent.lo icqlib.lo \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_jabber_Makefile_in,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- plugins/jabber/Makefile.in.orig Sun Jul 29 21:36:56 2001
+++ plugins/jabber/Makefile.in Sun Jul 29 21:37:06 2001
@@ -156,7 +156,7 @@ LTLIBRARIES = $(pkg_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-libjabber_la_LDFLAGS =
+libjabber_la_LDFLAGS = -export-dynamic -avoid-version
libjabber_la_LIBADD =
libjabber_la_OBJECTS = expat.lo genhash.lo hashtable.lo pool.lo sha.lo \
snprintf.lo socket.lo str.lo xmlnode.lo xmlparse.lo xmlrole.lo \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_msn_Makefile_in,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- plugins/msn/Makefile.in.orig Sun Jul 29 21:36:15 2001
+++ plugins/msn/Makefile.in Sun Jul 29 21:36:28 2001
@@ -153,7 +153,7 @@ LTLIBRARIES = $(pkg_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-libmsn_la_LDFLAGS =
+libmsn_la_LDFLAGS = -export-dynamic -avoid-version
libmsn_la_LIBADD =
libmsn_la_OBJECTS = msn.lo md5.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_yay_Makefile_in,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- plugins/yay/Makefile.in.orig Sun Jul 29 21:37:21 2001
+++ plugins/yay/Makefile.in Sun Jul 29 21:37:31 2001
@@ -156,7 +156,7 @@ LTLIBRARIES = $(pkg_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-libyahoo_la_LDFLAGS =
+libyahoo_la_LDFLAGS = -export-dynamic -avoid-version
libyahoo_la_LIBADD =
libyahoo_la_OBJECTS = buddy.lo conn.lo login.lo misc.lo outgoing.lo \
rxhandlers.lo yay.lo

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_zephyr_Makefile_in,v 1.1 2001/07/30 10:41:39 naddy Exp $
--- plugins/zephyr/Makefile.in.orig Sun Jul 29 21:34:02 2001
+++ plugins/zephyr/Makefile.in Sun Jul 29 21:35:54 2001
@@ -154,7 +154,7 @@ LTLIBRARIES = $(pkg_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-libzephyr_la_LDFLAGS =
+libzephyr_la_LDFLAGS = -export-dynamic -avoid-version
libzephyr_la_LIBADD =
libzephyr_la_OBJECTS = ZAsyncLocate.lo ZCkAuth.lo ZCkIfNot.lo \
ZClosePort.lo ZCmpUID.lo ZCmpUIDP.lo ZFlsLocs.lo ZFlsSubs.lo \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_icq_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/icq/Makefile.in.orig Sat Sep 22 00:18:46 2001
+++ src/protocols/icq/Makefile.in Sat Sep 22 00:19:21 2001
@@ -186,7 +186,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libicq_la_LDFLAGS =
+libicq_la_LDFLAGS = -export-dynamic -avoid-version
libicq_la_LIBADD =
@STATIC_ICQ_FALSE@libicq_la_OBJECTS = chatsession.lo contacts.lo \
@STATIC_ICQ_FALSE@cyrillic.lo eventhandle.lo filesession.lo \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_irc_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/irc/Makefile.in.orig Sat Sep 22 00:20:34 2001
+++ src/protocols/irc/Makefile.in Sat Sep 22 00:20:43 2001
@@ -175,7 +175,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libirc_la_LDFLAGS =
+libirc_la_LDFLAGS = -export-dynamic -avoid-version
libirc_la_LIBADD =
@STATIC_IRC_FALSE@libirc_la_OBJECTS = irc.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_jabber_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/jabber/Makefile.in.orig Sat Sep 22 00:21:20 2001
+++ src/protocols/jabber/Makefile.in Sat Sep 22 00:21:31 2001
@@ -183,7 +183,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libjabber_la_LDFLAGS =
+libjabber_la_LDFLAGS = -export-dynamic -avoid-version
libjabber_la_LIBADD =
@STATIC_JABBER_FALSE@libjabber_la_OBJECTS = expat.lo genhash.lo \
@STATIC_JABBER_FALSE@hashtable.lo pool.lo sha.lo snprintf.lo socket.lo \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_msn_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/msn/Makefile.in.orig Sat Sep 22 00:22:22 2001
+++ src/protocols/msn/Makefile.in Sat Sep 22 00:22:33 2001
@@ -175,7 +175,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libmsn_la_LDFLAGS =
+libmsn_la_LDFLAGS = -export-dynamic -avoid-version
libmsn_la_LIBADD =
@STATIC_MSN_FALSE@libmsn_la_OBJECTS = msn.lo md5.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_napster_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/napster/Makefile.in.orig Sat Sep 22 00:23:00 2001
+++ src/protocols/napster/Makefile.in Sat Sep 22 00:23:09 2001
@@ -173,7 +173,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libnapster_la_LDFLAGS =
+libnapster_la_LDFLAGS = -export-dynamic -avoid-version
libnapster_la_LIBADD =
@STATIC_NAPSTER_FALSE@libnapster_la_OBJECTS = napster.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_oscar_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/oscar/Makefile.in.orig Sat Sep 22 00:23:42 2001
+++ src/protocols/oscar/Makefile.in Sat Sep 22 00:23:50 2001
@@ -185,7 +185,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-liboscar_la_LDFLAGS =
+liboscar_la_LDFLAGS = -export-dynamic -avoid-version
liboscar_la_LIBADD =
@STATIC_OSCAR_FALSE@liboscar_la_OBJECTS = admin.lo adverts.lo auth.lo \
@STATIC_OSCAR_FALSE@bos.lo buddylist.lo chat.lo chatnav.lo conn.lo \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_toc_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/toc/Makefile.in.orig Sat Sep 22 00:24:17 2001
+++ src/protocols/toc/Makefile.in Sat Sep 22 00:24:24 2001
@@ -175,7 +175,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libtoc_la_LDFLAGS =
+libtoc_la_LDFLAGS = -export-dynamic -avoid-version
libtoc_la_LIBADD =
@STATIC_TOC_FALSE@libtoc_la_OBJECTS = toc.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_yahoo_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/yahoo/Makefile.in.orig Sat Sep 22 00:24:52 2001
+++ src/protocols/yahoo/Makefile.in Sat Sep 22 00:24:59 2001
@@ -177,7 +177,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libyahoo_la_LDFLAGS =
+libyahoo_la_LDFLAGS = -export-dynamic -avoid-version
libyahoo_la_LIBADD =
@STATIC_YAHOO_FALSE@libyahoo_la_OBJECTS = buddy.lo conn.lo login.lo \
@STATIC_YAHOO_FALSE@misc.lo outgoing.lo rxhandlers.lo yay.lo

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_protocols_zephyr_Makefile_in,v 1.1 2001/09/22 05:45:27 jcs Exp $
--- src/protocols/zephyr/Makefile.in.orig Sat Sep 22 00:25:32 2001
+++ src/protocols/zephyr/Makefile.in Sat Sep 22 00:25:43 2001
@@ -200,7 +200,7 @@
AR = ar
LTLIBRARIES = $(pkg_LTLIBRARIES)
-libzephyr_la_LDFLAGS =
+libzephyr_la_LDFLAGS = -export-dynamic -avoid-version
libzephyr_la_LIBADD =
@STATIC_ZEPHYR_FALSE@libzephyr_la_OBJECTS = ZAsyncLocate.lo ZCkAuth.lo \
@STATIC_ZEPHYR_FALSE@ZCkIfNot.lo ZClosePort.lo ZCmpUID.lo ZCmpUIDP.lo \

View File

@ -1,14 +1,15 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2001/07/30 10:41:39 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/22 05:45:27 jcs Exp $
lib/gaim/autorecon.so
lib/gaim/chatlist.so
lib/gaim/iconaway.so
lib/gaim/irc.so
lib/gaim/lagmeter.so
lib/gaim/libgaimicq.so
lib/gaim/libicq.so
lib/gaim/libirc.so
lib/gaim/libjabber.so
lib/gaim/libmsn.so
lib/gaim/libnapster.so
lib/gaim/libyahoo.so
lib/gaim/libzephyr.so
lib/gaim/napster.so
lib/gaim/notify.so
lib/gaim/spellchk.so
@dirrm lib/gaim

View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2001/07/30 10:41:39 naddy Exp $
@comment $OpenBSD: PLIST,v 1.4 2001/09/22 05:45:27 jcs Exp $
bin/gaim
man/man1/gaim.1
share/locale/de/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
share/locale/ko/LC_MESSAGES/gaim.mo
share/locale/ru/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/pixmaps/gaim.xpm
%%SHARED%%