Update to 2.0.1 in support of Gnome 2.2.1

ok jolan@
This commit is contained in:
marcm 2003-06-12 19:39:57 +00:00
parent dac5bec5a1
commit 8aa263135f
9 changed files with 86 additions and 129 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2003/03/06 05:44:22 brad Exp $
# $OpenBSD: Makefile,v 1.3 2003/06/12 19:39:57 marcm Exp $
COMMENT= "portable library for obtaining system information"
V= 2.0.0
V= 2.0.1
DISTNAME= libgtop-${V}
PKGNAME= libgtop2-${V}
CATEGORIES= devel
@ -29,6 +29,8 @@ LIB_DEPENDS= glib-2.0.0.0::devel/glib2
SEPARATE_BUILD= concurrent
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
# Should be 2.53
AUTOCONF_VERSION= 2.52
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,6 +1,6 @@
MD5 (libgtop-2.0.0.tar.bz2) = 80cda9d8541b3e7404a65f180e98f42d
MD5 (libgtop-2.0.1.tar.bz2) = 1757801cb39ad7be19b1a472e7fc9060
MD5 (openbsd-libgtop-020830.tar.gz) = 382e1c276bb5a92969d963c97294d7d4
RMD160 (libgtop-2.0.0.tar.bz2) = ec3f93ae688ca103c5e949cde6795ada1ce0432b
RMD160 (libgtop-2.0.1.tar.bz2) = 80c1cb76c4f2021984fa6628bdcf6f25080dbd5e
RMD160 (openbsd-libgtop-020830.tar.gz) = 94bacc99553d5eb72e4d6cb5f0ce219468f3d663
SHA1 (libgtop-2.0.0.tar.bz2) = 9178e5cede22ae5a8928677b195fe585b84b3b86
SHA1 (libgtop-2.0.1.tar.bz2) = db0abf89b26bc61d664df005abb5a62daec79b6a
SHA1 (openbsd-libgtop-020830.tar.gz) = 6d78d7daf6d6f543b7e192a68b24ee2f09cbbb31

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
--- aclocal.m4.orig Mon Jun 10 14:45:51 2002
+++ aclocal.m4 Fri Dec 6 22:27:34 2002
@@ -716,17 +716,23 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
$OpenBSD: patch-aclocal_m4,v 1.2 2003/06/12 19:39:57 marcm Exp $
--- aclocal.m4.orig Sun Jan 12 18:40:00 2003
+++ aclocal.m4 Mon May 19 12:24:12 2003
@@ -719,17 +719,23 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
fi
libgtop_need_server=no
;;
@ -26,37 +26,32 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server && chmod 2755 $(DESTDIR)$(bindir)/libgtop_server2'
;;
*)
if test x$hacker_mode = xyes ; then
@@ -2561,10 +2567,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
aix*)
libgtop_sysdeps_dir=aix
@@ -2703,8 +2709,8 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -2713,8 +2719,8 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -4171,6 +4191,16 @@ newos6*)
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
;;
esac
fi
@@ -4396,6 +4402,16 @@ newos6*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
@ -71,4 +66,4 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
+ fi
;;
osf3* | osf4* | osf5*)
openbsd*)

View File

@ -1,29 +1,11 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
--- configure.in.orig Mon Jun 10 23:45:47 2002
+++ configure.in Mon Jul 29 21:53:39 2002
@@ -372,7 +372,7 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS
LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server'
+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
sysdeps_dir="$libgtop_sysdeps_dir"
AC_SUBST(sysdeps_dir)
@@ -441,7 +441,7 @@ AC_SUBST(LIBGTOP_SERVER)
if test x$libgtop_need_server = xyes ; then
sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
- server_programs='libgtop_server'
+ server_programs='libgtop_server2'
else
sysdeps_suid_lib=
server_programs=
@@ -468,6 +468,7 @@ sysdeps/osf1/Makefile
$OpenBSD: patch-configure_in,v 1.2 2003/06/12 19:39:57 marcm Exp $
--- configure.in.orig Mon May 19 12:33:10 2003
+++ configure.in Mon May 19 12:33:38 2003
@@ -471,6 +471,7 @@ sysdeps/osf1/Makefile
sysdeps/linux/Makefile
sysdeps/kernel/Makefile
sysdeps/freebsd/Makefile
+sysdeps/openbsd/Makefile
sysdeps/solaris/Makefile
sysdeps/aix/Makefile
src/Makefile
src/daemon/Makefile

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
--- ltmain.sh.orig Mon Jun 10 23:45:50 2002
+++ ltmain.sh Sun Jul 28 19:35:04 2002
@@ -1037,6 +1037,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:39:57 marcm Exp $
--- ltmain.sh.orig Sun Jan 12 18:40:08 2003
+++ ltmain.sh Mon May 19 13:15:55 2003
@@ -1073,6 +1073,17 @@ compiler."
continue
;;
@ -19,9 +19,21 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
-module)
module=yes
continue
@@ -4412,40 +4423,6 @@ relink_command=\"$relink_command\""
@@ -1775,11 +1786,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4526,40 +4532,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-po_zh_CN_po,v 1.1 2003/03/08 20:39:07 naddy Exp $
--- po/zh_CN.po.orig Sat Mar 8 18:16:25 2003
+++ po/zh_CN.po Sat Mar 8 18:16:28 2003
@@ -591,8 +591,8 @@ msgid ""
"\n"
"The math bit should be a decimal 4, and the traced bit is decimal 10."
msgstr ""
-"Linux餈𤤿<E9A488><F0A4A4BF><EFBFBD><EFBFBD>敶枏<E695B6>瘥譍葵<E8AD8D><E891B5><EFBFBD><EFBFBD>㗇㺭摮虫<E691AE>霈曄蔭,<2C>牐蛹crt0.s閬<73><E996AC><EFBFBD><EFBFBD>"
-"坔銁颲枏枂銝剖僎銝滚<E98A9D><E6BB9A><EFBFBD>"
+"Linux餈𤤿<E9A488><F0A4A4BF><EFBFBD><EFBFBD>敶枏<E695B6>瘥譍葵<E8AD8D><E891B5><EFBFBD><EFBFBD>㗇㺭摮虫<E691AE>霈曄蔭,<2C>牐蛹crt0.s閬<73><E996AC><EFBFBD><EFBFBD>"
+"<22><EFBFBD><E588BB>箔葉撟嗡<E6929F><E597A1><EFBFBD>𡠺"
#. Min_Flt
#: sysdeps/names/prockernel.c:59
@@ -638,8 +638,8 @@ msgid ""
"textual name. (If you have an up-to-date /etc/psdatabase, then try ps -l to "
"see the WCHAN field in action)"
msgstr ""
-"餈蹱糓餈𤤿<E9A488>蝑匧<E89D91><E58CA7><EFBFBD><EFBFBD>𡁻<EFBFBD>,銝<>銝芰頂蝏蠘<E89D8F><E8A098><EFBFBD><E587BD><EFBFBD>撟嗡<E6929F><EFBFBD><E68692>雿𣳇<E99BBF><EFBFBD>"
-"<22><><EFBFBD><E7A08D><EFBFBD><EFBFBD><EFBFBD>臭誑隞𤾸<E99A9E>摮堒<E691AE>銵其葉<E585B6>𦦵揣<F0A6A6B5><EFBFBD>摮堒<E691AE><E5A092><EFBFBD><E99D9D><EFBFBD><E39787><EFBFBD>/et"
+"餈蹱糓餈𤤿<E9A488>蝑匧<E89D91><E58CA7><EFBFBD><EFBFBD>𡁻<EFBFBD>,銝<>銝芰頂蝏蠘<E89D8F><E8A098><EFBFBD><E587BD><EFBFBD>撟嗡<E6929F><EFBFBD><E68692>雿𣳇<E99BBF><EFBFBD><E996AC>"
+"<22><EFBFBD><E7A08D><EFBFBD><EFBFBD><EFBFBD>臭誑隞𤾸<E99A9E>摮堒<E691AE>銵其葉<E585B6>𦦵揣<F0A6A6B5><EFBFBD>摮堒<E691AE><E5A092><EFBFBD><E99D9D><EFBFBD><E39787><EFBFBD>/et"
"c/psdatabase,<2C><><EFBFBD><EFBFBD>私s -l<>賭誘<E8B3AD><EFBFBD>WCHAN<41><4E>"
#. WChan
@@ -690,8 +690,8 @@ msgid ""
"space. This does not include pages which have not been demand-loaded in, or "
"which are swapped out."
msgstr ""
-"餈𤤿<E9A488><F0A4A4BF><EFBFBD>摮条<E691AE>憿菟𢒰<E88F9F><F0A292B0>,銝箇恣<E7AE87><E681A3>𤌍<EFBFBD><F0A48C8D><EFBFBD>3餈䠷<E9A488><EFBFBD><E99A9E>霈∠<E99C88><E288A0><EFBFBD>𧋦,<2C><EFBFBD>"
-"桀<><E6A180><EFBFBD><EFBFBD>蝛粹𡢿憿菜㺭餈坔僎銝滚<E98A9D><E6BB9A>砍𪑛鈭𥟇瓷<F0A59F87>㕑◤鋆<E297A4><E98B86><EFBFBD>䔶漱<E494B6><EFBCB7><E69E82>△"
+"餈𤤿<E9A488><F0A4A4BF><EFBFBD>摮条<E691AE>憿菟𢒰<E88F9F><F0A292B0>,銝箇恣<E7AE87><E681A3>𤌍<EFBFBD><F0A48C8D><EFBFBD>3餈䠷<E9A488><EFBFBD><E99A9E>霈∠<E99C88><E288A0><EFBFBD>𧋦,<2C>唳旿"
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>湧△<E6B9A7><EFBFBD>撟嗡<E6929F><E597A1><EFBFBD>𡠺<EFBFBD><EFBFBD>瘝⊥<E7989D>鋡怨<E98BA1><E680A8><EFBFBD>鈭斗揢<E69697><EFBFBD><EFBFBD>"
#: sysdeps/names/procmem.c:62
msgid ""
@@ -905,8 +905,8 @@ msgid ""
"The time (in jiffies) before the next SIGALRM is sent to the process due to "
"an interval timer."
msgstr ""
-"<22><EFBFBD><E69BB9><EFBFBD>霈⊥𧒄<E28AA5>典銁銝衤<E98A9D>銝杵IGALRM靽噡鋡怠<E98BA1><E680A0><EFBFBD><EFBFBD>餈𤤿<E9A488><F0A4A4BF><EFBFBD><E597A5>祇𡢿<E7A587>"
-"𧒄<><F0A79284>"
+"<22><EFBFBD><E69BB9><EFBFBD>霈⊥𧒄<E28AA5>典銁銝衤<E98A9D>銝杵IGALRM靽噡鋡怠<E98BA1><E680A0><EFBFBD><EFBFBD>餈𤤿<E9A488><F0A4A4BF><EFBFBD><E597A5>祇𡢿<E7A587><F0A1A2BF>"
+"<22><>"
#: sysdeps/names/proctime.c:60
msgid "Tick frequency"

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-src_daemon_Makefile_in,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
--- src/daemon/Makefile.in.orig Mon Jun 10 23:49:23 2002
+++ src/daemon/Makefile.in Mon Jul 29 21:54:46 2002
@@ -161,7 +161,7 @@ EXTRA_PROGRAMS = libgtop_server2
libgtop_daemon2_SOURCES = gnuserv.c slave.c main.c io.c version.c daemon.h server_config.h
-libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la @sysdeps_suid_lib@ $(suid_sysdeps) $(suid_common) $(LIBGTOP_LIBS) @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
+libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la @sysdeps_suid_lib@ $(suid_sysdeps) $(suid_common) $(LIBGTOP_LIBS) @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ -L$(top_builddir)/lib/.libs -L$(top_builddir)/sysdeps/@sysdeps_dir@/.libs -L$(top_builddir)/sysdeps/common/.libs
$OpenBSD: patch-src_daemon_Makefile_in,v 1.2 2003/06/12 19:39:57 marcm Exp $
--- src/daemon/Makefile.in.orig Sun Jan 12 18:48:09 2003
+++ src/daemon/Makefile.in Mon May 19 12:27:49 2003
@@ -171,7 +171,8 @@ libgtop_daemon2_LDADD = $(top_builddir)/
@sysdeps_suid_lib@ \
$(suid_sysdeps) $(suid_common)\
$(LIBGTOP_LIBS)\
- @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
+ @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ \
+ -L$(top_builddir)/lib/.libs -L$(top_builddir)/sysdeps/@sysdeps_dir@/.libs -L$(top_builddir)/sysdeps/common/.libs
@ENABLE_STATIC_TRUE@libgtop_daemon2_LDFLAGS = -static
libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/06/12 19:39:57 marcm Exp $
lib/libgnomesupport-2.0.so.0.0
lib/libgtop-2.0.so.0.0
lib/libgtop_common-2.0.so.0.0
lib/libgtop_names-2.0.so.0.0
lib/libgtop_suid_common-2.0.so.0.0
lib/libgtop_sysdeps-2.0.so.0.0
lib/libgtop_sysdeps_suid-2.0.so.0.0
lib/libgtop-2.0.so.0.1
lib/libgtop_common-2.0.so.0.1
lib/libgtop_names-2.0.so.0.1
lib/libgtop_suid_common-2.0.so.0.1
lib/libgtop_sysdeps-2.0.so.0.1
lib/libgtop_sysdeps_suid-2.0.so.0.1
DYNLIBDIR(%D/lib)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/01/31 18:35:57 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2003/06/12 19:39:57 marcm Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/libgtop2.info
bin/libgtop_daemon2
bin/libgtop_server2
@ -64,7 +64,10 @@ lib/libgtop_sysdeps_suid-2.0.a
lib/libgtop_sysdeps_suid-2.0.la
lib/pkgconfig/libgtop-2.0.pc
share/locale/az/LC_MESSAGES/libgtop-2.0.mo
share/locale/be/LC_MESSAGES/libgtop-2.0.mo
share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
share/locale/da/LC_MESSAGES/libgtop-2.0.mo
share/locale/de/LC_MESSAGES/libgtop-2.0.mo
share/locale/el/LC_MESSAGES/libgtop-2.0.mo
@ -77,6 +80,7 @@ share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
@ -126,6 +130,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@comment @dirrm share/locale/nl
@comment @dirrm share/locale/ms/LC_MESSAGES
@comment @dirrm share/locale/ms
@comment @dirrm share/locale/lv/LC_MESSAGES
@comment @dirrm share/locale/lv
@comment @dirrm share/locale/ko/LC_MESSAGES
@comment @dirrm share/locale/ko
@comment @dirrm share/locale/ja/LC_MESSAGES
@ -150,8 +156,14 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@comment @dirrm share/locale/de
@comment @dirrm share/locale/da/LC_MESSAGES
@comment @dirrm share/locale/da
@comment @dirrm share/locale/cs/LC_MESSAGES
@comment @dirrm share/locale/cs
@comment @dirrm share/locale/ca/LC_MESSAGES
@comment @dirrm share/locale/ca
@comment @dirrm share/locale/bg/LC_MESSAGES
@comment @dirrm share/locale/bg
@comment @dirrm share/locale/be/LC_MESSAGES
@comment @dirrm share/locale/be
@comment @dirrm share/locale/az/LC_MESSAGES
@comment @dirrm share/locale/az
@comment @dirrm share/locale