Wed Dec 26 18:51:47 2012 UTC ()
Fix build on Solaris without /usr/bin/ccs/ar.


(ryoon)
diff -r1.7 -r1.8 pkgsrc/devel/jam/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/jam/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/devel/jam/patches/patch-ab
diff -r0 -r1.1 pkgsrc/devel/jam/patches/patch-jambase.c
cvs diff -r1.7 -r1.8 pkgsrc/devel/jam/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jam/distinfo 2008/03/10 00:09:23 1.7
+++ pkgsrc/devel/jam/distinfo 2012/12/26 18:51:47 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2008/03/10 00:09:23 tnn Exp $ 1$NetBSD: distinfo,v 1.8 2012/12/26 18:51:47 ryoon Exp $
2 2
3SHA1 (ftjam-2.5.2.tar.bz2) = 08bad35e74ec85c4592d378014586174d22297b5 3SHA1 (ftjam-2.5.2.tar.bz2) = 08bad35e74ec85c4592d378014586174d22297b5
4RMD160 (ftjam-2.5.2.tar.bz2) = fd1d1161963ba85be09aecffe832cf1db8a7b70f 4RMD160 (ftjam-2.5.2.tar.bz2) = fd1d1161963ba85be09aecffe832cf1db8a7b70f
5Size (ftjam-2.5.2.tar.bz2) = 196631 bytes 5Size (ftjam-2.5.2.tar.bz2) = 196631 bytes
6SHA1 (patch-aa) = 91a3bdf0b8382afd90ac21c4304bdc580d5068e8 6SHA1 (patch-aa) = 64a149995f63cd3d3648f4597769e2ec57b0b0ba
7SHA1 (patch-ab) = 72816ee8c6dafdcb557560a8815f70e5ec593ff4 7SHA1 (patch-ab) = 6f6fce24c46d799d7ef9885271960c3d2038f93d
 8SHA1 (patch-jambase.c) = 906d3589718e4bf87a0f1740d876c2ddc7a7f90d
cvs diff -r1.4 -r1.5 pkgsrc/devel/jam/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/jam/patches/patch-aa 2008/03/10 00:09:23 1.4
+++ pkgsrc/devel/jam/patches/patch-aa 2012/12/26 18:51:47 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-aa,v 1.4 2008/03/10 00:09:23 tnn Exp $ 1$NetBSD: patch-aa,v 1.5 2012/12/26 18:51:47 ryoon Exp $
2 2
3Beware of DOS linebreaks. 3Beware of DOS linebreaks.
4 4
5--- jam.h.orig 2006-06-05 12:52:05.000000000 +0200 5--- jam.h.orig 2006-06-05 10:52:05.000000000 +0000
6+++ jam.h 6+++ jam.h
7@@ -379,19 +379,8 @@ 7@@ -379,19 +379,8 @@
8 # include <memory.h>  8 # include <memory.h>
9 # endif  9 # endif
10  10
11-# ifndef OS_ULTRIX  11-# ifndef OS_ULTRIX
12 # include <stdlib.h>  12 # include <stdlib.h>
13-# endif  13-# endif
14  14
15-# if !defined(OS_BSDI) && \  15-# if !defined(OS_BSDI) && \
16- !defined(OS_FREEBSD) && \  16- !defined(OS_FREEBSD) && \
17- !defined(OS_NEXT) && \  17- !defined(OS_NEXT) && \
18- !defined(OS_MACHTEN) && \  18- !defined(OS_MACHTEN) && \
cvs diff -r1.1 -r1.2 pkgsrc/devel/jam/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/jam/patches/patch-ab 2008/03/10 00:09:23 1.1
+++ pkgsrc/devel/jam/patches/patch-ab 2012/12/26 18:51:47 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.1 2008/03/10 00:09:23 tnn Exp $ 1$NetBSD: patch-ab,v 1.2 2012/12/26 18:51:47 ryoon Exp $
2 2
3Beware of DOS linebreaks. 3Beware of DOS linebreaks.
4 4
5--- execunix.c.orig 2006-06-05 12:52:27.000000000 +0200 5--- execunix.c.orig 2006-06-05 10:52:27.000000000 +0000
6+++ execunix.c 6+++ execunix.c
7@@ -42,6 +42,7 @@ 7@@ -42,6 +42,7 @@
8 # include "lists.h"  8 # include "lists.h"
9 # include "execcmd.h"  9 # include "execcmd.h"
10 # include <errno.h>  10 # include <errno.h>
11+# include <unistd.h>  11+# include <unistd.h>
12  12
13 # ifdef USE_EXECUNIX  13 # ifdef USE_EXECUNIX
14  14
File Added: pkgsrc/devel/jam/patches/patch-jambase.c
$NetBSD: patch-jambase.c,v 1.1 2012/12/26 18:51:47 ryoon Exp $

--- jambase.c.orig	2012-12-26 18:50:42.000000000 +0000
+++ jambase.c
@@ -607,7 +607,6 @@ const char *jambase[] = {
 "\n",
 "case SOLARIS :\n",
 "RANLIB      ?= \"\" ;\n",
-"AR      ?= \"/usr/ccs/bin/ar ru\" ;\n",
 "\n",
 "case UNICOS :\n",
 "NOARSCAN    ?= true ;\n",