summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/bicom/Makefile4
-rw-r--r--archivers/fcrackzip/Makefile3
-rw-r--r--archivers/lha/Makefile4
-rw-r--r--archivers/ppunpack/Makefile3
-rw-r--r--archivers/rar/Makefile8
-rw-r--r--archivers/sapcar/Makefile4
-rw-r--r--archivers/szip/Makefile10
-rw-r--r--archivers/unace-bin/Makefile8
-rw-r--r--archivers/unace/Makefile10
-rw-r--r--archivers/unarj/Makefile4
-rw-r--r--archivers/unrar/Makefile24
-rw-r--r--archivers/xbin/Makefile4
-rw-r--r--archivers/xmill/Makefile18
-rw-r--r--archivers/zip1/Makefile4
-rw-r--r--archivers/zoo/Makefile3
-rw-r--r--audio/cddb-bundle/Makefile3
-rw-r--r--audio/cdplayer/Makefile3
-rw-r--r--audio/eawpatches/Makefile4
-rw-r--r--audio/espeak/Makefile5
-rw-r--r--audio/festlex-oald/Makefile6
-rw-r--r--audio/festlex-ogi/Makefile5
-rw-r--r--audio/festogi-spanish/Makefile5
-rw-r--r--audio/festvox-abc/Makefile5
-rw-r--r--audio/festvox-aec/Makefile5
-rw-r--r--audio/festvox-el11/Makefile5
-rw-r--r--audio/festvox-en1/Makefile5
-rw-r--r--audio/festvox-hvs/Makefile5
-rw-r--r--audio/festvox-jph/Makefile5
-rw-r--r--audio/festvox-mwm/Makefile5
-rw-r--r--audio/festvox-ogirab/Makefile5
-rw-r--r--audio/festvox-tll/Makefile5
-rw-r--r--audio/festvox-us1/Makefile5
-rw-r--r--audio/festvox-us2/Makefile5
-rw-r--r--audio/festvox-us3/Makefile5
-rw-r--r--audio/fluidsynth/Makefile3
-rw-r--r--audio/gogo/Makefile16
-rw-r--r--audio/lame/Makefile3
-rw-r--r--audio/mbrola/Makefile3
-rw-r--r--audio/mbrolavox-en1/Makefile5
-rw-r--r--audio/mbrolavox-us1/Makefile5
-rw-r--r--audio/mbrolavox-us2/Makefile5
-rw-r--r--audio/mbrolavox-us3/Makefile5
-rw-r--r--audio/mpg123/Makefile.common6
-rw-r--r--audio/shntool/Makefile5
-rw-r--r--audio/shorten/Makefile3
-rw-r--r--benchmarks/iozone/Makefile3
-rw-r--r--benchmarks/netio/Makefile3
-rw-r--r--biology/phylip/Makefile4
-rw-r--r--cad/eagle/Makefile8
-rw-r--r--cad/lc/Makefile7
-rw-r--r--cad/simian-docs/Makefile4
-rw-r--r--cad/simian/Makefile4
-rw-r--r--chat/ejabberd/Makefile3
-rw-r--r--chat/tkicb/Makefile4
-rw-r--r--chat/weechat/Makefile5
-rw-r--r--chat/ymessenger/Makefile4
-rw-r--r--comms/bthfp/Makefile3
-rw-r--r--comms/estic/Makefile8
-rw-r--r--comms/kermit/Makefile3
-rw-r--r--comms/obexapp/Makefile3
-rw-r--r--converters/convmv/Makefile5
-rw-r--r--converters/dvi2tty/Makefile3
-rw-r--r--converters/ja-dvi2tty/Makefile5
-rw-r--r--converters/libiconv/Makefile4
-rw-r--r--converters/p5-MIME-Base64/Makefile4
-rw-r--r--databases/guile-pg/Makefile4
-rw-r--r--databases/lua-tokyocabinet/Makefile3
-rw-r--r--databases/p5-DBD-PgPP/Makefile4
-rw-r--r--databases/p5-tokyocabinet/Makefile3
-rw-r--r--databases/p5-tokyotyrant/Makefile3
-rw-r--r--databases/palm-db-tools/Makefile5
-rw-r--r--databases/ruby-tokyocabinet/Makefile3
-rw-r--r--databases/ruby-tokyotyrant/Makefile3
-rw-r--r--databases/sqlite3/Makefile.common3
-rw-r--r--databases/tokyocabinet/Makefile3
-rw-r--r--databases/tokyotyrant/Makefile3
-rw-r--r--devel/GConf/Makefile.common3
-rw-r--r--devel/Gorm/Makefile3
-rw-r--r--devel/ObjectiveLib/Makefile5
-rw-r--r--devel/ProjectCenter/Makefile3
-rw-r--r--devel/SDL_Pango/Makefile5
-rw-r--r--devel/SDL_gfx/Makefile3
-rw-r--r--devel/coccinelle/Makefile5
-rw-r--r--devel/diffuse/Makefile3
-rw-r--r--devel/eclipse/Makefile3
-rw-r--r--devel/edcommon/Makefile3
-rw-r--r--devel/fromcvs/Makefile5
-rw-r--r--devel/gmp/Makefile4
-rw-r--r--devel/gnustep-base/Makefile5
-rw-r--r--devel/gnustep-examples/Makefile5
-rw-r--r--devel/gnustep-make/Makefile5
-rw-r--r--devel/gnustep-objc-lf2/Makefile5
-rw-r--r--devel/gnustep-objc/Makefile5
-rw-r--r--devel/gtl/Makefile5
-rw-r--r--devel/guile-www/Makefile5
-rw-r--r--devel/hptools/Makefile4
-rw-r--r--devel/its4/Makefile3
-rw-r--r--devel/libFoundation-examples/Makefile3
-rw-r--r--devel/libFoundation/Makefile3
-rw-r--r--devel/libdatrie/Makefile3
-rw-r--r--devel/libgsf/Makefile3
-rw-r--r--devel/libidn/Makefile3
-rw-r--r--devel/libowfat/Makefile4
-rw-r--r--devel/libstatgrab/Makefile5
-rw-r--r--devel/libthai/Makefile3
-rw-r--r--devel/libtool/Makefile.common4
-rw-r--r--devel/m17n-lib/Makefile3
-rw-r--r--devel/m4/Makefile4
-rw-r--r--devel/meld/Makefile5
-rw-r--r--devel/p5-Date-Business/Makefile5
-rw-r--r--devel/pango/Makefile3
-rw-r--r--devel/popt/Makefile3
-rw-r--r--devel/pvs/Makefile4
-rw-r--r--devel/py-InlineEgg/Makefile5
-rw-r--r--devel/py-babel/Makefile3
-rw-r--r--devel/py-game/Makefile3
-rw-r--r--devel/readline/Makefile4
-rw-r--r--devel/ruby-rcsparse/Makefile3
-rw-r--r--devel/sapnwrfcsdk/Makefile4
-rw-r--r--devel/subversion/Makefile.common3
-rw-r--r--devel/tailor/Makefile4
-rw-r--r--devel/wide/Makefile5
-rw-r--r--devel/xdelta3/Makefile3
-rw-r--r--devel/xfce4-dev-tools/Makefile4
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/nano/Makefile5
-rw-r--r--editors/pico/Makefile3
-rw-r--r--emulators/darcnes/Makefile.common3
-rw-r--r--emulators/palmosemulator/Makefile5
-rw-r--r--emulators/sdlmame/Makefile.common8
-rw-r--r--emulators/spim/Makefile8
-rw-r--r--emulators/vmware/Makefile5
-rw-r--r--emulators/vmware3/Makefile5
-rw-r--r--emulators/xm7/Makefile14
-rw-r--r--emulators/xmame/Makefile4
-rw-r--r--emulators/xmess/Makefile4
-rw-r--r--fonts/acroread5-font-share/Makefile.common4
-rw-r--r--fonts/acroread7-font-share/Makefile.common4
-rw-r--r--fonts/bakoma-fonts/Makefile4
-rw-r--r--fonts/cyberbit-ttf/Makefile.common8
-rw-r--r--fonts/dbz-ttf/Makefile8
-rw-r--r--fonts/inconsolata-ttf/Makefile3
-rw-r--r--fonts/ja-elisat/Makefile5
-rw-r--r--fonts/ja-elisau/Makefile5
-rw-r--r--fonts/ja-kaname/Makefile5
-rw-r--r--fonts/ms-ttf/Makefile8
-rw-r--r--games/gate88/Makefile16
-rw-r--r--games/gbrainy/Makefile3
-rw-r--r--games/gcompris/Makefile4
-rw-r--r--games/gnome-games/Makefile3
-rw-r--r--games/quake3arena/Makefile14
-rw-r--r--games/quakedata/Makefile8
-rw-r--r--games/rollemup/Makefile4
-rw-r--r--games/velena/Makefile4
-rw-r--r--games/wesnoth/Makefile5
-rw-r--r--games/xdoom/Makefile3
-rw-r--r--games/xfrisk/Makefile10
-rw-r--r--geography/epsg-docs/Makefile3
-rw-r--r--geography/epsg/Makefile5
-rw-r--r--graphics/Cenon/Makefile3
-rw-r--r--graphics/clutter-box2d/Makefile3
-rw-r--r--graphics/clutter-cairo/Makefile3
-rw-r--r--graphics/clutter-gtk/Makefile3
-rw-r--r--graphics/clutter/Makefile3
-rw-r--r--graphics/comix/Makefile3
-rw-r--r--graphics/eog/Makefile3
-rw-r--r--graphics/exiv2/Makefile5
-rw-r--r--graphics/goocanvas/Makefile3
-rw-r--r--graphics/goocanvasmm/Makefile3
-rw-r--r--graphics/jpeg2ps/Makefile4
-rw-r--r--graphics/jpeg_ls/Makefile4
-rw-r--r--graphics/lcms/Makefile7
-rw-r--r--graphics/libkdcraw/Makefile3
-rw-r--r--graphics/p5-clutter/Makefile3
-rw-r--r--graphics/povray/Makefile5
-rw-r--r--graphics/pstoedit/Makefile8
-rw-r--r--graphics/py-cairo/Makefile3
-rw-r--r--graphics/py-clutter/Makefile3
-rw-r--r--graphics/py-goocanvas/Makefile3
-rw-r--r--graphics/qvplay/Makefile4
-rw-r--r--graphics/radiance/Makefile5
-rw-r--r--graphics/xv/Makefile4
-rw-r--r--ham/7plus/Makefile5
-rw-r--r--inputmethod/gtk-im-libthai/Makefile3
-rw-r--r--inputmethod/m17n-im-config/Makefile3
-rw-r--r--lang/inform/Makefile3
-rw-r--r--lang/jbuilder-jit/Makefile4
-rw-r--r--lang/jdk/Makefile3
-rw-r--r--lang/jini/Makefile15
-rw-r--r--lang/perl5/Makefile4
-rw-r--r--lang/sun-jdk14/Makefile5
-rw-r--r--lang/sun-jdk15/Makefile6
-rw-r--r--lang/sun-jdk6/Makefile5
-rw-r--r--lang/sun-jre14/Makefile5
-rw-r--r--lang/sun-jre15/Makefile6
-rw-r--r--lang/sun-jre6/Makefile6
-rw-r--r--lang/twelf/Makefile8
-rw-r--r--mail/GNUMail/Makefile3
-rw-r--r--mail/OSBF-lua/Makefile4
-rw-r--r--mail/Pantomime/Makefile3
-rw-r--r--mail/clamav/Makefile3
-rw-r--r--mail/claws-mail/Makefile.common5
-rw-r--r--mail/courier-analog/Makefile5
-rw-r--r--mail/courier-mta/Makefile.common4
-rw-r--r--mail/cucipop/Makefile3
-rw-r--r--mail/dk-milter/Makefile8
-rw-r--r--mail/dkim-milter/Makefile8
-rw-r--r--mail/evolution-data-server/Makefile3
-rw-r--r--mail/evolution-sharp/Makefile3
-rw-r--r--mail/faces/Makefile12
-rw-r--r--mail/fromto/Makefile4
-rw-r--r--mail/majordomo/Makefile3
-rw-r--r--mail/milter-greylist/Makefile3
-rw-r--r--mail/mpop/Makefile5
-rw-r--r--mail/msmtp/Makefile5
-rw-r--r--mail/mush/Makefile4
-rw-r--r--mail/pine/Makefile6
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/sendmail/Makefile.common3
-rw-r--r--mail/sendmail813/Makefile.common3
-rw-r--r--mail/spamassassin/Makefile5
-rw-r--r--mail/xfmail/Makefile3
-rw-r--r--math/gap/Makefile5
-rw-r--r--math/py-ephem/Makefile8
-rw-r--r--meta-pkgs/gnuradio/Makefile.common5
-rw-r--r--meta-pkgs/xfce4/Makefile.common4
-rw-r--r--misc/Addresses/Makefile3
-rw-r--r--misc/astrolog/Makefile4
-rw-r--r--misc/cksfv/Makefile3
-rw-r--r--misc/fep/Makefile4
-rw-r--r--misc/gnome-devel-docs/Makefile3
-rw-r--r--misc/m17n-contrib/Makefile3
-rw-r--r--misc/m17n-db/Makefile3
-rw-r--r--misc/m17n-docs/Makefile3
-rw-r--r--misc/mnemosyne/Makefile3
-rw-r--r--misc/molden/Makefile16
-rw-r--r--misc/orca/Makefile3
-rw-r--r--misc/ppower/Makefile5
-rw-r--r--misc/rlwrap/Makefile5
-rw-r--r--misc/sch/Makefile3
-rw-r--r--misc/softmaker-office-demo/Makefile4
-rw-r--r--misc/zyGrib-maps/Makefile3
-rw-r--r--misc/zyGrib/Makefile5
-rw-r--r--multimedia/adobe-flash-plugin/Makefile4
-rw-r--r--multimedia/clutter-gst/Makefile3
-rw-r--r--multimedia/libdvdcss/Makefile10
-rw-r--r--multimedia/ns-flash/Makefile12
-rw-r--r--multimedia/win32-codecs/Makefile16
-rw-r--r--multimedia/xanim/Makefile5
-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
-rw-r--r--news/nntpcache/Makefile3
-rw-r--r--news/nntpclnt/Makefile8
-rw-r--r--news/tin/Makefile4
-rw-r--r--news/trn/Makefile5
-rw-r--r--pkgtools/digest/Makefile4
-rw-r--r--pkgtools/p5-pkgsrc-Dewey/Makefile4
-rw-r--r--pkgtools/pkg_install/Makefile4
-rw-r--r--pkgtools/rpm2pkg/Makefile5
-rw-r--r--pkgtools/x11-links/Makefile4
-rw-r--r--pkgtools/xpkgwedge/Makefile4
-rw-r--r--print/acroread/Makefile4
-rw-r--r--print/acroread5/Makefile14
-rw-r--r--print/acroread7/Makefile16
-rw-r--r--print/acroread8/Makefile16
-rw-r--r--print/pcps/Makefile12
-rw-r--r--print/tex-foiltex/Makefile4
-rw-r--r--security/amap/Makefile5
-rw-r--r--security/courier-authlib/Makefile5
-rw-r--r--security/fprot-workstation-bin/Makefile4
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnupg2/Makefile4
-rw-r--r--security/gnutls/Makefile3
-rw-r--r--security/heimdal/Makefile5
-rw-r--r--security/hydra/Makefile5
-rw-r--r--security/libgcrypt/Makefile6
-rw-r--r--security/libidea/Makefile13
-rw-r--r--security/libtasn1/Makefile3
-rw-r--r--security/p5-Crypt-IDEA/Makefile6
-rw-r--r--security/p5-Crypt-OpenSSL-AES/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Bignum/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Random/Makefile3
-rw-r--r--security/p5-Digest-SHA/Makefile5
-rw-r--r--security/p5-Digest-SHA1/Makefile4
-rw-r--r--security/p5-Digest/Makefile4
-rw-r--r--security/p5-OpenSSL/Makefile3
-rw-r--r--security/pgp2/Makefile7
-rw-r--r--security/pgp5/Makefile7
-rw-r--r--security/qca2/Makefile3
-rw-r--r--security/rsaref/Makefile4
-rw-r--r--security/seahorse-plugins/Makefile3
-rw-r--r--security/seahorse/Makefile3
-rw-r--r--security/srp_client/Makefile4
-rw-r--r--security/ssh2/Makefile13
-rw-r--r--security/uvscan/Makefile8
-rw-r--r--sysutils/bcmfw/Makefile7
-rw-r--r--sysutils/burn/Makefile5
-rw-r--r--sysutils/checkperms/Makefile4
-rw-r--r--sysutils/daemontools/Makefile4
-rw-r--r--sysutils/ddrescue/Makefile5
-rw-r--r--sysutils/fs-kit/Makefile4
-rw-r--r--sysutils/gnome-nds-thumbnailer/Makefile3
-rw-r--r--sysutils/gworkspace/Makefile3
-rw-r--r--sysutils/hal-info/Makefile3
-rw-r--r--sysutils/ipw-firmware/Makefile11
-rw-r--r--sysutils/iwi-firmware/Makefile11
-rw-r--r--sysutils/iwi-firmware3/Makefile11
-rw-r--r--sysutils/monit/Makefile5
-rw-r--r--sysutils/nvnet/Makefile6
-rw-r--r--sysutils/storage-manager/Makefile8
-rw-r--r--sysutils/su2/Makefile4
-rw-r--r--sysutils/swapd/Makefile3
-rw-r--r--sysutils/sysinfo/Makefile4
-rw-r--r--sysutils/tdir/Makefile5
-rw-r--r--sysutils/xraidadmin/Makefile7
-rw-r--r--textproc/cdif/Makefile8
-rw-r--r--textproc/emacs-muse/Makefile4
-rw-r--r--textproc/expatobjc/Makefile3
-rw-r--r--textproc/glimpse/Makefile8
-rw-r--r--textproc/iso-codes/Makefile3
-rw-r--r--textproc/py-pygments/Makefile3
-rw-r--r--textproc/tokyodystopia/Makefile3
-rw-r--r--time/cardboard-schedule/Makefile12
-rw-r--r--time/emiclock/Makefile4
-rw-r--r--time/etm/Makefile5
-rw-r--r--time/titrax/Makefile10
-rw-r--r--wm/amiwm/Makefile8
-rw-r--r--wm/fvwm-devel/Makefile4
-rw-r--r--wm/fvwm1/Makefile4
-rw-r--r--www/ap2-wsgi/Makefile3
-rw-r--r--www/firefox-bin-flash/Makefile.common8
-rw-r--r--www/gtkhtml314/Makefile3
-rw-r--r--www/ja-trac/Makefile3
-rw-r--r--www/navigator/Makefile.common4
-rw-r--r--www/opera/Makefile3
-rw-r--r--www/py-genshi/Makefile3
-rw-r--r--www/squid30/Makefile4
-rw-r--r--www/squid31/Makefile4
-rw-r--r--www/varnish/Makefile3
-rw-r--r--x11/gnome-mag/Makefile3
-rw-r--r--x11/gnome-screensaver/Makefile3
-rw-r--r--x11/gnome-themes/Makefile3
-rw-r--r--x11/gnustep-back/Makefile5
-rw-r--r--x11/gnustep-gui/Makefile5
-rw-r--r--x11/gnustep-preferences/Makefile5
-rw-r--r--x11/libxklavier/Makefile3
-rw-r--r--x11/openmotif/Makefile10
-rw-r--r--x11/swing/Makefile7
-rw-r--r--x11/x11vnc/Makefile3
-rw-r--r--x11/xclip/Makefile5
-rw-r--r--x11/xcruise/Makefile5
-rw-r--r--x11/xephem/Makefile5
383 files changed, 836 insertions, 1074 deletions
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index d3c61629325..a98616f2724 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/02/09 23:29:54 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:00 wiz Exp $
#
DISTNAME= bicom101
@@ -11,8 +11,8 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www3.sympatico.ca/mt0000/bicom/bicom.html
COMMENT= Data compressor in the PPM family
-
LICENSE= bicom-license
+
RESTRICTED= No commercial use without prior arrangement, no permission to distribute granted.
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/archivers/fcrackzip/Makefile b/archivers/fcrackzip/Makefile
index 51d6033279f..352b53d641c 100644
--- a/archivers/fcrackzip/Makefile
+++ b/archivers/fcrackzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/13 08:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:00 wiz Exp $
DISTNAME= fcrackzip-1.0
MASTER_SITES= http://home.schmorp.de/marc/data/
@@ -7,7 +7,6 @@ CATEGORIES= archivers
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://home.schmorp.de/marc/fcrackzip.html
COMMENT= Zip password cracker
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 713f40305d5..aa9e4dbfc5f 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/03/02 03:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2009/05/19 08:59:00 wiz Exp $
DISTNAME= lha-114i
PKGNAME= lha-114.9
@@ -9,8 +9,8 @@ MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
COMMENT= Archive files using LZW compression (.lzh files)
-
LICENSE= lha-license
+
RESTRICTED= Other than for-free distribution of the unmodified source \
over a network, redistribution terms are complex.
NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 3c5e01a9049..44758801eb2 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/02 03:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:00 wiz Exp $
DISTNAME= ppsmall-1.0
PKGNAME= ppunpack-1.0
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Decompresses Amiga PowerPacker files
-
LICENSE= ppunpack-license
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 6799ce2dc9c..13dcd360ba0 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2009/02/09 23:33:27 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2009/05/19 08:59:00 wiz Exp $
DISTNAME= rar # overridden in Makefile.${EMUL_PLATFORM}
PKGNAME= rar-2.02 # also overridden
@@ -11,14 +11,14 @@ PKG_DESTDIR_SUPPORT= user-destdir
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rarsoft.com/
COMMENT= RAR file archiver (binary)
-
-EMUL_PLATFORMS= linux-i386 netbsd-i386
-
LICENSE= rar-license
+
RESTRICTED= Only unmodified original package can be distributed
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+EMUL_PLATFORMS= linux-i386 netbsd-i386
+
MESSAGE_SRC= ${PKGDIR}/MESSAGE.${EMUL_PLATFORM}
.include "../../mk/bsd.prefs.mk"
diff --git a/archivers/sapcar/Makefile b/archivers/sapcar/Makefile
index dd3b9fc92cb..503c0101ccd 100644
--- a/archivers/sapcar/Makefile
+++ b/archivers/sapcar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/09 16:52:05 sno Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:00 wiz Exp $
PKGNAME= sapcar-7.00
CATEGORIES= archivers
@@ -60,8 +60,8 @@ BROKEN= Plattform ${OPSYS} not supported
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= SAP archiver
-
LICENSE= sap-license
+
RESTRICTED= Only unmodified original package can be distributed
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile
index 78b3b928bee..dc5c0e80d1d 100644
--- a/archivers/szip/Makefile
+++ b/archivers/szip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/01/16 09:18:30 obache Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:00 wiz Exp $
DISTNAME= szip-2.1
PKGREVISION= 1
@@ -8,17 +8,17 @@ MASTER_SITES= ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://hdf.ncsa.uiuc.edu/doc_resource/SZIP/
COMMENT= Extended-Rice lossless compression
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= szip-license
+
RESTRICTED= No permission to redistribute
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
DIST_SUBDIR= ${PKGNAME}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile
index 6bcf653606b..271e49f1037 100644
--- a/archivers/unace-bin/Makefile
+++ b/archivers/unace-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/09 23:38:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:00 wiz Exp $
#
DISTNAME= linunace25
@@ -10,14 +10,14 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.winace.com/
COMMENT= Extract, list and test files in ACE archives (Linux binary)
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= unace-license
+
RESTRICTED= Only original file distribution.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= base compat
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 2e9f1bd49c9..6a6b6813294 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:00 wiz Exp $
#
DISTNAME= unace-1.2b
@@ -10,15 +10,15 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/compress/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.winace.com/
COMMENT= Extract, list and test files in ACE archives
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= unace-source-license
+
RESTRICTED= Only original file distribution.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake
BUILD_TARGET= clean unace
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index aa1510a44b5..57c5c4c0a7d 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:01 wiz Exp $
DISTNAME= unarj-2.65
PKGREVISION= 1
@@ -8,8 +8,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.arjsoftware.com/
COMMENT= Allows files to be extracted from ARJ archives
-
LICENSE= unarj-license
+
RESTRICTED= Do not charge a fee for use, copying, or distribution
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index df687c36676..8fc973521da 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/05/02 12:37:10 zafer Exp $
+# $NetBSD: Makefile,v 1.61 2009/05/19 08:59:01 wiz Exp $
DISTNAME= unrarsrc-3.8.3
PKGNAME= ${DISTNAME:S/src//}
@@ -8,18 +8,8 @@ MASTER_SITES= http://www.rarlab.com/rar/
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.rarlab.com/
COMMENT= Extract, view & test RAR archives
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-NO_CONFIGURE= YES
-USE_LANGUAGES= c++
-# XXX: makefile.unix has DOS line endings
-USE_TOOLS+= gmake
-
-MAKE_FILE= makefile.unix
-
LICENSE= unrar-license
+
RESTRICTED= Do not charge a fee for redistribution. Do not use to develop a rar archiver.
# Reading the license implies NO_BIN_ON_FTP should be set because no
# permission is granted to distribute derived works (e.g., binaries).
@@ -31,6 +21,16 @@ RESTRICTED= Do not charge a fee for redistribution. Do not use to develop a rar
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
+NO_CONFIGURE= YES
+USE_LANGUAGES= c++
+# XXX: makefile.unix has DOS line endings
+USE_TOOLS+= gmake
+
+MAKE_FILE= makefile.unix
+
WRKSRC= ${WRKDIR}/unrar
INSTALLATION_DIRS= bin share/doc/unrar
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index 9ef0ea81c47..5660c9fe571 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= ${PRGNAME}unix
@@ -9,8 +9,8 @@ DISTFILES= ${DISTNAME}.c ${PRGNAME}.man
MAINTAINER= rh@NetBSD.org
COMMENT= Convert mailable BinHex format into binary
-
LICENSE= xbin-license
+
RESTRICTED= May not be sold without permission.
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 25f6761211c..66ee2312625 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/24 23:00:18 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:01 wiz Exp $
DISTNAME= xmill-0.9.1
PKGREVISION= 3
@@ -8,15 +8,8 @@ MASTER_SITES= http://www.cs.washington.edu/homes/suciu/XMILL/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${MASTER_SITES}
COMMENT= Specialized compressor for XML
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake
-MAKE_FILE= makefile
-USE_LANGUAGES= c c++
-
LICENSE= xmill-license
+
RESTRICTED= Redistribution not permitted
# It is not entirely clear that noncommercial redistribution is
# permitted, but it's too hard to read the license, so it's marked as
@@ -26,6 +19,13 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
+USE_TOOLS+= gmake
+MAKE_FILE= makefile
+USE_LANGUAGES= c c++
+
INSTALLATION_DIRS= bin
do-install:
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index ec30387f5b2..f2d75fea1da 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= zip1-1.1
@@ -11,8 +11,8 @@ DISTFILES= zip11.zip zcrypt10.zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.info-zip.org/pub/infozip/
COMMENT= Create/update ZIP files compatible with pkzip version 1
-
LICENSE= generic-nonlicense
+
RESTRICTED= Do not modify. Do not sell for profit.
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 4075c071b46..780596a2253 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/04/25 23:46:47 gdt Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:01 wiz Exp $
DISTNAME= zoo-2.10pl1
PKGNAME= zoo-2.10.1
@@ -8,7 +8,6 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Manipulate archives of files in compressed form
-
LICENSE= zoo-license
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 6ecb138b73e..a31872a06d2 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/19 08:19:37 rh Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= cddb.bundle-0.2
@@ -10,7 +10,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gsburn.sourceforge.net/
COMMENT= CDDB client bundle
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index 1d8d15485e0..bdf85dce4fe 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/19 11:43:16 rh Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= cdplayer-0.5
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gsburn.sourceforge.net/
COMMENT= GNUstep CD player with CDDB support
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 31a3b55650f..35e25695cfd 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/25 21:42:20 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= eawpats12_full
@@ -9,11 +9,11 @@ MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
MAINTAINER= adam@NetBSD.org
COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity
+LICENSE= generic-nonlicense
RESTRICTED= Some patches are copyrighted, some marked no-commercial-use
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= generic-nonlicense
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index f008b0c433d..dd0b2e47db8 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/06/16 13:13:44 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:01 wiz Exp $
#
DISTNAME= espeak-1.31-source
@@ -10,6 +10,7 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://espeak.sourceforge.net/
COMMENT= Speech synthesizer
+#LICENSE= GPLv3
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,8 +18,6 @@ USE_LANGUAGES= c++
USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/espeak-1.31-source/src
-#LICENSE= GPLv3
-
INSTALLATION_DIRS= bin include lib share
do-install:
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 0328403f958..0122dd5506e 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
DISTNAME= festlex_OALD
PKGNAME= festlex-oald-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= Oxford Advanced Learner's pronunciation dictionary for Festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
-USE_TOOLS+= pax
-LICENSE= no-commercial-use
+USE_TOOLS+= pax
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index c492bfc404d..fe833bfac2a 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
DISTNAME= OGIlexicon-2.0
PKGNAME= festlex-ogi-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= Composite pronunciation dictionary from ogi.edu for festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 80c81e0e985..e155bdbc94f 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/05 18:58:59 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:02 wiz Exp $
DISTNAME= OGIspanish-2.0.1
PKGNAME= festogi-spanish-2.0.1
@@ -9,13 +9,12 @@ MASTER_SITES= # ftp://cslu.cse.ogi.edu/pub/tts/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= Festival Spanish (Mexican) language support routines (in scheme)
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 937e7986412..d95150f6c7e 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:02 wiz Exp $
DISTNAME= voice_abc_di-2.0
PKGNAME= festvox-abc-2.0
@@ -9,13 +9,12 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= Mexican Spanish male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
DEPENDS+= festogi-spanish>=2.0:../../audio/festogi-spanish
-LICENSE= no-commercial-use
-
USE_TOOLS+= pax
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index f7de91ce1a6..ce6a862a1fb 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/05/05 19:02:17 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:02 wiz Exp $
DISTNAME= voice_aec_di-2.0
PKGNAME= festvox-aec-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= # ftp://cslu.cse.ogi.edu/pub/tts/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= American English male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= ${PKGNAME_NOREV}nb1
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 4f3986e28db..78c787cba32 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:02 wiz Exp $
DISTNAME= festvox_ellpc11k
PKGNAME= festvox-el11-1.4.0
@@ -9,13 +9,12 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= Castilian Spanish male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.1:../../audio/festival
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index a214970b68e..58630fd80da 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:02 wiz Exp $
DISTNAME= festvox_en1
PKGNAME= festvox-en1-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= MBROLA based British English male voice for festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+= mbrolavox-en1-980910{,nb[0-9]*}:../../audio/mbrolavox-en1
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index d1e45c90ab5..f36d3b65e8d 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
DISTNAME= voice_hvs_di-2.0
PKGNAME= festvox-hvs-2.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= Mexican Spanish female voice for the festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
@@ -16,8 +17,6 @@ DEPENDS+= festogi-spanish>=2.0:../../audio/festogi-spanish
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 79271db37a5..52a807630a4 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
DISTNAME= voice_jph_di-2.0
PKGNAME= festvox-jph-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= American English male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index fa0c5819386..2152d41ca98 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
DISTNAME= voice_mwm_di-2.0
PKGNAME= festvox-mwm-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= American English male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index dcb24e01e3b..2ca66a02b69 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:40:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:03 wiz Exp $
DISTNAME= voice_ogirab_di-2.0
PKGNAME= festvox-ogirab-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= British English male voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 44886fdba22..f7b5e1569c9 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:40:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:03 wiz Exp $
DISTNAME= voice_tll_di-2.0
PKGNAME= festvox-tll-2.0
@@ -9,14 +9,13 @@ MASTER_SITES= http://www.cslu.ogi.edu/tts/download/data/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cslu.cse.ogi.edu/tts/
COMMENT= American English female voice for the festival speech synthesis system
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index f7835ae557e..99935b3ab82 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
DISTNAME= festvox_us1
PKGNAME= festvox-us1-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= MBROLA based American English female voice for festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+= mbrolavox-us1-980512{,nb[0-9]*}:../../audio/mbrolavox-us1
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index c93d0177e63..3c7c43a39a9 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
DISTNAME= festvox_us2
PKGNAME= festvox-us2-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= MBROLA based Americal English male voice for festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+= mbrolavox-us2-980812{,nb[0-9]*}:../../audio/mbrolavox-us2
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index e3be39d8e08..40daae071ad 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:16 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
DISTNAME= festvox_us3
PKGNAME= festvox-us3-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= MBROLA based American English male voice for festival
+LICENSE= no-commercial-use
DEPENDS+= festival>=1.4.0:../../audio/festival
DEPENDS+= festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+= mbrolavox-us3-990208{,nb[0-9]*}:../../audio/mbrolavox-us3
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/festival
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index e0e8f5e9e46..3a16fbf7bdb 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/13 22:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:03 wiz Exp $
DISTNAME= fluidsynth-1.0.9
CATEGORIES= audio
@@ -7,7 +7,6 @@ MASTER_SITES= http://savannah.nongnu.org/download/fluid/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nongnu.org/fluid/
COMMENT= Software synthesizer based on SoundFont2
-
LICENSE= gnu-lgpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 155044f76c8..51b5d191504 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/09/10 00:28:43 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:03 wiz Exp $
#
DISTNAME= gogo239b
@@ -11,6 +11,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://homepage1.nifty.com/herumi/gogo_e.html
COMMENT= Very fast lame-based mp3 encoder, i386 only
+LICENSE= unclear-patent-claims
+
+RESTRICTED= Source based on patent protected Fraunhofer code
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
@@ -20,13 +27,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake
-LICENSE= unclear-patent-claims
-RESTRICTED= Source based on patent protected Fraunhofer code
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
.include "../../mk/bsd.prefs.mk"
.if (${OBJECT_FMT} == "a.out")
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 8612387b04a..4dd766d0e5c 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/01/27 22:03:12 sketch Exp $
+# $NetBSD: Makefile,v 1.62 2009/05/19 08:59:03 wiz Exp $
#
DISTNAME= lame-398-2
@@ -10,7 +10,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://lame.sourceforge.net/
COMMENT= Fast, high quality MP3 encoder
-
LICENSE= lame-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 6bbe7c8ffef..c2326c9ac15 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/02 06:10:33 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:03 wiz Exp $
DISTNAME= mbr301h
PKGNAME= mbrola-301h
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
COMMENT= MBROLA diphone synthesizer executable
-
LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index 1d3ce12e7fc..fb07d397d87 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/05/02 12:41:52 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:03 wiz Exp $
DISTNAME= en1-980910
PKGNAME= mbrolavox-en1-980910
@@ -10,13 +10,12 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
COMMENT= British English male voice for MBROLA
+LICENSE= no-commercial-use
DEPENDS+= mbrola-301h{,nb[0-9]*}:../../audio/mbrola
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index 94be07c2adc..69d6db61f4f 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/05/02 12:54:42 zafer Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:04 wiz Exp $
DISTNAME= us1-980512
PKGNAME= mbrolavox-us1-980512
@@ -10,13 +10,12 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
COMMENT= American English female voice for MBROLA
+LICENSE= no-commercial-use
DEPENDS+= mbrola-301h{,nb[0-9]*}:../../audio/mbrola
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index 5eb6d1effd4..7ddcbb46ba3 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/02 12:55:57 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:04 wiz Exp $
DISTNAME= us2-980812
PKGNAME= mbrolavox-${DISTNAME}
@@ -10,13 +10,12 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
COMMENT= American English male voice for MBROLA
+LICENSE= no-commercial-use
DEPENDS+= mbrola-301h{,nb[0-9]*}:../../audio/mbrola
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 1b2221c46f3..aeaac269300 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/02 12:57:01 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:04 wiz Exp $
DISTNAME= us3-990208
PKGNAME= mbrolavox-${DISTNAME}
@@ -10,13 +10,12 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tcts.fpms.ac.be/synthesis/mbrola/
COMMENT= American English male voice for MBROLA
+LICENSE= no-commercial-use
DEPENDS+= mbrola-301h{,nb[0-9]*}:../../audio/mbrola
USE_TOOLS+= pax
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index 4c6a9f42743..1f522cc43ac 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2008/04/29 11:02:13 tron Exp $
+# $NetBSD: Makefile.common,v 1.31 2009/05/19 08:59:04 wiz Exp $
DISTNAME= mpg123-0.59r
MPG123_VERSION= 0.59.18
@@ -11,13 +11,13 @@ PATCHFILES= mpg123-059r-v6-20000713b.diff.gz
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mpg123.de/
+LICENSE= mpg123-license
+
DIST_SUBDIR= mpg123
PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
FILESDIR= ${.CURDIR}/../../audio/mpg123/files
DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
-LICENSE= mpg123-license
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 6eb46e72680..b880f7ff092 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:04 wiz Exp $
#
DISTNAME= shntool-2.0.3
@@ -9,11 +9,10 @@ MASTER_SITES= http://www.etree.org/shnutils/shntool/source/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.etree.org/shnutils/shntool/
COMMENT= Lossless audio compressor wrapper tool
+LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= no-commercial-use
-
GNU_CONFIGURE= YES
# could also support: "WV" (is this not wav?), OFR, LPAC and APE.
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 92840fad5c3..c248ae1f2ea 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/08 03:07:45 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:04 wiz Exp $
#
DISTNAME= shorten-3.6.1
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.etree.org/shnutils/shorten/dist/src/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.etree.org/shnutils/shorten/
COMMENT= Lossless audio compressor
-
LICENSE= shorten-license
GNU_CONFIGURE= YES
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index c5265afb845..e88ebb86694 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/08/25 19:35:30 bjs Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/19 08:59:04 wiz Exp $
DISTNAME= iozone3_308
PKGNAME= iozone-3.308
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.iozone.org/
COMMENT= Benchmark for file read and write speed
-
# No derivative works
LICENSE= iozone-license
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index 8667ef7c97f..6844fe47595 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/03 23:15:47 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:04 wiz Exp $
DISTNAME= netio126
PKGNAME= netio-1.26
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .zip
HOMEPAGE= http://www.ars.de/ars/ars.nsf/docs/netio
MAINTAINER= tron@NetBSD.org
COMMENT= Network benchmark for OS/2 2.x, Windows NT/2000 and Unix
-
LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index 1316a945992..f3e8caea082 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/11/10 17:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:04 wiz Exp $
DISTNAME= phylip-3.61
PKGREVISION= 3
@@ -8,8 +8,8 @@ MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/phylip/
MAINTAINER= babafou@babafou.eu.org
HOMEPAGE= http://evolution.genetics.washington.edu/phylip.html
COMMENT= Phylogeny Inference Package
-
LICENSE= phylip-license
+
RESTRICTED= Distribution permitted only if no fee is charged.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index a7fea14648c..75cff2a1fac 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:05 wiz Exp $
#
DISTNAME= eagle-lin-eng-4.14
@@ -11,16 +11,16 @@ EXTRACT_SUFX= .tgz
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.cadsoft.de/
COMMENT= Easy to use printed circuit board editor
-
-PKG_DESTDIR_SUPPORT= user-destdir
+LICENSE= fee-based-commercial-use
RESTRICTED= Redistribution not permitted
-LICENSE= fee-based-commercial-use
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= x11
diff --git a/cad/lc/Makefile b/cad/lc/Makefile
index 50293900e32..a2fd9435145 100644
--- a/cad/lc/Makefile
+++ b/cad/lc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/12 22:42:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:05 wiz Exp $
DISTNAME= lc # overridden below
PKGNAME= lc-2.10
@@ -9,18 +9,17 @@ MASTER_SITES= http://lc.cray.com/download/
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://lc.cray.com/
COMMENT= Finite Difference Time Domain (FDTD) Electromagnetic Simulator
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
+LICENSE= lc-license
RESTRICTED= Original installer required to redistribute.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= lc-license
PKG_DESTDIR_SUPPORT= destdir
+DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}/lc2.10
BUILD_DIRS= # empty
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index c8d439ca261..ec579081da3 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:05 wiz Exp $
#
DISTNAME= simian_man_12_98
@@ -10,9 +10,9 @@ EXTRACT_SUFX= .pdf
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
COMMENT= PDF manual for SIMIAN
+LICENSE= simian-license
RESTRICTED= Personal use only
-LICENSE= simian-license
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 148968b100b..3af4d92f7e4 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:05 wiz Exp $
#
DISTNAME= simian_12_98
@@ -9,8 +9,8 @@ MASTER_SITES= http://weewave.mer.utexas.edu/MED_files/CODE_RQST/
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://weewave.mer.utexas.edu/MED_files/MED_research/Intrcncts/SIMIAN_stuff/simian_links.html
COMMENT= 2-dimensional interconnect and transmission line simulator
-
LICENSE= simian-license
+
RESTRICTED= Redistribution for personal use only.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 64e72676815..746d040197d 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/12 18:37:01 martti Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:05 wiz Exp $
DISTNAME= ejabberd-2.0.5
#PKGREVISION= 1
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.process-one.net/downloads/ejabberd/2.0.5/
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.ejabberd.im/
COMMENT= Free and Open Source distributed fault-tolerant Jabber server
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/chat/tkicb/Makefile b/chat/tkicb/Makefile
index 4529ce9afa3..ce0f3d25720 100644
--- a/chat/tkicb/Makefile
+++ b/chat/tkicb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:05 wiz Exp $
#
DISTNAME= icb.2.1.4
@@ -11,8 +11,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.icb.net/
COMMENT= TK interface to the ICB chat system
-
LICENSE= generic-nonlicense
+
RESTRICTED= Author wishes to handle distribution
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 6a163d46380..0818db5f193 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/03/22 10:32:40 tonio Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:05 wiz Exp $
#
DISTNAME= weechat-0.2.6.1
@@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= tonio@NetBSD.org
HOMEPAGE= http://weechat.flashtux.org/
COMMENT= Lightweight and user friendly curses based IRC client
+#LICENSE= gplv3
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,8 +22,6 @@ MAKE_ENV+= INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
INCOMPAT_CURSES+= NetBSD-*-*
-#LICENSE= gplv3
-
.include "options.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index 7c06ed51724..f74006c42f5 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:37 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:05 wiz Exp $
DISTNAME= rh9.ymessenger-1.0.4-1.i386
PKGNAME= ymessenger-1.0.4
@@ -9,8 +9,8 @@ EXTRACT_SUFX= .rpm
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://messenger.yahoo.com/
COMMENT= Yahoo! instant messaging client
-
LICENSE= generic-nonlicense
+
RESTRICTED= Commercial software (no permission to copy is evident).
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/comms/bthfp/Makefile b/comms/bthfp/Makefile
index 3bee30639a3..c4ffc74f8c3 100644
--- a/comms/bthfp/Makefile
+++ b/comms/bthfp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/12 14:36:28 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:05 wiz Exp $
DISTNAME= bthfp-0.1
CATEGORIES= comms
@@ -7,7 +7,6 @@ DISTFILES= bthfp-0.1.tar.gz
MAINTAINER= plunky@rya-online.net
COMMENT= Bluetooth Handsfree Profile
-
LICENSE= modified-bsd
ONLY_FOR_PLATFORM= NetBSD-[4-9].*-*
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index c929fc21aba..bf28ff55188 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/10/13 21:17:28 schwarz Exp $
+# $NetBSD: Makefile,v 1.29 2009/05/19 08:59:05 wiz Exp $
DISTNAME= estic-1.61
PKGREVISION= 1
@@ -10,11 +10,9 @@ DISTFILES= ${EXTRACT_ONLY} ${ESTICPATCH}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.von-bassewitz.de/uz/estic/estic.html
COMMENT= German language configuration tool for ISTEC 1003/1008 ISDN systems
-
-EXTRACT_ONLY= estic-1.60-sources${EXTRACT_SUFX}
+LICENSE= generic-nonlicense
# No permissions are apparent from inspecting the sources.
-LICENSE= generic-nonlicense
RESTRICTED= No permission to copy
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
@@ -23,6 +21,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
+EXTRACT_ONLY= estic-1.60-sources${EXTRACT_SUFX}
+
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
USE_LANGUAGES= c c++
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 66d557ee4ef..4f00b775494 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2008/03/03 05:33:32 jlam Exp $
+# $NetBSD: Makefile,v 1.74 2009/05/19 08:59:06 wiz Exp $
DISTNAME= cku211
PKGNAME= kermit-8.0.211
@@ -9,7 +9,6 @@ MASTER_SITES= ftp://kermit.columbia.edu/kermit/archives/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.columbia.edu/kermit/
COMMENT= Network and serial communication, file transfer, and scripting utility
-
LICENSE= kermit-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index eec30bbee3d..7579f094bbc 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/05/12 14:43:17 plunky Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:06 wiz Exp $
#
DISTNAME= obexapp-1.4.11
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.geocities.com/m_evmenkin/
MAINTAINER= plunky@rya-online.net
HOMEPAGE= http://www.geocities.com/m_evmenkin/
COMMENT= Obex application to transfer objects to mobile equipment
-
LICENSE= modified-bsd
ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-[4-9].*-*
diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index f8d1f620a22..2b49488355b 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/02/15 09:48:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:06 wiz Exp $
DISTNAME= convmv-1.14
CATEGORIES= converters
@@ -7,6 +7,7 @@ MASTER_SITES= http://www.j3e.de/linux/convmv/
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://j3e.de/linux/convmv/
COMMENT= Converts filenames from one encoding to another
+#LICENSE= gnu-gplv2 OR gnu-gplv3
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -14,8 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= # empty
USE_TOOLS+= pax perl:run
-#LICENSE= gnu-gplv2 or gnu-gplv3
-
MANCOMPRESSED= yes
NO_BUILD= yes
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index 0b90fc7d281..fb10b006ba6 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:06 wiz Exp $
#
DISTNAME= dvi2tty
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Program for previewing DVI files
-
LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/converters/ja-dvi2tty/Makefile b/converters/ja-dvi2tty/Makefile
index b769585dec6..af3cef4b888 100644
--- a/converters/ja-dvi2tty/Makefile
+++ b/converters/ja-dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:06 wiz Exp $
DISTNAME= dvi2tty5.0
PKGNAME= ja-dvi2tty-5.0
@@ -14,6 +14,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Program for previewing DVI files (ASCII Japanese TeX)
+LICENSE= no-commercial-use
DEPENDS+= ja-less>=358:../../misc/ja-less
@@ -21,8 +22,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= ja-dvi2tty
-LICENSE= no-commercial-use
-
MAKE_FLAGS+= CFLAGS="${CFLAGS} -DDEFPAGER='\"${PREFIX}/bin/jless\"'"
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 2c6dd2981a7..208e73270e4 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/05/26 02:13:16 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:06 wiz Exp $
DISTNAME= libiconv-1.12
PKGREVISION= 1
@@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libiconv/
COMMENT= Character set conversion library
+#LICENSE= gnu-gplv3 gnu-lgplv2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -16,7 +17,6 @@ USE_LANGUAGES+= c c++
USE_LIBTOOL= yes
USE_TOOLS+= pax
GNU_CONFIGURE= yes
-#LICENSE= gnu-gplv3 gnu-lgplv2
# Explicitly disable NLS since libiconv is a dependency for gettext-lib
# and we don't want libiconv to pick up any NLS functions from libc
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index ff1832c57d7..f15082e5481 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/10/19 19:17:42 he Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:06 wiz Exp $
#
VERS= 3.07
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/MIME-Base64/
COMMENT= Perl5 module for Base64 and Quoted-Printable encodings
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 8cbf33e82b9..c1270b35fd7 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/10/20 13:53:17 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2009/05/19 08:59:06 wiz Exp $
#
DISTNAME= guile-pg-0.37
@@ -8,12 +8,12 @@ MASTER_SITES= http://www.gnuvola.org/software/guile-pg/
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://www.gnuvola.org/software/guile-pg/
COMMENT= PostgreSQL interface for Guile
+LICENSE= gnu-gpl-v3
USE_LIBTOOL= YES
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
INFO_FILES= # PLIST
-#LICENSE= gnu-gplv3
TEST_TARGET= check
diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile
index 6661a12744e..744d9d78fbb 100644
--- a/databases/lua-tokyocabinet/Makefile
+++ b/databases/lua-tokyocabinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/13 08:56:55 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:06 wiz Exp $
#
DISTNAME= tokyocabinet-lua-1.5
@@ -10,7 +10,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/luadoc/
COMMENT= Lua binding of Tokyo Cabinet
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/p5-DBD-PgPP/Makefile b/databases/p5-DBD-PgPP/Makefile
index 96dce1ad900..a7f94947f21 100644
--- a/databases/p5-DBD-PgPP/Makefile
+++ b/databases/p5-DBD-PgPP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/24 14:59:28 sno Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:06 wiz Exp $
#
DISTNAME= DBD-PgPP-0.06
@@ -9,7 +9,7 @@ MASTER_SITES= http://search.cpan.org/CPAN/authors/id/A/AR/ARC/
MAINTAINER= ficovh@yahoo.com
HOMEPAGE= http://search.cpan.org/CPAN/authors/id/A/AR/ARC/
COMMENT= DBD::PgPP - Pure Perl PostgreSQL driver for the DBI
-LICENSE= artistic-2.0 # or gpl-v2+
+LICENSE= artistic-2.0 # OR gnu-gpl-v2+
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/p5-tokyocabinet/Makefile b/databases/p5-tokyocabinet/Makefile
index 4a2b55b37b6..dead205c56e 100644
--- a/databases/p5-tokyocabinet/Makefile
+++ b/databases/p5-tokyocabinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/07 10:56:26 obache Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyocabinet-perl-1.26
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/perldoc/
COMMENT= Perl binding of Tokyo Cabinet
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/p5-tokyotyrant/Makefile b/databases/p5-tokyotyrant/Makefile
index b307771b1a3..052a10a15a6 100644
--- a/databases/p5-tokyotyrant/Makefile
+++ b/databases/p5-tokyotyrant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/05/07 11:06:28 obache Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyotyrant-perl-1.10
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/tyrantperldoc/
COMMENT= Pure Perl Interface of Tokyo Tyrant
-
LICENSES= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/palm-db-tools/Makefile b/databases/palm-db-tools/Makefile
index d6aac9a7bef..1d76f5c04f3 100644
--- a/databases/palm-db-tools/Makefile
+++ b/databases/palm-db-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= ${PKGNAME_NOREV:S/./_/g}
@@ -10,11 +10,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=palm-db-tools/}
MAINTAINER= dsainty@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/palm-db-tools/
COMMENT= Conversion utilities for PalmOS flat-file database programs
+#LICENSE= GPL
PKG_DESTDIR_SUPPORT= user-destdir
-#LICENSE= GPL
-
WRKSRC= ${WRKDIR}/palm-db-tools
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
diff --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile
index bfe7c90ab47..359f4df73f4 100644
--- a/databases/ruby-tokyocabinet/Makefile
+++ b/databases/ruby-tokyocabinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/05/07 10:57:41 obache Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyocabinet-ruby-1.23
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/rubydoc/
COMMENT= Ruby binding of Tokyo Cabinet
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/ruby-tokyotyrant/Makefile b/databases/ruby-tokyotyrant/Makefile
index da06c425b15..8306ffbae26 100644
--- a/databases/ruby-tokyotyrant/Makefile
+++ b/databases/ruby-tokyotyrant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/14 08:46:18 obache Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyotyrant-ruby-1.6
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/tyrantrubydoc/
COMMENT= Pure Ruby Interface of Tokyo Tyrant
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/sqlite3/Makefile.common b/databases/sqlite3/Makefile.common
index a0f8633b4cc..72ba9e8bcdb 100644
--- a/databases/sqlite3/Makefile.common
+++ b/databases/sqlite3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2009/05/07 08:01:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.37 2009/05/19 08:59:07 wiz Exp $
# used by databases/sqlite3-tcl/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES= http://www.hwaci.com/sw/sqlite/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.sqlite.org/
COMMENT= SQL Database Engine in a C Library
-
#LICENSE= public-domain
DISTINFO_FILE= ${.CURDIR}/../../databases/sqlite3/distinfo
diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 6b335242ea9..a0a392be120 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/10 04:42:38 obache Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyocabinet-1.4.20
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/
COMMENT= Modern implementation of DBM
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index df745dfd615..70f4e19de2f 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/05/10 04:43:31 obache Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:07 wiz Exp $
#
DISTNAME= tokyotyrant-1.1.26
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/
COMMENT= Network interface of Tokyo Cabinet
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index 6750e16991d..fe7c4c0e5cb 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2009/05/18 08:26:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2009/05/19 08:59:07 wiz Exp $
#
# used by devel/GConf/Makefile
# used by devel/GConf-ui/Makefile
@@ -13,7 +13,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/projects/gconf/
COMMENT= Configuration database system used by GNOME
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 659b3f92e54..3bd26ac7d5c 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/04/13 12:29:14 rh Exp $
+# $NetBSD: Makefile,v 1.47 2009/05/19 08:59:07 wiz Exp $
DISTNAME= gorm-1.2.8
PKGNAME= Gorm-1.2.8
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=dev-apps/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Graphical user interface builder for GNUstep
-
LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/ObjectiveLib/Makefile b/devel/ObjectiveLib/Makefile
index 1883864de32..0daa25e10ee 100644
--- a/devel/ObjectiveLib/Makefile
+++ b/devel/ObjectiveLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/17 21:28:39 rh Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:08 wiz Exp $
#
PKGNAME= ObjectiveLib-1.0.0
@@ -9,8 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=objectivelib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://objectivelib.sourceforge.net/
COMMENT= Object containers and generic algorithms for Objective-C
-
-LICENSE= gnu-lgpl-v2.1
+LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= destdir
MAKE_JOBS_SAFE= no
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index 4e61c582cb0..7e0bd8f17b9 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/04/13 12:31:54 rh Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:08 wiz Exp $
DISTNAME= ProjectCenter-0.5.0
CATEGORIES= devel gnustep
@@ -7,7 +7,6 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=dev-apps/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/experience/ProjectCenter.html
COMMENT= GNUstep Integrated Development Environment
-
LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= destdir
diff --git a/devel/SDL_Pango/Makefile b/devel/SDL_Pango/Makefile
index f294bad2930..60ecbe781b3 100644
--- a/devel/SDL_Pango/Makefile
+++ b/devel/SDL_Pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/27 05:13:01 heinz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:08 wiz Exp $
#
DISTNAME= SDL_Pango-0.1.2
@@ -8,8 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sdlpango/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://sdlpango.sourceforge.net/
COMMENT= Connects the text rendering engine of GNOME 2.x. with SDL
-
-#LICENSE= gnu-lgpl-v2.1
+LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index 198bf323bd3..1797ced424d 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/04/29 19:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:08 wiz Exp $
DISTNAME= SDL_gfx-2.0.19
CATEGORIES= devel
@@ -7,7 +7,6 @@ MASTER_SITES= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
COMMENT= Basic drawing routines for SDL
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 6c5e7885a0c..77f37cadd58 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/10 21:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:08 wiz Exp $
DISTNAME= coccinelle-0.1.8
CATEGORIES= devel
@@ -9,12 +9,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.emn.fr/x-info/coccinelle/
COMMENT= Tool for writing and applying semantic patches
+LICENSE= gnu-gpl-v2
BUILD_DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
DEPENDS+= menhir-[0-9]*:../../devel/menhir
-LICENSE= gnu-gpl-v2
-
PKG_DESTDIR_SUPPORT= user-destdir
#MAKE_JOBS_SAFE= no
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 1d56918bc89..562ef4f6116 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/29 09:16:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:08 wiz Exp $
#
DISTNAME= diffuse-0.3.3
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://diffuse.sourceforge.net/
COMMENT= Graphical tool for merging and comparing text files
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile
index 24c489ea3c2..65f4a3497a9 100644
--- a/devel/eclipse/Makefile
+++ b/devel/eclipse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/03/22 02:31:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:08 wiz Exp $
#
DISTNAME= ${PKGNAME_NOREV}
@@ -11,7 +11,6 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.eclipse.org/
COMMENT= Java IDE
-
LICENSE= eclipse-license
DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
diff --git a/devel/edcommon/Makefile b/devel/edcommon/Makefile
index d20611cd548..aefbfac1683 100644
--- a/devel/edcommon/Makefile
+++ b/devel/edcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/17 23:00:48 rh Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:08 wiz Exp $
#
DISTNAME= edcommon-32-s
@@ -10,7 +10,6 @@ MASTER_SITES= http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mulle-kybernetik.com/software/EDFrameworks/
COMMENT= Foundation and AppKit extensions
-
LICENSE= edcommon-license
PKG_DESTDIR_SUPPORT= destdir
diff --git a/devel/fromcvs/Makefile b/devel/fromcvs/Makefile
index 1e43e7bbc6d..65194d174f7 100644
--- a/devel/fromcvs/Makefile
+++ b/devel/fromcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/05/02 18:04:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:08 wiz Exp $
DISTNAME= c31a1dd9cbb2
# Last part of PKGNAME is changeset number
@@ -10,13 +10,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ww2.fs.ei.tum.de/~corecode/hg/fromcvs/
COMMENT= CVS repository conversion tool
+LICENSE= corecode-license
DEPENDS+= ${RUBY_PKGPREFIX}-rbtree>=0.2.0:../../devel/ruby-rbtree
DEPENDS+= ${RUBY_PKGPREFIX}-rcsparse>=0.0.0.37:../../devel/ruby-rcsparse
DEPENDS+= ${RUBY_PKGPREFIX}-sqlite3>=1.2.1:../../databases/ruby-sqlite3
-LICENSE= corecode-license
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/fromcvs-${DISTNAME}
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index ca587b84360..bd753975c01 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/01/20 17:51:12 sketch Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:09 wiz Exp $
DISTNAME= gmp-4.2.4
PKGREVISION= 1
@@ -14,7 +14,7 @@ PATCH_DIST_STRIP= -p0
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gmplib.org/
COMMENT= Library for arbitrary precision arithmetic
-#LICENSE= gnu-lgpl-v3
+LICENSE= gnu-lgpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 418a13302e8..44976b1f856 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2009/04/18 03:22:31 rh Exp $
+# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:09 wiz Exp $
DISTNAME= gnustep-base-1.18.0
CATEGORIES= devel gnustep
@@ -7,11 +7,10 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= GNUstep foundation classes
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v3
-
USE_LANGUAGES= objc
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 22a7bdedd26..d4acfcdef14 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/04/13 12:24:28 rh Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:09 wiz Exp $
#
DISTNAME= gnustep-examples-1.2.0
@@ -8,11 +8,10 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Some GUI programming examples for GNUstep
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v2
-
USE_LANGUAGES= objc
NO_CONFIGURE= yes
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 70dcb54fc2f..e94754ae5cf 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/04/19 00:50:11 rh Exp $
+# $NetBSD: Makefile,v 1.47 2009/05/19 08:59:09 wiz Exp $
DISTNAME= gnustep-make-2.0.8
PKGREVISION= 2
@@ -8,12 +8,11 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= GNUstep makefile package
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
-LICENSE= gnu-gpl-v3
-
USE_LANGUAGES= objc
USE_TOOLS+= csh
GNU_CONFIGURE= yes
diff --git a/devel/gnustep-objc-lf2/Makefile b/devel/gnustep-objc-lf2/Makefile
index b0dff3d3cc4..d74043ee2be 100644
--- a/devel/gnustep-objc-lf2/Makefile
+++ b/devel/gnustep-objc-lf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/04/18 03:42:56 rh Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:09 wiz Exp $
#
DISTNAME= gnustep-objc-lf2.95.3-r88
@@ -10,8 +10,7 @@ MASTER_SITES= http://download.opengroupware.org/nightly/sources/releases/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sope.opengroupware.org/en/build/thirdparty.html\#gstep_objc
COMMENT= Objective-C library required for libFoundation
-
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index 058a41bfa13..74683d1f37a 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/04/18 03:13:40 rh Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:09 wiz Exp $
#
DISTNAME= gnustep-objc-1.6.0
@@ -9,11 +9,10 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=libs/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Objective-C runtime
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v3
-
USE_LANGUAGES= objc
USE_TOOLS+= gmake
MAKE_FILE= GNUmakefile
diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 623618bddbd..94c3742f1c2 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/12/02 13:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:09 wiz Exp $
DISTNAME= GTL-1.2.1
PKGNAME= gtl-1.2.1
@@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.infosun.fim.uni-passau.de/GTL/
COMMENT= C++ graph data structure library based on the STL
+LICENSE= no-commercial-use
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
@@ -16,8 +17,6 @@ USE_LANGUAGES= c c++
# previous version of the same
CONFLICTS= gtl0-[0-9]*
-LICENSE= no-commercial-use
-
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
diff --git a/devel/guile-www/Makefile b/devel/guile-www/Makefile
index 49161cbff04..70b45aff9d0 100644
--- a/devel/guile-www/Makefile
+++ b/devel/guile-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/03/06 15:17:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:09 wiz Exp $
DISTNAME= guile-www-2.22
CATEGORIES= devel www
@@ -9,8 +9,7 @@ HOMEPAGE= http://www.gnuvola.org/software/guile-www/
#Before ttn maintainership, formerly 1.1.1 at
#HOMEPAGE= http://www.gnu.org/software/guile/
COMMENT= Guile WWW module
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/hptools/Makefile b/devel/hptools/Makefile
index 6cce7ba69b7..a85747f6276 100644
--- a/devel/hptools/Makefile
+++ b/devel/hptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:09 wiz Exp $
#
DISTNAME= hptools-src-3.0.8
@@ -9,12 +9,12 @@ MASTER_SITES= http://www.hpcalc.org/hp48/pc/programming/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.hpcalc.org/hp48/pc/programming/
COMMENT= SDK for Hewlett-Packard HP-48G/49G/39G/40G calculators
+LICENSE= hptools-license
RESTRICTED= Redistribution of unmodified source only; resale prohibited.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= hptools-license
WRKSRC= ${WRKDIR}/Hptools
GNU_CONFIGURE= YES
diff --git a/devel/its4/Makefile b/devel/its4/Makefile
index 6230f248fe3..e706fe3c17a 100644
--- a/devel/its4/Makefile
+++ b/devel/its4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:09 wiz Exp $
#
DISTNAME= its4-1.1.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cigital.com/its4/
COMMENT= Static C/C++ code scanner for potential security problems
-
LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/libFoundation-examples/Makefile b/devel/libFoundation-examples/Makefile
index 7fc062d1e37..950b2e00333 100644
--- a/devel/libFoundation-examples/Makefile
+++ b/devel/libFoundation-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/18 02:28:36 rh Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libFoundation-1.1.7-r168
PKGNAME= ${DISTNAME:S/-/-examples-/:S/-r/./}
@@ -8,7 +8,6 @@ MASTER_SITES= http://download.opengroupware.org/nightly/sources/releases/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.opengroupware.org/en/devs/thirdparty/libFoundation/
COMMENT= Library implementing the OpenStep Foundation API
-
LICENSE= libFoundation-license
.include "../../devel/libFoundation/common.mk"
diff --git a/devel/libFoundation/Makefile b/devel/libFoundation/Makefile
index 96686fb2187..a31f243b2a8 100644
--- a/devel/libFoundation/Makefile
+++ b/devel/libFoundation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/18 02:19:23 rh Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libFoundation-1.1.7-r168
PKGNAME= ${DISTNAME:S/-r/./}
@@ -8,7 +8,6 @@ MASTER_SITES= http://download.opengroupware.org/nightly/sources/releases/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.opengroupware.org/en/devs/thirdparty/libFoundation/
COMMENT= Library implementing the OpenStep Foundation API
-
LICENSE= libFoundation-license
.include "common.mk"
diff --git a/devel/libdatrie/Makefile b/devel/libdatrie/Makefile
index 93b8403b02a..b1d1c91121c 100644
--- a/devel/libdatrie/Makefile
+++ b/devel/libdatrie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/15 08:52:42 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libdatrie-0.2.2
@@ -9,7 +9,6 @@ MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://linux.thai.net/~thep/datrie/datrie.html
COMMENT= Implementation of Double-Array Trie
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index c766568759a..20f03a81f26 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/05/13 10:04:25 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libgsf-1.14.13
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME2 structured file library
-
LICENSE= gnu-gpl-v2 # AND gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 7c935cd1991..aa3b9a80330 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2009/04/30 05:51:04 dsainty Exp $
+# $NetBSD: Makefile,v 1.65 2009/05/19 08:59:10 wiz Exp $
DISTNAME= libidn-1.14
CATEGORIES= devel
@@ -8,7 +8,6 @@ MASTER_SITES= ftp://alpha.gnu.org/pub/gnu/libidn/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libidn/
COMMENT= Internationalized Domain Names command line tool
-
#LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/libowfat/Makefile b/devel/libowfat/Makefile
index 22f999723aa..9a4814b4a97 100644
--- a/devel/libowfat/Makefile
+++ b/devel/libowfat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/21 16:53:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libowfat-0.28
@@ -9,12 +9,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fefe.de/libowfat/
COMMENT= Library of general purpose APIs
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
MAKE_FILE= GNUmakefile
USE_TOOLS+= gmake
-#LICENSE= gnu-gplv2
INSTALL_MAKE_FLAGS= prefix=${DESTDIR}${PREFIX}
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index b2754794f85..df81b9c2779 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/16 11:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:10 wiz Exp $
DISTNAME= libstatgrab-0.16
CATEGORIES= devel
@@ -11,11 +11,10 @@ MASTER_SITES= ftp://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.i-scream.org/libstatgrab/
COMMENT= Provides a useful interface to system statistics
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v2
-
.include "options.mk"
USE_TOOLS+= pkg-config perl:run
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 2ca9d2d30d1..a5b4da3d92c 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/15 08:55:35 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:10 wiz Exp $
#
DISTNAME= libthai-0.1.11
@@ -9,7 +9,6 @@ MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://linux.thai.net/projects/libthai
COMMENT= Thai language support routines
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 13f2054f60d..c1f27b29303 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2009/03/23 23:03:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.75 2009/05/19 08:59:10 wiz Exp $
###########################################################################
###########################################################################
@@ -29,7 +29,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
OWNER= joerg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libtool/libtool.html
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
CONFLICTS= glibtool-[0-9]*
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index cc41b3c0643..e0a1329ea5f 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/12 08:19:54 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= m17n-lib-1.5.4
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.m17n.org/m17n-lib-download/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.m17n.org/m17n-lib/
COMMENT= Multilingualization library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 40a01a090ca..12dfd1966a3 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/04/20 09:57:37 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/05/19 08:59:11 wiz Exp $
DISTNAME= m4-1.4.13
CATEGORIES= devel
@@ -7,13 +7,13 @@ MASTER_SITES= ${MASTER_SITE_GNU:=m4/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/m4/
COMMENT= GNU version of UNIX m4 macro language processor
+LICENSE= gnu-gpl-v3
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
INFO_FILES= yes
-LICENSE= gnu-gpl-v3
TEST_TARGET= check
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index e8f2fd9f043..ab1bf5d777b 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/04/20 10:53:58 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= meld-1.3.0
@@ -9,11 +9,10 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= dieter.NetBSD@pandora.be
HOMEPAGE= http://meld.sourceforge.net/
COMMENT= Visual diff and merge tool
+LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
-LICENSE= gnu-gpl-v2
-
PKG_DESTDIR_SUPPORT= user-destdir
USE_DIRS+= gnome2-1.6 xdg-1.3
diff --git a/devel/p5-Date-Business/Makefile b/devel/p5-Date-Business/Makefile
index 9f4eedc9125..4b89eb65534 100644
--- a/devel/p5-Date-Business/Makefile
+++ b/devel/p5-Date-Business/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:17:51 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= Date-Business-1.2
@@ -11,12 +11,11 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Date/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cpan.org/
COMMENT= Perl5 module for fast calendar and business date calculations
+LICENSE= morganstanley-license
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= morganstanley-license
-
PERL5_PACKLIST= auto/Date/Business/.packlist
.include "../../lang/perl5/module.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 017acadce1e..9e5c9d0d4d5 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2009/05/13 10:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2009/05/19 08:59:11 wiz Exp $
DISTNAME= pango-1.24.2
CATEGORIES= devel fonts
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pango.org/
COMMENT= Library for layout and rendering of text
-
LICENSE= gnu-lgpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index ebd65a35ebe..fbe1af2d94b 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/04/20 11:23:57 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= popt-1.15
@@ -7,7 +7,6 @@ MASTER_SITES= http://rpm5.org/files/popt/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Command line option parsing library
-
# mit license with advertising clause
#LICENSE= mit
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 430e3f7f481..b18ef46f562 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/03/17 21:40:45 darcy Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= pvs-${VERSION}
@@ -12,8 +12,8 @@ EXTRACT_SUFX= .tgz
DISTFILES= ${DISTNAME}-${MAINFILEEXT}${EXTRACT_SUFX} \
pvs-${VERSION}-system${EXTRACT_SUFX} \
pvs-${VERSION}-libraries${EXTRACT_SUFX}
-
LICENSE= pvs-license
+
# not quite sure about this, but to be on the safe side:
RESTRICTED= Redistribution not permitted - see ${HOMEPAGE}license.html
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index bd11e5330e3..8f29db323ed 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/02/09 21:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= InlineEgg-1.08
@@ -10,11 +10,10 @@ MASTER_SITES= http://oss.corest.com/repo/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://oss.corest.com/projects/inlineegg.html
COMMENT= Python module for writing inline assembler programs
+LICENSE= inlineegg-license
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= inlineegg-license
-
PY_PATCHPLIST= YES
PYDISTUTILSPKG= YES
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 045be8ff82f..c8208982a27 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/12 13:27:55 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= Babel-0.9.4
@@ -9,7 +9,6 @@ MASTER_SITES= http://ftp.edgewall.com/pub/babel/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://babel.edgewall.org/
COMMENT= Collection of tools for internationalizing Python applications
-
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index fb4f39c9b60..915f1d754bd 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/27 17:08:48 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= pygame-1.8.1release
@@ -10,7 +10,6 @@ MASTER_SITES= http://pygame.org/ftp/
MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://pygame.org/
COMMENT= Set of Python modules designed for writing games
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index d54a4c415cb..5db537cb99d 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2009/02/23 12:35:46 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2009/05/19 08:59:11 wiz Exp $
#
DISTNAME= readline-6.0
@@ -11,7 +11,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=readline/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
COMMENT= GNU library that can recall and edit previous input
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/ruby-rcsparse/Makefile b/devel/ruby-rcsparse/Makefile
index 2ce40f35df1..e4782200562 100644
--- a/devel/ruby-rcsparse/Makefile
+++ b/devel/ruby-rcsparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/24 16:17:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:12 wiz Exp $
DISTNAME= 0aa8fb608963
PKGNAME= ${RUBY_PKGPREFIX}-rcsparse-0.0.0.43
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ww2.fs.ei.tum.de/~corecode/hg/rcsparse/
COMMENT= RCS parsing library for Ruby
-
LICENSE= corecode-license
DIST_SUBDIR= rcsparse
diff --git a/devel/sapnwrfcsdk/Makefile b/devel/sapnwrfcsdk/Makefile
index 97852daa679..3899367d25e 100644
--- a/devel/sapnwrfcsdk/Makefile
+++ b/devel/sapnwrfcsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/09 16:53:16 sno Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:12 wiz Exp $
PKGNAME= sapnwrfcsdk-7.11
CATEGORIES= devel
@@ -65,8 +65,8 @@ EXTRACT_CMD= SAPCAR -xvf ${DOWNLOADED_DISTFILE}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= SAP NetWeaver RFC SDK
-
LICENSE= sap-license
+
RESTRICTED= Only unmodified original package can be distributed
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index b873168ca14..edc9631b05d 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2009/04/29 23:52:14 gdt Exp $
+# $NetBSD: Makefile.common,v 1.32 2009/05/19 08:59:12 wiz Exp $
# used by devel/java-subversion/Makefile
# used by devel/p5-subversion/Makefile
# used by devel/py-subversion/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= http://subversion.tigris.org/tarballs/
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://subversion.tigris.org/
-
LICENSE= apache-1.1
.include "../../devel/subversion/Makefile.version"
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 895eb119e29..a94978abc89 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/02/09 22:56:23 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:12 wiz Exp $
#
DISTNAME= tailor-0.9.35
@@ -9,10 +9,10 @@ MASTER_SITES= http://darcs.arstecnica.it/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wiki.darcs.net/DarcsWiki/Tailor
COMMENT= Tool to migrate changesets between various version control systems
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-#LICENSE= GPLv3
PYDISTUTILSPKG= yes
PYTHON_PATCH_SCRIPTS= tailor
diff --git a/devel/wide/Makefile b/devel/wide/Makefile
index 887755a99d0..cb775964d00 100644
--- a/devel/wide/Makefile
+++ b/devel/wide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/03/17 21:40:45 darcy Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:12 wiz Exp $
#
DISTNAME= wide
@@ -11,6 +11,7 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www2.mta.ac.il/~tal/WIDE/
COMMENT= IDE for the While programming language
+LICENSE= eclipse-license
PKG_DESTDIR_SUPPORT= user-destdir
@@ -18,8 +19,6 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/WIDE
EXTRACT_OPTS_ZIP= -aqo
-LICENSE= eclipse-license
-
PKG_JVMS_ACCEPTED= sun-jdk14 sun-jdk15
INSTALLATION_DIRS= bin libexec/wide share/wide
diff --git a/devel/xdelta3/Makefile b/devel/xdelta3/Makefile
index 8a38f719267..3cb4920b49b 100644
--- a/devel/xdelta3/Makefile
+++ b/devel/xdelta3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/08 19:57:48 heinz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:12 wiz Exp $
#
DISTNAME= xdelta3.0u
@@ -9,7 +9,6 @@ MASTER_SITES= http://xdelta.googlecode.com/files/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xdelta.org/
COMMENT= Enhanced diff that works on binary files (version 3.x)
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index e4e20dbb82f..587082838a4 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:12 wiz Exp $
DISTNAME= xfce4-dev-tools-4.4.0.1
CATEGORIES= devel
@@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.xfce.org/
COMMENT= Xfce development tools
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index bca5657a9e0..927dd2abce3 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2009/05/12 08:33:52 hasso Exp $
+# $NetBSD: Makefile,v 1.121 2009/05/19 08:59:12 wiz Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
CONFLICTS+= elisp-manual-[0-9]*
CONFLICTS+= emacs-[0-9]*
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 634196ad842..32fdc31078f 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/06 21:56:44 snj Exp $
+# $NetBSD: Makefile,v 1.37 2009/05/19 08:59:12 wiz Exp $
DISTNAME= nano-2.0.8
CATEGORIES= editors
@@ -7,13 +7,12 @@ MASTER_SITES= http://www.nano-editor.org/dist/v2.0/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nano-editor.org/
COMMENT= Small and friendly text editor (a free replacement for Pico)
+LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt
-#LICENSE= gnu-gplv3
-
INFO_FILES= yes
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 7c17b205090..e9042c46e16 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2008/11/04 19:24:40 jwise Exp $
+# $NetBSD: Makefile,v 1.76 2009/05/19 08:59:12 wiz Exp $
#
# NOTE:
# When updating, it is necessary to change the shlib version, located in
@@ -17,7 +17,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.washington.edu/pine/
COMMENT= Text editor (ships with Pine), and Pine's text editing lib
-
LICENSE= pine-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index 9588b2ac132..ff01a2b6367 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:13 wiz Exp $
DISTNAME= dn9b0401
CATEGORIES= emulators
@@ -6,7 +6,6 @@ MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/
EXTRACT_SUFX= .tgz
HOMEPAGE= http://www.dridus.com/~nyef/darcnes/
-
LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/darcnes
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 891d01221cd..739d65f286a 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/09/02 12:06:18 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:13 wiz Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
@@ -12,6 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= dsainty@NetBSD.org
HOMEPAGE= http://www.palmos.com/dev/tools/emulator/
COMMENT= Palm OS Emulator
+#LICENSE= GPL
PKG_DESTDIR_SUPPORT= user-destdir
@@ -22,8 +23,6 @@ DIST_SUBDIR= ${PKGBASE}
# Source is under sources/ directory, skins are not...
SITES.emulator-skins-19.tar.gz= http://www.palmos.com/dev/tools/emulator/
-#LICENSE= GPL
-
WRKSRC= ${WRKDIR}/Emulator_Src_${POSE_VERSION}
POSE_BUILD_DIR= ${WRKSRC}/BuildUnix
POSE_SHARE_DIR= ${PREFIX}/share/palmosemulator
diff --git a/emulators/sdlmame/Makefile.common b/emulators/sdlmame/Makefile.common
index f54787505fb..3ed9d6146a1 100644
--- a/emulators/sdlmame/Makefile.common
+++ b/emulators/sdlmame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2009/01/18 16:02:17 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/05/19 08:59:13 wiz Exp $
#
# used by emulators/sdlmess/Makefile
@@ -9,16 +9,16 @@ EXTRACT_SUFX= .zip
MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://rbelmont.mameworld.info/?page_id=163
-
-PKG_DESTDIR_SUPPORT= user-destdir
+LICENSE= mame-license
RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake pkg-config
UNLIMIT_RESOURCES+= datasize
-LICENSE= mame-license
.if ${MACHINE_ARCH:Mi386}
MAKE_FLAGS+= X86_MIPS3_DRC=1
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 53433a47244..7acff4c30d4 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/04/28 21:19:00 zafer Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:13 wiz Exp $
DISTNAME= spim-7.3
CATEGORIES= emulators
@@ -7,16 +7,16 @@ MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pages.cs.wisc.edu/~larus/spim.html
COMMENT= MIPS R2000 Simulator
+LICENSE= spim-license
-PKG_DESTDIR_SUPPORT= user-destdir
-
-LICENSE= spim-license
RESTRICTED= No permission to copy, and prohibited commercially.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
HAS_CONFIGURE= yes
CONFIGURE_DIRS= xspim
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 2b53a062bbc..b3d4a35323d 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:13 wiz Exp $
DISTNAME= VMware-2.0.4-1142
PKGNAME= vmware-2.0.4
@@ -16,11 +16,10 @@ MASTER_SITES= http://www4.vmware.com/software/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.vmware.com/
COMMENT= VMware 2.x emulator
+LICENSE= vmware-license
DEPENDS+= vmware-module-1.*:../../emulators/vmware-module
-LICENSE= vmware-license
-
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= vmware
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 5b2c97496fe..3601a56d77e 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/03 19:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:13 wiz Exp $
DISTNAME= VMware-workstation-3.2.1-2242
PKGNAME= vmware-3.2.1pl1
@@ -17,11 +17,10 @@ SITES.${VMWARE_BIN_PATCH}.tar.gz= ftp://ftp.cvut.cz/vmware/obsolete/
MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://www.vmware.com/
COMMENT= VMware emulator 3.x
+LICENSE= vmware-license
DEPENDS+= vmware-module>=3.2.1.8:../../emulators/vmware-module3
-LICENSE= vmware-license
-
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= vmware
EMUL_REQD= suse>=6.4nb1
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 07a6c1575d1..7e372d4fe61 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/09/10 00:33:59 gdt Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:13 wiz Exp $
#
DISTNAME= xm71010s
@@ -11,19 +11,19 @@ EXTRACT_SUFX= .lzh
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml
COMMENT= X11-based FM-7 emulator
-
-BUILD_DEPENDS+= nkf>=1.7:../../converters/nkf
-
-PKG_DESTDIR_SUPPORT= user-destdir
-NOT_FOR_BULK_PLATFORM= Linux-*-*
-
LICENSE= xm7-license
+
RESTRICTED= source archive is not redistributable
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
+BUILD_DEPENDS+= nkf>=1.7:../../converters/nkf
+
+PKG_DESTDIR_SUPPORT= user-destdir
+NOT_FOR_BULK_PLATFORM= Linux-*-*
+
EXTRACT_OPTS_LHA= qt # convert CRLF to LF
WRKSRC= ${WRKDIR}/vm
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 74c7679c40a..bd46aee646a 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2009/01/18 16:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2009/05/19 08:59:13 wiz Exp $
#
DISTNAME= xmame-0.106
@@ -9,8 +9,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= kristerw@NetBSD.org
HOMEPAGE= http://x.mame.net/
COMMENT= X11 emulator for old arcade machines
-
LICENSE= mame-license
+
RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 2e460879aa3..0a066693293 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/01/18 16:05:03 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:13 wiz Exp $
#
DISTNAME= xmame-0.106
@@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= kristerw@NetBSD.org
HOMEPAGE= http://x.mame.net/
COMMENT= X11 emulator for old computers and console machines
-
LICENSE= mame-license
+
RESTRICTED= selling is not allowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/fonts/acroread5-font-share/Makefile.common b/fonts/acroread5-font-share/Makefile.common
index 95d68cd6f34..0189fcfa843 100644
--- a/fonts/acroread5-font-share/Makefile.common
+++ b/fonts/acroread5-font-share/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.7 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2009/05/19 08:59:14 wiz Exp $
#
PKGNAME= acroread5-${DISTNAME}-5.0
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/5.x/
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
+LICENSE= adobe-acrobat-license
DEPENDS+= acroread5-5.*:../../print/acroread5
DIST_SUBDIR= acrobat5-fonts
-LICENSE= adobe-acrobat-license
RESTRICTED= Redistribution not permitted
NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/fonts/acroread7-font-share/Makefile.common b/fonts/acroread7-font-share/Makefile.common
index a231e3709fb..d83b30207fb 100644
--- a/fonts/acroread7-font-share/Makefile.common
+++ b/fonts/acroread7-font-share/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.3 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/05/19 08:59:14 wiz Exp $
#
PKGNAME= acroread7-${DISTNAME}-7.0
MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/misc/
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
+LICENSE= adobe-acrobat-license
DEPENDS+= acroread7-7.*:../../print/acroread7
DIST_SUBDIR= acrobat7-fonts
-LICENSE= adobe-acrobat-license
RESTRICTED= Redistribution not permitted
NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index 86633a567b8..eeb012151d3 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:14 wiz Exp $
#
DISTNAME= bakoma-20010719
@@ -11,8 +11,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/
COMMENT= BaKoMa Fonts for TeX
-
LICENSE+= no-commercial-use
+
NO_SRC_ON_CDROM= #defined
NO_BIN_ON_CDROM= #defined
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 7f304537d69..caf7e2ba73f 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/05/19 08:59:14 wiz Exp $
#
DISTNAME= # empty
@@ -8,16 +8,16 @@ DISTFILES= ${FONT_FILE} ReadMe.htm
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.bitstream.com/
-
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
LICENSE= cyberbit-ttf-license
+
RESTRICTED= Redistribution not permitted; single user license only.
NO_SRC_ON_CDROM=${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
+
PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= cyberbit-ttf
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index bb2d277f7a0..52dff0ae7f0 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:14 wiz Exp $
#
DISTNAME= dbz
@@ -11,14 +11,14 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://fonts.tom7.com/
COMMENT= Divide By Zero TrueType fonts created by Tom Murphy 7
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
LICENSE= dbz-ttf-license
+
RESTRICTED= Resale prohibited.
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
+DIST_SUBDIR= ${PKGNAME_NOREV}
+
PKG_DESTDIR_SUPPORT= user-destdir
USE_X11= YES
diff --git a/fonts/inconsolata-ttf/Makefile b/fonts/inconsolata-ttf/Makefile
index 5b52bee3146..9616c564897 100644
--- a/fonts/inconsolata-ttf/Makefile
+++ b/fonts/inconsolata-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/07 19:49:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:14 wiz Exp $
#
DISTNAME= Inconsolata.otf
@@ -10,7 +10,6 @@ EXTRACT_SUFX= # empty
MAINTAINER= smb@NetBSD.org
HOMEPAGE= http://www.levien.com/type/myfonts/inconsolata.html
COMMENT= Inconsolata TrueType font
-
#LICENSE= sil-open-font-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index e3be99caa63..a806bf830a5 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:14 wiz Exp $
DISTNAME= elisat10
PKGNAME= ja-elisat-1.0
@@ -9,6 +9,7 @@ MASTER_SITES= http://www.tea.forus.or.jp/toshi/exhibition/
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= ${MASTER_SITES}/elisat10.html
COMMENT= 8x8 dots X11 bitmap font for JIS X 0208
+LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,8 +20,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local
FONTS_DIRS.x11= ${FONTDIR}
USE_TOOLS+= bdftopcf gzip
-LICENSE= no-commercial-use
-
do-build:
cd ${WRKSRC}; \
for i in *.bdf; do \
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 37aa442d94f..639dbda86db 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:14 wiz Exp $
DISTNAME= elisau10
PKGNAME= ja-elisau-1.0
@@ -12,6 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} clR5x8.bdf
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www.wheel.gr.jp/~dai/software/#elisau10
COMMENT= 10x8 dots X11 bitmap font for JIS X 0208
+LICENSE= no-commercial-use
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
SITES.elisau10${EXTRACT_SUFX}= \
@@ -28,8 +29,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local
FONTS_DIRS.x11= ${FONTDIR}
DISTPATCH= ${WRKSRC}/clR5x8-s5x8.diff
-LICENSE= no-commercial-use
-
post-extract:
${CP} ${DISTDIR}/clR5x8.bdf ${WRKDIR}; \
cd ${WRKSRC}; \
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 06709a35b5d..2e2be464195 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:14 wiz Exp $
DISTNAME= kaname_k12_bdf
PKGNAME= ja-kaname-0.0.0.20030112
@@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} # original site was closed.
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
COMMENT= 12x12 dots X11 bitmap font for JIS X 0208
+#LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
@@ -18,8 +19,6 @@ DOCDIR= ${PREFIX}/share/doc/kaname
FONTDIR= ${PREFIX}/lib/X11/fonts/local
FONTS_DIRS.x11= ${FONTDIR}
-#LICENSE= no-commercial-use
-
do-build:
cd ${WRKSRC}; \
for i in *.bdf; do \
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 5d1a18d7a3c..2fedfe1222a 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:03 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:14 wiz Exp $
DISTNAME= # empty
PKGNAME= ms-ttf-20020306
@@ -12,13 +12,13 @@ DISTFILES= andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://corefonts.sourceforge.net/
COMMENT= TrueType fonts from Microsoft
+LICENSE= ms-ttf-license
-PKG_DESTDIR_SUPPORT= user-destdir
+RESTRICTED= No redistribution in altered form
BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
-LICENSE= ms-ttf-license
-RESTRICTED= No redistribution in altered form
+PKG_DESTDIR_SUPPORT= user-destdir
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/games/gate88/Makefile b/games/gate88/Makefile
index 9f6dbe931c1..d86bf88908a 100644
--- a/games/gate88/Makefile
+++ b/games/gate88/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:19 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:14 wiz Exp $
#
DISTNAME= Gate88_Mar19_05
@@ -9,6 +9,13 @@ MASTER_SITES= http://www.queasygames.com/gate88/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.queasygames.com/gate88/
COMMENT= Deep space intergalactic battle
+LICENSE= gate88-license
+
+RESTRICTED= ${LICENSE}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,13 +24,6 @@ EMUL_MODULES.linux= base x11
USE_LANGUAGES= # none
-LICENSE= gate88-license
-RESTRICTED= ${LICENSE}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-
INSTALLATION_DIRS= bin lib/gate88 lib/gate88/lib lib/gate88/music
INSTALLATION_DIRS+= lib/gate88/music/non-ingame lib/gate88/sound
INSTALLATION_DIRS+= share/doc/gate88
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 8a5efd2cb3c..901af89da0f 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/04 01:37:43 hasso Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:15 wiz Exp $
#
DISTNAME= gbrainy-1.1
@@ -10,7 +10,6 @@ MASTER_SITES= http://www.softcatala.org/~jmas/gbrainy/
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://live.gnome.org/gbrainy
COMMENT= Brain teaser game and trainer
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index a031c38b3e4..41729120803 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/12 08:28:59 hasso Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:15 wiz Exp $
DISTNAME= gcompris-8.4.4
PKGREVISION= 3
@@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gcompris/}
MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://gcompris.net/
COMMENT= Educational games for children
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,7 +20,6 @@ USE_LIBTOOL= YES
CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh
USE_DIRS+= xdg-1.1 gnome2-1.5
INFO_FILES= yes
-#LICENSE= gnu-gplv3
DEPENDS+= gnuchess-[0-9]*:../../games/gnuchess
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 12ac23146e4..b6e6db3616b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2009/05/18 10:27:15 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2009/05/19 08:59:15 wiz Exp $
DISTNAME= gnome-games-2.26.1
CATEGORIES= games gnome
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME2 games collection
-
#LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index bf979e4115f..97a79bc60b8 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/01/12 16:19:31 jmcneill Exp $
+# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:15 wiz Exp $
DISTNAME= linuxq3apoint-1.32b.x86
PKGREVISION= 3
@@ -11,19 +11,19 @@ EXTRACT_SUFX= .run
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.quake3arena.com/
COMMENT= Quake 3 Arena -- first person shooter (binary only, no data files)
-
-CONFLICTS= quake3arena-demo-[0-9]*
-
-EMUL_PLATFORMS= linux-i386
-EMUL_MODULES.linux= base x11 glx
-
LICENSE= quake3arena-license
+
RESTRICTED= Terms are too complicated to evaluate.
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+CONFLICTS= quake3arena-demo-[0-9]*
+
+EMUL_PLATFORMS= linux-i386
+EMUL_MODULES.linux= base x11 glx
+
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gtar gunzip pax tail
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index 2bc620375d9..343448f7558 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:15 wiz Exp $
DISTNAME= quake106
PKGNAME= quakedata-1.0
@@ -11,15 +11,15 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.idsoftware.com/
COMMENT= Game data files for Quake
-
-BUILD_DEPENDS+= lha-[0-9]*:../../archivers/lha
-
LICENSE= quakedata-license
+
RESTRICTED= This software is shareware.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+BUILD_DEPENDS+= lha-[0-9]*:../../archivers/lha
+
PKG_DESTDIR_SUPPORT= user-destdir
EXTRACT_ELEMENTS= resource.*
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 75830c4192c..629a9fb4ddf 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/09/25 14:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:15 wiz Exp $
DISTNAME= Rollemup
PKGNAME= rollemup-1.0
@@ -10,8 +10,8 @@ MASTER_SITES= http://savor.gulic.org/demos/
MAINTAINER= pkgsrc-users@NetBSD.org
#HOMEPAGE= http://www.medialab.lostboys.nl/projects/madewith/pinball/pinballgame.html
COMMENT= Multi Ball, Player, Platform, Media, Cool Pinball game
-
LICENSE= no-commercial-use
+
RESTRICTED= You are not allowed to distribute the software by any means. \
You are allowed to download a copy from this site for personal use. \
See http://www.medialab.lostboys.nl/content/showcase/license.html
diff --git a/games/velena/Makefile b/games/velena/Makefile
index 157eadae7f8..42c406996ec 100644
--- a/games/velena/Makefile
+++ b/games/velena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/03 19:15:52 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:15 wiz Exp $
#
DISTNAME= veleng10
@@ -11,8 +11,8 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ce.unipr.it/~gbe/
COMMENT= Perfect-play engine for connect four
+LICENSE= velena-license
-LICENSE= velena-license
RESTRICTED= You must not charge a fee for this software nor for any derived work in which this software is included.
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 44929e61b53..a8f24a481ef 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2009/03/30 09:31:00 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2009/05/19 08:59:15 wiz Exp $
DISTNAME= wesnoth-1.6
CATEGORIES= games
@@ -8,13 +8,12 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.wesnoth.org/
COMMENT= Fantasy turn-based strategy game
+LICENSE= gnu-gpl-v2
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
PKG_DESTDIR_SUPPORT= user-destdir
-#LICENSE= gnu-gpl-v2
-
CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
USE_DIRS= xdg-1.4
USE_LIBTOOL= yes
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 3ee7002f6f9..e64fe69981d 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/03/04 06:59:06 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:15 wiz Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -12,7 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
# HOMEPAGE= http://www.idsoftware.com/archives/doomarc.html
# AWOL
COMMENT= 3D shoot-em-up for 8-bit X11 displays
-
LICENSE= xdoom-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 1190966ab91..690ff1bff7d 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= xfrisk-1.2
@@ -9,14 +9,14 @@ MASTER_SITES= http://www.tuxick.net/xfrisk/files/
MAINTAINER= sketch@NetBSD.org
HOMEPAGE= http://www.tuxick.net/xfrisk/
COMMENT= X11 version of the classic Risk board game
-
-WRKSRC= ${WRKDIR}/XFrisk
-USE_TOOLS+= gmake
-
# LICENSE pending investigation; absence of LICENSE violates
# "RESTRICTED implies LICENSE" pkgsrc rule.
#LICENSE= gnu-gpl-v2
LICENSE+= generic-nonlicense
+
+WRKSRC= ${WRKDIR}/XFrisk
+USE_TOOLS+= gmake
+
RESTRICTED= Possible trademark infringement
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/geography/epsg-docs/Makefile b/geography/epsg-docs/Makefile
index e94017a204c..f18e2c3975d 100644
--- a/geography/epsg-docs/Makefile
+++ b/geography/epsg-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= G7-1
@@ -12,7 +12,6 @@ DIST_SUBDIR= epsg-docs-${VERS}
MAINTAINER= cngo@nmsu.edu
HOMEPAGE= http://www.epsg.org/
COMMENT= EPSG geodetic parameters database documentation
-
LICENSE= epsg-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/geography/epsg/Makefile b/geography/epsg/Makefile
index 7dfdc01bc88..f2372c839dd 100644
--- a/geography/epsg/Makefile
+++ b/geography/epsg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/12/09 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= epsg-v${VERS}sql-PostgreSQL
@@ -15,14 +15,13 @@ DIST_SUBDIR= epsg-${VERS}
MAINTAINER= brook@nmsu.edu
HOMEPAGE= http://www.epsg.org/
COMMENT= EPSG geodetic parameters database
+LICENSE= epsg-license
PKG_DESTDIR_SUPPORT= user-destdir
# Don't make filenames lowercase.
EXTRACT_OPTS_ZIP= -aqo
-LICENSE= epsg-license
-
WRKSRC= ${WRKDIR}
NO_BUILD= yes
diff --git a/graphics/Cenon/Makefile b/graphics/Cenon/Makefile
index 8deae585986..014d8265f36 100644
--- a/graphics/Cenon/Makefile
+++ b/graphics/Cenon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/04/19 07:57:27 rh Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= Cenon-3.83
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cenon.info/
COMMENT= Vector graphics / CAD / DTP program
-
LICENSE= vhf-public-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 29b814c05c0..860c7cac039 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:06:33 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= clutter-box2d-0.8.2
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter-box2d/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= Clutter Box2D integration library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile
index 8f2ee7e3af1..97c9e55d60b 100644
--- a/graphics/clutter-cairo/Makefile
+++ b/graphics/clutter-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:12:20 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= clutter-cairo-0.8.2
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter-cairo/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= Clutter Cairo integrarion library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index c8154fc42ef..51aa953ae96 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= clutter-gtk-0.8.3
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter-gtk/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= GTK+ Integration library for Clutter
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 9349860dce2..ee8b7aba668 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:02:28 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= clutter-0.8.8
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://clutter-project.org/
COMMENT= Open GL based interactive canvas library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 22bf42aba30..98f994c9f6c 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/04/20 09:17:19 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= comix-4.0.4
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=comix/}
MAINTAINER= hugor@users.sourceforge.net
HOMEPAGE= http://comix.sourceforge.net/index.html
COMMENT= Image viewer specifically designed to handle comic books
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 998aacffbd1..43185ad0896 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2009/05/18 09:51:07 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2009/05/19 08:59:16 wiz Exp $
#
DISTNAME= eog-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Eye of GNOME: an image viewing and cataloging program
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 86fd646c148..53b6e716388 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/01/08 18:21:54 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= exiv2-0.18
@@ -9,8 +9,7 @@ MASTER_SITES= http://www.exiv2.org/
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://www.exiv2.org/
COMMENT= Image metadata manipulation
-
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index 7e1b053e68d..476fcc5ebe7 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/10 05:10:31 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= goocanvas-0.14
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvas/0.14/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://live.gnome.org/GooCanvas
COMMENT= Cairo-based canvas widget for GTK+
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index 14029d9db72..9aadac7262e 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/05/10 13:12:01 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= goocanvasmm-0.14.0
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvasmm/0.14/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://live.gnome.org/GooCanvas
COMMENT= C++ wrappers for goocanvas
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile
index 0b6461d370a..2d74829c91b 100644
--- a/graphics/jpeg2ps/Makefile
+++ b/graphics/jpeg2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/09/10 13:46:30 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= jpeg2ps-1.9
@@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
# 200809: broken
HOMEPAGE= http://www.pdflib.com/products/more/jpeg2ps.html
COMMENT= Convert jpeg images to PostScript level 2 or 3
-
LICENSE= jpeg2ps-license
+
RESTRICTED= may not be sold or bundled with any commercial package
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/graphics/jpeg_ls/Makefile b/graphics/jpeg_ls/Makefile
index 0220170d0b5..13c2686713c 100644
--- a/graphics/jpeg_ls/Makefile
+++ b/graphics/jpeg_ls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 15:39:10 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= jpeg_ls_v2.2
@@ -9,13 +9,13 @@ MASTER_SITES= http://kt.ijs.si/aleks/jpeg-ls/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://kt.ijs.si/aleks/jpeg-ls/mirror.htm
COMMENT= JPEG-LS codec (lossless/near-lossless codec)
+LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
BUILD_DIRS= ${WRKSRC}/Decoder ${WRKSRC}/Encoder
MAKE_FILE= makefile
-LICENSE= no-commercial-use
INSTALLATION_DIRS= bin
do-install:
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index fc4dba9157c..dd9c3d49f03 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/19 16:58:29 gdt Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:17 wiz Exp $
DISTNAME= lcms-1.18a
# 1.18a is a bugfix semi-release after 1.18, and it's just 1.18 with a
@@ -10,6 +10,8 @@ MASTER_SITES= http://www.littlecms.com/
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://www.littlecms.com/
COMMENT= Little Color Management System -- a color management library
+# This is very MIT-like, but perhaps not the exact text.
+#LICENSE= lcms-license
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -22,9 +24,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
TEST_TARGET= check
-# This is very MIT-like, but perhaps not the exact text.
-#LICENSE= lcms-license
-
# lcms does not need zlib, but will look for it and link it to tifficc
# if present. Therefore, we don't enjoin lcms from finding zlib, but
# don't include it via bl3.
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 2aac9e62e04..5a3eca29214 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/13 10:20:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= libkdcraw-0.1.9
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.kipi-plugins.org/
COMMENT= C++ interface around dcraw
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile
index bdefb50ffe0..22c86695616 100644
--- a/graphics/p5-clutter/Makefile
+++ b/graphics/p5-clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:12:20 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:17 wiz Exp $
#
DISTNAME= clutter-perl-0.8.2.0
@@ -9,7 +9,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= Perl bindings to the Clutter OpenGL canvas
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 5f68e23c797..3bd729ff8e6 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2008/12/01 12:01:18 obache Exp $
+# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:18 wiz Exp $
DISTNAME= povray-3.6.1
PKGREVISION= 5
@@ -10,11 +10,10 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.povray.org/
COMMENT= Persistence of Vision Ray Tracer
+LICENSE= povray-license
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= povray-license
-
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
USE_LANGUAGES= c c++
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index ee7202b62e1..6544a8ca414 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/03/10 03:29:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/19 08:59:18 wiz Exp $
DISTNAME= pstoedit-3.45
CATEGORIES= converters graphics print
@@ -7,12 +7,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pstoedit/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pstoedit.net/
COMMENT= Convert PostScript / PDF into various vector graphic formats
-
-PKG_DESTDIR_SUPPORT= user-destdir
+LICENSE= unclear-license
# man page indicates that there are many licenses and one has to read all
# the source files
-LICENSE= unclear-license
RESTRICTED= license is unclear
RESTRICTED?= "The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
NO_SRC_ON_FTP= ${RESTRICTED}
@@ -20,6 +18,8 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gs:run
USE_LIBTOOL= yes
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 8db29008327..92d7e2e13da 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/05/13 12:56:46 obache Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= pycairo-1.8.4
@@ -9,7 +9,6 @@ MASTER_SITES= http://cairographics.org/releases/
MAINTAINER= leuzi@trash.net
HOMEPAGE= http://cairographics.org/pycairo/
COMMENT= Python bindings for cairo
-
#LICENSE= gnu-lgpl-v2.1 OR mpl-v1.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 063d325c8cd..072e0272594 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/08 11:12:20 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= pyclutter-0.8.2
@@ -10,7 +10,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= Python modules for Clutter toolkit
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index cb8d5e927ee..aa401d62dc9 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/13 13:00:48 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= pygoocanvas-0.14.1
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygoocanvas/0.14/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://live.gnome.org/PyGoocanvas
COMMENT= Python bindings for GooCanvas
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index fc017f04433..cef2b39aa0c 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/10 14:01:58 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= qvplay-0.94
@@ -8,8 +8,8 @@ MASTER_SITES= http://www.asahi-net.or.jp/~xg2k-hys/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.asahi-net.or.jp/~xg2k-hys/index-e.html
COMMENT= Software for use with CASIO QV digital cameras
-
LICENSE= generic-nonlicense
+
RESTRICTED= No permission to distribute
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 3ac4733804d..916560aa655 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/04/29 05:15:14 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= rad3R6P1
@@ -12,6 +12,7 @@ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}supp${EXTRACT_SUFX}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.radiance-online.org/
COMMENT= Physically-based, image-generating, backward raytracer
+LICENSE= radiance-license
PKG_DESTDIR_SUPPORT= user-destdir
NOT_FOR_BULK_PLATFORM= HPUX-*-*
@@ -20,8 +21,6 @@ USE_TOOLS+= pax
WRKSRC= ${WRKDIR}/ray
-LICENSE= radiance-license
-
PATCHEES= makeall ./src/rt/Rmakefile ./src/util/Rmakefile \
./src/ot/Rmakefile ./src/meta/Rmakefile \
./src/hd/Rmakefile ./src/gen/Rmakefile \
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 10c10e4ac9f..115356380f8 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2009/05/03 22:58:31 abs Exp $
+# $NetBSD: Makefile,v 1.77 2009/05/19 08:59:18 wiz Exp $
DISTNAME= xv-3.10a
PKGREVISION= 13
@@ -15,6 +15,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.trilon.com/xv/
# and... http://www.sonic.net/~roelofs/greg_xv.html
COMMENT= X11 program that displays images of various formats
+LICENSE= xv-license
SITES.xv-3.10a-jumbo-patches-20070520.tar.gz= ${MASTER_SITE_SOURCEFORGE:=png-mng/}
USE_IMAKE= YES
@@ -30,7 +31,6 @@ MAKEFLAGS+= PREFIX=${PREFIX:Q}
MAKEFLAGS+= PNGDIR=${BUILDLINK_PREFIX.png}
CPPFLAGS+= -DDOCDIR=\""${PREFIX:Q}/share/doc/xv"\"
-LICENSE= xv-license
BUILD_TARGET= depend all
SUBST_CLASSES+= gspath
diff --git a/ham/7plus/Makefile b/ham/7plus/Makefile
index 7aac1b93632..1ab5ff54228 100644
--- a/ham/7plus/Makefile
+++ b/ham/7plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:32 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= 7pl225sr
@@ -12,11 +12,10 @@ DISTFILES= 7pl225sr.tgz \
MAINTAINER= wulf@NetBSD.org
HOMEPAGE= #http://home.t-online.de/home/dg1bbq/
COMMENT= Uuencode-like file coder for AMPR BBS S&F of binary files
+LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= no-commercial-use
-
WRKSRC= ${WRKDIR}/7plsrc.225
MAKE_FILE= netbsd.mak
USE_TOOLS+= gmake
diff --git a/inputmethod/gtk-im-libthai/Makefile b/inputmethod/gtk-im-libthai/Makefile
index 3bf06a051a1..7a947b9b78c 100644
--- a/inputmethod/gtk-im-libthai/Makefile
+++ b/inputmethod/gtk-im-libthai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/15 08:57:44 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:18 wiz Exp $
#
DISTNAME= gtk-im-libthai-0.1.4
@@ -10,7 +10,6 @@ MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://linux.thai.net/projects/gtk-im-libthai
COMMENT= GTK+-2.0 Thai Input Module
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/inputmethod/m17n-im-config/Makefile b/inputmethod/m17n-im-config/Makefile
index 309c8540e79..1947584ed3e 100644
--- a/inputmethod/m17n-im-config/Makefile
+++ b/inputmethod/m17n-im-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/12 08:21:09 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:19 wiz Exp $
#
DISTNAME= m17n-im-config-0.9.0
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.m17n.org/m17n-lib-download/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.m17n.org/common/im-config/index.html
COMMENT= Configuration input methods of the m17n library
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index 19230b9355f..3b4774662d0 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/07/14 12:56:07 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:19 wiz Exp $
DISTNAME= inform-6.31.1
CATEGORIES= lang
@@ -7,7 +7,6 @@ MASTER_SITES= http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/s
MAINTAINER= nathanw@mit.edu
HOMEPAGE= http://www.inform-fiction.org/
COMMENT= Interactive fiction compiler (Z-Machine and Glulx)
-
LICENSE= no-profit
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index 1ec106da82e..eb76443f80e 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/19 08:59:19 wiz Exp $
#
DISTNAME= unix_jb35foundation
@@ -10,6 +10,7 @@ MASTER_SITES= http://ftp.cdut.edu.cn/pub2/linux/develop/jbuilder/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.borland.com/
COMMENT= Just-In-Time compiler for Linux Java Virtual Machine
+LICENSE= jbuilder-jit-license
WRKSRC= ${WRKDIR}/javacomp-1.2.15
USE_JAVA= run
@@ -18,7 +19,6 @@ PLIST_SUBST+= JAVADIR=${PKG_JAVA_HOME:C|${PREFIX}/||}
EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz
-LICENSE= jbuilder-jit-license
RESTRICTED= Redistribution of binaries not permitted
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 498d51df967..1a84544e48d 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2009/05/19 08:59:19 wiz Exp $
#
VERSION= 1.1.8
@@ -11,7 +11,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Sun's Java(tm) Development Kit
-
LICENSE= jdk-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/lang/jini/Makefile b/lang/jini/Makefile
index 62b2d5c3119..0e488d2862b 100644
--- a/lang/jini/Makefile
+++ b/lang/jini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:19 wiz Exp $
#
DISTNAME= jini-${SUN_VERSION}-src
@@ -11,6 +11,13 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.sun.com/software/jini/
COMMENT= Suns Jini(tm) Technology Starter Kit
+LICENSE= scsl3-jini-tsa-1.0-license
+
+RESTRICTED= Redistribution of repackaged binaries not permitted
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
ONLY_FOR_PLATFORM= Darwin-*-* Linux-*-* NetBSD-1.[6-9]*-*
ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-*
@@ -18,12 +25,6 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-*
ONLY_FOR_PLATFORM+= NetBSD-1.5Z[D-Z]-*
INTERACTIVE_STAGE= fetch
-LICENSE= scsl3-jini-tsa-1.0-license
-RESTRICTED= Redistribution of repackaged binaries not permitted
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
USE_TOOLS+= pax
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index ff349b91066..fc712736006 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2009/05/02 19:23:44 sno Exp $
+# $NetBSD: Makefile,v 1.151 2009/05/19 08:59:19 wiz Exp $
DISTNAME= perl-5.10.0
CATEGORIES= lang devel perl5
@@ -9,7 +9,7 @@ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jlam@pkgsrc.org
HOMEPAGE= http://www.perl.org/
COMMENT= Practical Extraction and Report Language
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 86f20bfd23f..970553d094b 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2008/03/05 21:50:22 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/19 08:59:19 wiz Exp $
DISTNAME= j2sdk-1_4_2_17-linux-${DIST_ARCH}
PKGNAME= sun-jdk14-2.17
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
+LICENSE= sun-jdk14-license
SHORT= SDK
@@ -14,8 +15,6 @@ WRKSRC= ${WRKDIR}/j2sdk1.4.2_17
JAVA_WRAPPERS+= appletviewer extcheck idlj jar jarsigner \
javac javadoc javah javap jdb rmic serialver
-LICENSE= sun-jdk14-license
-
.include "../../lang/sun-jre14/Makefile.common"
# Remove parts that are in common with the JRE
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 21224848b4b..54459c001a2 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2008/08/15 15:06:36 he Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:19 wiz Exp $
DISTNAME= jdk-1_5_0_16-linux-${DIST_ARCH}
PKGNAME= sun-jdk15-5.0.16
MASTER_SITES= # empty
+LICENSE= sun-jdk6-license
+
SHORT_NAME= JDK
DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
@@ -12,8 +14,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:C/-linux-.*//}
JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
javac javadoc javah javap jdb rmic serialver
-LICENSE= sun-jdk6-license
-
.include "../../lang/sun-jre15/Makefile.common"
# Remove parts that are in common with the JRE
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 94313fd6702..fb62f3ccec8 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/03/06 16:22:55 abs Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:19 wiz Exp $
DISTNAME= jdk-6u12-linux-${DIST_ARCH}
#PKGREVISION= 1
@@ -7,6 +7,8 @@ MASTER_SITES= # empty
DOWNLOAD_NAME= JDK 6u12
+LICENSE= sun-jdk6-license
+
DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
WRKSRC= ${WRKDIR}/jdk1.6.0_12
@@ -14,7 +16,6 @@ JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
javac javadoc javah javap jdb rmic serialver
MAKE_JOBS_SAFE= no
-LICENSE= sun-jdk6-license
.include "../../lang/sun-jre6/Makefile.common"
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 6ad4ab23213..b3a4f996e12 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2009/05/19 08:59:19 wiz Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -7,6 +7,7 @@ PKGNAME= sun-jre14-2.17
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2
+LICENSE= sun-jre14-license
SHORT= JRE
@@ -16,8 +17,6 @@ WRKSRC= ${WRKDIR}/j2re1.4.2_17
JAVA_WRAPPERS= java keytool orbd policytool rmid rmiregistry \
servertool tnameserv
-LICENSE= sun-jre14-license
-
.include "../../lang/sun-jre14/Makefile.common"
REQD_DIRS= ${JAVA_HOME}
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 4e43af38fb4..cfc4749c1a4 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/08/15 15:06:35 he Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:20 wiz Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -6,6 +6,8 @@ DISTNAME= jre-1_5_0_16-linux-${DIST_ARCH}
PKGNAME= sun-jre15-5.0.16
MASTER_SITES= # empty
+LICENSE= sun-jre6-license
+
SHORT_NAME= JRE
USE_TOOLS+= pax
@@ -21,8 +23,6 @@ REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors
REQD_DIRS+= ${JAVA_HOME}/lib/security
CONF_FILES= # empty
-LICENSE= sun-jre6-license
-
.include "../../lang/sun-jre15/Makefile.common"
.sinclude "sfiles-${EMUL_ARCH}.mk"
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 055abe3db7e..f66191b108d 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/03/06 16:18:04 abs Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:20 wiz Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
# Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -8,6 +8,8 @@ DISTNAME= jre-6u12-linux-${DIST_ARCH}
PKGNAME= sun-jre6-6.0.12
MASTER_SITES= # empty
+LICENSE= sun-jre6-license
+
DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u12
USE_TOOLS+= pax
@@ -23,8 +25,6 @@ REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors
REQD_DIRS+= ${JAVA_HOME}/lib/security
CONF_FILES= # empty
-LICENSE= sun-jre6-license
-
.include "../../lang/sun-jre6/Makefile.common"
.sinclude "sfiles-${EMUL_ARCH}.mk"
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index f32ec34eaf3..a9c5359d208 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:20 wiz Exp $
#
DISTNAME= twelf-1-4
@@ -9,16 +9,16 @@ MASTER_SITES= http://www.cs.cmu.edu/~twelf/dist/
MAINTAINER= richards+netbsd@CS.Princeton.EDU
HOMEPAGE= http://www.cs.cmu.edu/~twelf/
COMMENT= Meta-language for proving properties of languages and logics
-
-DEPENDS+= smlnj>=110.38:../../lang/smlnj
-
LICENSE= generic-nonlicense
+
RESTRICTED= License terms not specified; assume no redistribution rights
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+DEPENDS+= smlnj>=110.38:../../lang/smlnj
+
USE_TOOLS+= pax
WRKSRC= ${WRKDIR}/twelf
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index 54adb9384a6..6645099df89 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/04/19 01:00:48 rh Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:20 wiz Exp $
#
DISTNAME= GNUMail-1.2.0pre3
@@ -9,7 +9,6 @@ MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.collaboration-world.com/gnumail/
COMMENT= GNUstep clone of NeXT's Mail.app application
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 1e0596ae4d1..72da9b2864e 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:44 reed Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:20 wiz Exp $
#
DISTNAME= osbf-lua-2.0.4
@@ -8,7 +8,7 @@ MASTER_SITES= http://luaforge.net/frs/download.php/2094/
MAINTAINER= shannonjr@NetBSD.org
HOMEPAGE= http://osbf-lua.luaforge.net/
COMMENT= Lua C module for text classification
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PREV_PKGPATH= mail/lua-OSBF
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index fb0c2ec9ed1..6d1703a6af4 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/04/18 23:55:27 rh Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:20 wiz Exp $
#
DISTNAME= Pantomime-1.2.0pre3
@@ -8,7 +8,6 @@ MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.collaboration-world.com/pantomime/
COMMENT= Objective-C mail system class library
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index d1e13f6eddc..101dfb19993 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/04/14 06:16:24 martti Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:20 wiz Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
MAINTAINER= grant@NetBSD.org
HOMEPAGE= http://www.clamav.net/
COMMENT= Anti-virus toolkit
-
LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index afaefad1275..fc9de324c39 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile.common,v 1.9 2009/05/19 08:59:20 wiz Exp $
# used by mail/claws-mail/plugins.mk
@@ -10,6 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://claws-mail.org/
+LICENSE= gnu-gpl-v3
DISTINFO_FILE= ${.CURDIR}/../../mail/claws-mail/distinfo
PATCHDIR= ${.CURDIR}/../../mail/claws-mail/patches
@@ -25,8 +26,6 @@ GNU_CONFIGURE= YES
# Force gnome detection off to avoid installing some extra files
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no"
-#LICENSE= gplv3
-
CONFIGURE_ARGS+= --enable-enchant
CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --enable-openssl
diff --git a/mail/courier-analog/Makefile b/mail/courier-analog/Makefile
index 04b6f5addc6..8e4f6bc69c9 100644
--- a/mail/courier-analog/Makefile
+++ b/mail/courier-analog/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2008/02/19 18:45:09 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:20 wiz Exp $
DISTNAME= courier-analog-0.15
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
-#LICENSE= gnu-gpl-v3
-
MAINTAINER= jlam@pkgsrc.org
HOMEPAGE= http://www.courier-mta.org/
COMMENT= Courier log analyzer
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
index 139031319e9..affb87e2517 100644
--- a/mail/courier-mta/Makefile.common
+++ b/mail/courier-mta/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2008/02/19 18:45:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:20 wiz Exp $
COURIER_VERSION= 0.58.0
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index af807b65b55..1dc6cd9f928 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/19 08:59:21 wiz Exp $
#
DISTNAME= cucipop-1.31
@@ -12,7 +12,6 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= The Cubic Circle POP3 mail server
-
LICENSE= cucipop-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index d98bd8b536b..92d1eaebd65 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/10/02 19:03:11 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:21 wiz Exp $
DISTNAME= dk-milter-0.3.0
PKGREVISION= 3
@@ -8,10 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dk-milter/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/dk-milter/
COMMENT= Open source implementation of DomainKeys for sendmail
-
-BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
-
-LICENSE= sendmail-open-source-license
+LICENSE= sendmail-open-source-license
PKG_DESTDIR_SUPPORT= user-destdir
@@ -68,6 +65,7 @@ do-install:
.include "options.mk"
.include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
.include "../../mail/libmilter/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 77f98751a7b..a7efcc662d1 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/03/28 01:03:55 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:21 wiz Exp $
DISTNAME= dkim-milter-2.8.2
CATEGORIES= mail
@@ -7,10 +7,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
MAINTAINER= imil@gcu.info
HOMEPAGE= http://sourceforge.net/projects/dkim-milter/
COMMENT= Open source DKIM filter software from Sendmail, Inc
-
-BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
-BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
-
LICENSE= sendmail-open-source-license
MAKE_ENV+= M4=${M4:Q}
@@ -108,7 +104,9 @@ post-install:
${PREFIX}/${PKGMANDIR}/man8
. endif
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
.include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.13.0
.include "../../mail/libmilter/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index fbc978b35a2..563d297f8d3 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2009/04/27 16:05:19 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:21 wiz Exp $
#
DISTNAME= evolution-data-server-2.26.1.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/projects/evolution/
COMMENT= Evolution data server
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index c7dd1a8e514..48904592738 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/12 13:16:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/19 08:59:21 wiz Exp $
#
DISTNAME= evolution-sharp-0.20.0
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${MASTER_SITE_GNOME:=sources/evolution-sharp/0.20/}
COMMENT= .NET language binding for various Evolution libraries
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 32f19be9766..771499d6da4 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/02/15 14:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2009/05/19 08:59:21 wiz Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 4
@@ -8,16 +8,16 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Visual mail, user and print face server
-
-DEPENDS+= netpbm>=9.2:../../graphics/netpbm
-
-CONFLICTS= compface-[0-9]*
-
LICENSE= faces-license
+
RESTRICTED= Distribution not allowed if money exchanged
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+DEPENDS+= netpbm>=9.2:../../graphics/netpbm
+
+CONFLICTS= compface-[0-9]*
+
WRKSRC= ${WRKDIR}/faces
USE_X11BASE= YES
USE_LIBTOOL= YES
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 381a8798759..e9a828acdba 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:21 wiz Exp $
#
DISTNAME= fromto-1.5
@@ -8,8 +8,8 @@ EXTRACT_SUFX= #empty
MAINTAINER= bad@NetBSD.org
COMMENT= Sendmail logfile viewer
-
LICENSE= fromto-license # XXX missing
+
RESTRICTED= Redistribution allowed for non-commercial purposes only
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index d36107847ba..57a5ab0902a 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/02/17 12:57:07 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:21 wiz Exp $
DISTNAME= majordomo-1.94.5
PKGREVISION= 2
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.greatcircle.com/majordomo/
COMMENT= The Majordomo mailing list manager
-
LICENSE= majordomo-license
CONFLICTS+= bounce-*
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 99a6db0bda0..46d702267a9 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/04/22 13:00:36 tron Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:22 wiz Exp $
DISTNAME= milter-greylist-4.2.2
CATEGORIES= mail
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tgz
OWNER= tron@NetBSD.org
HOMEPAGE= http://hcpnet.free.fr/milter-greylist/
COMMENT= Easy-to-use greylist milter for sendmail
-
LICENSE= original-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 58a735e9b63..867b546122b 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/01/18 05:08:27 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:22 wiz Exp $
#
DISTNAME= mpop-1.0.12
@@ -7,11 +7,10 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpop/}
EXTRACT_SUFX= .tar.bz2
-#LICENSE= gnu-gpl-v3
-
MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://mpop.sourceforge.net/
COMMENT= Small, fast and portable POP3 client
+LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index a0982b0a016..9f716a5d18b 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/01/06 12:08:01 obache Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:22 wiz Exp $
DISTNAME= msmtp-1.4.17
CATEGORIES= mail
@@ -8,8 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= bcv@hub3.net
HOMEPAGE= http://msmtp.sourceforge.net/
COMMENT= SMTP plugin for MUAs
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 8deba4e1c5d..771dfbf00b7 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/09/10 14:07:23 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:22 wiz Exp $
DISTNAME= mush-7.2.5
PKGNAME= mush-7.2.6.b4.pl1
@@ -19,8 +19,8 @@ PATCHFILES= patch-7.2.6-alpha-1 \
MAINTAINER= christos@NetBSD.org
COMMENT= Text-based mail client
-
LICENSE= mush-license
+
RESTRICTED= Unmodified source may be distributed but not sold.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 414eef14c46..5353edc5527 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2008/11/13 14:21:05 tron Exp $
+# $NetBSD: Makefile,v 1.122 2009/05/19 08:59:22 wiz Exp $
DISTNAME= pine4.64
PKGNAME= pine-4.64
@@ -11,11 +11,9 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@netbsd.org
HOMEPAGE= http://www.washington.edu/pine/
COMMENT= Program for Internet News and E-mail
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= pine-license
+PKG_DESTDIR_SUPPORT= user-destdir
CONF_FILES= ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 73b857d8cd5..61234898f71 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.225 2009/05/14 17:12:10 martti Exp $
+# $NetBSD: Makefile,v 1.226 2009/05/19 08:59:22 wiz Exp $
DISTNAME= postfix-2.6.0
PKGREVISION= 1
@@ -12,7 +12,6 @@ DIST_SUBDIR= postfix
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.postfix.org/
COMMENT= Postfix SMTP server and tools
-
LICENSE= postfix-license
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 418ca1bd0d1..657f7050d36 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2009/03/21 21:30:58 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.49 2009/05/19 08:59:22 wiz Exp $
#
# used by mail/libmilter/Makefile
# used by mail/sendmail/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
OWNER?= jnemeth@NetBSD.org
HOMEPAGE= http://www.sendmail.org/
-
LICENSE= sendmail-license
DISTINFO_FILE= ${.CURDIR}/../../mail/sendmail/distinfo
diff --git a/mail/sendmail813/Makefile.common b/mail/sendmail813/Makefile.common
index e0ecbd1473b..6a90a1f5713 100644
--- a/mail/sendmail813/Makefile.common
+++ b/mail/sendmail813/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2008/01/04 02:26:18 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.3 2009/05/19 08:59:22 wiz Exp $
#
#
@@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
MAINTAINER= jnemeth@NetBSD.org
HOMEPAGE= http://www.sendmail.org/
-
LICENSE= sendmail-license
DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail813/distinfo
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a1d6b4c3463..1811be42bba 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/04/11 23:15:20 sno Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:22 wiz Exp $
DISTNAME= Mail-SpamAssassin-3.2.5
PKGNAME= spamassassin-3.2.5
@@ -10,8 +10,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://spamassassin.apache.org/
COMMENT= Mail filter to identify spam
-
-#LICENSE= apache-2.0
+LICENSE= apache-2.0
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index db2e7967d13..ead7be212d5 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/09/12 00:42:13 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:23 wiz Exp $
DISTNAME= xfmail-1.5.5
PKGREVISION= 1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xfmail.slappy.org/
COMMENT= Xforms based mail application for Unix operating systems
-
#LICENSE= gpl-gnu-v2
# A few files are.
#LICENSE+= mit-license
diff --git a/math/gap/Makefile b/math/gap/Makefile
index 07d47294a81..3a7557b1ded 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:23 wiz Exp $
#
DISTNAME= gap4r3
@@ -15,12 +15,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= cjep@NetBSD.org
HOMEPAGE= http://www.gap-system.org/
COMMENT= Computational group theory and discrete algebra language
+LICENSE= no-commercial-use
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
SITES.fix4r3n5.tar.gz= ${MASTER_SITES:=bugfixes/}
-LICENSE= no-commercial-use
-
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gtar
diff --git a/math/py-ephem/Makefile b/math/py-ephem/Makefile
index 5b1a205915d..eafdf26df35 100644
--- a/math/py-ephem/Makefile
+++ b/math/py-ephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:36 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:23 wiz Exp $
#
DISTNAME= pyephem-3.7b
@@ -9,15 +9,15 @@ MASTER_SITES= http://www.rhodesmill.org/brandon/projects/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rhodesmill.org/brandon/projects/pyephem.html
COMMENT= Scientific-grade astronomical computations for Python
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
# See ../../x11/xephem/Makefile.
LICENSE= xephem-license
+
RESTRICTED= Combined work is both GPL and non-Free
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
PYDISTUTILSPKG= true
INSTALLATION_DIRS= share/doc/${PKGNAME}
diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
index 6f1ec7bd414..fb0eb236dda 100644
--- a/meta-pkgs/gnuradio/Makefile.common
+++ b/meta-pkgs/gnuradio/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2008/04/25 20:39:10 joerg Exp $
+# $NetBSD: Makefile.common,v 1.13 2009/05/19 08:59:23 wiz Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
@@ -12,6 +12,7 @@ MASTER_SITES?= http://gnuradio.org/releases/gnuradio/
MAINTAINER?= wulf@NetBSD.org
HOMEPAGE?= http://www.gnu.org/software/gnuradio/
+LICENSE= gnu-gpl-v3
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -22,8 +23,6 @@ BUILD_DEPENDS+=doxygen>=1.5.1:../../devel/doxygen
PY_PATCHPLIST= yes
-#LICENSE= gplv3
-
EGDIR= ${PREFIX}/share/examples/gnuradio/conf.d
PKG_SYSCONFSUBDIR=gnuradio/conf.d
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index db40aeecff9..e0be07c36c8 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.40 2008/12/17 12:50:03 hira Exp $
+# $NetBSD: Makefile.common,v 1.41 2009/05/19 08:59:23 wiz Exp $
MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.3/src/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.xfce.org/
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
XFCE4_VERSION= 4.4.3
diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index 41e8d120c11..da2a4540f6a 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/04/13 12:37:22 rh Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:23 wiz Exp $
#
DISTNAME= Addresses-0.4.6
@@ -9,7 +9,6 @@ MASTER_SITES= http://giesler.biz/bjoern/downloads/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://giesler.biz/bjoern/en/sw_addr.html
COMMENT= Address book for GNUstep
-
LICENSE= gnu-lgpl-v2
USE_LANGUAGES= objc
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 7e4cb1f102b..814307abc9c 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:23 wiz Exp $
DISTNAME= ast54unx
PKGNAME= astrolog-5.40
@@ -12,8 +12,8 @@ DISTFILES= ${DISTNAME}.shr ${EPHEM}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.astrolog.org/
COMMENT= Astrology program for X11 and alpha-numeric terminals
-
LICENSE= astrolog-license
+
RESTRICTED= Do not sell or profit from this software in any way
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/misc/cksfv/Makefile b/misc/cksfv/Makefile
index b37a17445c0..ac7cf0bc629 100644
--- a/misc/cksfv/Makefile
+++ b/misc/cksfv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/04/20 09:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:23 wiz Exp $
#
DISTNAME= cksfv-1.3.14
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://zakalwe.fi/~shd/foss/cksfv/
COMMENT= Check and create simple file verification (SFV) listings
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 48372335c9e..2f61ebdfdd4 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/01/03 18:16:10 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:23 wiz Exp $
DISTNAME= fep
PKGNAME= fep-1.0
@@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/fep/
MAINTAINER= nobu@psrc.isac.co.jp
COMMENT= General purpose front end for command line editing
-
LICENSE= fep-license
+
RESTRICTED= Do not redistribute for a fee.
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 3b488d5a061..d09d909ab9f 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/18 10:00:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:23 wiz Exp $
#
DISTNAME= gnome-devel-docs-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= The GNOME 2 developer's guide
-
LICENSE= gnu-fdl-v1.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/m17n-contrib/Makefile b/misc/m17n-contrib/Makefile
index 1fd308f6cb3..90a437c3bd1 100644
--- a/misc/m17n-contrib/Makefile
+++ b/misc/m17n-contrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/12 08:17:32 obache Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= m17n-contrib-1.1.9
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.m17n.org/m17n-lib-download/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.m17n.org/m17n-lib/
COMMENT= Collection of contributed works used with the m17n library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/m17n-db/Makefile b/misc/m17n-db/Makefile
index e917a05ccd2..64d6d732d72 100644
--- a/misc/m17n-db/Makefile
+++ b/misc/m17n-db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/05/12 08:16:03 obache Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= m17n-db-1.5.4
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.m17n.org/m17n-lib-download/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.m17n.org/m17n-lib-en/index.html
COMMENT= The m17n database used by the m17n library
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/m17n-docs/Makefile b/misc/m17n-docs/Makefile
index ffa9afea4b1..a6db373b655 100644
--- a/misc/m17n-docs/Makefile
+++ b/misc/m17n-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/12 08:14:15 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= m17n-docs-1.5.2
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.m17n.org/m17n-lib-download/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.m17n.org/m17n-lib/
COMMENT= Documents for the m17n library
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/mnemosyne/Makefile b/misc/mnemosyne/Makefile
index 76ddddbfcb2..4a270c77f6c 100644
--- a/misc/mnemosyne/Makefile
+++ b/misc/mnemosyne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/12 16:37:25 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= mnemosyne-1.2.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://mnemosyne-proj.org/
COMMENT= Sophisticated flash-card tool which optimizes your learning process
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/molden/Makefile b/misc/molden/Makefile
index fbef8c24154..927465becf6 100644
--- a/misc/molden/Makefile
+++ b/misc/molden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/02/17 13:02:20 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:24 wiz Exp $
DISTNAME= molden4.6
PKGNAME= ${DISTNAME:S/molden/&-/}
@@ -9,6 +9,13 @@ EXTRACT_SUFX= .tar.gz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.cmbi.ru.nl/molden/molden.html
COMMENT= Displaying MOLecular DENsity
+LICENSE= molden-license
+
+RESTRICTED= Redistributing Molden by unregistered user is prohibited.
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -20,13 +27,6 @@ USE_LANGUAGES= c fortran
INSTALLATION_DIRS= bin share/molden/doc share/molden/test share/molden/utils
-LICENSE= molden-license
-RESTRICTED= Redistributing Molden by unregistered user is prohibited.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/molden ${DESTDIR}${PREFIX}/bin
for d in doc test utils ; do \
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index dd541069f19..1355499fb3f 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/18 13:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= orca-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://live.gnome.org/Orca
COMMENT= Screen reader
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/ppower/Makefile b/misc/ppower/Makefile
index c4e243292f5..da665a176b3 100644
--- a/misc/ppower/Makefile
+++ b/misc/ppower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:37 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= ppower-0.1.5
@@ -8,11 +8,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ppower/}
MAINTAINER= dsainty@NetBSD.org
HOMEPAGE= http://ppower.sourceforge.net/
COMMENT= X10 controller software for the CM11A interface
+#LICENSE= GPL
PKG_DESTDIR_SUPPORT= user-destdir
-#LICENSE= GPL
-
GNU_CONFIGURE= YES
USE_TOOLS+= lex
diff --git a/misc/rlwrap/Makefile b/misc/rlwrap/Makefile
index 604bd6407a8..70f5fa2ae36 100644
--- a/misc/rlwrap/Makefile
+++ b/misc/rlwrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/09 13:40:37 heinz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= rlwrap-0.30
@@ -8,8 +8,7 @@ MASTER_SITES= http://utopia.knoware.nl/~hlub/uck/rlwrap/
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://utopia.knoware.nl/~hlub/uck/rlwrap/
COMMENT= Provides command line editing and history for other commands
-
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/sch/Makefile b/misc/sch/Makefile
index 70cbfec91b3..c7ac606edd3 100644
--- a/misc/sch/Makefile
+++ b/misc/sch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/04 19:21:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:24 wiz Exp $
DISTNAME= sch-20010224
CATEGORIES= misc
@@ -6,7 +6,6 @@ MASTER_SITES= ftp://ftp.itojun.org/pub/misc/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Curses-based schedule management tool
-
LICENSE= no-commercial-use
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/softmaker-office-demo/Makefile b/misc/softmaker-office-demo/Makefile
index 96c3884e56b..f71ee3cc907 100644
--- a/misc/softmaker-office-demo/Makefile
+++ b/misc/softmaker-office-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/05/25 21:42:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:24 wiz Exp $
#
DISTNAME= ofl06trial
@@ -10,8 +10,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.softmaker.net/
COMMENT= SoftMaker Office (TextMaker and PlanMaker) demo version (Linux binary)
+LICENSE= softmaker-office-demo-license
-LICENSE= softmaker-office-demo-license
RESTRICTED= Only separately distributed, exact copies, for no fee
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/misc/zyGrib-maps/Makefile b/misc/zyGrib-maps/Makefile
index f04e2666b51..b9d6e9dd386 100644
--- a/misc/zyGrib-maps/Makefile
+++ b/misc/zyGrib-maps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/16 16:36:32 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
#
DISTNAME= zyGrib-maps-2
@@ -9,7 +9,6 @@ DISTFILES= zyGrib_maps2.tgz
MAINTAINER= plunky@rya-online.net
HOMEPAGE= http://www.zygrib.org/
COMMENT= High resolution map files for zyGrib
-
#LICENSE= gnu-gpl
DEPENDS+= zyGrib>=2.0:../../misc/zyGrib
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 11409fc2fd5..5e3b7519b3b 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/15 21:00:05 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
#
DISTNAME= zyGrib-3.3.0
@@ -9,8 +9,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= plunky@rya-online.net
HOMEPAGE= http://www.zygrib.org/
COMMENT= GRIB file viewer for weather data
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}/zyGrib/src
USE_LANGUAGES= c c++
diff --git a/multimedia/adobe-flash-plugin/Makefile b/multimedia/adobe-flash-plugin/Makefile
index 52942a87988..b37d4794a02 100644
--- a/multimedia/adobe-flash-plugin/Makefile
+++ b/multimedia/adobe-flash-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/19 19:51:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
CATEGORIES= multimedia www
MASTER_SITES= http://download.macromedia.com/pub/labs/flashplayer10/
@@ -6,8 +6,8 @@ MASTER_SITES= http://download.macromedia.com/pub/labs/flashplayer10/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.adobe.com/
COMMENT= Adobe Flash Player Browser plugin
-
LICENSE= flash-license
+
RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 81827dbadb0..ae8272510aa 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:12:20 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
#
DISTNAME= clutter-gst-0.8.0
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.clutter-project.org/sources/clutter-gst/0.8/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.clutter-project.org/
COMMENT= Clutter GStreamer integration
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 97bc30410e5..77d858932e0 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/14 13:54:45 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:25 wiz Exp $
#
# In order to ensure compliance with U.S. and international law, please
# do not modify this file to provide pointers to the source or homepage
@@ -13,18 +13,18 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht@NetBSD.org
HOMEPAGE= ${LIBDVDCSS_HOMEPAGE}
COMMENT= Simple library designed for accessing DVDs
-
-PKG_DESTDIR_SUPPORT= user-destdir
-PKGCONFIG_OVERRIDE= src/libdvdcss.pc.in
-
# XXX missing
LICENSE= libdvdcss-license
+
RESTRICTED= Legal problems due to CSS code
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+PKGCONFIG_OVERRIDE= src/libdvdcss.pc.in
+
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_TOOLS+= gmake
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index 48965c38094..30a503b205d 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/03/06 19:10:52 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:25 wiz Exp $
CATEGORIES= multimedia www
MASTER_SITES= http://download.macromedia.com/pub/flashplayer/installers/current/9/
@@ -6,18 +6,18 @@ MASTER_SITES= http://download.macromedia.com/pub/flashplayer/installers/current
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.flash.com/
COMMENT= MacroMedia Flash Player Netscape plugin
-
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+= communicator<=4.76nb1
-CONFLICTS+= navigator<=4.76nb1
-
LICENSE= flash-license
+
RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+# Must update communicator/navigator to at least 4.76nb1
+CONFLICTS+= communicator<=4.76nb1
+CONFLICTS+= navigator<=4.76nb1
+
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${WRKNAME}
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index be1a9efae6e..bc1574193ef 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/30 06:40:06 tron Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/19 08:59:25 wiz Exp $
DISTNAME= windows-all-20071007
PKGNAME= win32-codecs-071007
@@ -15,6 +15,13 @@ DISTFILES+= rp9codecs-win32-20050115.tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mplayerhq.hu/MPlayer/releases/codecs/
COMMENT= Huge compilation of Win32 binary codecs
+LICENSE= mplayer-codec-license
+
+RESTRICTED= Unsure of codec's license
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -25,13 +32,6 @@ ONLY_FOR_PLATFORM= *-*-i386
NO_BUILD= yes
NO_CONFIGURE= yes
-LICENSE= mplayer-codec-license
-RESTRICTED= Unsure of codec's license
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/win32
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/* ${DESTDIR}${PREFIX}/lib/win32
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index e5002e0aa68..1fb578f26f3 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/03 13:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:25 wiz Exp $
DISTNAME= xanim2920
PKGNAME= xanim-2.92.0
@@ -13,13 +13,12 @@ DISTFILES= ${EXTRACT_ONLY} ${CODEC_FILES}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Play a variety of simple animation formats and show pictures
HOMEPAGE= http://xanim.polter.net/
+LICENSE= xanim-license
PKG_DESTDIR_SUPPORT= user-destdir
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-LICENSE= xanim-license
-
.include "Makefile.codecs"
USE_IMAKE= YES
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
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 9a7cc5e140f..e159452fab7 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/06/15 13:08:52 obache Exp $
+# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:29 wiz Exp $
DISTNAME= nntpcache-3.0.2
PKGREVISION= 1
@@ -8,7 +8,6 @@ MASTER_SITES= http://www.xs4all.nl/~suelette/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://iq.org/~proff/nntpcache.org/
COMMENT= NNTP multi-server caching daemon
-
LICENSE= nntpcache-license
.include "../../mk/bsd.prefs.mk"
diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index 8f649ddbf7d..4018642fd35 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/11/11 21:12:20 chuck Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:29 wiz Exp $
DISTNAME= nntpclnt-1.6.1
PKGREVISION= 6
@@ -7,16 +7,16 @@ MASTER_SITES= ftp://ftp.uu.net/networking/news/nntp/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= NNTP client library and inews client posting program
-
-CONFLICTS+= inn-[0-9]*
-
LICENSE= nntpclnt-license
+
RESTRICTED= Do not sell, rent, trade, market, or use for monetary profit
# No permission granted for derivative works.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
+CONFLICTS+= inn-[0-9]*
+
BUILD_TARGET= inews
PKG_GROUPS= news
PKG_SYSCONFSUBDIR= nntp
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 0a81c0212b6..e971e1772fb 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/03/25 22:37:14 he Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:29 wiz Exp $
#
DISTNAME= tin-1.8.3
@@ -13,9 +13,9 @@ PKGREVISION= 1
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.tin.org/
COMMENT= TIN newsreader (termcap based)
-
# See src/nntplib.c, vms/vms.c
LICENSE= tin-license
+
RESTRICTED= Profit from use, sale, trade, or reproduction disallowed
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/news/trn/Makefile b/news/trn/Makefile
index 98d2e88d675..7c080c287ba 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/12/02 11:32:25 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:29 wiz Exp $
DISTNAME= trn-4.0-test76
PKGNAME= trn-4.76
@@ -6,10 +6,9 @@ PKGREVISION= 3
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=trn/}
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://trn.sourceforge.net/
COMMENT= Threaded version of rn, the classic news reader
-
LICENSE= trn-license
PKG_SYSCONFSUBDIR= nntp
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 23782f5463f..567ac9e3459 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/04/09 00:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2009/05/19 08:59:29 wiz Exp $
#
# When adding new digest algorithms, please use rmd160 as the template,
# and bump the VERSION definition.
@@ -11,7 +11,7 @@ DISTFILES= # empty
MAINTAINER?= agc@NetBSD.org
HOMEPAGE?= http://www.NetBSD.org/docs/software/packages.html
COMMENT?= Message digest wrapper utility
-#LICENSE= original-bsd
+LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/pkgtools/p5-pkgsrc-Dewey/Makefile b/pkgtools/p5-pkgsrc-Dewey/Makefile
index b569bbfa3ab..206543695bd 100644
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/04/09 00:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:29 wiz Exp $
DISTNAME= p5-pkgsrc-Dewey-1.1
CATEGORIES= pkgtools perl5
@@ -8,7 +8,7 @@ DISTFILES= # empty
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
COMMENT= Perl module to compare pkgsrc Dewey numbers
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 6d26bc10533..f1e3683dd37 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2009/04/09 00:48:12 joerg Exp $
+# $NetBSD: Makefile,v 1.163 2009/05/19 08:59:29 wiz Exp $
# Notes to package maintainers:
#
@@ -14,7 +14,7 @@ DISTFILES= # empty
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.pkgsrc.org/
COMMENT= Package management and administration tools for pkgsrc
-#LICENSE= modified-bsd
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
BOOTSTRAP_PKG= yes
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 81f86504689..0c6237ef361 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/04/23 21:38:02 tron Exp $
+# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:29 wiz Exp $
DISTNAME= rpm2pkg-2.2
CATEGORIES= pkgtools
@@ -8,11 +8,10 @@ DISTFILES= # empty
OWNER= tron@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
COMMENT= Convert RPM archives to NetBSD packages
+LICENSE= modified-bsd
CONFLICTS+= suse-base<=6.4
-LICENSE= modified-bsd
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 8714be798fd..54b4e396adc 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2009/04/09 00:48:14 joerg Exp $
+# $NetBSD: Makefile,v 1.102 2009/05/19 08:59:29 wiz Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
@@ -12,7 +12,7 @@ DISTFILES= # empty
MAINTAINER= jlam@pkgsrc.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Shadow tree of links to native X11 headers and libraries
-#LICENSE= original-bsd
+LICENSE= original-bsd
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 2353cb49bef..82a6c650e64 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2009/04/09 00:48:14 joerg Exp $
+# $NetBSD: Makefile,v 1.77 2009/05/19 08:59:30 wiz Exp $
DISTNAME= xpkgwedge-1.16
CATEGORIES= pkgtools devel x11
@@ -8,7 +8,7 @@ DISTFILES= # empty
MAINTAINER= jlam@pkgsrc.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE}
-#LICENSE= original-bsd
+LICENSE= original-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index f5566dc1dad..6f23958de1a 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/07/29 05:19:47 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2009/05/19 08:59:30 wiz Exp $
DISTNAME= acroread # overridden below
PKGNAME= acroread-4.05
@@ -10,13 +10,13 @@ MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
COMMENT= View, distribute and print PDF documents
+LICENSE= adobe-acrobat-license
RESTRICTED= Original installer required to redistribute.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= adobe-acrobat-license
BUILD_DIRS= # empty
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 0e62832e953..b6572f28227 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/07/29 05:19:50 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:30 wiz Exp $
DISTNAME= acroread5 # overridden below
PKGNAME= acroread5-5.10
@@ -9,18 +9,18 @@ MASTER_SITES= http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
COMMENT= View, distribute and print PDF documents
-
-CONFLICTS+= acroread-5.*
-# conflict with acroread7 due to bin/acroread
-CONFLICTS+= acroread-7.*
-CONFLICTS+= acroread7-7.*
+LICENSE= adobe-acrobat-license
RESTRICTED= Original installer required to redistribute.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= adobe-acrobat-license
+
+CONFLICTS+= acroread-5.*
+# conflict with acroread7 due to bin/acroread
+CONFLICTS+= acroread-7.*
+CONFLICTS+= acroread7-7.*
WRKSRC= ${WRKDIR}/installers
BUILD_DIRS= # empty
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 001165ecea3..8046448ea5c 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/08/11 14:29:20 is Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:30 wiz Exp $
DISTNAME= acroread7 # overridden below
PKGNAME= acroread7-7.0.9
@@ -9,6 +9,13 @@ MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
COMMENT= View, distribute and print PDF documents
+LICENSE= adobe-acrobat-license
+
+RESTRICTED= Original installer required to redistribute.
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,13 +24,6 @@ CONFLICTS+= acroread-5.*
# maybe should do ALTERNATIVES?
CONFLICTS+= acroread5-5.*
-RESTRICTED= Original installer required to redistribute.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= adobe-acrobat-license
-
WRKSRC= ${WRKDIR}/AdobeReader
BUILD_DIRS= # empty
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index e3261ace9f7..52fda3acfb2 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/05 11:01:23 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:30 wiz Exp $
DISTNAME= acroread8 # overridden below
PKGNAME= acroread8-8.1.3
@@ -8,6 +8,13 @@ MASTER_SITES= http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.3/enu/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
COMMENT= View, distribute and print PDF documents
+LICENSE= adobe-acrobat-license
+
+RESTRICTED= Original installer required to redistribute.
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,13 +24,6 @@ CONFLICTS+= acroread-5.*
CONFLICTS+= acroread5-5.*
CONFLICTS+= acroread7-7.*
-RESTRICTED= Original installer required to redistribute.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-LICENSE= adobe-acrobat-license
-
WRKSRC= ${WRKDIR}/AdobeReader
BUILD_DIRS= # empty
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 4c20c65df85..aac34380a6f 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:30 wiz Exp $
#
DISTNAME= pcps840
@@ -10,6 +10,11 @@ MASTER_SITES= ftp://garbo.uwasa.fi/unix/pcps/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.swreg.org/soft_shop/695/shopscr3.shtml
COMMENT= Converts text files to PostScript(tm)
+LICENSE= pcps-license
+
+RESTRICTED= This is shareware for your evaluation and subsequent payment
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM=${RESTRICTED}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,11 +24,6 @@ BUILD_TARGET=
MAKE_ENV+= "CC=${CC} ${CFLAGS} -DUNIX"
NO_CONFIGURE= yes
-LICENSE= pcps-license
-RESTRICTED= This is shareware for your evaluation and subsequent payment
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/pcps share/examples/pcps
CONF_FILES+= ${PREFIX}/share/examples/pcps/pcps.cfg ${PREFIX}/bin/pcps.cfg
diff --git a/print/tex-foiltex/Makefile b/print/tex-foiltex/Makefile
index 831b23c3cfc..b814cb6738a 100644
--- a/print/tex-foiltex/Makefile
+++ b/print/tex-foiltex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/09/12 11:39:06 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:30 wiz Exp $
DISTNAME= # empty
PKGNAME= tex-foiltex-2.1.4a
@@ -10,8 +10,8 @@ DISTFILES= foiltex.dtx foiltex.ins
MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/foiltex.html
COMMENT= LaTeX2e class for overhead transparencies
-
LICENSE= foiltex-license
+
RESTRICTED= May not be redistributed for profit
NO_BIN_ON_CDROM=${RESTRICTED}
NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 09f3e939c94..3f22eda8aa7 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:30 wiz Exp $
#
DISTNAME= amap-5.2
@@ -9,6 +9,7 @@ MASTER_SITES= http://freeworld.thc.org/releases/
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://freeworld.thc.org/thc-amap/
COMMENT= Applications and Services scanner
+LICENSE= amap-license
PKG_DESTDIR_SUPPORT= user-destdir
@@ -18,8 +19,6 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
EGDIR= ${PREFIX}/share/examples/amap
PKG_SYSCONFSUBDIR?= amap
-LICENSE= amap-license
-
CONF_FILES= ${EGDIR}/appdefs.resp ${PKG_SYSCONFDIR}/appdefs.resp
CONF_FILES+= ${EGDIR}/appdefs.rpc ${PKG_SYSCONFDIR}/appdefs.rpc
CONF_FILES+= ${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index b66c3af553d..dc780eee66f 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/09/28 22:15:30 tonnerre Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:30 wiz Exp $
.include "Makefile.common"
@@ -10,14 +10,13 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@pkgsrc.org
COMMENT= Courier Authentication Library
HOMEPAGE= http://www.courier-mta.org/authlib/
+LICENSE= gnu-gpl-v3
CONFLICTS+= courier-auth-[0-9]*
CONFLICTS+= courier-authldap-[0-9]*
CONFLICTS+= courier-authmysql-[0-9]*
CONFLICTS+= courier-authpgsql-[0-9]*
-#LICENSE= gnu-gpl-v3
-
PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 4012d4b9da4..ada3018ed07 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/08/21 23:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/19 08:59:30 wiz Exp $
DISTNAME= fprot-workstation-bin # overridden below
PKGNAME= fprot-workstation-bin-${FPVER}
@@ -10,8 +10,8 @@ FPVER= 4.6.8
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.f-prot.com/products/home_use/
COMMENT= F-prot antivirus for home users
-
LICENSE= fprot-workstation-license
+
RESTRICTED= Redistribution not permitted
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index a31d51b0ef4..81600910df8 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2009/05/04 20:39:55 zafer Exp $
+# $NetBSD: Makefile,v 1.101 2009/05/19 08:59:31 wiz Exp $
DISTNAME= gnupg-1.4.9
CATEGORIES= security
@@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnupg.org/
COMMENT= GNU Privacy Guard, public-Key encryption and digital signatures
+LICENSE= gnu-gpl-v3
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -27,7 +28,6 @@ CONFIGURE_ARGS+= --with-static-rnd=auto
CONFIGURE_ARGS+= --with-mailprog=/usr/sbin/sendmail
TEST_TARGET= check
INFO_FILES= # PLIST
-#LICENSE= gnu-gplv3
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index a6aa738b393..8c0b2772625 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:31 wiz Exp $
#
DISTNAME= gnupg-2.0.9
@@ -16,6 +16,7 @@ SITES.libassuan-1.0.4.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/
MAINTAINER= shannonjr@NetBSD.org
HOMEPAGE= http://www.gnupg.org/
COMMENT= GNUpg with OpenPGP and S/MIME capabilities
+LICENSE= gnu-gpl-v3
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -32,7 +33,6 @@ USE_TOOLS+= automake
USE_TOOLS+= gettext
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-#LICENSE= GPLv3
CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 99c87e9e152..9b6c9d143ab 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2009/05/02 20:04:32 tnn Exp $
+# $NetBSD: Makefile,v 1.81 2009/05/19 08:59:31 wiz Exp $
DISTNAME= gnutls-2.6.6
CATEGORIES= security devel
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnutls.org/
COMMENT= GNU Transport Layer Security library
-
#LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 12ade2b977b..4082e88a224 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2009/02/01 21:39:43 shattered Exp $
+# $NetBSD: Makefile,v 1.73 2009/05/19 08:59:31 wiz Exp $
DISTNAME= heimdal-1.1
CATEGORIES= security
@@ -8,14 +8,13 @@ PKGREVISION= 2
MAINTAINER= lha@NetBSD.org
HOMEPAGE= http://www.h5l.org/
COMMENT= Kerberos 5 implementation
+LICENSE= modified-bsd
CONFLICTS+= arla-[0-9]*
CONFLICTS+= mit-krb5-[0-9]*
CONFLICTS+= openafs-[0-9]*
CONFLICTS+= gss-[0-9]*
-#LICENSE= modified-bsd
-
PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 130b4f947da..563de286f65 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/10/30 14:52:14 bad Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:31 wiz Exp $
#
DISTNAME= ${PKGNAME_NOREV}-src
@@ -10,6 +10,7 @@ MASTER_SITES= http://freeworld.thc.org/releases/
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://freeworld.thc.org/thc-hydra/
COMMENT= Login password cracker
+LICENSE= hydra-license
.include "../../mk/bsd.prefs.mk"
@@ -18,8 +19,6 @@ GNU_CONFIGURE= YES
BUILD_TARGET= all
WRKSRC= ${WRKDIR}/${DISTNAME}
-LICENSE= hydra-license
-
SUBST_CLASSES+= build
SUBST_STAGE.build= post-patch
SUBST_FILES.build= Makefile.am configure hydra-gtk/src/main.c
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 911f730b22f..62102c3752a 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/01/31 08:53:14 adam Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:31 wiz Exp $
DISTNAME= libgcrypt-1.4.4
CATEGORIES= security
@@ -9,6 +9,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://directory.fsf.org/security/libgcrypt.html
COMMENT= GNU cryptographic library
+#LICENSE= gnu-gpl-v2 gnu-lgpl-v21
+
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,8 +23,6 @@ TEST_TARGET= check
TEXINFO_REQD= 4.0
INFO_FILES= yes # PLIST
-#LICENSE= gnu-gpl-v2 gnu-lgpl-v21
-
.include "../../mk/bsd.prefs.mk"
.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
diff --git a/security/libidea/Makefile b/security/libidea/Makefile
index e5331ac7483..a706dd6289f 100644
--- a/security/libidea/Makefile
+++ b/security/libidea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/01 14:01:50 zafer Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:31 wiz Exp $
#
DISTNAME= libidea-0.8.2b
@@ -8,18 +8,19 @@ MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.media-crypt.com/pages/fidea.html
COMMENT= IDEA block cipher library
-
-NOT_FOR_BULK_PLATFORM= HPUX-*-*
-
-WRKSRC= ${WRKDIR}/idea
-CRYPTO= YES
LICENSE= idea-license
+
RESTRICTED= IDEA is a patented algorithm that requires proper licensing
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+NOT_FOR_BULK_PLATFORM= HPUX-*-*
+
+WRKSRC= ${WRKDIR}/idea
+CRYPTO= YES
+
INSTALLATION_DIRS= bin include lib
do-install:
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 97ad2b5806e..a269b5a640e 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/04/20 12:48:48 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:31 wiz Exp $
DISTNAME= libtasn1-2.1
CATEGORIES= security devel
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gnutls/} \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnutls.org/
COMMENT= ASN.1 structure parser library
-
#LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-3.0
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 87d35becb47..1c5c3aaf213 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:31 wiz Exp $
#
DISTNAME= Crypt-IDEA-1.08
@@ -10,9 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Crypt-IDEA/
COMMENT= Perl5 module for the IDEA symmetric key algorithm
-
-# IDEA's license
-LICENSE= fee-based-commercial-use
+LICENSE= idea-license
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/security/p5-Crypt-OpenSSL-AES/Makefile b/security/p5-Crypt-OpenSSL-AES/Makefile
index 949e6e82197..f03ca23ba40 100644
--- a/security/p5-Crypt-OpenSSL-AES/Makefile
+++ b/security/p5-Crypt-OpenSSL-AES/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:31 wiz Exp $
#
DISTNAME= Crypt-OpenSSL-AES-0.02
@@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Crypt-OpenSSL-AES/
COMMENT= Perl5 wrapper module for the OpenSSL AES functions
-
#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/p5-Crypt-OpenSSL-Bignum/Makefile b/security/p5-Crypt-OpenSSL-Bignum/Makefile
index f29e0539bad..5ee7c7f9325 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/Makefile
+++ b/security/p5-Crypt-OpenSSL-Bignum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Crypt-OpenSSL-Bignum-0.04
@@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for the OpenSSL Bignum functions
-
#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index cc818292cf2..a6ad6f946e0 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Crypt-OpenSSL-RSA-0.25
@@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for the OpenSSL RSA functions
-
#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index 5566fe18003..19e1f6b19e8 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Crypt-OpenSSL-Random-0.04
@@ -11,7 +11,6 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://perl-openssl.sourceforge.net/
COMMENT= Perl5 wrapper module for OpenSSL pseudo-random number generator
-
#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/p5-Digest-SHA/Makefile b/security/p5-Digest-SHA/Makefile
index df1fd8f4017..0310ff4dcc9 100644
--- a/security/p5-Digest-SHA/Makefile
+++ b/security/p5-Digest-SHA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/10/19 19:18:46 he Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Digest-SHA-5.47
@@ -10,11 +10,10 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Digest-SHA/
COMMENT= Perl module for SHA-1/224/256/384/512 algorithms
+#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
-#LICENSE= gnu-gpl-v2 # under same terms as Perl
-
USE_LANGUAGES= c
PERL5_PACKLIST= auto/Digest/SHA/.packlist
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index ea7a4028935..8e5e8bfd09e 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/10/19 19:18:46 he Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Digest-SHA1-2.11
@@ -11,7 +11,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Digest-SHA1/
COMMENT= Perl5 module for SHA1
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index d361dad1469..be7588566e8 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/10/19 19:18:46 he Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= Digest-1.15
@@ -11,7 +11,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/}
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Digest/
COMMENT= Perl5 base class for Digest:: modules
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
DEPENDS+= p5-MIME-Base64>=2.18:../../converters/p5-MIME-Base64
diff --git a/security/p5-OpenSSL/Makefile b/security/p5-OpenSSL/Makefile
index 3e92588e8fa..a8b2186415f 100644
--- a/security/p5-OpenSSL/Makefile
+++ b/security/p5-OpenSSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/19 18:30:52 he Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= OpenSSL-0.09
@@ -10,7 +10,6 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/O/OE/OESI/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/OpenSSL/
COMMENT= Perl5 wrapper module for the OpenSSL functions
-
#LICENSE= gnu-gpl-v2 # under same terms as Perl
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 0b86d3a2305..d39d8e72104 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:45 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/05/19 08:59:32 wiz Exp $
DISTNAME= pgp263is
PKGREVISION= 1
@@ -9,15 +9,14 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pgpi.org/
COMMENT= Public-key encryption and digital signature utility (v2)
+# use of IDEA as crypto function
+LICENSE= idea-license
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/src
CRYPTO= yes
-# use of IDEA as crypto function
-LICENSE= fee-based-commercial-use
-
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index d0838ab0abc..0b70ec5beda 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/06/12 02:14:45 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:32 wiz Exp $
#
DISTNAME= pgp50i-unix-src
@@ -13,6 +13,8 @@ MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pgpi.org/
COMMENT= Public-key encryption and digital signature utilities (v5)
+# use of IDEA as crypto function
+LICENSE= idea-license
PKG_DESTDIR_SUPPORT= user-destdir
@@ -24,9 +26,6 @@ WRKSRC= ${WRKDIR}/pgp50i/src
CRYPTO= YES
GNU_CONFIGURE= YES
-# use of IDEA as crypto function
-LICENSE= fee-based-commercial-use
-
PGPLIB= ${PREFIX}/share/pgp5
INSTALLATION_DIRS= bin ${PGPLIB}
diff --git a/security/qca2/Makefile b/security/qca2/Makefile
index 7d15695e456..d86901561e5 100644
--- a/security/qca2/Makefile
+++ b/security/qca2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/13 10:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:32 wiz Exp $
DISTNAME= qca-2.0.2
PKGNAME= qca2-${DISTNAME:C/.*-//}
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://delta.affinix.com/qca/
COMMENT= Cross-platform crypto API for QT
-
LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= gmake
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index f73b0890d0c..8d5c95cb139 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/06/14 18:58:15 gdt Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/19 08:59:33 wiz Exp $
#
DISTNAME= rsaref
@@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Encryption/authentication library, RSA/MDX/DES
-
LICENSE= rsaref-license
+
RESTRICTED= No generation of income.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 226ac752df7..b3a09ff785f 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/18 15:40:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:33 wiz Exp $
DISTNAME= seahorse-plugins-2.26.1
CATEGORIES= security
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/projects/seahorse/
COMMENT= Plugins for the GnuPG front end and bonobo component for GNOME
-
#LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1
DEPENDS+= gnupg>=1.2.1:../../security/gnupg
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 68ddd49f49f..95e2f8701fe 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2009/05/18 15:32:02 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2009/05/19 08:59:33 wiz Exp $
DISTNAME= seahorse-2.26.1
CATEGORIES= security
@@ -8,7 +8,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/projects/seahorse/
COMMENT= GnuPG front end and bonobo component for GNOME
-
#LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index e0c990fff2d..5c3cd3bdf45 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/09/12 11:49:57 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2009/05/19 08:59:33 wiz Exp $
DISTNAME= srp-1.4.4
PKGNAME= srp-client-1.4.4
@@ -9,8 +9,8 @@ MASTER_SITES= ftp://ftp.zedz.net/pub/crypto/programs/srp/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://srp.stanford.edu/
COMMENT= Client programs using Secure Remote Password protocol
-
LICENSE= srp_client-license
+
RESTRICTED= Licensor makes vague patent claims.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 108ff59dfad..33435cbed48 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/09/07 22:12:22 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:33 wiz Exp $
DISTNAME= ssh-3.2.9.1
PKGNAME= ${DISTNAME:C/ssh-/ssh2-/}
@@ -8,6 +8,12 @@ MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.ssh.com/
+LICENSE= ssh-communications-security-license
+
+RESTRICTED= Reciprocal grant required for derivative works. Non-comercial use restrictions on some systems.
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+
COMMENT= Secure Shell client and server for V.2 SSH protocol
PKG_DESTDIR_SUPPORT= destdir
@@ -30,11 +36,6 @@ PLIST_SRC= ${.CURDIR}/../../security/ssh2/PLIST
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-LICENSE= ssh-communications-security-license
-RESTRICTED= Reciprocal grant required for derivative works. Non-comercial use restrictions on some systems.
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc64"
# Later we may want to put an upper version bound on OS_VERSION or on
# gcc version for this.
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 5a8ee6f57b2..0db2a750065 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/09/04 19:43:15 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:33 wiz Exp $
DISTNAME= vlp4510e
PKGNAME= uvscan-5.10
@@ -10,16 +10,16 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mcafee.com/us/enterprise/products/anti_virus/file_servers_desktops/virusscan_command_line_scanner_windows_unix.html
COMMENT= Evaluation version of a DOS/Windows file virus scanner
-
-CONFLICTS= uvscan-dat-[0-9]*
-
LICENSE= uvscan-license
+
RESTRICTED= restrictive 30 day evaluation license
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
+CONFLICTS= uvscan-dat-[0-9]*
+
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= compat
diff --git a/sysutils/bcmfw/Makefile b/sysutils/bcmfw/Makefile
index cd4be2eb3bf..01152986b26 100644
--- a/sysutils/bcmfw/Makefile
+++ b/sysutils/bcmfw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/07/28 20:07:41 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:33 wiz Exp $
DISTNAME= bcmfw-1.0
CATEGORIES= sysutils
@@ -10,15 +10,14 @@ SITES.bluez-firmware-1.2.tar.gz= \
MAINTAINER= plunky@rya-online.net
COMMENT= Broadcom 2033 Bluetooth Firmware Loader
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= bcmfw-license
RESTRICTED= No clear permission redistribute firmware
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
ONLY_FOR_PLATFORM= NetBSD-[4-9].*-*
RCD_SCRIPTS+= bcmfw
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index c25a28400af..348c36cb5de 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/04/25 12:07:04 rh Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:33 wiz Exp $
#
DISTNAME= burn-0.4.1
@@ -8,14 +8,13 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gsburn.sourceforge.net/
COMMENT= GNUstep based CD burning program
+LICENSE= gnu-gpl-v2
DEPENDS+= cdparanoia>=3.0.9.8:../../audio/cdparanoia
DEPENDS+= cdrtools>=1.10:../../sysutils/cdrtools
DEPENDS+= cdrdao>=1.1.5:../../sysutils/cdrdao
DEPENDS+= gworkspace-[0-9]*:../../sysutils/gworkspace
-LICENSE= gnu-gpl-v2
-
PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= YES
diff --git a/sysutils/checkperms/Makefile b/sysutils/checkperms/Makefile
index 9de41c19844..e35f21dc60d 100644
--- a/sysutils/checkperms/Makefile
+++ b/sysutils/checkperms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/02/28 11:58:49 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:33 wiz Exp $
#
DISTNAME= checkperms-1.10
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.schlechte-software.de/checkperms/
MAINTAINER= rillig@NetBSD.org
HOMEPAGE= http://www.schlechte-software.de/checkperms/
COMMENT= Check and correct file permissions
-#LICENSE= modified-bsd
+LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
AUTO_MKDIRS= yes
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 75c8771b35c..c4fdec6a6bc 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/02/16 18:46:42 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:33 wiz Exp $
DISTNAME= daemontools-0.76
PKGREVISION= 1
@@ -9,7 +9,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
MAINTAINER= schmonz@NetBSD.org
HOMEPAGE= http://cr.yp.to/daemontools.html
COMMENT= Service monitoring and logging utilities by djb
-#LICENSE= public-domain
+LICENSE= public-domain
MANPAGES= ${DISTNAME}-man-20020131.tar.gz
SITES.${MANPAGES}= http://smarden.org/pape/djb/manpages/
diff --git a/sysutils/ddrescue/Makefile b/sysutils/ddrescue/Makefile
index ff6dbf5b81c..3eb11dc79d7 100644
--- a/sysutils/ddrescue/Makefile
+++ b/sysutils/ddrescue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/28 14:08:07 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:34 wiz Exp $
DISTNAME= ddrescue-1.8
CATEGORIES= sysutils
@@ -8,8 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= ef@math.uni-bonn.de
HOMEPAGE= http://www.gnu.org/software/ddrescue/ddrescue.html
COMMENT= GNU ddrescue is a data recovery tool
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/fs-kit/Makefile b/sysutils/fs-kit/Makefile
index 40f0e4f6477..e2de6826b11 100644
--- a/sysutils/fs-kit/Makefile
+++ b/sysutils/fs-kit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/14 18:39:05 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:34 wiz Exp $
DISTNAME= fs-kit-0.4
CATEGORIES= sysutils
@@ -8,8 +8,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nobius.org/~dbg/
COMMENT= User-level filesystem testing kit
-
LICENSE= fs-kit-license
+
RESTRICTED= No commercial use.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/sysutils/gnome-nds-thumbnailer/Makefile b/sysutils/gnome-nds-thumbnailer/Makefile
index e20b825e8d8..b34e7977cb3 100644
--- a/sysutils/gnome-nds-thumbnailer/Makefile
+++ b/sysutils/gnome-nds-thumbnailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/13 21:48:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= gnome-nds-thumbnailer-1.2.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://download.gnome.org/sources/gnome-nds-thumbnailer/1.2/
COMMENT= Thumbnailer for GNOME for Nintendo DS ROMs
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 85491a86535..a2e7ad4a4f5 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/04/18 23:54:02 rh Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= gworkspace-0.8.6
@@ -9,7 +9,6 @@ MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnustep.it/enrico/gworkspace/
COMMENT= GNUstep Workspace manager
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index a81c64f76d4..bbe59818e5a 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/20 11:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= hal-info-20090414
@@ -8,7 +8,6 @@ MASTER_SITES= http://hal.freedesktop.org/releases/
MAINTAINER= netbsd-desktop@NetBSD.org
HOMEPAGE= http://hal.freedesktop.org/
COMMENT= FreeDesktop hardware abstraction layer (info subpackage)
-
#LICENSE= Academic-Free-License-v2.1 OR gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/ipw-firmware/Makefile b/sysutils/ipw-firmware/Makefile
index 633c3cd2bcc..6f86e2067e2 100644
--- a/sysutils/ipw-firmware/Makefile
+++ b/sysutils/ipw-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/10 00:42:02 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:34 wiz Exp $
DISTNAME= ipw2100-fw-1.2
PKGNAME= ipw-firmware-1.0
@@ -9,19 +9,18 @@ EXTRACT_SUFX= .tgz
MAINTAINER= Damien.Bergamini@Free.FR
HOMEPAGE= http://damien.bergamini.free.fr/ipw/
COMMENT= Firmware binary images for ipw(4) driver
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= intel-ipw-license
-WRKSRC= ${WRKDIR}
-
RESTRICTED= Intel Licensed Software: see http://ipw2100.sourceforge.net/firmware.php?fid=3
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
+WRKSRC= ${WRKDIR}
+
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/sysutils/iwi-firmware/Makefile b/sysutils/iwi-firmware/Makefile
index 01e89bb2df5..5acb1cf6f3d 100644
--- a/sysutils/iwi-firmware/Makefile
+++ b/sysutils/iwi-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/20 17:40:53 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= ipw2200-fw-2.3
@@ -11,11 +11,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= Damien.Bergamini@Free.FR
HOMEPAGE= http://damien.bergamini.free.fr/ipw/
COMMENT= Firmware binary images for iwi(4) driver
-
-CONFLICTS+= iwi-firmware3-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= intel-ipw-license
RESTRICTED= Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=5
@@ -24,6 +19,10 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+CONFLICTS+= iwi-firmware3-[0-9]*
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
diff --git a/sysutils/iwi-firmware3/Makefile b/sysutils/iwi-firmware3/Makefile
index bf1f44c4efc..24517b715ca 100644
--- a/sysutils/iwi-firmware3/Makefile
+++ b/sysutils/iwi-firmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/20 17:32:31 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= ipw2200-fw-3.0
@@ -10,11 +10,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= Damien.Bergamini@Free.FR
HOMEPAGE= http://damien.bergamini.free.fr/ipw/
COMMENT= Firmware binary images for iwi(4) driver
-
-CONFLICTS+= iwi-firmware-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= intel-ipw-license
RESTRICTED= Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=7
@@ -23,6 +18,10 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+CONFLICTS+= iwi-firmware-[0-9]*
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index b1c3cff6dc4..625a1d501fd 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/01/18 05:09:44 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:34 wiz Exp $
#
DISTNAME= monit-4.10.1
@@ -9,8 +9,7 @@ MASTER_SITES= http://www.tildeslash.com/monit/dist/
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://www.tildeslash.com/monit/
COMMENT= Utility for monitoring processes, files, directories and devices
-
-#LICENSE= gnu-gpl-v3
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile
index f1fe213891b..326720bb464 100644
--- a/sysutils/nvnet/Makefile
+++ b/sysutils/nvnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/03/22 04:53:40 manu Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:34 wiz Exp $
#
PKGNAME= nvnet-20050620nb1
@@ -13,9 +13,6 @@ EXTRACT_SUFX=
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.morgart.com/NetBSD/nVidia/nvnet/
COMMENT= Driver for nVidia ethernet
-
-BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4
-
LICENSE= nvidia-license
RESTRICTED= nVidia Licensed Software: http://www.nvidia.com/object/nv_swlicense.html
@@ -24,6 +21,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+BROKEN_IN= pkgsrc-2006Q1 pkgsrc-2006Q4
WRKSRC= ${WRKDIR}/nvnet
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 72e382054b3..14b4d8d1170 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:35 wiz Exp $
DISTNAME= sm_linux_v314_install
PKGNAME= storage-manager-3.14
@@ -10,10 +10,8 @@ EXTRACT_SUFX= .rpm
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://opensource.adaptec.com/
COMMENT= Adaptec Storage Management software
-
-USE_TOOLS+= pax
-
LICENSE= generic-nonlicense
+
RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
@@ -22,6 +20,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
BUILD_DEPENDS+= rpm>=2.5.4:../../misc/rpm
+USE_TOOLS+= pax
+
EMUL_PLATFORMS= linux-i386
EMUL_MODULES.linux= compat x11
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index e056ac255d3..498a55cd56f 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/12 11:51:35 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= su2-1.3
@@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.ccs.neu.edu/pub/sysadmin/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ftp://ftp.ccs.neu.edu/pub/sysadmin/
COMMENT= Enhanced su, users su with own password + more
-
LICENSE= su2-license
+
RESTRICTED= may not be sold for profit
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index c48364d3e00..0ac1ea27944 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/05/16 08:10:03 obache Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= swapd-1.0.3
@@ -9,7 +9,6 @@ MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rkeene.org/oss/swapd/
COMMENT= Swap daemon for POSIX-compliant operating systems
-
LICENSE= gnu-gpl-v2
ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-*
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index a440e879385..e7dd68e9003 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/09/12 11:58:50 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= sysinfo-3.5.1
@@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.rge.com/pub/admin/sysinfo/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.magnicomp.com/
COMMENT= Displays system hardware and software information and configuration
-
LICENSE= sysinfo-license
+
RESTRICTED= May not be sold for profit or used for commercial gain.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index 0c06f083ffd..34ae595616d 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/02/16 18:47:43 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= tdir-1.58
@@ -8,11 +8,10 @@ MASTER_SITES= http://www.tundraware.com/Software/tdir/
MAINTAINER= zuntum@NetBSD.org
COMMENT= Display directories with files ordered by ending "extension"
+LICENSE= tdir-license
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= tdir-license
-
NOT_FOR_BULK_PLATFORM= HPUX-*-*
USE_TOOLS+= gunzip
diff --git a/sysutils/xraidadmin/Makefile b/sysutils/xraidadmin/Makefile
index cecb4f118e7..3f0702dd0c3 100644
--- a/sysutils/xraidadmin/Makefile
+++ b/sysutils/xraidadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/16 13:40:11 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= RAIDAdmin1.3.1archive
@@ -10,9 +10,6 @@ MASTER_SITES= http://download.info.apple.com/Mac_OS_X/061-1325.20040706.bNhy4/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.apple.com/downloads/macosx/apple/xserveraidadmintools.html
COMMENT= Tool to administer Apple's Xserve RAID
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= apple-admin-license
RESTRICTED= Redistribution not permitted
@@ -21,6 +18,8 @@ NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/RAID\ Admin\ 1.3.1
NO_BUILD= yes
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index fb5e9d3192c..c2c9a03c21b 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/09/12 12:00:12 gdt Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= cdif-1.15
@@ -9,14 +9,14 @@ EXTRACT_SUFX= # empty
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.srekcah.org/~utashiro/perl/scripts/cdif/
COMMENT= Word context diff
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= cdif-license
+
RESTRICTED= Redistribution only for "non-commercial purpose".
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
NOT_FOR_BULK_PLATFORM= HPUX-*-*
WRKSRC= ${WRKDIR}
diff --git a/textproc/emacs-muse/Makefile b/textproc/emacs-muse/Makefile
index b9c6084960c..aff6e8918fc 100644
--- a/textproc/emacs-muse/Makefile
+++ b/textproc/emacs-muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= muse-3.11
@@ -9,8 +9,8 @@ MASTER_SITES= http://download.gna.org/muse-el/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://mwolson.org/projects/EmacsMuse.html
COMMENT= Publishing environment for Emacs
+LICENSE= gnu-gpl-v3
-#LICENSE= gplv3
USE_LANGUAGES= # none
USE_TOOLS+= gmake makeinfo
INFO_FILES= yes
diff --git a/textproc/expatobjc/Makefile b/textproc/expatobjc/Makefile
index f6188f292b7..7f5593c5163 100644
--- a/textproc/expatobjc/Makefile
+++ b/textproc/expatobjc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/19 07:11:26 rh Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
#
DISTNAME= expatobjc-1.0
@@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expatobjc/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://expatobjc.sourceforge.net/
COMMENT= Objective-C Wrapper for Expat
-
LICENSE= expatobjc-license
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 3b9ecc06445..d49903e27dd 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/09/12 12:06:06 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2009/05/19 08:59:35 wiz Exp $
DISTNAME= glimpse-4.18.5
CATEGORIES= textproc databases
@@ -7,14 +7,14 @@ MASTER_SITES= http://webglimpse.net/trial/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://webglimpse.net/
COMMENT= Text search engine
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= glimpse-license
+
RESTRICTED= Redistribution only on non-profit basis.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake lex
GNU_CONFIGURE= yes
MAKE_FLAGS= mandir=${PREFIX}/${PKGMANDIR}/man1
diff --git a/textproc/iso-codes/Makefile b/textproc/iso-codes/Makefile
index e5072122a97..50ad11a88be 100644
--- a/textproc/iso-codes/Makefile
+++ b/textproc/iso-codes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/05/13 12:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/05/19 08:59:36 wiz Exp $
DISTNAME= iso-codes-3.9
CATEGORIES= textproc
@@ -7,7 +7,6 @@ MASTER_SITES= ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://alioth.debian.org/projects/pkg-isocodes/
COMMENT= List of country, language and currency names
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index b59b3d09f85..dae7697e5e7 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/12 13:45:01 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= Pygments-1.0
@@ -9,7 +9,6 @@ MASTER_SITES= http://pypi.python.org/packages/source/P/Pygments/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://pygments.org/
COMMENT= Python syntax highlighter
-
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index d9763ee6407..9a5dd82217e 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/05/07 11:01:09 obache Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= tokyodystopia-0.9.11
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://tokyocabinet.sourceforge.net/dystopiadoc/
COMMENT= Full-text search system
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index cf6cc3300d0..dad050ccab6 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/09/12 18:43:51 gdt Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= cs113ins
@@ -11,17 +11,17 @@ EXTRACT_SUFX= .exe
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://cardboard.nu/docs/software.html
COMMENT= Project and resource management software implemented in Java/Swing
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_X11BASE= yes
-
LICENSE= cardboard-schedule-license
+
RESTRICTED= Distribution permitted only of unmodified distfile at no charge.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
+USE_X11BASE= yes
+
USE_TOOLS+= pax gtar unzip
WRKSRC= ${WRKDIR}
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index d06c8a735d4..c5dc6c5dec2 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= emiclock-2.0.2
@@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.koba.jp/pub/EmiClock/X11/
MAINTAINER= minoura@NetBSD.org
COMMENT= Analog clock with image in the middle
-
LICENSE= emiclock-license
+
RESTRICTED= Do not distribute
NO_SRC_ON_FTP=${RESTRICTED}
NO_BIN_ON_FTP=${RESTRICTED}
diff --git a/time/etm/Makefile b/time/etm/Makefile
index 8a72d64b412..08ec371ecbf 100644
--- a/time/etm/Makefile
+++ b/time/etm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/10 21:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= etm-221
@@ -8,12 +8,11 @@ MASTER_SITES= http://www.duke.edu/~dgraham/ETM/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.duke.edu/~dgraham/ETM/
COMMENT= Event and Task Manager
+LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4:../../time/py-dateutil
-LICENSE= gnu-gpl-v3
-
PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= # none
diff --git a/time/titrax/Makefile b/time/titrax/Makefile
index c99a61e933c..09fa4534646 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/04/16 09:54:45 he Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= titrax-1.98
@@ -9,17 +9,17 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.alvestrand.no/titrax/TimeTracker.html
COMMENT= Little X11 tool to track project times
-
-USE_IMAKE= YES
-USE_TOOLS+= perl:run
-
LICENSE= titrax-license
+
RESTRICTED= Do not sell for "real money".
# XXX Arguably NO_*_ON_CDROM is not necessary, because "real money" seems
# to exclude CDROM distribution charges.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+USE_IMAKE= YES
+USE_TOOLS+= perl:run
+
post-patch:
${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
${SED} -e "s|@LOCALBASE@|${LOCALBASE}|g" \
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 6ab5a8be1a2..ba926fbbe0d 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/09/12 20:06:29 gdt Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:36 wiz Exp $
#
DISTNAME= amiwm0.20pl48
@@ -10,15 +10,15 @@ MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html
COMMENT= X window manager with Amiga look and feel
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
LICENSE= amiwm-license
+
RESTRICTED= Distribution limited to non-commercial purposes, unmodified binaries only.
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= ksh:run yacc lex
REPLACE_KSH= Xsession.in Xsession2.in
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 755d5a11b13..0833452ba00 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/08/18 00:55:48 epg Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/19 08:59:36 wiz Exp $
DISTNAME= fvwm-${FVWM_VER}
#PKGREVISION= 1
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fvwm.org/
COMMENT= Development version of X11 Virtual window manager
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]*
FVWM_VER= 2.5.26
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 4e5a40e23a6..062854af2f2 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/11/01 10:36:58 martti Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:36 wiz Exp $
DISTNAME= fvwm-1.24r
PKGNAME= ${DISTNAME:S/fvwm/fvwm1/}
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= cjs@NetBSD.org
HOMEPAGE= http://www.fvwm.org/
COMMENT= Virtual window manager for X
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
DEPENDS+= xpmroot-2.*:../../x11/xpmroot
diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile
index d1d0594c5bc..6d9981e2aa7 100644
--- a/www/ap2-wsgi/Makefile
+++ b/www/ap2-wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/29 23:18:58 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:37 wiz Exp $
#
DISTNAME= mod_wsgi-${VERSION}
@@ -9,7 +9,6 @@ MASTER_SITES= http://modwsgi.googlecode.com/files/
MAINTAINER= jan.m.danielsson@gmail.com
HOMEPAGE= http://modwsgi.googlecode.com/
COMMENT= WSGI module for apache
-
LICENSE= apache-2.0
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index bf627ec3f88..e6f3306bc7e 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2008/04/09 08:39:24 tron Exp $
+# $NetBSD: Makefile.common,v 1.23 2009/05/19 08:59:37 wiz Exp $
DISTNAME= install_flash_player_9_${DISTUNAME}
PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -7,16 +7,16 @@ MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.flash.com/
-
-DIST_SUBDIR= flash/${FLASH_VERS}
-
LICENSE= flash-license
+
RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+DIST_SUBDIR= flash/${FLASH_VERS}
+
EMUL_PLATFORMS= linux-i386
.include "../../mk/bsd.prefs.mk"
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index a4e37f0b99a..4e59728a4d2 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/18 13:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:37 wiz Exp $
#
# PKGNAME derives from the supported API (still from
# release 3.14). See also PLIST.
@@ -13,7 +13,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-
#LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/ja-trac/Makefile b/www/ja-trac/Makefile
index c7b1d46b548..b1c0f66a1a4 100644
--- a/www/ja-trac/Makefile
+++ b/www/ja-trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/07 11:29:52 obache Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:37 wiz Exp $
#
DISTNAME= Trac-0.11.4.ja1
@@ -10,7 +10,6 @@ EXTRACT_SUFX= .zip
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.i-act.co.jp/project/products/products.html
COMMENT= Trac issue tracking system with Japanese localization
-
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 9628dc3e52f..7c0a28971af 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.90 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile.common,v 1.91 2009/05/19 08:59:37 wiz Exp $
#
# Common include file for communicator and navigator packages
@@ -6,8 +6,8 @@ CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.netscape.com/browsers/index.html
-
LICENSE= generic-nonlicense
+
RESTRICTED= No re-distribution without agreement from Netscape
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 5f2d75099cb..26240a801c9 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2009/05/17 13:46:00 obache Exp $
+# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:37 wiz Exp $
DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/}
CATEGORIES= www
@@ -13,7 +13,6 @@ DISTFILES= opera-${OPERA_DIST_VERSION}${OPERA_ARCH}${EXTRACT_SUFX}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.opera.com/
COMMENT= Small, fast and customizable WWW client
-
LICENSE= opera-850-license
EMUL_PLATFORMS= freebsd-i386
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index 2ea44f5f00a..e330c8ff39e 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/12 13:27:55 obache Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/19 08:59:37 wiz Exp $
#
DISTNAME= Genshi-0.5.1
@@ -9,7 +9,6 @@ MASTER_SITES= http://ftp.edgewall.com/pub/genshi/
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://genshi.edgewall.org/
COMMENT= Python toolkit for generation of output for the web
-
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 46ad5da9673..7e612cd07ee 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/08 13:39:09 taca Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:37 wiz Exp $
DISTNAME= squid-3.0.STABLE15
PKGNAME= ${DISTNAME:S/STABLE//}
@@ -9,8 +9,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.squid-cache.org/
COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
+LICENSE= gnu-gpl-v2
-LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_TOOLS+= perl
GNU_CONFIGURE= yes
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 3782d1f3ef0..d2187708628 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/17 14:17:42 tron Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $
DISTNAME= squid-3.1.0.7
PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk"
@@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.squid-cache.org/
COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
+LICENSE= gnu-gpl-v2
-LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_TOOLS+= perl gmake
GNU_CONFIGURE= yes
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index edbbd69c178..af60a7d05f3 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/11 19:03:53 spz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $
#
DISTNAME= varnish-2.0.4
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=varnish/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://varnish-cache.org/
COMMENT= High-performace HTTP accelerator
-
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index c1abf325ef2..651d7af117c 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2009/05/18 10:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2009/05/19 08:59:38 wiz Exp $
#
DISTNAME= gnome-mag-0.15.6
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME screen magnifier
-
LICENSE= gnu-lgpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 4de2b420c5b..eda7fa7d1eb 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/18 12:23:34 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:38 wiz Exp $
#
DISTNAME= gnome-screensaver-2.26.1
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.26/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://live.gnome.org/GnomeScreensaver/
COMMENT= Screen saver and locker for the GNOME desktop
-
#LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index f351b3007c7..b8216084733 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2009/05/18 12:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2009/05/19 08:59:38 wiz Exp $
#
DISTNAME= gnome-themes-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Collection of themes and icons for GNOME 2
-
LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 7a386ab2a17..298633f09f9 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2009/04/13 12:21:37 rh Exp $
+# $NetBSD: Makefile,v 1.46 2009/05/19 08:59:38 wiz Exp $
DISTNAME= gnustep-back-0.16.0
CATEGORIES= x11 gnustep
@@ -7,11 +7,10 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= X11 AppKit backend for GNUstep
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v3
-
USE_LANGUAGES= objc
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index ad69c034b79..8a9408b9a52 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/04/13 12:19:14 rh Exp $
+# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:38 wiz Exp $
DISTNAME= gnustep-gui-0.16.0
CATEGORIES= x11 gnustep
@@ -7,11 +7,10 @@ MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= GNUstep AppKit Implementation
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v3
-
USE_LANGUAGES= objc
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index c65debaf856..d0138997d3b 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/04/19 09:21:24 rh Exp $
+# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:38 wiz Exp $
DISTNAME= Preferences-1.2.0
PKGNAME= gnustep-${DISTNAME:S/P/p/}
@@ -10,11 +10,10 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://prefsapp.sourceforge.net/
COMMENT= Application for setting preferences for the GNUstep system
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= gnu-gpl-v2
-
USE_LANGUAGES= objc
NO_CONFIGURE= YES
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 7e1b7d13c47..c592196c513 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/13 12:32:08 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:38 wiz Exp $
#
DISTNAME= libxklavier-3.9
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://freedesktop.org/Software/LibXklavier
COMMENT= High-level API for the X Keyboard Extension (XKB)
-
LICENSE= gnu-lgpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index c4472857efe..b752033e8ac 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/05/19 08:59:38 wiz Exp $
PKGVER= 2.3.1
DISTNAME= openmotif-${PKGVER}
@@ -11,13 +11,10 @@ MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.1/
MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.opengroup.org/openmotif/
COMMENT= The Open Group Motif toolkit for the X Window System
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
+LICENSE= openmotif-license
.include "../../mk/bsd.prefs.mk"
-LICENSE= openmotif-license
RESTRICTED= Only for Open Source OS; complex terms for commercial distribution.
# License grants permission to reproduce distfile for use on Open
@@ -37,6 +34,9 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
CONFLICTS+= lesstif-[0-9]*
USE_LIBTOOL= yes
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 8275c5978cb..63f096c4854 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:26 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:39 wiz Exp $
DISTNAME= swing1_1_1
PKGNAME= swing-1.1.1
@@ -10,8 +10,7 @@ EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://java.sun.com/products/jfc/
COMMENT= Sun's Java Foundation Classes (the Swing UI toolkit), version 1.1.1
-
-DOWNLOAD= http://java.sun.com/products/jfc/download.archive.html
+LICENSE= sun-swing-license
RESTRICTED= Read license before redistributing the Java(tm) Foundation Classes
NO_SRC_ON_FTP= ${RESTRICTED}
@@ -19,7 +18,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-LICENSE= sun-swing-license
+DOWNLOAD= http://java.sun.com/products/jfc/download.archive.html
WRKSRC= ${WRKDIR}/swing-1.1.1fcs
USE_JAVA= run
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index 1aacd19ee89..699b8264e9f 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/05/07 14:03:26 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:39 wiz Exp $
#
DISTNAME= x11vnc-0.9.7
@@ -8,7 +8,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.karlrunge.com/x11vnc/
COMMENT= VNC server for real X displays
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 4a486379682..5a449227ab2 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/08/19 13:33:09 obache Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:39 wiz Exp $
#
DISTNAME= xclip-0.11
@@ -8,8 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xclip/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/xclip/
COMMENT= Command line interface to the X windows clipboard
-
-#LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xcruise/Makefile b/x11/xcruise/Makefile
index 6128e081054..e1691e9cccb 100644
--- a/x11/xcruise/Makefile
+++ b/x11/xcruise/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:39 wiz Exp $
#
DISTNAME= xcruise-0.24
@@ -9,8 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcruiser/}
MAINTAINER= minoura@NetBSD.org
HOMEPAGE= http://xcruiser.sourceforge.net/
COMMENT= Navigate through a three-dimensional view of a file system
-
-# LICENSE= GPL
+#LICENSE= GPL
USE_IMAKE= yes
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 7ce62701c78..58257df3544 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/05/30 17:04:04 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2009/05/19 08:59:39 wiz Exp $
DISTNAME= xephem-3.7.3
CATEGORIES= x11
@@ -7,8 +7,7 @@ MASTER_SITES= http://www.clearskyinstitute.com/xephem/
MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://www.clearskyinstitute.com/xephem/
COMMENT= Interactive astronomical ephemeris program
-
-LICENSE= xephem-license
+LICENSE= xephem-license
# Pending adjustment of license wording to clarify the copyright
# holder's intent, permission has been granted to distribute the