- Fix build issue

- Add PKG_DESTDIR_SUPPORT
- Allow to build on any platform
- bump PKGREVISION

3 files changed, 28 insertions, 10 deletions

diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile
index 4f59818138e..c85e7f3d444 100644
--- a/sysutils/fix4SA110rev2/Makefile
+++ b/sysutils/fix4SA110rev2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/01/21 18:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2009/02/10 12:49:56 abs Exp $
 #
 
 DISTNAME=	fix4SA110rev2-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/arch/arm32/misc/
 DISTFILES=	fix4SA110rev2.c fix4SA110rev2.README
@@ -11,17 +11,16 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/arch/arm32/misc/fix4SA110rev2.README
 COMMENT=	Modify arm32 binaries to work around SA rev2 problems
 
-ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32
-
 WRKSRC=		${WRKDIR}
 
+PKG_DESTDIR_SUPPORT= 	user-destdir
 INSTALLATION_DIRS=	bin share/doc
 
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fix4SA110rev2 ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/fix4SA110rev2.README ${PREFIX}/share/doc
+	${INSTALL_PROGRAM} ${WRKSRC}/fix4SA110rev2 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/fix4SA110rev2.README ${DESTDIR}${PREFIX}/share/doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fix4SA110rev2/distinfo b/sysutils/fix4SA110rev2/distinfo
index b2903a282fa..ad90850e962 100644
--- a/sysutils/fix4SA110rev2/distinfo
+++ b/sysutils/fix4SA110rev2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/05/25 13:37:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/02/10 12:49:56 abs Exp $
 
 SHA1 (fix4SA110rev2.c) = c7043743e482087322b4dce346649af5b221ae36
 RMD160 (fix4SA110rev2.c) = 0901e3e3f0cd9fc6f1fc920b7b7aff0addbd2372
@@ -6,4 +6,4 @@ Size (fix4SA110rev2.c) = 8170 bytes
 SHA1 (fix4SA110rev2.README) = 7ffd9c6dc9c311c4cc47d7544fb2e89961108f3a
 RMD160 (fix4SA110rev2.README) = 9a29979ba526296c9929d2c01cafabde308237a3
 Size (fix4SA110rev2.README) = 2724 bytes
-SHA1 (patch-aa) = c07eff77ea24c1f3b0d3b7bc13a8e7825075e4ae
+SHA1 (patch-aa) = 2129dc53b0250bbf121bac9a84d8e58821858e77
diff --git a/sysutils/fix4SA110rev2/patches/patch-aa b/sysutils/fix4SA110rev2/patches/patch-aa
index a8fdd434814..bb60d3832bf 100644
--- a/sysutils/fix4SA110rev2/patches/patch-aa
+++ b/sysutils/fix4SA110rev2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2003/07/31 09:17:46 abs Exp $
+$NetBSD: patch-aa,v 1.2 2009/02/10 12:49:56 abs Exp $
 
---- fix4SA110rev2.c.orig	2003-07-31 10:20:41.000000000 +0100
+--- fix4SA110rev2.c.orig	2009-02-10 12:46:34.000000000 +0000
 +++ fix4SA110rev2.c
 @@ -79,8 +79,8 @@
   */
@@ -12,3 +12,22 @@ $NetBSD: patch-aa,v 1.1 2003/07/31 09:17:46 abs Exp $
  
  /* All programs are loaded at this base address. */
  #define LOAD_ADDR 0x1000
+@@ -100,7 +100,7 @@ int fixcount = 0;
+ 
+ static void usage(void)
+ {
+-  fprintf(stderr, "Usage: findbad <infile> <outfile>\n");
++  fprintf(stderr, "Usage: fix4SA110rev2 <infile> <outfile>\n");
+ }
+ 
+ fix *newfix(unsigned long where, unsigned long inst)
+@@ -240,8 +240,7 @@ space
+      for instructions that do not appear elsewhere, and for the ldr pc 
+      hackery.  */
+   if (fixcount > i - 1)
+-    fprintf(stderr, "Insufficient space for patch instructions (need %d 
+-words)\n", fixcount);
++    fprintf(stderr, "Insufficient space for patch instructions (need %d words)\n", fixcount);
+ 
+   if ((out = fopen(argv[2], "w")) == NULL)
+     {