Remove two weird patches. Add comments to most others.diff -r1.26 -r1.27 pkgsrc/devel/tet3/Makefile
(wiz)
@@ -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 | |||
3 | DISTNAME= tet3.7-unsup.src | 3 | DISTNAME= tet3.7-unsup.src | |
4 | PKGNAME= tet3-3.7 | 4 | PKGNAME= tet3-3.7 | |
5 | PKGREVISION= 6 | 5 | PKGREVISION= 6 | |
6 | CATEGORIES= devel | 6 | CATEGORIES= devel | |
7 | MASTER_SITES= http://tetworks.opengroup.org/tet/ | 7 | MASTER_SITES= http://tetworks.opengroup.org/tet/ | |
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://tetworks.opengroup.org/ | 11 | HOMEPAGE= http://tetworks.opengroup.org/ | |
12 | COMMENT= The Open Group test harness | 12 | COMMENT= The Open Group test harness | |
13 | LICENSE= artistic | 13 | LICENSE= artistic | |
14 | 14 | |||
@@ -18,35 +18,34 @@ CONFIG_SHELL= ${SH} | @@ -18,35 +18,34 @@ CONFIG_SHELL= ${SH} | |||
18 | CONFIGURE_ARGS+= -t inet | 18 | CONFIGURE_ARGS+= -t inet | |
19 | BUILD_DIRS= src | 19 | BUILD_DIRS= src | |
20 | 20 | |||
21 | USE_LANGUAGES= c c++ | 21 | USE_LANGUAGES= c c++ | |
22 | USE_TOOLS+= pax perl:run ksh:run | 22 | USE_TOOLS+= pax perl:run ksh:run | |
23 | REPLACE_PERL= contrib/suite/src/common.pl contrib/NTperldemo/ts/tc1.pl | 23 | REPLACE_PERL= contrib/suite/src/common.pl contrib/NTperldemo/ts/tc1.pl | |
24 | REPLACE_PERL+= contrib/NTperldemo/ts/tc2.pl contrib/NTperldemo/ts/tc3.pl | 24 | REPLACE_PERL+= contrib/NTperldemo/ts/tc2.pl contrib/NTperldemo/ts/tc3.pl | |
25 | REPLACE_PERL+= contrib/tetreport/TetJournal.pl contrib/tetreport/TetReports.pl | 25 | REPLACE_PERL+= contrib/tetreport/TetJournal.pl contrib/tetreport/TetReports.pl | |
26 | REPLACE_PERL+= contrib/tetreport/tetreport.pl contrib/templates/perl-api.pl | 26 | REPLACE_PERL+= contrib/tetreport/tetreport.pl contrib/templates/perl-api.pl | |
27 | REPLACE_PERL+= src/perl/api.pl | 27 | REPLACE_PERL+= src/perl/api.pl | |
28 | REPLACE_KSH+= src/scripts/tet_start.sh | 28 | REPLACE_KSH+= src/scripts/tet_start.sh | |
29 | MAKE_FILE= makefile | 29 | MAKE_FILE= makefile | |
30 | 30 | |||
31 | INSTALLATION_DIRS= tet3/bin tet3/lib | |||
32 | ||||
31 | .include "../../mk/bsd.prefs.mk" | 33 | .include "../../mk/bsd.prefs.mk" | |
32 | 34 | |||
33 | PLIST_VARS+= java | 35 | PLIST_VARS+= java | |
34 | .if ${OPSYS} == "SunOS" | 36 | .if ${OPSYS} == "SunOS" | |
35 | PLIST.java= yes | 37 | PLIST.java= yes | |
36 | .endif | 38 | .endif | |
37 | 39 | |||
38 | post-install: | 40 | post-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 | |||
45 | PTHREAD_OPTS+= native # only native threads make sense | 44 | PTHREAD_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" | |
49 | PKG_SKIP_REASON+= "Native threads are needed for this package" | 48 | PKG_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" |
@@ -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 | |||
3 | SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73 | 3 | SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73 | |
4 | RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d | 4 | RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d | |
5 | SHA512 (tet3.7-unsup.src.tgz) = c3f192a907e521d628f47c5d676f8cb3681f1fae2bed2d458b2d65d05525a6302e024bc90e99bc8ae1b5abade71ca07fb24a3b0dd914d2af8487c54041ca822f | 5 | SHA512 (tet3.7-unsup.src.tgz) = c3f192a907e521d628f47c5d676f8cb3681f1fae2bed2d458b2d65d05525a6302e024bc90e99bc8ae1b5abade71ca07fb24a3b0dd914d2af8487c54041ca822f | |
6 | Size (tet3.7-unsup.src.tgz) = 953406 bytes | 6 | Size (tet3.7-unsup.src.tgz) = 953406 bytes | |
7 | SHA1 (patch-aa) = 6b67991e3deed46ef7a3451e3ff94dee286d1d65 | 7 | SHA1 (patch-aa) = 37c1da834d026be3b6b79afe40b257fd4104d108 | |
8 | SHA1 (patch-ab) = a18d1928e58ea8e5eef7fd797641f802e99cc02d | 8 | SHA1 (patch-ab) = 8a4046b5fa63ef25995506f22d7e948c33695b73 | |
9 | SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb | 9 | SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb | |
10 | SHA1 (patch-ad) = ba0bb07f74a70691cf62d72502a3d608e522e2c0 | 10 | SHA1 (patch-ad) = 3541d02db440e29d4c9ea36bd988499be3e2c082 | |
11 | SHA1 (patch-ae) = adb90e2ce7ad8429a701718ec4a79ddb2f93d509 | 11 | SHA1 (patch-ai) = 3039a9a1bdaa7f3e00d359cd0d05fd2bbb701f3d | |
12 | SHA1 (patch-ah) = aaee593e861966595ef71ab59b535372facc1115 | |||
13 | SHA1 (patch-ai) = 256d4903ec91f4a4ffe147accb5d7e80740e6c46 | |||
14 | SHA1 (patch-aj) = 98738ce53f8746e478475f6ad483db2af16ee6b8 | 12 | SHA1 (patch-aj) = 98738ce53f8746e478475f6ad483db2af16ee6b8 | |
15 | SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a | 13 | SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a | |
16 | SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5 | 14 | SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5 | |
17 | SHA1 (patch-src_scripts_tet_start.sh) = 3b3ae5806c88b3f795a51ed1b057df4134f1961c | 15 | SHA1 (patch-src_scripts_tet_start.sh) = 7c1c464d69a6ba346ad0c81f452426c44b008e56 |
@@ -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 | ||||
3 | Add 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 |
@@ -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 | ||||
3 | Matt 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 | } |
@@ -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 | ||||
3 | Add 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 |
@@ -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 | ||||
3 | Support 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 |
@@ -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 | ||||
3 | Fix 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 | # |