Tweak patching a bit and regen PLIST.

This commit is contained in:
ajacoutot 2014-03-31 09:34:52 +00:00
parent 76c430ba29
commit 8202e5759f
4 changed files with 24 additions and 10 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.117 2014/03/28 13:30:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.118 2014/03/31 09:34:52 ajacoutot Exp $
COMMENT= portable library for obtaining system information
GNOME_VERSION= 2.28.5
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
REVISION= 11
REVISION= 12
SHARED_LIBS= gtop-2.0 9.0 # .9.0

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libgtop-sysdeps_m4,v 1.4 2014/02/03 13:50:32 ajacoutot Exp $
$OpenBSD: patch-libgtop-sysdeps_m4,v 1.5 2014/03/31 09:34:52 ajacoutot Exp $
RM at next release.
--- libgtop-sysdeps.m4.orig Sat Jul 27 14:40:23 2013
+++ libgtop-sysdeps.m4 Sun Feb 2 14:20:59 2014
--- libgtop-sysdeps.m4.orig Mon Mar 31 10:55:50 2014
+++ libgtop-sysdeps.m4 Mon Mar 31 10:55:54 2014
@@ -79,6 +79,8 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
libgtop_sysdeps_dir=openbsd
libgtop_use_machine_h=yes
@ -13,3 +13,15 @@ RM at next release.
libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
;;
freebsd*|kfreebsd*)
@@ -172,7 +174,10 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
AC_SUBST(EXTRA_SYSDEPS_LIBS)
- AC_CHECK_HEADERS(net/if_var.h)
+ AC_CHECK_HEADERS(net/if_var.h,,, [
+#include <net/if.h>
+#include <sys/types.h>
+#include <sys/socket.h>])
AC_MSG_CHECKING([for I4B])
AC_TRY_COMPILE([
#include <sys/types.h>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-sysdeps_openbsd_Makefile_am,v 1.2 2014/02/03 13:50:32 ajacoutot Exp $
$OpenBSD: patch-sysdeps_openbsd_Makefile_am,v 1.3 2014/03/31 09:34:52 ajacoutot Exp $
RM at next release.
--- sysdeps/openbsd/Makefile.am.orig Sat Jul 27 14:40:23 2013
+++ sysdeps/openbsd/Makefile.am Sun Feb 2 15:17:00 2014
+++ sysdeps/openbsd/Makefile.am Mon Mar 31 10:51:53 2014
@@ -4,18 +4,23 @@ INCLUDES = @INCLUDES@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
@ -17,7 +17,7 @@ RM at next release.
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS)
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 \
- uptime.c loadavg.c shm_limits.c msg_limits.c \
- sem_limits.c proclist.c procstate.c procuid.c \
@ -25,7 +25,6 @@ RM at next release.
- procsegment.c procargs.c procmap.c netlist.c \
- netload.c ppp.c procopenfiles.c fsusage.c \
- procwd.c procaffinity.c glibtop_private.c
+libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
+ proclist.c procstate.c procuid.c \
+ proctime.c procmem.c procsignal.c \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.24 2013/08/26 08:43:17 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.25 2014/03/31 09:34:52 ajacoutot Exp $
@bin bin/libgtop_daemon2
@mode 2555
@group kmem
@ -66,6 +66,7 @@ share/gtk-doc/html/libgtop/
share/gtk-doc/html/libgtop/home.png
share/gtk-doc/html/libgtop/index.html
share/gtk-doc/html/libgtop/index.sgml
share/gtk-doc/html/libgtop/left-insensitive.png
share/gtk-doc/html/libgtop/left.png
share/gtk-doc/html/libgtop/libgtop-Close.html
share/gtk-doc/html/libgtop/libgtop-Command.html
@ -106,8 +107,10 @@ share/gtk-doc/html/libgtop/libgtop-version.html
share/gtk-doc/html/libgtop/libgtop-white-paper-overview.html
share/gtk-doc/html/libgtop/libgtop-white-paper.html
share/gtk-doc/html/libgtop/libgtop.devhelp2
share/gtk-doc/html/libgtop/right-insensitive.png
share/gtk-doc/html/libgtop/right.png
share/gtk-doc/html/libgtop/style.css
share/gtk-doc/html/libgtop/up-insensitive.png
share/gtk-doc/html/libgtop/up.png
share/locale/am/
share/locale/am/LC_MESSAGES/