From ae1cb22cb2ca061873a7681c505cebb254dafc84 Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 14 Jul 2019 02:16:50 +0000 Subject: [PATCH] Switch to PERMIT_(DISTFILES|PACKAGE). CDROM restrictions are no longer applicable. --- archivers/freeze/Makefile | 7 +++---- archivers/macutil/Makefile | 7 +++---- archivers/nulib/Makefile | 7 +++---- archivers/unarj/Makefile | 7 +++---- astro/sattrack/Makefile | 7 +++---- astro/xephem/Makefile | 7 +++---- audio/squeezecenter/Makefile | 7 +++---- benchmarks/iozone/Makefile | 7 +++---- books/JLS/Makefile | 7 +++---- books/JVMS/Makefile | 7 +++---- cad/qcad/Makefile | 7 +++---- comms/zmtx-zmrx/Makefile | 7 +++---- converters/ish/Makefile | 7 +++---- converters/mimepp/Makefile | 7 +++---- emulators/advancemame/Makefile | 7 +++---- emulators/openmsx/Makefile | 7 +++---- fonts/farsi-bfonts-ttf/Makefile | 7 +++---- fonts/freefonts/Makefile | 7 +++---- fonts/msctfonts/Makefile | 7 +++---- fonts/msttcorefonts/Makefile | 7 +++---- fonts/pkfonts/Makefile | 7 +++---- fonts/zh-taipeifonts/Makefile | 7 +++---- games/doomdata/doom1/Makefile | 7 +++---- games/doomdata/doom2/Makefile | 7 +++---- games/eduke32/Makefile | 7 +++---- games/fs2open/Makefile | 7 +++---- games/sauerbraten/Makefile | 7 +++---- games/xbomber/Makefile | 7 +++---- lang/go-bootstrap/Makefile | 7 +++---- mail/majordomo/Makefile | 7 +++---- misc/vmware-vncpasswd/Makefile | 7 +++---- net/ctrace/Makefile | 7 +++---- net/mfi/Makefile | 7 +++---- net/nssl/Makefile | 7 +++---- net/p5-Net-ICQ2000/Makefile | 7 +++---- net/thcrut/Makefile | 7 +++---- plan9/9menu/Makefile | 7 +++---- security/ADMsnmp/Makefile | 7 +++---- security/cryptcat/Makefile | 7 +++---- security/p5-GPG/Makefile | 7 +++---- security/sentinel/Makefile | 7 +++---- sysutils/tarsnap/Makefile | 7 +++---- telephony/asterisk-g729/Makefile | 7 +++---- textproc/html/Makefile | 7 +++---- textproc/p5-Lingua-EN-Summarize/Makefile | 7 +++---- textproc/spiff/Makefile | 7 +++---- x11/amiwm/Makefile | 7 +++---- x11/mxconns/Makefile | 7 +++---- x11/wmx/Makefile | 7 +++---- 49 files changed, 147 insertions(+), 196 deletions(-) diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile index de23a543f7b..ae156061600 100644 --- a/archivers/freeze/Makefile +++ b/archivers/freeze/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2014/07/17 08:29:04 zhuk Exp $ +# $OpenBSD: Makefile,v 1.28 2019/07/14 02:16:50 naddy Exp $ COMMENT= FREEZE / MELT compression program - often used in QNX @@ -8,9 +8,8 @@ CATEGORIES= archivers MASTER_SITES= http://www.arcane-labs.net/download/OpenBSD/ # None -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No REVISION = 2 WANTLIB= c diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile index 3762ba53303..f39594af02a 100644 --- a/archivers/macutil/Makefile +++ b/archivers/macutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2018/05/12 09:22:27 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2019/07/14 02:16:50 naddy Exp $ COMMENT= several programs to handle macintosh files and archives DISTNAME= macutil2.0b3 @@ -6,9 +6,8 @@ PKGNAME= macutil-2.0b3 CATEGORIES= archivers # None -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No REVISION = 3 WANTLIB= c diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile index 8579ea85850..cfb518fe913 100644 --- a/archivers/nulib/Makefile +++ b/archivers/nulib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2018/05/12 09:22:27 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2019/07/14 02:16:50 naddy Exp $ COMMENT= NuFX archiver @@ -10,9 +10,8 @@ MASTER_SITES= https://people.freebsd.org/~jseger/ EXTRACT_SUFX= .tar.Z # Restrictive -PERMIT_PACKAGE_CDROM= no fee -PERMIT_PACKAGE_FTP= no terms -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= no terms +PERMIT_DISTFILES= Yes WANTLIB= c diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile index 5f7d5b52b3b..d1648954d46 100644 --- a/archivers/unarj/Makefile +++ b/archivers/unarj/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2013/03/10 22:28:05 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2019/07/14 02:16:50 naddy Exp $ COMMENT= extract files from ARJ archives @@ -9,9 +9,8 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ EXTRACT_SUFX= .tgz # Restrictive -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No WANTLIB= c diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile index b486926e3d3..5b89c4b0faa 100644 --- a/astro/sattrack/Makefile +++ b/astro/sattrack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2013/03/10 22:28:05 espie Exp $ +# $OpenBSD: Makefile,v 1.31 2019/07/14 02:16:50 naddy Exp $ V= 3.1.6 COMMENT= real-time satellite tracking and orbit propagation program @@ -6,9 +6,8 @@ DISTNAME= sattrack-${V} CATEGORIES= astro # Commercial License -PERMIT_PACKAGE_CDROM= May not be bundled, according to copyright -PERMIT_PACKAGE_FTP= May not distribute modified version -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= May not distribute modified version +PERMIT_DISTFILES= Yes REVISION = 4 WANTLIB= ICE SM X11 Xt c m diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index 6989a7d2b2b..f7e1c5e78c2 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2018/08/07 10:20:23 espie Exp $ +# $OpenBSD: Makefile,v 1.53 2019/07/14 02:16:50 naddy Exp $ COMMENT= interactive astronomical ephemeris DISTNAME= xephem-3.2.3 @@ -7,9 +7,8 @@ MASTER_SITES= https://distfiles.nl/ HOMEPAGE= http://www.clearskyinstitute.com/xephem/ -PERMIT_PACKAGE_CDROM= no modifications, no fee -PERMIT_PACKAGE_FTP= no modifications -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= no modifications +PERMIT_DISTFILES= Yes REVISION = 9 WANTLIB= ICE SM X11 Xau Xdmcp Xext Xt c m Xm diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile index 189788a05e7..af7d49ab75b 100644 --- a/audio/squeezecenter/Makefile +++ b/audio/squeezecenter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2017/08/15 15:53:57 afresh1 Exp $ +# $OpenBSD: Makefile,v 1.21 2019/07/14 02:16:51 naddy Exp $ COMMENT = streaming audio server for Squeezebox network music players @@ -14,9 +14,8 @@ HOMEPAGE = http://wiki.slimdevices.com/index.php/SqueezeCenter # but unfortunately also with proprietary (required) firmware, also # image files/fonts etc which may not be redistributed without an # explicit permission being granted. -PERMIT_PACKAGE_CDROM = No -PERMIT_PACKAGE_FTP = No -PERMIT_DISTFILES_FTP = No +PERMIT_PACKAGE = No +PERMIT_DISTFILES = No EXTRACT_SUFX = .tgz diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile index 2edf3675708..fa8346a8aad 100644 --- a/benchmarks/iozone/Makefile +++ b/benchmarks/iozone/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2017/08/20 10:26:27 jasper Exp $ +# $OpenBSD: Makefile,v 1.49 2019/07/14 02:16:51 naddy Exp $ COMMENT= performance test of sequential file I/O @@ -11,9 +11,8 @@ EXTRACT_SUFX= .tar HOMEPAGE= http://www.iozone.org/ -PERMIT_PACKAGE_CDROM= incomplete/bad license -PERMIT_PACKAGE_FTP= incomplete/bad license -PERMIT_DISTFILES_FTP= incomplete/bad license +PERMIT_PACKAGE= incomplete/bad license +PERMIT_DISTFILES= incomplete/bad license WANTLIB += c pthread diff --git a/books/JLS/Makefile b/books/JLS/Makefile index b452c3d414d..5a50003e945 100644 --- a/books/JLS/Makefile +++ b/books/JLS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/04/21 21:31:40 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.10 2019/07/14 02:16:51 naddy Exp $ COMMENT= Oracle's official Java language specification @@ -16,9 +16,8 @@ HOMEPAGE= https://docs.oracle.com/javase/specs/ MAINTAINER= Ian Darwin # No redistribution. -PERMIT_PACKAGE_CDROM= Copyright -PERMIT_PACKAGE_FTP= Copyright -PERMIT_DISTFILES_FTP= Copyright +PERMIT_PACKAGE= Copyright +PERMIT_DISTFILES= Copyright MASTER_SITES= https://docs.oracle.com/javase/specs/jls/se${MAJOR}/ diff --git a/books/JVMS/Makefile b/books/JVMS/Makefile index a470358af99..f21c147c132 100644 --- a/books/JVMS/Makefile +++ b/books/JVMS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2014/08/09 21:33:22 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $ COMMENT = Sun's official Java VM Specification, 2nd Ed. @@ -11,9 +11,8 @@ CATEGORIES = books 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_FTP = Copyright +PERMIT_PACKAGE = Copyright +PERMIT_DISTFILES = Copyright MASTER_SITES = ${HOMEPAGE}download/ diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index bf9ba70449e..c8e0c7ee9c8 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2018/12/06 20:10:03 naddy Exp $ +# $OpenBSD: Makefile,v 1.33 2019/07/14 02:16:51 naddy Exp $ COMMENT= Qt-based 2D CAD system @@ -11,9 +11,8 @@ CATEGORIES= cad graphics 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_FTP= Non-free data files +PERMIT_PACKAGE= Non-free data files +PERMIT_DISTFILES= Non-free data files WANTLIB= X11 Xext c m pthread ${COMPILER_LIBCXX} diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile index c6ccf6b1f66..e115f2d195d 100644 --- a/comms/zmtx-zmrx/Makefile +++ b/comms/zmtx-zmrx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2018/05/12 14:08:51 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2019/07/14 02:16:51 naddy Exp $ COMMENT= receive/send files via ZMODEM protocol (unrestricted) @@ -6,9 +6,8 @@ DISTNAME= zmtx-zmrx-1.02 CATEGORIES= comms REVISION= 2 -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= Yes WANTLIB= c diff --git a/converters/ish/Makefile b/converters/ish/Makefile index b0bd600273e..20ff626dd60 100644 --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2018/07/15 08:36:38 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2019/07/14 02:16:51 naddy Exp $ COMMENT= binary-to-text file converter @@ -6,9 +6,8 @@ DISTNAME= ish201a5 PKGNAME= ish-2.01a5 CATEGORIES= converters -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WANTLIB += c diff --git a/converters/mimepp/Makefile b/converters/mimepp/Makefile index 32e49879f83..30834e2db8f 100644 --- a/converters/mimepp/Makefile +++ b/converters/mimepp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2017/05/04 15:46:56 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2019/07/14 02:16:51 naddy Exp $ COMMENT= C++ class library for MIME messages @@ -6,9 +6,8 @@ DISTNAME= mimepp-1.0 REVISION= 1 CATEGORIES= converters -PERMIT_PACKAGE_CDROM= restrictive non-commercial license -PERMIT_PACKAGE_FTP= restrictive non-commercial license -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= restrictive non-commercial license +PERMIT_DISTFILES= Yes MASTER_SITES= ${MASTER_SITE_SUNSITE:=devel/lang/c++/} diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile index 983db72db5c..28b3a8a5b30 100644 --- a/emulators/advancemame/Makefile +++ b/emulators/advancemame/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2018/11/12 18:49:48 naddy Exp $ +# $OpenBSD: Makefile,v 1.16 2019/07/14 02:16:51 naddy Exp $ COMMENT = MAME port with advanced video support for monitors and TVs @@ -13,9 +13,8 @@ HOMEPAGE = https://www.advancemame.it/ MAINTAINER = Frederic Cambus # GPLv2+ and MAME License -PERMIT_PACKAGE_CDROM = unclear license -PERMIT_PACKAGE_FTP = unclear license -PERMIT_DISTFILES_FTP = unclear license +PERMIT_PACKAGE = unclear license +PERMIT_DISTFILES = unclear license WANTLIB += SDL2 c expat freetype m pthread z diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 981b966f85d..9500a88cef7 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2018/09/04 12:46:12 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2019/07/14 02:16:51 naddy Exp $ BROKEN-powerpc =CPUCore.cc:2347: error: insn does not satisfy its constraints BROKEN-hppa = OOM when building src/cpu/CPUCore.cc @@ -14,9 +14,8 @@ CATEGORIES = emulators HOMEPAGE = https://openmsx.org/ -PERMIT_PACKAGE_CDROM = claims GPLv2, but no copyright notices in source files -PERMIT_PACKAGE_FTP = claims GPLv2, but no copyright notices in source files -PERMIT_DISTFILES_FTP = claims GPLv2, but no copyright notices in source files +PERMIT_PACKAGE = claims GPLv2, but no copyright notices in source files +PERMIT_DISTFILES = claims GPLv2, but no copyright notices in source files WANTLIB += ${MODTCL_LIB} WANTLIB += GL GLEW SDL SDL_ttf c freetype iconv m ogg png diff --git a/fonts/farsi-bfonts-ttf/Makefile b/fonts/farsi-bfonts-ttf/Makefile index e0cd85c1c0f..a1622c941d5 100644 --- a/fonts/farsi-bfonts-ttf/Makefile +++ b/fonts/farsi-bfonts-ttf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2016/11/04 15:53:59 rpe Exp $ +# $OpenBSD: Makefile,v 1.8 2019/07/14 02:16:51 naddy Exp $ COMMENT= farsi bornaray fonts @@ -15,9 +15,8 @@ CATEGORIES= fonts x11 HOMEPAGE= http://www.bornaray.com/en_fonts.asp # No license -PERMIT_PACKAGE_CDROM= No license -PERMIT_PACKAGE_FTP= No license -PERMIT_DISTFILES_FTP= No license +PERMIT_PACKAGE= No license +PERMIT_DISTFILES= No license MASTER_SITES = http://www.borna.ir/download/fonts/ \ http://www.bornaray.com/download/fonts/ diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile index 3012a145c72..75cc8bc2875 100644 --- a/fonts/freefonts/Makefile +++ b/fonts/freefonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2015/06/17 09:06:36 bentley Exp $ +# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $ COMMENT= collection of ATM fonts from the CICA archives @@ -11,9 +11,8 @@ MASTER_SITES= http://download.gimp.org/pub/gimp/fonts/ HOMEPAGE= http://www.gimp.org/fonts.html # lots of different custom licenses, the worst one wins -PERMIT_PACKAGE_CDROM= may not sell -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WRKDIST= ${WRKDIR} NO_BUILD= Yes diff --git a/fonts/msctfonts/Makefile b/fonts/msctfonts/Makefile index f769918c688..2dd349e284a 100644 --- a/fonts/msctfonts/Makefile +++ b/fonts/msctfonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2015/08/26 14:16:07 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2019/07/14 02:16:51 naddy Exp $ COMMENT = Microsoft ClearType fonts @@ -8,9 +8,8 @@ PKGNAME = msctfonts-1.0 CATEGORIES = fonts # No redistribution -PERMIT_PACKAGE_CDROM = No redistribution -PERMIT_PACKAGE_FTP = No redistribution -PERMIT_DISTFILES_FTP = No redistribution +PERMIT_PACKAGE = No redistribution +PERMIT_DISTFILES = No redistribution MASTER_SITES = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/ diff --git a/fonts/msttcorefonts/Makefile b/fonts/msttcorefonts/Makefile index 7f1c02972f5..c27d703d781 100644 --- a/fonts/msttcorefonts/Makefile +++ b/fonts/msttcorefonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/05/28 00:49:12 danj Exp $ +# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $ COMMENT= Microsoft TrueType core fonts @@ -9,9 +9,8 @@ CATEGORIES= fonts x11 HOMEPAGE= http://corefonts.sourceforge.net/ # Font source files have a restrictive license -PERMIT_PACKAGE_CDROM= Restrictive license, can't distribute modified files -PERMIT_PACKAGE_FTP= Restrictive license, can't distribute modified files -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= Restrictive license, can't distribute modified files +PERMIT_DISTFILES= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corefonts/} DIST_SUBDIR= ${DISTNAME} diff --git a/fonts/pkfonts/Makefile b/fonts/pkfonts/Makefile index 07f6d6f155b..84a856a2e91 100644 --- a/fonts/pkfonts/Makefile +++ b/fonts/pkfonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/03/11 11:06:05 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2019/07/14 02:16:51 naddy Exp $ COMMENT-main= English PK fonts (300dpi) for ghostscript, xdvi, etc. @@ -10,9 +10,8 @@ PKGNAME-main= pkfonts-dpi300-${VERSION} REVISION-main = 1 CATEGORIES= fonts print -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license S= FreeBSD-jp/ports-jp/LOCAL_PORTS/pkfonts MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/$S/ \ diff --git a/fonts/zh-taipeifonts/Makefile b/fonts/zh-taipeifonts/Makefile index b106416567d..5a4bd5d4229 100644 --- a/fonts/zh-taipeifonts/Makefile +++ b/fonts/zh-taipeifonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/01/29 09:15:24 kevlo Exp $ +# $OpenBSD: Makefile,v 1.6 2019/07/14 02:16:51 naddy Exp $ COMMENT= extra chinese fonts @@ -10,9 +10,8 @@ DIST_SUBDIR= zh-fonts MASTER_SITES= https://ftp.kh.edu.tw/Linux/CLE/fonts/bitmap/taipeifont/ -PERMIT_DISTFILES_FTP= no license -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license +PERMIT_DISTFILES= no license +PERMIT_PACKAGE= no license FONTS= taipei16.pcf.gz taipeik20.pcf.gz taipeim20.pcf.gz \ taipei24.pcf.gz taipeik24.pcf.gz taipeim24.pcf.gz diff --git a/games/doomdata/doom1/Makefile b/games/doomdata/doom1/Makefile index cf29bb85610..9081e3ec4fb 100644 --- a/games/doomdata/doom1/Makefile +++ b/games/doomdata/doom1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/03/11 11:07:38 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $ COMMENT = DOOM I data files @@ -16,9 +16,8 @@ MAINTAINER = Paul de Weerd PKG_ARCH = * # Commercial game data files (for GPL'ed game) -PERMIT_PACKAGE_CDROM = Commercial game data files -PERMIT_PACKAGE_FTP = Commercial game data files -PERMIT_DISTFILES_FTP = Commercial game data files +PERMIT_PACKAGE = Commercial game data files +PERMIT_DISTFILES = Commercial game data files FETCH_MANUALLY = "You must copy the original DOOM.WAD from your" FETCH_MANUALLY += "original distribution media and copy it to" diff --git a/games/doomdata/doom2/Makefile b/games/doomdata/doom2/Makefile index 5010ae85544..4ad08782d13 100644 --- a/games/doomdata/doom2/Makefile +++ b/games/doomdata/doom2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/03/11 11:07:38 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2019/07/14 02:16:51 naddy Exp $ COMMENT = DOOM II data files @@ -16,9 +16,8 @@ MAINTAINER = Paul de Weerd PKG_ARCH = * # Commercial game data files (for GPL'ed game) -PERMIT_PACKAGE_CDROM = Commercial game data files -PERMIT_PACKAGE_FTP = Commercial game data files -PERMIT_DISTFILES_FTP = Commercial game data files +PERMIT_PACKAGE = Commercial game data files +PERMIT_DISTFILES = Commercial game data files FETCH_MANUALLY = "You must copy the original DOOM2.WAD from your" FETCH_MANUALLY += "original distribution media and copy it to" diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 80bc5a53ed3..c40dde86fac 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2018/11/26 21:33:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2019/07/14 02:16:51 naddy Exp $ COMMENT = Enhanced Duke Nukem 3D engine RDATE = 20171105 @@ -14,9 +14,8 @@ HOMEPAGE = http://www.eduke32.com/ MAINTAINER = Ryan Freeman # GPLv2, BUILD license and shareware data -PERMIT_PACKAGE_CDROM = "BUILD engine license is not compatible with GPLv2." -PERMIT_PACKAGE_FTP = "BUILD engine license is not compatible with GPLv2." -PERMIT_DISTFILES_FTP = "BUILD engine license is not compatible with GPLv2." +PERMIT_PACKAGE = "BUILD engine license is not compatible with GPLv2." +PERMIT_DISTFILES = "BUILD engine license is not compatible with GPLv2." BUILD_DEPENDS = archivers/unzip \ graphics/gdk-pixbuf2 diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index f3e566543f9..086245b0dbf 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2019/01/06 21:26:03 thfr Exp $ +# $OpenBSD: Makefile,v 1.7 2019/07/14 02:16:51 naddy Exp $ COMMENT = open source game engine based on FreeSpace 2 @@ -14,9 +14,8 @@ HOMEPAGE = https://github.com/scp-fs2open/fs2open.github.com MAINTAINER = Thomas Frohwein # Volition custom license (non-commercial, not really a license) -PERMIT_PACKAGE_CDROM = selling explicitly prohibited -PERMIT_PACKAGE_FTP = no license at all -PERMIT_DISTFILES_FTP = no license at all +PERMIT_PACKAGE = no license at all +PERMIT_DISTFILES = no license at all WANTLIB += ${COMPILER_LIBCXX} c m z WANTLIB += SDL2 ${MODLUA_WANTLIB} openal diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile index 58761595366..edba99cc304 100644 --- a/games/sauerbraten/Makefile +++ b/games/sauerbraten/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2019/07/14 02:16:51 naddy Exp $ ONLY_FOR_ARCHS= i386 amd64 @@ -24,9 +24,8 @@ EXTRACT_SUFX= .tar.bz2 PKG_ARCH-data= * # zlib (code) + no modification (data) -PERMIT_PACKAGE_CDROM= no modify -PERMIT_PACKAGE_FTP= no modify -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= no modify +PERMIT_DISTFILES= Yes WRKDIST= ${WRKDIR}/${N}/src USE_GMAKE= Yes diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile index 8b15b631c5a..c66945d023c 100644 --- a/games/xbomber/Makefile +++ b/games/xbomber/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2017/10/23 17:10:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2019/07/14 02:16:52 naddy Exp $ COMMENT= colorful game where you blow other people/robots up @@ -10,9 +10,8 @@ CATEGORIES= games x11 HOMEPAGE= http://www.newbreedsoftware.com/xbomber/ -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No WANTLIB= X11 c m xcb MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/xbomber/ diff --git a/lang/go-bootstrap/Makefile b/lang/go-bootstrap/Makefile index a9800a804f3..862c2c1d058 100644 --- a/lang/go-bootstrap/Makefile +++ b/lang/go-bootstrap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2018/05/10 18:41:04 kn Exp $ +# $OpenBSD: Makefile,v 1.11 2019/07/14 02:16:52 naddy Exp $ ONLY_FOR_ARCHS = ${GO_ARCHS} @@ -16,9 +16,8 @@ HOMEPAGE = https://golang.org/ MAINTAINER = Joel Sing # software: BSD, documentation: CC-BY-3.0 -PERMIT_PACKAGE_CDROM = bootstrap only -PERMIT_PACKAGE_FTP = bootstrap only -PERMIT_DISTFILES_FTP = bootstrap only +PERMIT_PACKAGE = bootstrap only +PERMIT_DISTFILES = bootstrap only WANTLIB = c m pthread diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index 55abd507167..7446572cc29 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2015/06/18 06:57:21 bentley Exp $ +# $OpenBSD: Makefile,v 1.26 2019/07/14 02:16:52 naddy Exp $ COMMENT= mailing list manager @@ -12,9 +12,8 @@ HOMEPAGE= http://www.greatcircle.com/majordomo/ # I sent a mail to greatcircle.com asking for these permissions. # Until I get an answer, I assume nothing. # Read http://www.greatcircle.com/majordomo/LICENSE -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No WANTLIB= c MASTER_SITES= http://www.greatcircle.com/majordomo/$V/ \ diff --git a/misc/vmware-vncpasswd/Makefile b/misc/vmware-vncpasswd/Makefile index f38e0b78502..110d5ec0f27 100644 --- a/misc/vmware-vncpasswd/Makefile +++ b/misc/vmware-vncpasswd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2017/12/07 20:14:55 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2019/07/14 02:16:52 naddy Exp $ COMMENT= obfuscate passwords for VMware RemoteDisplay.vnc.key @@ -11,9 +11,8 @@ FIX_EXTRACT_PERMISSIONS=Yes HOMEPAGE= http://communities.vmware.com/docs/DOC-7535 # no license for vmware-vncpasswd.c; other files are ISC/PD -PERMIT_PACKAGE_CDROM= missing license -PERMIT_PACKAGE_FTP= missing license -PERMIT_DISTFILES_FTP= missing license +PERMIT_PACKAGE= missing license +PERMIT_DISTFILES= missing license WANTLIB= c diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile index 8cca37692e5..887ff24484c 100644 --- a/net/ctrace/Makefile +++ b/net/ctrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2015/02/16 22:57:10 naddy Exp $ +# $OpenBSD: Makefile,v 1.20 2019/07/14 02:16:52 naddy Exp $ COMMENT= multiprotocol traceroute tool @@ -7,9 +7,8 @@ REVISION= 2 CATEGORIES= net HOMEPAGE= http://www.pratyeka.org/ctrace/ -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license MASTER_SITES= ${HOMEPAGE}download/ diff --git a/net/mfi/Makefile b/net/mfi/Makefile index b2b64c2df9e..1eb7bf4b026 100644 --- a/net/mfi/Makefile +++ b/net/mfi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2019/06/11 00:38:35 kurt Exp $ +# $OpenBSD: Makefile,v 1.15 2019/07/14 02:16:52 naddy Exp $ COMMENT= Ubiquiti mfi wireless controller @@ -13,9 +13,8 @@ CATEGORIES= net MAINTAINER= Jasper Lievisse Adriaanse # at least the firmware files are restricted, if not more -PERMIT_PACKAGE_CDROM= http://www.ubnt.com/eula/ -PERMIT_PACKAGE_FTP= http://www.ubnt.com/eula/ -PERMIT_DISTFILES_FTP= http://www.ubnt.com/eula/ +PERMIT_PACKAGE= http://www.ubnt.com/eula/ +PERMIT_DISTFILES= http://www.ubnt.com/eula/ MASTER_SITES= http://dl.ubnt.com/mfi/$V/ diff --git a/net/nssl/Makefile b/net/nssl/Makefile index 25fc5d520fb..9849c93b7e5 100644 --- a/net/nssl/Makefile +++ b/net/nssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2019/05/10 16:50:05 danj Exp $ +# $OpenBSD: Makefile,v 1.11 2019/07/14 02:16:52 naddy Exp $ COMMENT= netcat-like program with transparent SSL support @@ -11,9 +11,8 @@ FIX_EXTRACT_PERMISSIONS=Yes HOMEPAGE= http://nssl.sourceforge.net/ # None -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No WANTLIB= crypto ssl c diff --git a/net/p5-Net-ICQ2000/Makefile b/net/p5-Net-ICQ2000/Makefile index 9314cde4acf..e71619e37dc 100644 --- a/net/p5-Net-ICQ2000/Makefile +++ b/net/p5-Net-ICQ2000/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2016/03/20 19:56:53 naddy Exp $ +# $OpenBSD: Makefile,v 1.16 2019/07/14 02:16:52 naddy Exp $ COMMENT= module for ICQv7 protocol realisation @@ -8,9 +8,8 @@ DISTNAME= Net-ICQ2000-0.2.1 REVISION= 2 CATEGORIES= net -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license MASTER_SITES= http://gonzo.kiev.ua/projects/vicq.old/ diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile index 1a71c8dec97..0603b96641c 100644 --- a/net/thcrut/Makefile +++ b/net/thcrut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2013/03/11 11:35:57 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2019/07/14 02:16:52 naddy Exp $ COMMENT= local network discovery tool @@ -10,9 +10,8 @@ HOMEPAGE= http://www.thehackerschoice.com/ LIB_DEPENDS= net/libnet/1.0 -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WANTLIB= c pcap lib/libnet-1.0/net=0 diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile index c424662e087..0ce722489fe 100644 --- a/plan9/9menu/Makefile +++ b/plan9/9menu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2017/10/23 17:11:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2019/07/14 02:16:52 naddy Exp $ COMMENT= simple menu patterned after plan9 @@ -13,9 +13,8 @@ MASTER_SITES= ftp://ftp.freefriends.org/arnold/Source/ EXTRACT_SUFX= .shar.gz # nonstandard license -PERMIT_PACKAGE_CDROM = No -PERMIT_PACKAGE_FTP = No -PERMIT_DISTFILES_FTP = No +PERMIT_PACKAGE = No +PERMIT_DISTFILES = No WANTLIB= X11 c xcb MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ diff --git a/security/ADMsnmp/Makefile b/security/ADMsnmp/Makefile index b7c8f246be0..3f67d2bc641 100644 --- a/security/ADMsnmp/Makefile +++ b/security/ADMsnmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2015/06/10 11:05:02 jca Exp $ +# $OpenBSD: Makefile,v 1.25 2019/07/14 02:16:52 naddy Exp $ COMMENT= SNMP audit scanner @@ -8,9 +8,8 @@ REVISION = 1 CATEGORIES= security EXTRACT_SUFX= .tgz -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WANTLIB= c MASTER_SITES= ftp://adm.freelsd.net/pub/ADM/ \ diff --git a/security/cryptcat/Makefile b/security/cryptcat/Makefile index ed7b359425d..ccfd1db08bb 100644 --- a/security/cryptcat/Makefile +++ b/security/cryptcat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/04/03 15:12:28 pascal Exp $ +# $OpenBSD: Makefile,v 1.7 2019/07/14 02:16:52 naddy Exp $ COMMENT= netcat enhanced with twofish encryption @@ -15,9 +15,8 @@ MAINTAINER= Laurent Fanis # From the README "freely given away # with no restrictions except giving credit where it is due" # Added Twofish encryption is under Cryptix General Licence -PERMIT_PACKAGE_CDROM= No clear Licence -PERMIT_PACKAGE_FTP= No clear Licence -PERMIT_DISTFILES_FTP= No clear Licence +PERMIT_PACKAGE= No clear Licence +PERMIT_DISTFILES= No clear Licence MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptcat/} diff --git a/security/p5-GPG/Makefile b/security/p5-GPG/Makefile index 8cce7cf08fc..d703a8cfa78 100644 --- a/security/p5-GPG/Makefile +++ b/security/p5-GPG/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2016/03/20 19:57:01 naddy Exp $ +# $OpenBSD: Makefile,v 1.23 2019/07/14 02:16:52 naddy Exp $ COMMENT= perl5 interface to GnuPG using scalars @@ -12,8 +12,7 @@ CPAN_AUTHOR= MILES RUN_DEPENDS= security/gnupg BUILD_DEPENDS= ${RUN_DEPENDS} -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license .include diff --git a/security/sentinel/Makefile b/security/sentinel/Makefile index dd0d7acdeab..659a39ed000 100644 --- a/security/sentinel/Makefile +++ b/security/sentinel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2019/02/08 19:07:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.24 2019/07/14 02:16:52 naddy Exp $ COMMENT= remote promiscuous mode detection tool @@ -8,9 +8,8 @@ CATEGORIES= security net HOMEPAGE= http://packetfactory.openwall.net/projects/sentinel/ -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WANTLIB= c pcap pthread lib/libnet-1.0/net=0 MASTER_SITES= http://packetfactory.openwall.net/projects/sentinel/ \ diff --git a/sysutils/tarsnap/Makefile b/sysutils/tarsnap/Makefile index 93216beda7d..739632cca97 100644 --- a/sysutils/tarsnap/Makefile +++ b/sysutils/tarsnap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2017/07/29 18:21:16 jturner Exp $ +# $OpenBSD: Makefile,v 1.15 2019/07/14 02:16:52 naddy Exp $ COMMENT= client for the tarsnap.com online encrypted backup service V= 1.0.39 @@ -10,9 +10,8 @@ MAINTAINER= James Turner # May not be modified and may only be used with tarsnap.com # see http://www.tarsnap.com/legal.html -PERMIT_PACKAGE_CDROM= restrictive licence -PERMIT_PACKAGE_FTP= restrictive licence -PERMIT_DISTFILES_FTP= restrictive licence +PERMIT_PACKAGE= restrictive licence +PERMIT_DISTFILES= restrictive licence WANTLIB += bz2>=10 c crypto lzma z diff --git a/telephony/asterisk-g729/Makefile b/telephony/asterisk-g729/Makefile index 944185f3003..3175c9ec046 100644 --- a/telephony/asterisk-g729/Makefile +++ b/telephony/asterisk-g729/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2019/05/19 11:26:25 naddy Exp $ +# $OpenBSD: Makefile,v 1.27 2019/07/14 02:16:52 naddy Exp $ COMMENT= G.729a voice codec for Asterisk DISTNAME= asterisk-g72x-1.4.3 @@ -11,9 +11,8 @@ MASTER_SITES= http://asterisk.hosting.lv/src/ HOMEPAGE= http://asterisk.hosting.lv/ # GPL frontend to patented algorithm; free to use for non-commercial purposes -PERMIT_DISTFILES_FTP= contains non-compiled proprietary Intel code -PERMIT_PACKAGE_CDROM= patents -PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES= contains non-compiled proprietary Intel code +PERMIT_PACKAGE= Yes WANTLIB += bcg729 diff --git a/textproc/html/Makefile b/textproc/html/Makefile index 89d31a69f6c..629935d0f5f 100644 --- a/textproc/html/Makefile +++ b/textproc/html/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2014/08/09 21:35:09 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2019/07/14 02:16:52 naddy Exp $ COMMENT= all W3C-published SGML DTDs for HTML @@ -6,9 +6,8 @@ DISTNAME= html-4.01 CATEGORIES= textproc # License: NONE -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license MASTER_SITES= ${MASTER_SITE_FREEBSD_LOCAL:=kuriyama/} EXTRACT_ONLY= # empty diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile index 0f0b9bbf551..a1fdd85dde1 100644 --- a/textproc/p5-Lingua-EN-Summarize/Makefile +++ b/textproc/p5-Lingua-EN-Summarize/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/20 19:57:05 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2019/07/14 02:16:52 naddy Exp $ COMMENT= summarize english text @@ -8,9 +8,8 @@ DISTNAME= Lingua-EN-Summarize-0.2 REVISION= 0 CATEGORIES= textproc -PERMIT_PACKAGE_CDROM= No licence -PERMIT_PACKAGE_FTP= No licence -PERMIT_DISTFILES_FTP= No licence +PERMIT_PACKAGE= No licence +PERMIT_DISTFILES= No licence RUN_DEPENDS= textproc/p5-HTML-Summary diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile index 620b9206638..f6cc5af8952 100644 --- a/textproc/spiff/Makefile +++ b/textproc/spiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/03/11 11:42:47 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2019/07/14 02:16:52 naddy Exp $ COMMENT= very flexible diff-like program @@ -11,9 +11,8 @@ MASTER_SITES= http://www.darwinsys.com/freeware/ MAINTAINER= Ian Darwin # custom -PERMIT_PACKAGE_CDROM= no fee -PERMIT_PACKAGE_FTP= may not modify -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= may not modify +PERMIT_DISTFILES= Yes WANTLIB= c m NO_TEST= Yes diff --git a/x11/amiwm/Makefile b/x11/amiwm/Makefile index 48ca03bcdde..a4ee5ea7742 100755 --- a/x11/amiwm/Makefile +++ b/x11/amiwm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/12/06 20:12:42 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2019/07/14 02:16:52 naddy Exp $ COMMENT= Amiga Workbench lookalike window manager @@ -11,9 +11,8 @@ MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html -PERMIT_PACKAGE_CDROM= restrictive -PERMIT_PACKAGE_FTP= restrictive -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE= restrictive +PERMIT_DISTFILES= Yes WANTLIB= ICE SM X11 Xext Xmu c m CONFIGURE_STYLE= gnu dest diff --git a/x11/mxconns/Makefile b/x11/mxconns/Makefile index 971d7fa609d..be8aa38db61 100644 --- a/x11/mxconns/Makefile +++ b/x11/mxconns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2016/05/05 19:52:29 naddy Exp $ +# $OpenBSD: Makefile,v 1.29 2019/07/14 02:16:52 naddy Exp $ COMMENT= interactive X11 proxy with selective X request replacement @@ -11,9 +11,8 @@ MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tgz # Restrictive -PERMIT_PACKAGE_CDROM= No -PERMIT_PACKAGE_FTP= No -PERMIT_DISTFILES_FTP= No +PERMIT_PACKAGE= No +PERMIT_DISTFILES= No WANTLIB += X11 Xau Xext Xm Xpm Xt c diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile index abd91680548..34b6eb45fbd 100644 --- a/x11/wmx/Makefile +++ b/x11/wmx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.30 2019/07/14 02:16:53 naddy Exp $ COMMENT= minimal window manager @@ -9,9 +9,8 @@ REVISION = 4 HOMEPAGE= http://www.all-day-breakfast.com/wmx/ MASTER_SITES= ${HOMEPAGE} -PERMIT_PACKAGE_CDROM= no license -PERMIT_PACKAGE_FTP= no license -PERMIT_DISTFILES_FTP= no license +PERMIT_PACKAGE= no license +PERMIT_DISTFILES= no license WANTLIB += ICE SM X11 Xau Xcomposite Xdmcp Xext Xft Xpm Xrender c expat WANTLIB += fontconfig freetype m ${COMPILER_LIBCXX} xcb z