From a7f2560fffd26601f303c2c6461df0b05f236fab Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Fri, 19 Nov 2010 22:31:39 +0000 Subject: [PATCH] new depends --- net/BitTorrent/Makefile | 8 ++-- net/Makefile | 3 +- net/adsuck/Makefile | 6 +-- net/aguri/Makefile | 4 +- net/aimsniff/Makefile | 14 +++---- net/aircontrol/Makefile | 4 +- net/amsn/Makefile | 16 +++---- net/amule/Makefile | 6 +-- net/angst/Makefile | 6 +-- net/argus-clients/Makefile | 4 +- net/argus/Makefile | 4 +- net/arp-scan/Makefile | 4 +- net/arpd/Makefile | 4 +- net/arping/Makefile | 6 +-- net/avahi/Makefile | 42 +++++++++---------- net/axyftp/Makefile | 6 +-- net/balance/Makefile | 4 +- net/bindgraph/Makefile | 6 +-- net/bird/Makefile | 6 +-- net/bitlbee/Makefile | 8 ++-- net/bluetooth-tools/Makefile | 6 +-- net/bnc/Makefile | 4 +- net/bro/Makefile | 8 ++-- net/btpd/Makefile | 4 +- net/bwm-ng/Makefile | 4 +- net/cadaver/Makefile | 4 +- net/castget/Makefile | 10 ++--- net/charm/Makefile | 4 +- net/cjc/Makefile | 4 +- net/coccinella/Makefile | 22 +++++----- net/crawl/Makefile | 4 +- net/ctrace/Makefile | 8 ++-- net/curl/Makefile | 4 +- net/cvsup/Makefile | 4 +- net/darkstat/Makefile | 4 +- net/dc_gui/Makefile | 16 +++---- net/dclib/Makefile | 6 +-- net/dctc/Makefile | 10 ++--- net/ddclient/Makefile | 4 +- net/dhcping/Makefile | 4 +- net/dlint/Makefile | 4 +- net/dnsreflector/Makefile | 4 +- net/dnstop/Makefile | 4 +- net/dss/Makefile | 4 +- net/dxpc/Makefile | 4 +- net/dysnomia/Makefile | 6 +-- net/echoping/Makefile | 4 +- net/ejabberd/Makefile | 6 +-- net/emesene/Makefile | 10 ++--- net/etherape/Makefile | 14 +++---- net/ettercap/Makefile | 10 ++--- net/ezstream/Makefile | 12 +++--- net/farsight2/Makefile | 8 ++-- net/filezilla/Makefile | 20 ++++----- net/firewalk/Makefile | 6 +-- net/flickcurl/Makefile | 14 +++---- net/flow-tools/Makefile | 7 ++-- net/flowd/Makefile | 4 +- net/fping/Makefile | 4 +- net/freeradius/Makefile | 36 ++++++++-------- net/freetalk/Makefile | 8 ++-- net/gajim/Makefile | 22 +++++----- net/galago-daemon/Makefile | 6 +-- net/gftp/Makefile | 14 +++---- net/gloox/Makefile | 4 +- net/gmudix/Makefile | 6 +-- net/gnaughty/Makefile | 10 ++--- net/gnet/Makefile | 4 +- net/gnugk/Makefile | 16 +++---- net/gotthard/Makefile | 4 +- net/gsnmp/Makefile | 4 +- net/gtk-gnutella/Makefile | 8 ++-- net/h323plus/Makefile | 12 +++--- net/haproxy/Makefile | 4 +- net/honeyd/Makefile | 12 +++--- net/hpodder/Makefile | 18 ++++---- net/hs-HTTP/Makefile | 6 +-- net/hs-network-bytestring/Makefile | 4 +- net/hs-pb/Makefile | 8 ++-- net/icecast/Makefile | 16 +++---- net/ices/Makefile | 18 ++++---- net/ices2/Makefile | 12 +++--- net/ifstat/Makefile | 7 ++-- net/iftop/Makefile | 4 +- net/ii/Makefile | 4 +- net/iodine/Makefile | 6 +-- net/ipaudit/Makefile | 4 +- net/ipcad/Makefile | 4 +- net/ipfm/Makefile | 4 +- net/ipfreely/Makefile | 4 +- net/ipsvd/Makefile | 4 +- net/ircd-hybrid/Makefile | 4 +- net/ircd-ratbox/Makefile | 6 +-- net/irssi-icb/Makefile | 10 ++--- net/irssi-silc/Makefile | 10 ++--- net/irssi/Makefile | 4 +- net/isc-dhcp/Makefile | 4 +- net/jabberd/Makefile | 20 ++++----- net/kismet/Makefile | 8 ++-- net/ktorrent/Makefile | 16 +++---- net/ladvd/Makefile | 6 +-- net/ldns/drill/Makefile | 6 +-- net/ldns/utils/Makefile | 6 +-- net/libbgpdump/Makefile | 4 +- net/libcares/Makefile | 4 +- net/libdnet/Makefile | 6 +-- net/libgadu/Makefile | 4 +- net/libgalago/Makefile | 6 +-- net/libnetdude/libnetdude/Makefile | 6 +-- net/libnetdude/plugins/conntrack/Makefile | 6 +-- net/libnetdude/plugins/demux/Makefile | 8 ++-- net/libnetdude/plugins/tcpfilter/Makefile | 8 ++-- net/libnetdude/plugins/traceset/Makefile | 6 +-- .../plugins/traffic-analyzer/Makefile | 8 ++-- net/libnice/Makefile | 4 +- net/libnids/Makefile | 4 +- net/libproxy/Makefile | 6 +-- net/librest/Makefile | 4 +- net/librsync/Makefile | 6 +-- net/libshout/Makefile | 8 ++-- net/libtorrent/Makefile | 4 +- net/loudmouth/Makefile | 10 ++--- net/mbrowse/Makefile | 8 ++-- net/mcabber/Makefile | 18 ++++---- net/meanwhile/Makefile | 6 +-- net/microblog-purple/Makefile | 8 ++-- net/minbif/Makefile | 12 +++--- net/mirmon/Makefile | 4 +- net/mldonkey/stable/Makefile | 12 +++--- net/mon/server/Makefile | 4 +- net/mono-zeroconf/Makefile | 4 +- net/mrtd/Makefile | 4 +- net/mrtg/Makefile | 14 +++---- net/mtr/Makefile | 4 +- net/munin/Makefile | 12 +++--- net/mutella/Makefile | 4 +- net/nagios/check_bioctl/Makefile | 4 +- net/nagios/check_email_delivery/Makefile | 16 +++---- net/nagios/check_hw_sensors/Makefile | 4 +- net/nagios/check_mssql_health/Makefile | 4 +- net/nagios/check_openbgpd/Makefile | 4 +- net/nagios/check_sip/Makefile | 6 +-- net/nagios/cnagios/Makefile | 4 +- net/nagios/nagios/Makefile | 18 ++++---- net/nagios/nrpe/Makefile | 4 +- net/nagios/nsca/Makefile | 12 +++--- net/nagios/p5-Nagios-Plugin/Makefile | 12 +++--- net/nagios/plugins/Makefile | 32 +++++++------- net/nam/Makefile | 4 +- net/nemesis/Makefile | 6 +-- net/neon/Makefile | 4 +- net/nepenthes/Makefile | 20 ++++----- net/nepim/Makefile | 6 +-- net/net-snmp/Makefile | 8 ++-- net/netatalk/Makefile | 6 +-- net/netdude/netdude/Makefile | 14 +++---- net/netdude/plugins/traffic-analyzer/Makefile | 6 +-- net/nfdump/Makefile | 8 ++-- net/nfsen/Makefile | 14 +++---- net/ngrep/Makefile | 4 +- net/nicotine/Makefile | 4 +- net/nmap/Makefile | 20 ++++----- net/ns/Makefile | 6 +-- net/nslint/Makefile | 4 +- net/oggfwd/Makefile | 8 ++-- net/oinkmaster/Makefile | 4 +- net/olsrd/Makefile | 8 ++-- net/onioncat/Makefile | 6 +-- net/opal/Makefile | 14 +++---- net/openfire/Makefile | 4 +- net/openvpn/Makefile | 4 +- net/openvpn_bsdauth/Makefile | 4 +- net/p5-Bot-BasicBot/Makefile | 4 +- net/p5-Business-PayPal-API/Makefile | 6 +-- net/p5-Business-PayPal-IPN/Makefile | 6 +-- net/p5-Business-PayPal/Makefile | 4 +- net/p5-DNS-ZoneParse/Makefile | 4 +- net/p5-Danga-Socket/Makefile | 6 +-- net/p5-Event-RPC/Makefile | 6 +-- net/p5-Filesys-Virtual-DAAP/Makefile | 8 ++-- net/p5-Geo-IP/Makefile | 6 +-- net/p5-IO-Socket-INET6/Makefile | 8 ++-- net/p5-IO-Socket-Multicast/Makefile | 4 +- net/p5-IP-Country/Makefile | 4 +- net/p5-Net-Amazon/Makefile | 10 ++--- net/p5-Net-DAAP-Client/Makefile | 8 ++-- net/p5-Net-DAV-Server/Makefile | 14 +++---- net/p5-Net-DBus/Makefile | 8 ++-- net/p5-Net-DNS-DynDNS/Makefile | 4 +- net/p5-Net-DNS-SEC/Makefile | 16 +++---- net/p5-Net-DNS/Makefile | 12 +++--- net/p5-Net-Dict/Makefile | 4 +- net/p5-Net-FTP-AutoReconnect/Makefile | 4 +- net/p5-Net-FTPSSL/Makefile | 4 +- net/p5-Net-FTPServer/Makefile | 12 +++--- net/p5-Net-GPSD/Makefile | 12 +++--- net/p5-Net-Google/Makefile | 4 +- net/p5-Net-ICal/Makefile | 8 ++-- net/p5-Net-INET6Glue/Makefile | 6 +-- net/p5-Net-IPTrie/Makefile | 4 +- net/p5-Net-Jabber/Makefile | 4 +- net/p5-Net-MySQL/Makefile | 6 +-- net/p5-Net-OAuth/Makefile | 12 +++--- net/p5-Net-Pcap/Makefile | 4 +- net/p5-Net-Ping-External/Makefile | 4 +- net/p5-Net-Radius/Makefile | 6 +-- net/p5-Net-SFTP/Makefile | 4 +- net/p5-Net-SMTP-SSL/Makefile | 4 +- net/p5-Net-SMTP-TLS/Makefile | 8 ++-- net/p5-Net-SMTP_auth/Makefile | 6 +-- net/p5-Net-SNMP/Makefile | 8 ++-- net/p5-Net-SSH-Expect/Makefile | 4 +- net/p5-Net-SSH-Perl/Makefile | 20 ++++----- net/p5-Net-SSH2/Makefile | 4 +- net/p5-Net-Telnet-Cisco/Makefile | 8 ++-- net/p5-Net-Telnet/Makefile | 4 +- net/p5-Net-Traceroute/Makefile | 4 +- net/p5-Net-Twitter/Makefile | 22 +++++----- net/p5-Net-Whois-RIPE/Makefile | 4 +- net/p5-Net-Whois-Raw/Makefile | 8 ++-- net/p5-Net-XMPP/Makefile | 8 ++-- net/p5-Net-Z3950-Zoom/Makefile | 6 +-- net/p5-NetAddr-IP/Makefile | 4 +- net/p5-NetPacket/Makefile | 4 +- net/p5-Nmap-Parser/Makefile | 6 +-- net/p5-Nmap-Scanner/Makefile | 12 +++--- net/p5-POE-Component-Client-DNS/Makefile | 6 +-- net/p5-POE-Component-Client-HTTP/Makefile | 12 +++--- .../Makefile | 6 +-- .../Makefile | 8 ++-- net/p5-POE-Component-IRC/Makefile | 14 +++---- net/p5-POE-Component-Jabber/Makefile | 16 +++---- net/p5-POE-Component-Pcap/Makefile | 8 ++-- net/p5-POE-Component-Server-FTP/Makefile | 8 ++-- net/p5-POE-Filter-IRCD/Makefile | 6 +-- net/p5-PlRPC/Makefile | 4 +- net/p5-RPC-XML/Makefile | 14 +++---- net/p5-SNMP-BridgeQuery/Makefile | 4 +- net/p5-SNMP-Info/Makefile | 4 +- net/p5-Validate-Net/Makefile | 4 +- net/p5-flowd/Makefile | 6 +-- net/packit/Makefile | 6 +-- net/papyon/Makefile | 8 ++-- net/pavuk/Makefile | 4 +- net/pcapdiff/Makefile | 4 +- net/pcapmerge/Makefile | 4 +- net/pear-HTTP-Request/Makefile | 6 +-- net/pear-Net-DNS/Makefile | 4 +- net/pear-Net-IMAP/Makefile | 6 +-- net/pear-Net-LDAP/Makefile | 4 +- net/pear-Net-SMTP/Makefile | 6 +-- net/pear-Net-URL-Mapper/Makefile | 4 +- net/pear-Services-Weather/Makefile | 8 ++-- net/pear-Services-oEmbed/Makefile | 8 ++-- net/pen/Makefile | 4 +- net/pfflowd/Makefile | 4 +- net/pfstat/Makefile | 8 ++-- net/php-weathermap/Makefile | 8 ++-- net/pidgin-facebookchat/Makefile | 8 ++-- net/pidgin-icb/Makefile | 4 +- net/pidgin-tlen/Makefile | 4 +- net/pidgin/Makefile | 34 +++++++-------- net/pktstat/Makefile | 4 +- net/plushs/Makefile | 4 +- net/pmacct/Makefile | 14 +++---- net/poco/Makefile | 10 ++--- net/poptop/Makefile | 4 +- net/powerdns/Makefile | 32 +++++++------- net/prosody/Makefile | 16 +++---- net/psi/Makefile | 8 ++-- net/pure-ftpd/Makefile | 14 +++---- net/putty/Makefile | 8 ++-- net/py-GeoIP/Makefile | 6 +-- net/py-adns/Makefile | 4 +- net/py-curl/Makefile | 6 +-- net/py-flowd/Makefile | 4 +- net/py-flowtools/Makefile | 4 +- net/py-impacket/Makefile | 6 +-- net/py-libpcap/Makefile | 4 +- net/py-nmap/Makefile | 4 +- net/py-pcs/Makefile | 4 +- net/py-xmpp/Makefile | 8 ++-- net/py-zsi/Makefile | 6 +-- net/quagga/Makefile | 6 +-- net/rabbitmq/Makefile | 6 +-- net/radiusd-cistron/Makefile | 6 +-- net/rrdtool/Makefile | 12 +++--- net/rsnapshot/Makefile | 10 ++--- net/rtg/Makefile | 14 +++---- net/rtmpdump/Makefile | 4 +- net/rtorrent/Makefile | 8 ++-- net/ruby-amqp-utils/Makefile | 12 +++--- net/ruby-amqp/Makefile | 8 ++-- net/ruby-errand/Makefile | 4 +- net/ruby-minion/Makefile | 6 +-- net/ruby-net-scp/Makefile | 6 +-- net/ruby-net-sftp/Makefile | 6 +-- net/ruby-net-ssh-gateway/Makefile | 6 +-- net/ruby-net-ssh/Makefile | 6 +-- net/ruby-pcap/Makefile | 4 +- net/ruby-rrdtool/Makefile | 6 +-- net/samba/Makefile | 16 +++---- net/scapy/Makefile | 10 ++--- net/scli/Makefile | 6 +-- net/sendxmpp/Makefile | 4 +- net/ser/Makefile | 6 +-- net/si/Makefile | 4 +- net/silc-client/Makefile | 8 ++-- net/silc-server/Makefile | 4 +- net/sing/Makefile | 6 +-- net/sipsak/Makefile | 4 +- net/smokeping/Makefile | 24 +++++------ net/snmptt/Makefile | 6 +-- net/snort/Makefile | 20 ++++----- net/spectrum-tools/Makefile | 8 ++-- net/spectrum/Makefile | 10 ++--- net/ssldump/Makefile | 6 +-- net/ssvnc/Makefile | 14 +++---- net/tclcurl/Makefile | 6 +-- net/tcludp/Makefile | 4 +- net/tcpdpriv/Makefile | 4 +- net/tcpflow/Makefile | 4 +- net/tcpreen/Makefile | 4 +- net/tcpreplay/Makefile | 6 +-- net/tcptrace/Makefile | 10 ++--- net/tcptraceroute/Makefile | 8 ++-- net/telepathy/folks/Makefile | 14 +++---- net/telepathy/telepathy-butterfly/Makefile | 6 +-- net/telepathy/telepathy-farsight/Makefile | 6 +-- net/telepathy/telepathy-gabble/Makefile | 18 ++++---- net/telepathy/telepathy-glib/Makefile | 10 ++--- net/telepathy/telepathy-haze/Makefile | 14 +++---- net/telepathy/telepathy-idle/Makefile | 10 ++--- net/telepathy/telepathy-inspector/Makefile | 8 ++-- net/telepathy/telepathy-logger/Makefile | 14 +++---- .../telepathy-mission-control/Makefile | 8 ++-- net/telepathy/telepathy-python/Makefile | 10 ++--- net/telepathy/telepathy-salut/Makefile | 16 +++---- net/telepathy/telepathy-spec/Makefile | 8 ++-- net/thcrut/Makefile | 6 +-- net/tightvnc/Makefile | 6 +-- net/tircd/Makefile | 4 +- net/tkirc/Makefile | 4 +- net/totd/Makefile | 4 +- net/transmission/Makefile | 26 +++++++----- net/twirssi/Makefile | 6 +-- net/twitux/Makefile | 18 ++++---- net/unbound/Makefile | 6 +-- net/unison/Makefile.inc | 6 +-- net/ushare/Makefile | 4 +- net/valknut/Makefile | 8 ++-- net/vicq/Makefile | 4 +- net/vncsnapshot/Makefile | 4 +- net/vnstat/Makefile | 4 +- net/walker/Makefile | 6 +-- net/weex/Makefile | 4 +- net/wget/Makefile | 4 +- net/wide-dhcpv6/Makefile | 4 +- net/winexe/Makefile | 4 +- net/wmnetload/Makefile | 4 +- net/wol/Makefile | 4 +- net/xchat/Makefile | 10 ++--- net/xmlrpc-c/Makefile | 4 +- net/xmlrpc-epi/Makefile | 6 +-- net/xorp/Makefile | 6 +-- net/xprobe/Makefile | 4 +- net/yaz/Makefile | 12 +++--- net/yersinia/Makefile | 4 +- net/ysmv7/Makefile | 4 +- net/yt/Makefile | 8 ++-- net/zabbix/Makefile | 28 ++++++------- net/zenirc/Makefile | 4 +- net/ziproxy/Makefile | 12 +++--- net/znc/Makefile | 4 +- 374 files changed, 1454 insertions(+), 1447 deletions(-) diff --git a/net/BitTorrent/Makefile b/net/BitTorrent/Makefile index 9d054901dc..a23ff8d5f0 100644 --- a/net/BitTorrent/Makefile +++ b/net/BitTorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2010/11/09 19:46:52 jasper Exp $ +# $OpenBSD: Makefile,v 1.33 2010/11/19 22:31:32 espie Exp $ COMMENT-main= cooperative file distribution system implemented in Python COMMENT-gui= graphical interface components for BitTorrent @@ -23,10 +23,10 @@ MASTER_SITES= http://download.bittorrent.com/dl/ MULTI_PACKAGES= -main -gui MODULES= lang/python -BUILD_DEPENDS= ::devel/gettext +BUILD_DEPENDS= devel/gettext -RUN_DEPENDS-gui=:${PKGNAME-main}:net/BitTorrent \ - :py-gtk2->=2.6:x11/py-gtk2 +RUN_DEPENDS-gui=${PKGNAME-main}:net/BitTorrent \ + x11/py-gtk2>=2.6 NO_REGRESS= Yes diff --git a/net/Makefile b/net/Makefile index c0930e33a2..d770fb3e3b 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.662 2010/11/11 09:19:38 jasper Exp $ +# $OpenBSD: Makefile,v 1.663 2010/11/19 22:31:32 espie Exp $ # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $ # @@ -26,6 +26,7 @@ SUBDIR += arping SUBDIR += arpwatch SUBDIR += avahi, + SUBDIR += avahi,no_mono SUBDIR += axel SUBDIR += axyftp SUBDIR += balance diff --git a/net/adsuck/Makefile b/net/adsuck/Makefile index 7a82a7ffa9..2db39b0d7f 100644 --- a/net/adsuck/Makefile +++ b/net/adsuck/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/15 18:13:45 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:32 espie Exp $ COMMENT= DNS relay for ad blocking @@ -18,9 +18,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://opensource.conformal.com/snapshots/adsuck/ -WANTLIB= c ldns.>=4.4 +WANTLIB= c ldns>=4.4 -LIB_DEPENDS= :libldns->=1.6.5:net/ldns/libldns +LIB_DEPENDS= net/ldns/libldns>=1.6.5 MAKE_FLAGS= BINDIR="${TRUEPREFIX}/sbin" \ MANDIR="${TRUEPREFIX}/man/cat" diff --git a/net/aguri/Makefile b/net/aguri/Makefile index ac387f293f..0caf8c598b 100644 --- a/net/aguri/Makefile +++ b/net/aguri/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:45 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:32 espie Exp $ COMMENT= aggregation-based network traffic profiler DISTNAME= aguri-0.7 @@ -18,7 +18,7 @@ WANTLIB= c pcap MASTER_SITES= ftp://ftp.csl.sony.co.jp/pub/kjc/ MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" -USE_GROFF = Yes +USE_GROFF = Yes do-configure: @perl -pi -e 's,/usr/local,${PREFIX},' ${WRKDIST}/scripts/* diff --git a/net/aimsniff/Makefile b/net/aimsniff/Makefile index 864dfd3230..027f6fb08f 100644 --- a/net/aimsniff/Makefile +++ b/net/aimsniff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/15 22:36:52 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:32 espie Exp $ PKG_ARCH= * COMMENT= utility for monitoring and archiving AOL Instant Messenger @@ -17,12 +17,12 @@ PERMIT_PACKAGE_FTP= Yes NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS= ::converters/p5-Unicode-String \ - ::databases/p5-DBI \ - ::devel/p5-Proc-Daemon \ - ::devel/p5-Proc-Simple \ - ::net/p5-NetPacket \ - ::sysutils/p5-Unix-Syslog +RUN_DEPENDS= converters/p5-Unicode-String \ + databases/p5-DBI \ + devel/p5-Proc-Daemon \ + devel/p5-Proc-Simple \ + net/p5-NetPacket \ + sysutils/p5-Unix-Syslog do-install: ${INSTALL_SCRIPT} ${WRKSRC}/aimSniff.pl ${PREFIX}/bin/aimsniff diff --git a/net/aircontrol/Makefile b/net/aircontrol/Makefile index b2eed0b76f..2eb9dfafaf 100644 --- a/net/aircontrol/Makefile +++ b/net/aircontrol/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/12 22:07:37 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:32 espie Exp $ COMMENT= management tool for Ubiquiti wireless devices @@ -21,7 +21,7 @@ MODULES= java MODJAVA_VER= 1.6+ MODJAVA_JRERUN= Yes -RUN_DEPENDS= ::java/javaPathHelper +RUN_DEPENDS= java/javaPathHelper PREFIX= /var/aircontrol diff --git a/net/amsn/Makefile b/net/amsn/Makefile index 85db8ddaab..4cad0d420c 100644 --- a/net/amsn/Makefile +++ b/net/amsn/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.14 2010/11/11 11:54:08 espie Exp $ +#$OpenBSD: Makefile,v 1.15 2010/11/19 22:31:32 espie Exp $ COMMENT= open source MSN Messenger clone @@ -26,15 +26,15 @@ WANTLIB= ICE SM X11 m stdc++ z glib-2.0 gmodule-2.0 gobject-2.0 \ gthread-2.0 gstbase-0.10 gstinterfaces-0.10 \ gstreamer-0.10 xml2 jpeg png gstfarsight-0.10 -LIB_DEPENDS= ::graphics/jpeg \ - ::graphics/png \ - ::net/farsight2 +LIB_DEPENDS= graphics/jpeg \ + graphics/png \ + net/farsight2 RUN_DEPENDS+= ${MODTK_RUN_DEPENDS} \ - ::security/tcltls \ - ::x11/bwidget \ - :desktop-file-utils-*:devel/desktop-file-utils + security/tcltls \ + x11/bwidget \ + devel/desktop-file-utils BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} \ - ::security/tcltls + security/tcltls MODTK_THREADED= Yes MODULES= devel/gettext \ diff --git a/net/amule/Makefile b/net/amule/Makefile index 5644810cb7..78f442cf50 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:32 espie Exp $ COMMENT-main = another eMule p2p client COMMENT-web = webserver interface to amuled @@ -26,9 +26,9 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amule/} EXTRACT_SUFX = .tar.bz2 RUN_DEPENDS-main=${RUN_DEPENDS} \ - :desktop-file-utils-*:devel/desktop-file-utils + devel/desktop-file-utils -LIB_DEPENDS = :wxWidgets-gtk2->=2.6.3:x11/wxWidgets +LIB_DEPENDS = x11/wxWidgets>=2.6.3 WANTLIB = c m pthread z stdc++ wx_base_net wx_base USE_GMAKE = Yes diff --git a/net/angst/Makefile b/net/angst/Makefile index cd20021859..e6389f7c1e 100644 --- a/net/angst/Makefile +++ b/net/angst/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:32 espie Exp $ COMMENT= active packet sniffer @@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB = c pcap lib/libnet-1.0/net.=0 -LIB_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 +WANTLIB = c pcap lib/libnet-1.0/net=0 +LIB_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 ALL_TARGET= angst diff --git a/net/argus-clients/Makefile b/net/argus-clients/Makefile index f5876e0816..c8560d5ed3 100644 --- a/net/argus-clients/Makefile +++ b/net/argus-clients/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/11 08:40:27 steven Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:32 espie Exp $ COMMENT = utilities to read and parse Argus data @@ -22,7 +22,7 @@ NO_REGRESS = Yes CONFIGURE_STYLE = gnu MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config -BUILD_DEPENDS = ::devel/bison +BUILD_DEPENDS = devel/bison USE_GROFF = Yes MAKE_FLAGS = CCOPT="${CFLAGS}" diff --git a/net/argus/Makefile b/net/argus/Makefile index 5a386cd1a8..4d467cef5d 100644 --- a/net/argus/Makefile +++ b/net/argus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/12 21:03:45 steven Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:32 espie Exp $ COMMENT = Audit Record Generation and Utilization System @@ -24,7 +24,7 @@ NO_REGRESS = Yes CONFIGURE_STYLE = gnu MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config -BUILD_DEPENDS = ::devel/bison +BUILD_DEPENDS = devel/bison MAKE_FLAGS = CCOPT= CFLAGS += -DSYSCONFDIR=\\\"${SYSCONFDIR}\\\" diff --git a/net/arp-scan/Makefile b/net/arp-scan/Makefile index 76047a0723..89531b7b80 100644 --- a/net/arp-scan/Makefile +++ b/net/arp-scan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:45 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:32 espie Exp $ COMMENT = ARP scanning and fingerprinting tool DISTNAME = arp-scan-1.7 @@ -19,6 +19,6 @@ PERMIT_PACKAGE_FTP = Yes WANTLIB = c pcap CONFIGURE_STYLE = gnu -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/arpd/Makefile b/net/arpd/Makefile index 432281ee8f..9c48c4b1a5 100644 --- a/net/arpd/Makefile +++ b/net/arpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:32 espie Exp $ COMMENT= ARP reply daemon @@ -23,6 +23,6 @@ USE_GROFF = Yes WRKDIST= ${WRKDIR}/arpd -LIB_DEPENDS= ::net/libdnet +LIB_DEPENDS= net/libdnet .include diff --git a/net/arping/Makefile b/net/arping/Makefile index 3b01c039d4..95dcd5f291 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:32 espie Exp $ COMMENT = ARP level ping utility @@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c pcap lib/libnet-1.1/net.=11 +WANTLIB = c pcap lib/libnet-1.1/net=11 MASTER_SITES = http://www.habets.pp.se/synscan/files/ \ http://www.arcane-labs.net/download/OpenBSD/ -LIB_DEPENDS = :libnet->=1.1,<1.2:net/libnet/1.1 +LIB_DEPENDS = libnet->=1.1,<1.2:net/libnet/1.1 CONFIGURE_STYLE = gnu CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libnet-1.1 \ diff --git a/net/avahi/Makefile b/net/avahi/Makefile index abb535c94c..07b14bd233 100755 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2010/11/06 19:05:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2010/11/19 22:31:32 espie Exp $ COMMENT-main= framework for Multicast DNS Service Discovery COMMENT-gtk= GUI client utilities for avahi @@ -54,16 +54,16 @@ MODULES= devel/gettext \ USE_GROFF = Yes -BUILD_DEPENDS= ::converters/xmltoman +BUILD_DEPENDS= converters/xmltoman WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \ gthread-2.0 gdbm daemon dbus-1 \ ${MODGETTEXT_WANTLIB} LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \ - ::devel/glib2 \ - ::databases/gdbm \ - ::devel/libdaemon \ - ::x11/dbus + devel/glib2 \ + databases/gdbm \ + devel/libdaemon \ + x11/dbus # keep in sync with lang/mono/mono.port.mk ONLY_FOR_ARCHS-mono = i386 amd64 @@ -81,10 +81,10 @@ BUILD_MONO = Yes .if ${BUILD_MONO:L} == "yes" MODULES+= lang/mono BUILD_DEPENDS+= ${MODMONO_BUILD_DEPENDS} \ - ::x11/mono-gtk2 + x11/mono-gtk2 RUN_DEPENDS-mono= ${MODMONO_RUN_DEPENDS} \ - ::net/avahi,-gtk,no_qt3,no_qt4 \ - ::x11/mono-gtk2 + net/avahi,-gtk,no_qt3,no_qt4 \ + x11/mono-gtk2 LIB_DEPENDS-mono= # empty WANTLIB-mono= # empty .else @@ -95,17 +95,17 @@ CONFIGURE_ARGS+= --disable-mono \ .if !${FLAVOR:L:Mno_gtk} || ${BUILD_MONO:L} == "yes" MULTI_PACKAGES+= -gtk MODULES+= lang/python -BUILD_DEPENDS+= :python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \ - ::x11/py-gtk2 \ - ::x11/dbus-python +BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \ + x11/py-gtk2 \ + x11/dbus-python LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \ - ::net/avahi + net/avahi RUN_DEPENDS-gtk= ${MODPY_RUN_DEPENDS} \ - :python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \ - ::x11/py-gtk2 \ - ::x11/dbus-python \ - ::devel/py-twisted/web \ - ::devel/desktop-file-utils + lang/python/${MODPY_VERSION},-gdbm \ + x11/py-gtk2 \ + x11/dbus-python \ + devel/py-twisted/web \ + devel/desktop-file-utils WANTLIB-gtk= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \ expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \ @@ -126,7 +126,7 @@ MULTI_PACKAGES+= -qt3 MODULES+= x11/qt3 LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \ ${MODQT3_LIB_DEPENDS} \ - ::net/avahi + net/avahi WANTLIB-qt3= GL ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \ Xinerama Xmu Xrandr Xrender Xt expat fontconfig \ freetype jpeg lcms m mng png pthread-stubs xcb z \ @@ -139,8 +139,8 @@ CONFIGURE_ARGS+= --disable-qt3 MULTI_PACKAGES+= -qt4 MODULES+= x11/qt4 LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \ - ::x11/qt4 \ - ::net/avahi + x11/qt4 \ + net/avahi WANTLIB-qt4= QtCore avahi-common m stdc++ ${MODGETTEXT_WANTLIB} .else CONFIGURE_ARGS+= --disable-qt4 diff --git a/net/axyftp/Makefile b/net/axyftp/Makefile index 329fd342a1..86e0d3c381 100644 --- a/net/axyftp/Makefile +++ b/net/axyftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/19 22:31:32 espie Exp $ COMMENT= ftp client for X window system @@ -25,9 +25,9 @@ FLAVORS= gtk FLAVOR?= .if ${FLAVOR:L:Mgtk} -LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ +LIB_DEPENDS= x11/gtk+ CONFIGURE_ARGS= --with-gui=gtk -WANTLIB+= Xi m glib gmodule iconv intl +WANTLIB+= Xi m glib gmodule iconv intl gtk gdk .else USE_MOTIF= any WANTLIB+= ICE SM Xpm Xt m diff --git a/net/balance/Makefile b/net/balance/Makefile index 8fd7250bad..47ffaf0b60 100644 --- a/net/balance/Makefile +++ b/net/balance/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:45 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:32 espie Exp $ COMMENT= tcp proxy with load balancing and failover mechanisms @@ -22,7 +22,7 @@ MASTER_SITES= http://www.inlab.de/ MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" ALL_TARGET= balance -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/bindgraph/Makefile b/net/bindgraph/Makefile index 305186a1c1..eebc22f2fc 100644 --- a/net/bindgraph/Makefile +++ b/net/bindgraph/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/10/25 12:42:24 pea Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:32 espie Exp $ COMMENT= rrdtool frontend for Bind installation @@ -19,8 +19,8 @@ PERMIT_DISTFILES_FTP= Yes EXTRACT_SUFX= .tgz -RUN_DEPENDS= :p5-RRD-*:net/rrdtool,-perl \ - ::devel/p5-File-Tail +RUN_DEPENDS= net/rrdtool,-perl \ + devel/p5-File-Tail NO_REGRESS= Yes NO_BUILD= Yes diff --git a/net/bird/Makefile b/net/bird/Makefile index 29c006187b..810387b69b 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/15 09:47:26 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:32 espie Exp $ COMMENT-main= bird internet routing daemon COMMENT-doc= bird internet routing daemon (documentation) @@ -39,8 +39,8 @@ PKGNAME-main= bird-$V MASTER_SITES= ftp://bird.network.cz/pub/bird/ -BUILD_DEPENDS= ::devel/m4 \ - ::devel/bison +BUILD_DEPENDS= devel/m4 \ + devel/bison FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/bird diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index 28765d3c24..9119bb762b 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.34 2010/11/19 22:31:32 espie Exp $ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo @@ -27,8 +27,8 @@ EXAMPLEDIR= ${PREFIX}/share/examples/bitlbee DOCS= ${WRKSRC}/doc/user-guide/user-guide.html DOCDIR= ${PREFIX}/share/doc/bitlbee/ -LIB_DEPENDS= ::devel/glib2 \ - ::security/gnutls +LIB_DEPENDS= devel/glib2 \ + security/gnutls CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ --ssl=gnutls USE_GMAKE= Yes -USE_GROFF = Yes +USE_GROFF = Yes MAKE_ENV= "CC=${CC}" "CFLAGS=${CFLAGS}" FAKE_FLAGS= ETCDIR=${EXAMPLEDIR} FAKE_TARGET= install install-etc diff --git a/net/bluetooth-tools/Makefile b/net/bluetooth-tools/Makefile index 7a0351780f..f63159e56a 100644 --- a/net/bluetooth-tools/Makefile +++ b/net/bluetooth-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:32 espie Exp $ COMMENT= bluetooth network tools DISTNAME= bluetooth-tools-20081122 @@ -14,8 +14,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.bsdx.de/openbsd/distfiles/ -WANTLIB= c event usbhid util bluetooth.>=2.0 sdp.>=2.1 -LIB_DEPENDS= ::devel/bluetooth-libs +WANTLIB= c event usbhid util bluetooth>=2.0 sdp>=2.1 +LIB_DEPENDS= devel/bluetooth-libs MAKE_ENV= BINDIR=${TRUEPREFIX}/bin \ SBINDIR=${TRUEPREFIX}/sbin \ diff --git a/net/bnc/Makefile b/net/bnc/Makefile index 03607509b9..540e8c3fbb 100644 --- a/net/bnc/Makefile +++ b/net/bnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2007/09/15 22:36:52 merdely Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:32 espie Exp $ COMMENT= simple IRC relay proxy with support for virtual hosting @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -RUN_DEPENDS= :dialog-*:misc/dialog +RUN_DEPENDS= misc/dialog CONFIGURE_STYLE= gnu pre-configure: diff --git a/net/bro/Makefile b/net/bro/Makefile index 046843a828..f724e05266 100644 --- a/net/bro/Makefile +++ b/net/bro/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:32 espie Exp $ COMMENT= highly flexible sniffer/NIDS @@ -22,12 +22,12 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto m pcap ssl stdc++ termcap z GeoIP.>=5 magic.>=1 +WANTLIB= c crypto m pcap ssl stdc++ termcap z GeoIP>=5 magic>=1 MASTER_SITES= ftp://bro-ids.org/ -LIB_DEPENDS= ::net/GeoIP \ - ::devel/libmagic +LIB_DEPENDS= net/GeoIP \ + devel/libmagic USE_LIBTOOL= Yes CONFIGURE_STYLE=autoconf diff --git a/net/btpd/Makefile b/net/btpd/Makefile index 78632e473b..0bc5ef7b3b 100644 --- a/net/btpd/Makefile +++ b/net/btpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:32 espie Exp $ COMMENT= BitTorrent Protocol Daemon @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto m pthread CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/btpd diff --git a/net/bwm-ng/Makefile b/net/bwm-ng/Makefile index 5c146fbe38..41bbc0c224 100644 --- a/net/bwm-ng/Makefile +++ b/net/bwm-ng/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:32 espie Exp $ COMMENT= realtime bandwidth monitoring of interfaces @@ -19,7 +19,7 @@ WANTLIB= c curses CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-libstatgrab -USE_GROFF = Yes +USE_GROFF = Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bwm-ng diff --git a/net/cadaver/Makefile b/net/cadaver/Makefile index c10a901346..29e9c6d3f8 100644 --- a/net/cadaver/Makefile +++ b/net/cadaver/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:32 espie Exp $ COMMENT= command-line WebDAV client @@ -18,7 +18,7 @@ WANTLIB += z neon MODULES= devel/gettext -LIB_DEPENDS= ::net/neon +LIB_DEPENDS= net/neon MASTER_SITES= ${HOMEPAGE} diff --git a/net/castget/Makefile b/net/castget/Makefile index a1cb3e8181..d473a64370 100644 --- a/net/castget/Makefile +++ b/net/castget/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:32 espie Exp $ COMMENT= command-line podcast downloader @@ -22,10 +22,10 @@ WANTLIB= c crypto idn m ssl stdc++ z pcre id3 glib-2.0 curl xml2 MODULES= devel/gettext -LIB_DEPENDS= ::audio/id3lib \ - ::devel/glib2 \ - ::net/curl \ - ::textproc/libxml +LIB_DEPENDS= audio/id3lib \ + devel/glib2 \ + net/curl \ + textproc/libxml CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-lm -I${LOCALBASE}/include" \ diff --git a/net/charm/Makefile b/net/charm/Makefile index 4b4c1fdb66..1897d274b3 100644 --- a/net/charm/Makefile +++ b/net/charm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:32 espie Exp $ COMMENT= LiveJournal client for Python @@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ljcharm/} MODULES= lang/python -RUN_DEPENDS= :py-feedparser-*:textproc/py-feedparser +RUN_DEPENDS= textproc/py-feedparser USE_GROFF = Yes NO_REGRESS= Yes diff --git a/net/cjc/Makefile b/net/cjc/Makefile index 5adca33024..e8bd5e617d 100644 --- a/net/cjc/Makefile +++ b/net/cjc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/08/30 21:14:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:32 espie Exp $ COMMENT= Jabber client for text terminals @@ -21,7 +21,7 @@ MASTER_SITES= ${HOMEPAGE}downloads/ MODULES= lang/python -RUN_DEPENDS= :py-xmpp-*:net/py-xmpp +RUN_DEPENDS= net/py-xmpp NO_REGRESS= Yes diff --git a/net/coccinella/Makefile b/net/coccinella/Makefile index 7235bbc1ca..a03b510874 100644 --- a/net/coccinella/Makefile +++ b/net/coccinella/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/05 15:17:13 sebastia Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:32 espie Exp $ SHARED_ONLY = Yes @@ -24,16 +24,16 @@ MODULES = x11/tk # No dependencies to sound and telephony yet, due to the reason those # need to be ported to sndio first -RUN_DEPENDS = ::devel/itcl \ - ::graphics/tkpng \ - ::graphics/tkimg \ - ::misc/memchan \ - ::net/tcludp \ - ::security/tcltls \ - ::x11/tkdnd \ - ::x11/tkhtml \ - ::x11/tktray \ - ::x11/tktreectrl +RUN_DEPENDS = devel/itcl \ + graphics/tkpng \ + graphics/tkimg \ + misc/memchan \ + net/tcludp \ + security/tcltls \ + x11/tkdnd \ + x11/tkhtml \ + x11/tktray \ + x11/tktreectrl NO_BUILD = Yes NO_REGRESS = Yes diff --git a/net/crawl/Makefile b/net/crawl/Makefile index cd2e158d27..c3073cb520 100644 --- a/net/crawl/Makefile +++ b/net/crawl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/11/11 11:54:08 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:32 espie Exp $ COMMENT= small and efficient HTTP crawler @@ -18,7 +18,7 @@ WANTLIB= c event lib/db/db.=3 MASTER_SITES= http://www.monkey.org/~provos/ -LIB_DEPENDS= :db->=3,<4:databases/db/v3 +LIB_DEPENDS= db->=3,<4:databases/db/v3 CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-db="${LOCALBASE}" diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile index c935cccbbb..fdebb455d9 100644 --- a/net/ctrace/Makefile +++ b/net/ctrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:32 espie Exp $ COMMENT= multiprotocol traceroute tool @@ -16,9 +16,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}download/ -RUN_DEPENDS= ::devel/p5-List-MoreUtils \ - ::net/p5-Net-RawIP \ - ::www/p5-libwww +RUN_DEPENDS= devel/p5-List-MoreUtils \ + net/p5-Net-RawIP \ + www/p5-libwww BUILD_DEPENDS= ${RUN_DEPENDS} NO_BUILD= Yes diff --git a/net/curl/Makefile b/net/curl/Makefile index 847a9c4d84..a14342c3a2 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.74 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.75 2010/11/19 22:31:32 espie Exp $ COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers @@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= devel/gettext -LIB_DEPENDS= ::devel/libidn +LIB_DEPENDS= devel/libidn WANTLIB= c crypto idn ssl z USE_LIBTOOL= Yes diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index 6f95bad94a..7d76d02ae1 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:32 espie Exp $ ONLY_FOR_ARCHS= i386 COMMENT-main= network file distribution system @@ -30,7 +30,7 @@ MULTI_PACKAGES= -main -server WANTLIB= c m util z -BUILD_DEPENDS= ::lang/ezm3 +BUILD_DEPENDS= lang/ezm3 FLAVORS= no_x11 FLAVOR?= diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile index 42fdc630f6..886e78b5e2 100644 --- a/net/darkstat/Makefile +++ b/net/darkstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:32 espie Exp $ COMMENT= network statistics gatherer with graphs @@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-privdrop-user=_darkstat -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes .include diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile index b31a0e6bc3..ed7ccd9bd0 100644 --- a/net/dc_gui/Makefile +++ b/net/dc_gui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/19 22:31:32 espie Exp $ COMMENT= GUI for dctc (Direct Connect Text Clone) @@ -32,13 +32,13 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext -BUILD_DEPENDS= :dctc->=0.85.9:net/dctc -RUN_DEPENDS= ::devel/desktop-file-utils \ - :dctc->=0.85.9:net/dctc \ - ::x11/gnome/yelp -LIB_DEPENDS= :db->=4,<5:databases/db/v4 \ - ::net/curl \ - ::x11/gnome/libgnomeui +BUILD_DEPENDS= net/dctc>=0.85.9 +RUN_DEPENDS= devel/desktop-file-utils \ + net/dctc>=0.85.9 \ + x11/gnome/yelp +LIB_DEPENDS= db->=4,<5:databases/db/v4 \ + net/curl \ + x11/gnome/libgnomeui USE_LIBTOOL= Yes VMEM_WARNING= Yes diff --git a/net/dclib/Makefile b/net/dclib/Makefile index c0ca6b3b32..1f71442a1c 100644 --- a/net/dclib/Makefile +++ b/net/dclib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:32 espie Exp $ COMMENT= Library for direct-connect protocol @@ -20,8 +20,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_BERLIOS:=dcgui/} MODULES= converters/libiconv -LIB_DEPENDS= ::archivers/bzip2 \ - ::textproc/libxml +LIB_DEPENDS= archivers/bzip2 \ + textproc/libxml WANTLIB= crypto m ssl z bz2 xml2 USE_LIBTOOL= Yes diff --git a/net/dctc/Makefile b/net/dctc/Makefile index f84e29c9a8..6db69c1cbb 100644 --- a/net/dctc/Makefile +++ b/net/dctc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:32 espie Exp $ COMMENT= Direct Connect clone @@ -20,10 +20,10 @@ MODULES= devel/gettext WANTLIB= c gpg-error m pcre pthread z db glib-2.0 gthread-2.0 \ gcrypt xml2 -LIB_DEPENDS= :db->=4,<5:databases/db/v4 \ - ::devel/glib2 \ - ::security/libgcrypt \ - ::textproc/libxml +LIB_DEPENDS= db->=4,<5:databases/db/v4 \ + devel/glib2 \ + security/libgcrypt \ + textproc/libxml USE_LIBTOOL= Yes USE_GROFF = Yes diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile index 7d9008709a..0716ff5481 100644 --- a/net/ddclient/Makefile +++ b/net/ddclient/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/09/07 16:52:50 sebastia Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:32 espie Exp $ COMMENT= Dynamic DNS service update client @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ddclient/} -RUN_DEPENDS= :p5-IO-Socket-SSL-*:security/p5-IO-Socket-SSL +RUN_DEPENDS= security/p5-IO-Socket-SSL NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/dhcping/Makefile b/net/dhcping/Makefile index fdd4d8590c..d256e8b5a5 100644 --- a/net/dhcping/Makefile +++ b/net/dhcping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:32 espie Exp $ COMMENT= dhcp daemon ping program @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu .include diff --git a/net/dlint/Makefile b/net/dlint/Makefile index 820bbecd8c..5f0c96ccd4 100644 --- a/net/dlint/Makefile +++ b/net/dlint/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:32 espie Exp $ COMMENT= DNS zone verification tool @@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.domtools.com/pub/ -USE_GROFF = Yes +USE_GROFF = Yes NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/dnsreflector/Makefile b/net/dnsreflector/Makefile index 34daa2ef6b..3601944e9e 100644 --- a/net/dnsreflector/Makefile +++ b/net/dnsreflector/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:32 espie Exp $ COMMENT= DNS queries reflector @@ -16,7 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/dnstop/Makefile b/net/dnstop/Makefile index 94b93eb988..3586bfe415 100644 --- a/net/dnstop/Makefile +++ b/net/dnstop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:46 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:32 espie Exp $ COMMENT = pcap-based DNS query monitor @@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += c curses pcap -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE = gnu dest HOMEPAGE = http://dns.measurement-factory.com/tools/dnstop/ diff --git a/net/dss/Makefile b/net/dss/Makefile index ff36328c79..b614a41d32 100644 --- a/net/dss/Makefile +++ b/net/dss/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/07/12 22:07:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:32 espie Exp $ BROKEN= security issues @@ -34,7 +34,7 @@ HOMEPAGE= http://dss.macosforge.org/ MULTI_PACKAGES= -server -admin -examples -proxy SUBPACKAGE?= -server -RUN_DEPENDS-admin= :p5-Net-SSLeay->=1.03:security/p5-Net_SSLeay +RUN_DEPENDS-admin= security/p5-Net_SSLeay>=1.03 WRKTMP= ${WRKDIR}/tmp diff --git a/net/dxpc/Makefile b/net/dxpc/Makefile index 5d50595dc1..d129b417cb 100644 --- a/net/dxpc/Makefile +++ b/net/dxpc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/19 22:31:33 espie Exp $ COMMENT = X11 over a low bandwidth link VERSION = 3.8.2 @@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = http://www.vigor.nu/dxpc/${VERSION}/ HOMEPAGE = http://www.vigor.nu/dxpc/ -LIB_DEPENDS = ::archivers/lzo +LIB_DEPENDS = archivers/lzo WANTLIB = c m stdc++ lzo USE_GROFF = Yes diff --git a/net/dysnomia/Makefile b/net/dysnomia/Makefile index 60ece98a98..c064342a91 100644 --- a/net/dysnomia/Makefile +++ b/net/dysnomia/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/07/12 22:08:15 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:33 espie Exp $ CATEGORIES = net audio www COMMENT = interface to the deezer on-demand music system @@ -15,8 +15,8 @@ PERMIT_DISTFILES_FTP = Yes PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -LIB_DEPENDS = ::x11/wxWidgets \ - ::net/curl +LIB_DEPENDS = x11/wxWidgets \ + net/curl WANTLIB = c curl m pthread stdc++ wx_base wx_base_net wx_base_odbc \ wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid \ diff --git a/net/echoping/Makefile b/net/echoping/Makefile index a0396696ba..35f4d2bcc1 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:47 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ COMMENT= test performance of a remote TCP service @@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto m ssl -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes CONFIGURE_STYLE= gnu diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile index 750ea55f31..ea0108e16b 100644 --- a/net/ejabberd/Makefile +++ b/net/ejabberd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/11/06 07:56:48 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/19 22:31:33 espie Exp $ COMMENT= jabber server written in Erlang @@ -23,8 +23,8 @@ WANTLIB= expat crypto ssl z MASTER_SITES= http://www.process-one.net/downloads/ejabberd/$V/ MODULES= converters/libiconv -BUILD_DEPENDS= :erlang->=12b.0:lang/erlang -RUN_DEPENDS= :erlang->=12b.0:lang/erlang +BUILD_DEPENDS= lang/erlang>=12b.0 +RUN_DEPENDS= lang/erlang>=12b.0 MAKE_FLAGS+= EJABBERDDIR=${PREFIX}/lib/ejabberd \ LOGDIR=${EJLOGDIR} \ diff --git a/net/emesene/Makefile b/net/emesene/Makefile index 1d3ad09807..fb5e9f3a74 100644 --- a/net/emesene/Makefile +++ b/net/emesene/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/08/30 21:14:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ COMMENT = client for the Windows Live Messenger chat network @@ -18,10 +18,10 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes MODULES = lang/python -RUN_DEPENDS = ::x11/py-gtk2 \ - ::multimedia/gstreamer-0.10/py-gstreamer \ - :dbus-python-*:x11/dbus-python \ - ::devel/py-notify +RUN_DEPENDS = x11/py-gtk2 \ + multimedia/gstreamer-0.10/py-gstreamer \ + x11/dbus-python \ + devel/py-notify SUBST_VARS = MODPY_SITEPKG diff --git a/net/etherape/Makefile b/net/etherape/Makefile index ec3fb00765..1506f29c9e 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/19 22:31:33 espie Exp $ COMMENT = graphical network monitor @@ -37,13 +37,13 @@ CONFIGURE_STYLE = gnu CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib" -BUILD_DEPENDS = ::textproc/rarian -RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS = ::x11/gtk+2 \ - ::devel/libglade2 \ - ::x11/gnome/libgnomeui +BUILD_DEPENDS = textproc/rarian +RUN_DEPENDS = devel/desktop-file-utils +LIB_DEPENDS = x11/gtk+2 \ + devel/libglade2 \ + x11/gnome/libgnomeui USE_LIBTOOL = Yes -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 1d598d7da5..fd5bd56524 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.50 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes @@ -20,11 +20,11 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += c crypto form menu ncurses panel pcap pthread ssl z -WANTLIB += lib/libnet-1.1/net.=11 ltdl pcre +WANTLIB += lib/libnet-1.1/net=11 ltdl pcre -LIB_DEPENDS= :libnet->=1.1,<1.2:net/libnet/1.1 \ - ::devel/libtool,-ltdl \ - ::devel/pcre +LIB_DEPENDS= libnet->=1.1,<1.2:net/libnet/1.1 \ + devel/libtool,-ltdl \ + devel/pcre FLAVORS= no_x11 FLAVOR?= diff --git a/net/ezstream/Makefile b/net/ezstream/Makefile index 0072b8da0a..2fa732b27d 100644 --- a/net/ezstream/Makefile +++ b/net/ezstream/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:33 espie Exp $ COMMENT= streaming source client that uses external en-/decoders @@ -17,14 +17,14 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c iconv m ogg pthread theora vorbis vorbisfile z \ - shout.>=3 speex.>=4 xml2.>=9 tag_c.>=1 + shout>=3 speex>=4 xml2>=9 tag_c>=1 MASTER_SITES= http://downloads.xiph.org/releases/ezstream/ -LIB_DEPENDS= ::net/libshout \ - ::audio/speex \ - ::textproc/libxml \ - ::audio/taglib +LIB_DEPENDS= net/libshout \ + audio/speex \ + textproc/libxml \ + audio/taglib SEPARATE_BUILD= simple diff --git a/net/farsight2/Makefile b/net/farsight2/Makefile index ec949706df..7af4b33bf4 100644 --- a/net/farsight2/Makefile +++ b/net/farsight2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/24 15:53:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:33 espie Exp $ COMMENT= audio/video communications framework @@ -22,10 +22,10 @@ WANTLIB += z nice util WANTLIB += ${MODPY_WANTLIB} BUILD_DEPENDS= ${RUN_DEPENDS} -LIB_DEPENDS= ::net/libnice \ +LIB_DEPENDS= net/libnice \ ${MODPY_LIB_DEPENDS} -RUN_DEPENDS= :gstreamer-plugins-farsight->=0.12.11p0:multimedia/gstreamer-0.10/plugins-farsight \ - ::multimedia/gstreamer-0.10/py-gstreamer +RUN_DEPENDS= multimedia/gstreamer-0.10/plugins-farsight>=0.12.11p0 \ + multimedia/gstreamer-0.10/py-gstreamer MODULES= devel/gettext \ lang/python diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index c38da4fa58..16000ab83e 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:33 espie Exp $ COMMENT= fast FTP and SFTP GUI client with a lot of features @@ -30,15 +30,15 @@ WANTLIB += idn gnutls.>=13 dbus-1 wx_gtk2_aui wx_base_xml wx_gtk2_adv WANTLIB += wx_gtk2_xrc wx_base_net wx_base wx_gtk2_core MODULES= devel/gettext -LIB_DEPENDS= ::devel/libidn \ - ::security/gnutls \ - ::x11/dbus \ - :wxWidgets-gtk2->=2.8.6:x11/wxWidgets - -BUILD_DEPENDS= ::devel/cppunit \ - ::devel/xdg-utils -RUN_DEPENDS= ::devel/desktop-file-utils \ - ::devel/xdg-utils +LIB_DEPENDS= devel/libidn \ + security/gnutls \ + x11/dbus \ + x11/wxWidgets>=2.8.6 + +BUILD_DEPENDS= devel/cppunit \ + devel/xdg-utils +RUN_DEPENDS= devel/desktop-file-utils \ + devel/xdg-utils SEPARATE_BUILD= concurrent CONFIGURE_STYLE=gnu diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile index af9c03f1c6..831c84564f 100644 --- a/net/firewalk/Makefile +++ b/net/firewalk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.33 2010/11/19 22:31:33 espie Exp $ COMMENT= gateway acl scanner (via static-source port traceroute) @@ -11,8 +11,8 @@ MASTER_SITES= http://spacehopper.org/mirrors/ #HOMEPAGE= http://www.packetfactory.net/projects/firewalk/ -LIB_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 -WANTLIB= c pcap lib/libnet-1.0/net.=0 +LIB_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 +WANTLIB= c pcap lib/libnet-1.0/net=0 # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/flickcurl/Makefile b/net/flickcurl/Makefile index 4065093ada..930b83c81e 100644 --- a/net/flickcurl/Makefile +++ b/net/flickcurl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/08 21:29:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:33 espie Exp $ COMMENT = flickr API library and utility @@ -19,18 +19,18 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/gettext -WANTLIB = c crypto curl.>=10 idn.>=16 m raptor.>=2 ssl \ - xml2.>=9 xslt z +WANTLIB = c crypto curl>=10 idn>=16 m raptor>=2 ssl \ + xml2>=9 xslt z MASTER_SITES = http://download.dajobe.org/flickcurl/ USE_LIBTOOL = Yes USE_GROFF = Yes -LIB_DEPENDS = ::net/curl \ - ::devel/libidn \ - ::textproc/libxml,-main \ - ::textproc/raptor +LIB_DEPENDS = net/curl \ + devel/libidn \ + textproc/libxml,-main \ + textproc/raptor CONFIGURE_STYLE = gnu CONFIGURE_ARGS = ${CONFIGURE_SHARED} --with-raptor diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 8c3c0421f8..cf6a8c98d8 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/18 18:36:47 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/19 22:31:33 espie Exp $ SHARED_LIBS += ft 0.0 # .0.0 @@ -35,7 +35,8 @@ CONFIGURE_ARGS+= --localstatedir=/var/flow-tools .if !${FLAVOR:L:Mpgsql} CONFIGURE_ARGS+= --without-postgresql .else -LIB_DEPENDS+= pq::databases/postgresql,-main +WANTLIB += pq +LIB_DEPENDS+= databases/postgresql,-main .endif MAKE_FLAGS+= "SUBDIRS=lib src bin configs docs" @@ -43,7 +44,7 @@ FAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/flow-tools USE_GMAKE= Yes USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes PYTHON_SCRIPTS= bin/flow-log2rrd \ bin/flow-rpt2rrd \ diff --git a/net/flowd/Makefile b/net/flowd/Makefile index 015940d53d..db90cabf0b 100644 --- a/net/flowd/Makefile +++ b/net/flowd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:47 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:33 espie Exp $ COMMENT= NetFlow collector @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes CONFIGURE_STYLE= gnu diff --git a/net/fping/Makefile b/net/fping/Makefile index 2d1f115104..9e79472359 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/18 18:36:47 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2010/11/19 22:31:33 espie Exp $ # $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $ COMMENT = quickly ping N hosts w/o flooding the network @@ -28,7 +28,7 @@ MASTER_SITES = http://spacehopper.org/mirrors/ CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --bindir=${PREFIX}/sbin COPTS += -DHAVE_PROGNAME -USE_GROFF = Yes +USE_GROFF = Yes post-build: cd ${WRKSRC}; \ diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index e6c3516338..cf3ca2ba72 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2010/11/11 11:54:09 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes SHARED_LIBS += freeradius-radius 4.0 # .0.0 @@ -73,10 +73,10 @@ USE_LIBTOOL= gnu USE_GROFF = Yes BUILD_DEPENDS= ::net/net-snmp -LIB_DEPENDS-main = ::databases/gdbm \ - ::devel/libtool,-ltdl +LIB_DEPENDS-main = databases/gdbm \ + devel/libtool,-ltdl WANTLIB-main= ${WANTLIB} c com_err krb5 pcap pthread readline \ - termcap gdbm.>=3 ltdl.>=4 + termcap gdbm>=3 ltdl>=4 PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_iodbc FLAVOR?= @@ -85,44 +85,44 @@ FLAVOR?= CONFIGURE_ARGS+= --without-rlm_sql_iodbc .else MULTI_PACKAGES+= -iodbc -BUILD_DEPENDS+= ::databases/iodbc +BUILD_DEPENDS+= databases/iodbc CONFIGURE_ARGS+= --with-rlm_sql_iodbc -LIB_DEPENDS-iodbc= ::databases/iodbc -WANTLIB-iodbc= iodbc.>=2 +LIB_DEPENDS-iodbc= databases/iodbc +WANTLIB-iodbc= iodbc>=2 .endif .if ${FLAVOR:L:Mno_ldap} CONFIGURE_ARGS+= --without-rlm_ldap .else MULTI_PACKAGES+= -ldap -BUILD_DEPENDS+= :openldap-client-*:databases/openldap -LIB_DEPENDS-ldap= :openldap-client-*:databases/openldap \ - ::${BASE_PKGPATH} +BUILD_DEPENDS+= databases/openldap +LIB_DEPENDS-ldap= databases/openldap \ + ${BASE_PKGPATH} WANTLIB-ldap= ${WANTLIB} sasl2 asn1 com_err gssapi krb5 \ - lber.>=8 ldap_r.>=8 freeradius-radius.>=1 + lber>=8 ldap_r>=8 freeradius-radius>=1 .endif .if ${FLAVOR:L:Mno_mysql} CONFIGURE_ARGS+= --without-rlm_sql_mysql .else MULTI_PACKAGES+= -mysql -BUILD_DEPENDS+= :mysql-client-*:databases/mysql -LIB_DEPENDS-mysql= :mysql-client-*:databases/mysql -WANTLIB-mysql= ${WANTLIB} m pthread z mysqlclient_r.>=16 +BUILD_DEPENDS+= databases/mysql +LIB_DEPENDS-mysql= databases/mysql +WANTLIB-mysql= ${WANTLIB} m pthread z mysqlclient_r>=16 .endif .if ${FLAVOR:L:Mno_pgsql} CONFIGURE_ARGS+= --without-rlm_sql_postgresql .else MULTI_PACKAGES+= -pgsql -BUILD_DEPENDS+= :postgresql-client-*:databases/postgresql +BUILD_DEPENDS+= databases/postgresql CONFIGURE_ARGS+= --with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql -LIB_DEPENDS-pgsql= :postgresql-client-*:databases/postgresql -WANTLIB-pgsql= pq.>=2 +LIB_DEPENDS-pgsql= databases/postgresql +WANTLIB-pgsql= pq>=2 .endif .for i in ${MULTI_PACKAGES:N-main} -RUN_DEPENDS$i += :freeradius-$V:net/freeradius +RUN_DEPENDS$i += freeradius-$V:net/freeradius .endfor post-configure: diff --git a/net/freetalk/Makefile b/net/freetalk/Makefile index f8a5efb0fb..eb1e1109ea 100644 --- a/net/freetalk/Makefile +++ b/net/freetalk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 14:00:44 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:33 espie Exp $ COMMENT= console based Jabber client @@ -18,13 +18,13 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c glib-2.0 gmp idn ltdl m ncurses pthread readline stdc++ \ - guile loudmouth-1.>=3 + guile loudmouth-1>=3 MASTER_SITES= ${MASTER_SITE_SAVANNAH:=freetalk/} MODULES= devel/gettext -LIB_DEPENDS= ::lang/guile \ - ::net/loudmouth +LIB_DEPENDS= lang/guile \ + net/loudmouth AUTOCONF_VERSION= 2.61 CONFIGURE_STYLE= gnu autoconf no-autoheader diff --git a/net/gajim/Makefile b/net/gajim/Makefile index 67943d5433..63a0917e0e 100644 --- a/net/gajim/Makefile +++ b/net/gajim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2010/11/10 08:04:15 pea Exp $ +# $OpenBSD: Makefile,v 1.45 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes @@ -32,15 +32,15 @@ MODULES= lang/python \ textproc/intltool BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::databases/py-sqlite2 \ - ::devel/desktop-file-utils \ - ::net/py-dns \ - :dbus-python-*:x11/dbus-python \ - ::x11/py-gtk2 \ - ::security/py-openssl \ - ::security/py-crypto \ - :avahi-gtk-*:net/avahi,-gtk,no_mono,no_qt3,no_qt4 \ - ::textproc/gtkspell \ - ::net/farsight2 +RUN_DEPENDS= databases/py-sqlite2 \ + devel/desktop-file-utils \ + net/py-dns \ + x11/dbus-python \ + x11/py-gtk2 \ + security/py-openssl \ + security/py-crypto \ + net/avahi,-gtk,no_mono,no_qt3,no_qt4 \ + textproc/gtkspell \ + net/farsight2 .include diff --git a/net/galago-daemon/Makefile b/net/galago-daemon/Makefile index b5f552c59f..3f19759314 100644 --- a/net/galago-daemon/Makefile +++ b/net/galago-daemon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/11 14:00:44 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:33 espie Exp $ COMMENT= galago presence daemon @@ -18,9 +18,9 @@ MASTER_SITES= http://www.galago-project.org/files/releases/source/galago-daemon WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 iconv intl \ pthread galago -LIB_DEPENDS= ::net/libgalago +LIB_DEPENDS= net/libgalago BUILD_DEPENDS= ${REGRESS_DEPENDS} -REGRESS_DEPENDS= ::devel/check +REGRESS_DEPENDS= devel/check USE_GMAKE= Yes USE_LIBTOOL= Yes diff --git a/net/gftp/Makefile b/net/gftp/Makefile index c37ce9afce..57c32d3e96 100755 --- a/net/gftp/Makefile +++ b/net/gftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2010/11/11 14:00:44 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/19 22:31:33 espie Exp $ COMMENT= multithreaded gtk2 file transfer client @@ -35,21 +35,21 @@ FLAVOR?= MODULES= devel/gettext USE_GROFF = Yes -BUILD_DEPENDS= ::devel/bison +BUILD_DEPENDS= devel/bison .if ${FLAVOR:L:Mno_x11} -LIB_DEPENDS += ::devel/glib2 -WANTLIB += glib-2.0.>=1803 +LIB_DEPENDS += devel/glib2 +WANTLIB += glib-2.0>=1803 CONFIGURE_ARGS +=--disable-gtkport .else -LIB_DEPENDS+= ::x11/gtk+2 -RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils +LIB_DEPENDS+= x11/gtk+2 +RUN_DEPENDS+= devel/desktop-file-utils WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-render-util -WANTLIB += z gdk_pixbuf-2.0 gtk-x11-2.0.>=600.10 gdk-x11-2.0.>=600.0 +WANTLIB += z gdk_pixbuf-2.0 gtk-x11-2.0>=600.10 gdk-x11-2.0>=600.0 .endif .include diff --git a/net/gloox/Makefile b/net/gloox/Makefile index 70823eedba..813f436e87 100644 --- a/net/gloox/Makefile +++ b/net/gloox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/07/29 06:31:15 sebastia Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:33 espie Exp $ COMMENT = extensible C++ library for XMPP clients and components @@ -22,7 +22,7 @@ MODULES = devel/gettext gcc3 MODGCC3_ARCHES = sparc MODGCC3_LANGS = c++ WANTLIB = idn m stdc++ ssl crypto z -LIB_DEPENDS = ::devel/libidn +LIB_DEPENDS = devel/libidn USE_GMAKE = Yes USE_LIBTOOL = Yes diff --git a/net/gmudix/Makefile b/net/gmudix/Makefile index af1d978fc9..28b66fcc00 100644 --- a/net/gmudix/Makefile +++ b/net/gmudix/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:33 espie Exp $ COMMENT= GNOME MUD/Moo Client @@ -25,8 +25,8 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += gdk-x11-2.0 gtk-x11-2.0 -LIB_DEPENDS= ::devel/glib2 \ - ::x11/gtk+2 +LIB_DEPENDS= devel/glib2 \ + x11/gtk+2 MODULES= devel/gettext diff --git a/net/gnaughty/Makefile b/net/gnaughty/Makefile index 686e55f3dc..8f4454e810 100644 --- a/net/gnaughty/Makefile +++ b/net/gnaughty/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/27 22:26:32 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:33 espie Exp $ COMMENT= fast and easy porn downloader @@ -28,10 +28,10 @@ WANTLIB += glade-2.0 curl xml2 GL Xxf86vm drm xcb-render xcb-shm MODULES= devel/gconf2 \ devel/gettext -LIB_DEPENDS= ::devel/libglade2 \ - ::net/curl \ - ::textproc/libxml -RUN_DEPENDS= ::devel/desktop-file-utils +LIB_DEPENDS= devel/libglade2 \ + net/curl \ + textproc/libxml +RUN_DEPENDS= devel/desktop-file-utils DESKTOP_FILES= Yes MODGCONF2_SCHEMAS_DIR= gnaughty diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 70731533dd..5aade06f84 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:33 espie Exp $ COMMENT= simple network library @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes MODULES= devel/gettext \ x11/gnome -LIB_DEPENDS= ::devel/glib2 +LIB_DEPENDS= devel/glib2 WANTLIB= pcre glib-2.0 gthread-2.0 diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile index 63417bfc3f..d6e76ad662 100644 --- a/net/gnugk/Makefile +++ b/net/gnugk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes @@ -21,10 +21,10 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/} WANTLIB= SDL avutil c crypto expat lber ldap ldap_r m \ - pt pthread sasl2 ssl stdc++ h323.>=3 sqlite3.>=12 + pt pthread sasl2 ssl stdc++ h323>=3 sqlite3>=12 -LIB_DEPENDS= ::net/h323plus \ - ::databases/sqlite3 +LIB_DEPENDS= net/h323plus \ + databases/sqlite3 USE_GMAKE= Yes USE_GROFF = Yes @@ -47,16 +47,16 @@ FLAVORS= mysql pgsql FLAVOR?= .if ${FLAVOR:L:Mmysql} -WANTLIB+= z mysqlclient.>=18 -LIB_DEPENDS+= ::databases/mysql +WANTLIB+= z mysqlclient>=18 +LIB_DEPENDS+= databases/mysql CONFIGURE_ARGS+=--enable-mysql .else CONFIGURE_ARGS+=--disable-mysql .endif .if ${FLAVOR:L:Mpgsql} -WANTLIB += pq.>=5 -LIB_DEPENDS+= ::databases/postgresql +WANTLIB += pq>=5 +LIB_DEPENDS+= databases/postgresql CONFIGURE_ARGS+=--enable-pgsql \ --with-pgsql-lib-dir=${LOCALBASE}/lib \ --with-pgsql-include-dir=${LOCALBASE}/include/postgresql diff --git a/net/gotthard/Makefile b/net/gotthard/Makefile index 638a41a773..008b06abdc 100644 --- a/net/gotthard/Makefile +++ b/net/gotthard/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:47 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:33 espie Exp $ COMMENT= ssh through https proxy tunnel @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes post-extract: diff --git a/net/gsnmp/Makefile b/net/gsnmp/Makefile index 6cff539930..551eb9d4d1 100644 --- a/net/gsnmp/Makefile +++ b/net/gsnmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:33 espie Exp $ COMMENT= SNMP library based on glib2 and gnet @@ -18,7 +18,7 @@ WANTLIB += c glib-2.0 gthread-2.0 pcre pthread gnet-2.0 MODULES= devel/gettext -LIB_DEPENDS= ::net/gnet +LIB_DEPENDS= net/gnet USE_LIBTOOL= Yes USE_GROFF = Yes diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index ba233b0eac..af68ee1fbb 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.51 2010/11/19 22:31:33 espie Exp $ COMMENT= Gtk-based GUI client for the Gnutella Network @@ -24,9 +24,9 @@ WANTLIB += gtk-x11-2.0 gthread-2.0 pthread xcb-render xcb-render-util MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/} EXTRACT_SUFX= .tar.bz2 -LIB_DEPENDS= ::x11/gtk+2 \ - ::textproc/libxml -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils +LIB_DEPENDS= x11/gtk+2 \ + textproc/libxml +RUN_DEPENDS= devel/desktop-file-utils MODULES= devel/gettext diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile index cdc1a04998..cd2924019a 100644 --- a/net/h323plus/Makefile +++ b/net/h323plus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes @@ -27,12 +27,12 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/source/download/ WANTLIB += SDL c crypto expat lber ldap ldap_r m sasl2 -WANTLIB += ssl pt.>=3 avutil.>=6 speex.>=4 gsm.>=1 +WANTLIB += ssl pt>=3 avutil>=6 speex>=4 gsm>=1 -LIB_DEPENDS= ::devel/ptlib \ - ::graphics/ffmpeg \ - ::audio/speex \ - ::audio/gsm +LIB_DEPENDS= devel/ptlib \ + graphics/ffmpeg \ + audio/speex \ + audio/gsm WRKDIST= ${WRKDIR}/h323plus diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 37f16d7322..b1b519e59c 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ COMMENT = reliable, high performance TCP/HTTP load balancer @@ -30,7 +30,7 @@ MAKE_FLAGS += CC="${CC}" LD="${CC}" USE_GROFF = Yes NO_REGRESS = Yes -LIB_DEPENDS = ::devel/pcre +LIB_DEPENDS = devel/pcre DOCS = architecture configuration gpl haproxy-en haproxy-fr lgpl EXAMPLES = acl-content-sw content-sw-sample haproxy \ diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile index 8f000eefdb..4fb765656f 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY= Yes @@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c edit event m ncurses pcap pthread util z -WANTLIB += ${MODPY_WANTLIB} dnet.>=1 pcre.>=1 eventextra.>=1 +WANTLIB += ${MODPY_WANTLIB} dnet>=1 pcre>=1 eventextra>=1 .if ${MACHINE_ARCH} == "sparc64" PATCH_LIST= patch-* align-* @@ -30,11 +30,11 @@ USE_LIBTOOL= Yes USE_GROFF = Yes MODULES= lang/python -LIB_DEPENDS= ::net/libdnet \ +LIB_DEPENDS= net/libdnet \ ${MODPY_LIB_DEPENDS} \ - ::devel/pcre \ - ::devel/libeventextra -RUN_DEPENDS= ::net/rrdtool + devel/pcre \ + devel/libeventextra +RUN_DEPENDS= net/rrdtool CONFIGURE_STYLE=gnu CONFIGURE_ENV= PATH_PYTHON=${MODPY_BIN} \ diff --git a/net/hpodder/Makefile b/net/hpodder/Makefile index a3d1bcda17..53591a2508 100644 --- a/net/hpodder/Makefile +++ b/net/hpodder/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:33 espie Exp $ COMMENT = command line podcast aggregator @@ -18,16 +18,16 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c gmp m pthread sqlite3 util MODULES = lang/ghc converters/libiconv -USE_GROFF = Yes +USE_GROFF = Yes MODGHC_BUILD = cabal hackage nort -BUILD_DEPENDS = ::devel/hs-ConfigFile \ - :hs-HaXml->=1.13.2<1.19:textproc/hs-HaXml \ - ::databases/hs-HDBC-sqlite3 -LIB_DEPENDS = ::databases/sqlite3 \ - ::devel/gmp -RUN_DEPENDS = :curl->=7.15.5:net/curl \ - :py-mutagen->=1.9:audio/py-mutagen +BUILD_DEPENDS = devel/hs-ConfigFile \ + hs-HaXml->=1.13.2<1.19:textproc/hs-HaXml \ + databases/hs-HDBC-sqlite3 +LIB_DEPENDS = databases/sqlite3 \ + devel/gmp +RUN_DEPENDS = net/curl>=7.15.5 \ + audio/py-mutagen>=1.9 post-install: ${INSTALL_MAN} ${FILESDIR}/hpodder.1 ${PREFIX}/man/man1 diff --git a/net/hs-HTTP/Makefile b/net/hs-HTTP/Makefile index d1bb5c2ed6..6a77099303 100644 --- a/net/hs-HTTP/Makefile +++ b/net/hs-HTTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/03 22:17:40 kili Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:33 espie Exp $ COMMENT = library for client-side HTTP @@ -18,8 +18,8 @@ MODULES = lang/ghc MODGHC_BUILD = cabal hackage haddock register -LIB_DEPENDS = ::devel/hs-network \ - ::devel/hs-parsec +LIB_DEPENDS = devel/hs-network \ + devel/hs-parsec RUN_DEPENDS = ${LIB_DEPENDS} .include diff --git a/net/hs-network-bytestring/Makefile b/net/hs-network-bytestring/Makefile index ae75db32c6..c2688f353b 100644 --- a/net/hs-network-bytestring/Makefile +++ b/net/hs-network-bytestring/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/03 22:17:40 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:33 espie Exp $ COMMENT = socket functions that use Data.ByteString @@ -18,7 +18,7 @@ MODULES = lang/ghc MODGHC_BUILD = cabal hackage haddock register -RUN_DEPENDS += ::devel/hs-network +RUN_DEPENDS += devel/hs-network BUILD_DEPENDS += ${RUN_DEPENDS} .include diff --git a/net/hs-pb/Makefile b/net/hs-pb/Makefile index e12402fbcb..f10bd9cb67 100644 --- a/net/hs-pb/Makefile +++ b/net/hs-pb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/09/29 07:13:15 kili Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:33 espie Exp $ COMMENT= pastebin command line application @@ -21,9 +21,9 @@ MODULES= converters/libiconv \ MODGHC_BUILD = cabal hackage nort -BUILD_DEPENDS += ::devel/hs-network \ - ::net/hs-HTTP +BUILD_DEPENDS += devel/hs-network \ + net/hs-HTTP -LIB_DEPENDS= ::devel/gmp +LIB_DEPENDS= devel/gmp .include diff --git a/net/icecast/Makefile b/net/icecast/Makefile index 17c059f562..10d33a075c 100644 --- a/net/icecast/Makefile +++ b/net/icecast/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2010/11/11 11:15:26 edd Exp $ +# $OpenBSD: Makefile,v 1.41 2010/11/19 22:31:33 espie Exp $ COMMENT= server for streaming various media formats @@ -16,8 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c curl.>=2 crypto idn m ogg pthread speex.>=3 ssl theora.>=1 -WANTLIB += vorbis.>=3 xml2 xslt.>=3 z +WANTLIB += c curl>=2 crypto idn m ogg pthread speex>=3 ssl theora>=1 +WANTLIB += vorbis>=3 xml2 xslt>=3 z MASTER_SITES= http://downloads.xiph.org/releases/icecast/ @@ -29,11 +29,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LIBTOOL= Yes -LIB_DEPENDS = ::net/curl \ - ::textproc/libxslt \ - ::audio/libvorbis \ - ::audio/speex \ - ::multimedia/libtheora +LIB_DEPENDS = net/curl \ + textproc/libxslt \ + audio/libvorbis \ + audio/speex \ + multimedia/libtheora SEPARATE_BUILD= simple diff --git a/net/ices/Makefile b/net/ices/Makefile index 6c554981a7..89c5162b73 100644 --- a/net/ices/Makefile +++ b/net/ices/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:33 espie Exp $ COMMENT= icecast source for streaming MP3 @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB = c m ogg perl pthread theora util vorbis vorbisfile z WANTLIB += ${MODPY_WANTLIB} -WANTLIB += mp3lame shout.>=3 speex.>=4 FLAC.>=5 xml2.>=7 +WANTLIB += mp3lame shout>=3 speex>=4 FLAC>=5 xml2>=7 MASTER_SITES= http://downloads.xiph.org/releases/ices/ @@ -30,11 +30,11 @@ CONFIGURE_ARGS= --with-docdir=${LOCALBASE}/share/doc/ices \ --with-flac=${LOCALBASE} MODULES= converters/libiconv -LIB_DEPENDS= ::audio/lame \ - ::net/libshout \ - ::audio/speex \ - ::audio/flac \ - ::textproc/libxml +LIB_DEPENDS= audio/lame \ + net/libshout \ + audio/speex \ + audio/flac \ + textproc/libxml FLAVORS= python mp4 FLAVOR?= @@ -49,8 +49,8 @@ CONFIGURE_ARGS+=--without-python .if ${FLAVOR:L:Mmp4} CONFIGURE_ARGS+=--with-faad=${LOCALBASE} -LIB_DEPENDS+= ::audio/faad \ - ::multimedia/libmp4v2 +LIB_DEPENDS+= audio/faad \ + multimedia/libmp4v2 WANTLIB += faad mp4v2 .else CONFIGURE_ARGS+=--without-faad diff --git a/net/ices2/Makefile b/net/ices2/Makefile index 14d17a3a4f..f6ecb22cd6 100644 --- a/net/ices2/Makefile +++ b/net/ices2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:33 espie Exp $ COMMENT= icecast source for streaming Ogg Vorbis @@ -26,13 +26,13 @@ CONFIGURE_ARGS= --program-suffix=2 --disable-sun-audio USE_LIBTOOL = Yes # Needs AC_PROG_LIBTOOL -BUILD_DEPENDS += ::devel/libtool +BUILD_DEPENDS += devel/libtool MODULES= converters/libiconv WANTLIB= c m ogg pthread sndio theora vorbis vorbisenc z \ - shout.>=3 speex.>=4 xml2.>=9 -LIB_DEPENDS= ::net/libshout \ - ::audio/speex \ - ::textproc/libxml + shout>=3 speex>=4 xml2>=9 +LIB_DEPENDS= net/libshout \ + audio/speex \ + textproc/libxml SEPARATE_BUILD= simple diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile index d877b452d7..8dfc05a21a 100644 --- a/net/ifstat/Makefile +++ b/net/ifstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:33 espie Exp $ COMMENT= tool to monitor interface bandwidth usage @@ -21,7 +21,7 @@ WANTLIB= c MASTER_SITES= ${HOMEPAGE} CONFIGURE_STYLE= gnu dest -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes @@ -29,7 +29,8 @@ FLAVORS= snmp FLAVOR?= .if ${FLAVOR:L} == "snmp" -LIB_DEPENDS= netsnmp.6.2::net/net-snmp +WANTLIB += netsnmp +LIB_DEPENDS= net/net-snmp CONFIGURE_ARGS+= --with-snmp=${LOCALBASE} WANTLIB+= crypto m .else diff --git a/net/iftop/Makefile b/net/iftop/Makefile index c727b36d34..99eb75ee93 100644 --- a/net/iftop/Makefile +++ b/net/iftop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:33 espie Exp $ COMMENT = display bandwidth usage on an inteface @@ -21,7 +21,7 @@ WANTLIB = c curses m pcap pthread MASTER_SITES = ${HOMEPAGE}download/ CONFIGURE_STYLE = gnu dest -USE_GROFF = Yes +USE_GROFF = Yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iftop ${PREFIX}/bin diff --git a/net/ii/Makefile b/net/ii/Makefile index 2bd3ce3e59..0a817ff65a 100644 --- a/net/ii/Makefile +++ b/net/ii/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:33 espie Exp $ COMMENT= minimalist IRC client @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/iodine/Makefile b/net/iodine/Makefile index 776c80dcd6..a39b67ced6 100644 --- a/net/iodine/Makefile +++ b/net/iodine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:33 espie Exp $ COMMENT= tunnel IPv4 data through DNS @@ -18,9 +18,9 @@ MASTER_SITES= ${HOMEPAGE} WANTLIB= c z -USE_GROFF = Yes +USE_GROFF = Yes MAKE_ENV= CC=${CC} -REGRESS_DEPENDS= ::devel/check +REGRESS_DEPENDS= devel/check REGRESS_TARGET= test .include diff --git a/net/ipaudit/Makefile b/net/ipaudit/Makefile index 1c66841a73..a23f1f9544 100644 --- a/net/ipaudit/Makefile +++ b/net/ipaudit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:33 espie Exp $ COMMENT= IP traffic summarizer @@ -19,7 +19,7 @@ WANTLIB= c m pcap EXTRACT_SUFX= .tgz -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/ipcad/Makefile b/net/ipcad/Makefile index f4324615ac..39ecfeecaa 100644 --- a/net/ipcad/Makefile +++ b/net/ipcad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:33 espie Exp $ # $RuOBSD: Makefile,v 1.1.1.1 2002/04/08 02:46:36 form Exp $ COMMENT= IP accounting daemon simulating Cisco ip accounting @@ -18,7 +18,7 @@ WANTLIB= c pcap pthread MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ipcad/} CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes diff --git a/net/ipfm/Makefile b/net/ipfm/Makefile index 2be2ba34c7..31f0feb81d 100644 --- a/net/ipfm/Makefile +++ b/net/ipfm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:33 espie Exp $ COMMENT = IP bandwidth analysis tool @@ -19,7 +19,7 @@ MASTER_SITES = ${HOMEPAGE}archive/ EXTRACT_SUFX = .tgz CONFIGURE_STYLE = gnu -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS = Yes diff --git a/net/ipfreely/Makefile b/net/ipfreely/Makefile index 05d7b7801b..32440be6b6 100644 --- a/net/ipfreely/Makefile +++ b/net/ipfreely/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:33 espie Exp $ COMMENT= simple, secure TCP proxy daemon @@ -21,7 +21,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ipfreely/} WRKDIST= ${WRKDIR}/ipfreely WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/ipsvd/Makefile b/net/ipsvd/Makefile index da7338d790..9b4f628f5d 100644 --- a/net/ipsvd/Makefile +++ b/net/ipsvd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:48 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:33 espie Exp $ COMMENT= set of internet protocol service daemons for Unix @@ -24,7 +24,7 @@ DOCS= benefits.html ipsvd-cdb.8.html tcpsvd.8.html \ examples.html ipsvd-instruct.5.html udpsvd.8.html \ index.html ipsvd.7.html upgrade.html install.html PKGDOCS= CHANGES README COPYING -USE_GROFF = Yes +USE_GROFF = Yes pre-build: echo "${CC} ${CFLAGS} ${COPTS}" > ${WRKSRC}/conf-cc diff --git a/net/ircd-hybrid/Makefile b/net/ircd-hybrid/Makefile index 1b3a79605f..3e61489b4f 100644 --- a/net/ircd-hybrid/Makefile +++ b/net/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/13 06:52:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY = Yes @@ -21,7 +21,7 @@ EXTRACT_SUFX = .tgz WANTLIB = c crypto ssl z pcre -LIB_DEPENDS = ::devel/pcre +LIB_DEPENDS = devel/pcre CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/ircd-ratbox/Makefile b/net/ircd-ratbox/Makefile index 44ce8c09ba..3bf395b2ce 100644 --- a/net/ircd-ratbox/Makefile +++ b/net/ircd-ratbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/09 11:56:17 jasper Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:33 espie Exp $ SHARED_ONLY = Yes COMMENT = advanced, stable and fast irc server @@ -22,8 +22,8 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c crypto ltdl sqlite3 ssl z -LIB_DEPENDS = ::databases/sqlite3 \ - :libltdl-*:devel/libtool,-ltdl +LIB_DEPENDS = databases/sqlite3 \ + devel/libtool,-ltdl USE_LIBTOOL = Yes NO_REGRESS = Yes diff --git a/net/irssi-icb/Makefile b/net/irssi-icb/Makefile index 38a43a17dd..a47ee7b136 100644 --- a/net/irssi-icb/Makefile +++ b/net/irssi-icb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/11/02 21:28:00 steven Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -12,9 +12,9 @@ CATEGORIES= net BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ - ::net/irssi:configure \ - ::devel/glib2 -RUN_DEPENDS= :irssi-*:net/irssi + net/irssi:configure \ + devel/glib2 +RUN_DEPENDS= net/irssi # GPL PERMIT_PACKAGE_CDROM= Yes @@ -24,7 +24,7 @@ PERMIT_DISTFILES_FTP= Yes # Needs AC_PROG_LIBTOOL USE_LIBTOOL = Yes -BUILD_DEPENDS += ::devel/libtool +BUILD_DEPENDS += devel/libtool LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu AUTOCONF_VERSION=2.61 diff --git a/net/irssi-silc/Makefile b/net/irssi-silc/Makefile index 06f3be5485..1d2ef183f2 100644 --- a/net/irssi-silc/Makefile +++ b/net/irssi-silc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -21,12 +21,12 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://martynas.blarzwurst.de/distfiles/ -BUILD_DEPENDS= ::devel/gettext \ - ::devel/glib2 +BUILD_DEPENDS= devel/gettext \ + devel/glib2 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= :yasm-*:devel/yasm +BUILD_DEPENDS+= devel/yasm .endif -RUN_DEPENDS= :irssi->=0.8.15:net/irssi +RUN_DEPENDS= net/irssi>=0.8.15 MAKE_FLAGS= libfe_common_silc_la_LDFLAGS=-avoid-version \ libsilc_core_la_LDFLAGS=-avoid-version diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 91ccba8a11..fec22a6d42 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.47 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -23,7 +23,7 @@ WANTLIB= c crypto m ncurses perl ssl util pcre glib-2.0 gmodule-2.0 MODULES= devel/gettext -LIB_DEPENDS= ::devel/glib2 +LIB_DEPENDS= devel/glib2 USE_LIBTOOL= Yes USE_GROFF = Yes diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 0d583a1528..6ffb514d22 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/19 22:31:34 espie Exp $ COMMENT-main= ISC DHCP Server COMMENT-client= ISC DHCP Client @@ -29,7 +29,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes MULTI_PACKAGES= -main -omapi -client diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile index a2d2b6ac8f..f9beb77e16 100644 --- a/net/jabberd/Makefile +++ b/net/jabberd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2010/11/11 14:00:45 espie Exp $ +# $OpenBSD: Makefile,v 1.39 2010/11/19 22:31:34 espie Exp $ COMMENT= jabber server DISTNAME= jabberd-2.0s11 @@ -33,7 +33,7 @@ FLAVORS= ${STORAGES} ldap FLAVOR?= mysql USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --localstatedir=/var \ --enable-debug \ @@ -45,24 +45,24 @@ EXTRA_INCLUDE_PATH= ${LOCALBASE}/include EXTRA_LIBRARY_PATH= ${LOCALBASE}/lib .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= ::databases/mysql -WANTLIB += lib/mysql/mysqlclient.>=10 +LIB_DEPENDS+= databases/mysql +WANTLIB += lib/mysql/mysqlclient>=10 CONFIGURE_ARGS+= --enable-mysql .else CONFIGURE_ARGS+= --disable-mysql .endif .if ${FLAVOR:L:Mpostgresql} -LIB_DEPENDS+= ::databases/postgresql -WANTLIB += pq.>=4 +LIB_DEPENDS+= databases/postgresql +WANTLIB += pq>=4 CONFIGURE_ARGS+= --enable-pgsql .else CONFIGURE_ARGS+= --disable-pgsql .endif .if ${FLAVOR:L:Mdb} -LIB_DEPENDS+= ::databases/db/v4 -WANTLIB += lib/db4/db.>=4 +LIB_DEPENDS+= databases/db/v4 +WANTLIB += lib/db4/db>=4 CONFIGURE_ARGS+= --enable-db EXTRA_INCLUDE_PATH:= ${EXTRA_INCLUDE_PATH}:${LOCALBASE}/include/db4 .else @@ -70,8 +70,8 @@ CONFIGURE_ARGS+= --disable-db .endif .if ${FLAVOR:L:Mldap} -LIB_DEPENDS+= :openldap-client->=2.3:databases/openldap -WANTLIB += ldap.>=8 lber.>=8 +LIB_DEPENDS+= databases/openldap>=2.3 +WANTLIB += ldap>=8 lber>=8 CONFIGURE_ARGS+= --enable-ldap WANTLIB+= sasl2 asn1 com_err gssapi krb5 .else diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 49568fa157..97a601cee7 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/11/11 14:11:34 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2010/11/19 22:31:34 espie Exp $ # Much help came from Alexandre Anriot, Robert Nagy, Bernd Ahlers, # and, last but not least, Pedro la Peu. @@ -55,9 +55,9 @@ MULTI_PACKAGES= -main WANTLIB-main= c m ncurses panel pcap stdc++ WANTLIB-gpsmap= c expat freetype m pthread stdc++ z \ - MagickCore.>=1 MagickWand.>=1 gmp.>=6 -LIB_DEPENDS-gpsmap= ::graphics/ImageMagick \ - ::devel/gmp + MagickCore>=1 MagickWand>=1 gmp>=6 +LIB_DEPENDS-gpsmap= graphics/ImageMagick \ + devel/gmp .if !${FLAVOR:L:Mno_gpsmap} MULTI_PACKAGES+= -gpsmap diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile index a783e1306c..e733d63bfe 100644 --- a/net/ktorrent/Makefile +++ b/net/ktorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -25,14 +25,14 @@ WANTLIB= art_lgpl_2 jpeg GL ICE SM X11 Xau Xcursor Xdmcp Xext \ Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt c dbus-1 \ expat fontconfig freetype lcms m mng pcre pcreposix \ png pthread pthread-stubs stdc++ util xcb z idn fam rpcsvc \ - kdecore.>=6 DCOP kdefx kdeprint kdesu kparts kdeui khtml \ - kio kjs kutils kwalletclient gmp.>=4 avahi-client \ + kdecore>=6 DCOP kdefx kdeprint kdesu kparts kdeui khtml \ + kio kjs kutils kwalletclient gmp>=4 avahi-client \ avahi-common avahi-qt3 -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= ::x11/kde/libs3 \ - ::devel/gmp \ - ::net/avahi \ - ::net/avahi,-qt3,no_gtk,no_mono,no_qt4 +RUN_DEPENDS= devel/desktop-file-utils +LIB_DEPENDS= x11/kde/libs3 \ + devel/gmp \ + net/avahi \ + net/avahi,-qt3,no_gtk,no_mono,no_qt4 SUBST_VARS+= VERSION diff --git a/net/ladvd/Makefile b/net/ladvd/Makefile index 0301ff74dc..87a1cc54d1 100644 --- a/net/ladvd/Makefile +++ b/net/ladvd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:34 espie Exp $ COMMENT = link advertisement (LLDP/CDP etc) daemon @@ -20,12 +20,12 @@ MASTER_SITES = ${HOMEPAGE} AUTOCONF_VERSION = 2.64 CONFIGURE_STYLE = gnu autoconf CONFIGURE_ARGS += --with-user=_ladvd --with-chroot-dir=/var/empty -USE_GROFF = Yes +USE_GROFF = Yes WANTLIB = c event # enables regression tests; GNU configure script enables them # only if devel/check is available at build time -BUILD_DEPENDS = ::devel/check +BUILD_DEPENDS = devel/check .include diff --git a/net/ldns/drill/Makefile b/net/ldns/drill/Makefile index a65fa84385..294c961dd5 100644 --- a/net/ldns/drill/Makefile +++ b/net/ldns/drill/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/10 08:28:33 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:34 espie Exp $ COMMENT= DNS debugger PKGNAME= drill-${VERSION} -WANTLIB= c crypto ldns.>=4.5 -LIB_DEPENDS+= :libldns->=1.6.7:net/ldns/libldns +WANTLIB= c crypto ldns>=4.5 +LIB_DEPENDS+= net/ldns/libldns>=1.6.7 WRKSRC= ${WRKDIST}/drill diff --git a/net/ldns/utils/Makefile b/net/ldns/utils/Makefile index af7f8472f2..1ad9b374b9 100644 --- a/net/ldns/utils/Makefile +++ b/net/ldns/utils/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/12 07:54:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:34 espie Exp $ COMMENT= LDNS utilities PKGNAME= ldns-utils-${VERSION} REVISION= 0 -WANTLIB= c crypto ldns.>=4.5 pcap -LIB_DEPENDS+= :libldns->=1.6.7:net/ldns/libldns +WANTLIB= c crypto ldns>=4.5 pcap +LIB_DEPENDS+= net/ldns/libldns>=1.6.7 WRKSRC= ${WRKDIST}/examples diff --git a/net/libbgpdump/Makefile b/net/libbgpdump/Makefile index ed7a81bc7b..cbc3d6432b 100644 --- a/net/libbgpdump/Makefile +++ b/net/libbgpdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/29 13:53:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:34 espie Exp $ COMMENT= library to analyze MRT-format BGP dump files @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.ris.ripe.net/source/bgpdump/ WANTLIB= bz2 c z -LIB_DEPENDS= ::archivers/bzip2 +LIB_DEPENDS= archivers/bzip2 CONFIGURE_STYLE= gnu CONFIGURE_ENV= CFLAGS="${CFLAGS}" diff --git a/net/libcares/Makefile b/net/libcares/Makefile index 57fd04010e..027a390ee5 100644 --- a/net/libcares/Makefile +++ b/net/libcares/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:34 espie Exp $ COMMENT= asynchronous resolver library @@ -23,6 +23,6 @@ PERMIT_DISTFILES_FTP= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile index 44b0ed1382..876d8deaf9 100644 --- a/net/libdnet/Makefile +++ b/net/libdnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:34 espie Exp $ COMMENT-main= portable low-level networking library COMMENT-python= python interface to libdnet @@ -34,7 +34,7 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config MULTI_PACKAGES= -main -USE_GROFF = Yes +USE_GROFF = Yes # override python.port.mk's RUN_DEPENDS RUN_DEPENDS-main= @@ -47,7 +47,7 @@ MODULES+= lang/python MULTI_PACKAGES+= -python CONFIGURE_ARGS+= --with-python MAKE_FLAGS= PYTHON=${MODPY_BIN} -REGRESS_DEPENDS= ::net/libdnet,-python +REGRESS_DEPENDS= net/libdnet,-python REGRESS_FLAGS= TESTS_ENVIRONMENT=${MODPY_BIN} WANTLIB-python= .endif diff --git a/net/libgadu/Makefile b/net/libgadu/Makefile index 8e943014db..111d7aa842 100644 --- a/net/libgadu/Makefile +++ b/net/libgadu/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2010/05/13 22:45:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= implementation of Gadu-Gadu IM protocol DISTNAME= libgadu-1.9.0 -PKGNAME= ${DISTNAME}v0 +EPOCH = 0 CATEGORIES= net MASTER_SITES= ${HOMEPAGE}files/ diff --git a/net/libgalago/Makefile b/net/libgalago/Makefile index 3645db9728..3dc4bd1212 100644 --- a/net/libgalago/Makefile +++ b/net/libgalago/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= desktop presence framework @@ -21,8 +21,8 @@ WANTLIB= dbus-1 glib-2.0 gobject-2.0 pcre dbus-glib-1 MODULES= devel/gettext -LIB_DEPENDS= ::x11/dbus-glib -BUILD_DEPENDS= :check->=0.9.5:devel/check +LIB_DEPENDS= x11/dbus-glib +BUILD_DEPENDS= devel/check>=0.9.5 REGRESS_DEPENDS= ${BUILD_DEPENDS} USE_LIBTOOL= Yes diff --git a/net/libnetdude/libnetdude/Makefile b/net/libnetdude/libnetdude/Makefile index 7f92385eac..ed493a4305 100644 --- a/net/libnetdude/libnetdude/Makefile +++ b/net/libnetdude/libnetdude/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:34 espie Exp $ COMMENT= packet manipulation backend of Netdude framework @@ -12,8 +12,8 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -LIB_DEPENDS= ::net/libpcapnav \ - ::devel/glib +LIB_DEPENDS= net/libpcapnav \ + devel/glib # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnetdude/plugins/conntrack/Makefile b/net/libnetdude/plugins/conntrack/Makefile index 9a0e7d26a4..317c8435f7 100644 --- a/net/libnetdude/plugins/conntrack/Makefile +++ b/net/libnetdude/plugins/conntrack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/03 16:18:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= libnetdude plugin for tcp connection tracking @@ -11,10 +11,10 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/libnetdude +RUN_DEPENDS= net/libnetdude/libnetdude BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/libtool,-ltdl + devel/libtool,-ltdl # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnetdude/plugins/demux/Makefile b/net/libnetdude/plugins/demux/Makefile index 4ebd3e3097..7919c6877d 100644 --- a/net/libnetdude/plugins/demux/Makefile +++ b/net/libnetdude/plugins/demux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/03 16:18:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= libnetdude plugin for separating traces into multiple files @@ -11,11 +11,11 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/plugins/conntrack \ - ::net/libnetdude/plugins/traceset +RUN_DEPENDS= net/libnetdude/plugins/conntrack \ + net/libnetdude/plugins/traceset BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/libtool,-ltdl + devel/libtool,-ltdl # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnetdude/plugins/tcpfilter/Makefile b/net/libnetdude/plugins/tcpfilter/Makefile index 8afa3ef23b..ff92bf26ee 100644 --- a/net/libnetdude/plugins/tcpfilter/Makefile +++ b/net/libnetdude/plugins/tcpfilter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/26 18:07:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= libnetdude plugin for pruning incomplete session from traces @@ -11,11 +11,11 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/plugins/conntrack \ - ::net/libnetdude/plugins/traceset +RUN_DEPENDS= net/libnetdude/plugins/conntrack \ + net/libnetdude/plugins/traceset BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/libtool,-ltdl + devel/libtool,-ltdl # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnetdude/plugins/traceset/Makefile b/net/libnetdude/plugins/traceset/Makefile index a26b732362..aea4f8138f 100644 --- a/net/libnetdude/plugins/traceset/Makefile +++ b/net/libnetdude/plugins/traceset/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/03 16:18:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= netdude plugin providing an API for trace sets @@ -11,10 +11,10 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/libnetdude +RUN_DEPENDS= net/libnetdude/libnetdude BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/libtool,-ltdl + devel/libtool,-ltdl # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnetdude/plugins/traffic-analyzer/Makefile b/net/libnetdude/plugins/traffic-analyzer/Makefile index 87b205d2ec..3c57486205 100644 --- a/net/libnetdude/plugins/traffic-analyzer/Makefile +++ b/net/libnetdude/plugins/traffic-analyzer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/03 16:18:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= netdude plugin for traffic analysis @@ -11,11 +11,11 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/plugins/conntrack \ - ::net/libnetdude/plugins/traceset +RUN_DEPENDS= net/libnetdude/plugins/conntrack \ + net/libnetdude/plugins/traceset BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/libtool,-ltdl + devel/libtool,-ltdl # BSD PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libnice/Makefile b/net/libnice/Makefile index 714c9174a8..847d3994ca 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY = Yes @@ -25,7 +25,7 @@ WANTLIB += xml2 z gstbase-0.10 gstreamer-0.10 MODULES = devel/gettext -LIB_DEPENDS = ::multimedia/gstreamer-0.10/core +LIB_DEPENDS = multimedia/gstreamer-0.10/core CONFIGURE_STYLE = gnu CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ diff --git a/net/libnids/Makefile b/net/libnids/Makefile index 0c0900f46c..e9b6ea38b0 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.35 2010/11/19 22:31:34 espie Exp $ COMMENT= network monitoring library with TCP/IP reassembly @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/} HOMEPAGE= http://www.packetfactory.net/projects/libnids/ -BUILD_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 +BUILD_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 # GPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index c6f646dfe2..77e4053b5c 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -32,8 +32,8 @@ USE_GMAKE= Yes MULTI_PACKAGES= -main -gnome -LIB_DEPENDS-gnome= ::${BUILD_PKGPATH},-main \ - ::devel/gconf2 +LIB_DEPENDS-gnome= ${BUILD_PKGPATH},-main \ + devel/gconf2 WANTLIB-main= ICE SM X11 Xau Xdmcp Xext Xmu Xt c m pthread \ pthread-stubs xcb diff --git a/net/librest/Makefile b/net/librest/Makefile index f26cafe219..745047741b 100644 --- a/net/librest/Makefile +++ b/net/librest/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:34 espie Exp $ COMMENT = access web services that claim to be RESTful @@ -26,7 +26,7 @@ USE_LIBTOOL = Yes CONFIGURE_ARGS = --without-gnome MODULES = devel/gettext -LIB_DEPENDS = ::devel/libsoup +LIB_DEPENDS = devel/libsoup WANTLIB += gcrypt gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0 WANTLIB += gpg-error gthread-2.0 m pcre tasn1 xml2 z soup-2.4 diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 669e541e6a..1a99b364ce 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:34 espie Exp $ COMMENT= Library for delta compression of streams DISTNAME= librsync-0.9.7 @@ -14,8 +14,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= ::archivers/bzip2 \ - ::devel/popt +LIB_DEPENDS= archivers/bzip2 \ + devel/popt WANTLIB= c z bz2 popt diff --git a/net/libshout/Makefile b/net/libshout/Makefile index 9220987c50..b23f1715be 100644 --- a/net/libshout/Makefile +++ b/net/libshout/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/19 22:31:34 espie Exp $ COMMENT= library for communicating with an icecast server @@ -21,9 +21,9 @@ WANTLIB= m ogg vorbis.>=4 theora.>=1 MASTER_SITES= http://downloads.xiph.org/releases/libshout/ -BUILD_DEPENDS= ::audio/speex -LIB_DEPENDS= ::audio/libvorbis \ - ::multimedia/libtheora +BUILD_DEPENDS= audio/speex +LIB_DEPENDS= audio/libvorbis \ + multimedia/libtheora FAKE_FLAGS= docdir='${PREFIX}/share/examples/libshout' diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile index f92210639c..a5f93c3ef0 100644 --- a/net/libtorrent/Makefile +++ b/net/libtorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:34 espie Exp $ COMMENT= BitTorrent library written in C++ @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}downloads/ WANTLIB= crypto sigc-2.0 -LIB_DEPENDS= :libsigc++->=2,<3:devel/libsigc++-2 +LIB_DEPENDS= libsigc++->=2,<3:devel/libsigc++-2 USE_LIBTOOL= Yes diff --git a/net/loudmouth/Makefile b/net/loudmouth/Makefile index a4899da38e..a7e4693167 100644 --- a/net/loudmouth/Makefile +++ b/net/loudmouth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/19 22:31:34 espie Exp $ COMMENT= lightweight Jabber client library @@ -15,17 +15,17 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= crypto pcre ssl glib-2.0 idn.>=16 +WANTLIB= crypto pcre ssl glib-2.0 idn>=16 MODULES= devel/gettext MASTER_SITES= ${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} EXTRACT_SUFX= .tar.bz2 -LIB_DEPENDS= ::devel/glib2 \ - ::devel/libidn +LIB_DEPENDS= devel/glib2 \ + devel/libidn BUILD_DEPENDS= ${REGRESS_DEPENDS} -REGRESS_DEPENDS= ::devel/check +REGRESS_DEPENDS= devel/check USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu diff --git a/net/mbrowse/Makefile b/net/mbrowse/Makefile index 084a3eebbc..7539b431c2 100644 --- a/net/mbrowse/Makefile +++ b/net/mbrowse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:34 espie Exp $ COMMENT= graphical MIB browser @@ -19,7 +19,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 -WANTLIB += gdk-x11-2.0 gtk-x11-2.0 netsnmp.>=6.2 +WANTLIB += gdk-x11-2.0 gtk-x11-2.0 netsnmp>=6.2 MODULES= devel/gettext @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-snmp-type=net \ --with-snmp-include=${LOCALBASE}/include \ --with-snmp-lib=${LOCALBASE}/lib -LIB_DEPENDS= ::x11/gtk+2 \ - ::net/net-snmp +LIB_DEPENDS= x11/gtk+2 \ + net/net-snmp .include diff --git a/net/mcabber/Makefile b/net/mcabber/Makefile index ec1fb8f25b..f1190cd325 100644 --- a/net/mcabber/Makefile +++ b/net/mcabber/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -22,18 +22,18 @@ EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext WANTLIB= c crypto gcrypt gpg-error ncurses panel pcre pthread \ - ssl glib-2.0 gmodule-2.0 gpgme loudmouth-1.>=3 \ + ssl glib-2.0 gmodule-2.0 gpgme loudmouth-1>=3 \ idn otr -LIB_DEPENDS= ::devel/glib2 \ - ::security/gpgme \ - ::net/loudmouth \ - ::devel/libidn \ - ::security/libotr -RUN_DEPENDS= ::devel/desktop-file-utils +LIB_DEPENDS= devel/glib2 \ + security/gpgme \ + net/loudmouth \ + devel/libidn \ + security/libotr +RUN_DEPENDS= devel/desktop-file-utils USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --enable-gpgme \ diff --git a/net/meanwhile/Makefile b/net/meanwhile/Makefile index 7f280c8c03..415ace5938 100644 --- a/net/meanwhile/Makefile +++ b/net/meanwhile/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:34 espie Exp $ COMMENT= implementation of Lotus Sametime Community Client protocol @@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -WANTLIB= m pcre glib-2.0.>=800 +WANTLIB= m pcre glib-2.0>=800 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=meanwhile/} @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --enable-mailme=no \ --enable-doxygen=no MODULES= devel/gettext -LIB_DEPENDS= ::devel/glib2 +LIB_DEPENDS= devel/glib2 USE_LIBTOOL= Yes diff --git a/net/microblog-purple/Makefile b/net/microblog-purple/Makefile index af2707b333..ec4c6b0f83 100644 --- a/net/microblog-purple/Makefile +++ b/net/microblog-purple/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/11 08:16:51 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:34 espie Exp $ SHARED_ONLY= Yes @@ -30,9 +30,9 @@ WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png WANTLIB += pthread-stubs xcb xcb-render xcb-render-util z purple -BUILD_DEPENDS= ::net/pidgin -LIB_DEPENDS= ::devel/pango \ - ::net/pidgin,-libpurple +BUILD_DEPENDS= net/pidgin +LIB_DEPENDS= devel/pango \ + net/pidgin,-libpurple USE_GMAKE= Yes ALL_TARGET= build diff --git a/net/minbif/Makefile b/net/minbif/Makefile index 5bd477d79e..5926847d09 100644 --- a/net/minbif/Makefile +++ b/net/minbif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/27 13:25:01 steven Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:34 espie Exp $ COMMENT = IRC-friendly instant messaging client @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES = devel/gettext devel/cmake -LIB_DEPENDS = ::net/pidgin,-libpurple +LIB_DEPENDS = net/pidgin,-libpurple WANTLIB = purple c glib-2.0 gthread-2.0 m pthread stdc++ CONFIGURE_ENV+= CPPFLAGS+="-I${X11BASE}/include" @@ -30,10 +30,10 @@ NO_REGRESS = Yes #FLAVOR ?= # #.if ${FLAVOR:L:Mfull} -#LIB_DEPENDS= :libpurple-*-audio:net/pidgin,-libpurple,audio \ -# ::multimedia/gstreamer-0.10/core \ -# ::net/farsight2 \ -# :libcaca->=0.99.17:graphics/libcaca +#LIB_DEPENDS= net/pidgin,-libpurple,audio \ +# multimedia/gstreamer-0.10/core \ +# net/farsight2 \ +# graphics/libcaca>=0.99.17 # #WANTLIB += Imlib2 X11 Xext freetype gmodule-2.0 gobject-2.0 gstreamer-0.10 #WANTLIB += caca gstbase-0.10 gstfarsight-0.10 gstinterfaces-0.10 xml2 z diff --git a/net/mirmon/Makefile b/net/mirmon/Makefile index fe1526c2e5..0aa88376b6 100644 --- a/net/mirmon/Makefile +++ b/net/mirmon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:34 espie Exp $ COMMENT= monitors the status of mirrors @@ -21,7 +21,7 @@ MASTER_SITES= ${HOMEPAGE} MODULES= perl ICONDIR= ${PREFIX}/share/examples/mirmon/icons -RUN_DEPENDS= ::net/rsync ::net/wget +RUN_DEPENDS= net/rsync net/wget USE_GROFF = Yes NO_REGRESS= Yes PKG_ARCH= * diff --git a/net/mldonkey/stable/Makefile b/net/mldonkey/stable/Makefile index e65fbe8107..2c709aa26f 100644 --- a/net/mldonkey/stable/Makefile +++ b/net/mldonkey/stable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.37 2010/11/19 22:31:34 espie Exp $ COMMENT = e-donkey client DISTNAME = mldonkey-3.0.5 @@ -40,11 +40,11 @@ CONFIGURE_ENV += LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' USE_GMAKE = Yes MODULES = lang/ocaml -BUILD_DEPENDS = ::x11/lablgtk2 -LIB_DEPENDS = ::x11/gnome/librsvg \ - ::archivers/bzip2 \ - ::graphics/gd \ - ::devel/libmagic +BUILD_DEPENDS = x11/lablgtk2 +LIB_DEPENDS = x11/gnome/librsvg \ + archivers/bzip2 \ + graphics/gd \ + devel/libmagic FAKE_FLAGS = MODOCAML_NATIVE=${MODOCAML_NATIVE} NO_REGRESS = Yes diff --git a/net/mon/server/Makefile b/net/mon/server/Makefile index aafc714c7e..f218a1b45d 100644 --- a/net/mon/server/Makefile +++ b/net/mon/server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/10 13:54:56 pea Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:34 espie Exp $ COMMENT = service monitoring daemon @@ -7,7 +7,7 @@ REVISION = 1 WANTLIB = c -RUN_DEPENDS = ::devel/p5-Time-Period +RUN_DEPENDS = devel/p5-Time-Period USE_GROFF = Yes NO_REGRESS = Yes diff --git a/net/mono-zeroconf/Makefile b/net/mono-zeroconf/Makefile index 5b81487754..8e49bef4f2 100644 --- a/net/mono-zeroconf/Makefile +++ b/net/mono-zeroconf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/07/12 22:07:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:34 espie Exp $ COMMENT= Zero Configuration Networking library for Mono @@ -22,7 +22,7 @@ MODULES= lang/mono USE_GMAKE= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :mono-avahi-*:net/avahi,-mono,no_gtk,no_qt3,no_qt4 +RUN_DEPENDS= net/avahi,-mono,no_gtk,no_qt3,no_qt4 CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --disable-mdnsresponder diff --git a/net/mrtd/Makefile b/net/mrtd/Makefile index ec6e125d4f..571a81033f 100644 --- a/net/mrtd/Makefile +++ b/net/mrtd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/18 18:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/19 22:31:34 espie Exp $ # Uses pthreads COMMENT= daemon/libs/toolkit for routing BGP4+, RIP, OSPF, etc. @@ -25,7 +25,7 @@ CONFIGURE_STYLE= gnu WRKDIST= ${WRKDIR}/mrt-${V}/src -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes FAKE_FLAGS= DESTDIR=${WRKINST}/${TRUEPREFIX}/sbin \ diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 374a8017eb..434accc194 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.69 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.70 2010/11/19 22:31:34 espie Exp $ COMMENT= multi-router traffic grapher @@ -15,16 +15,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c jpeg m png z gd.>=18 +WANTLIB= c jpeg m png z gd>=18 MASTER_SITES= ${HOMEPAGE}pub/ \ ${HOMEPAGE}pub/old -RUN_DEPENDS= ::net/p5-IO-Socket-INET6 \ - ::net/p5-Net-SNMP \ - ::net/p5-SNMP_Session \ - :p5-RRD-*:net/rrdtool,-perl -LIB_DEPENDS= ::graphics/gd +RUN_DEPENDS= net/p5-IO-Socket-INET6 \ + net/p5-Net-SNMP \ + net/p5-SNMP_Session \ + net/rrdtool,-perl +LIB_DEPENDS= graphics/gd USE_GROFF = Yes diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 38e9d03602..a3bd0bb618 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.46 2010/11/19 22:31:34 espie Exp $ COMMENT= Matt's traceroute - network diagnostic tool @@ -30,7 +30,7 @@ FLAVOR?= CONFIGURE_ARGS+= --without-gtk .else CONFIGURE_ARGS+= --with-gtk-prefix=${LOCALBASE} -LIB_DEPENDS+= ::x11/gtk+2 +LIB_DEPENDS+= x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig diff --git a/net/munin/Makefile b/net/munin/Makefile index cbe3aa1fea..3a630b7a0b 100644 --- a/net/munin/Makefile +++ b/net/munin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/29 12:54:43 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:34 espie Exp $ COMMENT-main = flexible network host monitoring, client COMMENT-server =flexible network host monitoring, server @@ -32,11 +32,11 @@ MODULES = lang/python lang/ruby MODPY_BUILDDEP = No MODRUBY_BUILDDEP = No # not supported yet, but won't need a bump when it is -RUN_DEPENDS-main = ::devel/p5-Net-Server \ - ::net/p5-Net-CIDR -RUN_DEPENDS-server += :p5-RRD-*:net/rrdtool,-perl \ - ::www/p5-HTML-Template \ - :munin-node-*:net/munin,-main +RUN_DEPENDS-main = devel/p5-Net-Server \ + net/p5-Net-CIDR +RUN_DEPENDS-server += net/rrdtool,-perl \ + www/p5-HTML-Template \ + net/munin,-main USE_GMAKE = Yes ALL_TARGET = default build-doc build-man diff --git a/net/mutella/Makefile b/net/mutella/Makefile index dfd8a3afd8..eebefe268c 100644 --- a/net/mutella/Makefile +++ b/net/mutella/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:50 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:34 espie Exp $ COMMENT= gnutella client with an easy to use interface @@ -21,6 +21,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mutella/} SEPARATE_BUILD= simple CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/nagios/check_bioctl/Makefile b/net/nagios/check_bioctl/Makefile index f6b9c5c701..e1ef43f920 100644 --- a/net/nagios/check_bioctl/Makefile +++ b/net/nagios/check_bioctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/11/09 21:28:19 merdely Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:34 espie Exp $ PKG_ARCH = * @@ -22,7 +22,7 @@ NO_BUILD = Yes NO_REGRESS = Yes WRKDIST = ${WRKDIR} -RUN_DEPENDS = ::net/nagios/plugins,-main +RUN_DEPENDS = net/nagios/plugins,-main do-configure: @${SUBST_CMD} ${WRKSRC}/check_bioctl ${WRKSRC}/README diff --git a/net/nagios/check_email_delivery/Makefile b/net/nagios/check_email_delivery/Makefile index 4112070b7c..d3b6e27dac 100644 --- a/net/nagios/check_email_delivery/Makefile +++ b/net/nagios/check_email_delivery/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:50 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:34 espie Exp $ COMMENT= Nagios plugin to check full email delivery loop (SMTP/IMAP) @@ -25,13 +25,13 @@ USE_GROFF = Yes # not needed for 0.6.6, but might be later. # -> ::net/nagios/plugins,-main -RUN_DEPENDS= ::mail/p5-Mail-IMAPClient \ - ::net/p5-Net-SMTP_auth \ - ::net/p5-Net-SMTP-SSL \ - ::net/p5-Net-SMTP-TLS \ - ::security/p5-Authen-SASL \ - ::security/p5-IO-Socket-SSL \ - ::textproc/p5-Text-Template +RUN_DEPENDS= mail/p5-Mail-IMAPClient \ + net/p5-Net-SMTP_auth \ + net/p5-Net-SMTP-SSL \ + net/p5-Net-SMTP-TLS \ + security/p5-Authen-SASL \ + security/p5-IO-Socket-SSL \ + textproc/p5-Text-Template do-configure: @${SUBST_CMD} ${WRKSRC}/check_email_delivery ${WRKSRC}/check_email_delivery_epn diff --git a/net/nagios/check_hw_sensors/Makefile b/net/nagios/check_hw_sensors/Makefile index 58d7836854..67e173522e 100644 --- a/net/nagios/check_hw_sensors/Makefile +++ b/net/nagios/check_hw_sensors/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2009/11/25 10:51:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:34 espie Exp $ PKG_ARCH= * @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS+= :nagios-plugins-*:net/nagios/plugins +RUN_DEPENDS+= net/nagios/plugins do-configure: @${SUBST_CMD} ${WRKSRC}/check_hw_sensors diff --git a/net/nagios/check_mssql_health/Makefile b/net/nagios/check_mssql_health/Makefile index 4e7c506acf..601a91775e 100644 --- a/net/nagios/check_mssql_health/Makefile +++ b/net/nagios/check_mssql_health/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/05/02 11:17:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:34 espie Exp $ COMMENT= Nagios plugin to check Microsoft SQL Server @@ -17,7 +17,7 @@ MASTER_SITES= http://labs.consol.de/wp-content/uploads/2009/11/ PKG_ARCH= * BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::databases/p5-DBD-Sybase +RUN_DEPENDS= databases/p5-DBD-Sybase CONFIGURE_STYLE= gnu CONFIGURE_ENV= ac_cv_path_mkdir=/bin/mkdir diff --git a/net/nagios/check_openbgpd/Makefile b/net/nagios/check_openbgpd/Makefile index e9680d5688..c07d03666e 100644 --- a/net/nagios/check_openbgpd/Makefile +++ b/net/nagios/check_openbgpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/11/20 17:47:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:34 espie Exp $ PKG_ARCH= * @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS+= :nagios-plugins-*:net/nagios/plugins +RUN_DEPENDS+= net/nagios/plugins do-configure: @${SUBST_CMD} ${WRKSRC}/check_openbgpd ${WRKSRC}/README diff --git a/net/nagios/check_sip/Makefile b/net/nagios/check_sip/Makefile index a3b09e14b6..0acbc7b7fb 100644 --- a/net/nagios/check_sip/Makefile +++ b/net/nagios/check_sip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/07/13 21:08:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:34 espie Exp $ COMMENT= Nagios plugin to check SIP @@ -21,8 +21,8 @@ NO_BUILD= Yes NO_REGRESS= Yes EXTRACT_SUFX= -RUN_DEPENDS= ::net/sipsak \ - ::net/nagios/plugins,-main +RUN_DEPENDS= net/sipsak \ + net/nagios/plugins,-main WRKDIST= ${WRKDIR} do-extract: diff --git a/net/nagios/cnagios/Makefile b/net/nagios/cnagios/Makefile index 16bb9f4e81..ae410df25d 100644 --- a/net/nagios/cnagios/Makefile +++ b/net/nagios/cnagios/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/07/13 21:08:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:35 espie Exp $ COMMENT = console interface for nagios @@ -21,7 +21,7 @@ MASTER_SITES = ftp://noc.hep.wisc.edu/src/cnagios/ \ NO_REGRESS = Yes -RUN_DEPENDS = :nagios->=3.0:net/nagios/nagios +RUN_DEPENDS = net/nagios/nagios>=3.0 CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --with-nagios-data=3 \ --with-etc-dir="${SYSCONFDIR}/cnagios" \ diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile index 40d7ebed1f..7cacb27ae7 100644 --- a/net/nagios/nagios/Makefile +++ b/net/nagios/nagios/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2010/11/01 21:49:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.43 2010/11/19 22:31:35 espie Exp $ COMMENT-main= host and service monitor COMMENT-web= cgis and webpages for nagios @@ -23,10 +23,10 @@ MULTI_PACKAGES= -main -web MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} -BUILD_DEPENDS= :gd-*:graphics/gd -LIB_DEPENDS= ::devel/libtool,-ltdl -RUN_DEPENDS= :nagios-plugins-*:net/nagios/plugins \ - ::www/php5/core +BUILD_DEPENDS= graphics/gd +LIB_DEPENDS= devel/libtool,-ltdl +RUN_DEPENDS= net/nagios/plugins \ + www/php5/core CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--datadir=/var/www/nagios \ @@ -62,14 +62,14 @@ PREFIX-web= /var/www .if ${FLAVOR:L:Mchroot} WANTLIB-web= LIB_DEPENDS-web= -RUN_DEPENDS-web= :nagios-${V}-chroot:net/nagios/nagios,chroot +RUN_DEPENDS-web= nagios-${V}-chroot:net/nagios/nagios,chroot .else WANTLIB-web= ${WANTLIB} fontconfig freetype gd jpeg png z -LIB_DEPENDS-web= ::graphics/gd -RUN_DEPENDS-web= :nagios-${V}-!chroot:net/nagios/nagios +LIB_DEPENDS-web= graphics/gd +RUN_DEPENDS-web= nagios-${V}-!chroot:net/nagios/nagios .endif -WANTLIB-main= ${WANTLIB} ltdl.>=4 pthread +WANTLIB-main= ${WANTLIB} ltdl>=4 pthread NO_REGRESS= Yes diff --git a/net/nagios/nrpe/Makefile b/net/nagios/nrpe/Makefile index bd3a27b8d8..37b2102ad8 100644 --- a/net/nagios/nrpe/Makefile +++ b/net/nagios/nrpe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/07/13 21:08:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:35 espie Exp $ COMMENT= Nagios Remote Plugin Executor @@ -18,7 +18,7 @@ WANTLIB= c crypto ssl wrap MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} -RUN_DEPENDS= ::net/nagios/plugins +RUN_DEPENDS= net/nagios/plugins CONFIGURE_STYLE= gnu CONFIGURE_ARGS+=--enable-command-args diff --git a/net/nagios/nsca/Makefile b/net/nagios/nsca/Makefile index f75dc61a03..a6581d899c 100644 --- a/net/nagios/nsca/Makefile +++ b/net/nagios/nsca/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:35 espie Exp $ COMMENT-main= nagios service check acceptor COMMENT-client= nagios service check acceptor - client @@ -19,8 +19,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} -WANTLIB= c mcrypt.>=8 -LIB_DEPENDS= ::security/libmcrypt +WANTLIB= c mcrypt>=8 +LIB_DEPENDS= security/libmcrypt CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-nsca-user=_nagios \ @@ -29,9 +29,9 @@ CONFIGURE_ARGS= --with-nsca-user=_nagios \ MULTI_PACKAGES= -main -client -REGRESS_DEPENDS= ::devel/p5-Clone \ - ::devel/p5-Parallel-Forker -RUN_DEPENDS-main= :nagios-*:net/nagios/nagios +REGRESS_DEPENDS= devel/p5-Clone \ + devel/p5-Parallel-Forker +RUN_DEPENDS-main= net/nagios/nagios pre-build: @perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/src/nsca.c \ diff --git a/net/nagios/p5-Nagios-Plugin/Makefile b/net/nagios/p5-Nagios-Plugin/Makefile index 4aef0fba90..d8bbe2b52f 100644 --- a/net/nagios/p5-Nagios-Plugin/Makefile +++ b/net/nagios/p5-Nagios-Plugin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:50 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:35 espie Exp $ COMMENT= helper routines for writing Nagios plugins @@ -6,7 +6,7 @@ DISTNAME= Nagios-Plugin-0.33 REVISION= 0 CATEGORIES= net MODULES= cpan -USE_GROFF = Yes +USE_GROFF = Yes # same as Perl PERMIT_PACKAGE_CDROM= Yes @@ -16,9 +16,9 @@ PERMIT_DISTFILES_FTP= Yes CPAN_AUTHOR= TONVOON -RUN_DEPENDS= ::math/p5-Math-Calc-Units \ - ::devel/p5-Class-Accessor \ - ::devel/p5-Params-Validate \ - ::devel/p5-Config-Tiny +RUN_DEPENDS= math/p5-Math-Calc-Units \ + devel/p5-Class-Accessor \ + devel/p5-Params-Validate \ + devel/p5-Config-Tiny .include diff --git a/net/nagios/plugins/Makefile b/net/nagios/plugins/Makefile index 403764144e..b5f591dad0 100644 --- a/net/nagios/plugins/Makefile +++ b/net/nagios/plugins/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/15 09:56:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.30 2010/11/19 22:31:35 espie Exp $ COMMENT-main= nagios base plugins COMMENT-fping= fping plugin @@ -39,8 +39,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagiosplug/} -BUILD_DEPENDS= ::games/qstat \ - ::net/fping +BUILD_DEPENDS= games/qstat \ + net/fping FAKE_FLAGS= setuid_root_mode=0555 @@ -72,48 +72,48 @@ CONFIGURE_ARGS+=--without-mysql --without-pgsql .if ! ${FLAVOR:L:Mno_ntp} MULTI_PACKAGES+=-ntp -BUILD_DEPENDS+= ::net/ntp +BUILD_DEPENDS+= net/ntp .endif .if ! ${FLAVOR:L:Mno_samba} MULTI_PACKAGES+=-samba -BUILD_DEPENDS+= ::net/samba +BUILD_DEPENDS+= net/samba .endif .if ! ${FLAVOR:L:Mno_snmp} MULTI_PACKAGES+=-snmp -BUILD_DEPENDS+= ::net/p5-Net-SNMP \ - ::net/net-snmp +BUILD_DEPENDS+= net/p5-Net-SNMP \ + net/net-snmp .endif WANTLIB= c pthread -RUN_DEPENDS-fping= ::net/fping +RUN_DEPENDS-fping= net/fping -RUN_DEPENDS-game= ::games/qstat +RUN_DEPENDS-game= games/qstat WANTLIB-ldap+= ${WANTLIB} asn1 com_err crypto gssapi krb5 WANTLIB-ldap+= lber ldap sasl2 ssl -LIB_DEPENDS-ldap= :openldap-client-*:databases/openldap \ +LIB_DEPENDS-ldap= databases/openldap \ ${LIB_DEPENDS} WANTLIB-mysql= ${WANTLIB} crypto m mysqlclient ssl z -LIB_DEPENDS-mysql= :mysql-client-*:databases/mysql \ +LIB_DEPENDS-mysql= databases/mysql \ ${LIB_DEPENDS} WANTLIB-ntp= ${WANTLIB} m -RUN_DEPENDS-ntp= ::net/ntp +RUN_DEPENDS-ntp= net/ntp WANTLIB-pgsql= ${WANTLIB} crypto pq -LIB_DEPENDS-pgsql= :postgresql-client-*:databases/postgresql \ +LIB_DEPENDS-pgsql= databases/postgresql \ ${LIB_DEPENDS} LIB_DEPENDS-samba= WANTLIB-samba= -RUN_DEPENDS-samba= ::net/samba +RUN_DEPENDS-samba= net/samba -RUN_DEPENDS-snmp= ::net/net-snmp \ - ::net/p5-Net-SNMP +RUN_DEPENDS-snmp= net/net-snmp \ + net/p5-Net-SNMP WANTLIB-main= ${WANTLIB} crypto m ssl diff --git a/net/nam/Makefile b/net/nam/Makefile index da7bbe299e..6382c2212b 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/10/24 21:30:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:35 espie Exp $ # $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $ COMMENT= UCB/LBNL Network Animator @@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xext c m otcl pthread-stubs stdc++ tcl84 tk84 xcb z BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :tclcl->=1.0b13p0:devel/tclcl +RUN_DEPENDS= devel/tclcl>=1.0b13p0 WRKDIST= ${WRKDIR}/nam-$V diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile index 61d0a7f534..e8fc3aaf6c 100644 --- a/net/nemesis/Makefile +++ b/net/nemesis/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.31 2010/11/19 22:31:35 espie Exp $ COMMENT= command line arbitrary packet builder @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nemesis/} HOMEPAGE= http://nemesis.sourceforge.net/ -LIB_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 +LIB_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 # BSD PERMIT_PACKAGE_CDROM= Yes @@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m lib/libnet-1.0/net.=0 +WANTLIB= c m lib/libnet-1.0/net=0 CONFIGURE_STYLE=gnu CONFIGURE_ARGS+= --with-libnet_includes=${LOCALBASE}/include/libnet-1.0 \ diff --git a/net/neon/Makefile b/net/neon/Makefile index b6814cb1d6..bbc22357cf 100644 --- a/net/neon/Makefile +++ b/net/neon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/10/18 18:36:50 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:35 espie Exp $ COMMENT= HTTP and WebDAV client library, with C interface @@ -22,7 +22,7 @@ WANTLIB= asn1 crypto expat gssapi krb5 ssl z MASTER_SITES= ${HOMEPAGE} USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index 8109f26ee9..e38c663bce 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes COMMENT= determine the malware activity on a network @@ -23,13 +23,13 @@ USE_LIBTOOL= Yes LIBTOOL_FLAGS+= --tag=disable-static USE_GROFF = Yes -LIB_DEPENDS= ::net/adns \ - ::net/curl \ - ::devel/libmagic \ - ::devel/pcre +LIB_DEPENDS= net/adns \ + net/curl \ + devel/libmagic \ + devel/pcre WANTLIB= c crypto iconv intl idn m ssl stdc++ pcap z \ - adns.>=1 curl.>=3 magic.>=1 pcre.>=1 + adns>=1 curl>=3 magic>=1 pcre>=1 FAKE_FLAGS+= localstatedir='/var/nepenthes' \ sysconfdir='${PREFIX}/share/examples' @@ -48,16 +48,16 @@ FLAVORS= prelude FLAVOR?= .if ${FLAVOR:L:Mprelude} -LIB_DEPENDS+= ::security/prelude/libprelude +LIB_DEPENDS+= security/prelude/libprelude CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/libprelude/" \ LDFLAGS="-L${LOCALBASE}/lib -pthread" -WANTLIB+= gcrypt gnutls gpg-error iconv intl pthread tasn1 prelude.>=8 +WANTLIB+= gcrypt gnutls gpg-error iconv intl pthread tasn1 prelude>=8 CONFIGURE_ARGS+=--enable-prelude MESSAGE= ${PKGDIR}/MESSAGE-prelude .else -LIB_DEPENDS+= ::databases/postgresql -WANTLIB += pq.>=4 +LIB_DEPENDS+= databases/postgresql +WANTLIB += pq>=4 .endif pre-configure: diff --git a/net/nepim/Makefile b/net/nepim/Makefile index c71abb48f2..ffe29c7e5f 100644 --- a/net/nepim/Makefile +++ b/net/nepim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:35 espie Exp $ COMMENT= network pipe meter @@ -14,11 +14,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c oop.>=4 +WANTLIB= c oop>=4 MASTER_SITES= ${MASTER_SITE_SAVANNAH:=nepim/} -LIB_DEPENDS= ::devel/liboop +LIB_DEPENDS= devel/liboop USE_GMAKE= Yes diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 2385addbd8..0116e1ee86 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2010/10/26 00:42:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.50 2010/11/19 22:31:35 espie Exp $ # XXX note there are various "openbsd[234]" ifdefs which will need adjusting when # OpenBSD goes to 5.x @@ -34,10 +34,10 @@ WANTLIB-main= c crypto kvm m perl pthread util wrap MULTI_PACKAGES= -main -perl -tkmib WANTLIB-perl= crypto netsnmp netsnmpagent netsnmptrapd netsnmpmibs -LIB_DEPENDS-perl= ::net/net-snmp,-main +LIB_DEPENDS-perl= net/net-snmp,-main -RUN_DEPENDS-tkmib= ::net/net-snmp,-perl \ - ::x11/p5-Tk +RUN_DEPENDS-tkmib= net/net-snmp,-perl \ + x11/p5-Tk NET_SNMP_MIB_LIST= host disman/event-mib smux mibII/mta_sendmail diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index d289ff371d..42e4ca2b5f 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2010/11/19 22:31:35 espie Exp $ COMMENT= AFP file and print services for AppleTalk/IP networks @@ -22,8 +22,8 @@ CONFIGURE_STYLE= gnu USE_LIBTOOL= Yes USE_GROFF = Yes -WANTLIB= c crypto rpcsvc db.>=4 -LIB_DEPENDS= :db->=4,<5:databases/db/v4 +WANTLIB= c crypto rpcsvc db>=4 +LIB_DEPENDS= db->=4,<5:databases/db/v4 CONFIGURE_ARGS+= --with-db4=${LOCALBASE} CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/net/netdude/netdude/Makefile b/net/netdude/netdude/Makefile index 3b896dffdd..eecdf21bba 100644 --- a/net/netdude/netdude/Makefile +++ b/net/netdude/netdude/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:35 espie Exp $ COMMENT= network traffic visualization and editing tool @@ -19,16 +19,16 @@ PERMIT_DISTFILES_FTP= Yes MODULES= devel/gettext -LIB_DEPENDS= ::net/libnetdude/libnetdude \ - ::net/libpcapnav \ - ::devel/glib \ - ::x11/gtk+ +LIB_DEPENDS= net/libnetdude/libnetdude \ + net/libpcapnav \ + devel/glib \ + x11/gtk+ WANTLIB= X11 Xau Xdmcp Xext Xi c m pcap pthread-stubs xcb netdude \ - pcapnav glib.>=1 gmodule.>=1 gdk gtk + pcapnav glib>=1 gmodule>=1 gdk gtk USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/netdude \ --disable-gtk-doc --datadir=${PREFIX}/lib diff --git a/net/netdude/plugins/traffic-analyzer/Makefile b/net/netdude/plugins/traffic-analyzer/Makefile index 193c9c3622..468b7c8667 100644 --- a/net/netdude/plugins/traffic-analyzer/Makefile +++ b/net/netdude/plugins/traffic-analyzer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/07/13 21:08:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:35 espie Exp $ COMMENT= netdude plugin providing traffic analysis @@ -11,8 +11,8 @@ HOMEPAGE= http://netdude.sourceforge.net/ MAINTAINER= Rui Reis -RUN_DEPENDS= ::net/libnetdude/plugins/traffic-analyzer \ - ::net/netdude/netdude +RUN_DEPENDS= net/libnetdude/plugins/traffic-analyzer \ + net/netdude/netdude BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index 3b0ace7fe3..8140e0245e 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:35 espie Exp $ COMMENT-main = tools to collect and process netflow data COMMENT-nfprofile = filters data from nfdump according to profiles @@ -43,11 +43,11 @@ USE_GROFF = Yes MULTI_PACKAGES = -main -nfprofile -LIB_DEPENDS-main = :flow-tools->=0.68.5:net/flow-tools +LIB_DEPENDS-main = net/flow-tools>=0.68.5 WANTLIB-main = ${WANTLIB} ft -LIB_DEPENDS-nfprofile = :rrdtool-*:net/rrdtool +LIB_DEPENDS-nfprofile = net/rrdtool WANTLIB-nfprofile = ${WANTLIB} rrd -RUN_DEPENDS-nfprofile = :nfdump-$V:net/nfdump,-main +RUN_DEPENDS-nfprofile = nfdump-$V:net/nfdump,-main post-build: perl -pi -e 's,/usr/local,${LOCALBASE},g;' \ diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile index ba44ace376..f56a81bb36 100644 --- a/net/nfsen/Makefile +++ b/net/nfsen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/12 09:55:51 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:35 espie Exp $ MULTI_PACKAGES= -main -web COMMENT-main= web-based front end for the nfdump netflow tools @@ -23,14 +23,14 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nfsen/} MODULES= perl -COMMON_DEPENDS= :p5-RRD-*:net/rrdtool,-perl \ - ::mail/p5-Mail-Tools \ - :nfprofile-*:net/nfdump,-nfprofile \ - :nfdump->=1.5.8p0:net/nfdump +COMMON_DEPENDS= net/rrdtool,-perl \ + mail/p5-Mail-Tools \ + net/nfdump,-nfprofile \ + net/nfdump>=1.5.8p0 BUILD_DEPENDS= ${COMMON_DEPENDS} RUN_DEPENDS-main= ${COMMON_DEPENDS} \ - :nfsen-web-$V:net/nfsen,-web -RUN_DEPENDS-web= ::www/php5/core + nfsen-web-$V:net/nfsen,-web +RUN_DEPENDS-web= www/php5/core NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index ddec659c96..7f8b5c67ab 100644 --- a/net/ngrep/Makefile +++ b/net/ngrep/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:35 espie Exp $ COMMENT= network grep @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c pcap pcre -LIB_DEPENDS= ::devel/pcre +LIB_DEPENDS= devel/pcre NO_REGRESS= Yes diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile index 809479bc05..174963aa14 100644 --- a/net/nicotine/Makefile +++ b/net/nicotine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/08/30 21:14:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:35 espie Exp $ COMMENT= gtk soulseek client written in Python @@ -21,7 +21,7 @@ MASTER_SITES= ${HOMEPAGE} MODULES= lang/python BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :py-gtk2-*:x11/py-gtk2 +RUN_DEPENDS= x11/py-gtk2 NO_REGRESS= Yes diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 8d95eab91f..da0b12a22d 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.93 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.94 2010/11/19 22:31:35 espie Exp $ COMMENT-main= scan ports and fingerprint stack of network hosts COMMENT-zenmap= graphical frontend for nmap @@ -43,19 +43,19 @@ CONFIGURE_ARGS= --with-libpcap=/usr \ --with-mandir=${LOCALBASE}/man \ --disable-nls -WANTLIB-main= c crypto m pcap ssl stdc++ pcre dnet lua.>=5 -LIB_DEPENDS-main= ::devel/pcre \ - ::net/libdnet \ - ::lang/lua +WANTLIB-main= c crypto m pcap ssl stdc++ pcre dnet lua>=5 +LIB_DEPENDS-main= devel/pcre \ + net/libdnet \ + lang/lua RUN_DEPENDS-main= -RUN_DEPENDS-zenmap= ::x11/py-gtk2 \ - ::databases/py-sqlite2 \ - ::devel/desktop-file-utils \ - ::net/nmap +RUN_DEPENDS-zenmap= x11/py-gtk2 \ + databases/py-sqlite2 \ + devel/desktop-file-utils \ + net/nmap -NO_REGRESS= Yes +NO_REGRESS= Yes post-extract: @cp ${WRKSRC}/libdnet-stripped/include/dnet/sctp.h ${WRKSRC}/sctp.h diff --git a/net/ns/Makefile b/net/ns/Makefile index ce10150d47..aa98f7be9d 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.38 2010/11/19 22:31:35 espie Exp $ # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $ COMMENT= UCB/LBNL Network Simulator Version 2 @@ -22,8 +22,8 @@ WANTLIB= X11 c m pcap pthread-stubs stdc++ tcl84 tk84 xcb otcl MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/} WRKDIST= ${WRKDIR}/ns-$V -BUILD_DEPENDS= :tclcl->=1.0b13p0:devel/tclcl -LIB_DEPENDS= ::lang/otcl +BUILD_DEPENDS= devel/tclcl>=1.0b13p0 +LIB_DEPENDS= lang/otcl USE_GROFF = Yes CONFIGURE_STYLE=gnu diff --git a/net/nslint/Makefile b/net/nslint/Makefile index 4bff12e937..a13e273476 100644 --- a/net/nslint/Makefile +++ b/net/nslint/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:50 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:35 espie Exp $ # $FreeBSD: ports/net/nslint/Makefile,v 1.10 2000/04/09 18:12:37 cpiazza Exp $ COMMENT= performs consistency checks on BIND files @@ -27,7 +27,7 @@ WANTLIB= c CONFIGURE_STYLE= gnu ALL_TARGET= nslint INSTALL_TARGET= install install-man -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes diff --git a/net/oggfwd/Makefile b/net/oggfwd/Makefile index 8e79616d1c..37b3ed54db 100644 --- a/net/oggfwd/Makefile +++ b/net/oggfwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:35 espie Exp $ COMMENT= pipe an Ogg stream to an Icecast server @@ -16,12 +16,12 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m ogg pthread theora vorbis shout.>=5 speex.>=4 +WANTLIB= c m ogg pthread theora vorbis shout>=5 speex>=4 MASTER_SITES= http://v2v.cc/~j/oggfwd/ -LIB_DEPENDS= ::net/libshout \ - ::audio/speex +LIB_DEPENDS= net/libshout \ + audio/speex USE_GROFF = Yes NO_REGRESS= Yes diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile index 04cdaa3e92..3165f1336c 100644 --- a/net/oinkmaster/Makefile +++ b/net/oinkmaster/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.16 2010/11/19 22:31:35 espie Exp $ COMMENT= update your Snort rules @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::net/wget +RUN_DEPENDS= net/wget NO_BUILD=Yes NO_REGRESS=Yes diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index 324a9267ec..84d660adcd 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:35 espie Exp $ COMMENT-main= OLSR routing daemon COMMENT-gui= OLSR routing daemon GUI @@ -28,10 +28,10 @@ PERMIT_DISTFILES_FTP= Yes MULTI_PACKAGES= -main -gui -plugins -BUILD_DEPENDS= ::devel/bison +BUILD_DEPENDS= devel/bison WANTLIB-main= c -LIB_DEPENDS-gui= ::x11/gtk+2 +LIB_DEPENDS-gui= x11/gtk+2 WANTLIB-gui= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ @@ -41,7 +41,7 @@ WANTLIB-gui= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ xcb-render xcb-render-util z gdk_pixbuf-2.0 gtk-x11-2.0 \ gdk-x11-2.0 -RUN_DEPENDS-plugins=:olsrd-${VERSION}:net/olsrd +RUN_DEPENDS-plugins= olsrd-${VERSION}:net/olsrd USE_GMAKE= Yes USE_GROFF = Yes diff --git a/net/onioncat/Makefile b/net/onioncat/Makefile index 9478e7f98d..d5b6fdf5ee 100644 --- a/net/onioncat/Makefile +++ b/net/onioncat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/29 09:54:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:35 espie Exp $ COMMENT = IP-Transparent Tor Hidden Service Connector @@ -20,11 +20,11 @@ WANTLIB = c pthread MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/ -RUN_DEPENDS = ::net/tor +RUN_DEPENDS = net/tor SEPARATE_BUILD = simple CONFIGURE_STYLE = simple CONFIGURE_ARGS += --mandir=${PREFIX}/man -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/opal/Makefile b/net/opal/Makefile index 8a6ee67028..34f808de2d 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/09/01 14:42:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes @@ -32,14 +32,14 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/} WANTLIB += SDL c crypto expat lber ldap ldap_r m ogg sasl2 WANTLIB += ssl speex speexdsp x264 theora gsm pt pthread stdc++ -LIB_DEPENDS= ::audio/speex \ - ::multimedia/libtheora \ - ::audio/gsm \ - ::devel/ptlib \ - ::multimedia/x264 +LIB_DEPENDS= audio/speex \ + multimedia/libtheora \ + audio/gsm \ + devel/ptlib \ + multimedia/x264 BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :ffmpeg->=20100512:graphics/ffmpeg # dlopen(3) libavcodec.so +RUN_DEPENDS= graphics/ffmpeg>=20100512 # dlopen(3) libavcodec.so ALL_TARGET= opt OPAL_FILE= libopal.so diff --git a/net/openfire/Makefile b/net/openfire/Makefile index e4632b7d60..7d121189b9 100644 --- a/net/openfire/Makefile +++ b/net/openfire/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/13 07:31:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:35 espie Exp $ COMMENT= XMPP real time collaboration server DISTNAME= openfire_src_3_6_4 @@ -21,7 +21,7 @@ NO_REGRESS= yes MODULES=java MODJAVA_VER= 1.7+ -BUILD_DEPENDS= ::devel/apache-ant +BUILD_DEPENDS= devel/apache-ant MAKE_ENV+= JAVA_HOME=${JAVA_HOME} WRKDIST= ${WRKDIR}/openfire_src diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index f89bbedea5..1584223d0e 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2010/11/19 22:31:35 espie Exp $ COMMENT= easy-to-use, robust, and highly configurable VPN @@ -20,7 +20,7 @@ WANTLIB= c crypto ssl pthread lzo2 MASTER_SITES= http://swupdate.openvpn.net/community/releases/ -LIB_DEPENDS= ::archivers/lzo2 +LIB_DEPENDS= archivers/lzo2 SEPARATE_BUILD= concurrent diff --git a/net/openvpn_bsdauth/Makefile b/net/openvpn_bsdauth/Makefile index 4785b5416d..1148168535 100644 --- a/net/openvpn_bsdauth/Makefile +++ b/net/openvpn_bsdauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/19 21:04:52 naddy Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:35 espie Exp $ COMMENT = BSD Auth helper program for OpenVPN @@ -20,7 +20,7 @@ WANTLIB = c MASTER_SITES = ${HOMEPAGE} BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = ::net/openvpn +RUN_DEPENDS = net/openvpn FAKE_FLAGS = PREFIX=${TRUEPREFIX} diff --git a/net/p5-Bot-BasicBot/Makefile b/net/p5-Bot-BasicBot/Makefile index db923b7b31..6a257f18e6 100644 --- a/net/p5-Bot-BasicBot/Makefile +++ b/net/p5-Bot-BasicBot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:35 espie Exp $ COMMENT = simple irc bot baseclass @@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -RUN_DEPENDS = ::net/p5-POE-Component-IRC +RUN_DEPENDS = net/p5-POE-Component-IRC MODCPAN_EXAMPLES= Yes diff --git a/net/p5-Business-PayPal-API/Makefile b/net/p5-Business-PayPal-API/Makefile index f75d78a3ff..92482af8e6 100644 --- a/net/p5-Business-PayPal-API/Makefile +++ b/net/p5-Business-PayPal-API/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/10/23 16:05:53 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:35 espie Exp $ COMMENT= PayPal API @@ -14,8 +14,8 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan -RUN_DEPENDS= ::net/p5-Business-PayPal \ - ::www/p5-SOAP-Lite +RUN_DEPENDS= net/p5-Business-PayPal \ + www/p5-SOAP-Lite MODCPAN_EXAMPLES= Yes MODCPAN_EXAMPLES_DIST= eg diff --git a/net/p5-Business-PayPal-IPN/Makefile b/net/p5-Business-PayPal-IPN/Makefile index dade262e29..5102d60fc7 100644 --- a/net/p5-Business-PayPal-IPN/Makefile +++ b/net/p5-Business-PayPal-IPN/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/10/23 16:07:43 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:35 espie Exp $ COMMENT= extension that implements PayPal IPN v1.5 @@ -14,8 +14,8 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan -RUN_DEPENDS= ::security/p5-Net_SSLeay \ - ::www/p5-libwww +RUN_DEPENDS= security/p5-Net_SSLeay \ + www/p5-libwww NO_REGRESS= Yes diff --git a/net/p5-Business-PayPal/Makefile b/net/p5-Business-PayPal/Makefile index 2fa3d4cc3e..37ce5b196a 100644 --- a/net/p5-Business-PayPal/Makefile +++ b/net/p5-Business-PayPal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/10/23 16:05:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:35 espie Exp $ COMMENT= extension for automating PayPal transactions @@ -14,7 +14,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan -RUN_DEPENDS= ::security/p5-Net_SSLeay +RUN_DEPENDS= security/p5-Net_SSLeay NO_REGRESS= Yes diff --git a/net/p5-DNS-ZoneParse/Makefile b/net/p5-DNS-ZoneParse/Makefile index 5f145d6f4c..18ed89c3ee 100644 --- a/net/p5-DNS-ZoneParse/Makefile +++ b/net/p5-DNS-ZoneParse/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:35 espie Exp $ COMMENT= parse and manipulate DNS Zone files MODULES= cpan DISTNAME= DNS-ZoneParse-0.96 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes MAINTAINER= Girish Venkatachalam diff --git a/net/p5-Danga-Socket/Makefile b/net/p5-Danga-Socket/Makefile index 2a5f425035..0bf1624ee7 100644 --- a/net/p5-Danga-Socket/Makefile +++ b/net/p5-Danga-Socket/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:35 espie Exp $ COMMENT = event loop and event-driven async socket base class @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -RUN_DEPENDS = ::devel/p5-IO-KQueue \ - ::sysutils/p5-Sys-Syscall +RUN_DEPENDS = devel/p5-IO-KQueue \ + sysutils/p5-Sys-Syscall .include diff --git a/net/p5-Event-RPC/Makefile b/net/p5-Event-RPC/Makefile index 7d57eacd1e..f3925f28ec 100644 --- a/net/p5-Event-RPC/Makefile +++ b/net/p5-Event-RPC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:35 espie Exp $ COMMENT= Event based transparent Client/Server RPC framework @@ -14,7 +14,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::devel/p5-Event \ - ::security/p5-IO-Socket-SSL +RUN_DEPENDS= devel/p5-Event \ + security/p5-IO-Socket-SSL .include diff --git a/net/p5-Filesys-Virtual-DAAP/Makefile b/net/p5-Filesys-Virtual-DAAP/Makefile index 6323265058..5b88619ac2 100644 --- a/net/p5-Filesys-Virtual-DAAP/Makefile +++ b/net/p5-Filesys-Virtual-DAAP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/22 19:40:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:35 espie Exp $ COMMENT= presents a DAAP share as a VFS @@ -14,9 +14,9 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -RUN_DEPENDS= :p5-Class-Accessor-*:devel/p5-Class-Accessor \ - :p5-Net-DAAP-Client-*:net/p5-Net-DAAP-Client \ - :p5-Filesys-Virtual-Plain-*:sysutils/p5-Filesys-Virtual-Plain +RUN_DEPENDS= devel/p5-Class-Accessor \ + net/p5-Net-DAAP-Client \ + sysutils/p5-Filesys-Virtual-Plain BUILD_DEPENDS= ${RUN_DEPENDS} post-install: diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile index 46ba040a53..1006048385 100644 --- a/net/p5-Geo-IP/Makefile +++ b/net/p5-Geo-IP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes @@ -16,8 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= ::net/GeoIP -WANTLIB = GeoIP.>=4 +LIB_DEPENDS= net/GeoIP +WANTLIB = GeoIP>=4 CONFIGURE_ARGS= LIBS='-L${LOCALBASE}/lib' INC='-I${LOCALBASE}/include' diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile index 3582a5f2b6..5bdf70db45 100644 --- a/net/p5-IO-Socket-INET6/Makefile +++ b/net/p5-IO-Socket-INET6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:35 espie Exp $ COMMENT = object interface for AF_INET and AF_INET6 domain sockets @@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP = Yes MODULES = cpan BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :p5-Socket6->=0.12:net/p5-Socket6 -REGRESS_DEPENDS = ::devel/p5-Test-Pod-Coverage ::devel/p5-Test-Pod -USE_GROFF = Yes +RUN_DEPENDS = net/p5-Socket6>=0.12 +REGRESS_DEPENDS = devel/p5-Test-Pod-Coverage devel/p5-Test-Pod +USE_GROFF = Yes .include diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile index b966920f7a..5b271d9fdb 100644 --- a/net/p5-IO-Socket-Multicast/Makefile +++ b/net/p5-IO-Socket-Multicast/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes @@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-IO-Interface->=0.94:net/p5-IO-Interface +RUN_DEPENDS= net/p5-IO-Interface>=0.94 BUILD_DEPENDS= ${RUN_DEPENDS} .include diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile index 44157f58ef..4b626a02bb 100644 --- a/net/p5-IP-Country/Makefile +++ b/net/p5-IP-Country/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 18:36:51 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:35 espie Exp $ COMMENT= fast lookup of country codes by IP address @@ -15,6 +15,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS = ::geo/p5-Geography-Countries +RUN_DEPENDS = geo/p5-Geography-Countries .include diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile index 09149579a4..75d5befa93 100644 --- a/net/p5-Net-Amazon/Makefile +++ b/net/p5-Net-Amazon/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:35 espie Exp $ COMMENT= Perl Interface to Amazon.{co.uk,com} Web Services MODULES= cpan DISTNAME= Net-Amazon-0.59 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes MAINTAINER= Sam Smith @@ -16,9 +16,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :p5-XML-Simple->=2.08:textproc/p5-XML-Simple \ - ::devel/p5-Log-Log4perl \ - :p5-libwww-*:www/p5-libwww +RUN_DEPENDS= textproc/p5-XML-Simple>=2.08 \ + devel/p5-Log-Log4perl \ + www/p5-libwww MODCPAN_EXAMPLES= Yes MODCPAN_EXAMPLES_DIST= eg diff --git a/net/p5-Net-DAAP-Client/Makefile b/net/p5-Net-DAAP-Client/Makefile index ab3ab51130..dba41a794a 100644 --- a/net/p5-Net-DAAP-Client/Makefile +++ b/net/p5-Net-DAAP-Client/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:35 espie Exp $ COMMENT= perl client for Apple iTunes DAAP service @@ -13,9 +13,9 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -RUN_DEPENDS= :p5-libwww-*:www/p5-libwww \ - :p5-Net-DAAP-DMAP-*:net/p5-Net-DAAP-DMAP \ - :p5-Digest-MD5-M4p-*:security/p5-Digest-MD5-M4p +RUN_DEPENDS= www/p5-libwww \ + net/p5-Net-DAAP-DMAP \ + security/p5-Digest-MD5-M4p BUILD_DEPENDS= ${RUN_DEPENDS} post-install: diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile index 584f740b57..d675be721b 100644 --- a/net/p5-Net-DAV-Server/Makefile +++ b/net/p5-Net-DAV-Server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:35 espie Exp $ COMMENT= perl module to provide a DAV server @@ -16,11 +16,11 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :p5-Class-Accessor-*:devel/p5-Class-Accessor \ - :p5-File-Slurp-*:devel/p5-File-Slurp \ - :p5-File-Find-Rule-Filesys-Virtual-*:devel/p5-File-Find-Rule-Filesys-Virtual \ - :p5-XML-LibXML-*:textproc/p5-XML-LibXML \ - :p5-libwww-*:www/p5-libwww -REGRESS_DEPENDS=:p5-Test-Pod-*:devel/p5-Test-Pod +RUN_DEPENDS= devel/p5-Class-Accessor \ + devel/p5-File-Slurp \ + devel/p5-File-Find-Rule-Filesys-Virtual \ + textproc/p5-XML-LibXML \ + www/p5-libwww +REGRESS_DEPENDS=devel/p5-Test-Pod .include diff --git a/net/p5-Net-DBus/Makefile b/net/p5-Net-DBus/Makefile index 32db93e470..491f4654b4 100644 --- a/net/p5-Net-DBus/Makefile +++ b/net/p5-Net-DBus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes @@ -18,9 +18,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::textproc/p5-XML-Twig +RUN_DEPENDS= textproc/p5-XML-Twig BUILD_DEPENDS= ${RUN_DEPENDS} -LIB_DEPENDS= ::x11/dbus -WANTLIB = dbus-1.>=6 +LIB_DEPENDS= x11/dbus +WANTLIB = dbus-1>=6 .include diff --git a/net/p5-Net-DNS-DynDNS/Makefile b/net/p5-Net-DNS-DynDNS/Makefile index 95eeaa7ef7..bc7f0bf349 100644 --- a/net/p5-Net-DNS-DynDNS/Makefile +++ b/net/p5-Net-DNS-DynDNS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT = update dyndns.org with correct ip address @@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -RUN_DEPENDS = ::www/p5-libwww +RUN_DEPENDS = www/p5-libwww BUILD_DEPENDS = ${RUN_DEPENDS} .include diff --git a/net/p5-Net-DNS-SEC/Makefile b/net/p5-Net-DNS-SEC/Makefile index 72146bd8f1..999e030ca5 100644 --- a/net/p5-Net-DNS-SEC/Makefile +++ b/net/p5-Net-DNS-SEC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:36 espie Exp $ COMMENT= extends the Net::DNS module with DNSSEC functionality @@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-MIME-Base32-*:mail/p5-MIME-Base32 \ - :p5-Net-DNS->=0.64:net/p5-Net-DNS \ - :p5-Digest-BubbleBabble->=0.01:security/p5-Digest-BubbleBabble \ - :p5-Crypt-OpenSSL-RSA->=0.19:security/p5-Crypt-OpenSSL-RSA \ - :p5-Crypt-OpenSSL-DSA->=0.10:security/p5-Crypt-OpenSSL-DSA \ - :p5-Crypt-OpenSSL-Bignum->=0.03:security/p5-Crypt-OpenSSL-Bignum \ - :p5-Digest-SHA1-*:security/p5-Digest-SHA1 +RUN_DEPENDS= mail/p5-MIME-Base32 \ + net/p5-Net-DNS>=0.64 \ + security/p5-Digest-BubbleBabble>=0.01 \ + security/p5-Crypt-OpenSSL-RSA>=0.19 \ + security/p5-Crypt-OpenSSL-DSA>=0.10 \ + security/p5-Crypt-OpenSSL-Bignum>=0.03 \ + security/p5-Digest-SHA1 .include diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile index 0e72946fdf..5b0da5978f 100644 --- a/net/p5-Net-DNS/Makefile +++ b/net/p5-Net-DNS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.38 2010/11/19 22:31:35 espie Exp $ SHARED_ONLY= Yes @@ -8,7 +8,7 @@ MODULES= cpan DISTNAME= Net-DNS-0.65 REVISION= 0 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes HOMEPAGE= http://www.net-dns.org/ @@ -21,10 +21,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :p5-Digest-HMAC->=1.00:security/p5-Digest-HMAC \ - :p5-Net-IP->=1.20:net/p5-Net-IP -REGRESS_DEPENDS= ::security/p5-Digest-BubbleBabble \ - ::devel/p5-Test-Pod +RUN_DEPENDS= security/p5-Digest-HMAC>=1.00 \ + net/p5-Net-IP>=1.20 +REGRESS_DEPENDS= security/p5-Digest-BubbleBabble \ + devel/p5-Test-Pod CONFIGURE_ARGS= --online-tests diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile index 2a885e9b62..baa6ffa57d 100644 --- a/net/p5-Net-Dict/Makefile +++ b/net/p5-Net-Dict/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl Interface to the DICT protocol @@ -16,6 +16,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-AppConfig-Std +RUN_DEPENDS= devel/p5-AppConfig-Std .include diff --git a/net/p5-Net-FTP-AutoReconnect/Makefile b/net/p5-Net-FTP-AutoReconnect/Makefile index a454d0ce8a..c34b2d9f12 100644 --- a/net/p5-Net-FTP-AutoReconnect/Makefile +++ b/net/p5-Net-FTP-AutoReconnect/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT= FTP client class with automatic reconnect on failure MODULES= cpan DISTNAME= Net-FTP-AutoReconnect-0.2 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes MAINTAINER= Girish Venkatachalam diff --git a/net/p5-Net-FTPSSL/Makefile b/net/p5-Net-FTPSSL/Makefile index b797e40112..bab70644fb 100644 --- a/net/p5-Net-FTPSSL/Makefile +++ b/net/p5-Net-FTPSSL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT = FTP over SSL/TLS client class @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -RUN_DEPENDS = ::security/p5-IO-Socket-SSL +RUN_DEPENDS = security/p5-IO-Socket-SSL REGRESS_IS_INTERACTIVE = Yes diff --git a/net/p5-Net-FTPServer/Makefile b/net/p5-Net-FTPServer/Makefile index e900ba637c..af18a97c3f 100644 --- a/net/p5-Net-FTPServer/Makefile +++ b/net/p5-Net-FTPServer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:36 espie Exp $ COMMENT= secure, extensible and configurable Perl FTPd @@ -11,11 +11,11 @@ USE_GROFF = Yes MAINTAINER= Anil Madhavapeddy BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::archivers/p5-Archive-Zip \ - ::databases/p5-DBI \ - ::devel/p5-BSD-Resource \ - ::devel/p5-File-Sync \ - ::devel/p5-IO-stringy +RUN_DEPENDS= archivers/p5-Archive-Zip \ + databases/p5-DBI \ + devel/p5-BSD-Resource \ + devel/p5-File-Sync \ + devel/p5-IO-stringy # GPL PERMIT_PACKAGE_CDROM= Yes diff --git a/net/p5-Net-GPSD/Makefile b/net/p5-Net-GPSD/Makefile index 56ff578659..228eda33d3 100644 --- a/net/p5-Net-GPSD/Makefile +++ b/net/p5-Net-GPSD/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= perl module that provides a client interface to gpsd MODULES= cpan @@ -12,11 +12,11 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -RUN_DEPENDS= ::geo/p5-GPS-PRN \ - ::geo/p5-Geo-Forward \ - ::geo/p5-Geo-Functions \ - ::geo/p5-Geo-Inverse \ - ::www/p5-libwww +RUN_DEPENDS= geo/p5-GPS-PRN \ + geo/p5-Geo-Forward \ + geo/p5-Geo-Functions \ + geo/p5-Geo-Inverse \ + www/p5-libwww MODCPAN_EXAMPLES= Yes MODCPAN_EXAMPLES_DIST= bin diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile index a5d19517a6..7b565d250a 100644 --- a/net/p5-Net-Google/Makefile +++ b/net/p5-Net-Google/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT= simple OOP-ish interface to the Google SOAP API @@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= modbuild -RUN_DEPENDS= :p5-SOAP-Lite-*:www/p5-SOAP-Lite +RUN_DEPENDS= www/p5-SOAP-Lite BUILD_DEPENDS= ${RUN_DEPENDS} REGRESS_IS_INTERACTIVE= Yes diff --git a/net/p5-Net-ICal/Makefile b/net/p5-Net-ICal/Makefile index 10a83196c4..51eb67f30d 100644 --- a/net/p5-Net-ICal/Makefile +++ b/net/p5-Net-ICal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl interface to RFC2445 (iCalendar) objects @@ -16,9 +16,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-Class-MethodMapper \ - ::devel/p5-Date-Calc \ - ::devel/p5-Date-ICal +RUN_DEPENDS= devel/p5-Class-MethodMapper \ + devel/p5-Date-Calc \ + devel/p5-Date-ICal BUILD_DEPENDS= ${RUN_DEPENDS} MODCPAN_EXAMPLES= Yes diff --git a/net/p5-Net-INET6Glue/Makefile b/net/p5-Net-INET6Glue/Makefile index ecc0a24b36..b255a40749 100644 --- a/net/p5-Net-INET6Glue/Makefile +++ b/net/p5-Net-INET6Glue/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT = make common perl modules IPv6 ready by hotpatching @@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes MODULES = cpan -USE_GROFF = Yes -RUN_DEPENDS = ::net/p5-IO-Socket-INET6 +USE_GROFF = Yes +RUN_DEPENDS = net/p5-IO-Socket-INET6 .include diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile index f4e77b97df..a32ca28215 100644 --- a/net/p5-Net-IPTrie/Makefile +++ b/net/p5-Net-IPTrie/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:36 espie Exp $ COMMENT= build IPv4 and IPv6 address space hierarchies @@ -12,7 +12,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::net/p5-NetAddr-IP +RUN_DEPENDS= net/p5-NetAddr-IP CONFIGURE_STYLE=modbuild USE_GROFF = Yes diff --git a/net/p5-Net-Jabber/Makefile b/net/p5-Net-Jabber/Makefile index a2efc411a9..21fe5f76ed 100644 --- a/net/p5-Net-Jabber/Makefile +++ b/net/p5-Net-Jabber/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:36 espie Exp $ COMMENT= perl interface to jabber @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Net-XMPP-*:net/p5-Net-XMPP +RUN_DEPENDS= net/p5-Net-XMPP BUILD_DEPENDS= ${RUN_DEPENDS} MODCPAN_EXAMPLES= Yes diff --git a/net/p5-Net-MySQL/Makefile b/net/p5-Net-MySQL/Makefile index 392f1685d0..23558bc8c1 100644 --- a/net/p5-Net-MySQL/Makefile +++ b/net/p5-Net-MySQL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:36 espie Exp $ COMMENT= Pure Perl MySQL network protocol interface @@ -15,9 +15,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Digest-SHA1-*:security/p5-Digest-SHA1 +RUN_DEPENDS= security/p5-Digest-SHA1 MODULES= cpan -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/p5-Net-OAuth/Makefile b/net/p5-Net-OAuth/Makefile index 049d16a49d..bb3381f1ab 100644 --- a/net/p5-Net-OAuth/Makefile +++ b/net/p5-Net-OAuth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= implementation of the OAuth protocol @@ -15,11 +15,11 @@ PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes MODULES= cpan -RUN_DEPENDS= ::devel/p5-Class-Accessor \ - ::devel/p5-Class-Data-Inheritable \ - ::devel/p5-Universal-require \ - ::security/p5-Digest-HMAC \ - ::www/p5-URI +RUN_DEPENDS= devel/p5-Class-Accessor \ + devel/p5-Class-Data-Inheritable \ + devel/p5-Universal-require \ + security/p5-Digest-HMAC \ + www/p5-URI BUILD_DEPENDS= ${RUN_DEPENDS} CONFIGURE_STYLE= modbuild diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile index 4029a0ad95..5e5a1b0f53 100644 --- a/net/p5-Net-Pcap/Makefile +++ b/net/p5-Net-Pcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:36 espie Exp $ SHARED_ONLY= Yes @@ -15,6 +15,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= pcap -RUN_DEPENDS= ::net/p5-IO-Interface +RUN_DEPENDS= net/p5-IO-Interface .include diff --git a/net/p5-Net-Ping-External/Makefile b/net/p5-Net-Ping-External/Makefile index e55d93aad5..2c07ceec63 100644 --- a/net/p5-Net-Ping-External/Makefile +++ b/net/p5-Net-Ping-External/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:36 espie Exp $ COMMENT= alternative Perl interface to ping(1) MODULES= cpan DISTNAME= Net-Ping-External-0.12 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes MAINTAINER= Jasper Lievisse Adriaanse diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile index f2e36191ff..c338ef9868 100644 --- a/net/p5-Net-Radius/Makefile +++ b/net/p5-Net-Radius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl interface to Radius @@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan MODCPAN_EXAMPLES= Yes -USE_GROFF = Yes -REGRESS_DEPENDS= ::devel/p5-Test-Warn +USE_GROFF = Yes +REGRESS_DEPENDS= devel/p5-Test-Warn DATADIR= ${PREFIX}/share/p5-Net-Radius DICTS= dictionary \ diff --git a/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile index cc50b0047f..c0a76d9300 100644 --- a/net/p5-Net-SFTP/Makefile +++ b/net/p5-Net-SFTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:36 espie Exp $ COMMENT= client for the Secure File Transfer Protocol @@ -15,6 +15,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::net/p5-Net-SSH-Perl +RUN_DEPENDS= net/p5-Net-SSH-Perl .include diff --git a/net/p5-Net-SMTP-SSL/Makefile b/net/p5-Net-SMTP-SSL/Makefile index 60027752d3..1e75526825 100644 --- a/net/p5-Net-SMTP-SSL/Makefile +++ b/net/p5-Net-SMTP-SSL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT= SSL support for Net::SMTP @@ -13,6 +13,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::security/p5-IO-Socket-SSL +RUN_DEPENDS= security/p5-IO-Socket-SSL .include diff --git a/net/p5-Net-SMTP-TLS/Makefile b/net/p5-Net-SMTP-TLS/Makefile index e0e62d3b5c..c3cb47e30b 100644 --- a/net/p5-Net-SMTP-TLS/Makefile +++ b/net/p5-Net-SMTP-TLS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl module for SMTP with TLS/AUTH support @@ -13,8 +13,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::security/p5-Digest-HMAC \ - ::security/p5-Net_SSLeay \ - ::security/p5-IO-Socket-SSL +RUN_DEPENDS= security/p5-Digest-HMAC \ + security/p5-Net_SSLeay \ + security/p5-IO-Socket-SSL .include diff --git a/net/p5-Net-SMTP_auth/Makefile b/net/p5-Net-SMTP_auth/Makefile index 485b37883a..6a5741feb5 100644 --- a/net/p5-Net-SMTP_auth/Makefile +++ b/net/p5-Net-SMTP_auth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl module to use authenticated SMTP @@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::security/p5-Digest-HMAC \ - :p5-Authen-SASL->=2.03:security/p5-Authen-SASL +RUN_DEPENDS= security/p5-Digest-HMAC \ + security/p5-Authen-SASL>=2.03 .include diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile index 9b269f6ff7..2f3dbd23c8 100644 --- a/net/p5-Net-SNMP/Makefile +++ b/net/p5-Net-SNMP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl modules to access SNMP @@ -14,9 +14,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Crypt-DES->=2.03:security/p5-Crypt-DES \ - :p5-Digest-HMAC->=1:security/p5-Digest-HMAC \ - :p5-Digest-SHA1->=1.02:security/p5-Digest-SHA1 +RUN_DEPENDS= security/p5-Crypt-DES>=2.03 \ + security/p5-Digest-HMAC>=1 \ + security/p5-Digest-SHA1>=1.02 BUILD_DEPENDS= ${RUN_DEPENDS} .include diff --git a/net/p5-Net-SSH-Expect/Makefile b/net/p5-Net-SSH-Expect/Makefile index 8efe411a6d..e442cef55e 100644 --- a/net/p5-Net-SSH-Expect/Makefile +++ b/net/p5-Net-SSH-Expect/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:36 espie Exp $ COMMENT = ssh wrapper to execute remote interactive commands @@ -16,6 +16,6 @@ PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = ::devel/p5-Expect +RUN_DEPENDS = devel/p5-Expect .include diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile index 89a3666d10..84b5999f79 100644 --- a/net/p5-Net-SSH-Perl/Makefile +++ b/net/p5-Net-SSH-Perl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:36 espie Exp $ COMMENT= perl implementation of the SSH1 and SSH2 protocols @@ -16,16 +16,16 @@ PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} # SSHv1 -RUN_DEPENDS= ::devel/p5-String-CRC32 \ - ::math/p5-Math-GMP +RUN_DEPENDS= devel/p5-String-CRC32 \ + math/p5-Math-GMP # SSHv2 -RUN_DEPENDS+= ::converters/p5-Convert-PEM \ - ::security/p5-Crypt-DH \ - ::security/p5-Crypt-DSA \ - ::security/p5-Crypt-RSA \ - ::security/p5-Digest-BubbleBabble \ - ::security/p5-Digest-HMAC \ - :p5-Digest-SHA1->=2.10:security/p5-Digest-SHA1 +RUN_DEPENDS+= converters/p5-Convert-PEM \ + security/p5-Crypt-DH \ + security/p5-Crypt-DSA \ + security/p5-Crypt-RSA \ + security/p5-Digest-BubbleBabble \ + security/p5-Digest-HMAC \ + security/p5-Digest-SHA1>=2.10 # 03-packet.t just hangs in test 2, known since early 2004 NO_REGRESS= Yes diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile index 988e4444b6..11c20ea183 100644 --- a/net/p5-Net-SSH2/Makefile +++ b/net/p5-Net-SSH2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:36 espie Exp $ SHARED_ONLY = Yes COMMENT = support for the SSH 2 protocol via libssh2 @@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -LIB_DEPENDS = ::security/libssh2 +LIB_DEPENDS = security/libssh2 WANTLIB += crypto ssl z ssh2 diff --git a/net/p5-Net-Telnet-Cisco/Makefile b/net/p5-Net-Telnet-Cisco/Makefile index 7b0a236642..275c418873 100644 --- a/net/p5-Net-Telnet-Cisco/Makefile +++ b/net/p5-Net-Telnet-Cisco/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:36 espie Exp $ COMMENT= module to interact with a Cisco router @@ -6,7 +6,7 @@ MODULES= cpan DISTNAME= Net-Telnet-Cisco-1.10 REVISION= 0 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes HOMEPAGE= http://nettelnetcisco.sourceforge.net/ @@ -16,8 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Net-Telnet->=3.02:net/p5-Net-Telnet \ - :p5-Term-ReadKey->=2.14:devel/p5-Term-ReadKey +RUN_DEPENDS= net/p5-Net-Telnet>=3.02 \ + devel/p5-Term-ReadKey>=2.14 BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile index 2068381e26..108cee30fd 100644 --- a/net/p5-Net-Telnet/Makefile +++ b/net/p5-Net-Telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/18 18:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:36 espie Exp $ COMMENT= perl5 module for interactive network functions @@ -6,7 +6,7 @@ MODULES= cpan DISTNAME= Net-Telnet-3.03 REVISION= 0 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes # Artistic License PERMIT_PACKAGE_CDROM= Yes diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile index d0eb310186..c5052abfea 100644 --- a/net/p5-Net-Traceroute/Makefile +++ b/net/p5-Net-Traceroute/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:36 espie Exp $ COMMENT= traceroute(1) functionality in perl MODULES= cpan DISTNAME= Net-Traceroute-1.10 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes HOMEPAGE= http://www.linnaean.org/~hag/perl/traceroute/traceroute.html diff --git a/net/p5-Net-Twitter/Makefile b/net/p5-Net-Twitter/Makefile index 404c9055b4..99f8dd7f3b 100644 --- a/net/p5-Net-Twitter/Makefile +++ b/net/p5-Net-Twitter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= perl interface to the Twitter API @@ -16,17 +16,17 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan USE_GROFF = Yes -RUN_DEPENDS= ::converters/p5-JSON-Any \ - ::devel/p5-Data-Visitor \ - ::devel/p5-DateTime-Format-Strptime \ - ::devel/p5-MooseX-AttributeHelpers \ - ::devel/p5-MooseX-MultiInitArg \ - ::devel/p5-namespace-autoclean \ - ::net/p5-Net-OAuth \ - ::net/p5-POE-Filter-IRCD +RUN_DEPENDS= converters/p5-JSON-Any \ + devel/p5-Data-Visitor \ + devel/p5-DateTime-Format-Strptime \ + devel/p5-MooseX-AttributeHelpers \ + devel/p5-MooseX-MultiInitArg \ + devel/p5-namespace-autoclean \ + net/p5-Net-OAuth \ + net/p5-POE-Filter-IRCD BUILD_DEPENDS= ${RUN_DEPENDS} -REGRESS_DEPENDS= ::devel/p5-Test-Deep \ - ::devel/p5-Test-Spelling +REGRESS_DEPENDS= devel/p5-Test-Deep \ + devel/p5-Test-Spelling MAKE_ENV= TEST_POD=Yes diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile index 5d22a78235..0dbf741336 100644 --- a/net/p5-Net-Whois-RIPE/Makefile +++ b/net/p5-Net-Whois-RIPE/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:36 espie Exp $ COMMENT = perl implementation of RIPE whois @@ -18,6 +18,6 @@ MODULES = cpan CPAN_AUTHOR = LMC CONFIGURE_STYLE = modbuild -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/p5-Net-Whois-Raw/Makefile b/net/p5-Net-Whois-Raw/Makefile index 0651f4f402..839749852a 100644 --- a/net/p5-Net-Whois-Raw/Makefile +++ b/net/p5-Net-Whois-Raw/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2010/11/19 22:31:36 espie Exp $ COMMENT= extension for unparsed raw whois information @@ -14,10 +14,10 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan CONFIGURE_STYLE= modbuild -USE_GROFF = Yes +USE_GROFF = Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::www/p5-URI \ - ::www/p5-libwww +RUN_DEPENDS= www/p5-URI \ + www/p5-libwww .include diff --git a/net/p5-Net-XMPP/Makefile b/net/p5-Net-XMPP/Makefile index d37d338f99..95ff47d96d 100644 --- a/net/p5-Net-XMPP/Makefile +++ b/net/p5-Net-XMPP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:36 espie Exp $ COMMENT= XMPP perl library @@ -14,10 +14,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= perl modbuild -USE_GROFF = Yes +USE_GROFF = Yes -RUN_DEPENDS= ::security/p5-Digest-SHA1 \ - ::textproc/p5-XML-Stream +RUN_DEPENDS= security/p5-Digest-SHA1 \ + textproc/p5-XML-Stream MODCPAN_EXAMPLES= Yes diff --git a/net/p5-Net-Z3950-Zoom/Makefile b/net/p5-Net-Z3950-Zoom/Makefile index 6496e4e4dd..f2805b28da 100644 --- a/net/p5-Net-Z3950-Zoom/Makefile +++ b/net/p5-Net-Z3950-Zoom/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:36 espie Exp $ SHARED_ONLY= Yes COMMENT= perl interface to yaz zoom @@ -13,8 +13,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::converters/p5-MARC-Record -LIB_DEPENDS= ::net/yaz +RUN_DEPENDS= converters/p5-MARC-Record +LIB_DEPENDS= net/yaz WANTLIB += exslt gcrypt gpg-error m pthread xml2 xslt z yaz diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile index 171f084a63..29e4bc9b52 100644 --- a/net/p5-NetAddr-IP/Makefile +++ b/net/p5-NetAddr-IP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ SHARED_ONLY = Yes @@ -17,6 +17,6 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes MODULES = cpan -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile index 22986b0a0b..c271b18288 100644 --- a/net/p5-NetPacket/Makefile +++ b/net/p5-NetPacket/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl module for encoding/decoding network traffic @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -BUILD_DEPENDS= ::net/p5-Net-Pcap +BUILD_DEPENDS= net/p5-Net-Pcap NO_REGRESS= Yes diff --git a/net/p5-Nmap-Parser/Makefile b/net/p5-Nmap-Parser/Makefile index 8e720da03c..99afdd76e0 100644 --- a/net/p5-Nmap-Parser/Makefile +++ b/net/p5-Nmap-Parser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:36 espie Exp $ COMMENT= perl module for parsing nmap XML reports @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::net/nmap \ - :p5-XML-Twig->=3.16:textproc/p5-XML-Twig +RUN_DEPENDS= net/nmap \ + textproc/p5-XML-Twig>=3.16 .include diff --git a/net/p5-Nmap-Scanner/Makefile b/net/p5-Nmap-Scanner/Makefile index 9c7fce91aa..91a82516a1 100644 --- a/net/p5-Nmap-Scanner/Makefile +++ b/net/p5-Nmap-Scanner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:36 espie Exp $ COMMENT= perform and manipulate nmap scans using Perl @@ -16,10 +16,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::textproc/p5-XML-SAX \ - ::devel/p5-Class-Generate \ - ::www/p5-HTML-Parser \ - ::www/p5-libwww \ - ::net/nmap +RUN_DEPENDS= textproc/p5-XML-SAX \ + devel/p5-Class-Generate \ + www/p5-HTML-Parser \ + www/p5-libwww \ + net/nmap .include diff --git a/net/p5-POE-Component-Client-DNS/Makefile b/net/p5-POE-Component-Client-DNS/Makefile index ca5d7869af..d8ad282779 100644 --- a/net/p5-POE-Component-Client-DNS/Makefile +++ b/net/p5-POE-Component-Client-DNS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:36 espie Exp $ COMMENT= DNS module for the Perl Object Environment @@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-POE \ - ::net/p5-Net-DNS +RUN_DEPENDS= devel/p5-POE \ + net/p5-Net-DNS .include diff --git a/net/p5-POE-Component-Client-HTTP/Makefile b/net/p5-POE-Component-Client-HTTP/Makefile index 25765b051f..f10c896bdd 100644 --- a/net/p5-POE-Component-Client-HTTP/Makefile +++ b/net/p5-POE-Component-Client-HTTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= POE HTTP user-agent component @@ -15,11 +15,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-POE \ - :p5-POE-Component-Client-Keepalive->=0.25:net/p5-POE-Component-Client-Keepalive \ - ::www/p5-URI \ - ::www/p5-libwww +RUN_DEPENDS= devel/p5-POE \ + net/p5-POE-Component-Client-Keepalive>=0.25 \ + www/p5-URI \ + www/p5-libwww -REGRESS_DEPENDS=::devel/p5-Test-POE-Server-TCP +REGRESS_DEPENDS=devel/p5-Test-POE-Server-TCP .include diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile index 1f1a2fad8d..bbf48f17a1 100644 --- a/net/p5-POE-Component-Client-Keepalive/Makefile +++ b/net/p5-POE-Component-Client-Keepalive/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= manage connections, with keep-alive @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-POE \ - ::net/p5-POE-Component-Client-DNS +RUN_DEPENDS= devel/p5-POE \ + net/p5-POE-Component-Client-DNS .include diff --git a/net/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile b/net/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile index 0e89e85c77..45405ab70b 100644 --- a/net/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile +++ b/net/p5-POE-Component-IRC-Plugin-RSS-Headlines/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/23 09:35:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:36 espie Exp $ COMMENT = PoCo::IRC Plugin that provides RSS Headline retrieval @@ -16,9 +16,9 @@ PERMIT_DISTFILES_FTP = Yes MODULES = cpan USE_GROFF = Yes -RUN_DEPENDS = ::net/p5-POE-Component-IRC \ - :p5-POE-Component-Client-HTTP->=0.73:net/p5-POE-Component-Client-HTTP \ - :p5-XML-RSS->1.1:textproc/p5-XML-RSS +RUN_DEPENDS = net/p5-POE-Component-IRC \ + net/p5-POE-Component-Client-HTTP>=0.73 \ + textproc/p5-XML-RSS>1.1 MAKE_ENV+= TEST_POD=Yes diff --git a/net/p5-POE-Component-IRC/Makefile b/net/p5-POE-Component-IRC/Makefile index 7b256764c4..96d9aadc51 100644 --- a/net/p5-POE-Component-IRC/Makefile +++ b/net/p5-POE-Component-IRC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2010/10/24 11:43:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/19 22:31:36 espie Exp $ COMMENT= event-driven IRC-client module @@ -17,14 +17,14 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan MODCPAN_EXAMPLES= Yes -RUN_DEPENDS= ::devel/p5-Object-Pluggable \ - :p5-POE->=1.287:devel/p5-POE \ - :p5-POE-Component-Client-DNS->=0.99:net/p5-POE-Component-Client-DNS \ - :p5-POE-Filter-IRCD->=2.42:net/p5-POE-Filter-IRCD \ - ::archivers/p5-POE-Filter-Zlib +RUN_DEPENDS= devel/p5-Object-Pluggable \ + devel/p5-POE>=1.287 \ + net/p5-POE-Component-Client-DNS>=0.99 \ + net/p5-POE-Filter-IRCD>=2.42 \ + archivers/p5-POE-Filter-Zlib # Not listed in PREREQ_PM, but needed for SSL connections. -RUN_DEPENDS= ::security/p5-POE-Component-SSLify +RUN_DEPENDS= security/p5-POE-Component-SSLify post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p5-POE-Component-IRC diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile index 94c44479fb..e2c70392b9 100644 --- a/net/p5-POE-Component-Jabber/Makefile +++ b/net/p5-POE-Component-Jabber/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:36 espie Exp $ COMMENT= POE Component for communicating over Jabber @@ -14,13 +14,13 @@ PERMIT_DISTFILES_FTP= Yes MODULES= cpan CONFIGURE_STYLE= modbuild -USE_GROFF = Yes +USE_GROFF = Yes -RUN_DEPENDS= ::devel/p5-Filter-Template \ - ::devel/p5-POE-Component-PubSub \ - ::security/p5-Authen-SASL \ - :p5-Net-SSLeay->=1.35:security/p5-Net_SSLeay \ - :p5-POE-Component-SSLify->=0.15:security/p5-POE-Component-SSLify \ - :p5-POE-Filter-XML->=0.35:textproc/p5-POE-Filter-XML +RUN_DEPENDS= devel/p5-Filter-Template \ + devel/p5-POE-Component-PubSub \ + security/p5-Authen-SASL \ + security/p5-Net_SSLeay>=1.35 \ + security/p5-POE-Component-SSLify>=0.15 \ + textproc/p5-POE-Filter-XML>=0.35 .include diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile index 9f1d5efb59..a09a812292 100644 --- a/net/p5-POE-Component-Pcap/Makefile +++ b/net/p5-POE-Component-Pcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ COMMENT= POE interface to Net::Pcap @@ -15,9 +15,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::devel/p5-POE \ - ::net/p5-Net-Pcap \ - ::net/p5-NetPacket +RUN_DEPENDS= devel/p5-POE \ + net/p5-Net-Pcap \ + net/p5-NetPacket # regress requires root privileges and a network connection REGRESS_IS_INTERACTIVE= Yes diff --git a/net/p5-POE-Component-Server-FTP/Makefile b/net/p5-POE-Component-Server-FTP/Makefile index 5a61b72157..c4b6861d7a 100644 --- a/net/p5-POE-Component-Server-FTP/Makefile +++ b/net/p5-POE-Component-Server-FTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:36 espie Exp $ COMMENT= event-based FTP server on a virtual filesystem @@ -14,8 +14,8 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::devel/p5-IO-stringy \ - ::devel/p5-POE \ - ::sysutils/p5-Filesys-Virtual +RUN_DEPENDS= devel/p5-IO-stringy \ + devel/p5-POE \ + sysutils/p5-Filesys-Virtual .include diff --git a/net/p5-POE-Filter-IRCD/Makefile b/net/p5-POE-Filter-IRCD/Makefile index 0e281ee0be..16c908e66c 100644 --- a/net/p5-POE-Filter-IRCD/Makefile +++ b/net/p5-POE-Filter-IRCD/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:36 espie Exp $ COMMENT= POE-based parser for the IRC protocol MODULES= cpan DISTNAME= POE-Filter-IRCD-2.42 CATEGORIES= net -USE_GROFF = Yes +USE_GROFF = Yes MAINTAINER= Jasper Lievisse Adriaanse @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-POE +RUN_DEPENDS= devel/p5-POE BUILD_DEPENDS= ${RUN_DEPENDS} MAKE_ENV= TEST_POD=Yes diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile index c60faf9045..14c499afd9 100644 --- a/net/p5-PlRPC/Makefile +++ b/net/p5-PlRPC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:36 espie Exp $ COMMENT= module for writing rpc servers and clients @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Net-Daemon->=0.13:net/p5-Net-Daemon +RUN_DEPENDS= net/p5-Net-Daemon>=0.13 BUILD_DEPENDS= ${RUN_DEPENDS} CPAN_AUTHOR= JWIED diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile index f99956a696..570d833bb6 100644 --- a/net/p5-RPC-XML/Makefile +++ b/net/p5-RPC-XML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:36 espie Exp $ COMMENT= perl implementation of XML-RPC @@ -16,11 +16,11 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes USE_GMAKE= Yes -RUN_DEPENDS= ::www/p5-libwww \ - ::textproc/p5-XML-Parser -REGRESS_DEPENDS= ::www/mod_perl \ - ::devel/p5-Net-Server \ - ::devel/p5-Test-Pod \ - ::devel/p5-Test-Pod-Coverage +RUN_DEPENDS= www/p5-libwww \ + textproc/p5-XML-Parser +REGRESS_DEPENDS= www/mod_perl \ + devel/p5-Net-Server \ + devel/p5-Test-Pod \ + devel/p5-Test-Pod-Coverage .include diff --git a/net/p5-SNMP-BridgeQuery/Makefile b/net/p5-SNMP-BridgeQuery/Makefile index 91f3daf400..6e2009996a 100644 --- a/net/p5-SNMP-BridgeQuery/Makefile +++ b/net/p5-SNMP-BridgeQuery/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:36 espie Exp $ COMMENT= Perl extension for retrieving bridge tables @@ -14,6 +14,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::net/p5-Net-SNMP +RUN_DEPENDS= net/p5-Net-SNMP .include diff --git a/net/p5-SNMP-Info/Makefile b/net/p5-SNMP-Info/Makefile index 6e50e6892c..fdf4325d69 100644 --- a/net/p5-SNMP-Info/Makefile +++ b/net/p5-SNMP-Info/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:36 espie Exp $ COMMENT= perl5 interface to network devices and MIBs through SNMP MODULES= cpan @@ -15,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=SNMP/} -RUN_DEPENDS= ::net/net-snmp,-perl +RUN_DEPENDS= net/net-snmp,-perl CONFIGURE_STYLE= perl USE_GROFF = Yes diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile index 2767d65ebf..903a6463e6 100644 --- a/net/p5-Validate-Net/Makefile +++ b/net/p5-Validate-Net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:37 espie Exp $ COMMENT= module to format validation for Net:: related strings @@ -17,6 +17,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/p5-Class-Default +RUN_DEPENDS= devel/p5-Class-Default .include diff --git a/net/p5-flowd/Makefile b/net/p5-flowd/Makefile index 9e04216655..d08bef464b 100644 --- a/net/p5-flowd/Makefile +++ b/net/p5-flowd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -22,9 +22,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www2.mindrot.org/files/flowd/ WRKSRC= ${WRKDIR}/${DISTNAME}/Flowd-perl -BUILD_DEPENDS= ::net/flowd +BUILD_DEPENDS= net/flowd CONFIGURE_STYLE= perl -USE_GROFF = Yes +USE_GROFF = Yes post-patch: perl -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/Makefile.PL diff --git a/net/packit/Makefile b/net/packit/Makefile index 70b49120d8..11402ad55a 100644 --- a/net/packit/Makefile +++ b/net/packit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:37 espie Exp $ COMMENT= packet generation tool DISTNAME= packit-1.0 @@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= :libnet->=1.1,<1.2:net/libnet/1.1 -WANTLIB= c pcap lib/libnet-1.1/net.=11 +LIB_DEPENDS= libnet->=1.1,<1.2:net/libnet/1.1 +WANTLIB= c pcap lib/libnet-1.1/net=11 CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libnet-includes=${LOCALBASE}/include/libnet-1.1 \ diff --git a/net/papyon/Makefile b/net/papyon/Makefile index cd6d2fdafe..cc91d72717 100644 --- a/net/papyon/Makefile +++ b/net/papyon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/09/23 13:33:30 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ COMMENT= fork of pymsn to support telepathy-butterfly @@ -19,9 +19,9 @@ MASTER_SITES= http://www.freedesktop.org/software/papyon/releases/ MODULES= lang/python BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::devel/py-gobject \ - ::security/py-crypto \ - ::security/py-openssl +RUN_DEPENDS= devel/py-gobject \ + security/py-crypto \ + security/py-openssl NO_REGRESS= Yes diff --git a/net/pavuk/Makefile b/net/pavuk/Makefile index 3b7354aa35..3f49790ffb 100644 --- a/net/pavuk/Makefile +++ b/net/pavuk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:37 espie Exp $ COMMENT= tool to mirror contents of HTTP and FTP servers @@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ USE_GROFF = Yes .if !${FLAVOR:L:Mno_x11} -LIB_DEPENDS+= ::x11/gtk+2 +LIB_DEPENDS+= x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 cairo expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 diff --git a/net/pcapdiff/Makefile b/net/pcapdiff/Makefile index 6e0b5d93d2..2e7cfd43cd 100644 --- a/net/pcapdiff/Makefile +++ b/net/pcapdiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/08/30 21:14:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:37 espie Exp $ COMMENT = compare pcap dump files @@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = http://www.eff.org/files/ MODULES = lang/python -RUN_DEPENDS = ::net/py-pcapy +RUN_DEPENDS = net/py-pcapy NO_REGRESS = Yes diff --git a/net/pcapmerge/Makefile b/net/pcapmerge/Makefile index b4f4f88cd4..444c9f5e74 100644 --- a/net/pcapmerge/Makefile +++ b/net/pcapmerge/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:37 espie Exp $ COMMENT= merge and extract portions of binary pcap files @@ -8,7 +8,7 @@ CATEGORIES= net perl5 MASTER_SITES= ${MASTER_SITE_PACKETSTORM:=sniffers/} -RUN_DEPENDS= :p5-Net-Pcap->=0.03:net/p5-Net-Pcap +RUN_DEPENDS= net/p5-Net-Pcap>=0.03 BUILD_DEPENDS= ${RUN_DEPENDS} MAINTAINER= Brian Caswell diff --git a/net/pear-HTTP-Request/Makefile b/net/pear-HTTP-Request/Makefile index 8b9c8fbdc5..a16de09b4b 100644 --- a/net/pear-HTTP-Request/Makefile +++ b/net/pear-HTTP-Request/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/07/12 22:07:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:37 espie Exp $ COMMENT= provide an easy way to perform HTTP requests @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::net/pear-Net-URL \ - :pear-Net-Socket->=1.0.9:net/pear-Net-Socket +RUN_DEPENDS= net/pear-Net-URL \ + net/pear-Net-Socket>=1.0.9 .include diff --git a/net/pear-Net-DNS/Makefile b/net/pear-Net-DNS/Makefile index b794c83753..b5ee21e314 100644 --- a/net/pear-Net-DNS/Makefile +++ b/net/pear-Net-DNS/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/03/21 00:04:15 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ COMMENT= resolver library used to communicate with a DNS server @@ -15,6 +15,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PKG_ARCH= * -RUN_DEPENDS= ::www/php5/extensions,-mhash +RUN_DEPENDS= www/php5/extensions,-mhash .include diff --git a/net/pear-Net-IMAP/Makefile b/net/pear-Net-IMAP/Makefile index 23365df5f8..a1ac2d4a04 100644 --- a/net/pear-Net-IMAP/Makefile +++ b/net/pear-Net-IMAP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/03/21 01:17:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:37 espie Exp $ COMMENT= implementation of the IMAP protocol for PHP @@ -8,8 +8,8 @@ CATEGORIES= net MODULES= www/pear -RUN_DEPENDS+= :pear-Net-Socket->=1.0.8:net/pear-Net-Socket \ - :pear-Auth-SASL->=1.0.2:security/pear-Auth-SASL +RUN_DEPENDS+= net/pear-Net-Socket>=1.0.8 \ + security/pear-Auth-SASL>=1.0.2 # PHP License PERMIT_PACKAGE_CDROM= Yes diff --git a/net/pear-Net-LDAP/Makefile b/net/pear-Net-LDAP/Makefile index 86b7b3ea81..c201e79e76 100644 --- a/net/pear-Net-LDAP/Makefile +++ b/net/pear-Net-LDAP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/12 22:07:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:37 espie Exp $ COMMENT= pear ldap @@ -15,6 +15,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::www/php5/extensions,-ldap +RUN_DEPENDS= www/php5/extensions,-ldap .include diff --git a/net/pear-Net-SMTP/Makefile b/net/pear-Net-SMTP/Makefile index b56dcbe703..0291555aab 100644 --- a/net/pear-Net-SMTP/Makefile +++ b/net/pear-Net-SMTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/03/21 01:17:33 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:37 espie Exp $ COMMENT= SMTP support for PHP @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :pear-Net-Socket->=1.0.7:net/pear-Net-Socket \ - ::security/pear-Auth-SASL +RUN_DEPENDS= net/pear-Net-Socket>=1.0.7 \ + security/pear-Auth-SASL .include diff --git a/net/pear-Net-URL-Mapper/Makefile b/net/pear-Net-URL-Mapper/Makefile index a617d0a3a7..2c133828c2 100644 --- a/net/pear-Net-URL-Mapper/Makefile +++ b/net/pear-Net-URL-Mapper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/11/18 11:13:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:37 espie Exp $ COMMENT= simple and flexible way to build nice URLs @@ -14,6 +14,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::net/pear-Net-URL +RUN_DEPENDS= net/pear-Net-URL .include diff --git a/net/pear-Services-Weather/Makefile b/net/pear-Services-Weather/Makefile index 59dab2e5d7..bd768b4649 100644 --- a/net/pear-Services-Weather/Makefile +++ b/net/pear-Services-Weather/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/07/12 22:07:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:37 espie Exp $ COMMENT= interface to various online weather-services for PHP @@ -15,8 +15,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :pear-Cache-*:devel/pear-Cache \ - :pear-HTTP-Request-*:net/pear-HTTP-Request \ - :pear-XML-Serializer-*:textproc/pear-XML-Serializer +RUN_DEPENDS= devel/pear-Cache \ + net/pear-HTTP-Request \ + textproc/pear-XML-Serializer .include diff --git a/net/pear-Services-oEmbed/Makefile b/net/pear-Services-oEmbed/Makefile index 60f84d54fe..b11865520c 100644 --- a/net/pear-Services-oEmbed/Makefile +++ b/net/pear-Services-oEmbed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2009/11/18 19:15:13 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:37 espie Exp $ COMMENT= interface to oEmbed @@ -14,8 +14,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::devel/pear-Validate \ - ::net/pear-Net-URL2 \ - ::net/pear-HTTP-Request +RUN_DEPENDS= devel/pear-Validate \ + net/pear-Net-URL2 \ + net/pear-HTTP-Request .include diff --git a/net/pen/Makefile b/net/pen/Makefile index 73d60b2101..3b8a2960ef 100644 --- a/net/pen/Makefile +++ b/net/pen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:37 espie Exp $ COMMENT= load balancer for simple TCP-based protocols @@ -21,7 +21,7 @@ WANTLIB= c CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-docdir=${PREFIX}/share/doc/pen -USE_GROFF = Yes +USE_GROFF = Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pen diff --git a/net/pfflowd/Makefile b/net/pfflowd/Makefile index 949502ffe9..5748d14cce 100644 --- a/net/pfflowd/Makefile +++ b/net/pfflowd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:37 espie Exp $ COMMENT= PF to NetFlow converter @@ -22,7 +22,7 @@ WANTLIB= c pcap util NO_REGRESS= Yes MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" -USE_GROFF = Yes +USE_GROFF = Yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pfflowd ${PREFIX}/sbin diff --git a/net/pfstat/Makefile b/net/pfstat/Makefile index 491b5e8d22..5fa9f5613f 100644 --- a/net/pfstat/Makefile +++ b/net/pfstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/11/06 10:18:38 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/19 22:31:37 espie Exp $ COMMENT-main= packet filter statistics visualization COMMENT-daemon= pfstat daemon @@ -22,14 +22,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -BUILD_DEPENDS= ::graphics/gd +BUILD_DEPENDS= graphics/gd MODULES= converters/libiconv MULTI_PACKAGES= -main -daemon -WANTLIB-main= ${MODLIBICONV_WANTLIB} c m z jpeg png gd.>=20 -LIB_DEPENDS-main= ${MODLIBICONV_LIB_DEPENDS} ::graphics/gd +WANTLIB-main= ${MODLIBICONV_WANTLIB} c m z jpeg png gd>=20 +LIB_DEPENDS-main= ${MODLIBICONV_LIB_DEPENDS} graphics/gd WANTLIB-daemon= c LIB_DEPENDS-daemon= RUN_DEPENDS-daemon= diff --git a/net/php-weathermap/Makefile b/net/php-weathermap/Makefile index 482bd0340d..8474e03208 100644 --- a/net/php-weathermap/Makefile +++ b/net/php-weathermap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/12 22:07:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:37 espie Exp $ COMMENT= graphical network traffic map @@ -20,9 +20,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}files/ -RUN_DEPENDS= :pear-*:www/pear \ - :php5-gd-*:www/php5/extensions,-gd \ - :php5-core-*:www/php5/core +RUN_DEPENDS= www/pear \ + www/php5/extensions,-gd \ + www/php5/core NO_REGRESS= Yes diff --git a/net/pidgin-facebookchat/Makefile b/net/pidgin-facebookchat/Makefile index c5e2bdb7f1..dca6a22b8a 100644 --- a/net/pidgin-facebookchat/Makefile +++ b/net/pidgin-facebookchat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY = Yes @@ -25,9 +25,9 @@ EXTRACT_SUFX = .tar.bz2 WRKDIST = ${WRKDIR}/pidgin-facebookchat BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :libpurple->=2.0.0:net/pidgin -LIB_DEPENDS = :json-glib->=0.7.6:devel/json-glib -WANTLIB = json-glib-1.0.>=1.0 +RUN_DEPENDS = net/pidgin>=2.0.0 +LIB_DEPENDS = devel/json-glib>=0.7.6 +WANTLIB = json-glib-1.0>=1.0 MAKE_FLAGS = LINUX32_COMPILER="${CC}" LOCALBASE=${LOCALBASE} ALL_TARGET = libfacebook.so diff --git a/net/pidgin-icb/Makefile b/net/pidgin-icb/Makefile index 2beb57d4b1..23527586ca 100644 --- a/net/pidgin-icb/Makefile +++ b/net/pidgin-icb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/07/12 22:07:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM= Yes MASTER_SITES= ${HOMEPAGE} BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :pidgin->=2.0.0:net/pidgin +RUN_DEPENDS= net/pidgin>=2.0.0 NO_REGRESS= Yes diff --git a/net/pidgin-tlen/Makefile b/net/pidgin-tlen/Makefile index 2488a400e1..9ee1dba6e6 100644 --- a/net/pidgin-tlen/Makefile +++ b/net/pidgin-tlen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/07/07 00:34:04 brad Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes MASTER_SITES= ${HOMEPAGE} BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :pidgin->=2.4.1:net/pidgin +RUN_DEPENDS= net/pidgin>=2.4.1 NO_REGRESS= Yes diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile index 5a51015706..e95c6b4f13 100644 --- a/net/pidgin/Makefile +++ b/net/pidgin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.80 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.81 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -47,7 +47,7 @@ WANTLIB-main= X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \ startup-notification-1 purple \ xcb-aux xcb-event xcb-render xcb-render-util xcb ${WANTLIB} -WANTLIB-libpurple= crypto ssl silc.>=7 silcclient.>=5 meanwhile gadu.>=4 \ +WANTLIB-libpurple= crypto ssl silc>=7 silcclient>=5 meanwhile gadu>=4 \ ${WANTLIB} WANTLIB-finch= X11 Xau Xdmcp ncurses panel pthread-stubs xcb purple ${WANTLIB} @@ -58,20 +58,20 @@ MODULES= devel/gettext \ lang/python \ devel/gconf2 -BUILD_DEPENDS= ::x11/dbus-python -RUN_DEPENDS-main= ::x11/dbus-python \ - ::x11/py-gtk2 \ - ::devel/desktop-file-utils +BUILD_DEPENDS= x11/dbus-python +RUN_DEPENDS-main= x11/dbus-python \ + x11/py-gtk2 \ + devel/desktop-file-utils LIB_DEPENDS-main= ${LIB_DEPENDS} \ - :startup-notification->=0.10:devel/startup-notification + devel/startup-notification>=0.10 RUN_DEPENDS-finch= # empty LIB_DEPENDS-finch= ${LIB_DEPENDS} \ ${MODPY_LIB_DEPENDS} RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS} LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \ - ::devel/silc-toolkit \ - ::net/meanwhile \ - ::net/libgadu + devel/silc-toolkit \ + net/meanwhile \ + net/libgadu MODGCONF2_SCHEMAS_DIR= pidgin MODGCONF2_LIBDEP= No @@ -113,15 +113,15 @@ FLAVOR?= MULTI_PACKAGES= -main -finch -libpurple .if ${FLAVOR:L:Maudio} -LIB_DEPENDS+= :gstreamer->=0.10,<=0.11:multimedia/gstreamer-0.10/core \ - ::multimedia/gstreamer-0.10/plugins-base +LIB_DEPENDS+= gstreamer->=0.10,<=0.11:multimedia/gstreamer-0.10/core \ + multimedia/gstreamer-0.10/plugins-base WANTLIB += gstreamer-0.10 gstinterfaces-0.10 -LIB_DEPENDS-main+= :libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple -LIB_DEPENDS-finch+= :libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-main+= libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-finch+= libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple .else CONFIGURE_ARGS+= --disable-gstreamer -LIB_DEPENDS-main+= :libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple -LIB_DEPENDS-finch+= :libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-main+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple +LIB_DEPENDS-finch+= libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple .endif .if ${FLAVOR:L:Mdebug} @@ -130,7 +130,7 @@ DEBUG= -O0 -g .endif .if ${FLAVOR:L:Mgtkspell} -LIB_DEPENDS-main+= ::textproc/gtkspell +LIB_DEPENDS-main+= textproc/gtkspell WANTLIB-main+= enchant gtkspell .else CONFIGURE_ARGS+= --disable-gtkspell diff --git a/net/pktstat/Makefile b/net/pktstat/Makefile index f02e4feae0..4f5533e3d7 100644 --- a/net/pktstat/Makefile +++ b/net/pktstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:37 espie Exp $ COMMENT= network traffic viewer DISTNAME= pktstat-1.8.4 @@ -20,6 +20,6 @@ WANTLIB= c m pcap termlib MASTER_SITES= ${HOMEPAGE} CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/plushs/Makefile b/net/plushs/Makefile index 79630eafa1..27bf151f82 100644 --- a/net/plushs/Makefile +++ b/net/plushs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ COMMENT= simple hostname scanner @@ -19,7 +19,7 @@ WANTLIB= c SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes post-install: diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile index 0c99a8c135..fea7ec2ac2 100644 --- a/net/pmacct/Makefile +++ b/net/pmacct/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:37 espie Exp $ COMMENT= IP accounting software @@ -13,11 +13,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m pcap z sqlite3.>=8 +WANTLIB= c m pcap z sqlite3>=8 MASTER_SITES= ${HOMEPAGE} -LIB_DEPENDS+= ::databases/sqlite3 +LIB_DEPENDS+= databases/sqlite3 CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --enable-64bit \ @@ -32,8 +32,8 @@ FLAVORS= mysql postgresql threads FLAVOR?= .if ${FLAVOR:L:Mpostgresql} -LIB_DEPENDS+= ::databases/postgresql -WANTLIB += pq.>=2 +LIB_DEPENDS+= databases/postgresql +WANTLIB += pq>=2 CONFIGURE_ARGS+= --enable-pgsql \ --with-pgsql-includes="${LOCALBASE}/include/postgresql/" .else @@ -41,8 +41,8 @@ CONFIGURE_ARGS+= --disable-pgsql .endif .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= ::databases/mysql -WANTLIB += lib/mysql/mysqlclient.>=10 +LIB_DEPENDS+= databases/mysql +WANTLIB += lib/mysql/mysqlclient>=10 CONFIGURE_ARGS+= --enable-mysql .else CONFIGURE_ARGS+= --disable-mysql diff --git a/net/poco/Makefile b/net/poco/Makefile index 4d1d227a9e..8c829d5e76 100644 --- a/net/poco/Makefile +++ b/net/poco/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/09 16:59:31 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:37 espie Exp $ COMMENT = POCO C++ libraries for network based applications @@ -25,10 +25,10 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += c crypto m pthread ssl stdc++ iodbc iodbcinst mysqlclient WANTLIB += expat pcre sqlite3 z -LIB_DEPENDS = ::databases/iodbc \ - ::databases/mysql \ - ::databases/sqlite3 \ - ::devel/pcre +LIB_DEPENDS = databases/iodbc \ + databases/mysql \ + databases/sqlite3 \ + devel/pcre USE_GMAKE = Yes SEPARATE_BUILD = simple diff --git a/net/poptop/Makefile b/net/poptop/Makefile index 132e3a78dc..8fced3c96e 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/12 15:04:51 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:37 espie Exp $ COMMENT= PPTP Server @@ -26,7 +26,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-bsdppp --with-pppd-ip-alloc FAKE_FLAGS= DESTDIR= USE_GMAKE= Yes -USE_GROFF = Yes +USE_GROFF = Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/poptop diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile index f88a3ca62e..9fa79c1b8d 100644 --- a/net/powerdns/Makefile +++ b/net/powerdns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -36,7 +36,7 @@ MASTER_SITES= http://downloads.powerdns.com/releases/ USE_GROFF = Yes NO_REGRESS= Yes -BUILD_DEPENDS= ::devel/boost +BUILD_DEPENDS= devel/boost PSEUDO_FLAVORS+= no_mysql no_pgsql no_sqlite no_sqlite3 FLAVOR?= @@ -49,9 +49,9 @@ CONFIGURE_ARGS+= --without-mysql .else MULTI_PACKAGES+= -mysql CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -LIB_DEPENDS-mysql= ::databases/mysql -RUN_DEPENDS-mysql= :${FULLPKGNAME-main}:net/powerdns -WANTLIB-mysql+= crypto m ssl z lib/mysql/mysqlclient.>=10 +LIB_DEPENDS-mysql= databases/mysql +RUN_DEPENDS-mysql= ${FULLPKGNAME-main}:net/powerdns +WANTLIB-mysql+= crypto m ssl z lib/mysql/mysqlclient>=10 BACKENDS+= gmysql .endif @@ -62,9 +62,9 @@ CONFIGURE_ARGS+= --without-pgsql MULTI_PACKAGES+= -pgsql CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} \ --with-pgsql-includes=${LOCALBASE}/include/postgresql -LIB_DEPENDS-pgsql= ::databases/postgresql,-main -RUN_DEPENDS-pgsql= :${FULLPKGNAME-main}:net/powerdns -WANTLIB-pgsql= crypto ssl z pq.>=2 +LIB_DEPENDS-pgsql= databases/postgresql,-main +RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns +WANTLIB-pgsql= crypto ssl z pq>=2 BACKENDS+= gpgsql .endif @@ -75,9 +75,9 @@ CONFIGURE_ARGS+= --without-sqlite MULTI_PACKAGES+= -sqlite CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \ --with-sqlite-includes=${LOCALBASE}/include -LIB_DEPENDS-sqlite= ::databases/sqlite -RUN_DEPENDS-sqlite= :${FULLPKGNAME-main}:net/powerdns -WANTLIB-sqlite+= z sqlite.>=8 +LIB_DEPENDS-sqlite= databases/sqlite +RUN_DEPENDS-sqlite= ${FULLPKGNAME-main}:net/powerdns +WANTLIB-sqlite+= z sqlite>=8 BACKENDS+= gsqlite .endif @@ -88,9 +88,9 @@ CONFIGURE_ARGS+= --without-sqlite3 MULTI_PACKAGES+= -sqlite3 CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} \ --with-sqlite3-includes=${LOCALBASE}/include -LIB_DEPENDS-sqlite3= ::databases/sqlite3 -RUN_DEPENDS-sqlite3= :${FULLPKGNAME-main}:net/powerdns -WANTLIB-sqlite3+= z sqlite3.>=8 +LIB_DEPENDS-sqlite3= databases/sqlite3 +RUN_DEPENDS-sqlite3= ${FULLPKGNAME-main}:net/powerdns +WANTLIB-sqlite3+= z sqlite3>=8 BACKENDS+= gsqlite3 .endif @@ -99,8 +99,8 @@ BACKENDS+= gsqlite3 CONFIGURE_ARGS+= --without-ldap .else MULTI_PACKAGES+= -ldap -LIB_DEPENDS-ldap= ::databases/openldap -RUN_DEPENDS-ldap= :${FULLPKGNAME-main}:net/powerdns +LIB_DEPENDS-ldap= databases/openldap +RUN_DEPENDS-ldap= ${FULLPKGNAME-main}:net/powerdns CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} \ --with-ldap-includes=${LOCALBASE}/include WANTLIB-ldap+= asn1 com_err crypto gssapi krb5 sasl2 ssl z lber ldap_r diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 04768ad7dd..936e6217ac 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -21,13 +21,13 @@ PERMIT_PACKAGE_FTP= Yes USE_GMAKE= Yes USE_GROFF = Yes MODULES= lang/lua -LIB_DEPENDS= ::devel/libidn \ - ::lang/lua -RUN_DEPENDS+= ::archivers/luazlib \ - ::devel/luaevent \ - ::devel/luafs \ - ::security/luasec \ - ::textproc/luaexpat +LIB_DEPENDS= devel/libidn \ + lang/lua +RUN_DEPENDS+= archivers/luazlib \ + devel/luaevent \ + devel/luafs \ + security/luasec \ + textproc/luaexpat WANTLIB+= crypto idn lua CONFIGURE_STYLE=simple diff --git a/net/psi/Makefile b/net/psi/Makefile index 473591dc29..df6a5cfe26 100644 --- a/net/psi/Makefile +++ b/net/psi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:37 espie Exp $ COMMENT= multiplatform Jabber client @@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xext Xss m c pthread pthread-stubs stdc++ xcb z \ - qca.>=1 + qca>=1 MODULES= x11/qt3 @@ -26,8 +26,8 @@ MODQT_OVERRIDE_UIC= No USE_GMAKE= Yes -LIB_DEPENDS= ::security/qca -RUN_DEPENDS= ::security/qca-tls +LIB_DEPENDS= security/qca +RUN_DEPENDS= security/qca-tls CONFIGURE_STYLE= simple diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile index c99619487a..669ce91ad8 100644 --- a/net/pure-ftpd/Makefile +++ b/net/pure-ftpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.52 2010/11/19 22:31:37 espie Exp $ COMMENT= small, easy to set up, fast and very secure FTP server @@ -40,16 +40,16 @@ FLAVORS= ldap mysql postgresql virtual_chroot FLAVOR?= .if ${FLAVOR:L:Mldap} -LIB_DEPENDS+= :openldap-client->=2,<3:databases/openldap -WANTLIB += ldap.>=2 lber +LIB_DEPENDS+= openldap-client->=2,<3:databases/openldap +WANTLIB += ldap>=2 lber CONFIGURE_ARGS+= --with-ldap="${LOCALBASE}" DOCS+= README.LDAP pureftpd.schema CONF_FILE+= pureftpd-ldap.conf .endif .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= ::databases/mysql -WANTLIB += lib/mysql/mysqlclient.>=10 +LIB_DEPENDS+= databases/mysql +WANTLIB += lib/mysql/mysqlclient>=10 CONFIGURE_ARGS+= --with-mysql="${LOCALBASE}" DOCS+= README.MySQL CONF_FILE+= pureftpd-mysql.conf @@ -57,8 +57,8 @@ WANTLIB+= m z .endif .if ${FLAVOR:L:Mpostgresql} -LIB_DEPENDS+= ::databases/postgresql -WANTLIB += pq.>=2 +LIB_DEPENDS+= databases/postgresql +WANTLIB += pq>=2 CONFIGURE_ARGS+= --with-pgsql="${LOCALBASE}" DOCS+= README.PGSQL CONF_FILE+= pureftpd-pgsql.conf diff --git a/net/putty/Makefile b/net/putty/Makefile index 2b330de13c..bcc9717bd3 100644 --- a/net/putty/Makefile +++ b/net/putty/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:37 espie Exp $ COMMENT-main= SSH and telnet client COMMENT-gui= PuTTY GUI clients @@ -24,14 +24,14 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu WRKBUILD= ${WRKSRC}/unix -USE_GROFF = Yes +USE_GROFF = Yes MULTI_PACKAGES= -main -gui WANTLIB= c WANTLIB-gui= X11 Xext Xi c glib gmodule iconv intl m \ - pthread-stubs xcb gtk.>=1 gdk.>=1 -LIB_DEPENDS-gui= ::x11/gtk+ + pthread-stubs xcb gtk>=1 gdk>=1 +LIB_DEPENDS-gui= x11/gtk+ pre-configure: cd ${WRKSRC} && ./mkfiles.pl diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile index d22749a422..3ae64d4501 100644 --- a/net/py-GeoIP/Makefile +++ b/net/py-GeoIP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ COMMENT = GeoIP Python API @@ -22,8 +22,8 @@ MASTER_SITES = http://geolite.maxmind.com/download/geoip/api/python/ MODULES = lang/python -LIB_DEPENDS = ::net/GeoIP -WANTLIB = GeoIP.>=7 +LIB_DEPENDS = net/GeoIP +WANTLIB = GeoIP>=7 EXAMPLEDIR = ${PREFIX}/share/examples/py-GeoIP NO_REGRESS = Yes diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile index 61aba21aae..8364a79ac1 100644 --- a/net/py-adns/Makefile +++ b/net/py-adns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -22,7 +22,7 @@ MASTER_SITES= ${HOMEPAGE}/files/ MODULES= lang/python CATEGORIES = net -LIB_DEPENDS= ::net/adns +LIB_DEPENDS= net/adns WANTLIB = adns NO_REGRESS= Yes diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile index 4a01216c9e..2b39d8a85f 100644 --- a/net/py-curl/Makefile +++ b/net/py-curl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -23,8 +23,8 @@ MASTER_SITES= ${HOMEPAGE}download/ \ MODULES= lang/python -LIB_DEPENDS= ::net/curl -WANTLIB= crypto idn ssl z curl.>=12 +LIB_DEPENDS= net/curl +WANTLIB= crypto idn ssl z curl>=12 do-regress: fake @cd ${WRKSRC}/tests && ${MAKE_ENV} \ diff --git a/net/py-flowd/Makefile b/net/py-flowd/Makefile index ccebf1873a..adc5cb3408 100644 --- a/net/py-flowd/Makefile +++ b/net/py-flowd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/08/30 21:21:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www2.mindrot.org/files/flowd/ -BUILD_DEPENDS= ::net/flowd +BUILD_DEPENDS= net/flowd MODULES= lang/python MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/flowd" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/py-flowtools/Makefile b/net/py-flowtools/Makefile index 769b777525..c242249da0 100644 --- a/net/py-flowtools/Makefile +++ b/net/py-flowtools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/11 16:27:55 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -23,7 +23,7 @@ WANTLIB+= z ft HOMEPAGE= http://code.google.com/p/pyflowtools/ MASTER_SITES= http://pyflowtools.googlecode.com/files/ -LIB_DEPENDS= ::net/flow-tools +LIB_DEPENDS= net/flow-tools MODULES= lang/python NO_REGRESS= Yes diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile index 1251bba04d..89cae0cfb3 100644 --- a/net/py-impacket/Makefile +++ b/net/py-impacket/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/08/30 21:21:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:37 espie Exp $ COMMENT = Python classes providing access to network packets @@ -23,8 +23,8 @@ MODULES = lang/python # one example also uses python-tkinter, but it's pretty heavy and # not required for normal use. -RUN_DEPENDS = ::security/py-crypto \ - ::net/py-pcapy +RUN_DEPENDS = security/py-crypto \ + net/py-pcapy NO_REGRESS = Yes diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile index aca7a9380b..652d4d68e0 100644 --- a/net/py-libpcap/Makefile +++ b/net/py-libpcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/08/30 21:21:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -22,7 +22,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pylibpcap/} MODULES= lang/python -BUILD_DEPENDS= :swig-*:devel/swig +BUILD_DEPENDS= devel/swig NO_REGRESS= Yes diff --git a/net/py-nmap/Makefile b/net/py-nmap/Makefile index 1d7307bcd0..961ad0f693 100644 --- a/net/py-nmap/Makefile +++ b/net/py-nmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/10/16 08:58:56 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:37 espie Exp $ COMMENT = python interface to the nmap scan data @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES = lang/python -RUN_DEPENDS = ::net/nmap +RUN_DEPENDS = net/nmap NO_REGRESS = Yes diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile index da61ae4797..9331b5dfb9 100644 --- a/net/py-pcs/Makefile +++ b/net/py-pcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/08/30 21:21:54 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= pcap -BUILD_DEPENDS= ::devel/pyrex +BUILD_DEPENDS= devel/pyrex NO_REGRESS= Yes diff --git a/net/py-xmpp/Makefile b/net/py-xmpp/Makefile index 93a4290bcc..29aa5e098f 100644 --- a/net/py-xmpp/Makefile +++ b/net/py-xmpp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/08/30 21:21:54 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:37 espie Exp $ COMMENT= Python XMPP and Jabber implementation @@ -23,9 +23,9 @@ MASTER_SITES= ${HOMEPAGE}downloads/ MODULES= lang/python -BUILD_DEPENDS= :py-libxml-*:textproc/libxml,-python -RUN_DEPENDS= :py-libxml-*:textproc/libxml,-python \ - :py-dnspython-*:net/py-dnspython +BUILD_DEPENDS= textproc/libxml,-python +RUN_DEPENDS= textproc/libxml,-python \ + net/py-dnspython REGRESS_DEPENDS=${RUN_DEPENDS} post-install: diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile index b029678247..197e0fe4bc 100644 --- a/net/py-zsi/Makefile +++ b/net/py-zsi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/08/30 21:21:54 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:37 espie Exp $ COMMENT= Zolera SOAP Infrastructure @@ -24,11 +24,11 @@ MODULES= lang/python MODPY_SETUPTOOLS=Yes BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::textproc/py-xml +RUN_DEPENDS= textproc/py-xml # regress needs network access REGRESS_IS_INTERACTIVE=Yes -REGRESS_DEPENDS=::${BUILD_PKGPATH} +REGRESS_DEPENDS=${BUILD_PKGPATH} do-regress: find ${WRKSRC}/test -name \*.py -exec ${MODPY_BIN} {} \; diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 438987fe57..3546ed3461 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:37 espie Exp $ COMMENT= multi-threaded routing daemon @@ -21,7 +21,7 @@ WANTLIB= c curses m readline termcap STATEDIR?= /var/quagga SUBST_VARS= CONFDIR STATEDIR -BUILD_DEPENDS= ::lang/gawk +BUILD_DEPENDS= lang/gawk USE_GMAKE= Yes USE_GROFF = Yes CONFDIR= ${SYSCONFDIR}/quagga @@ -45,7 +45,7 @@ FAKE_FLAGS= exampledir='${PREFIX}/share/examples/quagga' FLAVOR?= .if ${FLAVOR:L:Msnmp} -LIB_DEPENDS= ::net/net-snmp +LIB_DEPENDS= net/net-snmp CONFIGURE_ARGS+= --enable-snmp CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index f6d14e54e8..eb287dd578 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:37 espie Exp $ COMMENT = highly reliable Enterprise Messaging System @@ -29,8 +29,8 @@ USE_GROFF = Yes CONFIGURE_STYLE = none BUILD_DEPENDS = ${RUN_DEPENDS} \ - ::devel/py-simplejson -RUN_DEPENDS = ::lang/erlang + devel/py-simplejson +RUN_DEPENDS = lang/erlang MAKE_ENV = PYTHON=${MODPY_BIN} diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index c23fc65a3a..07f88005bf 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/19 22:31:37 espie Exp $ COMMENT= Cistron RADIUS server @@ -12,8 +12,8 @@ MASTER_SITES= ftp://ftp.radius.cistron.nl/pub/radius/ \ HOMEPAGE= http://www.radius.cistron.nl/ -RUN_DEPENDS= ::net/p5-Net-Telnet \ - ::net/p5-SNMP_Session +RUN_DEPENDS= net/p5-Net-Telnet \ + net/p5-SNMP_Session PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 3f4b43465f..f2ef8360fb 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2010/11/11 17:20:27 espie Exp $ +# $OpenBSD: Makefile,v 1.58 2010/11/19 22:31:37 espie Exp $ SHARED_ONLY= Yes @@ -57,20 +57,20 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ RUBY="${RUBY}" WANTLIB-main= c m z freetype png art_lgpl_2 -LIB_DEPENDS-main= ::graphics/png \ - ::graphics/libart +LIB_DEPENDS-main= graphics/png \ + graphics/libart RUN_DEPENDS-main= WANTLIB-perl= m z rrd -LIB_DEPENDS-perl= :rrdtool-${VERSION}:net/rrdtool +LIB_DEPENDS-perl= rrdtool-${VERSION}:net/rrdtool RUN_DEPENDS-perl= WANTLIB-python = rrd -LIB_DEPENDS-python= :rrdtool-${VERSION}:net/rrdtool +LIB_DEPENDS-python= rrdtool-${VERSION}:net/rrdtool RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} MODPY_EGG_VERSION= 0.2.1 -LIB_DEPENDS-ruby= :rrdtool-${VERSION}:net/rrdtool \ +LIB_DEPENDS-ruby= rrdtool-${VERSION}:net/rrdtool \ ${MODRUBY_LIB_DEPENDS} WANTLIB-ruby= c m rrd ${MODRUBY_WANTLIB} diff --git a/net/rsnapshot/Makefile b/net/rsnapshot/Makefile index 74c395ee1d..8d25a380be 100644 --- a/net/rsnapshot/Makefile +++ b/net/rsnapshot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:38 espie Exp $ COMMENT= remote filesystem snapshot utility @@ -18,9 +18,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.rsnapshot.org/downloads/ -BUILD_DEPENDS= ::net/rsync -RUN_DEPENDS= ::net/rsync \ - ::devel/p5-Lchown +BUILD_DEPENDS= net/rsync +RUN_DEPENDS= net/rsync \ + devel/p5-Lchown PKG_ARCH= * NO_REGRESS= Yes @@ -32,7 +32,7 @@ SAMPLES_DIR= ${PREFIX}/share/examples/rsnapshot SUBST_VARS= SAMPLES_DIR FAKE_FLAGS= sysconfdir=${SAMPLES_DIR} -USE_GROFF = Yes +USE_GROFF = Yes pre-build: ${SUBST_CMD} ${WRKSRC}/rsnapshot.1 ${WRKSRC}/README \ diff --git a/net/rtg/Makefile b/net/rtg/Makefile index 584101c094..ade8e99f66 100644 --- a/net/rtg/Makefile +++ b/net/rtg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/11 17:20:27 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:38 espie Exp $ SHARED_ONLY = Yes @@ -20,15 +20,15 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB = m crypto c z pthread fontconfig freetype \ - netsnmp.>=6 mysqlclient_r gd jpeg png + netsnmp>=6 mysqlclient_r gd jpeg png MODULES = converters/libiconv -LIB_DEPENDS = ::net/net-snmp \ - ::databases/mysql \ - ::graphics/gd \ - ::graphics/jpeg \ - ::graphics/png +LIB_DEPENDS = net/net-snmp \ + databases/mysql \ + graphics/gd \ + graphics/jpeg \ + graphics/png CONFIGURE_ENV = LOCALBASE=${LOCALBASE} \ LDFLAGS=-L${X11BASE}/lib diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile index e5c419d3a4..676c883756 100644 --- a/net/rtmpdump/Makefile +++ b/net/rtmpdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $ SHARED_LIBS = rtmp 0.0 @@ -23,7 +23,7 @@ MASTER_SITES = ${HOMEPAGE}download/ MAKE_FLAGS = CC="${CC}" XCFLAGS="${CFLAGS}" OPT= THREADLIB=-pthread -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS = Yes do-configure: diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 764e7c7461..e6d5ff8380 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/11/12 14:08:46 jasper Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:38 espie Exp $ COMMENT= ncurses BitTorrent client based on libTorrent @@ -17,12 +17,12 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto iconv intl idn m ncurses sigc-2.0 ssl \ - stdc++ z torrent.>=17 curl.>=14 + stdc++ z torrent>=17 curl>=14 MASTER_SITES= ${HOMEPAGE}downloads/ -LIB_DEPENDS= ::net/libtorrent \ - ::net/curl +LIB_DEPENDS= net/libtorrent \ + net/curl USE_LIBTOOL= Yes USE_GROFF = Yes diff --git a/net/ruby-amqp-utils/Makefile b/net/ruby-amqp-utils/Makefile index d8b5938803..75f7c84372 100644 --- a/net/ruby-amqp-utils/Makefile +++ b/net/ruby-amqp-utils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/08 23:28:54 jeremy Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:38 espie Exp $ COMMENT = AMQP command line utilities @@ -17,11 +17,11 @@ MODULES = lang/ruby CONFIGURE_STYLE = ruby gem BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-facets->=2.7.0:devel/ruby-facets,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-trollop->=1.10.2:devel/ruby-trollop,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-amqp->=0.6.0:net/ruby-amqp,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-json->=1.1.6:converters/ruby-json,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-clio-*:devel/ruby-clio,${FLAVOR} +RUN_DEPENDS = devel/ruby-facets,${FLAVOR}>=2.7.0 \ + devel/ruby-trollop,${FLAVOR}>=1.10.2 \ + net/ruby-amqp,${FLAVOR}>=0.6.0 \ + converters/ruby-json,${FLAVOR}>=1.1.6 \ + devel/ruby-clio,${FLAVOR} MODRUBY_REGRESS = rake diff --git a/net/ruby-amqp/Makefile b/net/ruby-amqp/Makefile index aa0c16fa86..e320b927cf 100644 --- a/net/ruby-amqp/Makefile +++ b/net/ruby-amqp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/08 23:28:54 jeremy Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:38 espie Exp $ COMMENT = simple AMQP driver for Ruby @@ -17,10 +17,10 @@ MODULES = lang/ruby CONFIGURE_STYLE = ruby gem BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-eventmachine-*:net/ruby-eventmachine,${FLAVOR} +RUN_DEPENDS = net/ruby-eventmachine,${FLAVOR} -REGRESS_DEPENDS = :${FULLPKGNAME}:${BUILD_PKGPATH} \ - :${MODRUBY_PKG_PREFIX}-bacon-*:devel/ruby-bacon,${FLAVOR} +REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ + devel/ruby-bacon,${FLAVOR} MODRUBY_REGRESS = rake RAKE_REGRESS_TARGET = spec diff --git a/net/ruby-errand/Makefile b/net/ruby-errand/Makefile index 224b60a870..c950cc06ae 100644 --- a/net/ruby-errand/Makefile +++ b/net/ruby-errand/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/08 23:28:54 jeremy Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:38 espie Exp $ COMMENT = bindings for RRD functions @@ -16,6 +16,6 @@ MODULES = lang/ruby CONFIGURE_STYLE = ruby gem -RUN_DEPENDS = ::net/rrdtool,-ruby +RUN_DEPENDS = net/rrdtool,-ruby .include diff --git a/net/ruby-minion/Makefile b/net/ruby-minion/Makefile index a99ea0bf22..fe28c3ad1c 100644 --- a/net/ruby-minion/Makefile +++ b/net/ruby-minion/Makefile @@ -19,8 +19,8 @@ MODULES = lang/ruby CONFIGURE_STYLE = ruby gem BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-amqp-*:net/ruby-amqp,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-bunny-*:net/ruby-bunny,${FLAVOR} \ - :${MODRUBY_PKG_PREFIX}-json-*:converters/ruby-json,${FLAVOR} +RUN_DEPENDS = net/ruby-amqp,${FLAVOR} \ + net/ruby-bunny,${FLAVOR} \ + converters/ruby-json,${FLAVOR} .include diff --git a/net/ruby-net-scp/Makefile b/net/ruby-net-scp/Makefile index ffb4d86fa0..1f188c7792 100644 --- a/net/ruby-net-scp/Makefile +++ b/net/ruby-net-scp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:38 espie Exp $ COMMENT = pure-Ruby implementation of the SCP protocol @@ -15,11 +15,11 @@ PERMIT_DISTFILES_FTP = Yes MODULES = lang/ruby BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-net-ssh->=2.0.0:net/ruby-net-ssh,${FLAVOR} +RUN_DEPENDS = net/ruby-net-ssh,${FLAVOR}>=2.0.0 CONFIGURE_STYLE = ruby gem -REGRESS_DEPENDS = :${MODRUBY_PKG_PREFIX}-mocha-*:devel/ruby-mocha,${FLAVOR} +REGRESS_DEPENDS = devel/ruby-mocha,${FLAVOR} do-regress: @cd ${WRKBUILD} && ${RUBY} -rubygems -Ilib test/test_all.rb diff --git a/net/ruby-net-sftp/Makefile b/net/ruby-net-sftp/Makefile index 5a5203524a..f19ee7f4de 100644 --- a/net/ruby-net-sftp/Makefile +++ b/net/ruby-net-sftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:38 espie Exp $ COMMENT = pure-ruby implementation of the SFTP client protocol @@ -15,11 +15,11 @@ PERMIT_DISTFILES_FTP = yes MODULES = lang/ruby BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-net-ssh->=2.0.0:net/ruby-net-ssh,${FLAVOR} +RUN_DEPENDS = net/ruby-net-ssh,${FLAVOR}>=2.0.0 CONFIGURE_STYLE = ruby gem -REGRESS_DEPENDS = :${MODRUBY_PKG_PREFIX}-mocha-*:devel/ruby-mocha,${FLAVOR} +REGRESS_DEPENDS = devel/ruby-mocha,${FLAVOR} do-regress: @cd ${WRKBUILD} && ${RUBY} -rubygems -Ilib test/test_all.rb diff --git a/net/ruby-net-ssh-gateway/Makefile b/net/ruby-net-ssh-gateway/Makefile index 04a0c92856..60d3c35bfd 100644 --- a/net/ruby-net-ssh-gateway/Makefile +++ b/net/ruby-net-ssh-gateway/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:38 espie Exp $ COMMENT = library for programmatically tunneling connections @@ -15,11 +15,11 @@ PERMIT_DISTFILES_FTP = Yes MODULES = lang/ruby BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-net-ssh->=2.0.0:net/ruby-net-ssh,${FLAVOR} +RUN_DEPENDS = net/ruby-net-ssh,${FLAVOR}>=2.0.0 CONFIGURE_STYLE = ruby gem -REGRESS_DEPENDS= :${MODRUBY_PKG_PREFIX}-mocha-*:devel/ruby-mocha,${FLAVOR} +REGRESS_DEPENDS= devel/ruby-mocha,${FLAVOR} do-regress: @cd ${WRKBUILD} && ${RUBY} -rubygems -Ilib/ test/gateway_test.rb diff --git a/net/ruby-net-ssh/Makefile b/net/ruby-net-ssh/Makefile index 2247cd7315..c7a72dfda1 100644 --- a/net/ruby-net-ssh/Makefile +++ b/net/ruby-net-ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:38 espie Exp $ COMMENT = pure-ruby implementation of the SSH2 client protocol @@ -15,11 +15,11 @@ PERMIT_DISTFILES_FTP = yes MODULES = lang/ruby BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = :${MODRUBY_PKG_PREFIX}-highline-*:devel/ruby-highline,${FLAVOR} +RUN_DEPENDS = devel/ruby-highline,${FLAVOR} CONFIGURE_STYLE = ruby gem -REGRESS_DEPENDS = :${MODRUBY_PKG_PREFIX}-mocha-*:devel/ruby-mocha,${FLAVOR} +REGRESS_DEPENDS = devel/ruby-mocha,${FLAVOR} do-regress: @cd ${WRKBUILD} && ${RUBY} -Ilib -rubygems test/test_all.rb diff --git a/net/ruby-pcap/Makefile b/net/ruby-pcap/Makefile index bc88de0eed..e0aebfb9c2 100644 --- a/net/ruby-pcap/Makefile +++ b/net/ruby-pcap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.35 2010/11/19 22:31:38 espie Exp $ COMMENT= Ruby interface to LBL Packet Capture library @@ -21,7 +21,7 @@ MASTER_SITES= http://www.goto.info.waseda.ac.jp/~fukusima/ruby/ MODULES= lang/ruby -NO_REGRESS= Yes +NO_REGRESS= Yes CONFIGURE_STYLE= ruby extconf diff --git a/net/ruby-rrdtool/Makefile b/net/ruby-rrdtool/Makefile index 0b9fd69285..a08e43f89f 100644 --- a/net/ruby-rrdtool/Makefile +++ b/net/ruby-rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/08 23:28:55 jeremy Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:38 espie Exp $ COMMENT= ruby bindings for RRDtool @@ -21,8 +21,8 @@ WANTLIB= art_lgpl_2 freetype png rrd z MODULES= lang/ruby BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :${MODRUBY_PKG_PREFIX}-hoe-*:devel/ruby-hoe,${FLAVOR} -LIB_DEPENDS= :rrdtool->=1.2,<1.3:net/rrdtool +RUN_DEPENDS= devel/ruby-hoe,${FLAVOR} +LIB_DEPENDS= rrdtool->=1.2,<1.3:net/rrdtool CONFIGURE_STYLE=ruby gem ext diff --git a/net/samba/Makefile b/net/samba/Makefile index 2aa3df05a6..b78e50b613 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.129 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.130 2010/11/19 22:31:38 espie Exp $ SHARED_ONLY= Yes @@ -36,10 +36,10 @@ MASTER_SITES= http://download.samba.org/samba/ftp/ \ MODULES= converters/libiconv BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} -LIB_DEPENDS= :tdb->=1.2:databases/tdb \ - ::devel/popt \ - ::devel/libexecinfo \ - ::devel/libtalloc +LIB_DEPENDS= databases/tdb>=1.2 \ + devel/popt \ + devel/libexecinfo \ + devel/libtalloc MAKE_FLAGS+= PASSWD_PROGRAM="/usr/bin/passwd" \ LIBSMBCLIENT_SOVER="${LIBsmbclient_VERSION}" \ @@ -91,7 +91,7 @@ FLAVOR?= MULTI_PACKAGES= -main -docs .if ${FLAVOR:L:Mcups} -LIB_DEPENDS+= ::print/cups +LIB_DEPENDS+= print/cups WANTLIB+= asn1 crypto gssapi krb5 m ssl z cups .else CONFIGURE_ARGS+= --disable-cups @@ -102,9 +102,9 @@ ERRORS+= "Fatal: ldap and ads flavors conflict" .endif .if ${FLAVOR:L:Mldap} || ${FLAVOR:L:Mads} -LIB_DEPENDS+= ::databases/openldap +LIB_DEPENDS+= databases/openldap WANTLIB += ldap lber -BUILD_DEPENDS+= ::misc/libutf8 +BUILD_DEPENDS+= misc/libutf8 .else CONFIGURE_ARGS+= --without-ldap .endif diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 551b7f7ec3..9c6754217d 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:38 espie Exp $ COMMENT= powerful interactive packet manipulation in python @@ -23,10 +23,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_GROFF = Yes MODULES= lang/python -RUN_DEPENDS= :py-libdnet-*:net/libdnet,-python \ - :py-libpcap-*:net/py-libpcap \ - :py-crypto-*:security/py-crypto \ - :py-gnuplot-*:math/py-gnuplot +RUN_DEPENDS= net/libdnet,-python \ + net/py-libpcap \ + security/py-crypto \ + math/py-gnuplot REGRESS_DEPENDS=${RUN_DEPENDS} PKG_ARCH= * diff --git a/net/scli/Makefile b/net/scli/Makefile index 5d780856d1..d2e2bb4eba 100644 --- a/net/scli/Makefile +++ b/net/scli/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:38 espie Exp $ COMMENT= snmp command line utility @@ -21,8 +21,8 @@ MODULES= devel/gettext USE_GMAKE= Yes USE_GROFF = Yes -LIB_DEPENDS= ::net/gsnmp \ - ::textproc/libxml +LIB_DEPENDS= net/gsnmp \ + textproc/libxml CONFIGURE_STYLE= gnu diff --git a/net/sendxmpp/Makefile b/net/sendxmpp/Makefile index 14e63ebacc..d4ca8374a2 100644 --- a/net/sendxmpp/Makefile +++ b/net/sendxmpp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:38 espie Exp $ COMMENT= perl script to send xmpp messages @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} MODULES= perl -RUN_DEPENDS= ::net/p5-Net-XMPP +RUN_DEPENDS= net/p5-Net-XMPP CONFIGURE_STYLE=perl diff --git a/net/ser/Makefile b/net/ser/Makefile index ee8ac26ddd..767b518ca6 100644 --- a/net/ser/Makefile +++ b/net/ser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:38 espie Exp $ COMMENT= SIP Express Router @@ -9,7 +9,7 @@ DISTNAME= ser-${VERSION}_src PKGNAME= ser-${VERSION} REVISION= 1 CATEGORIES= net -WANTLIB= c expat z lib/mysql/mysqlclient.>=10 +WANTLIB= c expat z lib/mysql/mysqlclient>=10 MASTER_SITES= ${MASTER_SITE_BERLIOS:=ser/} @@ -28,7 +28,7 @@ USE_GROFF = Yes ALL_TARGET= all ser.cfg -LIB_DEPENDS= ::databases/mysql +LIB_DEPENDS= databases/mysql do-install: cd ${WRKDIST}; ${MAKE_PROGRAM} PREFIX=${WRKINST}${TRUEPREFIX} install diff --git a/net/si/Makefile b/net/si/Makefile index c6f10db273..ac5483da00 100644 --- a/net/si/Makefile +++ b/net/si/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:38 espie Exp $ COMMENT = minimalistic SILC client @@ -16,7 +16,7 @@ MASTER_SITES = http://dokucode.de/files/ MODULES = converters/libiconv WANTLIB = c pthread silc silcclient -LIB_DEPENDS = ::devel/silc-toolkit +LIB_DEPENDS = devel/silc-toolkit USE_GROFF = Yes NO_REGRESS = Yes diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index 2f63e58ccc..40b7b4b4d9 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.63 2010/11/19 22:31:38 espie Exp $ COMMENT= Secure Internet Live Conferencing (SILC) client @@ -26,11 +26,11 @@ MASTER_SITES= http://ftp.silcnet.org/client/sources/ \ ftp://ftp.wiretapped.net/pub/security/network-security/silc/client/sources/ MODULES= devel/gettext -LIB_DEPENDS+= ::devel/glib2 -WANTLIB += glib-2.0.>=1000 gmodule-2.0.>=1000 +LIB_DEPENDS+= devel/glib2 +WANTLIB += glib-2.0>=1000 gmodule-2.0>=1000 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= :yasm-*:devel/yasm +BUILD_DEPENDS+= devel/yasm .endif CONFDIR= ${SYSCONFDIR}/silc diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile index 713483e62c..4eeb07d89f 100644 --- a/net/silc-server/Makefile +++ b/net/silc-server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2010/10/18 18:36:57 espie Exp $ +# $OpenBSD: Makefile,v 1.62 2010/11/19 22:31:38 espie Exp $ COMMENT= Secure Internet Live Conferencing (SILC) server @@ -25,7 +25,7 @@ MASTER_SITES= http://ftp.silcnet.org/server/sources/ \ MODULES= converters/libiconv .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= :yasm-*:devel/yasm +BUILD_DEPENDS+= devel/yasm .endif FLAVORS= operops diff --git a/net/sing/Makefile b/net/sing/Makefile index 41ba8b821b..6a9855f779 100644 --- a/net/sing/Makefile +++ b/net/sing/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:38 espie Exp $ COMMENT= send ICMP nasty garbage @@ -11,13 +11,13 @@ EXTRACT_SUFX= .tgz HOMEPAGE= http://sourceforge.net/projects/sing/ -LIB_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 +LIB_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pcap lib/libnet-1.0/net.=0 +WANTLIB= c pcap lib/libnet-1.0/net=0 SEPARATE_BUILD= concurrent AUTOCONF_VERSION=2.13 diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index 8533cfac51..0a99299c61 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:38 espie Exp $ COMMENT = SIP swiss army knife @@ -12,7 +12,7 @@ HOMEPAGE = http://sipsak.org/ MAINTAINER = Stuart Henderson -LIB_DEPENDS = ::net/libcares +LIB_DEPENDS = net/libcares # GPLv2+ PERMIT_PACKAGE_CDROM = Yes diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 8e9f85d662..986b028fea 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/19 22:31:38 espie Exp $ COMMENT= latency logging and graphing system @@ -18,17 +18,17 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= ::databases/p5-ldap \ - ::devel/p5-Config-Grammar \ - ::net/fping \ - ::net/p5-Net-DNS \ - ::net/p5-Net-Telnet \ - ::net/p5-SNMP_Session \ - ::security/p5-Authen-Radius \ - ::security/p5-Digest-HMAC \ - ::www/p5-CGI-SpeedyCGI \ - ::www/p5-libwww \ - :p5-RRD-*:net/rrdtool,-perl +RUN_DEPENDS= databases/p5-ldap \ + devel/p5-Config-Grammar \ + net/fping \ + net/p5-Net-DNS \ + net/p5-Net-Telnet \ + net/p5-SNMP_Session \ + security/p5-Authen-Radius \ + security/p5-Digest-HMAC \ + www/p5-CGI-SpeedyCGI \ + www/p5-libwww \ + net/rrdtool,-perl NO_REGRESS= Yes NO_BUILD= Yes diff --git a/net/snmptt/Makefile b/net/snmptt/Makefile index c53e044f95..1b9c006057 100644 --- a/net/snmptt/Makefile +++ b/net/snmptt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/03/22 17:35:44 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:38 espie Exp $ COMMENT= SNMP trap handler written @@ -22,8 +22,8 @@ PKG_ARCH= * NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS= ::devel/p5-Config-IniFiles \ - ::net/net-snmp +RUN_DEPENDS= devel/p5-Config-IniFiles \ + net/net-snmp DOC_DIR= ${PREFIX}/share/doc/snmptt EX_DIR= ${PREFIX}/share/examples/snmptt diff --git a/net/snort/Makefile b/net/snort/Makefile index a3232dc5b7..82401b986a 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.61 2010/11/19 22:31:38 espie Exp $ SHARED_ONLY = Yes @@ -36,27 +36,27 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ MAKE_FLAGS = mandir=${TRUEPREFIX}/man -LIB_DEPENDS = ::devel/pcre +LIB_DEPENDS = devel/pcre WANTLIB += pcre FLAVORS = postgresql mysql flexresp prelude FLAVOR ?= .if ${FLAVOR:L:Mflexresp} -LIB_DEPENDS += ::net/libdnet -WANTLIB += dnet.=1 +LIB_DEPENDS += net/libdnet +WANTLIB += dnet=1 CONFIGURE_ARGS += --enable-flexresp2 .endif .if ${FLAVOR:L:Mpostgresql} -LIB_DEPENDS += ::databases/postgresql -WANTLIB += pq.>=2 +LIB_DEPENDS += databases/postgresql +WANTLIB += pq>=2 CONFIGURE_ARGS += --with-postgresql="${LOCALBASE}" .endif .if ${FLAVOR:L:Mmysql} -LIB_DEPENDS += ::databases/mysql -WANTLIB += lib/mysql/mysqlclient.>=10 +LIB_DEPENDS += databases/mysql +WANTLIB += lib/mysql/mysqlclient>=10 CONFIGURE_ARGS += --with-mysql-libraries="${LOCALBASE}/lib" \ --with-mysql-includes="${LOCALBASE}/include" WANTLIB += z @@ -64,8 +64,8 @@ WANTLIB += z .if ${FLAVOR:L:Mprelude} MODULES = devel/gettext -LIB_DEPENDS += ::security/prelude/libprelude -WANTLIB += gcrypt gnutls gpg-error pthread tasn1 z prelude.>=8 +LIB_DEPENDS += security/prelude/libprelude +WANTLIB += gcrypt gnutls gpg-error pthread tasn1 z prelude>=8 CONFIGURE_ARGS += --enable-prelude MESSAGE = ${PKGDIR}/MESSAGE-prelude .endif diff --git a/net/spectrum-tools/Makefile b/net/spectrum-tools/Makefile index 4661d99136..8a07e72f0d 100644 --- a/net/spectrum-tools/Makefile +++ b/net/spectrum-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:38 espie Exp $ COMMENT-main = graphical tools for the MetaGeek Wi-spy spectrum analyser COMMENT-utils = tools for the MetaGeek Wi-spy spectrum analyser @@ -39,12 +39,12 @@ WANTLIB-main = ${WANTLIB} \ WANTLIB-utils = ${WANTLIB} ncurses -LIB_DEPENDS = :libusb-*:devel/libusb +LIB_DEPENDS = devel/libusb LIB_DEPENDS-main += ${LIB_DEPENDS} \ - ::x11/gtk+2 + x11/gtk+2 -RUN_DEPENDS-main = :spectrum-tools-utils-*:net/spectrum-tools,-utils +RUN_DEPENDS-main = net/spectrum-tools,-utils CONFIGURE_STYLE = gnu CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/spectrum/Makefile b/net/spectrum/Makefile index 7fea8ad2bf..c3c132dc0f 100644 --- a/net/spectrum/Makefile +++ b/net/spectrum/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:38 espie Exp $ COMMENT= XMPP transport/gateway @@ -18,10 +18,10 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/python devel/cmake WANTLIB += c m pthread stdc++ gloox purple glib-2.0 gthread-2.0 WANTLIB += PocoData PocoFoundation PocoMySQL PocoODBC PocoSQLite -LIB_DEPENDS= ::net/py-xmpppy \ - ::net/gloox \ - ::net/pidgin,-libpurple \ - ::net/poco +LIB_DEPENDS= net/py-xmpppy \ + net/gloox \ + net/pidgin,-libpurple \ + net/poco SPVARDIR= /var/spectrum # not using CONFIGURE_STYLE=cmake from cmake module, rolling own in diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile index 8388a1210b..af1b5f0198 100644 --- a/net/ssldump/Makefile +++ b/net/ssldump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:38 espie Exp $ COMMENT= SSLv3/TLS network protocol analyzer @@ -21,11 +21,11 @@ WANTLIB= c crypto m pcap ssl MASTER_SITES= http://www.rtfm.com/ssldump/ USE_GMAKE= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu dest CONFIGURE_ARGS+= --with-openssl-inc=/usr/include \ --with-openssl-lib=/usr/lib -NO_REGRESS= Yes +NO_REGRESS= Yes .include diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index a79d4aef44..d306829667 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/19 22:31:38 espie Exp $ COMMENT-gui = enhanced TightVNC client GUI and wrappers COMMENT-main = enhanced TightVNC client @@ -36,14 +36,14 @@ NO_REGRESS = Yes MODULES = x11/tk -WANTLIB-main = ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xmu Xt c z jpeg.>=62 -LIB_DEPENDS-main = ::graphics/jpeg +WANTLIB-main = ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xmu Xt c z jpeg>=62 +LIB_DEPENDS-main = graphics/jpeg WANTLIB-gui = c crypto ssl -RUN_DEPENDS-gui = ::devel/desktop-file-utils \ - ::net/avahi \ - ::net/ssvnc,-main \ - ::security/stunnel \ +RUN_DEPENDS-gui = devel/desktop-file-utils \ + net/avahi \ + net/ssvnc,-main \ + security/stunnel \ ${MODTK_RUN_DEPENDS} CONFIGURE_STYLE = imake noman diff --git a/net/tclcurl/Makefile b/net/tclcurl/Makefile index 9eb6e69992..6058e6bfeb 100644 --- a/net/tclcurl/Makefile +++ b/net/tclcurl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $ COMMENT= Tcl bindings for Curl SHARED_ONLY= Yes @@ -14,13 +14,13 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= crypto idn ssl z curl.>=2.2 +WANTLIB= crypto idn ssl z curl>=2.2 MASTER_SITES= ${HOMEPAGE}download/tarball/ MODULES= lang/tcl MODTCL_VERSION= 8.4 -LIB_DEPENDS= ::net/curl +LIB_DEPENDS= net/curl BUILD_DEPENDS+= ${MODTCL_BUILD_DEPENDS} RUN_DEPENDS+= ${MODTCL_RUN_DEPENDS} diff --git a/net/tcludp/Makefile b/net/tcludp/Makefile index bff3a15358..06d3cc7e63 100644 --- a/net/tcludp/Makefile +++ b/net/tcludp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:38 espie Exp $ SHARED_ONLY = Yes @@ -28,7 +28,7 @@ SEPARATE_BUILD = simple CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \ --datadir=${PREFIX}/share/examples -USE_GROFF = Yes +USE_GROFF = Yes REGRESS_TARGET = test CONFIGURE_ENV = LIBudp108_VERSION=${LIBudp108_VERSION} diff --git a/net/tcpdpriv/Makefile b/net/tcpdpriv/Makefile index 76ab0d41fe..88fe29e7cd 100644 --- a/net/tcpdpriv/Makefile +++ b/net/tcpdpriv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:38 espie Exp $ COMMENT= removes sensitive information from a tcpdump -w file @@ -22,7 +22,7 @@ EXTRACT_SUFX= .tar.Z MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" CONFIGURE_STYLE= simple -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile index 1c2521a7ca..1493966ddf 100644 --- a/net/tcpflow/Makefile +++ b/net/tcpflow/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:38 espie Exp $ COMMENT= tool for capturing data from TCP connections @@ -18,6 +18,6 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c pcap CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile index d606d20010..53d5c2f149 100644 --- a/net/tcpreen/Makefile +++ b/net/tcpreen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $ COMMENT= simple tcp re-engineering tool @@ -25,7 +25,7 @@ MODULES= devel/gettext FAKE_FLAGS+= localedir="${PREFIX}/share/locale" \ gettextsrcdir="${PREFIX}/share/gettext/po" -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/admin diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index 59c070aa3d..4562944811 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2010/11/19 22:31:38 espie Exp $ COMMENT= resend network traffic saved by tcpdump @@ -18,11 +18,11 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcpreplay/} -WANTLIB= c dnet.>=1 +WANTLIB= c dnet>=1 CONFIGURE_STYLE= gnu USE_GROFF = Yes -LIB_DEPENDS= ::net/libdnet +LIB_DEPENDS= net/libdnet .include diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index 1ddac3d1ce..e11a42c3cb 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/10/18 18:36:58 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/19 22:31:38 espie Exp $ COMMENT= TCP dump file analysis tool @@ -16,17 +16,17 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c m pcap -BUILD_DEPENDS= :bison-*:devel/bison +BUILD_DEPENDS= devel/bison -RUN_DEPENDS+= ::archivers/bzip2 \ - ::x11/xplot +RUN_DEPENDS+= archivers/bzip2 \ + x11/xplot CONFIGURE_STYLE= gnu CONFIGURE_ENV= YACC=bison ALL_TARGET= tcptrace -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes DOCFILES= ARGS COPYRIGHT FAQ README README.mailing_list README.modules \ diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile index 61be0469c8..5c40225820 100644 --- a/net/tcptraceroute/Makefile +++ b/net/tcptraceroute/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $ COMMENT= traceroute implementation using TCP packets @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pcap lib/libnet-1.1/net.=11 +WANTLIB= c pcap lib/libnet-1.1/net=11 CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-libnet=${PREFIX} \ @@ -24,12 +24,12 @@ CONFIGURE_ARGS= --with-libnet=${PREFIX} \ MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ -LIB_DEPENDS= :libnet->=1.1,<1.2:net/libnet/1.1 +LIB_DEPENDS= libnet->=1.1,<1.2:net/libnet/1.1 MAKE_FLAGS= CC="${CC}" \ CFLAGS="${CFLAGS}" -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes USE_GMAKE= Yes diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile index f1b4adb740..42c7a333ee 100644 --- a/net/telepathy/folks/Makefile +++ b/net/telepathy/folks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/26 08:42:35 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:38 espie Exp $ SHARED_ONLY= Yes @@ -19,12 +19,12 @@ WANTLIB += c m pthread dbus-1 dbus-glib-1 gee gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gthread-2.0 gobject-2.0 pcre telepathy-glib WANTLIB += xml2 z -BUILD_DEPENDS= :gobject-introspection->=0.9.12p0:devel/gobject-introspection \ - ::lang/vala -LIB_DEPENDS= ::devel/libgee \ - :telepathy-glib-0.12.0p0:net/telepathy/telepathy-glib\ - ::textproc/libxml -REGRESS_DEPENDS= :${PKGNAME}:${BASE_PKGPATH} +BUILD_DEPENDS= devel/gobject-introspection>=0.9.12p0 \ + lang/vala +LIB_DEPENDS= devel/libgee \ + telepathy-glib-0.12.0p0:net/telepathy/telepathy-glib \ + textproc/libxml +REGRESS_DEPENDS= ${PKGNAME}:${BASE_PKGPATH} CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/net/telepathy/telepathy-butterfly/Makefile b/net/telepathy/telepathy-butterfly/Makefile index 28313e5f20..d4bd62884e 100644 --- a/net/telepathy/telepathy-butterfly/Makefile +++ b/net/telepathy/telepathy-butterfly/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/09/23 14:24:22 jasper Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, MSN component @@ -11,8 +11,8 @@ MODULES= lang/python CONFIGURE_STYLE= gnu BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :papyon->=0.5.1:net/papyon \ - :telepathy-python->=0.15.17:net/telepathy/telepathy-python +RUN_DEPENDS= net/papyon>=0.5.1 \ + net/telepathy/telepathy-python>=0.15.17 USE_LIBTOOL= No NO_REGRESS= Yes diff --git a/net/telepathy/telepathy-farsight/Makefile b/net/telepathy/telepathy-farsight/Makefile index 5c288bdd14..78816b4306 100644 --- a/net/telepathy/telepathy-farsight/Makefile +++ b/net/telepathy/telepathy-farsight/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/24 15:53:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, farsight2 component @@ -17,8 +17,8 @@ MODULES= devel/gettext \ lang/python LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \ - ::net/farsight2 \ - ::net/telepathy/telepathy-glib + net/farsight2 \ + net/telepathy/telepathy-glib CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ diff --git a/net/telepathy/telepathy-gabble/Makefile b/net/telepathy/telepathy-gabble/Makefile index b10bb003e1..fe2cc926d5 100644 --- a/net/telepathy/telepathy-gabble/Makefile +++ b/net/telepathy/telepathy-gabble/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, xmpp component @@ -15,13 +15,13 @@ WANTLIB += nice.>=1 soup-2.4 crypto ssl MODULES= devel/gettext \ lang/python -BUILD_DEPENDS= ::textproc/libxslt \ - ::devel/py-twisted/words \ - ::net/py-xmpp -LIB_DEPENDS= ::devel/libsoup \ - :libnice->=0.0.13:net/libnice \ - ::net/telepathy/telepathy-glib \ - ::sysutils/e2fsprogs +BUILD_DEPENDS= textproc/libxslt \ + devel/py-twisted/words \ + net/py-xmpp +LIB_DEPENDS= devel/libsoup \ + net/libnice>=0.0.13 \ + net/telepathy/telepathy-glib \ + sysutils/e2fsprogs CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-ca-certificates=/etc/ssl/cert.pem \ @@ -31,7 +31,7 @@ CONFIGURE_ENV= UUID_LIBS="`pkg-config --libs e2fs-uuid`" \ UUID_CFLAGS="`pkg-config --cflags e2fs-uuid`" \ TLS_CFLAGS="-I/usr/include" \ TLS_LIBS="-L/usr/lib -lssl -lcrypto" -USE_GROFF = Yes +USE_GROFF = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/configure diff --git a/net/telepathy/telepathy-glib/Makefile b/net/telepathy/telepathy-glib/Makefile index f8aa99cb77..7929e09e61 100644 --- a/net/telepathy/telepathy-glib/Makefile +++ b/net/telepathy/telepathy-glib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/10/25 12:38:32 jasper Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, glib bindings @@ -17,10 +17,10 @@ MODULES= devel/gettext \ MODPY_RUNDEP= No -BUILD_DEPENDS= :gobject-introspection->=0.9.12p0:devel/gobject-introspection \ - ::lang/vala \ - ::textproc/libxslt -LIB_DEPENDS= ::x11/dbus-glib +BUILD_DEPENDS= devel/gobject-introspection>=0.9.12p0 \ + lang/vala \ + textproc/libxslt +LIB_DEPENDS= x11/dbus-glib CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ diff --git a/net/telepathy/telepathy-haze/Makefile b/net/telepathy/telepathy-haze/Makefile index 258ecb86c7..de16ec58a4 100644 --- a/net/telepathy/telepathy-haze/Makefile +++ b/net/telepathy/telepathy-haze/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, libpurple component @@ -12,18 +12,18 @@ MODULES= devel/gettext \ WANTLIB += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 m pcre pthread util xml2 z purple telepathy-glib -BUILD_DEPENDS= ::devel/py-twisted/words \ - ::net/py-xmpp \ - ::textproc/libxslt -LIB_DEPENDS= ::net/pidgin,-libpurple \ - ::net/telepathy/telepathy-glib +BUILD_DEPENDS= devel/py-twisted/words \ + net/py-xmpp \ + textproc/libxslt +LIB_DEPENDS= net/pidgin,-libpurple \ + net/telepathy/telepathy-glib MODPY_RUNDEP= No CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GROFF = Yes +USE_GROFF = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/configure diff --git a/net/telepathy/telepathy-idle/Makefile b/net/telepathy/telepathy-idle/Makefile index cb3bf5aec9..137d185ab1 100644 --- a/net/telepathy/telepathy-idle/Makefile +++ b/net/telepathy/telepathy-idle/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, IRC component @@ -14,9 +14,9 @@ MODULES= devel/gettext \ lang/python BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::devel/py-twisted/words -RUN_DEPENDS= ::textproc/libxslt -LIB_DEPENDS= ::net/telepathy/telepathy-glib + devel/py-twisted/words +RUN_DEPENDS= textproc/libxslt +LIB_DEPENDS= net/telepathy/telepathy-glib CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-silent-rules @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" \ OPENSSL_CFLAGS="-I/usr/include" -USE_GROFF = Yes +USE_GROFF = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/configure diff --git a/net/telepathy/telepathy-inspector/Makefile b/net/telepathy/telepathy-inspector/Makefile index a31d03e7ce..90d0eedfb5 100644 --- a/net/telepathy/telepathy-inspector/Makefile +++ b/net/telepathy/telepathy-inspector/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:38 espie Exp $ COMMENT= display information about a given connection manager @@ -20,9 +20,9 @@ WANTLIB += xcb-render-util xml2 z glade-2.0 telepathy-glib MODULES= devel/gettext \ lang/python -BUILD_DEPENDS= ::textproc/libxslt -LIB_DEPENDS= ::devel/libglade2 \ - ::net/telepathy/telepathy-glib +BUILD_DEPENDS= textproc/libxslt +LIB_DEPENDS= devel/libglade2 \ + net/telepathy/telepathy-glib CONFIGURE_STYLE= gnu USE_LIBTOOL= No diff --git a/net/telepathy/telepathy-logger/Makefile b/net/telepathy/telepathy-logger/Makefile index 727bb97981..1a2885ea8e 100644 --- a/net/telepathy/telepathy-logger/Makefile +++ b/net/telepathy/telepathy-logger/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/27 11:05:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:38 espie Exp $ COMMENT= flexible communications framework, logger component @@ -18,12 +18,12 @@ WANTLIB += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 m pcre pthread z telepathy-glib WANTLIB += xml2 sqlite3 -BUILD_DEPENDS= ::devel/py-twisted/words \ - ::x11/gnome/doc-utils -LIB_DEPENDS= ::databases/sqlite3 \ - ::net/telepathy/telepathy-glib \ - ::textproc/libxml -RUN_DEPENDS= ::devel/dconf +BUILD_DEPENDS= devel/py-twisted/words \ + x11/gnome/doc-utils +LIB_DEPENDS= databases/sqlite3 \ + net/telepathy/telepathy-glib \ + textproc/libxml +RUN_DEPENDS= devel/dconf MODGNOME_HELP_FILES= Yes MODGCONF2_SCHEMAS_DIR= telepathy-logger diff --git a/net/telepathy/telepathy-mission-control/Makefile b/net/telepathy/telepathy-mission-control/Makefile index 2c4e2de447..1296565ca1 100644 --- a/net/telepathy/telepathy-mission-control/Makefile +++ b/net/telepathy/telepathy-mission-control/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/19 22:31:38 espie Exp $ COMMENT= abstraction layer between apps and connection managers @@ -16,8 +16,8 @@ WANTLIB += gobject-2.0 gthread-2.0 pcre pthread z telepathy-glib MODULES= devel/gettext \ lang/python -BUILD_DEPENDS= ::textproc/libxslt -LIB_DEPENDS= ::net/telepathy/telepathy-glib +BUILD_DEPENDS= textproc/libxslt +LIB_DEPENDS= net/telepathy/telepathy-glib LIBTOOL_FLAGS= --tag=disable-static @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --enable-mcclient-so6 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GROFF = Yes +USE_GROFF = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/configure diff --git a/net/telepathy/telepathy-python/Makefile b/net/telepathy/telepathy-python/Makefile index 099362e87b..bf7bac4331 100644 --- a/net/telepathy/telepathy-python/Makefile +++ b/net/telepathy/telepathy-python/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/10/24 21:30:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:39 espie Exp $ COMMENT= flexible communications framework, python bindings @@ -10,10 +10,10 @@ MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-python/} MODULES= lang/python BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::devel/py-gobject \ - ::textproc/libxslt \ - ::x11/dbus-python \ - ::x11/py-gtk2 +RUN_DEPENDS= devel/py-gobject \ + textproc/libxslt \ + x11/dbus-python \ + x11/py-gtk2 CONFIGURE_STYLE= gnu diff --git a/net/telepathy/telepathy-salut/Makefile b/net/telepathy/telepathy-salut/Makefile index 068f227d7d..d364d15cf4 100644 --- a/net/telepathy/telepathy-salut/Makefile +++ b/net/telepathy/telepathy-salut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:39 espie Exp $ COMMENT= flexible communications framework, local-link component @@ -15,10 +15,10 @@ WANTLIB += avahi-client avahi-common avahi-glib avahi-gobject MODULES= devel/gettext \ lang/python -BUILD_DEPENDS= ::textproc/libxslt -LIB_DEPENDS= ::net/avahi \ - ::devel/libsoup \ - ::net/telepathy/telepathy-glib +BUILD_DEPENDS= textproc/libxslt +LIB_DEPENDS= net/avahi \ + devel/libsoup \ + net/telepathy/telepathy-glib CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -28,9 +28,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ac_cv_prog_PYTHON="${MODPY_BIN}" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-ssl -USE_GROFF = Yes +USE_GROFF = Yes -REGRESS_DEPENDS= ::devel/check \ - ::textproc/py-xmldiff +REGRESS_DEPENDS= devel/check \ + textproc/py-xmldiff .include diff --git a/net/telepathy/telepathy-spec/Makefile b/net/telepathy/telepathy-spec/Makefile index 387502d01a..6f7876ed9b 100644 --- a/net/telepathy/telepathy-spec/Makefile +++ b/net/telepathy/telepathy-spec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2010/09/23 14:24:22 jasper Exp $ +# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:39 espie Exp $ PKG_ARCH= * @@ -9,9 +9,9 @@ CATEGORIES= books MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-spec/} -BUILD_DEPENDS= ::devel/py-cheetah \ - ::textproc/libxslt \ - ::textproc/py-docutils +BUILD_DEPENDS= devel/py-cheetah \ + textproc/libxslt \ + textproc/py-docutils MODULES+= lang/python MODPY_RUNDEP= No diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile index b62a55ecfc..4cc0cd837e 100644 --- a/net/thcrut/Makefile +++ b/net/thcrut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:39 espie Exp $ COMMENT= local network discovery tool @@ -9,14 +9,14 @@ MASTER_SITES= ${HOMEPAGE}/releases/ HOMEPAGE= http://www.thehackerschoice.com/ -LIB_DEPENDS= :libnet->=1.0,<1.1:net/libnet/1.0 +LIB_DEPENDS= libnet->=1.0,<1.1:net/libnet/1.0 PERMIT_PACKAGE_CDROM= no license PERMIT_PACKAGE_FTP= no license PERMIT_DISTFILES_CDROM= no license PERMIT_DISTFILES_FTP= no license -WANTLIB= c pcap lib/libnet-1.0/net.=0 +WANTLIB= c pcap lib/libnet-1.0/net=0 CONFIGURE_STYLE= gnu old diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index a625561dab..05e4828054 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.31 2010/11/19 22:31:39 espie Exp $ COMMENT-main= cross-platform remote desktop access COMMENT-viewer= client for cross-platform remote desktop access @@ -37,8 +37,8 @@ NO_REGRESS= Yes WANTLIB= X11 Xau Xdmcp Xext c z -WANTLIB-viewer= ${WANTLIB} ICE SM Xaw Xmu Xpm Xt jpeg.>=62 -LIB_DEPENDS-viewer= ::graphics/jpeg +WANTLIB-viewer= ${WANTLIB} ICE SM Xaw Xmu Xpm Xt jpeg>=62 +LIB_DEPENDS-viewer= graphics/jpeg WANTLIB-main= ${WANTLIB} m diff --git a/net/tircd/Makefile b/net/tircd/Makefile index 783a06f0ef..fbd8e61626 100644 --- a/net/tircd/Makefile +++ b/net/tircd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:39 espie Exp $ COMMENT= ircd proxy to the twitter API @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://tircd.googlecode.com/files/ BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::net/p5-Net-Twitter +RUN_DEPENDS= net/p5-Net-Twitter NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile index 5843d5c61e..e50acf291b 100644 --- a/net/tkirc/Makefile +++ b/net/tkirc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/07/12 22:07:42 sthen Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:39 espie Exp $ COMMENT= ircII internet relay chat client @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://netsplit.de/tkirc2/ MODULES= x11/tk -RUN_DEPENDS= :ircII-*:net/ircII \ +RUN_DEPENDS= net/ircII \ ${MODTK_RUN_DEPENDS} NO_BUILD= Yes diff --git a/net/totd/Makefile b/net/totd/Makefile index 28e9020a51..f8450a7ca8 100644 --- a/net/totd/Makefile +++ b/net/totd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/18 18:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/19 22:31:39 espie Exp $ # $NetBSD: Makefile,v 1.3 2000/01/21 10:01:23 itojun Exp $ COMMENT= DNS proxy that supports IPv6 <==> IPv4 record translation @@ -19,7 +19,7 @@ WANTLIB= c CONFIGURE_STYLE= gnu CONFIGURE_ARGS += --enable-stf -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes MAKE_FLAGS= CC="${CC}" SYSCONFDIR="${SYSCONFDIR}" diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 3c9ed9b6fe..6b9fc3d1e4 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2010/10/30 22:05:43 naddy Exp $ +# $OpenBSD: Makefile,v 1.62 2010/11/19 22:31:39 espie Exp $ COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-gtk= lightweight BitTorrent client with GTK+ interface @@ -32,8 +32,8 @@ WANTLIB= c crypto curl event eventextra idn m pthread ssl z WANTLIB-main= ${WANTLIB} MODULES= devel/gettext textproc/intltool -LIB_DEPENDS= ::net/curl \ - ::devel/libeventextra +LIB_DEPENDS= net/curl \ + devel/libeventextra USE_GMAKE= Yes USE_LIBTOOL= Yes @@ -66,21 +66,25 @@ WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \ pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \ xcb-render xcb-shm -LIB_DEPENDS+= ::x11/gtk+2 \ - ::x11/dbus-glib -RUN_DEPENDS-gtk=:${PKGNAME-main}:net/transmission,-main \ - ::devel/desktop-file-utils \ - :gamin-*:sysutils/gamin,-server,no_python +LIB_DEPENDS+= x11/gtk+2 \ + x11/dbus-glib +RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \ + devel/desktop-file-utils \ + sysutils/gamin,-server,no_python .endif .include -.if ${COMPILER_VERSION:L:Mgcc4*} && !${FLAVOR:L:Mno_qt} +.if !${FLAVOR:L:Mno_qt} MULTI_PACKAGES+=-qt -LIB_DEPENDS+= ::x11/qt4 +.endif + +ONLY_FOR_ARCHS-qt = ${GCC4_ARCHS} +.if ${COMPILER_VERSION:L:Mgcc4*} && !${FLAVOR:L:Mno_qt} +LIB_DEPENDS+= x11/qt4 WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \ dbus-1 expat fontconfig freetype stdc++ -RUN_DEPENDS-qt= :${PKGNAME-main}:net/transmission,-main +RUN_DEPENDS-qt= ${PKGNAME-main}:net/transmission,-main post-build: cd ${WRKSRC}/qt; qmake4 qtr.pro; make ${MAKE_FLAGS} diff --git a/net/twirssi/Makefile b/net/twirssi/Makefile index ee8ebf7167..2f74bf7777 100644 --- a/net/twirssi/Makefile +++ b/net/twirssi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/04/05 21:17:14 xsa Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:39 espie Exp $ COMMENT= Twitter script for irssi @@ -20,8 +20,8 @@ MASTER_SITES= ${HOMEPAGE} EXTRACT_ONLY= EXTRACT_SUFX= .pl -RUN_DEPENDS= :irssi-*:net/irssi \ - ::net/p5-Net-Twitter +RUN_DEPENDS= net/irssi \ + net/p5-Net-Twitter NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/twitux/Makefile b/net/twitux/Makefile index 29c3e8eac3..07e7fe3ea2 100644 --- a/net/twitux/Makefile +++ b/net/twitux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2010/11/19 22:31:39 espie Exp $ COMMENT= Gtk-based GUI client for Twitter @@ -27,17 +27,17 @@ WANTLIB += gobject-2.0 gpg-error gthread-2.0 gtk-x11-2.0 ltdl WANTLIB += m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 WANTLIB += png pthread pthread-stubs stdc++ tasn1 vorbis vorbisfile WANTLIB += xcb xml2 z xcb-render xcb-render-util -WANTLIB += soup-2.4 sexy gnome-keyring.>=6 notify canberra canberra-gtk +WANTLIB += soup-2.4 sexy gnome-keyring>=6 notify canberra canberra-gtk WANTLIB += enchant -BUILD_DEPENDS= :iso-codes-*:devel/iso-codes +BUILD_DEPENDS= devel/iso-codes -LIB_DEPENDS= ::devel/libsoup \ - ::x11/libsexy \ - :libgnome-keyring-*:x11/gnome/libgnome-keyring \ - ::devel/libnotify \ - ::audio/libcanberra \ - ::textproc/enchant +LIB_DEPENDS= devel/libsoup \ + x11/libsexy \ + x11/gnome/libgnome-keyring \ + devel/libnotify \ + audio/libcanberra \ + textproc/enchant MODULES= devel/gconf2 \ devel/gettext \ diff --git a/net/unbound/Makefile b/net/unbound/Makefile index aae803fa4a..49ba42de70 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/11/10 08:29:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/19 22:31:39 espie Exp $ COMMENT= validating DNS resolver @@ -24,8 +24,8 @@ NO_REGRESS= Yes SHARED_LIBS+= unbound 2.6 -WANTLIB= c crypto event expat ldns.>=4.5 ssl -LIB_DEPENDS+= :libldns->=1.6.7:net/ldns/libldns +WANTLIB= c crypto event expat ldns>=4.5 ssl +LIB_DEPENDS+= net/ldns/libldns>=1.6.7 CONFIGURE_ARGS+= --with-ssl=/usr \ --with-libevent=/usr \ diff --git a/net/unison/Makefile.inc b/net/unison/Makefile.inc index a0bd262280..6913cc4a85 100644 --- a/net/unison/Makefile.inc +++ b/net/unison/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2010/11/19 22:31:39 espie Exp $ DISTNAME= unison-$V CATEGORIES= net @@ -23,8 +23,8 @@ FLAVOR?= .if ${FLAVOR:L:Mno_x11} MAKE_FLAGS= UISTYLE=text .else -BUILD_DEPENDS+= ::x11/lablgtk2 -LIB_DEPENDS= ::x11/gtk+2 +BUILD_DEPENDS+= x11/lablgtk2 +LIB_DEPENDS= x11/gtk+2 MAKE_FLAGS= UISTYLE=gtk2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama WANTLIB += Xrandr Xrender expat fontconfig freetype pixman-1 pthread-stubs diff --git a/net/ushare/Makefile b/net/ushare/Makefile index c2be8c8e56..772880b058 100755 --- a/net/ushare/Makefile +++ b/net/ushare/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:39 espie Exp $ COMMENT= UPnP A/V media server @@ -24,7 +24,7 @@ MASTER_SITES= ${HOMEPAGE}releases/ MODULES= devel/gettext -LIB_DEPENDS= ::net/libupnp +LIB_DEPENDS= net/libupnp USE_GMAKE= Yes NO_REGRESS= Yes diff --git a/net/valknut/Makefile b/net/valknut/Makefile index 62ab5fe0b4..b6db7adc45 100644 --- a/net/valknut/Makefile +++ b/net/valknut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:39 espie Exp $ COMMENT= Graphical Direct-Connect client @@ -19,9 +19,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_BERLIOS:=dcgui/} MODULES= converters/libiconv x11/qt3 -LIB_DEPENDS= ::net/dclib \ - ::graphics/jpeg \ - ::archivers/bzip2 +LIB_DEPENDS= net/dclib \ + graphics/jpeg \ + archivers/bzip2 WANTLIB= ICE SM X11 Xau Xdmcp Xext c crypto m png \ pthread pthread-stubs ssl stdc++ xcb xml2 z \ dc jpeg bz2 diff --git a/net/vicq/Makefile b/net/vicq/Makefile index 767754ad14..532466d41c 100644 --- a/net/vicq/Makefile +++ b/net/vicq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/09/15 22:37:00 merdely Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:39 espie Exp $ COMMENT= text-based ICQ implementation @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -RUN_DEPENDS= :p5-Term-ReadLine-Gnu-*:devel/p5-Term-ReadLine-Gnu +RUN_DEPENDS= devel/p5-Term-ReadLine-Gnu CONFIGURE_STYLE= perl diff --git a/net/vncsnapshot/Makefile b/net/vncsnapshot/Makefile index 41b3bbb56c..8dbced4a4d 100644 --- a/net/vncsnapshot/Makefile +++ b/net/vncsnapshot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:39 espie Exp $ COMMENT= connect to VNC server and save screen images @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= ::graphics/jpeg +LIB_DEPENDS= graphics/jpeg WANTLIB += c m stdc++ z jpeg diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index 544624257a..058dd83d63 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/08 13:20:44 pea Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:39 espie Exp $ COMMENT = network traffic monitor @@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c m gd -LIB_DEPENDS = ::graphics/gd +LIB_DEPENDS = graphics/gd USE_GMAKE = Yes diff --git a/net/walker/Makefile b/net/walker/Makefile index 56f4e982fe..a7d41f85a2 100644 --- a/net/walker/Makefile +++ b/net/walker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:39 espie Exp $ COMMENT= retrieve DNS zone via DNSSEC NXT/NSEC traversal @@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}releases/ -RUN_DEPENDS= ::net/p5-Net-DNS \ - ::net/p5-Net-DNS-SEC +RUN_DEPENDS= net/p5-Net-DNS \ + net/p5-Net-DNS-SEC NO_BUILD= Yes NO_REGRESS= Yes diff --git a/net/weex/Makefile b/net/weex/Makefile index 81eb3ab6b2..d3db6bd8d2 100644 --- a/net/weex/Makefile +++ b/net/weex/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:39 espie Exp $ COMMENT= noninteractive ftp client DISTNAME= weex-2.6.1.5 @@ -24,7 +24,7 @@ CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GROFF = Yes +USE_GROFF = Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/weex diff --git a/net/wget/Makefile b/net/wget/Makefile index 7f7b2d0970..862fb9a9a2 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.55 2010/11/19 22:31:39 espie Exp $ COMMENT = retrieve files from the web via HTTP, HTTPS and FTP @@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB = c crypto ssl idn -LIB_DEPENDS = ::devel/libidn +LIB_DEPENDS = devel/libidn MASTER_SITES = ${MASTER_SITE_GNU:=wget/} diff --git a/net/wide-dhcpv6/Makefile b/net/wide-dhcpv6/Makefile index b3afcc4f42..560ae5f13a 100644 --- a/net/wide-dhcpv6/Makefile +++ b/net/wide-dhcpv6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/10/18 18:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2010/11/19 22:31:39 espie Exp $ COMMENT= client and servers for the WIDE DHCPv6 protocol @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu WANTLIB= c -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes do-install: diff --git a/net/winexe/Makefile b/net/winexe/Makefile index 1788eb0342..b515ac383e 100644 --- a/net/winexe/Makefile +++ b/net/winexe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:39 espie Exp $ COMMENT = remotely execute programs on a Windows host @@ -23,7 +23,7 @@ EXTRACT_SUFX = .tar.bz2 WANTLIB = c gnutls BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} -LIB_DEPENDS = ::security/gnutls +LIB_DEPENDS = security/gnutls MODULES = converters/libiconv CONFIGURE_STYLE = gnu diff --git a/net/wmnetload/Makefile b/net/wmnetload/Makefile index 3ecfc316ce..fd46d7975f 100644 --- a/net/wmnetload/Makefile +++ b/net/wmnetload/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:39 espie Exp $ COMMENT= wm-dockapp; simple network interface monitoring tool @@ -19,7 +19,7 @@ WANTLIB= X11 Xext Xpm c kvm m pthread-stubs xcb dockapp MASTER_SITES= ftp://truffula.com/pub/ -LIB_DEPENDS= ::devel/libdockapp +LIB_DEPENDS= devel/libdockapp SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu diff --git a/net/wol/Makefile b/net/wol/Makefile index 8939a32b1f..f372930177 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/18 18:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:39 espie Exp $ COMMENT= Wake On Lan client @@ -22,6 +22,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ahh/} MODULES= devel/gettext CONFIGURE_STYLE= gnu -USE_GROFF = Yes +USE_GROFF = Yes .include diff --git a/net/xchat/Makefile b/net/xchat/Makefile index 7b828e31c3..2c52b91886 100644 --- a/net/xchat/Makefile +++ b/net/xchat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.80 2010/10/24 21:30:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.81 2010/11/19 22:31:39 espie Exp $ COMMENT= GTK+2 IRC client @@ -33,10 +33,10 @@ MASTER_SITES= ${HOMEPAGE}files/source/${MAJOR}/ \ MODULES= devel/gettext \ devel/gconf2 -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= ::x11/gtk+2 \ - ::x11/dbus-glib \ - ::x11/libsexy +RUN_DEPENDS= devel/desktop-file-utils +LIB_DEPENDS= x11/gtk+2 \ + x11/dbus-glib \ + x11/libsexy USE_LIBTOOL= Yes USE_GMAKE= Yes diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile index db30ed61d6..b03e5344af 100644 --- a/net/xmlrpc-c/Makefile +++ b/net/xmlrpc-c/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:39 espie Exp $ COMMENT= XML-RPC C/C++ client-server implementation CATEGORIES= net devel textproc @@ -32,7 +32,7 @@ PERMIT_PACKAGE_CDROM= Yes MODULES= devel/gettext -LIB_DEPENDS= ::net/curl +LIB_DEPENDS= net/curl CONFIGURE_STYLE= gnu USE_LIBTOOL= Yes diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index cac3515c62..10c3e08e39 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/24 21:30:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:39 espie Exp $ COMMENT= XML-RPC C/C++ client-server implementation CATEGORIES= net devel textproc @@ -19,8 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes -BUILD_DEPENDS += ::devel/gettext -RUN_DEPENDS += ::devel/gettext +BUILD_DEPENDS += devel/gettext +RUN_DEPENDS += devel/gettext CONFIGURE_STYLE= gnu autoconf USE_LIBTOOL= Yes diff --git a/net/xorp/Makefile b/net/xorp/Makefile index 98bfbc9a17..8d3ec9529c 100644 --- a/net/xorp/Makefile +++ b/net/xorp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/09/24 10:55:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2010/11/19 22:31:39 espie Exp $ COMMENT-main= eXtensible Open Router Platform @@ -38,8 +38,8 @@ CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --enable-optimize --disable-debug MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config ${WRKSRC}/cli/libtecla -REGRESS_DEPENDS= ::shells/bash \ - ::lang/python/2.5 +REGRESS_DEPENDS= shells/bash \ + lang/python/2.5 # some regression tests must be run as root do-regress: diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile index 6cf48639b4..d043161f81 100644 --- a/net/xprobe/Makefile +++ b/net/xprobe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/10/18 18:37:00 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/11/19 22:31:39 espie Exp $ COMMENT= ICMP active OS fingerprint scanner @@ -19,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xprobe/} CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/cfg-scripts -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes .include diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 0612654e1e..4806bcc6c6 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:39 espie Exp $ COMMENT= Z39.50/SR client and API library DISTNAME= yaz-3.0.49 @@ -28,11 +28,11 @@ WANTLIB= c m ncurses pthread readline z iconv intl \ MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ \ ftp://ftp.indexdata.dk/pub/yaz/ -LIB_DEPENDS= ::textproc/libxml \ - ::security/libgpg-error \ - ::security/libgcrypt \ - ::textproc/libxslt \ - ::textproc/icu4c +LIB_DEPENDS= textproc/libxml \ + security/libgpg-error \ + security/libgcrypt \ + textproc/libxslt \ + textproc/icu4c CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-gnutls diff --git a/net/yersinia/Makefile b/net/yersinia/Makefile index 47f5061573..0148084fb1 100644 --- a/net/yersinia/Makefile +++ b/net/yersinia/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/26 10:44:53 steven Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:39 espie Exp $ COMMENT = framework for analysis of layer 2 network protocols @@ -20,7 +20,7 @@ MASTER_SITES = http://www.yersinia.net/download/ WANTLIB = c ncurses panel pcap pthread net -LIB_DEPENDS = :libnet->=1.1:net/libnet/1.1 +LIB_DEPENDS = net/libnet/1.1>=1.1 CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --disable-gtk \ diff --git a/net/ysmv7/Makefile b/net/ysmv7/Makefile index d9af8a69bc..7437958868 100644 --- a/net/ysmv7/Makefile +++ b/net/ysmv7/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/10/18 18:37:00 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:39 espie Exp $ COMMENT= ICQ console client with encryption support @@ -23,7 +23,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_GROFF = Yes +USE_GROFF = Yes NO_REGRESS= Yes .include diff --git a/net/yt/Makefile b/net/yt/Makefile index bbdc46e76a..e44aa08ca1 100644 --- a/net/yt/Makefile +++ b/net/yt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2010/09/09 17:34:14 jasper Exp $ +# $OpenBSD: Makefile,v 1.38 2010/11/19 22:31:39 espie Exp $ COMMENT= fetch youtube and google videos @@ -19,9 +19,9 @@ MODULES= lang/lua NO_CHECKSUM= Yes NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS+= ::devel/luastdlib \ - ::graphics/ffmpeg \ - ::net/luasocket +RUN_DEPENDS+= devel/luastdlib \ + graphics/ffmpeg \ + net/luasocket do-install: ${INSTALL_SCRIPT} ${FILESDIR}/yt.lua ${PREFIX}/bin/yt diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile index 5c176f085b..537eb2fde6 100644 --- a/net/zabbix/Makefile +++ b/net/zabbix/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2010/11/16 10:08:49 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2010/11/19 22:31:39 espie Exp $ COMMENT-main = network and application monitoring - agent COMMENT-server = network and application monitoring - server @@ -32,7 +32,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=zabbix/} MODULES= converters/libiconv -USE_GROFF = Yes +USE_GROFF = Yes MULTI_PACKAGES = -main -web PSEUDO_FLAVORS = no_server @@ -41,16 +41,16 @@ FLAVORS = mysql pgsql sqlite3 SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV WANTLIB = c kvm m execinfo lber ldap -LIB_DEPENDS = ::databases/openldap \ - ::devel/libexecinfo +LIB_DEPENDS = databases/openldap \ + devel/libexecinfo LIB_DEPENDS-server = ${LIB_DEPENDS} \ - ::net/curl \ - ::net/net-snmp \ - ::textproc/iksemel -RUN_DEPENDS-server = ::net/fping + net/curl \ + net/net-snmp \ + textproc/iksemel +RUN_DEPENDS-server = net/fping # we want the _zabbix user&group as well as README-main -RUN_DEPENDS-server += :zabbix-agent->=${VERSION}:net/zabbix,-main +RUN_DEPENDS-server += net/zabbix,-main>=${VERSION} WANTLIB-server = ${WANTLIB} crypto idn ssl z curl netsnmp iksemel CONFIGURE_STYLE = gnu @@ -68,8 +68,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ PREFIX-web = /var/www LIB_DEPENDS-web = -RUN_DEPENDS-web = ::www/php5/extensions,-gd \ - ::www/php5/extensions,-mbstring +RUN_DEPENDS-web = www/php5/extensions,-gd \ + www/php5/extensions,-mbstring WANTLIB-web = ZABBIX_WEB = ${PREFIX-web}/zabbix @@ -81,17 +81,17 @@ FLAVOR ?= no_server BACKEND = ${FLAVOR} .if ${BACKEND} == "mysql" MULTI_PACKAGES += -server -LIB_DEPENDS-server += ::databases/mysql,-main +LIB_DEPENDS-server += databases/mysql,-main CONFIGURE_ARGS += --with-mysql WANTLIB-server += mysqlclient .elif ${BACKEND} == "pgsql" MULTI_PACKAGES += -server -LIB_DEPENDS-server += ::databases/postgresql,-main +LIB_DEPENDS-server += databases/postgresql,-main CONFIGURE_ARGS += --with-pgsql WANTLIB-server += pq .elif ${BACKEND} == "sqlite3" MULTI_PACKAGES += -server -LIB_DEPENDS-server += ::databases/sqlite3,-main +LIB_DEPENDS-server += databases/sqlite3,-main CONFIGURE_ARGS += --with-sqlite3 WANTLIB-server += sqlite3 .elif ${BACKEND} == "no_server" diff --git a/net/zenirc/Makefile b/net/zenirc/Makefile index 2fcbe1f5b0..5235a6d5f2 100644 --- a/net/zenirc/Makefile +++ b/net/zenirc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2007/10/14 09:28:12 aanriot Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/19 22:31:39 espie Exp $ COMMENT-main= IRC client for Emacs COMMENT-el= elisp sources of zenirc @@ -23,7 +23,7 @@ MASTER_SITES= ftp://ftp.zenirc.org/pub/zenirc/ CONFIGURE_STYLE=gnu old dest -RUN_DEPENDS= ::editors/emacs21 +RUN_DEPENDS= editors/emacs21 BUILD_DEPENDS= ${RUN_DEPENDS} MULTI_PACKAGES= -main -el diff --git a/net/ziproxy/Makefile b/net/ziproxy/Makefile index b6b03b4176..f9bc1e69c0 100644 --- a/net/ziproxy/Makefile +++ b/net/ziproxy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/11 17:20:28 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:39 espie Exp $ COMMENT = compressing non-caching HTTP proxy @@ -17,14 +17,14 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += c m pthread z gif.>=5 png.>=8 jpeg.>=62 jasper.>=2 +WANTLIB += c m pthread z gif>=5 png>=8 jpeg>=62 jasper>=2 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ziproxy/} -LIB_DEPENDS = ::graphics/libungif \ - ::graphics/png \ - ::graphics/jpeg \ - ::graphics/jasper +LIB_DEPENDS = graphics/libungif \ + graphics/png \ + graphics/jpeg \ + graphics/jasper SEPARATE_BUILD = concurrent diff --git a/net/znc/Makefile b/net/znc/Makefile index 3c4debbbfc..ff24b7e6ac 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 18:37:00 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:39 espie Exp $ SHARED_ONLY= Yes @@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c cares crypto m perl ssl stdc++ util -LIB_DEPENDS= ::net/libcares +LIB_DEPENDS= net/libcares MAKE_FLAGS+= VERBOSE=1