diff --git a/benchmarks/blogbench/Makefile b/benchmarks/blogbench/Makefile index c8add8805c9..38df5e6c14b 100644 --- a/benchmarks/blogbench/Makefile +++ b/benchmarks/blogbench/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 16:57:46 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/10 23:04:44 espie Exp $ COMMENT= filesystem benchmark @@ -9,9 +9,6 @@ HOMEPAGE= http://www.pureftpd.org/project/blogbench # ISC PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://download.pureftpd.org/pub/blogbench/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/blogbench/ diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index 5fe94753cd0..1df9acb6f6c 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2012/08/19 18:55:08 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2013/03/10 23:04:44 espie Exp $ COMMENT= enhanced performance test of filesystem I/O @@ -12,9 +12,6 @@ HOMEPAGE= http://www.coker.com.au/bonnie++/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c m pthread stdc++ @@ -22,7 +19,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE= autoconf dest AUTOCONF_VERSION= 2.61 -NO_REGRESS= Yes +NO_TEST= Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonnie++ diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index 7d62613423b..83395d2c0a9 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2012/03/29 13:38:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2013/03/10 23:04:44 espie Exp $ COMMENT= performance test of filesystem I/O @@ -14,12 +14,9 @@ MAINTAINER= Niklas Hallqvist # License: BSD PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes SEPARATE_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes USE_GROFF = Yes do-build: diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile index 6cd31e130c4..732817f59e9 100644 --- a/benchmarks/bytebench/Makefile +++ b/benchmarks/bytebench/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2011/05/22 16:25:38 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2013/03/10 23:04:44 espie Exp $ COMMENT= BYTE magazine benchmark suite DISTNAME= bytebench-3.1 @@ -7,7 +7,6 @@ CATEGORIES= benchmarks # License: NONE PERMIT_PACKAGE_CDROM= no license PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_CDROM= no license PERMIT_DISTFILES_FTP= no license MASTER_SITES= ftp://ftp.42.org/pub/OLD/b/ \ @@ -16,7 +15,7 @@ EXTRACT_SUFX= .tar.Z MAKE_ENV= CC="${CC}" -NO_REGRESS= Yes +NO_TEST= Yes do-install: -${INSTALL_DATA_DIR} ${PREFIX}/lib/bytebench diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile index 78f13c2be60..388da32d680 100644 --- a/benchmarks/httperf/Makefile +++ b/benchmarks/httperf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/15 00:22:49 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/10 23:04:44 espie Exp $ COMMENT = web server performance testing tool @@ -11,9 +11,6 @@ MAINTAINER = Scott Vokes # GPLv2 PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes MASTER_SITES = http://httperf.googlecode.com/files/ diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index c32a7da161a..4165fb6c80c 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2010/10/18 16:57:46 espie Exp $ +# $OpenBSD: Makefile,v 1.44 2013/03/10 23:04:44 espie Exp $ # Uses pthreads COMMENT= performance test of sequential file I/O @@ -13,13 +13,12 @@ HOMEPAGE= http://www.iozone.org/ PERMIT_PACKAGE_CDROM= incomplete/bad license PERMIT_PACKAGE_FTP= incomplete/bad license -PERMIT_DISTFILES_CDROM= incomplete/bad license PERMIT_DISTFILES_FTP= incomplete/bad license WANTLIB= c pthread MAKE_ENV= CC="${CC}" -NO_REGRESS= Yes +NO_TEST= Yes USE_GROFF = Yes ALL_TARGET= openbsd-threads diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile index c979942969a..a6ae5ab9550 100644 --- a/benchmarks/lmbench/Makefile +++ b/benchmarks/lmbench/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/10/18 16:57:46 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2013/03/10 23:04:44 espie Exp $ COMMENT= system performance measurement DISTNAME= lmbench @@ -7,9 +7,6 @@ CATEGORIES= benchmarks # License: GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c # this is the new home site @@ -27,7 +24,7 @@ MAN8= lmbench.8 lat_proc.8 lat_mmap.8 lat_ctx.8 lat_syscall.8 lat_pipe.8 \ lat_mem_rd.8 bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 \ bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 mhz.8 lmdd.8 -NO_REGRESS= Yes +NO_TEST= Yes test: build @cd ${WRKSRC}; make results diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile index 3a69fe3f631..41444fb5bc8 100644 --- a/benchmarks/netperf/Makefile +++ b/benchmarks/netperf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2011/05/22 18:04:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.30 2013/03/10 23:04:44 espie Exp $ COMMENT= Network performance benchmark @@ -16,15 +16,13 @@ HOMEPAGE= http://www.netperf.org/netperf/NetperfPage.html PERMIT_PACKAGE_CDROM= No PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= No -PERMIT_DISTFILES_FTP= Yes WANTLIB= c m MAKE_FILE= makefile MAKE_FLAGS+= CC="${CC}" CFLAGS='${CFLAGS} -DDEBUG_LOG_FILE="\"/tmp/netperf.debug\"" -DUSE_LOOPER -DDO_DNS' USE_GROFF = Yes -NO_REGRESS= Yes +NO_TEST= Yes SHAREDIR= ${PREFIX}/share/netperf SCRIPTS= arr_script snapshot_script \ diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile index 29ee369bc0b..429e7dc1962 100644 --- a/benchmarks/netpipe/Makefile +++ b/benchmarks/netpipe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2012/08/18 12:41:37 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.26 2013/03/10 23:04:44 espie Exp $ COMMENT= self-scaling network benchmark @@ -10,9 +10,6 @@ CATEGORIES= benchmarks net HOMEPAGE= http://www.scl.ameslab.gov/netpipe/ PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c MASTER_SITES= ${HOMEPAGE}/code/ @@ -21,7 +18,7 @@ MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_GETRUSAGE" ALL_TARGET= NPtcp USE_GROFF = Yes -NO_REGRESS= Yes +NO_TEST= Yes do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp ${PREFIX}/bin diff --git a/benchmarks/netstrain/Makefile b/benchmarks/netstrain/Makefile index 7815e490097..080a6ce9268 100644 --- a/benchmarks/netstrain/Makefile +++ b/benchmarks/netstrain/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/15 21:30:27 simon Exp $ +# $OpenBSD: Makefile,v 1.5 2013/03/10 23:04:44 espie Exp $ COMMENT= tool to measure TCP throughput DISTNAME= netstrain-3.0 @@ -8,13 +8,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netstrain/} HOMEPAGE= http://netstrain.sourceforge.net/ # ISC-like -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes WANTLIB= c -NO_REGRESS= Yes +NO_TEST= Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netstrain diff --git a/benchmarks/pear-Benchmark/Makefile b/benchmarks/pear-Benchmark/Makefile index de5ce0fab6d..f69324faf5e 100644 --- a/benchmarks/pear-Benchmark/Makefile +++ b/benchmarks/pear-Benchmark/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2011/09/16 08:48:01 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2013/03/10 23:04:44 espie Exp $ COMMENT= framework to benchmark PHP scripts or function calls @@ -10,11 +10,8 @@ MODULES= www/pear # BSD PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -do-regress: +do-test: @cd ${WRKSRC}/doc && ${PEAR_PHPBIN} ./timer_example.php .include diff --git a/benchmarks/randread/Makefile b/benchmarks/randread/Makefile index b9e5ae52b51..a05826deecd 100644 --- a/benchmarks/randread/Makefile +++ b/benchmarks/randread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2012/04/02 13:06:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/10 23:04:44 espie Exp $ COMMENT= help benchmark random read performance @@ -11,13 +11,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=randread/} # Public Domain PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c -NO_REGRESS= Yes +NO_TEST= Yes do-build: cd ${WRKSRC} && \ diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile index 6c8d709f525..5ee91d7e7ce 100644 --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2012/08/19 18:55:08 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2013/03/10 23:04:44 espie Exp $ COMMENT = multi-threaded HTTP benchmark and regression tester @@ -11,9 +11,6 @@ HOMEPAGE = http://www.joedog.org/index/siege-home # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes WANTLIB += c crypto pthread ssl diff --git a/benchmarks/smtp-benchmark/Makefile b/benchmarks/smtp-benchmark/Makefile index 31b76a5f3b1..ea1caaefa0a 100644 --- a/benchmarks/smtp-benchmark/Makefile +++ b/benchmarks/smtp-benchmark/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2011/06/23 22:50:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.12 2013/03/10 23:04:44 espie Exp $ COMMENT= SMTP benchmark to measure throughput of an MTA @@ -13,9 +13,6 @@ SHARED_ONLY= Yes # BSD PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c pthread MASTER_SITES= ${HOMEPAGE} @@ -23,6 +20,6 @@ EXTRACT_SUFX= .tgz FAKE_FLAGS= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man -NO_REGRESS= Yes +NO_TEST= Yes .include diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile index 245af853a40..df7a54380b3 100644 --- a/benchmarks/sysbench/Makefile +++ b/benchmarks/sysbench/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2012/11/23 10:59:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2013/03/10 23:04:44 espie Exp $ COMMENT = modular, cross-platform and multi-threaded benchmark tool DISTNAME = sysbench-0.4.8 @@ -9,17 +9,14 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sysbench/} HOMEPAGE = http://sysbench.sourceforge.net/ # GPL -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes WANTLIB = m c pthread MAINTAINER = Jung Lee BUILD_DEPENDS = textproc/docbook-xsl -NO_REGRESS = Yes +NO_TEST = Yes CONFIGURE_STYLE = gnu CONFIGURE_ENV = PREFIX=${PREFIX} diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile index 4bd738a6ff0..d946f1275bd 100644 --- a/benchmarks/tcpblast/Makefile +++ b/benchmarks/tcpblast/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2008/01/04 17:48:33 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2013/03/10 23:04:44 espie Exp $ COMMENT= measure the throughput of a TCP connection @@ -8,9 +8,6 @@ DISTFILES= # PD PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c FAKE_FLAGS= BINDIR="${PREFIX}/bin" diff --git a/benchmarks/tsung/Makefile b/benchmarks/tsung/Makefile index 29c83833011..2bff53bd7d5 100644 --- a/benchmarks/tsung/Makefile +++ b/benchmarks/tsung/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2012/08/24 09:41:41 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2013/03/10 23:04:44 espie Exp $ COMMENT= multi-protocol distributed load testing tool @@ -11,9 +11,6 @@ HOMEPAGE= http://www.process-one.net/en/tsung/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://tsung.erlang-projects.org/dist/ @@ -33,7 +30,7 @@ CONFIGURE_ENV= HOME=/tmp MODPY_ADJ_FILES= src/tsung-plotter/tsplot.py.in -REGRESS_TARGET= test +TEST_TARGET= test SUBST_VARS+= V diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile index 2960bbd71a3..d6192b23f40 100644 --- a/benchmarks/ubench/Makefile +++ b/benchmarks/ubench/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2012/10/15 15:06:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2013/03/10 23:04:44 espie Exp $ COMMENT= Unix benchmark utility @@ -11,9 +11,6 @@ MASTER_SITES= http://www.phystech.com/ftp/ # GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c m @@ -23,7 +20,7 @@ ALL_TARGET= default MAKE_FLAGS= CFLAGS="${CFLAGS}" USE_GROFF = Yes -NO_REGRESS= Yes +NO_TEST= Yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ubench ${PREFIX}/bin diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile index d84a46574a5..0e580197d3e 100644 --- a/benchmarks/xengine/Makefile +++ b/benchmarks/xengine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2010/11/03 07:20:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.33 2013/03/10 23:04:44 espie Exp $ COMMENT= reciprocating engine for X11 PKGNAME= xengine-1.0.1 @@ -12,8 +12,6 @@ MAINTAINER= Paul Janzen PERMIT_PACKAGE_CDROM= no fee PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= no fee -PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m @@ -25,7 +23,7 @@ WRKDIST= ${WRKDIR} CONFIGURE_STYLE= imake USE_GROFF = Yes -NO_REGRESS= Yes +NO_TEST= Yes do-distpatch: @cd $(WRKSRC) && ${PATCH} ${PATCH_DIST_ARGS} < xengine.patch1 diff --git a/biology/AcePerl/Makefile b/biology/AcePerl/Makefile index 56d47aac268..9eb6308e77f 100644 --- a/biology/AcePerl/Makefile +++ b/biology/AcePerl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2012/10/23 09:44:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2013/03/10 23:04:44 espie Exp $ COMMENT= perl interface to the ACEDB database @@ -12,9 +12,6 @@ FLAVOR?= # perl licence PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Ace/} diff --git a/biology/bioperl/Makefile b/biology/bioperl/Makefile index 545c5ac82f0..639e6ea07a4 100644 --- a/biology/bioperl/Makefile +++ b/biology/bioperl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2012/10/23 09:44:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2013/03/10 23:04:44 espie Exp $ COMMENT= perl tools for bioinformatics @@ -11,9 +11,6 @@ HOMEPAGE= http://bioperl.org/ # perl PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/DIST/ @@ -57,7 +54,7 @@ RUN_DEPENDS= biology/AcePerl \ www/p5-URI \ www/p5-libwww -REGRESS_DEPENDS=${RUN_DEPENDS} +TEST_DEPENDS=${RUN_DEPENDS} # Optional (not ported) dependencies: # Postscript-TextBlock diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index f190aaf4f3d..a56185fa987 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2011/11/01 16:05:26 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:44 espie Exp $ COMMENT= European Molecular Biology Open Software Suite @@ -14,10 +14,7 @@ CATEGORIES= biology HOMEPAGE= http://emboss.sourceforge.net/ # GPL v2 -PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes MASTER_SITES= ftp://emboss.open-bio.org/pub/EMBOSS/ diff --git a/biology/nutdb/Makefile b/biology/nutdb/Makefile index 98fc317dac6..f9f037a9345 100644 --- a/biology/nutdb/Makefile +++ b/biology/nutdb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2011/11/28 10:18:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.30 2013/03/10 23:04:44 espie Exp $ COMMENT= record and analyze your meals for nutrient composition @@ -11,15 +11,12 @@ HOMEPAGE= http://nut.sourceforge.net/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB += X11 Xau Xdmcp Xext c fltk m pthread stdc++ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nut/} -NO_REGRESS= Yes +NO_TEST= Yes LIB_DEPENDS= x11/fltk diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile index c5d43980134..cdb02f352d5 100644 --- a/biology/p5-Bio-ASN1-EntrezGene/Makefile +++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2011/04/14 21:21:56 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:44 espie Exp $ COMMENT = regular expression-based parser for NCBI Entrez Gene @@ -11,9 +11,6 @@ CATEGORIES = biology # perl PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes MODULES = cpan MODCPAN_EXAMPLES= Yes diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile index e7fc1083d54..b1562695fcc 100644 --- a/biology/py-biopython/Makefile +++ b/biology/py-biopython/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2011/11/01 16:05:26 jasper Exp $ +# $OpenBSD: Makefile,v 1.21 2013/03/10 23:04:44 espie Exp $ SHARED_ONLY= Yes COMMENT= Python tools for computational molecular biology @@ -14,9 +14,6 @@ MAINTAINER= Will Maier # BSD-like PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}DIST/ @@ -28,7 +25,7 @@ BUILD_DEPENDS= devel/swig \ math/py-numpy RUN_DEPENDS= math/py-numpy \ print/py-reportlab/reportlab -REGRESS_DEPENDS=${RUN_DEPENDS} +TEST_DEPENDS= ${RUN_DEPENDS} CFLAGS+= -fPIC @@ -39,7 +36,7 @@ post-install: cd ${WRKSRC}/Doc/examples; tar cf - * | \ tar xf - -C ${PREFIX}/share/examples/py-biopython -do-regress: fake +do-test: fake @cd ${WRKSRC}/Tests && \ PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \ ${MODPY_BIN} ./run_tests.py diff --git a/books/AsteriskGuide/Makefile b/books/AsteriskGuide/Makefile index 5f1a5c8f502..9ae7f10f2f6 100644 --- a/books/AsteriskGuide/Makefile +++ b/books/AsteriskGuide/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/08/26 13:30:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.3 2013/03/10 23:04:44 espie Exp $ PKG_ARCH= * @@ -18,15 +18,12 @@ MAINTAINER= Diego Casati # CC-Attribution-NonCommercial-NoDerivs # see page vii of the PDF PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://spacehopper.org/mirrors/ \ ${HOMEPAGE}pdf/ NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/AsteriskGuide diff --git a/books/AsteriskTFOT/Makefile b/books/AsteriskTFOT/Makefile index 751a198e1ef..ce2e8b56137 100644 --- a/books/AsteriskTFOT/Makefile +++ b/books/AsteriskTFOT/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2012/10/18 21:23:51 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/10 23:04:44 espie Exp $ PKG_ARCH= * @@ -18,9 +18,6 @@ MAINTAINER= Ian Darwin # Creative Commons Copyright, see page xi of the PDF PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://downloads.oreilly.com/books/ @@ -34,6 +31,6 @@ do-install: ${INSTALL_DATA_DIR} ${INSTALL_LOC} ${INSTALL_DATA} ${WRKDIST}/${DISTNAME}.pdf ${INSTALL_LOC}/${PKGNAME}.pdf -NO_REGRESS= Yes +NO_TEST= Yes .include diff --git a/books/JLS/Makefile b/books/JLS/Makefile index 292cb7abfdf..a230feeb4a5 100644 --- a/books/JLS/Makefile +++ b/books/JLS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/03/21 16:12:01 ian Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/10 23:04:44 espie Exp $ COMMENT= Sun's official Java Language Specification @@ -16,7 +16,6 @@ MAINTAINER= Ian Darwin # http://java.sun.com/docs/books/jls/third_edition/html/jcopyright.html PERMIT_PACKAGE_CDROM= Copyright PERMIT_PACKAGE_FTP= Copyright -PERMIT_DISTFILES_CDROM= Copyright PERMIT_DISTFILES_FTP= Copyright MASTER_SITES= http://java.sun.com/docs/books/jls/download/ @@ -24,7 +23,7 @@ MASTER_SITES= http://java.sun.com/docs/books/jls/download/ EXTRACT_ONLY= NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * INSTALL_LOC= ${PREFIX}/share/doc/java diff --git a/books/JVMS/Makefile b/books/JVMS/Makefile index 1c28d72c596..f28f5fe3f13 100644 --- a/books/JVMS/Makefile +++ b/books/JVMS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2011/10/21 16:23:45 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2013/03/10 23:04:44 espie Exp $ COMMENT = Sun's official Java VM Specification, 2nd Ed. @@ -13,13 +13,12 @@ HOMEPAGE = http://java.sun.com/docs/books/jvms/ # http://java.sun.com/docs/books/vmspec/2nd-edition/html/Copyright.doc.html PERMIT_PACKAGE_CDROM = Copyright PERMIT_PACKAGE_FTP = Copyright -PERMIT_DISTFILES_CDROM = Copyright PERMIT_DISTFILES_FTP = Copyright MASTER_SITES = ${HOMEPAGE}download/ NO_BUILD = Yes -NO_REGRESS = Yes +NO_TEST = Yes PKG_ARCH = * INSTALL_LOC = ${PREFIX}/share/doc/jvm diff --git a/books/autobook/Makefile b/books/autobook/Makefile index 6996abb583d..ae37b0deeba 100644 --- a/books/autobook/Makefile +++ b/books/autobook/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/15 12:46:18 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2013/03/10 23:04:44 espie Exp $ COMMENT= documentation for autoconf, automake, libtool @@ -10,18 +10,14 @@ CATEGORIES= books devel MAINTAINER= Marc Espie # Open Publication License - -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes MASTER_SITES= ${HOMEPAGE} HOMEPAGE= http://sourceware.org/autobook/ EXTRACT_ONLY= NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * DOCDIR= ${PREFIX}/share/doc diff --git a/books/clisp-hyperspec/Makefile b/books/clisp-hyperspec/Makefile index 3b504be087d..17d17d76848 100644 --- a/books/clisp-hyperspec/Makefile +++ b/books/clisp-hyperspec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/11/26 21:54:45 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2013/03/10 23:04:44 espie Exp $ COMMENT= Common Lisp reference @@ -8,13 +8,11 @@ CATEGORIES= books lang PERMIT_PACKAGE_CDROM= Commercial redistribution prohibited PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Commercial redistribution prohibited -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ftp://ftp.lispworks.com/pub/software_tools/reference/ NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * DOC= ${PREFIX}/share/doc/clisp-hyperspec diff --git a/books/cvs-guide/Makefile b/books/cvs-guide/Makefile index 67c5bdcf22f..51f933de7a8 100644 --- a/books/cvs-guide/Makefile +++ b/books/cvs-guide/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/09/15 21:34:35 simon Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/10 23:04:44 espie Exp $ COMMENT= the definitive guide to CVS @@ -13,14 +13,11 @@ MAINTAINER= Anil Madhavapeddy # GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WRKDIST= ${WRKDIR}/cvsbook-${V} NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * INSTALL_LOC= ${PREFIX}/share/doc/cvs-guide diff --git a/books/diveintopython/Makefile b/books/diveintopython/Makefile index 21e5d4f88f3..b1b128a393b 100644 --- a/books/diveintopython/Makefile +++ b/books/diveintopython/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2012/10/23 09:44:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:44 espie Exp $ COMMENT= book about Python for experienced programmers @@ -14,10 +14,7 @@ HOMEPAGE= http://diveintopython.org/ MAINTAINER= Aleksander Piotrowski # FDL -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes MASTER_SITES= ${HOMEPAGE}/download/ EXTRACT_SUFX= .zip @@ -28,7 +25,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAMEPRINT}${EXTRACT_SUFX} NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * DOC= ${PREFIX}/share/doc/diveintopython diff --git a/books/docbook-guide/Makefile b/books/docbook-guide/Makefile index 6fd14a1bd7b..86734db78eb 100644 --- a/books/docbook-guide/Makefile +++ b/books/docbook-guide/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2009/08/24 15:28:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2013/03/10 23:04:44 espie Exp $ COMMENT= the definite guide to DocBook @@ -15,14 +15,11 @@ MAINTAINER= Anil Madhavapeddy # GNU Free Documentation License PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WRKDIST= ${WRKDIR}/tdg/en NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * INSTALL_LOC= ${PREFIX}/share/doc/docbook-guide diff --git a/books/grokking-the-gimp/Makefile b/books/grokking-the-gimp/Makefile index 980896cc401..b296cd8734e 100644 --- a/books/grokking-the-gimp/Makefile +++ b/books/grokking-the-gimp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/07/24 06:29:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2013/03/10 23:04:44 espie Exp $ COMMENT=book about gimp CATEGORIES=books graphics @@ -9,10 +9,7 @@ PKGNAME=grokking-the-gimp-${VERSION} REVISION=1 # Open publication license -PERMIT_DISTFILES_CDROM=Yes -PERMIT_DISTFILES_FTP=Yes PERMIT_PACKAGE_CDROM=Yes -PERMIT_PACKAGE_FTP=Yes HOMEPAGE= http://gimp-savvy.com/ MASTER_SITES=${HOMEPAGE}BOOK/TarDist/ diff --git a/books/haskell-report/Makefile b/books/haskell-report/Makefile index 3e099129e98..3dc3fda13f8 100644 --- a/books/haskell-report/Makefile +++ b/books/haskell-report/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2011/04/10 06:52:41 kili Exp $ +# $OpenBSD: Makefile,v 1.5 2013/03/10 23:04:44 espie Exp $ COMMENT = language and library specification for Haskell @@ -15,16 +15,13 @@ MAINTAINER = Matthias Kilian # Copy and distribute for any purpose, but only completely. # When modified, mark as such and don't call the thing Haskell. PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes MASTER_SITES = http://haskell.org/definition/ PKG_ARCH = * NO_BUILD = Yes -NO_REGRESS = Yes +NO_TEST = Yes WRKSRC = ${WRKDIR}/haskell$V diff --git a/books/mason-book/Makefile b/books/mason-book/Makefile index da2de8e7500..37d8a069695 100644 --- a/books/mason-book/Makefile +++ b/books/mason-book/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2012/10/23 09:44:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:44 espie Exp $ COMMENT= book on embedding Perl in HTML with Mason CATEGORIES= books @@ -20,14 +20,11 @@ BUILD_DEPENDS= www/p5-HTML-Parser \ www/p5-URI # Open Publication License -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes WRKDIST= ${WRKDIR} INSTALL_LOC= ${PREFIX}/share/doc/mason-book -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * # pod files order important for TOC generation diff --git a/books/svnbook/Makefile b/books/svnbook/Makefile index 40ec224d9c6..1e6cac2e956 100644 --- a/books/svnbook/Makefile +++ b/books/svnbook/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2012/04/06 20:39:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2013/03/10 23:04:44 espie Exp $ COMMENT = Version Control with Subversion @@ -11,10 +11,7 @@ CATEGORIES = books devel HOMEPAGE = http://svnbook.red-bean.com/ # Creative Commons Attribution License -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes # ${HOMEPAGE}/en/$V/svn-book-html-chunk.tar.bz2 appears to be auto-generated MASTER_SITES = http://spacehopper.org/mirrors/ @@ -24,7 +21,7 @@ EXTRACT_ONLY = BUILD_DEPENDS = archivers/bzip2 NO_BUILD = Yes -NO_REGRESS = Yes +NO_TEST = Yes PKG_ARCH = * DOCDIR = ${PREFIX}/share/doc diff --git a/books/thinking-forth/Makefile b/books/thinking-forth/Makefile index f221005a3cf..b1e84b36a87 100644 --- a/books/thinking-forth/Makefile +++ b/books/thinking-forth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/10/25 10:29:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2013/03/10 23:04:44 espie Exp $ COMMENT= philosophy of problem solving, applied to Forth @@ -11,16 +11,13 @@ HOMEPAGE= http://thinking-forth.sourceforge.net/ # Creative Commons license # attribute, non-commercial, share-alike PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=thinking-forth/} DISTFILES= ${DISTNAME}.pdf EXTRACT_ONLY= NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * do-install: diff --git a/books/vol3ol/Makefile b/books/vol3ol/Makefile index 3d72b3d7105..b6cafd1c07b 100644 --- a/books/vol3ol/Makefile +++ b/books/vol3ol/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2012/10/29 11:27:05 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/10 23:04:44 espie Exp $ COMMENT= O'Reilly Volume 3: Users Guide, Open Look @@ -14,16 +14,13 @@ MAINTAINER= Ian Darwin # Open Publication License PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ftp://ftp.ora.com/pub/openlook/ DISTFILES= ${DISTNAME}.pdf EXTRACT_ONLY= NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * INSTALL_LOC= ${PREFIX}/share/doc/oreilly-x diff --git a/books/vol6a/Makefile b/books/vol6a/Makefile index 3514e8206f2..2006bddc05b 100644 --- a/books/vol6a/Makefile +++ b/books/vol6a/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2012/10/29 11:29:51 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2013/03/10 23:04:44 espie Exp $ COMMENT= O'Reilly Volume 6a: Motif Programming Manual @@ -15,15 +15,12 @@ MAINTAINER= Ian Darwin # Open Publication License PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.oreilly.com/catalog/motifref2/vol6a/ EXTRACT_ONLY= NO_BUILD= Yes -NO_REGRESS= Yes +NO_TEST= Yes PKG_ARCH= * INSTALL_LOC= ${PREFIX}/share/doc/oreilly-x diff --git a/books/wndw/Makefile b/books/wndw/Makefile index 76d9702b0b3..c41567bb968 100644 --- a/books/wndw/Makefile +++ b/books/wndw/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/24 06:29:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:44 espie Exp $ COMMENT-main = Wireless Networking in the Developing World, English edition COMMENT-es = Wireless Networking in the Developing World, Spanish edition @@ -22,9 +22,6 @@ CATEGORIES = books net # Creative Commons Attribution-ShareAlike 3.0 PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes MULTI_PACKAGES =-main -es -fr -ar -pt -id @@ -52,7 +49,7 @@ EXTRACT_ONLY = PKG_ARCH = * NO_BUILD = Yes -NO_REGRESS = Yes +NO_TEST = Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wndw diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile index 676c5ded08f..5a3ebe6d188 100644 --- a/cad/chipmunk/Makefile +++ b/cad/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2012/05/17 10:36:34 landry Exp $ +# $OpenBSD: Makefile,v 1.16 2013/03/10 23:04:44 espie Exp $ COMMENT= electronic CAD system BROKEN-sparc64 = Assembler messages: Error: Illegal operands @@ -17,9 +17,6 @@ MAINTAINER= Peter Valchev # GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 c m @@ -39,7 +36,7 @@ MAKE_FLAGS= CHIPMUNKCC="${CC} ${CFLAGS}" XINCLUDEDIR="${X11BASE}/include" \ WOLLIBDIR="${LDIR}" \ UNTILPSMAP="${LDIR}/pensps.map" -NO_REGRESS= Yes +NO_TEST= Yes post-extract: @cp ${FILESDIR}/Makefile ${WRKDIR} diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile index 9a314158cb5..f39a9492347 100644 --- a/cad/fritzing/Makefile +++ b/cad/fritzing/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2012/09/12 10:54:57 jasper Exp $ +# $OpenBSD: Makefile,v 1.16 2013/03/10 23:04:44 espie Exp $ COMMENT= interactive electronics designing software @@ -12,9 +12,6 @@ HOMEPAGE= http://fritzing.org/ # Code: GPLv3+ # Rest: CreativeCommons:BY-SA PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes MASTER_SITES= ${HOMEPAGE}download/$Vb/source-tarball/ EXTRACT_SUFX= .tar.bz2 @@ -23,7 +20,7 @@ WANTLIB += QtGui QtNetwork QtSql QtSvg QtXml c m pthread stdc++ z WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype MODULES= x11/qt4 -NO_REGRESS= Yes +NO_TEST= Yes BUILD_DEPENDS= devel/boost RUN_DEPENDS= devel/desktop-file-utils diff --git a/cad/geda-gaf/Makefile b/cad/geda-gaf/Makefile index 2f26f1d8091..56e8e305993 100644 --- a/cad/geda-gaf/Makefile +++ b/cad/geda-gaf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2012/09/01 14:36:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2013/03/10 23:04:44 espie Exp $ COMMENT = suite of tools for electronic design automation DISTNAME = geda-gaf-1.6.0 @@ -14,9 +14,6 @@ USE_GROFF = Yes # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \ @@ -51,8 +48,8 @@ post-extract: @rm -f ${WRKSRC}/gnetlist/examples/vams/gschemrc.orig # MAKE_ENV hoses the regression test, so we do this manually -do-regress: - cd ${WRKSRC} && ${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} \ - -f ${MAKE_FILE} ${REGRESS_TARGET} ${REGRESS_LOG} +do-test: + cd ${WRKSRC} && ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \ + -f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG} .include diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 6838e8d3861..53069c86633 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2012/06/15 08:32:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2013/03/10 23:04:44 espie Exp $ COMMENT= viewer for Gerber (RS-274X) files DISTNAME= gerbv-2.5.0 @@ -13,9 +13,6 @@ SHARED_LIBS += gerbv 0.1 # 1.5 # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index 1b2b578b8ee..6669196e495 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/15 00:22:49 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2013/03/10 23:04:44 espie Exp $ COMMENT= Gnu Circuit Analysis Package @@ -12,9 +12,6 @@ MAINTAINER= Andreas Bihlmaier # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= c m stdc++ readline termcap @@ -31,7 +28,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/man/gnucap-man.pdf \ ${PREFIX}/share/doc/gnucap/gnucap.pdf -do-regress: +do-test: cd ${WRKSRC}/examples && ./runall ../src/gnucap .include diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 061f054e2d5..59f0a1f77d3 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2012/08/19 20:55:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2013/03/10 23:04:45 espie Exp $ COMMENT= GTK+-based electronic waveform viewer @@ -10,9 +10,6 @@ HOMEPAGE= http://gtkwave.sourceforge.net/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} diff --git a/cad/kicad-library/Makefile b/cad/kicad-library/Makefile index 99cab06a082..2bc549bf8d4 100644 --- a/cad/kicad-library/Makefile +++ b/cad/kicad-library/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/05/03 18:27:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2013/03/10 23:04:45 espie Exp $ COMMENT= library modules for Kicad EDA @@ -9,9 +9,6 @@ HOMEPAGE= http://www.kicadlib.org/ # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://distfiles.nl/ DIST_SUBDIR= kicad diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index ad398e9bffe..ea882c5057e 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2012/06/15 08:32:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2013/03/10 23:04:45 espie Exp $ COMMENT-main= schematic and PCB editing software COMMENT-docs= documentation for the kicad library of components @@ -18,9 +18,6 @@ HOMEPAGE= http://kicad.sourceforge.net/ # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/ MASTER_SITES0= http://distfiles.nl/ diff --git a/cad/klogic/Makefile b/cad/klogic/Makefile index e2e62964ce4..50d2a80110b 100644 --- a/cad/klogic/Makefile +++ b/cad/klogic/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/01/23 21:16:30 zhuk Exp $ +# $OpenBSD: Makefile,v 1.25 2013/03/10 23:04:45 espie Exp $ SHARED_ONLY= Yes COMMENT= logic circuit simulator for KDE @@ -11,9 +11,6 @@ MASTER_SITES= http://distfiles.nl/ # GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB += DCOP GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 diff --git a/cad/necpp/Makefile b/cad/necpp/Makefile index 542108ec6f2..0ebb4521d02 100644 --- a/cad/necpp/Makefile +++ b/cad/necpp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/23 18:35:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2013/03/10 23:04:45 espie Exp $ COMMENT= NEC2++ antenna simulator @@ -11,9 +11,6 @@ MASTER_SITES= http://openbsd.dead-parrot.de/distfiles/ # GPL PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE=gnu diff --git a/cad/ngspice/Makefile b/cad/ngspice/Makefile index 389696ca764..ac2872f1e24 100644 --- a/cad/ngspice/Makefile +++ b/cad/ngspice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/02/02 04:39:55 bentley Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/10 23:04:45 espie Exp $ COMMENT = circuit simulator, based on Berkeley SPICE @@ -13,9 +13,6 @@ MAINTAINER = Anthony J. Bentley # BSD PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes USE_GMAKE = yes USE_LIBTOOL = yes diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index 066c3dc9b43..9be63bd6104 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/03/08 01:36:59 brad Exp $ +# $OpenBSD: Makefile,v 1.5 2013/03/10 23:04:45 espie Exp $ COMMENT = the programmer's solid 3D CAD modeller @@ -13,9 +13,6 @@ HOMEPAGE = http://www.openscad.org/ # GPLv2+ with CGAL exception PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes WANTLIB += c m pthread stdc++ WANTLIB += CGAL GL GLEW GLU ICE lib/qt4/QtGui lib/qt4/QtOpenGL diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 8cf05b851cd..1c97a9a49b2 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2012/09/21 13:21:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.27 2013/03/10 23:04:45 espie Exp $ COMMENT= printed circuit board layout tool DISTNAME= pcb-20110918 @@ -11,9 +11,6 @@ MAINTAINER= Andreas Bihlmaier # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB += GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 c cairo dbus-1 diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 5e4c97e5d91..50a8506bdf6 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2012/06/09 11:26:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.25 2013/03/10 23:04:45 espie Exp $ COMMENT= Qt-based 2D CAD system @@ -13,7 +13,6 @@ HOMEPAGE= http://www.ribbonsoft.com/qcad.html # Source code is GPLv2 and data not specified PERMIT_PACKAGE_CDROM= Non-free data files PERMIT_PACKAGE_FTP= Non-free data files -PERMIT_DISTFILES_CDROM= Non-free data files PERMIT_DISTFILES_FTP= Non-free data files WANTLIB= X11 Xext c m pthread stdc++ @@ -23,7 +22,7 @@ MASTER_SITES= http://www.ribbonsoft.com/archives/qcad/ MODULES= x11/qt3 USE_GMAKE= Yes -NO_REGRESS= Yes +NO_TEST= Yes PORTHOME= ${WRKDIR} diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile index e20694084f9..8950482f876 100644 --- a/cad/qucs/Makefile +++ b/cad/qucs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2011/09/16 08:48:02 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/10 23:04:45 espie Exp $ COMMENT= graphical circuit design and simulation tool @@ -11,9 +11,6 @@ HOMEPAGE= http://qucs.sourceforge.net/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qucs/} diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 0e19c56bdca..de937dcc431 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2011/11/13 12:50:39 naddy Exp $ +# $OpenBSD: Makefile,v 1.33 2013/03/10 23:04:45 espie Exp $ COMMENT= Simulation Program for Integrated Circuit Electronics @@ -10,9 +10,6 @@ CATEGORIES= cad # BSD PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xaw Xext Xmu Xt c m termlib @@ -22,7 +19,7 @@ HOMEPAGE= http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/ MAKE_ENV= MAKE_PROGRAM='${MAKE_PROGRAM}' CC="${CC}" USE_GROFF= Yes -NO_REGRESS= Yes +NO_TEST= Yes do-configure: @cp ${FILESDIR}/Makefile ${WRKSRC} diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index e9a94d87374..7b1a0fc73a4 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2013/02/07 22:49:22 stu Exp $ +# $OpenBSD: Makefile,v 1.23 2013/03/10 23:04:45 espie Exp $ SHARED_ONLY = Yes @@ -12,9 +12,6 @@ MAINTAINER = Stuart Cassoff # GPLv2 PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes WANTLIB = c m z ICE Xt X11 SM Xpm ${MODTK_WANTLIB} @@ -32,7 +29,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} -NO_REGRESS = Yes +NO_TEST = Yes SUBST_VARS = BASEVER diff --git a/cad/xnecview/Makefile b/cad/xnecview/Makefile index 41d83640aec..e0aa3774979 100644 --- a/cad/xnecview/Makefile +++ b/cad/xnecview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2011/11/01 19:00:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.19 2013/03/10 23:04:45 espie Exp $ COMMENT= NEC2 antenna simulator visualizer @@ -18,9 +18,6 @@ HOMEPAGE= http://www.cs.utwente.nl/~ptdeboer/ham/xnecview/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig diff --git a/cad/xtrkcad/Makefile b/cad/xtrkcad/Makefile index 1cc49649fd3..cb9deb964f0 100644 --- a/cad/xtrkcad/Makefile +++ b/cad/xtrkcad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2012/07/09 14:40:20 sebastia Exp $ +# $OpenBSD: Makefile,v 1.9 2013/03/10 23:04:45 espie Exp $ COMMENT= CAD program for designing model railroad layouts @@ -13,9 +13,6 @@ MAINTAINER= Sebastian Reitenbach # GPLv2 PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xtrkcad-fork/}