Fix build on NetBSD/i386 5.99.55 and Darwin/11.0.1.

Tested on NetBSD/i386 5.99.55, Darwin/11.0.1, and NetBSD/i386 5.1.

4 files changed, 19 insertions, 14 deletions

diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 78bc01c0600..212ee93fe7b 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/04 01:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2011/09/18 16:51:32 ryoon Exp $
 #
 
 DISTNAME=	rexx-imc-1.76
@@ -13,6 +13,8 @@ COMMENT=	Implementation of IBM's REXX scripting language
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+MAKE_JOBS_SAFE=	no
+
 USE_LIBTOOL=	yes
 
 INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1
diff --git a/lang/rexx-imc/distinfo b/lang/rexx-imc/distinfo
index f124e373179..b0bdb24ca6a 100644
--- a/lang/rexx-imc/distinfo
+++ b/lang/rexx-imc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/02/04 01:39:11 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/09/18 16:51:32 ryoon Exp $
 
 SHA1 (rexx-imc-1.76.tar.gz) = 3b567bf3e77e42f33eb0ad771ea17ed759c8b361
 RMD160 (rexx-imc-1.76.tar.gz) = 4fb42df97c113aa58e359deb78dfead74469ddde
 Size (rexx-imc-1.76.tar.gz) = 251581 bytes
-SHA1 (patch-aa) = 63de678adf302b818a43c4a79cff6248fae49190
-SHA1 (patch-ab) = f4d30c6d70f45fb463af1bb1fc2446621d7f7f50
+SHA1 (patch-aa) = 605cdc657cb85f944b5e46b8ea837bae938301d3
+SHA1 (patch-ab) = b79ee604da977922e320059c01ccb51434deb958
diff --git a/lang/rexx-imc/patches/patch-aa b/lang/rexx-imc/patches/patch-aa
index 6edf822cd8f..a0591be0850 100644
--- a/lang/rexx-imc/patches/patch-aa
+++ b/lang/rexx-imc/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2010/02/04 01:39:11 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2011/09/18 16:51:32 ryoon Exp $
 
 BSD-style Makefile (with libtool support)
 
---- Makefile.orig	2006-06-28 14:41:52.000000000 +0200
-+++ Makefile	2006-06-28 14:43:01.000000000 +0200
-@@ -0,0 +1,67 @@
+--- Makefile.orig	2011-09-18 15:50:11.000000000 +0000
++++ Makefile
+@@ -0,0 +1,70 @@
 +LIBTOOL= libtool
 +
 +LIBDIR=	${PREFIX}/lib
@@ -30,7 +30,7 @@ BSD-style Makefile (with libtool support)
 +all: ${LIBNAME} rexx rxque rxstack rxmathfn.rxfn
 +
 +${LIBNAME}: ${LIBFILES}
-+	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${LIBFILES:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:7
++	${LIBTOOL} --mode=link --tag=CC ${CC} -o ${.TARGET:.a=.la} ${LIBFILES:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:7
 +
 +rexx: ${LIBNAME} main.o
 +	${LIBTOOL} --mode=link ${CC} main.o ${LIBNAME:.a=.la} -L${LIBDIR} -o rexx
@@ -43,7 +43,10 @@ BSD-style Makefile (with libtool support)
 +
 +rxmathfn.rxfn: rxmathfn.c const.h functions.h
 +	${LIBTOOL} --mode=compile $(CC) $(OPTFLAG) $(CCFLAGS) ${DATE} ${FILEDEFS} -I. -c rxmathfn.c
-+	$(LD) -Bshareable -o rxmathfn.rxfn .libs/rxmathfn.o -lm
++	${LIBTOOL} --mode=link \
++	    ${CC} -o rxmathfn.rxfn \
++		.libs/rxmathfn.o .libs/rxstack.o librexx.la \
++		-rpath ${PREFIX}/lib -lm
 +
 +.c.o:
 +	${LIBTOOL} --mode=compile $(CC) $(OPTFLAG) $(CCFLAGS) ${DATE} ${FILEDEFS} -c $*.c
@@ -62,7 +65,7 @@ BSD-style Makefile (with libtool support)
 +	sed -e 's|@REXXLIBDIR@|${REXXLIBDIR}|g' rexx.1.in > ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rexx.1
 +	${INSTALL_MAN} rxque.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 +	${INSTALL_MAN} rxstack.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+	${INSTALL_PROGRAM} rxmathfn.rxfn ${DESTDIR}${PREFIX}/lib
++	${INSTALL_DATA} rxmathfn.rxfn ${DESTDIR}${PREFIX}/lib
 +	${INSTALL_MAN} rexxsaa.h ${DESTDIR}${PREFIX}/include
 +	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/rexx-imc
 +	for f in rexx.info rexx.ref rexx.summary rexx.tech; do		\
diff --git a/lang/rexx-imc/patches/patch-ab b/lang/rexx-imc/patches/patch-ab
index 16c7e7ce992..aca900f83f4 100644
--- a/lang/rexx-imc/patches/patch-ab
+++ b/lang/rexx-imc/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2006/01/09 22:03:37 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2011/09/18 16:51:32 ryoon Exp $
 
 Generalise for all *BSD (well, anything with Torek stdio, really)
 
---- rxfn.c	2002/09/02 08:50:31	1.1
-+++ rxfn.c	2002/09/02 08:51:26
+--- rxfn.c.orig	2000-11-01 18:04:28.000000000 +0000
++++ rxfn.c
 @@ -40,8 +40,10 @@
  #ifndef _CNT
  # ifdef linux