10 files changed, 16 insertions, 39 deletions
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index d4c5136459e5..034ed34d5351 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -17,8 +17,8 @@ INSTALLS_ICONS=	yes
 USE_GNOME=	intlhack gnomeprefix libgnome gnomepanel gnomedocutils
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	netstatus.schemas
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index 2520703fb9b4..e67c57f8a451 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -14,6 +14,7 @@ LIB_DEPENDS=	librote.so:${PORTSDIR}/devel/rote
 
 USES=		gmake
 GNU_CONFIGURE=	yes
+LIBS+=		-lncurses
 
 ALL_TARGET=	${PORTNAME}
 
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index a4a544342ee3..4879835b0155 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -12,10 +12,12 @@ COMMENT=	Production quality, multilayer virtual switch
 LICENSE=	APACHE20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	PERL=${PREFIX}/bin/perl
-CONFIGURE_ARGS+=SSL_LIBS=-lssl SSL_CFLAGS=-I/usr/include/openssl
-USE_AUTOTOOLS=	autoconf automake
+CONFIGURE_ARGS=	PERL=${PREFIX}/bin/perl \
+		SSL_CFLAGS="-I${OPENSSLINC}" \
+		SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 USES=		gmake pkgconfig
+USE_AUTOTOOLS=	autoconf automake
+USE_OPENSSL=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	ovs-vswitchd ovsdb-server
 
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index ef2b282c3912..4a37742f5898 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -41,18 +41,14 @@ PLIST_SUB+=	PACKTERTC=""
 PLIST_SUB+=	PACKTERTC="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/configure
+
 post-install:
 .if ${PORT_OPTIONS:MPACKTERTC}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} -pr ${WRKSRC}/packter_tc ${STAGEDIR}${DATADIR}/
 .endif
-
-.for f in packter.conf
-	@if [ ! -f ${PREFIX}/etc/${f} ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/${f}.sample ${STAGEDIR}/${PREFIX}/etc/${f} ; \
-	fi
-.endfor
-
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/net/packter-agent/pkg-plist b/net/packter-agent/pkg-plist
index 79a2d04cdd25..9d00071e443f 100644
--- a/net/packter-agent/pkg-plist
+++ b/net/packter-agent/pkg-plist
@@ -2,9 +2,7 @@ bin/pt_agent
 bin/pt_sflow
 bin/pt_netflow
 bin/pt_thmon
-@unexec if cmp -s %D/etc/packter.conf.sample %D/etc/packter.conf; then rm -f %D/etc/packter.conf; fi
-etc/packter.conf.sample
-@exec [ -f %D/etc/packter.conf ] || cp -p %D/etc/packter.conf.sample %D/etc/packter.conf
+@sample etc/packter.conf.sample
 %%PACKTERTC%%%%DATADIR%%/packter_tc/IPTB.pm
 %%PACKTERTC%%%%DATADIR%%/packter_tc/InterTrackMessage.xsd
 %%PACKTERTC%%%%DATADIR%%/packter_tc/btm.conf
diff --git a/net/udt/Makefile b/net/udt/Makefile
index c61eee7eadb6..b2a5069ed8dc 100644
--- a/net/udt/Makefile
+++ b/net/udt/Makefile
@@ -26,7 +26,7 @@ post-build:
 	# Building sample applications:
 .for a in ${UDT_APPS}
 	${CXX} ${CXXFLAGS} ${WRKSRC:H}/app/$a.cpp -o ${WRKSRC:H}/app/udt-$a \
-	    -I${WRKSRC} -L${WRKSRC} -ludt
+	    -I${WRKSRC} -L${WRKSRC} -ludt -pthread
 .endfor
 
 .include <bsd.port.options.mk>
diff --git a/net/udt/files/BSDmakefile b/net/udt/files/BSDmakefile
index c0d5c5111ca5..7625197ad218 100644
--- a/net/udt/files/BSDmakefile
+++ b/net/udt/files/BSDmakefile
@@ -6,7 +6,7 @@ LIBDIR=	${PREFIX}/lib
 INCLUDEDIR=	${PREFIX}/include
 INCS=	udt.h
 
-LDADD=	-lmd -lpthread
+LDADD=	-lmd -pthread
 
 SRCS=	common.cpp window.cpp list.cpp buffer.cpp packet.cpp channel.cpp \
 	queue.cpp ccc.cpp cache.cpp core.cpp epoll.cpp api.cpp
diff --git a/net/vortex/Makefile b/net/vortex/Makefile
index 007f889cbea0..d6eff948cf7e 100644
--- a/net/vortex/Makefile
+++ b/net/vortex/Makefile
@@ -22,8 +22,8 @@ USE_GNOME=	glib20
 
 do-build:
 	cd ${WRKSRC} && ${CC} -c vortex.c -I${LOCALBASE}/include
-	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap
-	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c ${PTHREAD_LIBS}
+	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap -pthread
+	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c -pthread
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/vortex.conf ${STAGEDIR}${PREFIX}/etc/vortex.conf.sample
diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in
deleted file mode 100644
index 8c5f811bb124..000000000000
--- a/net/wireshark/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2010-08-29 18:20:27.000000000 -0400
-+++ Makefile.in	2010-09-04 17:17:43.000000000 -0400
-@@ -444,6 +444,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LUA_INCLUDES = @LUA_INCLUDES@
-+LIBS = @LUA_LIBS@
- LUA_LIBS = @LUA_LIBS@
- LYNX = @LYNX@
- MAKEINFO = @MAKEINFO@
diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in
deleted file mode 100644
index 534461e11a1e..000000000000
--- a/net/wireshark/files/patch-epan_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- epan/Makefile.in.orig	2014-07-31 15:23:19.000000000 -0400
-+++ epan/Makefile.in	2014-08-09 22:55:55.000000000 -0400
-@@ -150,6 +150,7 @@ DIST_COMMON = $(srcdir)/../Makefile.am.i
- 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(srcdir)/doxygen.cfg.in $(top_srcdir)/depcomp
- @HAVE_WARNINGS_AS_ERRORS_TRUE@am__append_1 = -Werror
-+LIBS = @LUA_LIBS@
- EXTRA_PROGRAMS = reassemble_test$(EXEEXT) tvbtest$(EXEEXT) \
- 	oids_test$(EXEEXT)
- subdir = epan