Missed PERMIT_* cleanup.

jasperla · Mar 19, 2013 · 06a1f75 · 06a1f75
1 parent b127df0
commit 06a1f75
Show file tree

Hide file tree

Showing 44 changed files with 3 additions and 125 deletions.
diff --git a/audio/qtscrobbler/Makefile b/audio/qtscrobbler/Makefile
@@ -20,9 +20,6 @@ MAINTAINER = 		dukzcry <lomka@gero.in>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB-main += c crypto curl idn m mtp pthread ssl stdc++ usb z
 WANTLIB-main += ${MODGETTEXT_WANTLIB}

diff --git a/converters/p5-Convert-Bencode/Makefile b/converters/p5-Convert-Bencode/Makefile
@@ -8,9 +8,6 @@ CATEGORIES=	converters
 MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 

diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
@@ -8,9 +8,6 @@ CATEGORIES=	converters
 MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
@@ -18,10 +18,7 @@ MASTER_SITES =	${MASTER_SITE_KDE:=stable/kdevelop/$V/src/}
 DIST_SUBDIR =	kde
 
 # GPLv2+, LGPLv2.1+, GNU FDLv1.2
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtDeclarative lib/qt4/QtGui

diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
@@ -25,10 +25,7 @@ MASTER_SITES =	${MASTER_SITE_KDE:=stable/kdevelop/${V:C/^./4/}/src/}
 DIST_SUBDIR =	kde
 
 # LGPLv2+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork

diff --git a/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
@@ -7,9 +7,6 @@ CATEGORIES=		devel
 
 # Perl
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 RUN_DEPENDS=		devel/p5-Want
 

diff --git a/devel/py-couchapp/Makefile b/devel/py-couchapp/Makefile
@@ -14,9 +14,6 @@ MAINTAINER =	Christian Rueger <cr+openbsd@rueger-net.de>
 
 # Apache2
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 
 WANTLIB =	${MODPY_WANTLIB}
 

diff --git a/devel/virtinst/Makefile b/devel/virtinst/Makefile
@@ -14,9 +14,6 @@ MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=		devel/gettext \
 			lang/python

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
@@ -54,10 +54,7 @@ VMEM_WARNING =	Yes
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/${DISTNAME}/}
 
 # GPLv2+, LGPLv2+ and GNU FDLv1.2
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 MODULES =	x11/kde4
 

diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
@@ -10,10 +10,7 @@ EXTRACT_SUFX =	.tar.bz2
 MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE:=kile/}
 
 # GPLv2+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork

diff --git a/games/etlegacy/Makefile b/games/etlegacy/Makefile
@@ -32,9 +32,6 @@ CONFIGURE_ARGS =	-DINSTALL_DEFAULT_MODDIR:String=share/enemy-territory \
 
 # GPLv3+additions
 PERMIT_PACKAGE_CDROM=		Yes
-PERMIT_PACKAGE_FTP=		Yes
-PERMIT_DISTFILES_CDROM=		Yes
-PERMIT_DISTFILES_FTP=		Yes
 
 post-install:
 	cp ${FILESDIR}/etlegacy.sh ${WRKSRC}/

diff --git a/games/netrek/client/Makefile b/games/netrek/client/Makefile
@@ -13,9 +13,6 @@ MASTER_SITES =		${HOMEPAGE}/files/COW/
 
 # BSD-like
 PERMIT_PACKAGE_CDROM =  Yes
-PERMIT_PACKAGE_FTP =    Yes
-PERMIT_DISTFILES_CDROM =Yes
-PERMIT_DISTFILES_FTP =  Yes
 
 LIB_DEPENDS =		devel/gmp \
 			devel/sdl-mixer \

diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
@@ -25,8 +25,6 @@ PKG_ARCH-data=	i386,amd64
 # zlib (code) + no modification (data)
 PERMIT_PACKAGE_CDROM=   No
 PERMIT_PACKAGE_FTP=     No
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 WRKDIST=		${WRKDIR}/${N}/src
 AUTOCONF_VERSION=	2.62

diff --git a/geo/gpsdrive/Makefile b/geo/gpsdrive/Makefile
@@ -12,9 +12,6 @@ MAINTAINER =		Matthias Kilian <kili@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 
 MASTER_SITES =		${HOMEPAGE}packages/
 

diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
@@ -22,9 +22,6 @@ ERRORS =	"Fatal: You must select the turbo flavor. This is jpeg-turbo after all.
 
 # BSD-style
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
 DISTFILES =	libjpeg-turbo-${V}.tar.gz

diff --git a/graphics/qimageblitz/Makefile b/graphics/qimageblitz/Makefile
@@ -10,10 +10,7 @@ EXTRACT_SUFX =	.tar.bz2
 SHARED_LIBS =	qimageblitz         0.0      # .4.0
 
 # 2-clause BSDL
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/qimageblitz/}
 

diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
@@ -13,9 +13,6 @@ MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
 
 # custom, see fractsrc.txt
 PERMIT_PACKAGE_CDROM =	 Yes
-PERMIT_PACKAGE_FTP =	 Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP =	 Yes
 
 WANTLIB += X11 Xft c fontconfig m
 

diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
@@ -11,10 +11,7 @@ HOMEPAGE =	http://pauillac.inria.fr/~ddr/camlp5/
 MAINTAINER =	Christopher Zimmermann <madroach@gmerlin.de>
 
 # BSD3
-PERMIT_PACKAGE_FTP =		Yes
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_DISTFILES_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
 
 MODULES =		lang/ocaml
 

diff --git a/lang/smarteiffel/Makefile b/lang/smarteiffel/Makefile
@@ -13,9 +13,6 @@ HOMEPAGE=		http://smarteiffel.loria.fr/
 # Compiler: GPL
 # Class libraries: MIT
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=		http://distfiles.nl/
 

diff --git a/lang/utop/Makefile b/lang/utop/Makefile
@@ -12,10 +12,7 @@ HOMEPAGE =	http://ounit.forge.ocamlcore.org/
 MAINTAINER =	Christopher Zimmermann <madroach@gmerlin.de>
 
 # BSD3
-PERMIT_PACKAGE_FTP =		Yes
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_DISTFILES_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
 
 MODULES =		lang/ocaml
 

diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
@@ -17,9 +17,6 @@ MAINTAINER =	Christopher Zimmermann <madroach@gmerlin.de>
 
 # 2-clause BSD
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 
 SEPARATE_BUILD =	Yes
 

diff --git a/misc/p5-Palm-Keyring/Makefile b/misc/p5-Palm-Keyring/Makefile
@@ -8,9 +8,6 @@ CATEGORIES=	perl5 misc
 MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 CPAN_AUTHOR=	ANDREW

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
@@ -15,9 +15,6 @@ SHARED_LIBS +=           rpm                       1.0 \
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =   Yes
-PERMIT_PACKAGE_FTP =     Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP =   Yes
 
 MASTER_SITES =           http://rpm.org/releases/rpm-4.9.x/
 

diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
@@ -10,10 +10,7 @@ MASTER_SITES =	${MASTER_SITE_KDE:=stable/cagibi/}
 EXTRACT_SUFX =	.tar.bz2
 
 # GPLv2+ and LGPLv2.1+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtXml

diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile
@@ -10,9 +10,7 @@ MAINTAINER=		OpenBSD ports <ports@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=  	No
-PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM=	No
-PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		c
 
 MASTER_SITES=           ${HOMEPAGE}download/ \

diff --git a/net/ktorrent-kde4/Makefile b/net/ktorrent-kde4/Makefile
@@ -22,10 +22,7 @@ WANTLIB += syndication tag
 MASTER_SITES =	${HOMEPAGE}downloads/$V/
 
 # GPLv2+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 MODULES =	x11/kde4
 MODKDE4_USE =	pim workspace

diff --git a/net/libktorrent/Makefile b/net/libktorrent/Makefile
@@ -11,10 +11,7 @@ EXTRACT_SUFX =	.tar.bz2
 SHARED_LIBS =	ktorrent	0.0
 
 # GPLv2+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtSvg lib/qt4/QtXml

diff --git a/net/p5-Net-BitTorrent-File/Makefile b/net/p5-Net-BitTorrent-File/Makefile
@@ -12,9 +12,6 @@ MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 # perl
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 

diff --git a/net/p5-Net-Telnet-Trango/Makefile b/net/p5-Net-Telnet-Trango/Makefile
@@ -8,9 +8,6 @@ CATEGORIES=	net
 MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 

diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile
@@ -9,9 +9,6 @@ MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 # perl
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 CONFIGURE_STYLE=modbuild

diff --git a/net/p5-Transmission-Client/Makefile b/net/p5-Transmission-Client/Makefile
@@ -9,9 +9,6 @@ MAINTAINER=	Andrew Fresh <andrew@cpan.org>
 
 # perl
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 MODULES=	cpan
 CPAN_AUTHOR=    JHTHORSEN

diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile
@@ -14,7 +14,6 @@ HOMEPAGE =		http://rtmpdump.mplayerhq.hu/
 
 # tools GPLv2+, librtmp LGPLv2.1+
 PERMIT_PACKAGE_CDROM =	No
-PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB =		c crypto pthread ssl z
 

diff --git a/productivity/akonadi/Makefile b/productivity/akonadi/Makefile
@@ -2,7 +2,7 @@
 
 CATEGORIES =	productivity
 COMMENT =	PIM cache and access services
-DISTNAME =	akonadi-1.9.0
+DISTNAME =	akonadi-1.9.1
 HOMEPAGE =	http://community.kde.org/KDE_PIM/Akonadi
 
 SHARED_LIBS = 	akonadiprotocolinternals 1.0	# 1.0

diff --git a/productivity/akonadi/distinfo b/productivity/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (akonadi-1.9.0.tar.bz2) = b/XCPkJu/AJ4TUqxpubf8kyO/oH9NOx4u1K7TXcz4BM=
-SIZE (akonadi-1.9.0.tar.bz2) = 220255
+SHA256 (akonadi-1.9.1.tar.bz2) = U65JogOcwEVHlfFPbHwIeA85mQZSxFhD9CZmVMmaIPA=
+SIZE (akonadi-1.9.1.tar.bz2) = 220354
diff --git a/productivity/libkgapi/Makefile b/productivity/libkgapi/Makefile
@@ -12,10 +12,7 @@ MASTER_SITES =	${MASTER_SITE_KDE:=stable/libkgapi/$V/src/}
 SHARED_LIBS =   kgapi                     0.0 # 0.4
 
 # GPLv2+
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork

diff --git a/security/chroot_safe/Makefile b/security/chroot_safe/Makefile
@@ -11,9 +11,6 @@ MAINTAINER=		Sergey Bronnikov <estetus@gmail.com>
 
 # BSD
 PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB += m stdc++
 

diff --git a/telephony/freeswitch/Makefile b/telephony/freeswitch/Makefile
@@ -16,9 +16,6 @@ MAINTAINER =	Sergey Bronnikov <estetus@gmail.com>
 
 # MPL
 PERMIT_PACKAGE_CDROM =		Yes
-PERMIT_PACKAGE_FTP =		Yes
-PERMIT_DISTFILES_CDROM =	Yes
-PERMIT_DISTFILES_FTP =		Yes
 
 MODULES =	lang/python
 WANTLIB =	c crypto m ncurses pthread ssl stdc++

diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
@@ -16,9 +16,6 @@ HOMEPAGE =	http://xalan.apache.org/index.html
 
 # Apache 2.0
 PERMIT_PACKAGE_CDROM =   Yes
-PERMIT_PACKAGE_FTP =     Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP =   Yes
 
 MASTER_SITES =	http://mirrors.ukfast.co.uk/sites/ftp.apache.org/xml/xalan-c/source/
 

diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile
@@ -12,10 +12,7 @@ MASTER_SITES =	ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
 		http://www.ohvost.ru/dnl/kde/src/
 
 # LGPLv2+
-PERMIT_DISTFILES_CDROM =        Yes
-PERMIT_DISTFILES_FTP =          Yes
 PERMIT_PACKAGE_CDROM =          Yes
-PERMIT_PACKAGE_FTP =            Yes
 
 WANTLIB =  c m pthread stdc++
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork