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

fix build on -current

Browse Source 
move post-patch to pre-configure

new patch from Aleksander Piotrowski <aleksander.piotrowski at nic.com.pl>
via maintainer Peter Hessler <phessler at theapt.org>
This commit is contained in:
sturm 2004-02-19 17:27:55 +00:00
parent 694090b8df
commit 37fc33a85b
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/gkrellm/gkrellm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2004/01/25 16:37:30 sturm Exp $
# $OpenBSD: Makefile,v 1.7 2004/02/19 17:27:55 sturm Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -50,7 +50,7 @@ LIB_DEPENDS+= gdk-x11-2.0.=0,gdk_pixbuf-2.0.=0,gtk-x11-2.0.=0::x11/gtk+2
WRKBUILD= ${WRKDIST}/server
.endif
post-patch:
pre-configure:
@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g" \
${WRKSRC}/server/gkrellmd.h

8
sysutils/gkrellm/gkrellm/patches/patch-Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.3 2003/12/21 11:40:10 sturm Exp $
--- Makefile.orig 2003-12-16 08:53:06.000000000 -0800
+++ Makefile 2003-12-17 15:00:38.000000000 -0800
$OpenBSD: patch-Makefile,v 1.4 2004/02/19 17:27:56 sturm Exp $
--- Makefile.orig 2004-01-17 00:42:08.000000000 +0100
+++ Makefile 2004-02-19 18:10:12.000000000 +0100
@@ -89,16 +89,12 @@ BINMODE = 755
VERSION = 2.1.24
VERSION = 2.1.25
-INSTALLROOT ?= $(DESTDIR)$(PREFIX)
-

12
sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_bsd-net-open_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_sysdeps_bsd-net-open_c,v 1.3 2004/02/19 17:27:56 sturm Exp $
--- src/sysdeps/bsd-net-open.c.orig 2004-02-19 18:10:32.000000000 +0100
+++ src/sysdeps/bsd-net-open.c 2004-02-19 18:10:58.000000000 +0100
@@ -85,7 +85,7 @@ gkrellm_sys_disk_read_data(void)
/* Separate read/write stats were implemented in NetBSD 1.6K.
*/
-#if __NetBSD_Version__ >= 106110000
+#if (__NetBSD_Version__ >= 106110000) || defined(__OpenBSD__)
rbytes = d.dk_rbytes;
wbytes = d.dk_wbytes;
#else