aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/Makefile2
-rw-r--r--net/bluemix-cli/Makefile39
-rw-r--r--net/bluemix-cli/distinfo3
-rw-r--r--net/bluemix-cli/pkg-descr8
-rw-r--r--net/bluemix-cli/pkg-message12
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/easysoap/Makefile2
-rw-r--r--net/foreman-proxy/Makefile12
-rw-r--r--net/foreman-proxy/distinfo5
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example20
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example43
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example9
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-realm.yml.example6
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example9
-rw-r--r--net/foreman-proxy/files/patch-config-settings.yml.example6
-rw-r--r--net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example10
-rw-r--r--net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example9
-rw-r--r--net/foreman-proxy/pkg-message10
-rw-r--r--net/foreman-proxy/pkg-plist163
-rw-r--r--net/g2ipmsg/Makefile2
-rw-r--r--net/gini/Makefile2
-rw-r--r--net/gkrellmwireless2/Makefile2
-rw-r--r--net/gnet2/Makefile2
-rw-r--r--net/gnetcat/Makefile2
-rw-r--r--net/gnu-radius/Makefile2
-rw-r--r--net/grdesktop/Makefile2
-rw-r--r--net/gsk/Makefile8
-rw-r--r--net/gsk/files/patch-src_gskipv4.c4
-rw-r--r--net/gstreamer-plugins-libmms/Makefile2
-rw-r--r--net/gupnp-igd/Makefile1
-rw-r--r--net/gupnp-ui/Makefile2
-rw-r--r--net/gutenfetch/Makefile1
-rw-r--r--net/ipsorc/Makefile2
-rw-r--r--net/jags/Makefile2
-rw-r--r--net/ldapbrowser/Makefile2
-rw-r--r--net/ldapdiff/Makefile2
-rw-r--r--net/libdmapsharing/Makefile2
-rw-r--r--net/libzapojit/Makefile2
-rw-r--r--net/liveMedia/Makefile2
-rw-r--r--net/liveMedia/distinfo6
-rw-r--r--net/mediatomb/Makefile2
-rw-r--r--net/micro_proxy/Makefile4
-rw-r--r--net/micro_proxy/distinfo5
-rw-r--r--net/minisapserver/Makefile1
-rw-r--r--net/mpich/Makefile2
-rw-r--r--net/mpich2/Makefile2
-rw-r--r--net/nbd-server/Makefile1
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/openmpi/Makefile1
-rw-r--r--net/openmpi2/Makefile2
-rw-r--r--net/p5-Apache2-SOAP/Makefile2
-rw-r--r--net/p5-MaxMind-DB-Writer/Makefile2
-rw-r--r--net/p5-MaxMind-DB-Writer/distinfo6
-rw-r--r--net/p5-Net-Z3950-ZOOM/Makefile2
-rw-r--r--net/p5-OurNet-BBS/Makefile2
-rw-r--r--net/packter-agent/Makefile2
-rw-r--r--net/py-ldap/Makefile2
-rw-r--r--net/py-ldap/distinfo6
-rw-r--r--net/py-ldap3/Makefile2
-rw-r--r--net/py-ldap3/distinfo6
-rw-r--r--net/py-pysmb/Makefile2
-rw-r--r--net/py-pysmb/distinfo5
-rw-r--r--net/py-pysocks/Makefile2
-rw-r--r--net/py-pysocks/distinfo6
-rw-r--r--net/rabbitmq/Makefile16
-rw-r--r--net/rabbitmq/distinfo6
-rw-r--r--net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins10
-rw-r--r--net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server10
-rw-r--r--net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl (renamed from net/rabbitmq/files/patch-scripts_rabbitmqctl)8
-rw-r--r--net/rabbitmq/files/patch-scripts_rabbitmq-plugins10
-rw-r--r--net/rabbitmq/files/patch-scripts_rabbitmq-server10
-rw-r--r--net/rabbitmq/pkg-plist5
-rw-r--r--net/remmina/Makefile11
-rw-r--r--net/remmina/pkg-plist2
-rw-r--r--net/rubygem-qiniu/Makefile24
-rw-r--r--net/rubygem-qiniu/distinfo3
-rw-r--r--net/rubygem-qiniu/pkg-descr3
-rw-r--r--net/rubygem-twitter/Makefile3
-rw-r--r--net/rubygem-twitter/distinfo5
-rw-r--r--net/sl2tps/Makefile2
-rw-r--r--net/sobby/Makefile1
-rw-r--r--net/sofia-sip/Makefile2
-rw-r--r--net/ssvnc/Makefile35
-rw-r--r--net/ssvnc/files/patch-Makefile56
-rw-r--r--net/ssvnc/files/patch-vncstorepw_Makefile17
-rw-r--r--net/ssvnc/files/patch-wr__tool8
-rw-r--r--net/syncthing/Makefile2
-rw-r--r--net/syncthing/distinfo6
-rw-r--r--net/tapidbus/Makefile2
-rw-r--r--net/tcpreen/Makefile2
-rw-r--r--net/twitux/Makefile2
-rw-r--r--net/ulxmlrpcpp/Makefile2
-rw-r--r--net/unison-devel/Makefile1
-rw-r--r--net/userfw/Makefile1
-rw-r--r--net/vmware-vsphere-cli/Makefile2
-rw-r--r--net/vncreflector/Makefile2
-rw-r--r--net/whois/Makefile1
-rw-r--r--net/wmlj/Makefile2
-rw-r--r--net/wol/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
-rw-r--r--net/xmlrpc-c/distinfo6
-rw-r--r--net/xrdp-devel/Makefile2
-rw-r--r--net/yaz++/Makefile1
-rw-r--r--net/yazproxy/Makefile2
104 files changed, 454 insertions, 324 deletions
diff --git a/net/Makefile b/net/Makefile
index 422fd2c7593..ccb2bbed329 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -52,6 +52,7 @@
SUBDIR += bird-devel
SUBDIR += bird6
SUBDIR += bittwist
+ SUBDIR += bluemix-cli
SUBDIR += bmon
SUBDIR += bnxt-kmod
SUBDIR += boclient
@@ -1189,6 +1190,7 @@
SUBDIR += rubygem-opennebula
SUBDIR += rubygem-packetfu
SUBDIR += rubygem-pcaprub
+ SUBDIR += rubygem-qiniu
SUBDIR += rubygem-rabbiter
SUBDIR += rubygem-rbvmomi
SUBDIR += rubygem-right_aws
diff --git a/net/bluemix-cli/Makefile b/net/bluemix-cli/Makefile
new file mode 100644
index 00000000000..b1681dd6f01
--- /dev/null
+++ b/net/bluemix-cli/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PORTNAME= bluemix-cli
+PORTVERSION= 0.4.4
+DISTNAME= Bluemix_CLI_${PORTVERSION}_386
+CATEGORIES= net
+MASTER_SITES= http://public.dhe.ibm.com/cloud/${PORTNAME:C/-.*//}/cli/${PORTNAME}/
+
+MAINTAINER= avilla@FreeBSD.org
+COMMENT= Bluemix command line interface
+
+LICENSE= BLUEMIX
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_NAME= IBM Bluemix Service Description
+LICENSE_FILE= ${WRKSRC}/bin/LICENSE
+
+RUN_DEPENDS= cf:net/cf
+
+USES= linux
+NO_BUILD= yes
+NO_ARCH= yes
+STRIP= # empty
+
+WRKSRC= ${WRKDIR}/Bluemix_CLI
+
+PLIST_FILES= bin/bluemix bin/bluemix-analytics bin/bx \
+ etc/bash_completion.d/bluemix.sh
+
+pre-install:
+ ${BRANDELF} -t Linux ${WRKSRC}/bin/bluemix*
+
+do-install:
+ cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} bluemix bluemix-analytics \
+ ${STAGEDIR}${PREFIX}/bin
+ ${LN} -s bluemix ${STAGEDIR}${PREFIX}/bin/bx
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+ ${INSTALL_DATA} ${WRKSRC}/bx/bash_autocomplete ${STAGEDIR}${PREFIX}/etc/bash_completion.d/bluemix.sh
+
+.include <bsd.port.mk>
diff --git a/net/bluemix-cli/distinfo b/net/bluemix-cli/distinfo
new file mode 100644
index 00000000000..81d5c60be41
--- /dev/null
+++ b/net/bluemix-cli/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1481244062
+SHA256 (Bluemix_CLI_0.4.4_386.tar.gz) = 1f5efea2b0b0e0a0bbaf338f0116f0b8a7b6f30006f7e9a2a0fe94d7e92059c5
+SIZE (Bluemix_CLI_0.4.4_386.tar.gz) = 6122023
diff --git a/net/bluemix-cli/pkg-descr b/net/bluemix-cli/pkg-descr
new file mode 100644
index 00000000000..161c7134903
--- /dev/null
+++ b/net/bluemix-cli/pkg-descr
@@ -0,0 +1,8 @@
+Bluemix CLI provides a unified way for you to interact with your
+applications, virtual servers, containers, and other components in
+Bluemix through a command line interface. It also leverages command
+line tools from Cloud Foundry, Docker, and the OpenStack community
+when you interact with specific compute types. Bluemix CLI helps you
+handle the environment settings when these community tools are used.
+
+WWW: http://clis.ng.bluemix.net
diff --git a/net/bluemix-cli/pkg-message b/net/bluemix-cli/pkg-message
new file mode 100644
index 00000000000..f5e04cc3c02
--- /dev/null
+++ b/net/bluemix-cli/pkg-message
@@ -0,0 +1,12 @@
+======================================================================
+
+With IBM Bluemix CLI 0.4.0 or later, the CLI can automatically collect
+diagnostic and usage information and send it to Bluemix for analysis.
+This information will help us better understand current client usage
+and plan for future use. No personally identifiable data is collected.
+
+To stop collecting information, you can run the following command:
+
+$ bluemix config --usage-stats-collect false
+
+======================================================================
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 1334f51260c..85b5f658c33 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= boinc-client
PORTVERSION= 7.2.33
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= LOCAL/rene
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile
index f61a636e08e..853bd905edc 100644
--- a/net/easysoap/Makefile
+++ b/net/easysoap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= easysoap
PORTVERSION= 0.8.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SWANSONG
DISTNAME= EasySoap++-${PORTVERSION}
diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index ee762e8ce2a..291839ad89e 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= foreman-proxy
-PORTVERSION= 1.10.0
-PORTREVISION= 1
+PORTVERSION= 1.12.2
CATEGORIES= net
MASTER_SITES= http://downloads.theforeman.org/foreman-proxy/
@@ -75,7 +74,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \
${STAGEDIR}${PREFIX}/sbin/smart-proxy
.for file in CHANGELOG Contributors Gemfile LICENSE README.md \
- VERSION bundler.d config.ru lib modules public views
+ VERSION bundler.d config.ru lib modules
${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
.endfor
${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
@@ -86,8 +85,11 @@ do-install:
${CP} -r ${WRKSRC}/extra/migrations ${STAGEDIR}${DATADIR}/extra
${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
-.for cfg in bmc dhcp dns dns_dnscmd dns_nsupdate_gss dns_nsupdate dns_virsh \
- facts puppet puppetca realm templates tftp
+.for cfg in bmc dhcp dhcp_isc dhcp_libvirt dhcp_ms_native dns dns_dnscmd \
+ dns_libvirt dns_nsupdate dns_nsupdate dns_nsupdate_gss \
+ facts logs puppet puppet_proxy_customrun puppet_proxy_legacy \
+ puppet_proxy_mcollective puppet_proxy_puppet_api puppet_proxy_puppetrun \
+ puppet_proxy_salt puppet_proxy_ssh puppetca realm templates tftp
${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
.endfor
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 4cf9f79be36..b86a7f31383 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (foreman-proxy-1.10.0.tar.bz2) = 73fbfd058249cd59103fcad7335ff8e0323b577ba92d945d01b3d8327a2819a0
-SIZE (foreman-proxy-1.10.0.tar.bz2) = 116535
+TIMESTAMP = 1473110479
+SHA256 (foreman-proxy-1.12.2.tar.bz2) = 7d1c807da404a413c47c3931bbad1189aa1c643017ffad7d6a23f69a5d9a7735
+SIZE (foreman-proxy-1.12.2.tar.bz2) = 141089
diff --git a/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example b/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example
deleted file mode 100644
index d6a5c3c952e..00000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-dhcp.yml.example
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/settings.d/dhcp.yml.example.orig 2014-09-27 09:03:57.507470266 +0200
-+++ config/settings.d/dhcp.yml.example 2014-09-27 09:06:15.715460654 +0200
-@@ -8,14 +8,8 @@
- # dhcp_subnets is an ISC & Native MS implementation setting. It restricts the subnets queried to a
- # subset, so as to reduce the query time.
- #:dhcp_subnets: [192.168.205.0/255.255.255.128, 192.168.205.128/255.255.255.128]
--# Settings for Ubuntu ISC
--#:dhcp_config: /etc/dhcp3/dhcpd.conf
--#:dhcp_leases: /var/lib/dhcp3/dhcpd.leases
--# Settings for Redhat ISC
--# Redhat 5
--#:dhcp_config: /etc/dhcpd.conf
--# Redhat 6
--#:dhcp_config: /etc/dhcp/dhcpd.conf
--#:dhcp_leases: /var/lib/dhcpd/dhcpd.leases
-+# Settings for FreeBSD ISC
-+#:dhcp_config: %%LOCALBASE%%/etc/dhcpd.conf
-+#:dhcp_leases: /var/db/dhcpd.leases
- #:dhcp_key_name: secret_key_name
- #:dhcp_key_secret: secret_key
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example
deleted file mode 100644
index c9a9e87ef22..00000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-puppet.yml.example
+++ /dev/null
@@ -1,43 +0,0 @@
---- config/settings.d/puppet.yml.example.orig 2014-12-02 11:27:28.000000000 +0100
-+++ config/settings.d/puppet.yml.example 2014-12-04 11:27:31.399941182 +0100
-@@ -10,23 +10,23 @@
-
- # Customrun command details
- # Set :customrun_cmd to the full path of the script you want to run, instead of /bin/false
--:customrun_cmd: /bin/false
-+:customrun_cmd: /usr/bin/false
- # Set :customrun_args to any args you want to pass to your custom script. The hostname of the
- # system to run against will be appended after the custom commands.
- :customrun_args: -ay -f -s
-
--:puppet_conf: /etc/puppet/puppet.conf
-+:puppet_conf: %%LOCALBASE%%/etc/puppet/puppet.conf
- # whether to use sudo before the ssh command
- :puppetssh_sudo: false
- # the command which will be sent to the host
--:puppetssh_command: /usr/bin/puppet agent --onetime --no-usecacheonfailure
-+:puppetssh_command: %%LOCALBASE%%/bin/puppet agent --onetime --no-usecacheonfailure
- # wait for the command to finish (and capture exit code), or detach process and return 0
- # Note: enabling this option causes the Foreman web UI to be blocked when executing puppetrun,
- # with timeout from the Browser and/or Foreman's REST client after 60 seconds.
- :puppetssh_wait: false
- # With which user should the proxy connect
- #:puppetssh_user: root
--#:puppetssh_keyfile: /etc/foreman-proxy/id_rsa
-+#:puppetssh_keyfile: %%PREFIX%%/etc/foreman-proxy/id_rsa
-
- # Which user to invoke sudo as to run puppet commands
- #:puppet_user: root
-@@ -34,9 +34,9 @@
- # URL of the puppet master itself for API requests
- #:puppet_url: https://puppet.example.com:8140
- # SSL certificates used to access the puppet master API
--#:puppet_ssl_ca: /var/lib/puppet/ssl/certs/ca.pem
--#:puppet_ssl_cert: /var/lib/puppet/ssl/certs/puppet.example.com.pem
--#:puppet_ssl_key: /var/lib/puppet/ssl/private_keys/puppet.example.com.pem
-+#:puppet_ssl_ca: /var/puppet/ssl/certs/ca.pem
-+#:puppet_ssl_cert: /var/puppet/ssl/certs/puppet.example.com.pem
-+#:puppet_ssl_key: /var/puppet/ssl/private_keys/puppet.example.com.pem
-
- # Override use of Puppet's API to list environments, by default it will use only if
- # environmentpath is given in puppet.conf, else will look for environments in puppet.conf
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
index 909dcb619db..c00278e9059 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca.yml.example
@@ -1,8 +1,9 @@
---- config/settings.d/puppetca.yml.example.orig 2014-09-27 09:16:47.493418158 +0200
-+++ config/settings.d/puppetca.yml.example 2014-09-27 09:16:08.243420797 +0200
-@@ -1,6 +1,6 @@
- ---
+--- config/settings.d/puppetca.yml.example.orig 2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/puppetca.yml.example 2016-09-05 23:43:16.509994000 +0200
+@@ -2,7 +2,7 @@
+ # Can be true, false, or http/https to enable just one of the protocols
:enabled: false
+
-#:ssldir: /var/lib/puppet/ssl
-#:puppetdir: /etc/puppet
+#:ssldir: /var/puppet/ssl
diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
index 42d19374cbd..a24cad59074 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-realm.yml.example
@@ -1,6 +1,6 @@
---- config/settings.d/realm.yml.example.orig 2014-09-27 09:04:28.342471788 +0200
-+++ config/settings.d/realm.yml.example 2014-09-27 09:17:21.098415262 +0200
-@@ -6,7 +6,7 @@
+--- config/settings.d/realm.yml.example.orig 2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/realm.yml.example 2016-09-05 23:44:35.005749000 +0200
+@@ -7,7 +7,7 @@
#:realm_provider: freeipa
# Authentication for Kerberos-based Realms
diff --git a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
index a7475421a8a..0763e6d6a8e 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-tftp.yml.example
@@ -1,8 +1,9 @@
---- config/settings.d/tftp.yml.example.orig 2014-09-27 09:03:48.161469593 +0200
-+++ config/settings.d/tftp.yml.example 2014-09-27 09:07:14.400462451 +0200
-@@ -1,5 +1,5 @@
- ---
+--- config/settings.d/tftp.yml.example.orig 2016-08-24 09:01:39.000000000 +0200
++++ config/settings.d/tftp.yml.example 2016-09-05 23:44:01.480711000 +0200
+@@ -2,6 +2,6 @@
+ # Can be true, false, or http/https to enable just one of the protocols
:enabled: false
+
-#:tftproot: /var/lib/tftpboot
+#:tftproot: /tftpboot
# Defines the TFTP Servername to use, overrides the name in the subnet declaration
diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example
index 7b44082317d..2a23656a61f 100644
--- a/net/foreman-proxy/files/patch-config-settings.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.yml.example
@@ -1,6 +1,6 @@
---- config/settings.yml.example.orig 2014-12-04 11:41:56.011675735 +0100
-+++ config/settings.yml.example 2014-12-04 11:42:13.978674196 +0100
-@@ -25,7 +25,7 @@
+--- config/settings.yml.example.orig 2016-08-24 09:01:39.000000000 +0200
++++ config/settings.yml.example 2016-09-05 23:33:49.472857000 +0200
+@@ -38,7 +38,7 @@
#:foreman_ssl_key: ssl/private_keys/fqdn.pem
# by default smart_proxy runs in the foreground. To enable running as a daemon, uncomment 'daemon' setting
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
deleted file mode 100644
index 323fcf701ed..00000000000
--- a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate.yml.example
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/settings.d/dns_nsupdate.yml.example.orig 2015-12-24 23:16:48 UTC
-+++ config/settings.d/dns_nsupdate.yml.example
-@@ -3,6 +3,6 @@
- # Configuration file for 'nsupdate' dns provider
- #
-
--#:dns_key: /etc/rndc.key
-+#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key
- # use this setting if you are managing a dns server which is not localhost though this proxy
- #:dns_server: dns.domain.com
diff --git a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example b/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
deleted file mode 100644
index 917b5a9714c..00000000000
--- a/net/foreman-proxy/files/patch-config_settings.d_dns__nsupdate__gss.yml.example
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/settings.d/dns_nsupdate_gss.yml.example.orig 2015-12-24 23:18:07 UTC
-+++ config/settings.d/dns_nsupdate_gss.yml.example
-@@ -7,5 +7,5 @@
- #:dns_server: dns.domain.com
- # use dns_tsig_* for GSS-TSIG updates using Kerberos. Required for Windows MS DNS with
- # Secure Dynamic Updates, or BIND as used in FreeIPA. Set dns_provider to nsupdate_gss.
--#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab
-+#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab
- #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM
diff --git a/net/foreman-proxy/pkg-message b/net/foreman-proxy/pkg-message
new file mode 100644
index 00000000000..7a3baf83091
--- /dev/null
+++ b/net/foreman-proxy/pkg-message
@@ -0,0 +1,10 @@
+WARNING:
+
+In version 1.11+ Foreman Smart Proxy splits its configuration in even smaller
+chunks located in:
+
+${PREFIX}/etc/foreman-proxy/settings.d
+
+You can use a bundled script to convert your old settings to new settings:
+
+${PREFIX}/share/foreman/extra/migrate_settings.rb
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index dbcd0bafaaa..931398464ea 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -1,12 +1,23 @@
@sample %%ETCDIR%%/settings.d/bmc.yml.sample
@sample %%ETCDIR%%/settings.d/dhcp.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_isc.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_libvirt.yml.sample
+@sample %%ETCDIR%%/settings.d/dhcp_ms_native.yml.sample
@sample %%ETCDIR%%/settings.d/dns.yml.sample
@sample %%ETCDIR%%/settings.d/dns_dnscmd.yml.sample
+@sample %%ETCDIR%%/settings.d/dns_libvirt.yml.sample
@sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample
@sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample
-@sample %%ETCDIR%%/settings.d/dns_virsh.yml.sample
@sample %%ETCDIR%%/settings.d/facts.yml.sample
+@sample %%ETCDIR%%/settings.d/logs.yml.sample
@sample %%ETCDIR%%/settings.d/puppet.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_customrun.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_legacy.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_mcollective.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_puppetrun.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_salt.yml.sample
+@sample %%ETCDIR%%/settings.d/puppet_proxy_ssh.yml.sample
@sample %%ETCDIR%%/settings.d/puppetca.yml.sample
@sample %%ETCDIR%%/settings.d/realm.yml.sample
@sample %%ETCDIR%%/settings.d/templates.yml.sample
@@ -23,6 +34,7 @@ sbin/smart-proxy
%%DATADIR%%/bundler.d/bmc.rb
%%DATADIR%%/bundler.d/development.rb
%%DATADIR%%/bundler.d/krb5.rb
+%%DATADIR%%/bundler.d/libvirt.rb
%%DATADIR%%/bundler.d/puppet.rb
%%DATADIR%%/bundler.d/test.rb
%%DATADIR%%/bundler.d/windows.rb
@@ -31,38 +43,50 @@ sbin/smart-proxy
%%DATADIR%%/extra/migrate_settings.rb
%%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb
%%DATADIR%%/extra/migrations/20150611000000_migrate_dns_settings.rb
+%%DATADIR%%/extra/migrations/20150826000000_migrate_dhcp_settings.rb
+%%DATADIR%%/extra/migrations/20160411000000_migrate_libvirt_settings.rb
+%%DATADIR%%/extra/migrations/20160413000000_migrate_puppet_settings.rb
%%DATADIR%%/extra/query.rb
%%DATADIR%%/lib/bundler_helper.rb
%%DATADIR%%/lib/checks.rb
%%DATADIR%%/lib/daemon.rb
%%DATADIR%%/lib/launcher.rb
-%%DATADIR%%/lib/poodles-fix.rb
-%%DATADIR%%/lib/proxy.rb
+%%DATADIR%%/lib/proxy/default_di_wirings.rb
+%%DATADIR%%/lib/proxy/default_plugin_validators.rb
%%DATADIR%%/lib/proxy/dependency_injection.rb
%%DATADIR%%/lib/proxy/error.rb
%%DATADIR%%/lib/proxy/file_lock.rb
%%DATADIR%%/lib/proxy/helpers.rb
%%DATADIR%%/lib/proxy/http_download.rb
+%%DATADIR%%/lib/proxy/http_download.rb.bak
+%%DATADIR%%/lib/proxy/http_download.rb.orig
%%DATADIR%%/lib/proxy/kerberos.rb
%%DATADIR%%/lib/proxy/log.rb
+%%DATADIR%%/lib/proxy/log_buffer/buffer.rb
+%%DATADIR%%/lib/proxy/log_buffer/decorator.rb
+%%DATADIR%%/lib/proxy/log_buffer/ring_buffer.rb
%%DATADIR%%/lib/proxy/memory_store.rb
%%DATADIR%%/lib/proxy/pluggable.rb
%%DATADIR%%/lib/proxy/plugin.rb
+%%DATADIR%%/lib/proxy/plugin_initializer.rb
%%DATADIR%%/lib/proxy/plugin_validators.rb
+%%DATADIR%%/lib/proxy/plugins.rb
%%DATADIR%%/lib/proxy/provider.rb
%%DATADIR%%/lib/proxy/provider_factory.rb
%%DATADIR%%/lib/proxy/request.rb
%%DATADIR%%/lib/proxy/settings.rb
%%DATADIR%%/lib/proxy/settings/global.rb
%%DATADIR%%/lib/proxy/settings/plugin.rb
+%%DATADIR%%/lib/proxy/signal_handler.rb
%%DATADIR%%/lib/proxy/util.rb
%%DATADIR%%/lib/proxy/validations.rb
-%%DATADIR%%/lib/proxy/virsh.rb
%%DATADIR%%/lib/rack-patch.rb
%%DATADIR%%/lib/sinatra-patch.rb
%%DATADIR%%/lib/sinatra/authorization.rb
%%DATADIR%%/lib/smart_proxy.rb
%%DATADIR%%/lib/smart_proxy_for_testing.rb
+%%DATADIR%%/lib/smart_proxy_main.rb
+%%DATADIR%%/lib/webrick-patch.rb
%%DATADIR%%/modules/bmc/base.rb
%%DATADIR%%/modules/bmc/bmc.rb
%%DATADIR%%/modules/bmc/bmc_api.rb
@@ -74,64 +98,115 @@ sbin/smart-proxy
%%DATADIR%%/modules/dhcp/dhcp_api.rb
%%DATADIR%%/modules/dhcp/dhcp_plugin.rb
%%DATADIR%%/modules/dhcp/http_config.ru
-%%DATADIR%%/modules/dhcp/monkey_patch_subnet.rb
-%%DATADIR%%/modules/dhcp/monkey_patches.rb
-%%DATADIR%%/modules/dhcp/providers/server/isc.rb
-%%DATADIR%%/modules/dhcp/providers/server/native_ms.rb
-%%DATADIR%%/modules/dhcp/providers/server/virsh.rb
-%%DATADIR%%/modules/dhcp/record.rb
-%%DATADIR%%/modules/dhcp/record/deleted_reservation.rb
-%%DATADIR%%/modules/dhcp/record/lease.rb
-%%DATADIR%%/modules/dhcp/record/reservation.rb
-%%DATADIR%%/modules/dhcp/server.rb
-%%DATADIR%%/modules/dhcp/subnet.rb
-%%DATADIR%%/modules/dhcp/subnet_service.rb
+%%DATADIR%%/modules/dhcp_common/dependency_injection/container.rb
+%%DATADIR%%/modules/dhcp_common/dependency_injection/dependencies.rb
+%%DATADIR%%/modules/dhcp_common/dhcp_common.rb
+%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb
+%%DATADIR%%/modules/dhcp_common/monkey_patches.rb
+%%DATADIR%%/modules/dhcp_common/record.rb
+%%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
+%%DATADIR%%/modules/dhcp_common/record/lease.rb
+%%DATADIR%%/modules/dhcp_common/record/reservation.rb
+%%DATADIR%%/modules/dhcp_common/server.rb
+%%DATADIR%%/modules/dhcp_common/subnet.rb
+%%DATADIR%%/modules/dhcp_common/subnet_service.rb
+%%DATADIR%%/modules/dhcp_isc/dependencies.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc_main.rb
+%%DATADIR%%/modules/dhcp_isc/dhcp_isc_plugin.rb
+%%DATADIR%%/modules/dhcp_libvirt/dependencies.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt_main.rb
+%%DATADIR%%/modules/dhcp_libvirt/dhcp_libvirt_plugin.rb
+%%DATADIR%%/modules/dhcp_libvirt/libvirt_dhcp_network.rb
+%%DATADIR%%/modules/dhcp_native_ms/dependencies.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms_main.rb
+%%DATADIR%%/modules/dhcp_native_ms/dhcp_native_ms_plugin.rb
%%DATADIR%%/modules/dns/dns.rb
%%DATADIR%%/modules/dns/dns_api.rb
%%DATADIR%%/modules/dns/dns_plugin.rb
%%DATADIR%%/modules/dns/http_config.ru
+%%DATADIR%%/modules/dns_common/dependency_injection/container.rb
+%%DATADIR%%/modules/dns_common/dependency_injection/dependencies.rb
+%%DATADIR%%/modules/dns_common/dns_common.rb
+%%DATADIR%%/modules/dns_dnscmd/dependencies.rb
%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd.rb
%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_main.rb
%%DATADIR%%/modules/dns_dnscmd/dns_dnscmd_plugin.rb
+%%DATADIR%%/modules/dns_libvirt/dependencies.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt_main.rb
+%%DATADIR%%/modules/dns_libvirt/dns_libvirt_plugin.rb
+%%DATADIR%%/modules/dns_libvirt/libvirt_dns_network.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_main.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_gss_plugin.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_main.rb
%%DATADIR%%/modules/dns_nsupdate/dns_nsupdate_plugin.rb
-%%DATADIR%%/modules/dns_virsh/dns_virsh.rb
-%%DATADIR%%/modules/dns_virsh/dns_virsh_main.rb
-%%DATADIR%%/modules/dns_virsh/dns_virsh_plugin.rb
+%%DATADIR%%/modules/dns_nsupdate/nsupdate_dependencies.rb
+%%DATADIR%%/modules/dns_nsupdate/nsupdate_gss_dependencies.rb
%%DATADIR%%/modules/facts/facts.rb
%%DATADIR%%/modules/facts/facts_api.rb
%%DATADIR%%/modules/facts/facts_plugin.rb
%%DATADIR%%/modules/facts/http_config.ru
-%%DATADIR%%/modules/puppet_proxy/api_request.rb
-%%DATADIR%%/modules/puppet_proxy/class_scanner.rb
-%%DATADIR%%/modules/puppet_proxy/class_scanner_base.rb
-%%DATADIR%%/modules/puppet_proxy/class_scanner_eparser.rb
-%%DATADIR%%/modules/puppet_proxy/customrun.rb
-%%DATADIR%%/modules/puppet_proxy/dependency_injection/container.rb
-%%DATADIR%%/modules/puppet_proxy/dependency_injection/dependencies.rb
-%%DATADIR%%/modules/puppet_proxy/environment.rb
+%%DATADIR%%/modules/libvirt_common/libvirt_network.rb
+%%DATADIR%%/modules/logs/http_config.ru
+%%DATADIR%%/modules/logs/logs.rb
+%%DATADIR%%/modules/logs/logs_api.rb
+%%DATADIR%%/modules/logs/logs_plugin.rb
+%%DATADIR%%/modules/puppet_proxy/configuration_loader.rb
+%%DATADIR%%/modules/puppet_proxy/dependency_injection.rb
%%DATADIR%%/modules/puppet_proxy/http_config.ru
-%%DATADIR%%/modules/puppet_proxy/initializer.rb
-%%DATADIR%%/modules/puppet_proxy/mcollective.rb
%%DATADIR%%/modules/puppet_proxy/puppet.rb
%%DATADIR%%/modules/puppet_proxy/puppet_api.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_api_v2_environments_retriever.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_api_v3_environments_retriever.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_cache.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_class.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_config.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_config_environments_retriever.rb
%%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
-%%DATADIR%%/modules/puppet_proxy/puppet_ssh.rb
-%%DATADIR%%/modules/puppet_proxy/puppetrun.rb
-%%DATADIR%%/modules/puppet_proxy/runner.rb
-%%DATADIR%%/modules/puppet_proxy/runtime_configuration.rb
-%%DATADIR%%/modules/puppet_proxy/salt.rb
-%%DATADIR%%/modules/puppet_proxy/ssl_configuration_validator.rb
+%%DATADIR%%/modules/puppet_proxy_common/api_request.rb
+%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb
+%%DATADIR%%/modules/puppet_proxy_common/environment.rb
+%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
+%%DATADIR%%/modules/puppet_proxy_common/errors.rb
+%%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb
+%%DATADIR%%/modules/puppet_proxy_common/runner.rb
+%%DATADIR%%/modules/puppet_proxy_customrun/customrun_main.rb
+%%DATADIR%%/modules/puppet_proxy_customrun/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun.rb
+%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_base.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_eparser.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/environments_api_request.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/initializer.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_api_v2_environments_retriever.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_cache.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config_environments_retriever.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy.rb
+%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_mcollective/mcollective_main.rb
+%%DATADIR%%/modules/puppet_proxy_mcollective/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective.rb
+%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_classes_retriever.rb
+%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb
+%%DATADIR%%/modules/puppet_proxy_puppetrun/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun.rb
+%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_puppetrun/puppetrun_main.rb
+%%DATADIR%%/modules/puppet_proxy_salt/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt.rb
+%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt_plugin.rb
+%%DATADIR%%/modules/puppet_proxy_salt/salt_main.rb
+%%DATADIR%%/modules/puppet_proxy_ssh/plugin_configuration.rb
+%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh.rb
+%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_main.rb
+%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_plugin.rb
%%DATADIR%%/modules/puppetca/http_config.ru
%%DATADIR%%/modules/puppetca/puppetca.rb
%%DATADIR%%/modules/puppetca/puppetca_api.rb
@@ -146,6 +221,7 @@ sbin/smart-proxy
%%DATADIR%%/modules/root/http_config.ru
%%DATADIR%%/modules/root/root.rb
%%DATADIR%%/modules/root/root_api.rb
+%%DATADIR%%/modules/root/root_module_loader.rb
%%DATADIR%%/modules/root/root_plugin.rb
%%DATADIR%%/modules/templates/http_config.ru
%%DATADIR%%/modules/templates/template_proxy_request.rb
@@ -157,10 +233,5 @@ sbin/smart-proxy
%%DATADIR%%/modules/tftp/tftp.rb
%%DATADIR%%/modules/tftp/tftp_api.rb
%%DATADIR%%/modules/tftp/tftp_plugin.rb
-%%DATADIR%%/public/css/styles.css
-%%DATADIR%%/views/dhcp/index.erb
-%%DATADIR%%/views/dhcp/show.erb
-%%DATADIR%%/views/features/index.erb
-%%DATADIR%%/views/layout.erb
@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_LOGDIR%%
@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_RUNDIR%%
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index bf8937ae185..5f2bce1902f 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= g2ipmsg
PORTVERSION= 0.9.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= http://ipmsg.org/archive/
diff --git a/net/gini/Makefile b/net/gini/Makefile
index daddfd9cdce..2a5ecce6a57 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gini
PORTVERSION= 0.5.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net multimedia
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/net/gkrellmwireless2/Makefile b/net/gkrellmwireless2/Makefile
index 5fea876f4dc..d2d74ca1bba 100644
--- a/net/gkrellmwireless2/Makefile
+++ b/net/gkrellmwireless2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gkrellmwireless
PORTVERSION= 2.0.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 24e8d2c8447..f43917bab1c 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnet
PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index d8c9f76dac8..ed57df013d8 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnetcat
PORTVERSION= 0.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= SF/netcat/netcat/${PORTVERSION}
DISTNAME= netcat-0.7.1
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 135a52c9a77..3f1395e9e37 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnu-radius
PORTVERSION= 1.6.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= GNU/radius
DISTNAME= radius-${PORTVERSION}
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index fb927d8c0f8..0e1fe0204fb 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grdesktop
PORTVERSION= 0.23
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net
MASTER_SITES= SAVANNAH
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index 5501a7d7eb4..ad68d08ccea 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -3,19 +3,23 @@
PORTNAME= gsk
PORTVERSION= 1.0.63
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= C library for writing servers
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
USES= libtool pathfix pkgconfig ssl
USE_GNOME= glib20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
+
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
@@ -29,7 +33,7 @@ post-patch:
@${REINPLACE_CMD} -e \
's|fread_unlocked|fread|' ${WRKSRC}/src/gsktable-flat.c
-post-install:
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
${INSTALL_DATA} ${WRKSRC}/doc/html/*.css ${STAGEDIR}${DOCSDIR}/html
${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}/html
diff --git a/net/gsk/files/patch-src_gskipv4.c b/net/gsk/files/patch-src_gskipv4.c
index c11f209b7a2..ab49b90590e 100644
--- a/net/gsk/files/patch-src_gskipv4.c
+++ b/net/gsk/files/patch-src_gskipv4.c
@@ -1,5 +1,5 @@
---- src/gskipv4.c.orig 2006-05-18 03:39:35.000000000 +0900
-+++ src/gskipv4.c 2009-04-08 00:18:45.000000000 +0900
+--- src/gskipv4.c.orig 2006-05-17 18:39:35 UTC
++++ src/gskipv4.c
@@ -1,7 +1,9 @@
#include <string.h>
#include <stdlib.h>
diff --git a/net/gstreamer-plugins-libmms/Makefile b/net/gstreamer-plugins-libmms/Makefile
index 19743dd51d9..785074b587d 100644
--- a/net/gstreamer-plugins-libmms/Makefile
+++ b/net/gstreamer-plugins-libmms/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/net/gstreamer-plugins-libmms/Makefile,v 1.3 2008/03/19 14:05:38 ahze Exp $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
COMMENT= Gstreamer mms:// and mmsh:// plugin
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index 96d24810a4e..70aee19e821 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gupnp-igd
PORTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index fa38acb217d..f97232ec811 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gupnp-ui
PORTVERSION= 0.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 7433aff42d9..7aa506118a5 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gutenfetch
PORTVERSION= 1.5
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/ipsorc/Makefile b/net/ipsorc/Makefile
index 6fb9353f918..b51d79909dd 100644
--- a/net/ipsorc/Makefile
+++ b/net/ipsorc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipsorc
PORTVERSION= 1.7.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net security
MASTER_SITES= http://200ok.org/distfiles/ipsorc/ \
http://bsdforge.com/projects/source/net/ipsorcery/
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 3758f8d4a3d..b56fa18e51b 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jags
PORTVERSION= 0.22.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
diff --git a/net/ldapbrowser/Makefile b/net/ldapbrowser/Makefile
index 200846dab18..b11b28cdbad 100644
--- a/net/ldapbrowser/Makefile
+++ b/net/ldapbrowser/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldapbrowser
PORTVERSION= 2.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net java
MASTER_SITES= http://www.klop.ws/distfiles/ \
http://freebsd.nsu.ru/distfiles/ \
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index c823a0a84c4..924f8687f8e 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldapdiff
PORTVERSION= 1.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://launchpadlibrarian.net/20391352/
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile
index 0777f485050..09f5795be60 100644
--- a/net/libdmapsharing/Makefile
+++ b/net/libdmapsharing/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libdmapsharing
PORTVERSION= 2.9.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= https://www.flyn.org/projects/libdmapsharing/
DIST_SUBDIR= gnome3
diff --git a/net/libzapojit/Makefile b/net/libzapojit/Makefile
index 1cba7491b9d..312ca76b479 100644
--- a/net/libzapojit/Makefile
+++ b/net/libzapojit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libzapojit
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 4f5757690af..d27918da1d7 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= liveMedia
-PORTVERSION= 2016.11.17
+PORTVERSION= 2016.11.28
PORTEPOCH= 2
CATEGORIES= net devel
MASTER_SITES= http://www.live555.com/liveMedia/public/ \
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index 40bfce0461e..932ba808e9b 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480076945
-SHA256 (live.2016.11.17.tar.gz) = e3c825261ac4fa67ac1880c1d00be11f6db5d5b8eb05fe618e71c5ec1bf427c8
-SIZE (live.2016.11.17.tar.gz) = 626776
+TIMESTAMP = 1480981424
+SHA256 (live.2016.11.28.tar.gz) = 08b93a20bc302bed1da2f05621f37fda962dbfc272132afa6fa1058d222c238a
+SIZE (live.2016.11.28.tar.gz) = 626781
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 7672b4d7fcc..cc7f5a9e4e1 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mediatomb
PORTVERSION= 0.12.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net multimedia
MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION}
diff --git a/net/micro_proxy/Makefile b/net/micro_proxy/Makefile
index 7c15ecffc4f..f1128319112 100644
--- a/net/micro_proxy/Makefile
+++ b/net/micro_proxy/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= micro_proxy
-PORTVERSION= 20021030
+PORTVERSION= 20140814
CATEGORIES= net
MASTER_SITES= http://www.acme.com/software/micro_proxy/ \
LOCAL/ehaupt
-DISTNAME= ${PORTNAME}_30oct2002
+DISTNAME= ${PORTNAME}_14Aug2014
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Really small HTTP/HTTPS proxy
diff --git a/net/micro_proxy/distinfo b/net/micro_proxy/distinfo
index 4317b8d104a..d1f966c34ea 100644
--- a/net/micro_proxy/distinfo
+++ b/net/micro_proxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (micro_proxy_30oct2002.tar.gz) = 8a1844d684d4a78f2fd3f14cf7c1fb4257e210d376f169d9525b2dc455f71f39
-SIZE (micro_proxy_30oct2002.tar.gz) = 5822
+TIMESTAMP = 1481365213
+SHA256 (micro_proxy_14Aug2014.tar.gz) = c9cf6605e22cee8a67564902ce2fb262d06da6d9b9c73a14a1c8127e083d7de3
+SIZE (micro_proxy_14Aug2014.tar.gz) = 6085
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index 6e33cc1adda..173b8697338 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -3,6 +3,7 @@
PORTNAME= minisapserver
PORTVERSION= 0.3.8
+PORTREVISION= 1
CATEGORIES= net multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/miniSAPserver/${PORTVERSION}/
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 5b9ce510468..e4703bacc41 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mpich
PORTVERSION= 3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net parallel
MASTER_SITES= http://www.mpich.org/static/downloads/${DISTVERSION}/
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index f8be41c89c4..26872e1581b 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mpich2
DISTVERSION= 1.5
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 5
CATEGORIES= net java parallel
MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 3750284ae73..e05de775238 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nbd
PORTVERSION= 3.5
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index f7826048fee..17eb7742776 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netdude
PORTVERSION= 0.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 8308de64e55..55ed5ccb326 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -5,6 +5,7 @@
PORTNAME= openmpi
PORTVERSION= 1.10.4
+PORTREVISION= 1
CATEGORIES= net parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
diff --git a/net/openmpi2/Makefile b/net/openmpi2/Makefile
index db860bbb83d..979bbac3d4c 100644
--- a/net/openmpi2/Makefile
+++ b/net/openmpi2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= openmpi
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net parallel
MASTER_SITES= http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
PKGNAMESUFFIX= 2
diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile
index 47535c735eb..7eadd277234 100644
--- a/net/p5-Apache2-SOAP/Makefile
+++ b/net/p5-Apache2-SOAP/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Apache2-SOAP
PORTVERSION= 0.73
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-MaxMind-DB-Writer/Makefile b/net/p5-MaxMind-DB-Writer/Makefile
index dced90ff2ed..7865cc12d60 100644
--- a/net/p5-MaxMind-DB-Writer/Makefile
+++ b/net/p5-MaxMind-DB-Writer/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= MaxMind-DB-Writer
-PORTVERSION= 0.201003
+PORTVERSION= 0.201004
CATEGORIES= net perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:MAXMIND
diff --git a/net/p5-MaxMind-DB-Writer/distinfo b/net/p5-MaxMind-DB-Writer/distinfo
index eecce17d12b..40fabd14a4d 100644
--- a/net/p5-MaxMind-DB-Writer/distinfo
+++ b/net/p5-MaxMind-DB-Writer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480552890
-SHA256 (MaxMind-DB-Writer-0.201003.tar.gz) = f216741767376797639b847ec92209cd4627236073bafaade3a484a039a50b6b
-SIZE (MaxMind-DB-Writer-0.201003.tar.gz) = 186883
+TIMESTAMP = 1481206736
+SHA256 (MaxMind-DB-Writer-0.201004.tar.gz) = f8d3ab261bb686632973f33a40f56376b9d83aaeab29c99014f21266e0f85c86
+SIZE (MaxMind-DB-Writer-0.201004.tar.gz) = 186709
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index f375a4baaf5..cc9b5b465d7 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Net-Z3950-ZOOM
PORTVERSION= 1.30
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 25d4b9d093d..25f6c7dbb49 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OurNet-BBS
PORTVERSION= 1.66
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index 42159868ba4..d5efac01c5a 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -3,7 +3,7 @@
PORTNAME= packter-agent
PORTVERSION= 2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.packter.jp/
DISTNAME= PackterAgent-${PORTVERSION}
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index 93e7bdff9a7..cd1909ff5cf 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ldap
-PORTVERSION= 2.4.27
+PORTVERSION= 2.4.28
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-ldap/distinfo b/net/py-ldap/distinfo
index bd8ba1676e0..84b4df6a8f8 100644
--- a/net/py-ldap/distinfo
+++ b/net/py-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471614910
-SHA256 (python-ldap-2.4.27.tar.gz) = 6306a57a3c659ffda0003b386b1a23fdcee0b903a0ede0ce04c33ba78be64a2e
-SIZE (python-ldap-2.4.27.tar.gz) = 125094
+TIMESTAMP = 1481321294
+SHA256 (python-ldap-2.4.28.tar.gz) = d9aaa11974651b35993610993256fde9fc5e37039e0d318d0dc3963776ca21a9
+SIZE (python-ldap-2.4.28.tar.gz) = 125567
diff --git a/net/py-ldap3/Makefile b/net/py-ldap3/Makefile
index b09d542ea82..2c3e17ec72c 100644
--- a/net/py-ldap3/Makefile
+++ b/net/py-ldap3/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ldap3
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.1
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-ldap3/distinfo b/net/py-ldap3/distinfo
index 8cd4a174223..5f80653f4d3 100644
--- a/net/py-ldap3/distinfo
+++ b/net/py-ldap3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478526193
-SHA256 (ldap3-2.1.0.tar.gz) = 8a9b0331d9405884ac273106ded1a7d9ad5ba3e309c4bad25bae7dc5774cc809
-SIZE (ldap3-2.1.0.tar.gz) = 312069
+TIMESTAMP = 1481320405
+SHA256 (ldap3-2.1.1.tar.gz) = fc798773633c6bc7dedde5b721de269a8eb84d78dc3def1a13e9db9a8054af46
+SIZE (ldap3-2.1.1.tar.gz) = 314500
diff --git a/net/py-pysmb/Makefile b/net/py-pysmb/Makefile
index 075c85497c9..3fe2c97df67 100644
--- a/net/py-pysmb/Makefile
+++ b/net/py-pysmb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pysmb
-PORTVERSION= 1.1.18
+PORTVERSION= 1.1.19
CATEGORIES= net python
MASTER_SITES= CHEESESHOP \
http://miketeo.net/files/Projects/${PORTNAME}/
diff --git a/net/py-pysmb/distinfo b/net/py-pysmb/distinfo
index ade895564d6..875f93ad57a 100644
--- a/net/py-pysmb/distinfo
+++ b/net/py-pysmb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pysmb-1.1.18.tar.gz) = 580f7dcf8048656d2924c2f78731feaeaf6f9fa8ef5c251fc6964d39bfd3a6b9
-SIZE (pysmb-1.1.18.tar.gz) = 1962118
+TIMESTAMP = 1481320706
+SHA256 (pysmb-1.1.19.tar.gz) = fa4e6b4a4f2afbfbd71e9179c491f8c77bc2ad19e0bc866d7c6cbfa9ae272602
+SIZE (pysmb-1.1.19.tar.gz) = 1977444
diff --git a/net/py-pysocks/Makefile b/net/py-pysocks/Makefile
index 196cd310926..caa26fdbd23 100644
--- a/net/py-pysocks/Makefile
+++ b/net/py-pysocks/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pysocks
-PORTVERSION= 1.6.4
+PORTVERSION= 1.6.5
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-pysocks/distinfo b/net/py-pysocks/distinfo
index db1b2319b3e..8244ea771f7 100644
--- a/net/py-pysocks/distinfo
+++ b/net/py-pysocks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480758074
-SHA256 (PySocks-1.6.4.tar.gz) = 07f25f0720983462d5992c44a8288b54261e0055317535fbd8d96fe0c391817e
-SIZE (PySocks-1.6.4.tar.gz) = 17172
+TIMESTAMP = 1481261284
+SHA256 (PySocks-1.6.5.tar.gz) = 7962f4d7c76e8414ae168c677a77f19cf8926143911f7e8d37a5d4c4eb910c6f
+SIZE (PySocks-1.6.5.tar.gz) = 17212
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index c4828af17cf..101a141b3a2 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= rabbitmq
-PORTVERSION= 3.6.5
-PORTREVISION= 1
+PORTVERSION= 3.6.6
CATEGORIES= net
MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
@@ -39,12 +38,13 @@ PLIST_SUB= VERSION=${PORTVERSION}
CPE_VENDOR= pivotal_software
REINPLACE_ARGS= -i ""
-SCRIPTS_DIR= ${WRKSRC}/scripts/
+SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts
MAKE_ARGS+= PYTHON=${PYTHON_CMD}
MAKE_ENV+= TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \
MAN_DIR="${STAGEDIR}${PREFIX}/man" \
- DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}"
+ DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" \
+ VERSION="${PORTVERSION}"
MAKE_JOBS_UNSAFE= yes
@@ -57,21 +57,21 @@ post-patch:
${SCRIPTS_DIR}/rabbitmq-env \
${SCRIPTS_DIR}/rabbitmq-plugins \
${SCRIPTS_DIR}/rabbitmq-defaults \
- ${WRKSRC}/docs/rabbitmq-env.conf.5.xml
+ ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5.xml
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
- ${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \
+ ${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
.for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
.endfor
.for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
- ${INSTALL_MAN} ${WRKSRC}/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
.endfor
- ${INSTALL_MAN} ${WRKSRC}/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+ ${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
post-install-ADMIN-on:
${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 2f2542a63ba..625df9c6dfd 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470418703
-SHA256 (rabbitmq-server-3.6.5.tar.xz) = 9550433ca8aaf5130bf5235bb978c44d3c4694cbd09d97114b3859f4895788ec
-SIZE (rabbitmq-server-3.6.5.tar.xz) = 2923164
+TIMESTAMP = 1479770211
+SHA256 (rabbitmq-server-3.6.6.tar.xz) = 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e
+SIZE (rabbitmq-server-3.6.6.tar.xz) = 2471724
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
new file mode 100644
index 00000000000..6edde583d11
--- /dev/null
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
@@ -0,0 +1,10 @@
+--- deps/rabbit/scripts/rabbitmq-plugins.orig 2016-11-22 00:22:17 UTC
++++ deps/rabbit/scripts/rabbitmq-plugins
+@@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the
+ fi
+
+ RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+ -pa "${RABBITMQ_HOME}/ebin" \
+ -noinput \
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
new file mode 100644
index 00000000000..be4595d8395
--- /dev/null
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
@@ -0,0 +1,10 @@
+--- deps/rabbit/scripts/rabbitmq-server.orig 2016-11-22 00:22:59 UTC
++++ deps/rabbit/scripts/rabbitmq-server
+@@ -151,6 +151,7 @@ start_rabbitmq_server() {
+ ensure_thread_pool_size
+ check_start_params &&
+ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
++ HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+ -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
+ ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmqctl b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
index edb768cdbff..24ad0933ae9 100644
--- a/net/rabbitmq/files/patch-scripts_rabbitmqctl
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
@@ -1,10 +1,10 @@
---- scripts/rabbitmqctl.orig 2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmqctl
-@@ -23,6 +23,7 @@
+--- deps/rabbit/scripts/rabbitmqctl.orig 2016-11-22 00:23:32 UTC
++++ deps/rabbit/scripts/rabbitmqctl
+@@ -28,6 +28,7 @@ fi
# (e.g. forget_cluster_node --offline) require us to impersonate the
# real node.
RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
+HOME=/var/db/rabbitmq \
exec ${ERL_DIR}erl \
-pa "${RABBITMQ_HOME}/ebin" \
- -noinput \
+ -noinput +B \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
deleted file mode 100644
index f747941a51d..00000000000
--- a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/rabbitmq-plugins.orig 2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmq-plugins
-@@ -20,6 +20,7 @@
- . `dirname $0`/rabbitmq-env
-
- RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
-+HOME=/var/db/rabbitmq \
- exec ${ERL_DIR}erl \
- -pa "${RABBITMQ_HOME}/ebin" \
- -noinput \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-server b/net/rabbitmq/files/patch-scripts_rabbitmq-server
deleted file mode 100644
index ee8597ee61e..00000000000
--- a/net/rabbitmq/files/patch-scripts_rabbitmq-server
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/rabbitmq-server.orig 2015-09-24 20:00:50 UTC
-+++ scripts/rabbitmq-server
-@@ -101,6 +101,7 @@ set -f
-
- start_rabbitmq_server() {
- RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
-+ HOME=/var/db/rabbitmq \
- exec ${ERL_DIR}erl \
- -pa ${RABBITMQ_EBIN_ROOT} \
- ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index db80d45865f..8117304d64c 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -9,6 +9,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-base64js
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-EPL-OTP
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Erlware-Commons
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi
lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochiweb
@@ -28,8 +29,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochinum.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg2_fixed.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
@@ -51,6 +50,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_main.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_pbe.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam
@@ -94,6 +94,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_md5.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha256.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha512.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_pbe.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_main.beam
lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_usage.beam
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 24bb3ed62d4..a1380667927 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -4,6 +4,7 @@
PORTNAME= remmina
DISTVERSIONPREFIX=v
DISTVERSION= 1.2.0-rcgit.16
+PORTREVISION= 1
CATEGORIES= net gnome
MAINTAINER= woodsb02@FreeBSD.org
@@ -62,8 +63,12 @@ EXTRA_PATCHES= ${FILESDIR}/extrapatch-remmina_src_remmina__file.c
post-patch:
# do not build plugins and locales , they are provided by separated ports
- ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' ${WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' ${WRKSRC}/remmina/CMakeLists.txt
+ ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' \
+ -e 's,FreeBSD,FreeBSD|DragonFly,' ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' \
+ ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' \
+ -e 's,FreeBSD,FreeBSD|DragonFly,' \
+ ${WRKSRC}/remmina/CMakeLists.txt
.include <bsd.port.post.mk>
diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
index 19f16413ca6..8a9af85076e 100644
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@@ -3,6 +3,7 @@ include/remmina/plugin.h
include/remmina/remmina_trace_calls.h
include/remmina/types.h
libdata/pkgconfig/remmina.pc
+man/man1/remmina.1.gz
share/appdata/remmina.appdata.xml
share/applications/remmina.desktop
share/icons/hicolor/128x128/apps/remmina.png
@@ -90,7 +91,6 @@ share/icons/hicolor/scalable/apps/remmina.svg
%%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/remmina.mo
-share/man/man1/remmina.1
%%DATADIR%%/ui/remmina_about.glade
%%DATADIR%%/ui/remmina_key_chooser.glade
%%DATADIR%%/ui/remmina_main.glade
diff --git a/net/rubygem-qiniu/Makefile b/net/rubygem-qiniu/Makefile
new file mode 100644
index 00000000000..442c3c00efc
--- /dev/null
+++ b/net/rubygem-qiniu/Makefile
@@ -0,0 +1,24 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= qiniu
+PORTVERSION= 6.8.0
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Qiniu Resource (Cloud) Storage SDK for Ruby
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-json>=1.8:devel/rubygem-json \
+ rubygem-mime-types>=2.4.0:misc/rubygem-mime-types \
+ rubygem-rest-client>=1.8.0:www/rubygem-rest-client \
+ rubygem-ruby-hmac>=0.4:security/rubygem-ruby-hmac
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-qiniu/distinfo b/net/rubygem-qiniu/distinfo
new file mode 100644
index 00000000000..d833d926a95
--- /dev/null
+++ b/net/rubygem-qiniu/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1481282138
+SHA256 (rubygem/qiniu-6.8.0.gem) = 64e47f6c7be4193b1344be48fd37e5d7b5ff7ba04c473b4d2485d08323292a01
+SIZE (rubygem/qiniu-6.8.0.gem) = 55808
diff --git a/net/rubygem-qiniu/pkg-descr b/net/rubygem-qiniu/pkg-descr
new file mode 100644
index 00000000000..6d7d656d989
--- /dev/null
+++ b/net/rubygem-qiniu/pkg-descr
@@ -0,0 +1,3 @@
+Qiniu Resource (Cloud) Storage SDK for Ruby
+
+WWW: https://github.com/qiniu/ruby-sdk
diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index 5f155d318ae..496f00ac7d4 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= twitter
-PORTVERSION= 5.16.0
-PORTREVISION= 1
+PORTVERSION= 5.17.0
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-twitter/distinfo b/net/rubygem-twitter/distinfo
index 05a9c6d5a59..78a3be92b74 100644
--- a/net/rubygem-twitter/distinfo
+++ b/net/rubygem-twitter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/twitter-5.16.0.gem) = 2e67efb529baf50ddb4adb3b04d641fa8fb3a67ad44ee24a4a1569012038a0ed
-SIZE (rubygem/twitter-5.16.0.gem) = 75776
+TIMESTAMP = 1481279883
+SHA256 (rubygem/twitter-5.17.0.gem) = d33185d7ac0ad384156571bc1c98dafaae6505853663be9cd5a892ace542a1db
+SIZE (rubygem/twitter-5.17.0.gem) = 76288
diff --git a/net/sl2tps/Makefile b/net/sl2tps/Makefile
index d5f03d70899..870ac604fac 100644
--- a/net/sl2tps/Makefile
+++ b/net/sl2tps/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sl2tps
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/libpdel/${PORTNAME}/${PORTVERSION}
diff --git a/net/sobby/Makefile b/net/sobby/Makefile
index c9a4d8b66b4..dbd978dab33 100644
--- a/net/sobby/Makefile
+++ b/net/sobby/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sobby
PORTVERSION= 0.4.8
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://releases.0x539.de/sobby/
diff --git a/net/sofia-sip/Makefile b/net/sofia-sip/Makefile
index 7b7c90a1344..8547d17c329 100644
--- a/net/sofia-sip/Makefile
+++ b/net/sofia-sip/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sofia-sip
PORTVERSION= 1.12.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index 7ec4cdbab8c..003d50db5bf 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -3,10 +3,10 @@
PORTNAME= ssvnc
PORTVERSION= 1.0.29
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net security
MASTER_SITES= SF
-DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
+EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
@@ -19,30 +19,23 @@ RUN_DEPENDS= stunnel:security/stunnel \
USES= gmake imake:env jpeg perl5 ssl tk:wrapper
USE_PERL5= run
-USE_XORG= xi xmu xt xaw ice xpm xext sm
+USE_XORG= ice sm x11 xaw xext xi xmu xpm xt
+
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
+MAKE_ENV+= ROOT=${STAGEDIR}
OPTIONS_DEFINE= DOCS ULTRAFTP
OPTIONS_SUB= yes
-ULTRAFTP_DESC= UltraVNC File Transfer support (Java required)
-ULTRAFTP_USE= JAVA=yes
-
-MAKE_ENV+= ROOT=${STAGEDIR}
+DOCS_MAKE_ARGS_OFF= DOCS=""
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MULTRAFTP}
-MAKE_ARGS+= JSRC=""
-.endif
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_ARGS+= DOCS=""
-.endif
+ULTRAFTP_DESC= UltraVNC File Transfer support (Java required)
+ULTRAFTP_USE= JAVA=yes
+ULTRAFTP_MAKE_ARGS_OFF= JSRC=""
post-patch:
- @${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' \
+ @${REINPLACE_CMD} -e 's|netstat -ant|netstat -an|' \
${WRKSRC}/scripts/util/ss_vncviewer
@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' \
${WRKSRC}/man/man1/ssvnc.1
@@ -51,12 +44,4 @@ do-configure:
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_ARGS} config)
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ssvnc/*.so
- @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
-.for man in ssvnc.1 ssvncviewer.1
- ${INSTALL_MAN} ${WRKSRC}/man/man1/${man} \
- ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-
.include <bsd.port.mk>
diff --git a/net/ssvnc/files/patch-Makefile b/net/ssvnc/files/patch-Makefile
index f3182308893..2c3459285eb 100644
--- a/net/ssvnc/files/patch-Makefile
+++ b/net/ssvnc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2011-02-05 00:28:18.000000000 -0800
-+++ Makefile 2011-02-05 00:36:51.000000000 -0800
-@@ -29,6 +29,7 @@
+--- Makefile.orig 2010-02-26 02:29:31 UTC
++++ Makefile
+@@ -29,6 +29,7 @@ MAN = man
MANDIR ?= $(MAN)
APPS ?= share/applications
BINNAME ?= ssvncviewer
@@ -8,40 +8,50 @@
VSRC = vnc_unixsrc
-@@ -65,23 +66,30 @@
+@@ -65,23 +66,30 @@ clean:
cd $(PSRC); $(MAKE) clean
install: all
- mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
-+ mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)/man1
- strip $(VIEWER)
- cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
- cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
- cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
- cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
- cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
+- strip $(VIEWER)
+- cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
+- cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
+- cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
+- cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
+- cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
- cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
-+ cp -p scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
-+ cp -p scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
-+ cp -p scripts/tsvnc $(ROOT)$(PREFIX)/$(LIB)
-+ cp -p scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
-+ cp -p scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
- if [ "X$(JSRC)" != "X" ]; then cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util; fi
+- if [ "X$(JSRC)" != "X" ]; then cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util; fi
- cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1
- ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc $(PREFIX)/$(LIB)/ssvnc
- ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc $(PREFIX)/$(LIB)/tsvnc
- ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/sshvnc $(PREFIX)/$(LIB)/sshvnc
-+ cp -p $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/ssvnc-gui.1
++ mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)/man1
++ ${BSD_INSTALL_PROGRAM} $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_PROGRAM} $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_LIB} $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_LIB} $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_PROGRAM} $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_SCRIPT} scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_SCRIPT} scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_SCRIPT} scripts/tsvnc $(ROOT)$(PREFIX)/$(LIB)
++ ${BSD_INSTALL_SCRIPT} scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
++ ${BSD_INSTALL_SCRIPT} scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
++ if [ "X$(JSRC)" != "X" ]; then ${BSD_INSTALL_DATA} $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util; fi
++ ${BSD_INSTALL_MAN} $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/ssvnc.1
++ ${BSD_INSTALL_MAN} $(MAN)/man1/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/ssvnc-gui.1
+ ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-gui $(PREFIX)/$(LIB)/ssvnc
+ ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-ts $(PREFIX)/$(LIB)/tsvnc
+ ./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-stunnel $(PREFIX)/$(LIB)/util/ss_vncviewer
if [ "X$(APPS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(APPS); fi
- if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
- if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
- if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/man1/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/$(BINNAME).1; fi
+- if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
+- if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
+- if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/man1/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/$(BINNAME).1; fi
++ if [ "X$(APPS)" != X ]; then ${BSD_INSTALL_DATA} ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
++ if [ "X$(BINNAME)" != X ]; then ${BSD_INSTALL_PROGRAM} $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
++ if [ "X$(BINNAME)" != X ]; then ${BSD_INSTALL_MAN} $(MAN)/man1/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/man1/$(BINNAME).1; fi
+ if [ "X$(DOCS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(DOCS); fi
-+ if [ "X$(DOCS)" != X ]; then cp -p scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
-+ if [ "X$(DOCS)" != X ]; then cp -p README $(ROOT)$(PREFIX)/$(DOCS); fi
++ if [ "X$(DOCS)" != X ]; then ${BSD_INSTALL_DATA} scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
++ if [ "X$(DOCS)" != X ]; then ${BSD_INSTALL_MAN} README $(ROOT)$(PREFIX)/$(DOCS); fi
#internal use only, a test install:
diff --git a/net/ssvnc/files/patch-vncstorepw_Makefile b/net/ssvnc/files/patch-vncstorepw_Makefile
index a34936a511a..6ed065e2a2f 100644
--- a/net/ssvnc/files/patch-vncstorepw_Makefile
+++ b/net/ssvnc/files/patch-vncstorepw_Makefile
@@ -1,6 +1,6 @@
--- vncstorepw/Makefile.orig 2010-04-22 03:22:40 UTC
+++ vncstorepw/Makefile
-@@ -7,8 +7,6 @@ UNWRAP = unwrap.so
+@@ -7,21 +7,18 @@ UNWRAP = unwrap.so
LIMACC = lim_accept.so
ULTDSM = ultravnc_dsm_helper
@@ -9,7 +9,12 @@
all: $(CMD) $(UNWRAP) $(LIMACC) $(ULTDSM)
-@@ -21,7 +19,7 @@ $(UNWRAP): unwrap.c
+ $(CMD): vncauth.o vncstorepw.o d3des.o
+ PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
+- PATH=$$PATH:$(EPATH) strip $(CMD)
+ @ls -l $(CMD)
+
+ $(UNWRAP): unwrap.c
if [ `uname` = "Darwin" ]; then \
PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -dynamiclib -fPIC unwrap.c; \
else \
@@ -18,7 +23,7 @@
fi
@ls -l $(UNWRAP)
-@@ -29,7 +27,7 @@ $(LIMACC): lim_accept.c
+@@ -29,7 +26,7 @@ $(LIMACC): lim_accept.c
if [ `uname` = "Darwin" ]; then \
PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -dynamiclib -fPIC -nostartfiles lim_accept.c; \
else \
@@ -27,12 +32,14 @@
fi
@ls -l $(LIMACC)
-@@ -39,7 +37,7 @@ $(ULTDSM): ultravnc_dsm_helper.c
+@@ -39,9 +36,8 @@ $(ULTDSM): ultravnc_dsm_helper.c
if [ `uname` = "SunOS" ]; then \
PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto -lsocket -lnsl; \
else \
- PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lssl -lcrypto; \
+ PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(CFLAGS) $(LDFLAGS) -lssl -lcrypto; \
fi
- PATH=$$PATH:$(EPATH) strip $(ULTDSM)
+- PATH=$$PATH:$(EPATH) strip $(ULTDSM)
@ls -l $(ULTDSM)
+
+ test: $(CMD)
diff --git a/net/ssvnc/files/patch-wr__tool b/net/ssvnc/files/patch-wr__tool
new file mode 100644
index 00000000000..9c2f60f3eed
--- /dev/null
+++ b/net/ssvnc/files/patch-wr__tool
@@ -0,0 +1,8 @@
+--- wr_tool.orig 2008-08-29 12:58:03 UTC
++++ wr_tool
+@@ -6,4 +6,4 @@ cat > $wr <<END
+ UNAME=.; export UNAME
+ exec $cmd "\$@"
+ END
+-chmod 755 $wr
++chmod 555 $wr
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index c96c8489297..b198a48b1e0 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= syncthing
-PORTVERSION= 0.14.12
+PORTVERSION= 0.14.13
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index c6a04f87a2c..ae76e21133a 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480128113
-SHA256 (syncthing-syncthing-v0.14.12_GH0.tar.gz) = 0778785636e2c095f8f6cd353a206e0e1b1db37c40a4c79156a08eaaffcff81f
-SIZE (syncthing-syncthing-v0.14.12_GH0.tar.gz) = 6464612
+TIMESTAMP = 1481327492
+SHA256 (syncthing-syncthing-v0.14.13_GH0.tar.gz) = 13bce8afff0814817a0d70cdd4deddcdb2fa46494561976ad75e238a0ffbdb47
+SIZE (syncthing-syncthing-v0.14.13_GH0.tar.gz) = 6468568
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index b9e9fd1aad6..0228d18b609 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tapidbus
PORTVERSION= 0.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF/tapioca-voip/OldFiles
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 80f7c59383a..3fbeb9076c3 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tcpreen
PORTVERSION= 1.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/tcpreen/
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 599e4896c3b..94dada3caf5 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -3,7 +3,7 @@
PORTNAME= twitux
PORTVERSION= 0.69
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index c8a495a8ad0..3710625032d 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ulxmlrpcpp
PORTVERSION= 1.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 66d2e71c718..5638129de01 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.48.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= -devel
diff --git a/net/userfw/Makefile b/net/userfw/Makefile
index 4725841d71f..660ea6c30d8 100644
--- a/net/userfw/Makefile
+++ b/net/userfw/Makefile
@@ -3,6 +3,7 @@
PORTNAME= userfw
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= net kld
MASTER_SITES= http://userfw.net/files/release/ \
http://imax.in.ua/files/ \
diff --git a/net/vmware-vsphere-cli/Makefile b/net/vmware-vsphere-cli/Makefile
index c23f4269255..e68c8285559 100644
--- a/net/vmware-vsphere-cli/Makefile
+++ b/net/vmware-vsphere-cli/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vmware-vsphere-cli
PORTVERSION= 5.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net perl5
MASTER_SITES= #http://communities.vmware.com/community/vmtn/developer/downloads
DISTNAME= VMware-vSphere-Perl-SDK-${PORTVERSION}-${DISTREL}.i386
diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile
index 470ae6ca214..274ff325e90 100644
--- a/net/vncreflector/Makefile
+++ b/net/vncreflector/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vncreflector
PORTVERSION= 1.2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF/vnc-reflector/vnc-reflector/${PORTVERSION}
DISTNAME= vnc_reflector-${PORTVERSION}
diff --git a/net/whois/Makefile b/net/whois/Makefile
index 5619e0c29d1..f1f66505d25 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -3,6 +3,7 @@
PORTNAME= whois
PORTVERSION= 5.1.5
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= coco@executive-computing.de
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 06ab9651080..7ce6b4f55e2 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmlj
PORTVERSION= 0.4.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 0965450bc87..07845232b7b 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wol
PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= SF/ahh/OldFiles
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 3adb1ea2a4b..2fdb9cf2be9 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmlrpc-c
-PORTVERSION= 1.39.10
+PORTVERSION= 1.39.11
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
diff --git a/net/xmlrpc-c/distinfo b/net/xmlrpc-c/distinfo
index 44e9349de4b..dac29e42b71 100644
--- a/net/xmlrpc-c/distinfo
+++ b/net/xmlrpc-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473095632
-SHA256 (xmlrpc-c-1.39.10.tgz) = b82d871a6ef63bf0c29b7b303e4ab723a4a004f16ab96b341ccab30b2609edec
-SIZE (xmlrpc-c-1.39.10.tgz) = 816214
+TIMESTAMP = 1481295240
+SHA256 (xmlrpc-c-1.39.11.tgz) = 2e56cdcdd5c5fa564bcdc7a56bca108a88f5b78b34ccc85558366efabdc8b8e8
+SIZE (xmlrpc-c-1.39.11.tgz) = 815463
diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index 4aceda0d168..0ee33892cd9 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xrdp
PORTVERSION= 0.7.0.b20130912
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= net
PKGNAMESUFFIX= -devel
diff --git a/net/yaz++/Makefile b/net/yaz++/Makefile
index 6fae3913662..75c9376daac 100644
--- a/net/yaz++/Makefile
+++ b/net/yaz++/Makefile
@@ -3,6 +3,7 @@
PORTNAME= yaz++
PORTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yazpp/
DISTNAME= yazpp-${PORTVERSION}
diff --git a/net/yazproxy/Makefile b/net/yazproxy/Makefile
index 8ef5602d228..dbce38318d5 100644
--- a/net/yazproxy/Makefile
+++ b/net/yazproxy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= yazproxy
PORTVERSION= 1.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yazproxy/