Maintenance update to libgtop2-2.28.3.

This commit is contained in:
ajacoutot 2011-03-25 16:16:32 +00:00
parent 7c8e9ea8d6
commit c0c25d4647
7 changed files with 56 additions and 48 deletions

View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.55 2010/12/02 09:15:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.56 2011/03/25 16:16:32 ajacoutot Exp $
COMMENT= portable library for obtaining system information
GNOME_VERSION= 2.28.2
GNOME_VERSION= 2.28.3
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
REVISION= 2
SHARED_LIBS= gtop-2.0 9.0 # .9.0
CATEGORIES= devel
@ -29,6 +27,7 @@ RUN_DEPENDS= sysutils/lsof
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--without-libgtop-smp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \

View File

@ -1,5 +1,5 @@
MD5 (libgtop-2.28.2.tar.bz2) = 7UTXNu/ZfQYrd2Id5q/0OQ==
RMD160 (libgtop-2.28.2.tar.bz2) = YbGsTpxyEqBP9Fke3RocFU9olic=
SHA1 (libgtop-2.28.2.tar.bz2) = UTnT0qmMOcNrW2E1Jim/FtVNxoo=
SHA256 (libgtop-2.28.2.tar.bz2) = SZWNfaH3ayV7/Q1VfY7Sshilqw0xtZ/tHDLd8qFSn10=
SIZE (libgtop-2.28.2.tar.bz2) = 766124
MD5 (libgtop-2.28.3.tar.bz2) = LWo8fB7//QhUuNJNHSnY7w==
RMD160 (libgtop-2.28.3.tar.bz2) = EigyNQsrFuMnAytONT/W7JsYb8M=
SHA1 (libgtop-2.28.3.tar.bz2) = y5fJ8kr3vyXfMdUXmZyrakeTqxE=
SHA256 (libgtop-2.28.3.tar.bz2) = LIZr0Us81494UEz7ZbqhBdYrgIXJDkM6uduX4FDv6kI=
SIZE (libgtop-2.28.3.tar.bz2) = 793252

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp $
--- Makefile.in.orig Tue Sep 28 11:37:10 2010
+++ Makefile.in Tue Sep 28 14:52:41 2010
@@ -886,8 +886,8 @@ uninstall-am: uninstall-libgtopincludeHEADERS uninstal
$OpenBSD: patch-Makefile_in,v 1.6 2011/03/25 16:16:32 ajacoutot Exp $
--- Makefile.in.orig Fri Mar 25 15:54:08 2011
+++ Makefile.in Fri Mar 25 16:25:38 2011
@@ -901,8 +901,8 @@ uninstall-am: uninstall-libgtopincludeHEADERS uninstal
dist-hook:
cp libgtop.spec $(distdir)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
--- configure.orig Tue Sep 28 11:37:06 2010
+++ configure Tue Sep 28 15:14:22 2010
@@ -6727,10 +6727,12 @@ newos6*)
$OpenBSD: patch-configure,v 1.10 2011/03/25 16:16:32 ajacoutot Exp $
--- configure.orig Fri Mar 25 17:08:37 2011
+++ configure Fri Mar 25 17:11:52 2011
@@ -7006,10 +7006,12 @@ newos6*)
;;
openbsd*)
@ -17,19 +17,16 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
fi
;;
@@ -12021,6 +12023,11 @@ $as_echo_n "checking for libgtop sysdeps directory...
@@ -13053,7 +13055,7 @@ $as_echo_n "checking for libgtop sysdeps directory...
libgtop_sysdeps_dir=bsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
+ libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
;;
+ openbsd*)
+ libgtop_sysdeps_dir=bsd
+ libgtop_use_machine_h=yes
+ libgtop_need_server=yes
+ ;;
freebsd*|kfreebsd*)
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
@@ -13985,7 +13992,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then :
@@ -14903,7 +14905,7 @@ if ${ac_cv_lib_intl_strftime+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -38,8 +35,8 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14018,7 +14025,7 @@ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
@@ -14936,7 +14938,7 @@ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
if test "x$ac_cv_lib_intl_strftime" = xyes; then :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
-LIBS="-lintl $LIBS"
@ -47,7 +44,7 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
fi
fi
@@ -14756,7 +14763,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
@@ -15674,7 +15676,7 @@ if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -56,7 +53,7 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14793,7 +14800,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
@@ -15711,7 +15713,7 @@ if ${ac_cv_lib_intl_ngettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -65,7 +62,7 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14830,7 +14837,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
@@ -15748,7 +15750,7 @@ if ${ac_cv_lib_intl_dgettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -74,7 +71,16 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14999,7 +15006,7 @@ done
@@ -15885,7 +15887,7 @@ fi
#
if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
+ LIBS="$LIBS -lintl -liconv $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
for ac_func in bind_textdomain_codeset
do :
@@ -15917,7 +15919,7 @@ done
fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
@ -83,7 +89,7 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
fi
if test "$gt_cv_have_gettext" = "yes"; then
@@ -15314,11 +15321,6 @@ glib_save_datarootdir="$datarootdir"
@@ -16232,11 +16234,6 @@ glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
datarootdir=`eval echo "${datarootdir}"`
@ -95,7 +101,7 @@ $OpenBSD: patch-configure,v 1.9 2010/09/30 07:44:35 ajacoutot Exp $
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
datarootdir="$glib_save_datarootdir"
@@ -16476,9 +16478,9 @@ else
@@ -17394,9 +17391,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-examples_Makefile_in,v 1.2 2010/03/30 16:24:24 ajacoutot Exp $
--- examples/Makefile.in.orig Tue Mar 30 17:10:13 2010
+++ examples/Makefile.in Tue Mar 30 18:10:49 2010
$OpenBSD: patch-examples_Makefile_in,v 1.3 2011/03/25 16:16:32 ajacoutot Exp $
--- examples/Makefile.in.orig Fri Mar 25 15:54:07 2011
+++ examples/Makefile.in Fri Mar 25 16:25:38 2011
@@ -38,8 +38,7 @@ noinst_PROGRAMS = first$(EXEEXT) second$(EXEEXT) pprin
procargs$(EXEEXT) df$(EXEEXT) netlist$(EXEEXT) \
mountlist$(EXEEXT) procmap$(EXEEXT) netload$(EXEEXT) \
@ -11,7 +11,7 @@ $OpenBSD: patch-examples_Makefile_in,v 1.2 2010/03/30 16:24:24 ajacoutot Exp $
subdir = examples
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -113,7 +112,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
@@ -117,7 +116,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(L
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp $
--- sysdeps/bsd/Makefile.in.orig Tue Sep 28 11:37:08 2010
+++ sysdeps/bsd/Makefile.in Tue Sep 28 14:52:41 2010
@@ -49,7 +49,8 @@ CONFIG_CLEAN_FILES =
$OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.6 2011/03/25 16:16:32 ajacoutot Exp $
--- sysdeps/bsd/Makefile.in.orig Fri Mar 25 15:54:07 2011
+++ sysdeps/bsd/Makefile.in Fri Mar 25 16:25:38 2011
@@ -53,7 +53,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libgtop_sysdeps_2_0_la_LIBADD =
@ -11,7 +11,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp
libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
libgtop_sysdeps_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -291,7 +292,7 @@ top_build_prefix = @top_build_prefix@
@@ -305,7 +306,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
@ -20,7 +20,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS)
libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
@@ -303,7 +304,7 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c c
@@ -317,7 +318,7 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c c
libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \
@ -29,7 +29,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp
libgtopincludedir = $(includedir)/libgtop-2.0
all: all-am
@@ -363,6 +364,7 @@ distclean-compile:
@@ -377,6 +378,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@
@ -37,7 +37,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_limits.Plo@am__quote@
@@ -371,6 +373,7 @@ distclean-compile:
@@ -385,6 +387,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
@ -45,7 +45,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.5 2010/09/30 07:44:35 ajacoutot Exp
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prockernel.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Plo@am__quote@
@@ -382,6 +385,7 @@ distclean-compile:
@@ -396,6 +399,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procstate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctime.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procuid.Plo@am__quote@

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2010/09/30 07:44:35 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.20 2011/03/25 16:16:32 ajacoutot Exp $
%%SHARED%%
@bin bin/libgtop_daemon2
@mode 2555
@ -265,6 +265,9 @@ share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/libgtop-2.0.mo
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/libgtop-2.0.mo
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
share/locale/xh/