Bug#638335: gkrellm: FTBFS(kfreebsd): patch for building on kfreebsd

[Christoph Egger <christoph@debian.org>]

Package: src:gkrellm
Version: 2.3.5-2
Severity: important
User: debian-bsd@lists.debian.org
Usertags: kfreebsd-porting
X-Debbugs-Cc: debian-bsd@lists.debian.org
Justification: fails to build from source (but built successfully in the past)

Hi!

Your package failed to build on kfreebsd. I've prepared a patch to make
it work again:

First for debian/rules (could probably also be autodetected inside ./Makefile):
--- ../gkrellm-2.3.5/debian/rules	2011-08-18 19:47:45.000000000 +0200
+++ gkrellm-2.3.5/debian/rules	2011-08-17 21:28:55.000000000 +0200
@@ -1,11 +1,5 @@
 #!/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 $@
 
@@ -13,7 +7,7 @@
 	dh_installinit -u"defaults 21"
 
 override_dh_auto_build:
-	$(MAKE) PREFIX=/usr without-ssl=1 $(MAKE_EXTRAFLAG)
+	$(MAKE) PREFIX=/usr without-ssl=1
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp PREFIX=/usr

and the attached patch for debian/patches/series attached

Regards

    Christoph

--- gkrellm-2.3.5.orig/Makefile
+++ gkrellm-2.3.5/Makefile
@@ -213,6 +213,12 @@ freebsd3 freebsd4 freebsd5 freebsd: gkre
 	(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)
--- gkrellm-2.3.5.orig/server/gkrellmd-private.h
+++ gkrellm-2.3.5/server/gkrellmd-private.h
@@ -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
 
--- gkrellm-2.3.5.orig/server/sysdeps-unix.c
+++ gkrellm-2.3.5/server/sysdeps-unix.c
@@ -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"
--- gkrellm-2.3.5.orig/src/sysdeps-unix.c
+++ gkrellm-2.3.5/src/sysdeps-unix.c
@@ -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"
--- gkrellm-2.3.5.orig/src/gkrellm.h
+++ gkrellm-2.3.5/src/gkrellm.h
@@ -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
 
--- gkrellm-2.3.5.orig/src/sysdeps/freebsd.c
+++ gkrellm-2.3.5/src/sysdeps/freebsd.c
@@ -36,6 +36,10 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <osreldate.h>
+#include <netinet/in.h>
+#include <sys/socketvar.h>
+#include <netinet/in_pcb.h>
+#include <devstat.h>
 
 #if __FreeBSD_version < 500000
 #include <kvm.h>
@@ -1395,7 +1399,8 @@ static VoltDefault	voltdefault0[] =
 	};
 
 #include <dirent.h>
-#include <machine/cpufunc.h>
+/*#include <machine/cpufunc.h>*/
+#include <sys/io.h>
 #if __FreeBSD_version >= 500042
 #include <dev/smbus/smb.h>
 #elif __FreeBSD_version >= 300000
--- gkrellm-2.3.5.orig/src/sysdeps/bsd-common.c
+++ gkrellm-2.3.5/src/sysdeps/bsd-common.c
@@ -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) && \

-- 
9FED 5C6C E206 B70A 5857  70CA 9655 22B9 D49A E731
Debian Developer | Lisp Hacker | CaCert Assurer