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.diff -r1.26 -r1.27 pkgsrc/misc/chipmunk/Makefile
(dholland)
@@ -1,25 +1,29 @@ | @@ -1,25 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.26 2013/07/15 02:02:26 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.27 2015/01/04 09:06:17 dholland Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= chipmunk-1.4 | 4 | DISTNAME= chipmunk-1.4 | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= misc | 6 | CATEGORIES= misc | |
7 | MASTER_SITES= http://www.bitwizard.nl/chipmunk/ | 7 | MASTER_SITES= http://www.bitwizard.nl/chipmunk/ | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html | 10 | HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html | |
11 | COMMENT= Shell-like tool for hardware debugging | 11 | COMMENT= Shell-like tool for hardware debugging | |
12 | 12 | |||
13 | ONLY_FOR_PLATFORM= NetBSD-*-i386 | |||
14 | ||||
15 | BUILD_TARGET= chipmunk | 13 | BUILD_TARGET= chipmunk | |
16 | MAKE_ENV+= CONFIG_OPTIONS=${CPPFLAGS:M*:Q} | 14 | MAKE_ENV+= CONFIG_OPTIONS=${CPPFLAGS:M*:Q} | |
17 | MAKE_ENV+= EXTRA_LIBS=-li386 | 15 | ||
16 | .include "../../mk/bsd.prefs.mk" | |||
17 | .if ${OPSYS} == "NetBSD" | |||
18 | .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" | |||
19 | MAKE_ENV+= EXTRA_LIBS=-l${MACHINE_ARCH} | |||
20 | .endif | |||
21 | .endif | |||
18 | 22 | |||
19 | INSTALLATION_DIRS= sbin | 23 | INSTALLATION_DIRS= sbin | |
20 | 24 | |||
21 | do-install: | 25 | do-install: | |
22 | ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${DESTDIR}${PREFIX}/sbin/chipmunk | 26 | ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${DESTDIR}${PREFIX}/sbin/chipmunk | |
23 | 27 | |||
24 | .include "../../mk/readline.buildlink3.mk" | 28 | .include "../../mk/readline.buildlink3.mk" | |
25 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2005/02/24 11:02:50 agc Exp $ | 1 | $NetBSD: distinfo,v 1.5 2015/01/04 09:06:17 dholland Exp $ | |
2 | 2 | |||
3 | SHA1 (chipmunk-1.4.tar.gz) = a59c58427a27118497d39778ab7ca6daa371e868 | 3 | SHA1 (chipmunk-1.4.tar.gz) = a59c58427a27118497d39778ab7ca6daa371e868 | |
4 | RMD160 (chipmunk-1.4.tar.gz) = e567a702214d534777ae44fa01b2fc88582abfce | 4 | RMD160 (chipmunk-1.4.tar.gz) = e567a702214d534777ae44fa01b2fc88582abfce | |
5 | Size (chipmunk-1.4.tar.gz) = 62181 bytes | 5 | Size (chipmunk-1.4.tar.gz) = 62181 bytes | |
6 | SHA1 (patch-aa) = 6f883506ef85335ff896d662a4dae7ec7f299889 | 6 | SHA1 (patch-aa) = 6f883506ef85335ff896d662a4dae7ec7f299889 | |
7 | SHA1 (patch-ab) = c42f11558eed1912bc98b6769baffaad7d33f3bb | 7 | SHA1 (patch-ab) = c1d27276f222bc3263c391f3a7cea47471e25ebb |
@@ -1,30 +1,36 @@ | @@ -1,30 +1,36 @@ | |||
1 | $NetBSD: patch-ab,v 1.2 2001/05/17 20:17:28 jlam Exp $ | 1 | $NetBSD: patch-ab,v 1.3 2015/01/04 09:06:17 dholland Exp $ | |
2 | 2 | |||
3 | --- config.h.orig Thu Mar 23 10:38:56 1995 | 3 | --- config.h.orig Thu Mar 23 10:38:56 1995 | |
4 | +++ config.h | 4 | +++ config.h | |
5 | @@ -108,6 +108,25 @@ | 5 | @@ -108,6 +108,31 @@ | |
6 | # define USE_TESTS | 6 | # define USE_TESTS | |
7 | #endif | 7 | #endif | |
8 | 8 | |||
9 | +#ifdef __NetBSD__ | 9 | +#ifdef __NetBSD__ | |
10 | +# define OPSYS "NetBSD" | 10 | +# define OPSYS "NetBSD" | |
11 | +# define USE_UNISTD | 11 | +# define USE_UNISTD | |
12 | +# define USE_CBREAK | 12 | +# define USE_CBREAK | |
13 | +# define USE_MMAP | 13 | +# define USE_MMAP | |
14 | +# define USE_SIGNALS | 14 | +# define USE_SIGNALS | |
15 | +# define USE_WAIT | 15 | +# define USE_WAIT | |
16 | +# define UNIX | 16 | +# define UNIX | |
17 | +# define USE_ALLOCA | 17 | +# define USE_ALLOCA | |
18 | +# define USE_READLINE | 18 | +# define USE_READLINE | |
19 | +# define USE_MEMTEST | 19 | +# define USE_MEMTEST | |
20 | +# define USE_TESTS | 20 | +# define USE_TESTS | |
21 | +# define USE_SIGNAL_H | 21 | +# define USE_SIGNAL_H | |
22 | +# define IN_OUT_INSTRUCTIONS | 22 | +# define IN_OUT_INSTRUCTIONS | |
23 | +#if defined(__x86_64__) | |||
24 | +# define my_ioperm(x,y,z) x86_64_iopl(1) | |||
25 | +#elif defined(__i386__) | |||
23 | +# define my_ioperm(x,y,z) i386_iopl(1) | 26 | +# define my_ioperm(x,y,z) i386_iopl(1) | |
27 | +#else | |||
28 | +# define my_ioperm(x,y,z) 0 | |||
29 | +#endif | |||
24 | + | 30 | + | |
25 | +#define SIGNAL_FUNCTION_CAST (void (*)()) | 31 | +#define SIGNAL_FUNCTION_CAST (void (*)()) | |
26 | +#endif | 32 | +#endif | |
27 | + | 33 | + | |
28 | /* | 34 | /* | |
29 | * Here starts the section that provides defaults for most systems, that | 35 | * Here starts the section that provides defaults for most systems, that | |
30 | * can be overridden for a specific OS/compiler. | 36 | * can be overridden for a specific OS/compiler. |