Tue Mar 15 12:15:26 2016 UTC ()
Remove two weird patches. Add comments to most others.


(wiz)
diff -r1.26 -r1.27 pkgsrc/devel/tet3/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/tet3/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/devel/tet3/patches/patch-ab
diff -r1.2 -r0 pkgsrc/devel/tet3/patches/patch-ae
diff -r1.2 -r0 pkgsrc/devel/tet3/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/devel/tet3/patches/patch-src_scripts_tet_start.sh

cvs diff -r1.26 -r1.27 pkgsrc/devel/tet3/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/tet3/Makefile 2015/06/12 10:50:00 1.26
+++ pkgsrc/devel/tet3/Makefile 2016/03/15 12:15:26 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2015/06/12 10:50:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.27 2016/03/15 12:15:26 wiz Exp $
2 2
3DISTNAME= tet3.7-unsup.src 3DISTNAME= tet3.7-unsup.src
4PKGNAME= tet3-3.7 4PKGNAME= tet3-3.7
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://tetworks.opengroup.org/tet/ 7MASTER_SITES= http://tetworks.opengroup.org/tet/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://tetworks.opengroup.org/ 11HOMEPAGE= http://tetworks.opengroup.org/
12COMMENT= The Open Group test harness 12COMMENT= The Open Group test harness
13LICENSE= artistic 13LICENSE= artistic
14 14
@@ -18,35 +18,34 @@ CONFIG_SHELL= ${SH} @@ -18,35 +18,34 @@ CONFIG_SHELL= ${SH}
18CONFIGURE_ARGS+= -t inet 18CONFIGURE_ARGS+= -t inet
19BUILD_DIRS= src 19BUILD_DIRS= src
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= pax perl:run ksh:run 22USE_TOOLS+= pax perl:run ksh:run
23REPLACE_PERL= contrib/suite/src/common.pl contrib/NTperldemo/ts/tc1.pl 23REPLACE_PERL= contrib/suite/src/common.pl contrib/NTperldemo/ts/tc1.pl
24REPLACE_PERL+= contrib/NTperldemo/ts/tc2.pl contrib/NTperldemo/ts/tc3.pl 24REPLACE_PERL+= contrib/NTperldemo/ts/tc2.pl contrib/NTperldemo/ts/tc3.pl
25REPLACE_PERL+= contrib/tetreport/TetJournal.pl contrib/tetreport/TetReports.pl 25REPLACE_PERL+= contrib/tetreport/TetJournal.pl contrib/tetreport/TetReports.pl
26REPLACE_PERL+= contrib/tetreport/tetreport.pl contrib/templates/perl-api.pl 26REPLACE_PERL+= contrib/tetreport/tetreport.pl contrib/templates/perl-api.pl
27REPLACE_PERL+= src/perl/api.pl 27REPLACE_PERL+= src/perl/api.pl
28REPLACE_KSH+= src/scripts/tet_start.sh 28REPLACE_KSH+= src/scripts/tet_start.sh
29MAKE_FILE= makefile 29MAKE_FILE= makefile
30 30
 31INSTALLATION_DIRS= tet3/bin tet3/lib
 32
31.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
32 34
33PLIST_VARS+= java 35PLIST_VARS+= java
34.if ${OPSYS} == "SunOS" 36.if ${OPSYS} == "SunOS"
35PLIST.java= yes 37PLIST.java= yes
36.endif 38.endif
37 39
38post-install: 40post-install:
39 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3 
40 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/bin 
41 cd ${WRKSRC}/bin && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/bin 41 cd ${WRKSRC}/bin && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/bin
42 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/lib 
43 cd ${WRKSRC}/lib && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/lib 42 cd ${WRKSRC}/lib && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/lib
44 43
45PTHREAD_OPTS+= native # only native threads make sense 44PTHREAD_OPTS+= native # only native threads make sense
46.include "../../mk/pthread.buildlink3.mk" 45.include "../../mk/pthread.buildlink3.mk"
47 46
48.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" 47.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
49PKG_SKIP_REASON+= "Native threads are needed for this package" 48PKG_SKIP_REASON+= "Native threads are needed for this package"
50.endif 49.endif
51 50
52.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/devel/tet3/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tet3/distinfo 2015/11/03 03:29:35 1.9
+++ pkgsrc/devel/tet3/distinfo 2016/03/15 12:15:26 1.10
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: distinfo,v 1.9 2015/11/03 03:29:35 agc Exp $ 1$NetBSD: distinfo,v 1.10 2016/03/15 12:15:26 wiz Exp $
2 2
3SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73 3SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73
4RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d 4RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d
5SHA512 (tet3.7-unsup.src.tgz) = c3f192a907e521d628f47c5d676f8cb3681f1fae2bed2d458b2d65d05525a6302e024bc90e99bc8ae1b5abade71ca07fb24a3b0dd914d2af8487c54041ca822f 5SHA512 (tet3.7-unsup.src.tgz) = c3f192a907e521d628f47c5d676f8cb3681f1fae2bed2d458b2d65d05525a6302e024bc90e99bc8ae1b5abade71ca07fb24a3b0dd914d2af8487c54041ca822f
6Size (tet3.7-unsup.src.tgz) = 953406 bytes 6Size (tet3.7-unsup.src.tgz) = 953406 bytes
7SHA1 (patch-aa) = 6b67991e3deed46ef7a3451e3ff94dee286d1d65 7SHA1 (patch-aa) = 37c1da834d026be3b6b79afe40b257fd4104d108
8SHA1 (patch-ab) = a18d1928e58ea8e5eef7fd797641f802e99cc02d 8SHA1 (patch-ab) = 8a4046b5fa63ef25995506f22d7e948c33695b73
9SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb 9SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb
10SHA1 (patch-ad) = ba0bb07f74a70691cf62d72502a3d608e522e2c0 10SHA1 (patch-ad) = 3541d02db440e29d4c9ea36bd988499be3e2c082
11SHA1 (patch-ae) = adb90e2ce7ad8429a701718ec4a79ddb2f93d509 11SHA1 (patch-ai) = 3039a9a1bdaa7f3e00d359cd0d05fd2bbb701f3d
12SHA1 (patch-ah) = aaee593e861966595ef71ab59b535372facc1115 
13SHA1 (patch-ai) = 256d4903ec91f4a4ffe147accb5d7e80740e6c46 
14SHA1 (patch-aj) = 98738ce53f8746e478475f6ad483db2af16ee6b8 12SHA1 (patch-aj) = 98738ce53f8746e478475f6ad483db2af16ee6b8
15SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a 13SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a
16SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5 14SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5
17SHA1 (patch-src_scripts_tet_start.sh) = 3b3ae5806c88b3f795a51ed1b057df4134f1961c 15SHA1 (patch-src_scripts_tet_start.sh) = 7c1c464d69a6ba346ad0c81f452426c44b008e56

cvs diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/tet3/patches/patch-aa 2006/06/08 16:57:59 1.2
+++ pkgsrc/devel/tet3/patches/patch-aa 2016/03/15 12:15:26 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.2 2006/06/08 16:57:59 rillig Exp $ 1$NetBSD: patch-aa,v 1.3 2016/03/15 12:15:26 wiz Exp $
 2
 3Add build framework for NetBSD.
2 4
3--- /dev/null 2003-06-16 16:02:04.000000000 +0100 5--- /dev/null 2003-06-16 16:02:04.000000000 +0100
4+++ contrib/configtool/defines/netbsd.mk 2003-06-16 16:01:30.000000000 +0100 6+++ contrib/configtool/defines/netbsd.mk 2003-06-16 16:01:30.000000000 +0100
5@@ -0,0 +1,144 @@ 7@@ -0,0 +1,144 @@
6+# 8+#
7+# SCCS: @(#)netbsd.mk 1.1 (2003/06/16)  9+# SCCS: @(#)netbsd.mk 1.1 (2003/06/16)
8+# 10+#
9+# ************************************************************************ 11+# ************************************************************************
10+# 12+#
11+# SCCS: @(#)netbsd.mk 1.1 2003/06/16 TETware release 3.2 13+# SCCS: @(#)netbsd.mk 1.1 2003/06/16 TETware release 3.2
12+# NAME: netbsd.mk 14+# NAME: netbsd.mk
13+# PRODUCT: TETware 15+# PRODUCT: TETware
14+# AUTHOR: Alistair Crooks 16+# AUTHOR: Alistair Crooks

cvs diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/tet3/patches/patch-ad 2006/06/08 16:57:59 1.2
+++ pkgsrc/devel/tet3/patches/patch-ad 2016/03/15 12:15:26 1.3
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1$NetBSD: patch-ad,v 1.2 2006/06/08 16:57:59 rillig Exp $ 1$NetBSD: patch-ad,v 1.3 2016/03/15 12:15:26 wiz Exp $
2 
3Matt Thomas's patch 
4 2
5--- src/tet3/dtet2lib/notty.c 1999-09-04 15:47:17.000000000 +0100 3--- src/tet3/dtet2lib/notty.c 1999-09-04 15:47:17.000000000 +0100
6+++ src/tet3/dtet2lib/notty.c 2003-05-27 23:55:51.000000000 +0100 4+++ src/tet3/dtet2lib/notty.c 2003-05-27 23:55:51.000000000 +0100
7@@ -97,7 +97,7 @@ 5@@ -97,7 +97,7 @@
8 ** this for BSD systems where setpgrp() does not change the 6 ** this for BSD systems where setpgrp() does not change the
9 ** control terminal 7 ** control terminal
10 */ 8 */
11- if ((ttyfd = open("/dev/tty", O_RDONLY | O_NDELAY)) >= 0) { 9- if ((ttyfd = open("/dev/tty", O_RDONLY | O_NDELAY)) >= 0) {
12+ if ((ttyfd = open("/dev/tty", O_RDONLY | O_NONBLOCK)) >= 0) { 10+ if ((ttyfd = open("/dev/tty", O_RDONLY | O_NONBLOCK)) >= 0) {
13 (void) ioctl(ttyfd, TIOCNOTTY, 0); 11 (void) ioctl(ttyfd, TIOCNOTTY, 0);
14 (void) close(ttyfd); 12 (void) close(ttyfd);
15 } 13 }

cvs diff -r1.2 -r1.3 pkgsrc/devel/tet3/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/devel/tet3/patches/patch-ai 2006/06/08 16:57:59 1.2
+++ pkgsrc/devel/tet3/patches/patch-ai 2016/03/15 12:15:26 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ai,v 1.2 2006/06/08 16:57:59 rillig Exp $ 1$NetBSD: patch-ai,v 1.3 2016/03/15 12:15:26 wiz Exp $
 2
 3Add DragonFly support.
2 4
3--- src/helpers/GuessOS.orig 2006-01-09 15:31:00.000000000 +0000 5--- src/helpers/GuessOS.orig 2006-01-09 15:31:00.000000000 +0000
4+++ src/helpers/GuessOS 6+++ src/helpers/GuessOS
5@@ -182,6 +182,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ 7@@ -182,6 +182,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
6 echo "${MACHINE}-whatever-freebsd"; exit 0 8 echo "${MACHINE}-whatever-freebsd"; exit 0
7 ;; 9 ;;
8  10
9+ DragonFly:*) 11+ DragonFly:*)
10+ echo "${MACHINE}-whatever-dragonfly"; exit 0 12+ echo "${MACHINE}-whatever-dragonfly"; exit 0
11+ ;; 13+ ;;
12+ 14+
13 NetBSD:*:*:*486*) 15 NetBSD:*:*:*486*)
14 echo "i486-whatever-netbsd"; exit 0 16 echo "i486-whatever-netbsd"; exit 0

cvs diff -r1.3 -r1.4 pkgsrc/devel/tet3/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/tet3/patches/patch-ab 2006/06/08 16:57:59 1.3
+++ pkgsrc/devel/tet3/patches/patch-ab 2016/03/15 12:15:26 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.3 2006/06/08 16:57:59 rillig Exp $ 1$NetBSD: patch-ab,v 1.4 2016/03/15 12:15:26 wiz Exp $
 2
 3Support DragonFly and NetBSD.
2 4
3--- configure.orig 2000-03-07 02:12:40.000000000 +0000 5--- configure.orig 2000-03-07 02:12:40.000000000 +0000
4+++ configure 6+++ configure
5@@ -227,9 +227,12 @@ CRAY*) 7@@ -227,9 +227,12 @@ CRAY*)
6 *-sgi-irix*) 8 *-sgi-irix*)
7 fname=irix.mk 9 fname=irix.mk
8 ;; 10 ;;
9-*-freebsd) 11-*-freebsd)
10+*-freebsd | *-dragonfly*) 12+*-freebsd | *-dragonfly*)
11 fname=freebsd.mk 13 fname=freebsd.mk
12 ;; 14 ;;
13+*-netbsd) 15+*-netbsd)
14+ fname=netbsd.mk 16+ fname=netbsd.mk

File Deleted: pkgsrc/devel/tet3/patches/Attic/patch-ae

File Deleted: pkgsrc/devel/tet3/patches/Attic/patch-ah

cvs diff -r1.1 -r1.2 pkgsrc/devel/tet3/patches/patch-src_scripts_tet_start.sh (expand / switch to unified diff)

--- pkgsrc/devel/tet3/patches/patch-src_scripts_tet_start.sh 2011/12/11 11:57:09 1.1
+++ pkgsrc/devel/tet3/patches/patch-src_scripts_tet_start.sh 2016/03/15 12:15:26 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-src_scripts_tet_start.sh,v 1.1 2011/12/11 11:57:09 marino Exp $ 1$NetBSD: patch-src_scripts_tet_start.sh,v 1.2 2016/03/15 12:15:26 wiz Exp $
 2
 3Fix shebang.
2 4
3--- src/scripts/tet_start.sh.orig 2011-12-11 11:02:59.580983000 +0000 5--- src/scripts/tet_start.sh.orig 2011-12-11 11:02:59.580983000 +0000
4+++ src/scripts/tet_start.sh 6+++ src/scripts/tet_start.sh
5@@ -1,9 +1,4 @@ 7@@ -1,9 +1,4 @@
6-# -START-UNIX-ONLY- 8-# -START-UNIX-ONLY-
7 #!/bin/ksh 9 #!/bin/ksh
8-# -END-UNIX-ONLY- 10-# -END-UNIX-ONLY-
9-# -START-WIN32-ONLY- 11-# -START-WIN32-ONLY-
10-: use the MKS shell 12-: use the MKS shell
11-# -END-WIN32-ONLY- 13-# -END-WIN32-ONLY-
12 # 14 #
13 # SCCS: @(#)tet_start.sh 1.1 (98/08/28) 15 # SCCS: @(#)tet_start.sh 1.1 (98/08/28)
14 # 16 #