diff options
| author | dholland <dholland> | 2015-01-04 09:06:17 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2015-01-04 09:06:17 +0000 |
| commit | a548d4049db4f3f2e9a954e05d639a9442626b0b (patch) | |
| tree | b213da717ef6429abc841df072a3cf0b462e678d /misc | |
| parent | 7454bd18993754ad97b1faaec6d1a0d7535e0fe5 (diff) | |
| download | pkgsrc-a548d4049db4f3f2e9a954e05d639a9442626b0b.tar.gz | |
Remove ONLY_FOR_PLATFORM and fix amd64 netbsd build. The package appears
to support at least some other OSes and machines, so leave it unrestricted
until we find what it really does and doesn't work on.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/chipmunk/Makefile | 12 | ||||
| -rw-r--r-- | misc/chipmunk/distinfo | 4 | ||||
| -rw-r--r-- | misc/chipmunk/patches/patch-ab | 10 |
3 files changed, 18 insertions, 8 deletions
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile index 37247fe19ca..71d581b534c 100644 --- a/misc/chipmunk/Makefile +++ b/misc/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.27 2015/01/04 09:06:17 dholland Exp $ # DISTNAME= chipmunk-1.4 @@ -10,11 +10,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html COMMENT= Shell-like tool for hardware debugging -ONLY_FOR_PLATFORM= NetBSD-*-i386 - BUILD_TARGET= chipmunk MAKE_ENV+= CONFIG_OPTIONS=${CPPFLAGS:M*:Q} -MAKE_ENV+= EXTRA_LIBS=-li386 + +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "NetBSD" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +MAKE_ENV+= EXTRA_LIBS=-l${MACHINE_ARCH} +.endif +.endif INSTALLATION_DIRS= sbin diff --git a/misc/chipmunk/distinfo b/misc/chipmunk/distinfo index b16898beb39..6aa29842825 100644 --- a/misc/chipmunk/distinfo +++ b/misc/chipmunk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 11:02:50 agc Exp $ +$NetBSD: distinfo,v 1.5 2015/01/04 09:06:17 dholland Exp $ SHA1 (chipmunk-1.4.tar.gz) = a59c58427a27118497d39778ab7ca6daa371e868 RMD160 (chipmunk-1.4.tar.gz) = e567a702214d534777ae44fa01b2fc88582abfce Size (chipmunk-1.4.tar.gz) = 62181 bytes SHA1 (patch-aa) = 6f883506ef85335ff896d662a4dae7ec7f299889 -SHA1 (patch-ab) = c42f11558eed1912bc98b6769baffaad7d33f3bb +SHA1 (patch-ab) = c1d27276f222bc3263c391f3a7cea47471e25ebb diff --git a/misc/chipmunk/patches/patch-ab b/misc/chipmunk/patches/patch-ab index aa6b91143b3..b512291fb9e 100644 --- a/misc/chipmunk/patches/patch-ab +++ b/misc/chipmunk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2001/05/17 20:17:28 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2015/01/04 09:06:17 dholland Exp $ --- config.h.orig Thu Mar 23 10:38:56 1995 +++ config.h -@@ -108,6 +108,25 @@ +@@ -108,6 +108,31 @@ # define USE_TESTS #endif @@ -20,7 +20,13 @@ $NetBSD: patch-ab,v 1.2 2001/05/17 20:17:28 jlam Exp $ +# define USE_TESTS +# define USE_SIGNAL_H +# define IN_OUT_INSTRUCTIONS ++#if defined(__x86_64__) ++# define my_ioperm(x,y,z) x86_64_iopl(1) ++#elif defined(__i386__) +# define my_ioperm(x,y,z) i386_iopl(1) ++#else ++# define my_ioperm(x,y,z) 0 ++#endif + +#define SIGNAL_FUNCTION_CAST (void (*)()) +#endif |