summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz>2009-05-19 08:59:00 +0000
committerwiz <wiz>2009-05-19 08:59:00 +0000
commit53d692acd8a71f89a941dada62a4345937a07233 (patch)
tree6a9e4328c8c41ae43ff29db30f6e978dd26921b7 /net
parent3ed0ee791ad16bb4ffe35b3ae38c3c23a87b463f (diff)
downloadpkgsrc-53d692acd8a71f89a941dada62a4345937a07233.tar.gz
Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT
block). Uncomment some commented out LICENSE lines while here.
Diffstat (limited to 'net')
-rw-r--r--net/3proxy/Makefile13
-rw-r--r--net/DarwinStreamingServer/Makefile4
-rw-r--r--net/GeoIP/Makefile3
-rw-r--r--net/citrix_ica/Makefile4
-rw-r--r--net/clive/Makefile7
-rw-r--r--net/dgd/Makefile3
-rw-r--r--net/dhcpcd-gtk/Makefile11
-rw-r--r--net/dhcpcd/Makefile4
-rw-r--r--net/fetch/Makefile4
-rw-r--r--net/gated/Makefile12
-rw-r--r--net/gnome-nettool/Makefile3
-rw-r--r--net/irrtoolset-nox11/Makefile5
-rw-r--r--net/jwhois/Makefile5
-rw-r--r--net/libfetch/Makefile4
-rw-r--r--net/libtorrent/Makefile3
-rw-r--r--net/libvncserver/Makefile3
-rw-r--r--net/mrtg/Makefile4
-rw-r--r--net/msdl/Makefile3
-rw-r--r--net/openresolv/Makefile4
-rw-r--r--net/openvpn/Makefile4
-rw-r--r--net/parpd/Makefile4
-rw-r--r--net/powerdns-recursor/Makefile4
-rw-r--r--net/proftpd/Makefile4
-rw-r--r--net/ra-rtsp-proxy/Makefile4
-rw-r--r--net/rtorrent/Makefile3
-rw-r--r--net/skype/Makefile8
-rw-r--r--net/socks5/Makefile12
-rw-r--r--net/speedtouch/Makefile5
-rw-r--r--net/teamspeak-client/Makefile4
-rw-r--r--net/teamspeak-server/Makefile4
-rw-r--r--net/tinc/Makefile4
-rw-r--r--net/wireshark/Makefile5
32 files changed, 75 insertions, 89 deletions
diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index d72711fc267..d30ae7aef8c 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:38 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:25 wiz Exp $
#
DISTNAME= 3proxy-0.5.3k
@@ -11,6 +11,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://3proxy.ru/
COMMENT= Multi-protocol proxy
+# 3proxy-0.5.* is dual-licenced under GPL or custom terms. It's not
+# clear exactly which version of the GPL is intended; ${WRKSRC}/License
+# says "current version of GNU GPL" without specifying a numeric version
+# number. 3proxy-0.6.* will have a different license.
+LICENSE= 3proxy-0.5-license
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,12 +24,6 @@ MAKE_FILE= Makefile.unix
INSTALLATION_DIRS= sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-# 3proxy-0.5.* is dual-licenced under GPL or custom terms. It's not
-# clear exactly which version of the GPL is intended; ${WRKSRC}/License
-# says "current version of GNU GPL" without specifying a numeric version
-# number. 3proxy-0.6.* will have a different license.
-LICENSE= 3proxy-0.5-license
-
# We install only 3proxy and its man pages. There are several other
# binaries which we don't install, because the 3proxy executable
# provides a superset of the functionality of the others. We also don't
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 8a5a7fa6523..69026119aa2 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/10/19 19:18:31 he Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:26 wiz Exp $
DISTNAME= DarwinStreamingSrvr5.5.5-Source
PKGNAME= DarwinStreamingServer-5.5.5
@@ -9,8 +9,8 @@ MASTER_SITES= http://www.opensource.apple.com/projects/streaming/release/
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://developer.apple.com/opensource/server/streaming/
COMMENT= Open source version of Apple QuickTime Streaming Server
-
LICENSE= apple-public-source-license
+
RESTRICTED= Under APSL (see http://www.opensource.apple.com/apsl/).
NO_BIN_ON_CDROM=${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 3886c064d70..3d28eb16e59 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/05/03 13:34:24 abs Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:26 wiz Exp $
DISTNAME= GeoIP-1.4.6
PKGREVISION= 1
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.maxmind.com/download/geoip/api/c/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.maxmind.com/download/geoip/api/c/
COMMENT= Find the country from any IP address
-
#LICENSE= gnu-lgpl-v2.1
#LICENSE+= gnu-gpl-v2 # md5.c and types.h, from GNUPG
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index ebb8dcd0306..743a39259e5 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/10/07 09:57:58 sborrill Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:26 wiz Exp $
DISTNAME= citrix_ica-10.6.115659
PKGREVISION= 1
@@ -8,8 +8,8 @@ MASTER_SITES= # empty
MAINTAINER= sborrill@NetBSD.org
HOMEPAGE= http://www.citrix.com/English/SS/downloads/downloads.asp?dID=2755
COMMENT= Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
+LICENSE= citrix_ica-license
-LICENSE= citrix_ica-license
RESTRICTED= License prohibits redistribution
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/net/clive/Makefile b/net/clive/Makefile
index 3d420ff8538..5c5ad10a935 100644
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/13 12:08:41 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:26 wiz Exp $
#
DISTNAME= clive-2.1.12
@@ -9,6 +9,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://clive.sourceforge.net/
COMMENT= Command line video extraction tool for user-uploaded video hosts
+# similar, but not exact wording
+#LICENSE= mit
DEPENDS+= p5-BerkeleyDB>=0.34:../../databases/p5-BerkeleyDB
DEPENDS+= p5-Clipboard>=0.09:../../x11/p5-Clipboard
@@ -21,9 +23,6 @@ DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
DEPENDS+= p5-URI>=1.37:../../www/p5-URI
DEPENDS+= p5-WWW-Curl>=4.05:../../www/p5-WWW-Curl
-# similar, but not exact wording
-#LICENSE= mit
-
PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index b36f93f04e9..3ab9b7bb061 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:52 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:26 wiz Exp $
DISTNAME= dgd-1.2p4
PKGNAME= dgd-1.2.0.4
@@ -9,7 +9,6 @@ MASTER_SITES= ftp://ftp.dworkin.nl/pub/dgd/
MAINTAINER= sco@openface.ca
HOMEPAGE= http://www.dworkin.nl/dgd/
COMMENT= Object-oriented programmable server
-
LICENSE= fee-based-commercial-use
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile
index 92d41425823..06f34a957fd 100644
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2009/05/02 22:56:12 abs Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:26 wiz Exp $
#
DISTNAME= dhcpcd-ui-0.4.0
PKGNAME= dhcpcd-gtk-0.4.0
CATEGORIES= net
-LICENSE= modified-bsd
MASTER_SITES= ftp://roy.marples.name/pub/dhcpcd/
MASTER_SITES+= http://roy.aydogan.net/dhcpcd/
EXTRACT_SUFX= .tar.bz2
@@ -12,6 +11,10 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= roy@NetBSD.org
HOMEPAGE= http://roy.marples.name/projects/dhcpcd/
COMMENT= GTK+ systray monitor for dhcpcd
+LICENSE= modified-bsd
+
+DEPENDS+= dhcpcd-dbus>=0.4.0:../../net/dhcpcd-dbus
+BUILD_DEPENDS+= librsvg-[0-9]*:../../graphics/librsvg
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c99
@@ -19,10 +22,6 @@ USE_TOOLS+= pkg-config
INSTALL_MAKE_FLAGS+= SYSCONFDIR=${PREFIX}/share/gnome/autostart
-DEPENDS+= dhcpcd-dbus>=0.4.0:../../net/dhcpcd-dbus
-
-BUILD_DEPENDS+= librsvg>=0:../../graphics/librsvg
-
.include "../../x11/gtk2/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index f3c80b09217..5387d8483e6 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2009/05/11 08:29:28 roy Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:26 wiz Exp $
#
DISTNAME= dhcpcd-5.0.3
CATEGORIES= net
-LICENSE= modified-bsd
MASTER_SITES= ftp://roy.marples.name/pub/dhcpcd/
MASTER_SITES+= http://roy.aydogan.net/dhcpcd/
EXTRACT_SUFX= .tar.bz2
@@ -11,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= roy@NetBSD.org
HOMEPAGE= http://roy.marples.name/projects/dhcpcd/
COMMENT= RFC2131 compliant DHCP client
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c99
diff --git a/net/fetch/Makefile b/net/fetch/Makefile
index c55490f6ad5..1422f911619 100644
--- a/net/fetch/Makefile
+++ b/net/fetch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/09 19:14:40 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:26 wiz Exp $
#
DISTNAME= fetch-1.5
@@ -9,7 +9,7 @@ DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.FreeBSD.org/
COMMENT= Client to fetch URLs
-#LICENSE= modified-bsd
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 6775210270a..9fee45c60ca 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:26 wiz Exp $
DISTNAME= gated-3-5-11
PKGNAME= gated-3.5.11
@@ -10,18 +10,18 @@ MASTER_SITES= http://www.zcu.cz/ftp/pub/security/merit/gated/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gated.org/
COMMENT= Routing protocol daemon
+LICENSE= gated-license
-NOT_FOR_PLATFORM= Interix-*-* # no userland routing table support
-
-USE_TOOLS+= pax
-
-LICENSE= gated-license
RESTRICTED= Required license from Merit
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+NOT_FOR_PLATFORM= Interix-*-* # no userland routing table support
+
+USE_TOOLS+= pax
+
RCD_SCRIPTS= gated
RCD_SCRIPT_SRC.gated= ${FILESDIR}/gated
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index d97bf2b4b26..1013dd5bc00 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/18 11:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:26 wiz Exp $
#
DISTNAME= gnome-nettool-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME interface for various network tools
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 3d6ea4853a9..c9c786f725f 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/03/15 20:10:35 spz Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= IRRToolSet-4.8.5
@@ -9,14 +9,13 @@ MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
MAINTAINER= spz@NetBSD.org
HOMEPAGE= http://www.isc.org/index.pl?/sw/IRRToolSet/
COMMENT= The Internet Routing Registry Toolset - client to IRRd
+LICENSE= no-commercial-use
USE_LANGUAGES= c c++
USE_TOOLS+= bison flex gmake perl
INSTALLATION_DIRS= ${PKGBINDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
-LICENSE= no-commercial-use
-
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 973bf881042..5d1df05cbfd 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/01/10 10:02:00 shattered Exp $
+# $NetBSD: Makefile,v 1.62 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= jwhois-4.0
@@ -8,8 +8,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=jwhois/}
MAINTAINER= shattered@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/jwhois/
COMMENT= Configurable WHOIS client
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/net/libfetch/Makefile b/net/libfetch/Makefile
index 792a3603308..0622f8912fc 100644
--- a/net/libfetch/Makefile
+++ b/net/libfetch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/04/09 00:48:10 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= libfetch-2.23
@@ -9,7 +9,7 @@ DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.FreeBSD.org/
COMMENT= Library to access HTTP/FTP server
-#LICENSE= modified-bsd
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 65b91749d72..a3a63eb5f3f 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/10 09:06:20 tron Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:27 wiz Exp $
DISTNAME= libtorrent-0.12.2
CATEGORIES= net
@@ -7,7 +7,6 @@ MASTER_SITES= ${HOMEPAGE:=downloads/}
OWNER= tron@NetBSD.org
HOMEPAGE= http://libtorrent.rakshasa.no/
COMMENT= BitTorrent library written in C++ for *nix
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index be4a2811e75..661ff102c5a 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/07 12:19:15 obache Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= LibVNCServer-0.9.7
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
MAINTAINER= pierrick@bs-network.net
HOMEPAGE= http://libvncserver.sourceforge.net/
COMMENT= Easy API to write one's own vnc server
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index f43a27c8d07..3f86ba5a5e5 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2009/03/07 15:02:23 seb Exp $
+# $NetBSD: Makefile,v 1.92 2009/05/19 08:59:27 wiz Exp $
DISTNAME= mrtg-2.16.2
PKGREVISION= 2
@@ -9,7 +9,7 @@ MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://oss.oetiker.ch/mrtg/
COMMENT= The Multi-Router Traffic Grapher
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
USE_TOOLS+= perl:run
GNU_CONFIGURE= YES
diff --git a/net/msdl/Makefile b/net/msdl/Makefile
index 8d8f3867974..d46861bf266 100644
--- a/net/msdl/Makefile
+++ b/net/msdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/05 02:41:16 obache Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= msdl-1.2.4-r1
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msdl/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://msdl.sourceforge.net/
COMMENT= Media stream downloader
-
LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/openresolv/Makefile b/net/openresolv/Makefile
index 13b26e984ed..3ad8365d52e 100644
--- a/net/openresolv/Makefile
+++ b/net/openresolv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/04/30 16:27:11 roy Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= openresolv-3.3.1
CATEGORIES= net
-LICENSE= modified-bsd
MASTER_SITES= ftp://roy.marples.name/pub/openresolv/
MASTER_SITES+= http://roy.aydogan.net/openresolv/
EXTRACT_SUFX= .tar.bz2
@@ -11,6 +10,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= roy@NetBSD.org
HOMEPAGE= http://roy.marples.name/projects/openresolv/
COMMENT= Framework for managing /etc/resolv.conf
+LICENSE= modified-bsd
USE_LANGUAGES= # none
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index a21628faae7..067d0a0c651 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/12/05 08:13:35 hasso Exp $
+# $NetBSD: Makefile,v 1.29 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= openvpn-2.1_rc13
@@ -11,7 +11,7 @@ MASTER_SITES= http://openvpn.net/release/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://openvpn.net/
COMMENT= Easy-to-use SSL VPN daemon
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/parpd/Makefile b/net/parpd/Makefile
index b1835ee6613..19441c6b531 100644
--- a/net/parpd/Makefile
+++ b/net/parpd/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2009/04/24 09:47:47 roy Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:27 wiz Exp $
#
DISTNAME= parpd-1.4
CATEGORIES= net
-LICENSE= modified-bsd
MASTER_SITES= ftp://roy.marples.name/pub/parpd/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= roy@NetBSD.org
HOMEPAGE= http://roy.marples.name/projects/parpd/
COMMENT= RFC1027 compliant Proxy ARP Daemon
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c99
diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile
index fd74ef74eda..f2678febfdb 100644
--- a/net/powerdns-recursor/Makefile
+++ b/net/powerdns-recursor/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2009/04/21 22:52:37 roy Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:28 wiz Exp $
#
DISTNAME= pdns-recursor-3.1.7
CATEGORIES= net
-LICENSE= gnu-gpl-v2
MASTER_SITES= http://downloads.powerdns.com/releases/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= roy@NetBSD.org
HOMEPAGE= http://www.powerdns.com/
COMMENT= PowerDNS resolver/recursing nameserver
+LICENSE= gnu-gpl-v2
USE_TOOLS= gmake
USE_LANGUAGES= c c++
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 7b285f8e5bd..40c370d466d 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/02/09 11:57:48 tron Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:28 wiz Exp $
DISTNAME= proftpd-1.3.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.proftpd.org/
COMMENT= FTP server with Apache like configuration
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index 78a04efc3f2..3b89f7eb4b3 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/25 14:45:17 tron Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:28 wiz Exp $
DISTNAME= rtspd-src-1.0.0.0
PKGNAME= ra-rtsp-proxy-1.0.0.0
@@ -9,8 +9,8 @@ MASTER_SITES= http://www.scn.rain.com/pub/security/firewalls/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://service.real.com/firewall/fdev.html
COMMENT= Proxy server for the RealAudio RTSP protocol
+LICENSE= no-commercial-use
-LICENSE= no-commercial-use
RESTRICTED= ${LICENSE}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 4974677b7ef..031ebc5cc50 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/10 09:06:20 tron Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:28 wiz Exp $
DISTNAME= rtorrent-0.8.2
CATEGORIES= net
@@ -7,7 +7,6 @@ MASTER_SITES= ${HOMEPAGE:=downloads/}
OWNER= tron@NetBSD.org
HOMEPAGE= http://libtorrent.rakshasa.no/
COMMENT= Ncurses based torrent client with support for sessions
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 41eb0b72979..f97550582e1 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/02/05 00:53:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:28 wiz Exp $
#
DISTNAME= skype_static-1.4.0.118-oss
@@ -12,16 +12,16 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.skype.com/
COMMENT= P2P VoIP software
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= skype-license
+
RESTRICTED= Complex terms for redistribution.
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base compat fontconfig freetype2 glx \
libsigc++2 resmgr x11
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 54ead0de1ca..aa3e70f4fe6 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/02/10 17:18:43 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2009/05/19 08:59:28 wiz Exp $
DISTNAME= socks5-v1_0r2
PKGNAME= socks5-1.0.2
@@ -10,13 +10,9 @@ EXTRACT_SUFX= _tar.gz
MAINTAINER= ambrisko@ambrisko.roble.com
HOMEPAGE= http://www.socks.permeo.com/
COMMENT= SOCKS v5 application layer gateway and clients
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-CONFLICTS= socks4-[0-9]*
-
# XXX missing
LICENSE= socks5-license
+
RESTRICTED= no commercial use
# Set all pending someone looking at the license.
NO_SRC_ON_FTP= ${RESTRICTED}
@@ -24,6 +20,10 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
+CONFLICTS= socks4-[0-9]*
+
# here are some extra configure args you may wish to use
# see the readme file before screwing with them
#
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index ab17bd10bab..0566d2aa28b 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/02/10 12:55:25 abs Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:28 wiz Exp $
DISTNAME= speedtouch-1.3.1
PKGREVISION= 4
@@ -15,11 +15,10 @@ SITES.${FIRMWARE_SRCS}= http://www.speedtouch.com/download/drivers/USB/
DISTFILES+= ${FIRMWARE_SRCS}
EXTRACT_OPTS_ZIP= -Laqo -d ${WRKDIR}/firmware
-LICENSE= speedtouch-firmware-license
-
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.xsproject.org/speedtouch/
COMMENT= Alcatel SpeedTouch USB ADSL modem driver
+LICENSE= speedtouch-firmware-license
DEPENDS+= userppp>=001107:../../net/userppp
diff --git a/net/teamspeak-client/Makefile b/net/teamspeak-client/Makefile
index dff0fe10aca..c5f775a7d3c 100644
--- a/net/teamspeak-client/Makefile
+++ b/net/teamspeak-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/30 21:24:44 zafer Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:28 wiz Exp $
PKGNAME= teamspeak-client-2.0.32.60
DISTNAME= ts2_client_rc2_2032
@@ -9,12 +9,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.goteamspeak.com/
COMMENT= Teamspeak group VoIP client
+LICENSE= teamspeak-license-200700213
RESTRICTED= Redistribution to third parties is expressly prohibited
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= teamspeak-license-200700213
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base jpeg x11
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index 4ccbb45d7a0..d55684994b3 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/01/06 22:53:30 abs Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:28 wiz Exp $
PKGNAME= teamspeak-server-2.0.24.01
DISTNAME= ts2_server_rc2_202319
@@ -12,12 +12,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} server_linux
MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.goteamspeak.com/
COMMENT= Teamspeak group VoIP server
+LICENSE= teamspeak-license-200700213
RESTRICTED= Redistribution to third parties is expressly prohibited
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= teamspeak-license-200700213
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 6f203b834f9..1993289ed16 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/04/18 19:27:11 tonnerre Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:28 wiz Exp $
#
DISTNAME= tinc-1.0.9
@@ -7,8 +7,8 @@ MASTER_SITES= http://www.tinc-vpn.org/packages/
MAINTAINER= tonnerre@NetBSD.org
HOMEPAGE= http://www.tinc-vpn.org/
-LICENSE= gnu-gpl-v2
COMMENT= Virtual Private Network (VPN) daemon
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index b6c2902d421..6d281c92551 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/10 07:21:28 tron Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:29 wiz Exp $
DISTNAME= wireshark-1.0.7
CATEGORIES= net
@@ -9,13 +9,12 @@ EXTRACT_SUFX= .tar.bz2
OWNER= tron@NetBSD.org
HOMEPAGE= http://www.wireshark.org/
COMMENT= Network protocol analyzer
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= ethereal-[0-9]*
-LICENSE= gnu-gpl-v2
-
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config