Update to their GNOME 2.8.2 versions:

metacity        2.8.6 -> 2.8.8
gnome-mime-data 2.4.1 -> 2.4.2
nautilus        2.8.1 -> 2.8.2
gnome-panel     2.8.1 -> 2.8.2
gnome-terminal  2.8.0 -> 2.8.2
gnome-vfs2      2.8.2 -> 2.8.3
yelp            2.6.4 -> 2.6.5

GNOME 2.8.2 was announced right before I committed 2.8.1, sheesh.
This commit is contained in:
marcm 2004-12-14 01:14:44 +00:00
parent a5d66a619c
commit 39e8749e89
28 changed files with 132 additions and 144 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2004/12/10 20:36:45 marcm Exp $
# $OpenBSD: Makefile,v 1.11 2004/12/14 01:14:44 marcm Exp $
COMMENT= "Boring window manager for the adult in you."
DISTNAME= metacity-2.8.6
DISTNAME= metacity-2.8.8
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org/softwaremap/projects/Metacity

View File

@ -1,3 +1,3 @@
MD5 (metacity-2.8.6.tar.bz2) = c49e4b5575503975516159780855e317
RMD160 (metacity-2.8.6.tar.bz2) = 0f36aae985860244e728a6affc3becc4dda156b5
SHA1 (metacity-2.8.6.tar.bz2) = 5f86472a4f8ffa4d8a72e375e41e337362e7b8e0
MD5 (metacity-2.8.8.tar.bz2) = 36c9ff136cff365dc40365000bfecec0
RMD160 (metacity-2.8.8.tar.bz2) = a8cb0642be537a86d88adcf8df3acda5e4566525
SHA1 (metacity-2.8.8.tar.bz2) = 1affbe79fdbf354317d0ff6af4b694de37c61308

View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Mon Aug 9 13:07:34 2004
+++ ltmain.sh Wed Dec 1 18:12:31 2004
@@ -1374,6 +1374,17 @@
--- ltmain.sh.orig Mon Dec 6 10:34:27 2004
+++ ltmain.sh Sun Dec 12 19:36:06 2004
@@ -1492,6 +1492,17 @@ EOF
continue
;;
@ -18,7 +18,7 @@
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@
@@ -2153,6 +2164,21 @@ EOF
fi
continue
;;
@ -40,7 +40,7 @@
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@
@@ -2410,10 +2436,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +51,7 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@
@@ -5800,40 +5822,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2004/10/17 04:41:20 marcm Exp $
# $OpenBSD: Makefile,v 1.11 2004/12/14 01:14:44 marcm Exp $
COMMENT= "MIME and Application database for GNOME"
DISTNAME= gnome-mime-data-2.4.1
DISTNAME= gnome-mime-data-2.4.2
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org/

View File

@ -1,3 +1,3 @@
MD5 (gnome-mime-data-2.4.1.tar.bz2) = a8bd52c6876a5294abc402f8a581ac1a
RMD160 (gnome-mime-data-2.4.1.tar.bz2) = fefc9775e51026fbeaf7e3d0184c73efad64bee6
SHA1 (gnome-mime-data-2.4.1.tar.bz2) = 30941dfe2591a44310a33a87ffce9469ec2e700a
MD5 (gnome-mime-data-2.4.2.tar.bz2) = 37242776b08625fa10c73c18b790e552
RMD160 (gnome-mime-data-2.4.2.tar.bz2) = 2fd5597aee06dcd95c6cd05d095171201b54ee7f
SHA1 (gnome-mime-data-2.4.2.tar.bz2) = e6c6d80366b5064eea2305819b36dd02ed2e9454

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2004/12/10 20:36:45 marcm Exp $
# $OpenBSD: Makefile,v 1.12 2004/12/14 01:14:44 marcm Exp $
COMMENT= "GNOME shell and file manager"
DISTNAME= nautilus-2.8.1
DISTNAME= nautilus-2.8.2
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org/projects/nautilus/
@ -21,7 +21,7 @@ MODULES= devel/gettext
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
:p5-XML-Parser-*:textproc/p5-XML-Parser
LIB_DEPENDS= eel-2.6.1::x11/gnome/eel \
LIB_DEPENDS= eel-2.10.2::x11/gnome/eel \
gnome-desktop-2.0::x11/gnome/desktop \
rsvg-2.2::x11/gnome/librsvg
RUN_DEPENDS= :gnome-icon-theme-*:x11/gnome/icon-theme

View File

@ -1,3 +1,3 @@
MD5 (nautilus-2.8.1.tar.bz2) = f710649a204c84e61cb38352a3e4fc3b
RMD160 (nautilus-2.8.1.tar.bz2) = f29a0a5649c8cf72d9ac5491e6b5bd1e62447d43
SHA1 (nautilus-2.8.1.tar.bz2) = 76ef92ee99365c56528b16ba5edf1f652edcc97f
MD5 (nautilus-2.8.2.tar.bz2) = d5fdec9acc37181016e8424e96d663b8
RMD160 (nautilus-2.8.2.tar.bz2) = 71d0d48d5f0f266bc3234b0b450b4e420c28be6e
SHA1 (nautilus-2.8.2.tar.bz2) = cf85656656550d1e8c4be405434cd3e81c7ad7bb

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2004/06/23 03:26:18 marcm Exp $
--- configure.orig 2004-06-21 00:17:50.000000000 -0600
+++ configure 2004-06-21 00:18:15.000000000 -0600
@@ -9125,7 +9125,7 @@ nto-qnx*)
$OpenBSD: patch-configure,v 1.5 2004/12/14 01:14:44 marcm Exp $
--- configure.orig Thu Oct 28 08:06:36 2004
+++ configure Sun Dec 12 19:59:00 2004
@@ -9146,7 +9146,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no

View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Mon Aug 9 13:07:34 2004
+++ ltmain.sh Wed Dec 1 18:12:31 2004
@@ -1374,6 +1374,17 @@
--- ltmain.sh.orig Mon Aug 9 10:07:34 2004
+++ ltmain.sh Sun Dec 12 19:59:01 2004
@@ -1374,6 +1374,17 @@ EOF
continue
;;
@ -18,7 +18,7 @@
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@
@@ -2024,6 +2035,21 @@ EOF
fi
continue
;;
@ -40,7 +40,7 @@
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@
@@ -2274,10 +2300,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +51,7 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@
@@ -5827,40 +5849,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2004/12/10 20:36:45 marcm Exp $
@comment $OpenBSD: PLIST,v 1.14 2004/12/14 01:14:44 marcm Exp $
bin/nautilus
bin/nautilus-file-management-properties
include/libnautilus/
@ -81,8 +81,6 @@ share/locale/az/LC_MESSAGES/nautilus.mo
share/locale/be/LC_MESSAGES/nautilus.mo
share/locale/bg/LC_MESSAGES/nautilus.mo
share/locale/bn/LC_MESSAGES/nautilus.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2004/12/10 20:36:45 marcm Exp $
# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
COMMENT= "GNOME panel"
DISTNAME= gnome-panel-2.8.1
DISTNAME= gnome-panel-2.8.2
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org

View File

@ -1,3 +1,3 @@
MD5 (gnome-panel-2.8.1.tar.bz2) = 77aea214467da238170ed10dbc825799
RMD160 (gnome-panel-2.8.1.tar.bz2) = 79b083f3a2fa602bd6e1e35bd29538f25218751a
SHA1 (gnome-panel-2.8.1.tar.bz2) = 232b064bd7a71729d203cc006fff8de1d253ca30
MD5 (gnome-panel-2.8.2.tar.bz2) = 8637a859fd84cd3f9373cfe107131023
RMD160 (gnome-panel-2.8.2.tar.bz2) = 51d49ff32026751a2b8330de2d86755b3af73c84
SHA1 (gnome-panel-2.8.2.tar.bz2) = 3b667e85ea55ffe6080ba34e9d48941451e2928f

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/23 03:26:18 marcm Exp $
--- ltmain.sh.orig 2004-05-19 10:14:48.000000000 -0600
+++ ltmain.sh 2004-06-21 13:22:49.000000000 -0600
@@ -1857,9 +1857,12 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.5 2004/12/14 01:14:44 marcm Exp $
--- ltmain.sh.orig Sun Dec 5 08:46:55 2004
+++ ltmain.sh Sun Dec 12 15:41:59 2004
@@ -1975,9 +1975,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/06/23 03:26:18 marcm Exp $
continue
;;
-l*)
@@ -2274,10 +2277,6 @@ EOF
@@ -2410,10 +2413,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -27,7 +27,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2004/06/23 03:26:18 marcm Exp $
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
@@ -5800,40 +5799,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2004/12/10 20:36:45 marcm Exp $
@comment $OpenBSD: PLIST,v 1.14 2004/12/14 01:14:44 marcm Exp $
bin/gnome-desktop-item-edit
bin/gnome-panel
bin/gnome-panel-screenshot
@ -355,6 +355,12 @@ share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/nso/
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2004/12/10 20:36:46 marcm Exp $
# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
COMMENT= "GNOME terminal"
DISTNAME= gnome-terminal-2.8.0
DISTNAME= gnome-terminal-2.8.2
CATEGORIES= x11/gnome
HOMEPAGE= http://www.gnome.org/

View File

@ -1,3 +1,3 @@
MD5 (gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672
RMD160 (gnome-terminal-2.8.0.tar.bz2) = 1a4cf0ee130b0e85f373b0325652559425485487
SHA1 (gnome-terminal-2.8.0.tar.bz2) = 9f7b2263d2794b6844e6c5b6f8daf97922ebff2e
MD5 (gnome-terminal-2.8.2.tar.bz2) = ffa668b7301dff6ce5ad9ec4c1e11c92
RMD160 (gnome-terminal-2.8.2.tar.bz2) = 089d3a432f66a36e532cd2e1c5365998250ebbf4
SHA1 (gnome-terminal-2.8.2.tar.bz2) = 69e5c4a13f215119405c4ce722072cd07a3be54c

View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Mon Aug 9 13:07:34 2004
+++ ltmain.sh Wed Dec 1 18:12:31 2004
@@ -1374,6 +1374,17 @@
--- ltmain.sh.orig Tue Dec 7 13:29:57 2004
+++ ltmain.sh Sun Dec 12 08:06:03 2004
@@ -1492,6 +1492,17 @@ EOF
continue
;;
@ -18,7 +18,7 @@
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@
@@ -2157,6 +2168,21 @@ EOF
fi
continue
;;
@ -40,7 +40,7 @@
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@
@@ -2414,10 +2440,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +51,7 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@
@@ -5804,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_terminal-screen_c,v 1.1 2004/07/25 00:21:13 marcm Exp $
--- src/terminal-screen.c.orig Mon Jul 12 23:19:39 2004
+++ src/terminal-screen.c Mon Jul 12 23:19:43 2004
@@ -1057,7 +1057,7 @@ get_child_environment (GtkWidget *t
$OpenBSD: patch-src_terminal-screen_c,v 1.2 2004/12/14 01:14:44 marcm Exp $
--- src/terminal-screen.c.orig Mon Jun 28 00:44:02 2004
+++ src/terminal-screen.c Sun Dec 12 08:06:03 2004
@@ -1069,7 +1069,7 @@ get_child_environment (GtkWidget *t
retval[i] = g_strdup ("COLORTERM="EXECUTABLE_NAME);
++i;

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2004/12/10 20:36:46 marcm Exp $
# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
COMMENT= "GNOME Virtual File System"
VERSION= 2.8.2
VERSION= 2.8.3
DISTNAME= gnome-vfs-${VERSION}
PKGNAME= gnome-vfs2-${VERSION}
CATEGORIES= devel x11/gnome

View File

@ -1,3 +1,3 @@
MD5 (gnome-vfs-2.8.2.tar.gz) = 09541fa6633546a9b33300c71b10f5d9
RMD160 (gnome-vfs-2.8.2.tar.gz) = d28b44f3690fb03a686d4a507ab0c78c829f04fd
SHA1 (gnome-vfs-2.8.2.tar.gz) = fcb9f8a875f86ff8c42d9d31dfe3085cee92eb55
MD5 (gnome-vfs-2.8.3.tar.gz) = ac05aaf452310f0c44b6ba642fb12657
RMD160 (gnome-vfs-2.8.3.tar.gz) = 1086cec042c96ee8c9b09723986920b3ee5e3c7d
SHA1 (gnome-vfs-2.8.3.tar.gz) = 70bc14305c450c1b16fe79705bc287817e5e7f71

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2004/06/23 03:26:21 marcm Exp $
--- configure.orig 2004-04-20 03:54:46.000000000 -0600
+++ configure 2004-06-20 00:56:24.000000000 -0600
@@ -22807,6 +22807,7 @@ echo "${ECHO_T}$LINGUAS" >&6
$OpenBSD: patch-configure,v 1.8 2004/12/14 01:14:44 marcm Exp $
--- configure.orig Thu Oct 28 07:16:54 2004
+++ configure Sun Dec 12 16:24:37 2004
@@ -22960,6 +22960,7 @@ echo "${ECHO_T}$LINGUAS" >&6
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.7 2004/06/23 03:26:21 marcm Exp $
for ac_func in ngettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -25724,6 +25725,7 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -25884,6 +25885,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_MOUNT_H
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.7 2004/06/23 03:26:21 marcm Exp $
#include <sys/mount.h>
#endif
#ifdef HAVE_SYS_STATFS_H
@@ -27943,7 +27945,7 @@ if test "${openssl_libs+set}" = set; the
@@ -33518,7 +33520,7 @@ if test "${openssl_libs+set}" = set; the
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -26,7 +26,7 @@ $OpenBSD: patch-configure,v 1.7 2004/06/23 03:26:21 marcm Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29691,6 +29693,7 @@ _ACEOF
@@ -36841,6 +36843,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -34,7 +34,7 @@ $OpenBSD: patch-configure,v 1.7 2004/06/23 03:26:21 marcm Exp $
#include <sys/mount.h>
_ACEOF
@@ -29711,6 +29714,7 @@ _ACEOF
@@ -36862,6 +36865,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */

View File

@ -1,6 +1,6 @@
--- libgnomevfs/gnome-vfs-dns-sd.c.orig Wed Dec 1 17:56:06 2004
+++ libgnomevfs/gnome-vfs-dns-sd.c Wed Dec 1 18:04:28 2004
@@ -60,7 +60,7 @@
--- libgnomevfs/gnome-vfs-dns-sd.c.orig Tue Sep 21 01:05:42 2004
+++ libgnomevfs/gnome-vfs-dns-sd.c Sun Dec 12 16:24:37 2004
@@ -60,7 +60,7 @@ typedef struct {
} dns_message_header;
typedef struct {
@ -9,7 +9,7 @@
guint16 type;
guint16 class;
guint32 ttl;
@@ -225,7 +225,7 @@
@@ -225,7 +225,7 @@ parse_header (char *reply, int reply_len
unsigned char *p,
dns_message_header *header)
{
@ -18,7 +18,7 @@
return -1;
header->id = decode_16 (p); p += 2;
@@ -235,7 +235,7 @@
@@ -235,7 +235,7 @@ parse_header (char *reply, int reply_len
header->nscount = decode_16 (p); p += 2;
header->arcount = decode_16 (p); p += 2;
@ -27,7 +27,7 @@
}
@@ -308,7 +308,7 @@
@@ -308,7 +308,7 @@ unicast_list_domains_sync (const char *d
unsigned char reply[DNS_REPLY_SIZE];
unsigned char *p;
char *searchdomain;
@ -36,7 +36,7 @@
dns_message_header header;
dns_message_rr rr;
int res;
@@ -324,7 +324,7 @@
@@ -324,7 +324,7 @@ unicast_list_domains_sync (const char *d
/* Use TCP to support large queries */
_res.options |= RES_USEVC;
searchdomain = g_strconcat ("_browse._dns-sd._udp.", domain, NULL);
@ -45,7 +45,7 @@
reply, sizeof (reply));
g_free (searchdomain);
if (reply_len == -1) {
@@ -368,7 +368,7 @@
@@ -368,7 +368,7 @@ unicast_list_domains_sync (const char *d
goto error;
p += len;
@ -54,7 +54,7 @@
len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
if (len < 0)
goto error;
@@ -419,7 +419,7 @@
@@ -419,7 +419,7 @@ unicast_browse_sync (const char *domain,
unsigned char reply[DNS_REPLY_SIZE];
unsigned char *p;
char *searchdomain;
@ -63,7 +63,7 @@
dns_message_header header;
dns_message_rr rr;
GArray *array;
@@ -436,7 +436,7 @@
@@ -436,7 +436,7 @@ unicast_browse_sync (const char *domain,
/* Use TCP to support large queries */
_res.options |= RES_USEVC;
searchdomain = g_strconcat (type, ".", domain, NULL);
@ -72,7 +72,7 @@
reply, sizeof (reply));
g_free (searchdomain);
if (reply_len == -1) {
@@ -482,11 +482,12 @@
@@ -482,11 +482,12 @@ unicast_browse_sync (const char *domain,
goto error;
p += len;
@ -89,7 +89,7 @@
len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
if (len < 0)
@@ -580,7 +581,7 @@
@@ -580,7 +581,7 @@ unicast_resolve_sync (const char *name,
int reply_len, len, i;
unsigned char reply[DNS_REPLY_SIZE];
unsigned char *p;
@ -98,7 +98,7 @@
dns_message_header header;
dns_message_rr rr;
char *full_name;
@@ -600,7 +601,7 @@
@@ -600,7 +601,7 @@ unicast_resolve_sync (const char *name,
_res.options |= RES_USEVC;
full_name = service_to_dns_name (name, type, domain);
@ -107,7 +107,7 @@
reply, sizeof (reply));
g_free (full_name);
if (reply_len == -1) {
@@ -644,7 +645,7 @@
@@ -644,7 +645,7 @@ unicast_resolve_sync (const char *name,
goto error;
p += len;
@ -116,7 +116,7 @@
unsigned char *pp;
int priority, weight, port;
@@ -665,7 +666,7 @@
@@ -665,7 +666,7 @@ unicast_resolve_sync (const char *name,
}
}

View File

@ -1,46 +1,21 @@
--- ltmain.sh.orig Mon Aug 9 13:07:34 2004
+++ ltmain.sh Wed Dec 1 18:12:31 2004
@@ -1374,6 +1374,17 @@
continue
;;
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="deplibs $arg"
+ ;;
+ *)
--- ltmain.sh.orig Mon Aug 9 10:07:34 2004
+++ ltmain.sh Sun Dec 12 20:42:22 2004
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
+
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
+
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@
-l*)
@@ -2274,10 +2277,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +26,7 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,16 +1,19 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2004/12/10 20:36:46 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2004/12/14 01:14:44 marcm Exp $
lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
lib/gnome-vfs-2.0/modules/libbzip2.so
lib/gnome-vfs-2.0/modules/libcdda.so
lib/gnome-vfs-2.0/modules/libcomputer.so
lib/gnome-vfs-2.0/modules/libdns-sd.so
lib/gnome-vfs-2.0/modules/libfile.so
lib/gnome-vfs-2.0/modules/libftp.so
lib/gnome-vfs-2.0/modules/libgzip.so
lib/gnome-vfs-2.0/modules/libhttp.so
lib/gnome-vfs-2.0/modules/libnetwork.so
lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libsftp.so
lib/gnome-vfs-2.0/modules/libtar.so
lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
lib/gnome-vfs-2.0/modules/libvfs-pipe.so
lib/gnome-vfs-2.0/modules/libvfs-test.so
lib/gnome-vfs-2.0/modules/libvfs-translate.so
@lib lib/libgnomevfs-2.so.800.2
@lib lib/libgnomevfs-2.so.800.3

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2004/12/10 20:36:46 marcm Exp $
# $OpenBSD: Makefile,v 1.11 2004/12/14 01:14:45 marcm Exp $
COMMENT= "GNOME help browser"
VERSION= 2.6.4
VERSION= 2.6.5
DISTNAME= yelp-${VERSION}
CATEGORIES= x11/gnome

View File

@ -1,3 +1,3 @@
MD5 (yelp-2.6.4.tar.bz2) = 77d919335650ef0d114c951637669bda
RMD160 (yelp-2.6.4.tar.bz2) = ee38b5ed5bdade549aecf4b0afc024455b6c609f
SHA1 (yelp-2.6.4.tar.bz2) = 86454e7817d12f4060e9bb76d726e766d899fed1
MD5 (yelp-2.6.5.tar.bz2) = 9bd94af344ee6a0bf69aa6f9cbd6b7e9
RMD160 (yelp-2.6.5.tar.bz2) = d9ae640de40395485ee4e43ad03ed0e3b0c1a329
SHA1 (yelp-2.6.5.tar.bz2) = 2cd2c4125a01016ab9d60afbd9b684225b3b401f

View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig Mon Aug 9 13:07:34 2004
+++ ltmain.sh Wed Dec 1 18:12:31 2004
@@ -1374,6 +1374,17 @@
--- ltmain.sh.orig Sun Dec 5 11:28:48 2004
+++ ltmain.sh Sun Dec 12 08:00:37 2004
@@ -1374,6 +1374,17 @@ EOF
continue
;;
@ -18,7 +18,7 @@
-module)
module=yes
continue
@@ -2024,6 +2035,21 @@
@@ -2024,6 +2035,21 @@ EOF
fi
continue
;;
@ -40,7 +40,7 @@
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2274,10 +2300,6 @@
@@ -2274,10 +2300,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +51,7 @@
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5849,6 @@
@@ -5827,40 +5849,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2004/12/10 20:36:47 marcm Exp $
@comment $OpenBSD: PLIST,v 1.11 2004/12/14 01:14:45 marcm Exp $
bin/gnome-help
bin/yelp
lib/bonobo/
@ -103,6 +103,9 @@ share/locale/ne/LC_MESSAGES/yelp.mo
share/locale/nl/LC_MESSAGES/yelp.mo
share/locale/nn/LC_MESSAGES/yelp.mo
share/locale/no/LC_MESSAGES/yelp.mo
share/locale/nso/
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/yelp.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/yelp.mo
@ -139,6 +142,9 @@ share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/
share/locale/zu/LC_MESSAGES/
share/locale/zu/LC_MESSAGES/yelp.mo
share/sgml/docbook/yelp/
share/sgml/docbook/yelp/db2html-admon.xsl
share/sgml/docbook/yelp/db2html-biblio.xsl