aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2015-01-15 09:05:37 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2015-01-15 09:05:37 +0000
commitc88aaf5c891059139a97c6a9da40fb5cbe102634 (patch)
tree03708cdbdeb7094897643531ddd754b2c9a2c51b
parent11c750925ed8e4b886a43e45df089896dd23e6f5 (diff)
downloadports-c88aaf5c891059139a97c6a9da40fb5cbe102634.tar.gz
ports-c88aaf5c891059139a97c6a9da40fb5cbe102634.zip
Notes
-rw-r--r--audio/baresip/Makefile3
-rw-r--r--audio/libshairport/Makefile7
-rw-r--r--audio/opusfile/Makefile2
-rw-r--r--audio/re/Makefile2
-rw-r--r--audio/rem/Makefile4
-rw-r--r--benchmarks/sipp/Makefile3
-rw-r--r--benchmarks/wrk/Makefile5
-rw-r--r--chinese/bitchx/Makefile2
-rw-r--r--comms/conserver-com/Makefile3
-rw-r--r--databases/libdrizzle-redux/Makefile3
-rw-r--r--databases/virtuoso/Makefile3
-rw-r--r--devel/fossil/Makefile5
-rw-r--r--devel/ice/Makefile3
-rw-r--r--devel/libmonetra/Makefile5
-rw-r--r--devel/libmowgli2/Makefile4
-rw-r--r--devel/pecl-mcve/Makefile2
-rw-r--r--devel/poco-devel/Makefile11
-rw-r--r--devel/poco-ssl/Makefile3
-rw-r--r--devel/ucommon/Makefile2
-rw-r--r--ftp/tnftp/Makefile2
-rw-r--r--games/tinymux/Makefile4
-rw-r--r--irc/bitchx/Makefile3
-rw-r--r--irc/charybdis/Makefile3
-rw-r--r--irc/eggdrop-devel/Makefile3
-rw-r--r--irc/ircd-ratbox/Makefile3
-rw-r--r--irc/psybnc/Makefile3
-rw-r--r--irc/xaric/Makefile4
-rw-r--r--lang/mosh/Makefile3
-rw-r--r--lang/rubinius/Makefile3
-rw-r--r--mail/archiveopteryx-devel/Makefile2
-rw-r--r--mail/archiveopteryx/Makefile3
-rw-r--r--mail/filtermail/Makefile2
-rw-r--r--mail/gbuffy/Makefile8
-rw-r--r--mail/libesmtp/Makefile4
-rw-r--r--mail/nbsmtp/Makefile6
-rw-r--r--mail/prayer/Makefile3
-rw-r--r--mail/spamdyke/Makefile2
-rw-r--r--multimedia/asdcplib/Makefile3
-rw-r--r--net-im/sigram/Makefile3
-rw-r--r--net-mgmt/icinga/Makefile2
-rw-r--r--net-mgmt/kismet/Makefile2
-rw-r--r--net-mgmt/monitoring-plugins/Makefile3
-rw-r--r--net-mgmt/nagios-check_bacula/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/Makefile3
-rw-r--r--net-mgmt/nagircbot/Makefile2
-rw-r--r--net-mgmt/sysmon/Makefile10
-rw-r--r--net-p2p/dclib/Makefile5
-rw-r--r--net/bsdec2-image-upload/Makefile2
-rw-r--r--net/crtmpserver/Makefile3
-rw-r--r--net/hostapd/Makefile2
-rw-r--r--net/httping/Makefile3
-rw-r--r--net/kamailio/Makefile11
-rw-r--r--net/l4ip/Makefile2
-rw-r--r--net/libarms/Makefile5
-rw-r--r--net/libexosip2/Makefile3
-rw-r--r--net/miniupnpd/Makefile3
-rw-r--r--net/p5-Net-TCLink/Makefile3
-rw-r--r--net/p5-Socket-Class/Makefile3
-rw-r--r--net/relayd/Makefile2
-rw-r--r--net/ssltunnel-client/Makefile3
-rw-r--r--net/ssltunnel-server/Makefile3
-rw-r--r--net/ssvnc/Makefile4
-rw-r--r--net/svnup/Makefile2
-rw-r--r--net/tinyfugue/Makefile2
-rw-r--r--net/xrdp/Makefile10
-rw-r--r--security/duo/Makefile5
-rw-r--r--security/hs-HsOpenSSL/Makefile3
-rw-r--r--security/john/Makefile2
-rw-r--r--security/ncrack/Makefile4
-rw-r--r--security/nessus-libnasl/Makefile5
-rw-r--r--security/openca-tools-forked/Makefile5
-rw-r--r--security/osiris/Makefile3
-rw-r--r--security/ossec-hids-client/Makefile1
-rw-r--r--security/ossec-hids-local/Makefile1
-rw-r--r--security/ossec-hids-server/Makefile3
-rw-r--r--security/pev/Makefile6
-rw-r--r--security/proxytunnel/Makefile2
-rw-r--r--security/skipfish/Makefile3
-rw-r--r--security/sslscan/Makefile6
-rw-r--r--security/starttls/Makefile3
-rw-r--r--security/stunnel/Makefile23
-rw-r--r--sysutils/bacula-bat/Makefile5
-rw-r--r--sysutils/bacula-client-static/Makefile6
-rw-r--r--sysutils/bacula-client/Makefile6
-rw-r--r--sysutils/bacula-server/Makefile7
-rw-r--r--sysutils/monit/Makefile2
-rw-r--r--sysutils/syslog-ng-devel/Makefile20
-rw-r--r--sysutils/syslog-ng/Makefile21
-rw-r--r--sysutils/syslog-ng33/Makefile22
-rw-r--r--sysutils/syslog-ng34/Makefile17
-rw-r--r--sysutils/syslog-ng35/Makefile21
-rw-r--r--sysutils/tlsdate/Makefile2
-rw-r--r--textproc/exmpp/Makefile4
-rw-r--r--textproc/htdig/Makefile3
-rw-r--r--www/blastbeat/Makefile3
-rw-r--r--www/httrack/Makefile4
-rw-r--r--www/mini_httpd/Makefile12
-rw-r--r--www/mini_httpd/files/patch-Makefile9
-rw-r--r--www/nostromo/Makefile3
-rw-r--r--www/tengine/Makefile2
-rw-r--r--www/tntnet/Makefile3
-rw-r--r--www/xshttpd/Makefile5
102 files changed, 289 insertions, 197 deletions
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 71759fbd1810..d9ce731d9ae4 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -2,7 +2,7 @@
PORTNAME= baresip
PORTVERSION= 0.4.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.creytiv.com/pub/
@@ -17,6 +17,7 @@ BUILD_DEPENDS= re>=0.4.6:${PORTSDIR}/audio/re \
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= gmake pkgconfig
+USE_OPENSSL= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
MAKE_ARGS= MOD_AUTODETECT=""
PLIST_FILES= bin/baresip
diff --git a/audio/libshairport/Makefile b/audio/libshairport/Makefile
index f3fe62f51bdc..e45018744f2f 100644
--- a/audio/libshairport/Makefile
+++ b/audio/libshairport/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libshairport
PORTVERSION= 1.2.0.20310
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://mirrors.xbmc.org/build-deps/darwin-libs/
DISTNAME= libshairport-${PORTVERSION}_lib
@@ -11,10 +11,11 @@ DISTNAME= libshairport-${PORTVERSION}_lib
MAINTAINER= manuel.creach@icloud.com
COMMENT= Airport Extreme Emulator
-USES= autoreconf gmake libtool
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+USES= autoreconf gmake libtool
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 8ea191ce11d0..2f38900e8577 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -2,6 +2,7 @@
PORTNAME= opusfile
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
${MASTER_SITE_MOZILLA_EXTENDED}
@@ -18,6 +19,7 @@ LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg \
USES= autoreconf gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
+USE_OPENSSL= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
PATHFIX_MAKEFILEIN= Makefile.am
diff --git a/audio/re/Makefile b/audio/re/Makefile
index 5bfdef70f3f5..c92630381b53 100644
--- a/audio/re/Makefile
+++ b/audio/re/Makefile
@@ -2,6 +2,7 @@
PORTNAME= re
PORTVERSION= 0.4.6
+PORTREVISION= 1
CATEGORIES= audio devel
MASTER_SITES= http://www.creytiv.com/pub/
@@ -13,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING
USES= gmake
USE_LDCONFIG= yes
+USE_OPENSSL= yes
PORTDATA= re.mk
diff --git a/audio/rem/Makefile b/audio/rem/Makefile
index 3d679360c30d..49718d8dc475 100644
--- a/audio/rem/Makefile
+++ b/audio/rem/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rem
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= audio devel
MASTER_SITES= http://www.creytiv.com/pub/
@@ -14,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING
BUILD_DEPENDS= ${LOCALBASE}/share/re/re.mk:${PORTSDIR}/audio/re
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_LDCONFIG= yes
USES= gmake
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index 6c18dd6a4983..c26d55418912 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sipp
PORTVERSION= 3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= benchmarks net
MASTER_SITES= SF
MASTER_SITE_SUBDIR= sipp/sipp/${PORTVERSION}
@@ -52,6 +52,7 @@ PLIST_FILES+= %%DATADIR%%/pcap/${f}
.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL= yes
.if ${PORT_OPTIONS:MPCAPPLAY}
ALL_TARGET= pcapplay_ossl
.else
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
index 869926b7154c..78b76146a0a9 100644
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wrk
PORTVERSION= 3.1.1
+PORTREVISION= 1
CATEGORIES= benchmarks www
MASTER_SITES= https://github.com/wg/wrk/archive/
DISTNAME= ${PORTVERSION}
@@ -13,9 +14,11 @@ COMMENT= The modern HTTP benchmarking tool
LICENSE= APACHE20
-LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit
+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= gmake
+USE_OPENSSL= yes
CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH
PLIST_FILES= bin/wrk
diff --git a/chinese/bitchx/Makefile b/chinese/bitchx/Makefile
index 24c07b6083df..a006e33dc746 100644
--- a/chinese/bitchx/Makefile
+++ b/chinese/bitchx/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= BitchX
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= chinese
MAINTAINER= ports@FreeBSD.org
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index fce4b03c9621..2d611e421648 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -2,7 +2,7 @@
PORTNAME= conserver
PORTVERSION= 8.1.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://www.conserver.com/ \
ftp://ftp.conserver.com/conserver/
@@ -14,6 +14,7 @@ COMMENT= Application that allows multiple users to watch serial consoles
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
--with-pam --with-libwrap --with-openssl
+USE_OPENSSL= yes
USE_RC_SUBR= conserver
OPTIONS_DEFINE= UDS GSSAPI GSSAPIONLY STRIPREALM
diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile
index 451015f63c53..6f0bace81620 100644
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdrizzle
PORTVERSION= 5.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://launchpadlibrarian.net/138246183/
PKGNAMESUFFIX= -redux
@@ -18,6 +18,7 @@ LICENSE= BSD2CLAUSE
GNU_CONFIGURE= yes
USES= gmake libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
CONFLICTS= libdrizzle-[0-9]*
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 15ff87b8a52f..f36ab40ed62c 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -3,7 +3,7 @@
PORTNAME= virtuoso
PORTVERSION= 6.1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-opensource-${PORTVERSION}
@@ -23,6 +23,7 @@ LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
USES= gmake libtool readline uidfix
USE_AUTOTOOLS= autoheader aclocal
+USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-readline\
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index d11e2cade534..3a6ee9334e07 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -2,11 +2,11 @@
PORTNAME= fossil
PORTVERSION= 1.29
-DISTVERSION= 20140612172556
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= devel www
MASTER_SITES= http://www.fossil-scm.org/download/
-DISTVERSIONPREFIX= src-
+DISTNAME= ${PORTNAME}-src-20140612172556
MAINTAINER= bapt@FreeBSD.org
COMMENT= DSCM with built-in wiki, http interface and server, tickets database
@@ -18,6 +18,7 @@ PLIST_FILES= bin/fossil
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
+USE_OPENSSL= yes
USE_RC_SUBR= fossil
OPTIONS_DEFINE= JSON STATIC
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index c38b4481a817..de9a8b7aa69c 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Ice
PORTVERSION= 3.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://download.zeroc.com/Ice/3.5/
@@ -17,6 +17,7 @@ SLAVE_PORT?= no
.if ${SLAVE_PORT} == "no"
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
libmcpp.so:${PORTSDIR}/devel/mcpp
+USE_OPENSSL= yes
.else
LIB_VRS= ${PORTVERSION:R:S|.||g}
LIB_DEPENDS+= libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
diff --git a/devel/libmonetra/Makefile b/devel/libmonetra/Makefile
index af083dfafb81..46c9ea75665c 100644
--- a/devel/libmonetra/Makefile
+++ b/devel/libmonetra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmonetra
PORTVERSION= 7.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.monetra.com/pub/libmonetra/
DISTNAME= libmonetra-${PORTVERSION}
@@ -11,8 +11,9 @@ DISTNAME= libmonetra-${PORTVERSION}
MAINTAINER= brad@monetra.com
COMMENT= Library for credit card processing through Monetra (formerly MCVE)
-USES= gmake libtool
GNU_CONFIGURE= yes
+USES= gmake libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/devel/libmowgli2/Makefile b/devel/libmowgli2/Makefile
index b7886c1e1e2d..7d0a6b6b34a5 100644
--- a/devel/libmowgli2/Makefile
+++ b/devel/libmowgli2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libmowgli2
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://github.com/atheme/libmowgli-2/archive/
DISTNAME= libmowgli-${DISTVERSION}
@@ -12,9 +13,10 @@ COMMENT= Development framework for C
WRKSRC= ${WRKDIR}/libmowgli-2-libmowgli-${DISTVERSION}
+GNU_CONFIGURE= yes
USES= gmake pathfix
PATHFIX_MAKEFILEIN= Makefile
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/devel/pecl-mcve/Makefile b/devel/pecl-mcve/Makefile
index 749f903e35f2..e29e429d3310 100644
--- a/devel/pecl-mcve/Makefile
+++ b/devel/pecl-mcve/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mcve
PORTVERSION= 7.0.3
+PORTREVISION= 1
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -16,6 +17,7 @@ LIB_DEPENDS= libmonetra.so:${PORTSDIR}/devel/libmonetra
LICENSE= PHP30
+USE_OPENSSL= yes
USE_PHP= yes
USE_PHPEXT= yes
DEFAULT_PHP_VER=53
diff --git a/devel/poco-devel/Makefile b/devel/poco-devel/Makefile
index 1f3cd5cc9d0e..aecaee975e7c 100644
--- a/devel/poco-devel/Makefile
+++ b/devel/poco-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= poco
PORTVERSION= 1.5.4
+PORTREVISION= 1
CATEGORIES= devel net
MASTER_SITES= https://codeload.github.com/pocoproject/poco/legacy.tar.gz/poco-${PORTVERSION}-release?dummy=/
PKGNAMESUFFIX= -devel
@@ -13,6 +14,8 @@ COMMENT= C++ Portable Components library
LICENSE= BSL
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
+ libexpat.so:${PORTSDIR}/textproc/expat2
CONFLICTS= poco-ssl-[0-9]* poco-[0-9]*
@@ -27,12 +30,13 @@ OPTIONS_RADIO= ODBC
OPTIONS_RADIO_ODBC= UODBC IODBC
ODBC_DESC= ODBC Driver
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --config=FreeBSD --unbundled
USES= gmake
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
MAKE_JOBS_UNSAFE=true
-LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
- libexpat.so:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/pocoproject-poco-a64ebba
MAKE_ARGS= CXX=c++ CC=cc POCO_ODBC_LIB=${LOCALBASE}/lib
@@ -64,9 +68,6 @@ USE_SQLITE= yes
CONFIGURE_ARGS+= --omit=Data/SQLite
.endif
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
post-patch:
@${REINPLACE_CMD} -e "s/ =/ ?=/g" ${WRKSRC}/build/config/FreeBSD
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index f985f045b726..aea6701fbe20 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -4,7 +4,7 @@
PORTNAME= poco
# New version 1.4.6p4 is available; please use DISTVERSION upon updating
PORTVERSION= 1.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel net
MASTER_SITES= SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -ssl
@@ -21,6 +21,7 @@ USES= gmake tar:bzip2
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --config=FreeBSD
USE_LDCONFIG= yes
+USE_OPENSSL= yes
OPTIONS_DEFINE= TEST SAMPLES MYSQL SQLITE ODBC
OPTIONS_DEFAULT=MYSQL SQLITE
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 0e7e4f5d7600..ec2fb29bdb83 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ucommon
PORTVERSION= 6.1.11
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= commoncpp
@@ -16,6 +17,7 @@ USES= pathfix pkgconfig cmake:outsource
CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON \
-DINSTALL_BINDIR:STRING=bin/${PORTNAME}
USE_LDCONFIG= yes
+USE_OPENSSL= yes
post-install:
${INSTALL_DATA} ${BUILD_WRKSRC}/ucommon-config.h ${STAGEDIR}${PREFIX}/include/ucommon
diff --git a/ftp/tnftp/Makefile b/ftp/tnftp/Makefile
index 582759401515..cec4e5bfc65b 100644
--- a/ftp/tnftp/Makefile
+++ b/ftp/tnftp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tnftp
PORTVERSION= 20141104
+PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
@@ -10,6 +11,7 @@ MAINTAINER= danilo@FreeBSD.org
COMMENT= Enhanced ftp client from NetBSD
GNU_CONFIGURE= yes
+USE_OPENSSL= yes
PLIST_FILES= bin/tnftp man/man1/tnftp.1.gz
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 6fa80991ab86..0688d24f345f 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tinymux
PORTVERSION= 2.10.1.${PATCHLEVEL}
+PORTREVISION= 1
CATEGORIES= games net
MASTER_SITES= GOOGLE_CODE
DISTNAME= mux-${PORTVERSION}.unix
@@ -47,7 +48,8 @@ INLINE_SQL_CONFIGURE_ENABLE= inlinesql
MEMORY_BASED_CONFIGURE_ENABLE= memorybased
REALITY_LVLS_CONFIGURE_ENABLE= realitylvls
SELFCHECK_CONFIGURE_ENABLE= selfcheck
-SSL_CONFIGURE_ENABLE= ssl
+SSL_CONFIGURE_ENABLE= ssl
+SSL_USE= OPENSSL=yes
WOD_REALMS_CONFIGURE_ENABLE= wodrealms
SUB_FILES= ${PORTNAME} pkg-deinstall pkg-message
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index c5f1807233a9..b41f77b4180a 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BitchX
DISTVERSION= 1.2-final
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH= 1
CATEGORIES+= irc
MASTER_SITES= http://bitchx.ca/
@@ -44,6 +44,7 @@ CONFIGURE_ARGS+= --enable-ipv6
.if ${PORT_OPTIONS:MSSL}
CONFIGURE_ARGS+= --with-ssl
+USE_OPENSSL= yes
.endif
.if ${PORT_OPTIONS:MPLUGINS}
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile
index 25327775fd02..94768069429f 100644
--- a/irc/charybdis/Makefile
+++ b/irc/charybdis/Makefile
@@ -2,7 +2,7 @@
PORTNAME= charybdis
PORTVERSION= 3.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc net
MASTER_SITES= http://www.stack.nl/~jilles/irc/ \
http://www.bayofrum.net/dist/${PORTNAME}/
@@ -27,6 +27,7 @@ PORTDOCS= charybdis-oper-guide.pdf
USE_AUTOTOOLS= autoconf
USES= libtool pathfix
+USE_OPENSSL= yes
USE_RC_SUBR= ${PORTNAME}
GNU_CONFIGURE= yes
USERS= ircd
diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index de2012592b57..6ce28a2bbc6c 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= eggdrop
PORTVERSION= 1.8.0.20141008
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc
MASTER_SITES= GH \
http://mirror.shatow.net/freebsd/${PORTNAME}/
@@ -15,6 +15,7 @@ COMMENT= The most popular open source Internet Relay Chat bot
LICENSE= GPLv2
USES= tcl:85+
+USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index d7b26e3a9dc0..0b6d78cb452a 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ircd-ratbox
PORTVERSION= 3.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc ipv6
MASTER_SITES= http://www.ratbox.org/download/ \
http://www.ratbox.org/download/old/
@@ -17,6 +17,7 @@ CONFLICTS= ircd-ratbox-devel-[0-9]* charybdis-[0-9]*
USES= libtool tar:bzip2
#MAN8= ircd.8
+USE_OPENSSL= yes
USE_RC_SUBR= ircd-ratbox
USE_SQLITE= 3
USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox
diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile
index b699e88c3fa7..b9679816cff9 100644
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= psybnc
DISTVERSION= 2.3.2-9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc ipv6
MASTER_SITES= http://www.psybnc.at/download/beta/ CENKES
DISTNAME= psyBNC-${DISTVERSION}
@@ -11,6 +11,7 @@ DISTNAME= psyBNC-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful IRC bouncer
+USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/psybnc
PSYBASE?= ${PREFIX}/psybnc
MAKE_ARGS= PSYBASE=${PSYBASE}
diff --git a/irc/xaric/Makefile b/irc/xaric/Makefile
index d964e2d35bc4..b0d257ac2892 100644
--- a/irc/xaric/Makefile
+++ b/irc/xaric/Makefile
@@ -3,14 +3,16 @@
PORTNAME= xaric
PORTVERSION= 0.13.6
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://xaric.org/software/xaric/releases/
MAINTAINER= ports@FreeBSD.org
COMMENT= IRC Client similer to BitchX or ircII
-USES= pathfix gmake
GNU_CONFIGURE= yes
+USES= gmake pathfix
+USE_OPENSSL= yes
post-patch:
@${REINPLACE_CMD} -e 's|-ggdb3||g' ${WRKSRC}/Makefile.in
diff --git a/lang/mosh/Makefile b/lang/mosh/Makefile
index 05b8b99f932e..34325b6a5d19 100644
--- a/lang/mosh/Makefile
+++ b/lang/mosh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mosh
PORTVERSION= 0.2.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -scheme
@@ -15,6 +15,7 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \
libonig.so:${PORTSDIR}/devel/oniguruma5
USES= gmake
+USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/lib
CFLAGS+= -I${LOCALBASE}/include
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index d82d7b5b03d0..d52c25da27f3 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rubinius
PORTVERSION= 2.2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://releases.rubini.us/:source \
RG:gems
@@ -39,6 +39,7 @@ CONFIGURE_ARGS= -P "${PREFIX}" \
--stagingdir "${STAGEDIR}${PREFIX}" --with-execinfo
USES= perl5 gmake tar:bzip2 readline
+USE_OPENSSL= yes
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS= yes
USE_PERL5= build
diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index ef0077238d21..ff48a64a1494 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= archiveopteryx
PORTVERSION= 3.2.99.20140730
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -devel
@@ -20,6 +21,7 @@ GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= 39bdb8b
USES= perl5 tar:bzip2 pgsql:9.1+
+USE_OPENSSL= yes
USE_PERL5= build
PORTDOCS= COPYING README bsd.txt
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index f80b0ebbc56e..bdbfb287f296 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= archiveopteryx
PORTVERSION= 3.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://archiveopteryx.org/download/
@@ -15,6 +15,7 @@ LICENSE= MIT
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
USES= perl5 tar:bzip2 pgsql:9.1+
+USE_OPENSSL= yes
USE_PERL5= build
PORTDOCS= COPYING README bsd.txt
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index d1bb675f6deb..55957974dc9f 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -2,6 +2,7 @@
PORTNAME= filtermail
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://sourceforge.net/projects/mailfilter/files/Mailfilter/
DISTNAME= mailfilter-${PORTVERSION}
@@ -23,6 +24,7 @@ EXTRACT_AFTER_ARGS= | ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= bison gmake
+USE_OPENSSL= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index e7afef8c3821..113824a6b8c6 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gbuffy
PORTVERSION= 0.2.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail
MASTER_SITES= http://www.fiction.net/blong/programs/gbuffy/gbuffy-${PORTVERSION}/
@@ -13,10 +13,12 @@ COMMENT= GTK+ multiple mailbox "biff" program
LIB_DEPENDS= libPropList.so:${PORTSDIR}/devel/libPropList \
libcompface.so:${PORTSDIR}/mail/faces
-PLIST_FILES= bin/gbuffy
-USE_GNOME= gtk12
GNU_CONFIGURE= yes
LIBS+= -L${LOCALBASE}/lib
+USE_GNOME= gtk12
+USE_OPENSSL= yes
+
+PLIST_FILES= bin/gbuffy
post-patch:
@${REINPLACE_CMD} -e 's|bindir)|DESTDIR)$$(&|' \
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 162111d6a774..4a3e2d3a54a8 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libesmtp
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \
@@ -22,7 +22,7 @@ OPTIONS_SUB= yes
DEBUG_CONFIGURE_ENABLE= debug
OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE}
-OPENSSL_USE= openssl
+OPENSSL_USE= OPENSSL=yes
GNU_CONFIGURE= yes
# require-all-recipients (implied by enable-all) is required for Balsa
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index be64cfd4365c..c56edac1f7d4 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nbsmtp
PORTVERSION= 1.00
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= LOCAL/ehaupt
@@ -13,8 +13,8 @@ COMMENT= Simple program for outgoing SMTP delivery
LICENSE= GPLv2
GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --enable-ssl --enable-ipv6
+CONFIGURE_ARGS= --enable-ssl --enable-ipv6
+USE_OPENSSL= yes
PLIST_FILES= bin/nbsmtp man/man5/nbsmtprc.5.gz man/man8/nbsmtp.8.gz
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 0e8761a85502..ecf85e884e6c 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prayer
PORTVERSION= 1.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
@@ -35,6 +35,7 @@ GROUPS= prayer
SESSIONCACHE_USE= BDB=5+
LDAP_USE= OPENLDAP=yes
+SSL_USE= OPENSSL=yes
TIDY_LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib
GID!= id -g
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index be6173cf992d..9e042f5b4f31 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -3,6 +3,7 @@
PORTNAME= spamdyke
PORTVERSION= 5.0.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.spamdyke.org/releases/
@@ -29,6 +30,7 @@ DEBUG_DESC= Enable debugging output
DEBUG_EXCESSIVE_DESC= Enable excessive debugging output
TLS_CONFIGURE_ENABLE= tls
+TLS_USE= OPENSSL=yes
DEBUG_CONFIGURE_ENABLE= debug-output
DEBUG_EXCESSIVE_CONFIGURE_ENABLE= excessive-output
diff --git a/multimedia/asdcplib/Makefile b/multimedia/asdcplib/Makefile
index b23f32569a63..0e20ddb5dd17 100644
--- a/multimedia/asdcplib/Makefile
+++ b/multimedia/asdcplib/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asdcplib
PORTVERSION= 1.11.49
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://download.cinecert.com/asdcplib/
@@ -16,5 +16,6 @@ CONFIGURE_ARGS+=--with-expat=${LOCALBASE}
INSTALL_TARGET= install-strip
USES= libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/net-im/sigram/Makefile b/net-im/sigram/Makefile
index c881b47b492e..bbdc79fb67b3 100644
--- a/net-im/sigram/Makefile
+++ b/net-im/sigram/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sigram
PORTVERSION= 0.11182014
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MAINTAINER= kmoore@freebsd.org
@@ -16,6 +16,7 @@ GH_ACCOUNT= sialan-labs
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= ce3fb15
+USE_OPENSSL= yes
USE_QT5= core gui network opengl xml widgets buildtools_build graphicaleffects \
multimedia printsupport qml quick quickcontrols widgets \
sql sql-sqlite3
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index 9daa2eb6a61c..740b1d070782 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -3,6 +3,7 @@
PORTNAME= icinga
PORTVERSION= 1.12.0
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
@@ -92,6 +93,7 @@ CONFIGURE_ARGS+= --enable-idoutils \
--with-dbi-lib=${LOCALBASE}/lib \
--with-dbi-inc=${LOCALBASE}/include
INSTALL_TARGET+= install-idoutils
+USE_OPENSSL= yes
USE_RC_SUBR+= ido2db
PLIST_SUB+= IDOUTILS=""
.else
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 728873b3b3f3..5f66430c3fc4 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kismet
DISTVERSION= 2013-03-R1b
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.kismetwireless.net/code/:1 \
@@ -61,6 +62,7 @@ PLIST_SUB+= SUID="@comment " SUIDGROUP=""
.if ${PORT_OPTIONS:MPLUGINS}
ALL_TARGET= depend all all-plugins
INSTALL_TARGET+= all-plugins-install
+USE_OPENSSL= yes
PLIST_SUB+= PLUGINS=""
.else
PLIST_SUB+= PLUGINS="@comment "
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index d58356a91492..713ab3d6177c 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= monitoring-plugins
PORTVERSION= 2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-mgmt
MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
@@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= nagios-plugins-*
USES= charsetfix gmake perl5 libtool
+USE_OPENSSL= yes
USE_SUBMAKE= yes
OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
diff --git a/net-mgmt/nagios-check_bacula/Makefile b/net-mgmt/nagios-check_bacula/Makefile
index 1a343960a776..0008f168b970 100644
--- a/net-mgmt/nagios-check_bacula/Makefile
+++ b/net-mgmt/nagios-check_bacula/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= bacula
+PORTREVISION= 3
CATEGORIES= net-mgmt
PKGNAMEPREFIX= nagios-check_
PKGNAMESUFFIX= #
@@ -23,5 +24,6 @@ CONFIGURE_ARGS= --enable-client-only \
--disable-xatt
OPTIONS_DEFINE= #
+OPTIONS_DEFAULT=#
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 56f8b3287d24..a1d09d8a14a3 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 2.0.3
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
@@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= monitoring-plugins-*
USES= charsetfix gmake perl5 libtool
+USE_OPENSSL= yes
USE_SUBMAKE= yes
OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
diff --git a/net-mgmt/nagircbot/Makefile b/net-mgmt/nagircbot/Makefile
index 4b2ee9792476..e975932b7956 100644
--- a/net-mgmt/nagircbot/Makefile
+++ b/net-mgmt/nagircbot/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nagircbot
PORTVERSION= 0.0.33
+PORTREVISION= 1
CATEGORIES= net-mgmt irc
MASTER_SITES= http://www.vanheusden.com/nagircbot/
@@ -10,6 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= IRC bot for Nagios
USES= gmake tar:tgz
+USE_OPENSSL= yes
USE_RC_SUBR= nagircbot
PLIST_FILES= bin/nagircbot
diff --git a/net-mgmt/sysmon/Makefile b/net-mgmt/sysmon/Makefile
index 9d6968b10019..22c21a67e764 100644
--- a/net-mgmt/sysmon/Makefile
+++ b/net-mgmt/sysmon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sysmon
PORTVERSION= 0.93
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ftp://puck.nether.net/pub/jared/ \
http://titan.oxeo.com/mirror/sysmon.org/
@@ -12,16 +13,17 @@ COMMENT= Network tool designed for high performance and accurate monitoring
LICENSE= GPLv2
+GNU_CONFIGURE= yes
USES= alias
+USE_OPENSSL= yes
+
+OPTIONS_DEFINE= DOCS
+
DOCS= Changes.html binaries.html config.html docs.html index.html \
jclient.jpg net-example.png sysmon.conf.man.html sysmon.jpg \
sysmon.man.html reporting.xml-spec.txt
MANPAGE= sysmon.man.8 sysmon.conf.man.8
-GNU_CONFIGURE= yes
-
-OPTIONS_DEFINE= DOCS
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/sysmon ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/src/sysmond ${STAGEDIR}${PREFIX}/bin
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 6e179e4455d8..37a34ad356b3 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dclib
PORTVERSION= 0.3.23
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= SF/wxdcgui/${PORTNAME}/${PORTVERSION}
@@ -17,8 +17,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= libtool pathfix tar:bzip2
-USE_LDCONFIG= yes
USE_GNOME= libxml2
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
diff --git a/net/bsdec2-image-upload/Makefile b/net/bsdec2-image-upload/Makefile
index 688131085673..f64e6070639e 100644
--- a/net/bsdec2-image-upload/Makefile
+++ b/net/bsdec2-image-upload/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bsdec2-image-upload
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://freebsd-ec2-dist.s3.amazonaws.com/
@@ -14,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
USES= tar:tgz uidfix
+USE_OPENSSL= yes
# Install into ${STAGEDIR}${PREFIX}; but the build respects ${DESTDIR} so
# all we need to give is the ${PREFIX}/bin part.
diff --git a/net/crtmpserver/Makefile b/net/crtmpserver/Makefile
index 57820e7c84e9..26edefa460f4 100644
--- a/net/crtmpserver/Makefile
+++ b/net/crtmpserver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= crtmpserver
PORTVERSION= 0.811
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://rtmpd.com/assets/sources/
@@ -19,6 +19,7 @@ USE_LDCONFIG= yes
USES= cmake:outsource lua
CMAKE_SOURCE_PATH= ${WRKSRC}/builders/cmake
CMAKE_ARGS= -DCRTMPSERVER_INSTALL_PREFIX:STRING=${PREFIX} -DTEMP_FRAMEWORK_VER=${PORTVERSION}
+USE_OPENSSL= yes
USERS= crtmpserver
GROUPS= crtmpserver
diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index 0a4d0b878d22..db561305f869 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hostapd
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://w1.fi/releases/
@@ -12,6 +13,7 @@ COMMENT= IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
LICENSE= BSD3CLAUSE
USES= gmake
+USE_OPENSSL= yes
BUILD_WRKSRC= ${WRKSRC}/hostapd
PLIST_FILES= sbin/hostapd sbin/hostapd_cli man/man1/hostapd_cli.1.gz \
diff --git a/net/httping/Makefile b/net/httping/Makefile
index aebf6d4528a3..dddf3c008044 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -3,7 +3,7 @@
PORTNAME= httping
PORTVERSION= 2.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.vanheusden.com/httping/ \
LOCAL/ehaupt
@@ -40,6 +40,7 @@ MAKE_ENV+= FW=no
.if ${PORT_OPTIONS:MSSL}
MAKE_ENV+= SSL=yes
+USE_OPENSSL= yes
.else
MAKE_ENV+= SSL=no
.endif
diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index a94afc6144de..aad292612c39 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -4,6 +4,7 @@
PORTNAME= kamailio
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
@@ -13,16 +14,15 @@ COMMENT= Very fast and configurable open source SIP proxy
LICENSE= GPLv2
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+
USES= gmake shebangfix readline
USE_LDCONFIG= yes
SHEBANG_FILES= utils/kamctl/kamctl utils/kamctl/kamdbctl
CFLAGS+= -Wall
-LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \
- libxml2.so:${PORTSDIR}/textproc/libxml2
-
-RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_RC_SUBR= kamailio
@@ -41,6 +41,7 @@ PGSQL_USES= pgsql
JITSI_RUN_DEPENDS= jitsi:${PORTSDIR}/net-im/jitsi
UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC
RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+TLS_USE= OPENSSL=yes
.include <bsd.port.options.mk>
diff --git a/net/l4ip/Makefile b/net/l4ip/Makefile
index 23cb6bb2e13b..196e3b0732da 100644
--- a/net/l4ip/Makefile
+++ b/net/l4ip/Makefile
@@ -3,6 +3,7 @@
PORTNAME= l4ip
PORTVERSION= 1.0.294
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.lundman.net/ftp/l4ip/
DISTNAME= ${PORTNAME}-${PORTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)/v\1.\2.b\3/}
@@ -11,6 +12,7 @@ MAINTAINER= leeym@FreeBSD.org
COMMENT= L4 health check daemon for IPFILTER
USES= gmake tar:tgz
+USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/src
post-patch:
diff --git a/net/libarms/Makefile b/net/libarms/Makefile
index 9c44c34b49ea..64d91d8dff77 100644
--- a/net/libarms/Makefile
+++ b/net/libarms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libarms
PORTVERSION= 5.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net devel
MASTER_SITES= https://dev.smf.jp/dl/ \
http://dev.smf.jp/dl/
@@ -13,9 +13,10 @@ COMMENT= SMFv2/ARMS client library for C
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
-USES= gmake libtool
GNU_CONFIGURE= yes
+USES= gmake libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile
index 1492e06360b3..a8c2a65c7994 100644
--- a/net/libexosip2/Makefile
+++ b/net/libexosip2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libeXosip2
PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SAVANNAH/exosip
@@ -20,6 +20,7 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
SHLIB_VER= 11
PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index d9e8b67e52ec..e7e697c2f3d0 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= miniupnpd
PORTVERSION= 1.9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \
@@ -18,7 +19,7 @@ UUID!= uuidgen
PLIST_FILES= etc/miniupnpd.conf.sample sbin/miniupnpd \
man/man8/miniupnpd.8.gz
MAKE_JOBS_UNSAFE=yes
-
+USE_OPENSSL= yes
USE_RC_SUBR= miniupnpd
OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES CHECK_PORTINUSE IPV6 UPNP_IGDV2 UPNP_STRICT LEASEFILE
diff --git a/net/p5-Net-TCLink/Makefile b/net/p5-Net-TCLink/Makefile
index 11957a0c344c..2f63fe991391 100644
--- a/net/p5-Net-TCLink/Makefile
+++ b/net/p5-Net-TCLink/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Net-TCLink
PORTVERSION= 3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -15,6 +15,7 @@ COMMENT= Module to for connecting to the TrustCommerce payment gateway
LICENSE= LGPL21
USES= perl5
+USE_OPENSSL= yes
USE_PERL5= configure
.include <bsd.port.mk>
diff --git a/net/p5-Socket-Class/Makefile b/net/p5-Socket-Class/Makefile
index 517b7a762199..1bee0a81b612 100644
--- a/net/p5-Socket-Class/Makefile
+++ b/net/p5-Socket-Class/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Socket-Class
PORTVERSION= 2.258
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -12,6 +12,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Perl class to communicate with sockets
USES= perl5
+USE_OPENSSL= yes
USE_PERL5= configure
.include <bsd.port.mk>
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 63d7d323c890..0d161fac017b 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= relayd
PORTVERSION= 5.5.20140810
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= GH
@@ -16,6 +17,7 @@ GH_COMMIT= 49d1afd
WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/src/usr.sbin
USES= uidfix
USE_GITHUB= yes
+USE_OPENSSL= yes
USE_RC_SUBR= relayd
CFLAGS+= -Wall
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index cfafca3ef1d0..a677744b15dc 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ssltunnel
PORTVERSION= 1.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/ressources/outils/ssltunnel/download/
PKGNAMESUFFIX= -client
@@ -19,6 +19,7 @@ GUI_DESC= GTK 1.2 graphical interface
CONFIGURE_ARGS= --disable-server --with-iconv=${ICONV_PREFIX}
GNU_CONFIGURE= yes
USES= iconv
+USE_OPENSSL= yes
.include <bsd.port.options.mk>
diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile
index b1b2ed198a18..c3d98026cdc0 100644
--- a/net/ssltunnel-server/Makefile
+++ b/net/ssltunnel-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ssltunnel
PORTVERSION= 1.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.hsc.fr/ressources/outils/ssltunnel/download/
PKGNAMESUFFIX= -server
@@ -21,6 +21,7 @@ USE_RC_SUBR= ${PORTNAME}
SUB_FILES+= pkg-message
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-client
+USE_OPENSSL= yes
.include <bsd.port.options.mk>
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index 70c0951b8ec9..a52afb803ef7 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ssvnc
PORTVERSION= 1.0.29
+PORTREVISION= 1
CATEGORIES= net security
MASTER_SITES= SF
DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
@@ -21,8 +22,9 @@ OPTIONS_DEFINE= DOCS ULTRAFTP
ULTRAFTP_DESC= UltraVNC File Transfer support (Java required)
USES= imake:env gmake perl5 tk:wrapper
-USE_XORG= xi xmu xt xaw ice xpm xext sm
+USE_OPENSSL= yes
USE_PERL5= run
+USE_XORG= xi xmu xt xaw ice xpm xext sm
MAKE_ENV+= ROOT=${STAGEDIR}
diff --git a/net/svnup/Makefile b/net/svnup/Makefile
index 511eaa8234f3..6cbc4b03b337 100644
--- a/net/svnup/Makefile
+++ b/net/svnup/Makefile
@@ -2,6 +2,7 @@
PORTNAME= svnup
PORTVERSION= 1.07
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://jcm.dsl.visi.com/freebsd/svnup/ \
LOCAL/jgh/net/${PORTNAME}/
@@ -15,6 +16,7 @@ OPTIONS_DEFINE= DOCS
LDFLAGS+= -lmd -lssl
USES= tar:xz
+USE_OPENSSL= yes
PORTDOCS= ChangeLog
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 55496ad515a0..f4696214cef9 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tf
PORTVERSION= 5.0b8
+PORTREVISION= 1
CATEGORIES= net games
MASTER_SITES= SF/tinyfugue/tinyfugue/5.0%20beta%208
DISTVERSION= ${PORTVERSION:S/.//}
@@ -13,6 +14,7 @@ COMMENT= Popular programmable MUD client, with macro support and more
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-manpage --enable-version --enable-symlink --datadir=${PREFIX}/lib
+USE_OPENSSL= yes
PLIST_SUB= DISTNAME=${DISTNAME}
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index a0183e598a86..7e47269e6f21 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xrdp
PORTVERSION= 0.6.1
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= GH
@@ -14,11 +14,13 @@ COMMENT= Open source Remote Desktop Protocol (RDP) server
LICENSE= GPLv2
-USES= autoreconf:build libtool pkgconfig
-USE_XORG= x11 xfixes
GNU_CONFIGURE= yes
-USE_RC_SUBR= xrdp
+USES= autoreconf:build libtool pkgconfig
USE_LDCONFIG= ${PREFIX}/lib/xrdp
+USE_OPENSSL= yes
+USE_RC_SUBR= xrdp
+USE_XORG= x11 xfixes
+
USE_GITHUB= yes
GH_ACCOUNT= neutrinolabs
GH_PROJECT= xrdp
diff --git a/security/duo/Makefile b/security/duo/Makefile
index 934636cbaacb..98bf8d883efc 100644
--- a/security/duo/Makefile
+++ b/security/duo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= duo
PORTVERSION= 1.9.13
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://dl.duosecurity.com/ \
http://mirrors.rit.edu/zi/
@@ -16,9 +17,11 @@ LICENSE= GPLv2
CONFIGURE_ARGS= --with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \
--docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME}
-USES= libtool pathfix
GNU_CONFIGURE= yes
+USES= libtool pathfix
USE_LDCONFIG= yes
+USE_OPENSSL= yes
+
SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index 300df353671c..e9def50c6a3f 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -2,13 +2,14 @@
PORTNAME= HsOpenSSL
PORTVERSION= 0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Partial OpenSSL binding for Haskell
USE_CABAL= network>=2.1.0.0
+USE_OPENSSL= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/john/Makefile b/security/john/Makefile
index 6c7529275daa..6670edf624de 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -3,6 +3,7 @@
PORTNAME= john
DISTVERSION= 1.7.9-jumbo-7
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.openwall.com/john/g/ \
http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
@@ -16,6 +17,7 @@ LICENSE= GPLv2
USES= gmake shebangfix tar:bzip2
SHEBANG_FILES= run/*.pl
+USE_OPENSSL= yes
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src
# We prefer -jumbo (community-enhanced) versions instead of vanilla releases
diff --git a/security/ncrack/Makefile b/security/ncrack/Makefile
index e60193306bf7..b84d3fe9ee12 100644
--- a/security/ncrack/Makefile
+++ b/security/ncrack/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ncrack
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://nmap.org/ncrack/dist/ \
http://redundancy.redundancy.org/mirror/
@@ -12,6 +13,7 @@ MAINTAINER= lx@FreeBSD.org
COMMENT= High-speed network authentication cracking tool
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 77e5362b7ef6..da5996ee9749 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nessus-libnasl
PORTVERSION= 2.2.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -22,7 +22,8 @@ LIB_DEPENDS= libnessus.so:${PORTSDIR}/security/nessus-libraries
GNU_CONFIGURE= yes
USES= bison libtool
-USE_LDCONFIG= YES
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/libnasl
.include <bsd.port.mk>
diff --git a/security/openca-tools-forked/Makefile b/security/openca-tools-forked/Makefile
index 8434c7bacf9d..386b39fd58ff 100644
--- a/security/openca-tools-forked/Makefile
+++ b/security/openca-tools-forked/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openca-tools-forked
PORTVERSION= 1.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
DIST_SUBDIR= openxpki
@@ -17,8 +17,9 @@ GH_ACCOUNT= openxpki
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= 641e43a
-USES= gmake perl5
GNU_CONFIGURE= yes
+USES= gmake perl5
+USE_OPENSSL= yes
# security/openssl already has a verify.1 manpage.
post-stage:
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index f21051516e09..1777c96c4f51 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -2,7 +2,7 @@
PORTNAME= osiris
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://osiris.shmoo.com/data/ \
http://redundancy.redundancy.org/mirror/
@@ -11,6 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Shmoo client/server host integrity checker
GNU_CONFIGURE= yes
+USE_OPENSSL= yes
USE_RC_SUBR= yes
OPTIONS_DEFINE= OSIRISMD OSIRISD PRINTDB CLI
diff --git a/security/ossec-hids-client/Makefile b/security/ossec-hids-client/Makefile
index f7a5b2ea1990..29a814aa6ef4 100644
--- a/security/ossec-hids-client/Makefile
+++ b/security/ossec-hids-client/Makefile
@@ -1,6 +1,7 @@
# Created by: Valerio Daelli <valerio.daelli@gmail.com>
# $FreeBSD$
+PORTREVISION= 1
COMMENT= The client port of ossec-hids
CLIENT_ONLY= yes
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index ed03e03e280b..749c2f973707 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -1,6 +1,7 @@
# Created by: Valerio Daelli <valerio.daelli@gmail.com>
# $FreeBSD$
+PORTREVISION= 1
COMMENT= The client and server (local) port of ossec-hids
LOCAL_ONLY= yes
diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
index 53eaaa26fa11..283cc422c493 100644
--- a/security/ossec-hids-server/Makefile
+++ b/security/ossec-hids-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ossec-hids
PORTVERSION= 2.8.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= security
MASTER_SITES= http://www.ossec.net/files/ \
http://www.ossec.net/files/old/
@@ -17,6 +17,7 @@ USE_RC_SUBR= ossec-hids
CFLAGS+= -ferror-limit=0
USES= readline
+USE_OPENSSL= yes
.if defined(MAINTAINER_MODE)
UID_FILES+= ../../UIDs
diff --git a/security/pev/Makefile b/security/pev/Makefile
index a14570eba602..eb7f1cbd4738 100644
--- a/security/pev/Makefile
+++ b/security/pev/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pev
PORTVERSION= 0.70
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
@@ -13,10 +14,11 @@ LICENSE= GPLv3
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= gmake
+USES= gmake
USE_LDCONFIG= yes
+USE_OPENSSL= yes
MAKE_ARGS= MAKE=${MAKE_CMD}
CFLAGS+= -I${LOCALBASE}/include
diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index cea07b7125ae..fae077e94406 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= proxytunnel
PORTVERSION= 1.9.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source%20tarballs/${PORTNAME}%20${PORTVERSION}
@@ -10,6 +11,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Connects stdin and stdout to an origin server through an HTTPS proxy
USES= pkgconfig gmake tar:tgz
+USE_OPENSSL= yes
ALL_TARGET= ${PORTNAME}
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index ac6199582fb4..6310237af84f 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -3,7 +3,7 @@
PORTNAME= skipfish
PORTVERSION= 2.10b
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -17,6 +17,7 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \
libpcre.so:${PORTSDIR}/devel/pcre
USES= gmake tar:tgz
+USE_OPENSSL= yes
SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS
diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile
index 2e7eac86d1cc..d07a43a48939 100644
--- a/security/sslscan/Makefile
+++ b/security/sslscan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sslscan
PORTVERSION= 1.8.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
EXTRACT_SUFX= .tgz
@@ -12,6 +13,9 @@ COMMENT= SSLScan is a fast SSL port scanner
LICENSE= GPLv3
-MAKE_ARGS= CC="${CC}" CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include ${CPPFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${LIBS}
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index b2be196e910d..4ff194f642e5 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= starttls
PORTVERSION= 0.10
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= security
MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/
@@ -12,5 +12,6 @@ COMMENT= Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
GNU_CONFIGURE= yes
USES= gmake
USE_EMACS= yes
+USE_OPENSSL= yes
.include <bsd.port.mk>
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 86129c12df05..f864d6233429 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stunnel
PORTVERSION= 5.08
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \
http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
@@ -26,44 +27,36 @@ LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
USES= shebangfix libtool
-USE_RC_SUBR= stunnel
USE_LDCONFIG= yes
+USE_OPENSSL= yes
+USE_RC_SUBR= stunnel
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=/var/tmp --enable-static --disable-systemd
+CONFIGURE_ARGS= --localstatedir=/var/tmp --enable-static --disable-systemd \
+ --with-ssl="${OPENSSLBASE}"
SHEBANG_FILES= src/stunnel3.in
-OPTIONS_DEFINE= IPV6 LIBWRAP SSL_PORT FIPS DOCS EXAMPLES
+OPTIONS_DEFINE= IPV6 LIBWRAP FIPS DOCS EXAMPLES
OPTIONS_SINGLE= THREAD
OPTIONS_SINGLE_THREAD= FORK PTHREAD UCONTEXT
OPTIONS_DEFAULT= PTHREAD
IPV6_CONFIGURE_ENABLE= ipv6
LIBWRAP_CONFIGURE_ENABLE= libwrap
-SSL_PORT_CONFIGURE_ON= --with-ssl="${OPENSSLBASE}"
-SSL_PORT_CONFIGURE_OFF= --with-ssl=/usr
-SSL_PORT_USE= OPENSSL=yes
FIPS_CONFIGURE_ENABLE= fips
-SSL_PORT_DESC= Use OpenSSL from the ports collection
FORK_DESC= Use the fork(3) threading model
PTHREAD_DESC= Use the pthread(3) threading model
UCONTEXT_DESC= Use the ucontext(3) threading model
FIPS_DESC= Enable OpenSSL FIPS mode
-.include <bsd.port.options.mk>
-
STUNNEL_USER?= stunnel
STUNNEL_GROUP?= stunnel
USERS= ${STUNNEL_USER}
GROUPS= ${STUNNEL_GROUP}
-.if ${PORT_OPTIONS:MSSL_PORT}
-WITH_OPENSSL_PORT= yes
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLIBWRAP}
LDFLAGS+= -lwrap
@@ -114,4 +107,4 @@ cert:
@${ECHO} ""
@(cd ${WRKSRC}/tools/; make install-data-local)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 592f375f0185..894ea3bdd3e2 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= bacula
+PORTREVISION= 3
PKGNAMESUFFIX= -bat
COMMENT= Network backup solution (GUI)
@@ -24,7 +25,7 @@ CONFIGURE_ARGS+= --enable-bat \
--disable-build-stored \
--enable-client-only
-OPTIONS_DEFINE= OPENSSL
-OPTIONS_DEFAULT=OPENSSL
+OPTIONS_DEFINE= #
+OPTIONS_DEFAULT=#
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-client-static/Makefile b/sysutils/bacula-client-static/Makefile
index b0a937561b19..35e39a628a7b 100644
--- a/sysutils/bacula-client-static/Makefile
+++ b/sysutils/bacula-client-static/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bacula
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client-static
COMMENT= Network backup solution (static client)
@@ -12,8 +12,8 @@ MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
PLIST_FILES= sbin/bacula-fd-static \
sbin/bconsole-static
-OPTIONS_DEFINE= NLS OPENSSL
-OPTIONS_DEFAULT=NLS OPENSSL
+OPTIONS_DEFINE= NLS
+OPTIONS_DEFAULT=#
CONFIGURE_ARGS+= --enable-client-only \
--enable-static-fd \
diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile
index 11f34c010e91..e90c23a8ce80 100644
--- a/sysutils/bacula-client/Makefile
+++ b/sysutils/bacula-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bacula
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
COMMENT= Network backup solution (client)
@@ -12,7 +12,7 @@ USE_RC_SUBR= bacula-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
-OPTIONS_DEFINE= NLS OPENSSL PYTHON
-OPTIONS_DEFAULT=NLS OPENSSL
+OPTIONS_DEFINE= NLS PYTHON
+OPTIONS_DEFAULT=#
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 70e546e3b53c..f94af749989e 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bacula
DISTVERSION= 7.0.5
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?= #
@@ -13,6 +13,7 @@ MAINTAINER= dvl@FreeBSD.org
COMMENT?= Network backup solution (server)
USES+= libtool
+USE_OPENSSL= yes
CONFLICTS?= bacula5-server-*
@@ -29,8 +30,8 @@ USE_LDCONFIG= yes
CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
-OPTIONS_DEFAULT?= NLS OPENSSL PGSQL
+OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS
+OPTIONS_DEFAULT?= NLS PGSQL
MTX_DESC= Install mtx for control of autochanger devices
.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index aaee432c1a30..cfe49c0dba2b 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= monit
PORTVERSION= 5.11
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.mmonit.com/monit/dist/
@@ -30,6 +31,7 @@ SUB_FILES= pkg-message
PORTDOCS= COPYING README
SSL_CONFIGURE_OFF= --without-ssl
+SSL_USE= OPENSSL=yes
post-install:
${INSTALL} -m 600 ${WRKSRC}/monitrc ${STAGEDIR}${PREFIX}/etc/monitrc.sample
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index b30594bed424..ee97944622bf 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.7.0a2
+PORTREVISION= 1
PKGNAMESUFFIX= -devel
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -21,12 +22,8 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
MAKE_JOBS_UNSAFE= yes
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL
-OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT= PORTS_SSL JSON
-SYS_SSL_DESC= Build with OpenSSL support (from system)
-PORTS_SSL_DESC= Build with OpenSSL support (from ports)
+OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT= OPENSSL JSON
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
@@ -53,20 +50,17 @@ BROKEN_sparc64= Does not compile on sparc64: gcc core dump
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT= yes
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 4d96079f6ac1..915d975fca4a 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -3,7 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.6.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
DISTFILES= syslog-ng_${DISTVERSION}.tar.gz
@@ -21,12 +21,8 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
MAKE_JOBS_UNSAFE= yes
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL
-OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT= PORTS_SSL JSON
-SYS_SSL_DESC= Build with OpenSSL support (from system)
-PORTS_SSL_DESC= Build with OpenSSL support (from ports)
+OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT= OPENSSL JSON
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
@@ -53,20 +49,17 @@ BROKEN_sparc64= Does not compile on sparc64: gcc core dump
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT= yes
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
diff --git a/sysutils/syslog-ng33/Makefile b/sysutils/syslog-ng33/Makefile
index b423a7c16a8b..da85b8e01670 100644
--- a/sysutils/syslog-ng33/Makefile
+++ b/sysutils/syslog-ng33/Makefile
@@ -3,7 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.3.11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
PKGNAMESUFFIX= 33
@@ -18,13 +18,10 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
syslog-ng-devel-[0-9]*
WRKSRC= $(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
-OPTIONS_RADIO= SSL JSON
-OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL
+OPTIONS_RADIO= JSON
OPTIONS_RADIO_JSON= JSON_C JSON_GLIB
-OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SYSLOG2NG DOCS
-OPTIONS_DEFAULT= PORTS_SSL PCRE
-SYS_SSL_DESC= Build with OpenSSL support (from system)
-PORTS_SSL_DESC= Build with OpenSSL support (from ports)
+OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SYSLOG2NG DOCS OPENSSL
+OPTIONS_DEFAULT= OPENSSL PCRE
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
@@ -46,20 +43,17 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT= yes
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
diff --git a/sysutils/syslog-ng34/Makefile b/sysutils/syslog-ng34/Makefile
index 7cce63743338..b97979a8bed4 100644
--- a/sysutils/syslog-ng34/Makefile
+++ b/sysutils/syslog-ng34/Makefile
@@ -3,7 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.4.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
PKGNAMESUFFIX= 34
@@ -20,12 +20,8 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
syslog-ng-devel-[0-9]*
WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL
-OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS
-OPTIONS_DEFAULT= PORTS_SSL PCRE
-SYS_SSL_DESC= Build with OpenSSL support (from system)
-PORTS_SSL_DESC= Build with OpenSSL support (from ports)
+OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS OPENSSL
+OPTIONS_DEFAULT= OPENSSL PCRE
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
@@ -50,8 +46,9 @@ BROKEN_sparc64= Does not compile on sparc64: gcc core dump
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
@@ -60,10 +57,6 @@ PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT= yes
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
diff --git a/sysutils/syslog-ng35/Makefile b/sysutils/syslog-ng35/Makefile
index ceae8550da63..943e824932e6 100644
--- a/sysutils/syslog-ng35/Makefile
+++ b/sysutils/syslog-ng35/Makefile
@@ -3,7 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.5.6
-PORTREVISION= 5
+PORTREVISION= 6
PKGNAMESUFFIX= 35
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -21,12 +21,8 @@ CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
MAKE_JOBS_UNSAFE= yes
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL
-OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS
-OPTIONS_DEFAULT= PORTS_SSL PCRE
-SYS_SSL_DESC= Build with OpenSSL support (from system)
-PORTS_SSL_DESC= Build with OpenSSL support (from ports)
+OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS OPENSSL
+OPTIONS_DEFAULT= OPENSSL PCRE
TCP_WRAPPERS_DESC= Build with TCP Wrappers
SQL_DESC= Build with database (libdbi) support
SPOOF_DESC= Build with spoof source support
@@ -54,20 +50,17 @@ BROKEN_sparc64= Does not compile on sparc64: gcc core dump
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
+.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --enable-ssl
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if ${PORT_OPTIONS:MPORTS_SSL}
-WITH_OPENSSL_PORT= yes
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
diff --git a/sysutils/tlsdate/Makefile b/sysutils/tlsdate/Makefile
index c4ae002dc816..4070d8346160 100644
--- a/sysutils/tlsdate/Makefile
+++ b/sysutils/tlsdate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tlsdate
PORTVERSION= 0.0.7
+PORTREVISION= 1
CATEGORIES= sysutils
DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
@@ -20,6 +21,7 @@ GH_TAGNAME= ${GH_COMMIT}
GNU_CONFIGURE= yes
USES= autoreconf libtool pkgconfig
+USE_OPENSSL= yes
OPTIONS_DEFINE= DOCS
diff --git a/textproc/exmpp/Makefile b/textproc/exmpp/Makefile
index 76434c41d298..45c47cdc0128 100644
--- a/textproc/exmpp/Makefile
+++ b/textproc/exmpp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= exmpp
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= textproc net-im
MAINTAINER= olgeni@FreeBSD.org
@@ -26,7 +27,7 @@ CONFIGURE_ARGS+=--enable-static=yes \
--enable-shared=yes \
--with-erlang=${LOCALBASE} \
--with-expat=${LOCALBASE} \
- --with-openssl=/usr \
+ --with-openssl=${OPENSSLBASE} \
--disable-debug \
--disable-warnings \
--disable-examples \
@@ -35,6 +36,7 @@ GNU_CONFIGURE_PREFIX= "${PREFIX}/lib/erlang/lib"
PLIST_SUB= VERSION=${PORTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env
USES= libtool pkgconfig
+USE_OPENSSL= yes
.include <bsd.port.options.mk>
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 5dd42d8aaa26..6405837b5489 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -3,7 +3,7 @@
PORTNAME= htdig
PORTVERSION= 3.2.0.b6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc www
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/3.2.0b6
@@ -24,6 +24,7 @@ CONFIGURE_ARGS= --with-config-dir=${PREFIX}/etc/htdig \
--with-ssl
USES= libtool
USE_LDCONFIG= yes
+USE_OPENSSL= yes
OPTIONS_DEFINE= APACHE DOCS
OPTIONS_DEFAULT= APACHE
diff --git a/www/blastbeat/Makefile b/www/blastbeat/Makefile
index 8667b6c8018d..74ae4558c45d 100644
--- a/www/blastbeat/Makefile
+++ b/www/blastbeat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blastbeat
PORTVERSION= 20121205
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= GH GHC
@@ -20,6 +20,7 @@ LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev \
libzmq.so:${PORTSDIR}/net/libzmq2
USES= gmake
+USE_OPENSSL= yes
USE_GITHUB= yes
GH_ACCOUNT= zloidemon
GH_COMMIT= cdac9a9
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 5174a7268d6a..a1cb060486e6 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -3,6 +3,7 @@
PORTNAME= httrack
PORTVERSION= 3.48.20
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.httrack.com/ \
http://mirror.httrack.com/ \
@@ -23,8 +24,9 @@ CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= ${PREFIX}/lib/httrack
USES= alias execinfo gmake iconv libtool shebangfix
+USE_LDCONFIG= ${PREFIX}/lib/httrack
+USE_OPENSSL= yes
PORTDATA= *
PORTDOCS= *
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index f4013bb97a92..1c0cc4980716 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mini_httpd
PORTVERSION= 1.21
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://www.acme.com/software/mini_httpd/
@@ -11,12 +12,15 @@ COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
LICENSE= BSD2CLAUSE
-OPTIONS_DEFINE= SSL
-SSL_MAKE_ARGS= -DUSE_OPENSSL
+MAKE_ARGS= SSL_TREE="${OPENSSLBASE}"
+USE_OPENSSL= yes
post-patch:
- ${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1
- ${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/g' ${WRKSRC}/${PORTNAME}.8
+ @${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1
+ @${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/g' ${WRKSRC}/${PORTNAME}.8
+ @${REINPLACE_CMD} \
+ -e '/^CFLAGS =/s|=|= ${CFLAGS}|' \
+ -e '/^LDFLAGS =/s|=|= ${LDFLAGS}|' ${WRKSRC}/Makefile
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
diff --git a/www/mini_httpd/files/patch-Makefile b/www/mini_httpd/files/patch-Makefile
index 14cc02e02f92..72d781fd1af7 100644
--- a/www/mini_httpd/files/patch-Makefile
+++ b/www/mini_httpd/files/patch-Makefile
@@ -5,10 +5,11 @@
# it may be in /usr/local instead of /usr/local/ssl.
#SSL_TREE = /usr/local/ssl
-#SSL_DEFS = -DUSE_SSL
-+SSL_DEFS = -DUSE_SSL
- #SSL_INC = -I$(SSL_TREE)/include
+-#SSL_INC = -I$(SSL_TREE)/include
-#SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
-+SSL_LIBS = -lssl -lcrypto
++SSL_DEFS = -DUSE_SSL
++SSL_INC = -I$(SSL_TREE)/include
++SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto
BINDIR = /usr/local/sbin
@@ -16,7 +17,7 @@
CC = cc
CDEFS = $(SSL_DEFS) $(SSL_INC)
-CFLAGS = -O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
-+CFLAGS += $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
++CFLAGS = $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
LDFLAGS = -s
LDLIBS = $(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile
index ea98411dfb04..f2e63e89bf37 100644
--- a/www/nostromo/Makefile
+++ b/www/nostromo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nostromo
PORTVERSION= 1.9.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.nazgul.ch/dev/
@@ -16,6 +16,7 @@ NOSTROMO_DIR?= nostromo
NOSTROMO_LOGDIR?= ${NOSTROMO_DIR}/logs
NOSTROMO_LOGDIR_PERMS?= 0775
+USE_OPENSSL= yes
USE_RC_SUBR= nostromo
MAKE_ENV?= MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR}
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index 6a38a681146f..d0cf8b3d1374 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -739,8 +739,6 @@ USE_OPENSSL= yes
.if ${PORT_OPTIONS:MSPDY}
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000028
WITH_OPENSSL_PORT= yes
-.else
-WITH_OPENSSL_BASE= yes
.endif
.endif
.endif
diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index 56b766608bcc..ad8a13a07a5f 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tntnet
PORTVERSION= 2.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www devel
MASTER_SITES= http://www.tntnet.org/download/
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --with-ssl=gnutls
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
.else
CONFIGURE_ARGS+= --with-ssl=openssl
+USE_OPENSSL= yes
.endif
USERS= www
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index c9c58d1aa96c..d5ddc3ec59ec 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.6g01
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
@@ -26,8 +26,9 @@ CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
OPTIONS_DEFINE= SSL PCRE LDAP CURL M4_CONFIG PERSISTENT_PERL
OPTIONS_DEFAULT=SSL PCRE
+SSL_USE= OPENSSL=yes
SSL_CONFIGURE_WITH= ssl
-LDAP_USE= openldap
+LDAP_USE= OPENLDAP=yes
LDAP_CONFIGURE_WITH= ldap
M4_CONFIG_DESC= Enable m4 configuration preprocessor
M4_CONFIG_CONFIGURE_WITH=preprocessor