Hi, Current status?
gkrellm 2.3.10-2 with christoph's patch and small fix to debian materials is
built successfully on porterbox. attached them.
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -Nru gkrellm-2.3.10/debian/control gkrellm-2.3.10/debian/control --- gkrellm-2.3.10/debian/control 2018-05-14 08:16:12.000000000 +0900 +++ gkrellm-2.3.10/debian/control 2019-08-22 19:18:48.000000000 +0900 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Sandro Tosi <[email protected]> Standards-Version: 4.1.4 -Build-Depends: libglib2.0-dev, libgtk2.0-dev, debhelper (>= 9), libsm-dev, x11proto-core-dev, gettext, libgnutls-openssl-dev, libntlm0-dev, libsensors4-dev +Build-Depends: libglib2.0-dev, libgtk2.0-dev, debhelper (>= 9), libsm-dev, x11proto-core-dev, gettext, libgnutls-openssl-dev, libntlm0-dev, libsensors4-dev, libdevstat-dev [kfreebsd-any] Vcs-Git: https://salsa.debian.org/debian/gkrellm.git Vcs-Browser: https://salsa.debian.org/debian/gkrellm Homepage: http://gkrellm.net/ diff -Nru gkrellm-2.3.10/debian/patches/06_kfreebsd.patch gkrellm-2.3.10/debian/patches/06_kfreebsd.patch --- gkrellm-2.3.10/debian/patches/06_kfreebsd.patch 1970-01-01 09:00:00.000000000 +0900 +++ gkrellm-2.3.10/debian/patches/06_kfreebsd.patch 2019-08-22 19:21:51.000000000 +0900 @@ -0,0 +1,136 @@ +Description: building on kfreebsd +Author: Christoph Egger <[email protected]> +Bug-Debian: https://bugs.debian.org/638335 +Last-Update: 2011-08-24 + +Index: gkrellm/Makefile +=================================================================== +--- gkrellm.orig/Makefile 2011-08-20 16:27:09.000000000 +0200 ++++ gkrellm/Makefile 2011-08-20 16:28:20.000000000 +0200 +@@ -213,6 +213,12 @@ + (cd server && ${MAKE} \ + EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd ) + ++kfreebsd: gkrellm.pc ++ (cd po && ${MAKE} all) ++ (cd src && ${MAKE} freebsd) ++ (cd server && ${MAKE} \ ++ EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat" gkrellmd ) ++ + darwin: gkrellm.pc + (cd po && ${MAKE} all) + (cd src && ${MAKE} darwin) +Index: gkrellm/server/gkrellmd-private.h +=================================================================== +--- gkrellm.orig/server/gkrellmd-private.h 2011-08-20 16:22:07.000000000 +0200 ++++ gkrellm/server/gkrellmd-private.h 2011-08-20 16:28:20.000000000 +0200 +@@ -59,6 +59,10 @@ + #endif + #endif + ++#if defined(__FreeBSD_kernel__) ++#define HAVE_GETADDRINFO 1 ++#endif ++ + #if defined(__OpenBSD__) + #define HAVE_GETADDRINFO 1 + #endif +@@ -91,7 +95,7 @@ + + #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__) \ + && !defined(__OpenBSD__) && !defined(__solaris__) && !defined(WIN32) \ +- && !defined(__APPLE__) && !defined(__DragonFly__) ++ && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD_kernel__) + #define USE_LIBGTOP + #endif + +Index: gkrellm/server/sysdeps-unix.c +=================================================================== +--- gkrellm.orig/server/sysdeps-unix.c 2011-08-20 16:22:08.000000000 +0200 ++++ gkrellm/server/sysdeps-unix.c 2011-08-20 16:28:20.000000000 +0200 +@@ -46,7 +46,10 @@ + #include "../src/sysdeps/bsd-common.c" + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) ++#if defined(__FreeBSD_kernel__) ++#define __FreeBSD_version 800000 ++#endif + #include "../src/sysdeps/freebsd.c" + #include "../src/sysdeps/bsd-common.c" + #include "../src/sysdeps/sensors-common.c" +Index: gkrellm/src/sysdeps-unix.c +=================================================================== +--- gkrellm.orig/src/sysdeps-unix.c 2011-08-20 16:22:11.000000000 +0200 ++++ gkrellm/src/sysdeps-unix.c 2011-08-20 16:28:20.000000000 +0200 +@@ -47,7 +47,10 @@ + #include "sysdeps/bsd-common.c" + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) ++#if defined(__FreeBSD_kernel__) ++#define __FreeBSD_version 800000 ++#endif + #include "sysdeps/freebsd.c" + #include "sysdeps/bsd-common.c" + #include "sysdeps/sensors-common.c" +Index: gkrellm/src/gkrellm.h +=================================================================== +--- gkrellm.orig/src/gkrellm.h 2011-08-20 16:22:10.000000000 +0200 ++++ gkrellm/src/gkrellm.h 2011-08-20 16:28:21.000000000 +0200 +@@ -71,7 +71,7 @@ + + #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__) \ + && !defined(__OpenBSD__) && !defined(__solaris__) && !defined(WIN32) \ +- && !defined(__APPLE__) && !defined(__DragonFly__) ++ && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__FreeBSD_kernel__) + #define USE_LIBGTOP + #endif + +Index: gkrellm/src/sysdeps/freebsd.c +=================================================================== +--- gkrellm.orig/src/sysdeps/freebsd.c 2011-08-20 16:22:11.000000000 +0200 ++++ gkrellm/src/sysdeps/freebsd.c 2011-08-20 16:29:36.000000000 +0200 +@@ -36,6 +36,12 @@ + #include <sys/param.h> + #include <sys/sysctl.h> + #include <osreldate.h> ++#if defined (__FreeBSD_kernel__) ++#include <netinet/in.h> ++#include <sys/socketvar.h> ++#include <netinet/in_pcb.h> ++#include <devstat.h> ++#endif + + #if __FreeBSD_version < 500000 + #include <kvm.h> +@@ -1395,7 +1401,11 @@ + }; + + #include <dirent.h> ++#if defined(__FreeBSD_kernel__) ++#include <sys/io.h> ++#else + #include <machine/cpufunc.h> ++#endif + #if __FreeBSD_version >= 500042 + #include <dev/smbus/smb.h> + #elif __FreeBSD_version >= 300000 +Index: gkrellm/src/sysdeps/bsd-common.c +=================================================================== +--- gkrellm.orig/src/sysdeps/bsd-common.c 2011-08-20 16:22:11.000000000 +0200 ++++ gkrellm/src/sysdeps/bsd-common.c 2011-08-20 16:28:21.000000000 +0200 +@@ -35,6 +35,11 @@ + | as that of the covered work. + */ + ++#if defined __FreeBSD_kernel__ ++#define __FreeBSD__ ++#define __FreeBSD_version 800000 ++#endif ++ + #if !(defined(__FreeBSD__) && __FreeBSD_version < 410000) && \ + !(defined(__NetBSD__) && __NetBSD_version < 105000000) && \ + !(defined(__OpenBSD__) && OpenBSD < 200006) && \ diff -Nru gkrellm-2.3.10/debian/patches/series gkrellm-2.3.10/debian/patches/series --- gkrellm-2.3.10/debian/patches/series 2018-05-14 08:16:12.000000000 +0900 +++ gkrellm-2.3.10/debian/patches/series 2019-08-22 19:18:48.000000000 +0900 @@ -2,3 +2,4 @@ 04_fix_manpage_hyphen.patch 05_bts437033_fix_strip.patch 10_fix_glib_underlinkage.patch +06_kfreebsd.patch diff -Nru gkrellm-2.3.10/debian/rules gkrellm-2.3.10/debian/rules --- gkrellm-2.3.10/debian/rules 2018-05-14 08:16:12.000000000 +0900 +++ gkrellm-2.3.10/debian/rules 2019-08-22 19:18:48.000000000 +0900 @@ -1,5 +1,11 @@ #!/usr/bin/make -f +DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +MAKE_EXTRAFLAG=kfreebsd +endif + %: dh $@ @@ -7,7 +13,7 @@ dh_installinit -u"defaults 21" override_dh_auto_build: - dh_auto_build -- PREFIX=/usr without-ssl=1 + dh_auto_build -- PREFIX=/usr without-ssl=1 $(MAKE_EXTRAFLAG) override_dh_auto_install: $(MAKE) install DESTDIR=`pwd`/debian/tmp PREFIX=/usr
signature.asc
Description: PGP signature
