Update to 2.0.7 to sync with Gnome 2.4.1.
This commit is contained in:
marcm
parent
29ff72c183
commit
28d332fc58
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2003/10/07 05:47:57 marcm Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2003/12/01 04:08:56 marcm Exp $
|
||||
|
||||
COMMENT= "portable library for obtaining system information"
|
||||
|
||||
V= 2.0.5
|
||||
V= 2.0.7
|
||||
DISTNAME= libgtop-${V}
|
||||
PKGNAME= libgtop2-${V}
|
||||
CATEGORIES= devel
|
||||
@ -24,7 +24,8 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MODULES= gettext
|
||||
LIB_DEPENDS= glib-2.0.0.0::devel/glib2
|
||||
LIB_DEPENDS= glib-2.0.0.0::devel/glib2 \
|
||||
popt::devel/popt
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
USE_GMAKE= Yes
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
MD5 (libgtop-2.0.5.tar.bz2) = 6d5222cbd0c8ea7782666c364ce99008
|
||||
MD5 (libgtop-2.0.7.tar.bz2) = b07e6ed75e0d45423b47db8ac370c571
|
||||
MD5 (openbsd-libgtop-020830.tar.gz) = 382e1c276bb5a92969d963c97294d7d4
|
||||
RMD160 (libgtop-2.0.5.tar.bz2) = be6ae4f2dda84e4f0f3de40c7c58e6e7e9a89b79
|
||||
RMD160 (libgtop-2.0.7.tar.bz2) = 60fdc1c732f79580e23565a00e63f9686d1b569c
|
||||
RMD160 (openbsd-libgtop-020830.tar.gz) = 94bacc99553d5eb72e4d6cb5f0ce219468f3d663
|
||||
SHA1 (libgtop-2.0.5.tar.bz2) = 613f2125eddf598319120d0d3c60503ce2124d0e
|
||||
SHA1 (libgtop-2.0.7.tar.bz2) = e2e31b08a1609f3ba9f9a12e6d8f82ebe9e138fa
|
||||
SHA1 (openbsd-libgtop-020830.tar.gz) = 6d78d7daf6d6f543b7e192a68b24ee2f09cbbb31
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
--- aclocal.m4.orig 2003-08-24 12:00:16.000000000 -0700
|
||||
+++ aclocal.m4 2003-09-08 14:48:59.000000000 -0700
|
||||
$OpenBSD: patch-aclocal_m4,v 1.5 2003/12/01 04:08:56 marcm Exp $
|
||||
--- aclocal.m4.orig 2003-10-23 16:17:53.000000000 -0700
|
||||
+++ aclocal.m4 2003-11-29 13:57:27.000000000 -0800
|
||||
@@ -712,12 +712,18 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
|
||||
fi
|
||||
libgtop_need_server=no
|
||||
@ -21,22 +21,13 @@ $OpenBSD: patch-aclocal_m4,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
solaris*)
|
||||
libgtop_sysdeps_dir=solaris
|
||||
libgtop_use_machine_h=yes
|
||||
@@ -3446,7 +3452,7 @@ if test -f "$ltmain"; then
|
||||
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
||||
# variables and quote the copies for generation of the libtool script.
|
||||
for var in echo old_CC old_CFLAGS \
|
||||
- AR AR_FLAGS CC LD LN_S NM SHELL \
|
||||
+ AR AR_FLAGS EGREP CC LD LN_S NM SHELL \
|
||||
reload_flag reload_cmds wl \
|
||||
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
|
||||
thread_safe_flag_spec whole_archive_flag_spec libname_spec \
|
||||
@@ -3550,6 +3556,9 @@ CC=$lt_CC
|
||||
# Is the compiler the GNU C compiler?
|
||||
with_gcc=$GCC
|
||||
@@ -5046,6 +5052,9 @@ with_gcc=$_LT_AC_TAGVAR(GCC, $1)
|
||||
# An ERE matcher.
|
||||
EGREP=$lt_EGREP
|
||||
|
||||
+# An ERE matcher.
|
||||
+EGREP=$lt_EGREP
|
||||
+
|
||||
# The linker used to build libraries.
|
||||
LD=$lt_LD
|
||||
LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_in,v 1.3 2003/10/07 05:47:57 marcm Exp $
|
||||
--- configure.in.orig 2003-08-24 11:58:42.000000000 -0700
|
||||
+++ configure.in 2003-09-08 15:05:35.000000000 -0700
|
||||
@@ -36,7 +36,7 @@ AC_SUBST(LIBGTOP_VERSION_SUFFIX)
|
||||
$OpenBSD: patch-configure_in,v 1.4 2003/12/01 04:08:56 marcm Exp $
|
||||
--- configure.in.orig 2003-10-23 16:17:43.000000000 -0700
|
||||
+++ configure.in 2003-11-29 13:57:27.000000000 -0800
|
||||
@@ -44,7 +44,7 @@ AC_SUBST(LIBGTOP_VERSION_SUFFIX)
|
||||
|
||||
# libtool versioning
|
||||
LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.3 2003/10/07 05:47:57 marcm Exp $
|
||||
LT_REVISION=$LIBGTOP_INTERFACE_AGE
|
||||
LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
|
||||
LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
|
||||
@@ -471,6 +471,7 @@ sysdeps/osf1/Makefile
|
||||
@@ -478,6 +478,7 @@ sysdeps/osf1/Makefile
|
||||
sysdeps/linux/Makefile
|
||||
sysdeps/kernel/Makefile
|
||||
sysdeps/freebsd/Makefile
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
--- ltmain.sh.orig 2003-06-24 17:08:01.000000000 -0700
|
||||
+++ ltmain.sh 2003-09-08 14:48:09.000000000 -0700
|
||||
@@ -1060,6 +1060,17 @@ compiler."
|
||||
$OpenBSD: patch-ltmain_sh,v 1.5 2003/12/01 04:08:56 marcm Exp $
|
||||
--- ltmain.sh.orig 2003-10-02 02:54:55.000000000 -0700
|
||||
+++ ltmain.sh 2003-11-29 13:58:35.000000000 -0800
|
||||
@@ -1290,6 +1290,17 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1496,6 +1507,19 @@ compiler."
|
||||
@@ -1961,6 +1972,19 @@ EOF
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
@ -39,55 +39,55 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -1737,10 +1761,6 @@ compiler."
|
||||
continue
|
||||
fi
|
||||
|
||||
@@ -2209,10 +2233,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
|
||||
- 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
|
||||
@@ -4446,40 +4466,6 @@ relink_command=\"$relink_command\""
|
||||
# This is a shared library
|
||||
|
||||
# Warn about portability, can't link against -module's on some systems (darwin)
|
||||
@@ -5705,40 +5725,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:"
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
- $echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- $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:"
|
||||
- $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"
|
||||
- $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"
|
||||
- $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"
|
||||
- $echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- $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'"
|
||||
- $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 "----------------------------------------------------------------------"
|
||||
- $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
|
||||
;;
|
||||
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
$OpenBSD: patch-src_daemon_Makefile_in,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
--- src/daemon/Makefile.in.orig 2003-08-24 12:03:45.000000000 -0700
|
||||
+++ src/daemon/Makefile.in 2003-09-08 14:50:18.000000000 -0700
|
||||
@@ -158,7 +158,8 @@ 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.5 2003/12/01 04:08:56 marcm Exp $
|
||||
--- src/daemon/Makefile.in.orig 2003-10-23 16:19:32.000000000 -0700
|
||||
+++ src/daemon/Makefile.in 2003-11-29 14:00:42.000000000 -0800
|
||||
@@ -176,7 +176,10 @@ libgtop_daemon2_LDADD = $(top_builddir)/
|
||||
@sysdeps_suid_lib@ \
|
||||
$(suid_sysdeps) $(suid_common)\
|
||||
$(LIBGTOP_LIBS)\
|
||||
- @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ -lpopt
|
||||
+ @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ -lpopt \
|
||||
+ -L$(top_builddir)/lib/.libs \
|
||||
+ -L$(top_builddir)/sysdeps/@sysdeps_dir@/.libs \
|
||||
+ -L$(top_builddir)/sysdeps/common/.libs
|
||||
|
||||
|
||||
libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.5 2003/12/01 04:08:56 marcm Exp $
|
||||
lib/libgnomesupport-2.0.so.0.0
|
||||
lib/libgtop-2.0.so.1.5
|
||||
lib/libgtop_common-2.0.so.1.5
|
||||
lib/libgtop_names-2.0.so.1.5
|
||||
lib/libgtop_suid_common-2.0.so.1.5
|
||||
lib/libgtop_sysdeps-2.0.so.1.5
|
||||
lib/libgtop_sysdeps_suid-2.0.so.1.5
|
||||
lib/libgtop-2.0.so.1.7
|
||||
lib/libgtop_common-2.0.so.1.7
|
||||
lib/libgtop_names-2.0.so.1.7
|
||||
lib/libgtop_suid_common-2.0.so.1.7
|
||||
lib/libgtop_sysdeps-2.0.so.1.7
|
||||
lib/libgtop_sysdeps_suid-2.0.so.1.7
|
||||
DYNLIBDIR(%D/lib)
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2003/10/07 05:47:57 marcm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2003/12/01 04:08:56 marcm Exp $
|
||||
@unexec install-info --delete --info-dir=%D/info %D/info/libgtop2.info
|
||||
bin/libgtop_daemon2
|
||||
bin/libgtop_server2
|
||||
include/gnome/gnomesupport.h
|
||||
include/libgtop-2.0/glibtop.h
|
||||
include/libgtop-2.0/glibtop/close.h
|
||||
include/libgtop-2.0/glibtop/command.h
|
||||
@ -51,7 +52,6 @@ lib/libgnomesupport-2.0.a
|
||||
lib/libgnomesupport-2.0.la
|
||||
lib/libgtop-2.0.a
|
||||
lib/libgtop-2.0.la
|
||||
@comment lib/libgtop/include/gnomesupport.h
|
||||
lib/libgtop_common-2.0.a
|
||||
lib/libgtop_common-2.0.la
|
||||
lib/libgtop_names-2.0.a
|
||||
@ -62,6 +62,7 @@ lib/libgtop_sysdeps-2.0.a
|
||||
lib/libgtop_sysdeps-2.0.la
|
||||
lib/libgtop_sysdeps_suid-2.0.a
|
||||
lib/libgtop_sysdeps_suid-2.0.la
|
||||
lib/pkgconfig/gnome-support-2.0.pc
|
||||
lib/pkgconfig/libgtop-2.0.pc
|
||||
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
|
||||
@ -76,7 +77,6 @@ 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
|
||||
share/locale/es/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/es_ES/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/et/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
|
||||
@ -105,9 +105,11 @@ share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
|
||||
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
|
||||
@ -124,12 +126,16 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
|
||||
@comment @dirrm share/locale/uk
|
||||
@comment @dirrm share/locale/tr/LC_MESSAGES
|
||||
@comment @dirrm share/locale/tr
|
||||
@comment @dirrm share/locale/ta/LC_MESSAGES
|
||||
@comment @dirrm share/locale/ta
|
||||
@comment @dirrm share/locale/sv/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sv
|
||||
@comment @dirrm share/locale/sr@Latn/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sr@Latn
|
||||
@comment @dirrm share/locale/sr/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sr
|
||||
@comment @dirrm share/locale/sq/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sq
|
||||
@comment @dirrm share/locale/sl/LC_MESSAGES
|
||||
@comment @dirrm share/locale/sl
|
||||
@comment @dirrm share/locale/sk/LC_MESSAGES
|
||||
@ -186,8 +192,6 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
|
||||
@comment @dirrm share/locale/fa
|
||||
@comment @dirrm share/locale/et/LC_MESSAGES
|
||||
@comment @dirrm share/locale/et
|
||||
@comment @dirrm share/locale/es_ES/LC_MESSAGES
|
||||
@comment @dirrm share/locale/es_ES
|
||||
@comment @dirrm share/locale/es/LC_MESSAGES
|
||||
@comment @dirrm share/locale/es
|
||||
@comment @dirrm share/locale/el/LC_MESSAGES
|
||||
@ -216,8 +220,7 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
|
||||
@comment @dirrm share/locale/am
|
||||
@comment @dirrm share/locale
|
||||
@comment @dirrm lib/pkgconfig
|
||||
@comment @dirrm lib/libgtop/include
|
||||
@comment @dirrm lib/libgtop
|
||||
@dirrm include/libgtop-2.0/glibtop
|
||||
@dirrm include/libgtop-2.0
|
||||
@dirrm include/gnome
|
||||
@exec install-info --info-dir=%D/info %D/info/libgtop2.info
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user