cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libgtop2-2.28.2.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:44:35 +00:00
parent 74610260e8
commit fe20bbf81d
6 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/libgtop2/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.48 2010/09/18 09:14:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2010/09/30 07:44:35 ajacoutot Exp $
COMMENT= portable library for obtaining system information
GNOME_VERSION= 2.28.1
GNOME_VERSION= 2.28.2
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}p9
PKGNAME= libgtop2-${VERSION}
SHARED_LIBS= gtop-2.0 9.0 # .9.0
@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= Xau c kvm pcre
WANTLIB += Xau c kvm pcre pthread
MODULES= devel/gettext \
x11/gnome
@ -27,10 +27,12 @@ RUN_DEPENDS= ::sysutils/lsof
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--without-libgtop-smp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GMSGFMT="${LOCALBASE}/bin/msgfmt"
GMSGFMT="${LOCALBASE}/bin/msgfmt" \
ac_cv_header_sys_mount_h=yes
.ifdef DEBUG
CONFIGURE_ARGS+= --enable-debug

10
devel/libgtop2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libgtop-2.28.1.tar.bz2) = mUwpm226MwUkpn6kV3azqw==
RMD160 (libgtop-2.28.1.tar.bz2) = 7QSzNIEHMM1hx+iwc04uVXBId1M=
SHA1 (libgtop-2.28.1.tar.bz2) = 8LH17nQXywsnUUP9CVb0dTUFoh8=
SHA256 (libgtop-2.28.1.tar.bz2) = Cn4OfXNqYIpe0l+OR1qHvzjmHb72aCLiXo71BwXPcPY=
SIZE (libgtop-2.28.1.tar.bz2) = 760104
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

8
devel/libgtop2/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2010/03/30 16:24:24 ajacoutot Exp $
--- Makefile.in.orig Tue Mar 30 17:10:16 2010
+++ Makefile.in Tue Mar 30 18:11:35 2010
@@ -882,8 +882,8 @@ uninstall-am: uninstall-libgtopincludeHEADERS uninstal
$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
dist-hook:
cp libgtop.spec $(distdir)

71
devel/libgtop2/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2010/04/08 15:57:46 ajacoutot Exp $
--- configure.orig Tue Mar 30 17:10:07 2010
+++ configure Mon Apr 5 14:10:33 2010
@@ -6934,10 +6934,12 @@ newos6*)
$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*)
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.8 2010/04/08 15:57:46 ajacoutot Exp $
fi
;;
@@ -12826,6 +12828,11 @@ $as_echo_n "checking for libgtop sysdeps directory...
@@ -12021,6 +12023,11 @@ $as_echo_n "checking for libgtop sysdeps directory...
libgtop_need_server=yes
libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
;;
@ -29,52 +29,61 @@ $OpenBSD: patch-configure,v 1.8 2010/04/08 15:57:46 ajacoutot Exp $
freebsd*|kfreebsd*)
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
@@ -18246,7 +18253,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
@@ -13985,7 +13992,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -18310,7 +18317,7 @@ if test "x$ac_cv_lib_intl_strftime" = x""yes; then
#define HAVE_STRFTIME 1
_ACEOF
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 :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
fi
fi
@@ -19721,7 +19728,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
@@ -14756,7 +14763,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19787,7 +19794,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14793,7 +14800,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19853,7 +19860,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14830,7 +14837,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20721,11 +20728,6 @@ glib_save_datarootdir="$datarootdir"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14999,7 +15006,7 @@ done
fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
+ INTLLIBS="-lintl -liconv $libintl_extra_libs"
fi
if test "$gt_cv_have_gettext" = "yes"; then
@@ -15314,11 +15321,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}"`
@ -86,16 +95,8 @@ $OpenBSD: patch-configure,v 1.8 2010/04/08 15:57:46 ajacoutot Exp $
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
datarootdir="$glib_save_datarootdir"
@@ -22880,6 +22882,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <sys/param.h>
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -23391,9 +23394,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
@@ -16476,9 +16478,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <sys/param.h>

16
devel/libgtop2/patches/patch-sysdeps_bsd_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.4 2010/04/18 12:32:09 ajacoutot Exp $
--- sysdeps/bsd/Makefile.in.orig Tue Mar 30 17:10:14 2010
+++ sysdeps/bsd/Makefile.in Sun Apr 18 13:54:34 2010
$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 =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@ -11,7 +11,7 @@ $OpenBSD: patch-sysdeps_bsd_Makefile_in,v 1.4 2010/04/18 12:32:09 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) \
@@ -288,7 +289,7 @@ top_build_prefix = @top_build_prefix@
@@ -291,7 +292,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.4 2010/04/18 12:32:09 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 \
@@ -300,7 +301,7 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c c
@@ -303,7 +304,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.4 2010/04/18 12:32:09 ajacoutot Exp
libgtopincludedir = $(includedir)/libgtop-2.0
all: all-am
@@ -360,6 +361,7 @@ distclean-compile:
@@ -363,6 +364,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.4 2010/04/18 12:32:09 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@
@@ -368,6 +370,7 @@ distclean-compile:
@@ -371,6 +373,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.4 2010/04/18 12:32:09 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@
@@ -379,6 +382,7 @@ distclean-compile:
@@ -382,6 +385,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@

3
devel/libgtop2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2010/03/30 16:24:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.19 2010/09/30 07:44:35 ajacoutot Exp $
%%SHARED%%
@bin bin/libgtop_daemon2
@mode 2555
@ -47,6 +47,7 @@ include/libgtop-2.0/glibtop/union.h
include/libgtop-2.0/glibtop/uptime.h
include/libgtop-2.0/glibtop/version.h
include/libgtop-2.0/glibtop_machine.h
include/libgtop-2.0/glibtop_private.h
include/libgtop-2.0/glibtop_server.h
include/libgtop-2.0/glibtop_suid.h
include/libgtop-2.0/libgtopconfig.h