Sun Dec 7 16:23:45 2008 UTC ()
Make this compilable on the recent NetBSD-4.
 - support for KERN_OLDSYSVSHM
   patch provided by Sergey Svishchev
 - no support for NetBSD-5 because of /emul/pecoff


(kent)
diff -r1.26 -r1.27 pkgsrc/emulators/peace/Makefile
diff -r1.14 -r1.15 pkgsrc/emulators/peace/distinfo
diff -r0 -r1.3 pkgsrc/emulators/peace/patches/patch-aa
cvs diff -r1.26 -r1.27 pkgsrc/emulators/peace/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/peace/Attic/Makefile 2007/04/05 16:21:37 1.26
+++ pkgsrc/emulators/peace/Attic/Makefile 2008/12/07 16:23:45 1.27
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.26 2007/04/05 16:21:37 kent Exp $ 1# $NetBSD: Makefile,v 1.27 2008/12/07 16:23:45 kent Exp $
2# 2#
3PEACE_VERSION= 0.0.20060701 3PEACE_VERSION= 0.0.20060701
4DISTNAME= peace-${PEACE_VERSION} 4DISTNAME= peace-${PEACE_VERSION}
5#SITES.peace-0.0.20060701.tar.gz=http://chiharu.hauN.org/peace/dist/ 5#SITES.peace-0.0.20060701.tar.gz=http://chiharu.hauN.org/peace/dist/
6CATEGORIES= emulators 6CATEGORIES= emulators
7 7
8MAINTAINER= kent@NetBSD.org 8MAINTAINER= kent@NetBSD.org
9HOMEPAGE= http://chiharu.hauN.org/peace/ 9HOMEPAGE= http://chiharu.hauN.org/peace/
10COMMENT= Support running Win32 executables 10COMMENT= Support running Win32 executables
11 11
12DISTFILES+= peace-${PEACE_VERSION}.tar.gz 12DISTFILES+= peace-${PEACE_VERSION}.tar.gz
13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=peace/} 13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=peace/}
14ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 14# This version doesn't work on NetBSD-5.x because of /emul/pecoff removal.
 15ONLY_FOR_PLATFORM= NetBSD-[34].*-i386
15DEPENDS+= icu>=2.4nb1:../../textproc/icu 16DEPENDS+= icu>=2.4nb1:../../textproc/icu
16DEPENDS+= freetype2>=2.2.1:../../graphics/freetype2 17DEPENDS+= freetype2>=2.2.1:../../graphics/freetype2
17# bin/showstack requires perl5 and cross-i386-netbsdpe 18# bin/showstack requires perl5 and cross-i386-netbsdpe
18# DEPENDS+= perl5:../../lang/perl5 19# DEPENDS+= perl5:../../lang/perl5
19# DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe 20# DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
20 21
21BUILD_DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe 22BUILD_DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
22BUILD_DEPENDS+= x11-links>=0.30:../../pkgtools/x11-links 23BUILD_DEPENDS+= x11-links>=0.30:../../pkgtools/x11-links
23 24
24# Don't use "+=" here to avoid unexpected link with ELF libraries 25# Don't use "+=" here to avoid unexpected link with ELF libraries
25LDFLAGS= -L${WRKSRC}/lib 26LDFLAGS= -L${WRKSRC}/lib
26PECOFFDIR= ${PREFIX}/emul/pecoff 27PECOFFDIR= ${PREFIX}/emul/pecoff
27MAKE_FLAGS+= PECOFFDIR=${PECOFFDIR:Q} \ 28MAKE_FLAGS+= PECOFFDIR=${PECOFFDIR:Q} \
cvs diff -r1.14 -r1.15 pkgsrc/emulators/peace/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/peace/Attic/distinfo 2006/07/03 04:38:43 1.14
+++ pkgsrc/emulators/peace/Attic/distinfo 2008/12/07 16:23:45 1.15
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.14 2006/07/03 04:38:43 kent Exp $ 1$NetBSD: distinfo,v 1.15 2008/12/07 16:23:45 kent Exp $
2 2
3SHA1 (peace-0.0.20060701.tar.gz) = 0307592fc773dec131d75408cf31898f91952f81 3SHA1 (peace-0.0.20060701.tar.gz) = 0307592fc773dec131d75408cf31898f91952f81
4RMD160 (peace-0.0.20060701.tar.gz) = 3a0de978b3979b21fe3813e1267f4edd75802f54 4RMD160 (peace-0.0.20060701.tar.gz) = 3a0de978b3979b21fe3813e1267f4edd75802f54
5Size (peace-0.0.20060701.tar.gz) = 1685054 bytes 5Size (peace-0.0.20060701.tar.gz) = 1685054 bytes
 6SHA1 (patch-aa) = 74f91d96da3a216b8acb2192074c390377eae42a
File Added: pkgsrc/emulators/peace/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.3 2008/12/07 16:23:45 kent Exp $

--- dll/ui.so/X11.cc.orig	2008-12-08 01:09:48.000000000 +0900
+++ dll/ui.so/X11.cc
@@ -41,6 +41,9 @@
 #include <sys/param.h>
 #include <sys/shm.h>
 #include <sys/sysctl.h>
+#ifndef KERN_SYSVSHM
+#define KERN_SYSVSHM KERN_OLDSYSVSHM
+#endif
 
 #include "X11.h"
 #include "WindowObject.h"