Fix broken build on NetBSD. Add DESTDIR support.

PKGREVISION++ as a precaution.

6 files changed, 287 insertions, 17 deletions

diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile
index 52595283ba1..d10d8b3ba03 100644
--- a/devel/tet3/Makefile
+++ b/devel/tet3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:18 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/07/12 02:46:37 dholland Exp $
 
 DISTNAME=	tet3.7-unsup.src
 PKGNAME=	tet3-3.7
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://tetworks.opengroup.org/tet/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tetworks.opengroup.org/
 COMMENT=	The Open Group test harness
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${SH}
@@ -25,12 +28,19 @@ REPLACE_PERL+=	contrib/tetreport/tetreport.pl contrib/templates/perl-api.pl
 REPLACE_PERL+=	src/perl/api.pl
 MAKE_FILE=	makefile
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=	java
+.if ${OPSYS} == "SunOS"
+PLIST.java=	yes
+.endif
+
 post-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3/bin
-	cd ${WRKSRC}/bin && pax -rwpe . ${PREFIX}/tet3/bin
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tet3/lib
-	cd ${WRKSRC}/lib && pax -rwpe . ${PREFIX}/tet3/lib
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/bin
+	cd ${WRKSRC}/bin && pax -rwpe . ${DESTDIR}${PREFIX}/tet3/bin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/lib
+	cd ${WRKSRC}/lib && pax -rwpe . ${DESTDIR}${PREFIX}/tet3/lib
 
 PTHREAD_OPTS+=	native	# only native threads make sense
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/tet3/PLIST b/devel/tet3/PLIST
index befc936219e..960e734162f 100644
--- a/devel/tet3/PLIST
+++ b/devel/tet3/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/07/12 02:46:37 dholland Exp $
 tet3/bin/grw
-tet3/bin/jet-build
-tet3/bin/jet-clean
-tet3/bin/jet-exec
-tet3/bin/jet-spawn
+${PLIST.java}tet3/bin/jet-build
+${PLIST.java}tet3/bin/jet-clean
+${PLIST.java}tet3/bin/jet-exec
+${PLIST.java}tet3/bin/jet-spawn
 tet3/bin/tcc
 tet3/bin/tccd
 tet3/bin/tccdsrv
@@ -19,7 +19,21 @@ tet3/lib/perl/api.pl
 tet3/lib/perl/tcm.pl
 tet3/lib/posix_sh/tcm.sh
 tet3/lib/posix_sh/tetapi.sh
+tet3/lib/tet3/Ctcm.o
+tet3/lib/tet3/Ctcmchild.o
+tet3/lib/tet3/Cthrtcm.o
+tet3/lib/tet3/Cthrtcmchild.o
 tet3/lib/tet3/libapi.a
 tet3/lib/tet3/libthrapi.a
+tet3/lib/tet3/tcm.o
+tet3/lib/tet3/tcm_m.o
+tet3/lib/tet3/tcmc_m.o
+tet3/lib/tet3/tcmchild.o
+tet3/lib/tet3/tcmr_m.o
+tet3/lib/tet3/tcmrem.o
+tet3/lib/tet3/thrtcm.o
+tet3/lib/tet3/thrtcm_m.o
+tet3/lib/tet3/thrtcmc_m.o
+tet3/lib/tet3/thrtcmchild.o
 tet3/lib/xpg3sh/tcm.sh
 tet3/lib/xpg3sh/tetapi.sh
diff --git a/devel/tet3/distinfo b/devel/tet3/distinfo
index 9acfb740eb9..0102a414165 100644
--- a/devel/tet3/distinfo
+++ b/devel/tet3/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.5 2006/06/08 16:57:59 rillig Exp $
+$NetBSD: distinfo,v 1.6 2010/07/12 02:46:37 dholland Exp $
 
 SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73
 RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d
 Size (tet3.7-unsup.src.tgz) = 953406 bytes
 SHA1 (patch-aa) = 6b67991e3deed46ef7a3451e3ff94dee286d1d65
 SHA1 (patch-ab) = a18d1928e58ea8e5eef7fd797641f802e99cc02d
-SHA1 (patch-ac) = 19167238815d7393b6e3565a14e4f6a7f9674f6a
+SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb
 SHA1 (patch-ad) = ba0bb07f74a70691cf62d72502a3d608e522e2c0
 SHA1 (patch-ae) = adb90e2ce7ad8429a701718ec4a79ddb2f93d509
 SHA1 (patch-ah) = aaee593e861966595ef71ab59b535372facc1115
 SHA1 (patch-ai) = 256d4903ec91f4a4ffe147accb5d7e80740e6c46
 SHA1 (patch-aj) = 28bd55c8a55d60cbf4e2b2456c488090782babc5
+SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a
+SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5
diff --git a/devel/tet3/patches/patch-ac b/devel/tet3/patches/patch-ac
index 631607288ab..d6a3f6370e2 100644
--- a/devel/tet3/patches/patch-ac
+++ b/devel/tet3/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2006/06/08 16:57:59 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2010/07/12 02:46:38 dholland Exp $
 
---- /dev/null	2003-06-16 16:04:41.000000000 +0100
-+++ src/defines/UNTESTED/netbsd.mk	2003-06-16 16:03:57.000000000 +0100
-@@ -0,0 +1,165 @@
+Config for NetBSD.
+
+--- src/defines/UNTESTED/netbsd.mk.orig	2010-07-12 02:12:35.000000000 +0000
++++ src/defines/UNTESTED/netbsd.mk
+@@ -0,0 +1,181 @@
 +#
 +#	SCCS: @(#)netbsd.mk	1.1 (2003/06/16)
 +#
@@ -85,6 +87,8 @@ $NetBSD: patch-ac,v 1.2 2006/06/08 16:57:59 rillig Exp $
 +# sgs component definitions and flags
 +# CC - the name of the C compiler
 +CC = cc
++# LD_R - the program that performs partial linking
++LD_R = ld -r
 +# CDEFS may be passed to lint and cc, COPTS to cc only
 +# CDEFS usually defines NSIG (the highest signal number plus one)
 +CDEFS = -I$(INC) -I$(DINC)
@@ -168,3 +172,17 @@ $NetBSD: patch-ac,v 1.2 2006/06/08 16:57:59 rillig Exp $
 +THRSHLIB_BUILD_END =
 +SO =
 +
++# support for Java
++#
++# JAVA_CDEFS is used in addition to TET_CDEFS/DTET_CDEFS when compiling
++# the Java API.
++# It is normally set to -Ipath-to-jdk-include-directory
++# and includes a list of signals that the TCM should leave alone.
++# Set JAVA_CDEFS to JAVA_NOT_SUPPORTED if Java is not supported on your
++# system or if you don't want to build the Java API.
++# NOTE that the Java API is only supported on certain platforms - see the
++# Installation Guide and/or the Release Notes for details.
++JAVA_CDEFS = JAVA_NOT_SUPPORTED
++#
++# JAVA_COPTS is used in addition to COPTS when compiling the Java API.
++JAVA_COPTS = $(SHLIB_COPTS)
diff --git a/devel/tet3/patches/patch-ak b/devel/tet3/patches/patch-ak
new file mode 100644
index 00000000000..4effd301d99
--- /dev/null
+++ b/devel/tet3/patches/patch-ak
@@ -0,0 +1,93 @@
+$NetBSD: patch-ak,v 1.1 2010/07/12 02:46:38 dholland Exp $
+
+Work around POSIX getline() nonsense.
+
+--- src/tet3/tcc/scen1.c~	2006-03-10 09:42:21.000000000 +0000
++++ src/tet3/tcc/scen1.c
+@@ -152,7 +152,7 @@ static struct ifstack *ifstp;
+ 
+ /* static function declarations */
+ static int find1scen PROTOLIST((void));
+-static char *getline PROTOLIST((void));
++static char *get_line PROTOLIST((void));
+ static void includefile PROTOLIST((char *, char *, int));
+ static struct ifstack *ifsalloc PROTOLIST((void));
+ static void ifsfree PROTOLIST((struct ifstack *));
+@@ -245,7 +245,7 @@ static int find1scen()
+ 	**	the scenario processor can find it
+ 	*/
+ 	for (;;) {
+-		if ((line = getline()) == (char *) 0)
++		if ((line = get_line()) == (char *) 0)
+ 			return(ferror(ifstp->if_fp) ? -1 : 0);
+ 		if (!isspace(*line)) {
+ 			/* start of new scenario */
+@@ -288,7 +288,7 @@ static int proc1scen()
+ 	register struct scentab *ep;
+ 
+ 	/* read the scenario name - starts in column 1 */
+-	line = getline();
++	line = get_line();
+ 	ASSERT(line);
+ 	ASSERT(!isspace(*line));
+ 
+@@ -316,7 +316,7 @@ static int proc1scen()
+ 		return(-1);
+ 
+ 	/* process the rest of the current scenario */
+-	while ((line = getline()) != (char *) 0) {
++	while ((line = get_line()) != (char *) 0) {
+ 		if (!isspace(*line)) {
+ 			/* a new scenario */
+ 			ungetline(line);
+@@ -1197,13 +1197,13 @@ static struct ifstack *ifspop()
+ }
+ 
+ /*
+-**	getline() - get the next non-blank, non-comment line
++**	get_line() - get the next non-blank, non-comment line
+ **		from the currently active input file
+ **
+ **	return a pointer to the line, or (char *) 0 on EOF or error
+ */
+ 
+-static char *getline()
++static char *get_line()
+ {
+ 	static char buf[LBUFLEN];
+ 	struct lcache *lcp;
+@@ -1216,7 +1216,7 @@ static char *getline()
+ 	if ((lcp = lcpop()) != (struct lcache *) 0) {
+ 		(void) strcpy(buf, lcp->lc_line);
+ 		lcfree(lcp);
+-		TRACE2(tet_Tscen, 10, "getline(): line = <%s>", firstpart(buf));
++		TRACE2(tet_Tscen, 10, "get_line(): line = <%s>", firstpart(buf));
+ 		return(buf);
+ 	}
+ 
+@@ -1247,14 +1247,14 @@ static char *getline()
+ 			}
+ 			else
+ 				TRACE2(tet_Tscen, 10,
+-					"getline(): encountered EOF on %s",
++					"get_line(): encountered EOF on %s",
+ 					ifstp->if_fname);
+ 			if (ifstp->if_next) {
+ 				(void) fclose(ifstp->if_fp);
+ 				ifsfree(ifspop());
+ 				continue;
+ 			}
+-			TRACE1(tet_Tscen, 10, "getline(): return EOF");
++			TRACE1(tet_Tscen, 10, "get_line(): return EOF");
+ 			return((char *) 0);
+ 		}
+ 
+@@ -1289,7 +1289,7 @@ static char *getline()
+ 
+ 		/* if there is anything left, return it */
+ 		if (p >= buf) {
+-			TRACE4(tet_Tscen, 10, "getline(): fname = %s, lineno = %s, line = <%s>",
++			TRACE4(tet_Tscen, 10, "get_line(): fname = %s, lineno = %s, line = <%s>",
+ 				ifstp->if_fname, tet_i2a(ifstp->if_lcount),
+ 				firstpart(buf));
+ 			return(buf);
diff --git a/devel/tet3/patches/patch-al b/devel/tet3/patches/patch-al
new file mode 100644
index 00000000000..1b02bd93730
--- /dev/null
+++ b/devel/tet3/patches/patch-al
@@ -0,0 +1,133 @@
+$NetBSD: patch-al,v 1.1 2010/07/12 02:46:38 dholland Exp $
+
+make the build stop on error.
+
+--- src/tet3/makefile~	2006-03-10 09:42:19.000000000 +0000
++++ src/tet3/makefile
+@@ -107,7 +107,7 @@ all install CLEAN clean:
+ 	for i in $(DIRS);						\
+ 	do								\
+ 		echo $$i:;						\
+-		(cd $$i && $(MAKE) $@);					\
++		(cd $$i && $(MAKE) $@) || exit 1;			\
+ 	done;								\
+ 									\
+ 	: "thread-safe tcm and api library";				\
+@@ -118,7 +118,7 @@ all install CLEAN clean:
+ 		for i in $(THRDIRS);					\
+ 		do							\
+ 			echo $$i:;					\
+-			(cd $$i && $(MAKE) $@);				\
++			(cd $$i && $(MAKE) $@) || exit 1;		\
+ 		done;							\
+ 		;;							\
+ 	esac;								\
+@@ -131,7 +131,7 @@ all install CLEAN clean:
+ 		for i in $(SHLIBDIRS);					\
+ 		do							\
+ 			echo $$i:;					\
+-			(cd $$i && $(MAKE) $@);				\
++			(cd $$i && $(MAKE) $@) || exit 1;		\
+ 		done;							\
+ 		;;							\
+ 	esac;								\
+@@ -144,7 +144,7 @@ all install CLEAN clean:
+ 		for i in $(THRSHLIBDIRS);				\
+ 		do							\
+ 			echo $$i:;					\
+-			(cd $$i && $(MAKE) $@);				\
++			(cd $$i && $(MAKE) $@) || exit 1;		\
+ 		done;							\
+ 		;;							\
+ 	esac;								\
+@@ -155,11 +155,11 @@ all install CLEAN clean:
+ 		;;							\
+ 	*:all)								\
+ 		echo "tcm(C++):";					\
+-		(cd tcm && $(MAKE) allC);				\
++		(cd tcm && $(MAKE) allC) || exit 1;			\
+ 		;;							\
+ 	*:install)							\
+ 		echo "tcm(C++):";					\
+-		(cd tcm && $(MAKE) installC);				\
++		(cd tcm && $(MAKE) installC) || exit 1;			\
+ 		;;							\
+ 	esac;								\
+ 									\
+@@ -169,11 +169,11 @@ all install CLEAN clean:
+ 		;;							\
+ 	*:all)								\
+ 		echo "tcmthr(C++):";					\
+-		(cd tcmthr && $(MAKE) allC);				\
++		(cd tcmthr && $(MAKE) allC) || exit 1;			\
+ 		;;							\
+ 	*:install)							\
+ 		echo "tcmthr(C++):";					\
+-		(cd tcmthr && $(MAKE) installC);			\
++		(cd tcmthr && $(MAKE) installC) || exit 1;		\
+ 		;;							\
+ 	esac;								\
+ 									\
+@@ -183,11 +183,11 @@ all install CLEAN clean:
+ 		;;							\
+ 	*:all)								\
+ 		echo "tcmshlib(C++):";					\
+-		(cd tcmshlib && $(MAKE) allC);				\
++		(cd tcmshlib && $(MAKE) allC) || exit 1;		\
+ 		;;							\
+ 	*:install)							\
+ 		echo "tcmshlib(C++):";					\
+-		(cd tcmshlib && $(MAKE) installC);			\
++		(cd tcmshlib && $(MAKE) installC) || exit 1;		\
+ 		;;							\
+ 	esac;								\
+ 									\
+@@ -197,11 +197,11 @@ all install CLEAN clean:
+ 		;;							\
+ 	*:all)								\
+ 		echo "tcmthrshlib(C++):";				\
+-		(cd tcmthrshlib && $(MAKE) allC);			\
++		(cd tcmthrshlib && $(MAKE) allC) || exit 1;		\
+ 		;;							\
+ 	*:install)							\
+ 		echo "tcmsthrhlib(C++):";				\
+-		(cd tcmthrshlib && $(MAKE) installC);			\
++		(cd tcmthrshlib && $(MAKE) installC) || exit 1;		\
+ 		;;							\
+ 	esac;								\
+ 									\
+@@ -216,7 +216,7 @@ all install CLEAN clean:
+ 			for i in $(JAVADIRS);				\
+ 			do						\
+ 				echo $$i:;				\
+-				(cd $$i && $(MAKE) $@);			\
++				(cd $$i && $(MAKE) $@) || exit 1;	\
+ 			done;						\
+ 		fi;							\
+ 		;;							\
+@@ -228,7 +228,7 @@ all install CLEAN clean:
+ 		if test -d $$i;						\
+ 		then							\
+ 			echo $$i:;					\
+-			(cd $$i && $(MAKE) $@);				\
++			(cd $$i && $(MAKE) $@) || exit 1;		\
+ 		fi;							\
+ 	done;
+ 
+@@ -245,14 +245,14 @@ CLOBBER clobber FORCE FRC:
+ 	for i in $(DIRS) $(THRDIRS) $(SHLIBDIRS) $(THRSHLIBDIRS);	\
+ 	do								\
+ 		echo $$i:;						\
+-		(cd $$i && $(MAKE) $@);					\
++		(cd $$i && $(MAKE) $@) || exit 1;			\
+ 	done;								\
+ 	for i in $(JAVADIRS) $(OPTDIRS);				\
+ 	do								\
+ 		if test -d $$i;						\
+ 		then							\
+ 			echo $$i:;					\
+-			(cd $$i && $(MAKE) $@);				\
++			(cd $$i && $(MAKE) $@) || exit 1;		\
+ 		fi;							\
+ 	done;
+