diff --git a/devel/autoconf/Makefile.inc b/devel/autoconf/Makefile.inc index 727f5b270c5..65a026b73ce 100644 --- a/devel/autoconf/Makefile.inc +++ b/devel/autoconf/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2015/04/07 09:25:48 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2019/07/13 10:59:26 sthen Exp $ # most parts common to all autoconfs actually COMMENT ?= automatically configure source code on many Un*x platforms @@ -10,9 +10,7 @@ HOMEPAGE ?= https://www.gnu.org/software/autoconf/ MAINTAINER ?= Marc Espie # GPL -PERMIT_DISTFILES_FTP ?= Yes -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes +PERMIT_PACKAGE ?= Yes SUFFIX ?= -${VERSION} SUBST_VARS += SUFFIX diff --git a/devel/automake/Makefile.inc b/devel/automake/Makefile.inc index fea32f580ba..fa9f1a334e9 100644 --- a/devel/automake/Makefile.inc +++ b/devel/automake/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2018/05/15 11:17:47 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2019/07/13 10:59:26 sthen Exp $ COMMENT ?= GNU Standards-compliant Makefile generator HOMEPAGE ?= https://www.gnu.org/software/automake/ @@ -10,9 +10,7 @@ CATEGORIES += devel # XXX check for new versions. So far, automake-1.12 is still GPLv2 # GPLv2 -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes -PERMIT_DISTFILES_FTP ?= Yes +PERMIT_PACKAGE ?= Yes # we're not a python port UPDATE_PLIST_ARGS += -i MODPY_PY_PREFIX diff --git a/devel/libgit2/Makefile.inc b/devel/libgit2/Makefile.inc index 603621975a3..8cacd729c71 100644 --- a/devel/libgit2/Makefile.inc +++ b/devel/libgit2/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.11 2016/10/08 12:49:18 czarkoff Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2019/07/13 10:59:26 sthen Exp $ CATEGORIES+= devel HOMEPAGE= http://libgit2.github.com/ # GPLv2 with linking exemption. -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE?= Yes DIST_SUBDIR= libgit diff --git a/devel/libmpack/Makefile.inc b/devel/libmpack/Makefile.inc index 37fe54c4b53..7a3fc5a300f 100644 --- a/devel/libmpack/Makefile.inc +++ b/devel/libmpack/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2017/02/04 12:40:43 edd Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $ V ?= 1.0.3 DISTNAME ?= libmpack-${V} @@ -11,7 +11,7 @@ CATEGORIES ?= devel HOMEPAGE ?= https://github.com/tarruda/libmpack # MIT -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes USE_GMAKE ?= Yes diff --git a/devel/msp430/Makefile.inc b/devel/msp430/Makefile.inc index bde081ac0d4..df0bc6d3dc7 100644 --- a/devel/msp430/Makefile.inc +++ b/devel/msp430/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.27 2015/11/22 08:18:56 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.28 2019/07/13 10:59:26 sthen Exp $ # # XXX: Don't forget to adjust meta/msp430 when updating to new LTS @@ -34,9 +34,7 @@ HOMEPAGE?= http://mspgcc.sourceforge.net/ # binutils/gcc/gdb: GPLv3 # libc/msp430mcu: BSD3/ISC -PERMIT_PACKAGE_CDROM?= Yes -PERMIT_PACKAGE_FTP?= Yes -PERMIT_DISTFILES_FTP?= Yes +PERMIT_PACKAGE?= Yes MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mspgcc/} diff --git a/devel/open-ath9k-htc-firmware/Makefile.inc b/devel/open-ath9k-htc-firmware/Makefile.inc index 2f5ae2e1cf0..0d940fc2f02 100644 --- a/devel/open-ath9k-htc-firmware/Makefile.inc +++ b/devel/open-ath9k-htc-firmware/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2017/11/06 13:50:39 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $ PKGNAME ?= open-ath9k-htc-firmware-${ATH9K_FIRMWARE}-1.4.0pl20171105 DISTNAME ?= ${GH_PROJECT}-${GH_COMMIT} @@ -10,7 +10,7 @@ GH_COMMIT ?= d19607454d656cb14d8c16dfbf161eebb542e8fe CATEGORIES = devel # ISC/MIT/BSD, but with GPLv2 components -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MODULES ?= devel/cmake BUILD_DEPENDS ?= devel/xtensa-elf/gcc diff --git a/devel/qp/Makefile.inc b/devel/qp/Makefile.inc index 255b1a1536b..48a4c06cb9a 100644 --- a/devel/qp/Makefile.inc +++ b/devel/qp/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2018/03/30 04:47:59 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $ COMMENT ?= active object framework @@ -11,7 +11,7 @@ CATEGORIES ?= devel HOMEPAGE ?= https://www.state-machine.com/ # GPLv3+ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MASTER_SITES ?= ${MASTER_SITE_SOURCEFORGE:=qpc/} diff --git a/devel/radare2/Makefile.inc b/devel/radare2/Makefile.inc index e2d81c6d802..5c9ecacc659 100644 --- a/devel/radare2/Makefile.inc +++ b/devel/radare2/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2018/11/05 21:55:41 edd Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2019/07/13 10:59:26 sthen Exp $ # Arches suggested by upstream, unsure which work on OpenBSD for sure. ONLY_FOR_ARCHS ?= amd64 i386 @@ -11,11 +11,9 @@ HOMEPAGE ?= http://www.radare.org/r/ MAINTAINER ?= Edd Barrett # LGPLv3 -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes -PERMIT_DISTFILES_FTP ?= Yes +PERMIT_PACKAGE ?= Yes -GH_ACCOUNT = radare +GH_ACCOUNT = radare USE_GMAKE ?= Yes CONFIGURE_STYLE ?= simple diff --git a/devel/ruby-rspec/3/Makefile.inc b/devel/ruby-rspec/3/Makefile.inc index 60725be188c..0c0210659b3 100644 --- a/devel/ruby-rspec/3/Makefile.inc +++ b/devel/ruby-rspec/3/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2019/07/07 18:46:44 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2019/07/13 10:59:26 sthen Exp $ PORTROACH = limit:^3 @@ -7,7 +7,7 @@ CATEGORIES ?= devel HOMEPAGE ?= http://rspec.info/ # MIT -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MODULES ?= lang/ruby diff --git a/devel/ruby-rspec/Makefile.inc b/devel/ruby-rspec/Makefile.inc index 3cf8598a64c..b9fceb19918 100644 --- a/devel/ruby-rspec/Makefile.inc +++ b/devel/ruby-rspec/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.3 2013/04/23 06:52:59 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2019/07/13 10:59:26 sthen Exp $ CATEGORIES ?= devel HOMEPAGE ?= http://rspec.info/ # MIT -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MODULES ?= lang/ruby diff --git a/fonts/adobe-fonts/Makefile.inc b/fonts/adobe-fonts/Makefile.inc index b4109d25233..1b1c421bae9 100644 --- a/fonts/adobe-fonts/Makefile.inc +++ b/fonts/adobe-fonts/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2017/11/16 03:33:09 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2019/07/13 10:59:26 sthen Exp $ PKG_ARCH ?= * CATEGORIES += fonts fonts/adobe-fonts x11 @@ -11,7 +11,7 @@ PKGNAME ?= adobe-${GH_PROJECT}-${VERSION} HOMEPAGE ?= http://adobe-fonts.github.io/${GH_PROJECT}/ # SIL OFL 1.1 -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes DIST_SUBDIR ?= adobe-fonts diff --git a/fonts/noto/Makefile.inc b/fonts/noto/Makefile.inc index 3c59deb3b52..791467e8851 100644 --- a/fonts/noto/Makefile.inc +++ b/fonts/noto/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2019/05/10 04:14:13 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2019/07/13 10:59:26 sthen Exp $ DISTNAME ?= noto-${NOTO_PROJECT}-${V:S/-//g} @@ -7,7 +7,7 @@ CATEGORIES ?= fonts HOMEPAGE ?= https://www.google.com/get/noto/ # SIL OFL 1.1 -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MAINTAINER ?= Anthony J. Bentley diff --git a/games/colobot/Makefile.inc b/games/colobot/Makefile.inc index 48c0f68cfb4..b1030588cd2 100644 --- a/games/colobot/Makefile.inc +++ b/games/colobot/Makefile.inc @@ -1,5 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2018/09/25 08:53:04 bentley Exp $ - +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $ V ?= 0.1.11.1 @@ -8,7 +7,7 @@ CATEGORIES ?= games HOMEPAGE ?= https://colobot.info/ # GPLv3+ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MAINTAINER ?= Anthony J. Bentley diff --git a/games/freedoom/Makefile.inc b/games/freedoom/Makefile.inc index 9943a3b5c44..8a1092d86d7 100644 --- a/games/freedoom/Makefile.inc +++ b/games/freedoom/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2017/11/15 08:52:59 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $ COMMENT = free content game based on the Doom engine @@ -10,7 +10,7 @@ CATEGORIES ?= games HOMEPAGE ?= https://freedoom.github.io/ # BSD 3-clause -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes #WANTLIB = ??? diff --git a/geo/spatialite/Makefile.inc b/geo/spatialite/Makefile.inc index d83bc29caf6..6e7739aa933 100644 --- a/geo/spatialite/Makefile.inc +++ b/geo/spatialite/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.5 2019/04/16 20:13:09 landry Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2019/07/13 10:59:26 sthen Exp $ CATEGORIES ?= geo # MPL/1.1 GPLv2.0+ LGPLv2.1+ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes HOMEPAGE ?= https://www.gaia-gis.it/fossil/${PROJECT}/index MASTER_SITES ?= https://www.gaia-gis.it/gaia-sins/ diff --git a/graphics/clutter/Makefile.inc b/graphics/clutter/Makefile.inc index 247512eadd3..ba5c4f32082 100644 --- a/graphics/clutter/Makefile.inc +++ b/graphics/clutter/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.24 2016/04/25 09:35:19 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.25 2019/07/13 10:59:26 sthen Exp $ DIST_SUBDIR= clutter @@ -10,7 +10,7 @@ MAINTAINER?= Jasper Lievisse Adriaanse , \ Antoine Jacoutot # LGPLv2.1 - MIT -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE ?= Yes MODULES += x11/gnome diff --git a/mail/kopano/Makefile.inc b/mail/kopano/Makefile.inc index d754f1996c1..c8513cad131 100644 --- a/mail/kopano/Makefile.inc +++ b/mail/kopano/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.24 2019/06/29 18:12:10 robert Exp $ +# $OpenBSD: Makefile.inc,v 1.25 2019/07/13 10:59:26 sthen Exp $ V?= 8.7.81 BUILD?= 203 @@ -12,9 +12,7 @@ HOMEPAGE?= https://kopano.io/ MAINTAINER?= Robert Nagy # AGPLv3 (GNU Affero Public License) with exceptions -PERMIT_PACKAGE_CDROM?= Yes -PERMIT_PACKAGE_FTP?= Yes -PERMIT_DISTFILES_FTP?= Yes +PERMIT_PACKAGE?= Yes DIST_SUBDIR?= kopano MASTER_SITES?= http://nerd.hu/distfiles/ \ diff --git a/math/lpsolve/Makefile.inc b/math/lpsolve/Makefile.inc index 44f40cc47a2..4e543fcb0e7 100644 --- a/math/lpsolve/Makefile.inc +++ b/math/lpsolve/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2013/03/11 11:23:55 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2019/07/13 10:59:27 sthen Exp $ V_MAJOR ?= 5.5 V ?= ${V_MAJOR}.2.0 @@ -9,6 +9,4 @@ MAINTAINER ?= Edd Barrett MASTER_SITES ?= ${MASTER_SITE_SOURCEFORGE:=lpsolve/} # LGPLv2.1 -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes -PERMIT_DISTFILES_FTP ?= Yes +PERMIT_PACKAGE ?= Yes diff --git a/misc/m17n/Makefile.inc b/misc/m17n/Makefile.inc index e7d47dbe129..9a37fa5c0b7 100644 --- a/misc/m17n/Makefile.inc +++ b/misc/m17n/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2019/03/26 16:46:59 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:27 sthen Exp $ M17N_V = 1.8.0 @@ -8,7 +8,7 @@ HOMEPAGE ?= https://www.nongnu.org/m17n/ MAINTAINER ?= Eric Brown # LGPLv2+ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MASTER_SITES ?= ${MASTER_SITE_SAVANNAH:=m17n/} diff --git a/net/gupnp/Makefile.inc b/net/gupnp/Makefile.inc index 52ed9554545..1931d1edaf8 100644 --- a/net/gupnp/Makefile.inc +++ b/net/gupnp/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2013/03/11 12:24:02 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2019/07/13 10:59:27 sthen Exp $ CATEGORIES ?= net devel @@ -7,7 +7,7 @@ HOMEPAGE ?= http://gupnp.org/ MAINTAINER?= Jasper Lievisse Adriaanse # GPLv2/LGPLv2.1 -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE?= Yes EXTRACT_SUFX?= .tar.xz diff --git a/net/napalm/Makefile.inc b/net/napalm/Makefile.inc index 22c5e991ade..a3c3ec150fd 100644 --- a/net/napalm/Makefile.inc +++ b/net/napalm/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2018/02/17 14:09:19 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:27 sthen Exp $ CATEGORIES += net net/napalm @@ -9,4 +9,4 @@ MODPY_PI ?= Yes MODPY_SETUPTOOLS ?= Yes # Apache 2.0 -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes diff --git a/net/telepathy/Makefile.inc b/net/telepathy/Makefile.inc index 21f4a7d6d95..5a42a378417 100644 --- a/net/telepathy/Makefile.inc +++ b/net/telepathy/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.19 2016/03/19 15:47:04 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.20 2019/07/13 10:59:27 sthen Exp $ PORTROACH= limitw:1,even @@ -16,7 +16,7 @@ MASTER_SITES_TP= http://telepathy.freedesktop.org/releases/ DIST_SUBDIR= telepathy # BSD/GPL/LGPL -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE?= Yes MAINTAINER?= Jasper Lievisse Adriaanse diff --git a/print/texlive/Makefile.inc b/print/texlive/Makefile.inc index ebb64b9bbec..d9afff39225 100644 --- a/print/texlive/Makefile.inc +++ b/print/texlive/Makefile.inc @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.19 2019/01/20 11:17:30 edd Exp $ +# $OpenBSD: Makefile.inc,v 1.20 2019/07/13 10:59:27 sthen Exp $ CATEGORIES ?= print HOMEPAGE ?= http://tug.org/texlive/ MAINTAINER ?= Edd Barrett # http://tug.org/texlive/LICENSE.TL -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes -PERMIT_DISTFILES_FTP ?= Yes +PERMIT_PACKAGE ?= Yes EXTRACT_SUFX ?= .tar.xz diff --git a/sysutils/beats/Makefile.inc b/sysutils/beats/Makefile.inc index 13d5c797937..cb206d6eb80 100644 --- a/sysutils/beats/Makefile.inc +++ b/sysutils/beats/Makefile.inc @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile.inc,v 1.10 2019/03/30 04:42:31 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2019/07/13 10:59:27 sthen Exp $ PKGNAME ?= ${BEAT}-${VERSION} CATEGORIES += sysutils # Apachev2 -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes -MODULES += lang/go +MODULES += lang/go -ELASTIC_BEAT ?= Yes +ELASTIC_BEAT ?= Yes MODGO_ENV = PATH="${PORTPATH}" CFLAGS="${CFLAGS}" diff --git a/sysutils/gkrellm/plugins/Makefile.inc b/sysutils/gkrellm/plugins/Makefile.inc index aea564a3e68..2b809e28984 100644 --- a/sysutils/gkrellm/plugins/Makefile.inc +++ b/sysutils/gkrellm/plugins/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.34 2017/09/15 15:37:17 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.35 2019/07/13 10:59:27 sthen Exp $ CATEGORIES += sysutils # GPLv2+ -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE?= Yes .if ! defined(WANTLIB) LIB_DEPENDS += x11/gtk+2 diff --git a/sysutils/mcollective-plugins/Makefile.inc b/sysutils/mcollective-plugins/Makefile.inc index 9b864fb9eff..a49d5000d3f 100644 --- a/sysutils/mcollective-plugins/Makefile.inc +++ b/sysutils/mcollective-plugins/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.4 2016/09/06 11:26:08 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2019/07/13 10:59:27 sthen Exp $ CATEGORIES?= sysutils MAINTAINER?= Sebastian Reitenbach # Apache2 -PERMIT_PACKAGE_CDROM?= Yes +PERMIT_PACKAGE?= Yes NO_BUILD?= Yes NO_TEST?= Yes diff --git a/textproc/apertium-dicts/Makefile.inc b/textproc/apertium-dicts/Makefile.inc index 9a66f7daa20..0cc37a744c9 100644 --- a/textproc/apertium-dicts/Makefile.inc +++ b/textproc/apertium-dicts/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2016/01/19 03:03:18 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2019/07/13 10:59:27 sthen Exp $ COMMENT ?= ${LANG} language pack for apertium @@ -11,7 +11,7 @@ HOMEPAGE ?= https://www.apertium.org/ MAINTAINER ?= Anthony J. Bentley # GPLv2+ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MASTER_SITES ?= ${MASTER_SITE_SOURCEFORGE:=apertium/} diff --git a/textproc/aspell/dicts/Makefile.inc b/textproc/aspell/dicts/Makefile.inc index 6f3ded3438c..fbc7f96d707 100644 --- a/textproc/aspell/dicts/Makefile.inc +++ b/textproc/aspell/dicts/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2017/12/07 13:12:44 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2019/07/13 10:59:27 sthen Exp $ # Check individual packages for overrides when bumping this! PKGNAMEBASE= ${DISTNAME:C/aspell[0-9]/aspell/} @@ -13,9 +13,7 @@ EXTRACT_SUFX?= .tar.bz2 HOMEPAGE?= http://aspell.sourceforge.net/ # GPLv2 - LGPLv2 - FDL - CC ShareAlike -PERMIT_DISTFILES_FTP?= Yes -PERMIT_PACKAGE_CDROM?= Yes -PERMIT_PACKAGE_FTP?= Yes +PERMIT_PACKAGE?= Yes NO_TEST?= Yes diff --git a/textproc/zathura/plugins/Makefile.inc b/textproc/zathura/plugins/Makefile.inc index 1e832613ac0..3a36ff68609 100644 --- a/textproc/zathura/plugins/Makefile.inc +++ b/textproc/zathura/plugins/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.11 2018/04/28 14:57:32 landry Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2019/07/13 10:59:27 sthen Exp $ CATEGORIES ?= textproc x11 MASTER_SITES ?= https://pwmt.org/projects/zathura/plugins/download/ EXTRACT_SUFX ?= .tar.xz # MIT -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes RUN_DEPENDS ?= devel/desktop-file-utils \ textproc/zathura/core diff --git a/www/drupal7/Makefile.inc b/www/drupal7/Makefile.inc index 4c76b31b360..7fba329f2ef 100644 --- a/www/drupal7/Makefile.inc +++ b/www/drupal7/Makefile.inc @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.2 2013/03/11 11:44:41 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2019/07/13 10:59:27 sthen Exp $ MODULES += www/drupal7 # GPL -PERMIT_DISTFILES_FTP ?= Yes -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes +PERMIT_PACKAGE ?= Yes NO_BUILD ?= Yes NO_TEST ?= Yes diff --git a/www/tor-browser/Makefile.inc b/www/tor-browser/Makefile.inc index 1574c0aa875..599db516b51 100644 --- a/www/tor-browser/Makefile.inc +++ b/www/tor-browser/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.17 2019/05/09 06:31:17 landry Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2019/07/13 10:59:27 sthen Exp $ MAINTAINER ?= Sean Levy HOMEPAGE ?= https://www.torproject.org MASTER_SITES ?= https://bits.torbsd.org/pub/OpenBSD/distfiles/ -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes CATEGORIES = www BROWSER_NAME = tor-browser TB_VERSION = 8.0.9 diff --git a/x11/agar/Makefile.inc b/x11/agar/Makefile.inc index 3ddafdcb33e..f73b14cd2e1 100644 --- a/x11/agar/Makefile.inc +++ b/x11/agar/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1.1.1 2016/10/10 09:33:17 bentley Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:27 sthen Exp $ V ?= 1.5.0 DISTNAME ?= agar-$V @@ -8,7 +8,7 @@ CATEGORIES ?= x11 HOMEPAGE ?= http://libagar.org/ # BSD -PERMIT_PACKAGE_CDROM ?= Yes +PERMIT_PACKAGE ?= Yes MASTER_SITES ?= http://stable.hypertriton.com/agar/ diff --git a/x11/gnustep/Makefile.inc b/x11/gnustep/Makefile.inc index 0549c64dafb..59395b4de95 100644 --- a/x11/gnustep/Makefile.inc +++ b/x11/gnustep/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2017/06/01 11:47:06 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2019/07/13 10:59:27 sthen Exp $ DIST_SUBDIR= gnustep @@ -7,9 +7,7 @@ MAINTAINER?= Sebastian Reitenbach # simplified BSD (libobjc2) # GPLv3 - LGPLv3 (GNUStep core apps and libs) # GPLv2 - LGPLv2 -PERMIT_PACKAGE_CDROM?= Yes -PERMIT_PACKAGE_FTP?= Yes -PERMIT_DISTFILES_FTP?= Yes +PERMIT_PACKAGE?= Yes PKGNAME ?= ${DISTNAME:L} diff --git a/x11/kde/Makefile.inc b/x11/kde/Makefile.inc index a29e16033f3..602a829fdef 100644 --- a/x11/kde/Makefile.inc +++ b/x11/kde/Makefile.inc @@ -1,4 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.48 2016/03/16 21:40:56 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.49 2019/07/13 10:59:27 sthen Exp $ + DIST_SUBDIR ?= kde HOMEPAGE ?= http://www.kde.org @@ -30,12 +31,10 @@ CONFIGURE_ENV += ${MODKDE_CONFIGURE_ENV} MAKE_ENV = ${CONFIGURE_ENV} MAKE_FLAGS += ${MODKDE_MAKE_FLAGS} -FAKE_FLAGS ?= TAR=tar +FAKE_FLAGS ?= TAR=tar FAKE_FLAGS += sysconfdir=${SAMPLECONFDIR} # GPL -PERMIT_DISTFILES_FTP ?= Yes -PERMIT_PACKAGE_CDROM ?= Yes -PERMIT_PACKAGE_FTP ?= Yes +PERMIT_PACKAGE ?= Yes -MODKDE_LIB_LINKS = Yes +MODKDE_LIB_LINKS = Yes diff --git a/x11/nx/Makefile.inc b/x11/nx/Makefile.inc index a8a752879b8..04ca995a2f9 100644 --- a/x11/nx/Makefile.inc +++ b/x11/nx/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2016/10/15 19:14:20 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2019/07/13 10:59:27 sthen Exp $ CATEGORIES+= x11 @@ -7,9 +7,7 @@ HOMEPAGE?= http://www.nomachine.com/ MAJOR_VERSION?= 3.5.0 # GPLv2/LGPLv2 -PERMIT_PACKAGE_CDROM?= Yes -PERMIT_PACKAGE_FTP?= Yes -PERMIT_DISTFILES_FTP?= Yes +PERMIT_PACKAGE?= Yes MASTER_SITES_NX= http://code.x2go.org/releases/source/nx-libs/ DIST_SUBDIR= nx