2 files changed, 8 insertions, 22 deletions

diff --git a/sysutils/syslog-ng33/Makefile b/sysutils/syslog-ng33/Makefile
index c0c20df997ce..f9d1a065ff83 100644
--- a/sysutils/syslog-ng33/Makefile
+++ b/sysutils/syslog-ng33/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.3.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
 PKGNAMESUFFIX=	33
@@ -12,6 +12,8 @@ DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
+LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
+
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
@@ -32,12 +34,10 @@ JSON_C_DESC=		Build with JSON-C support
 JSON_GLIB_DESC=		Build with JSON-GLIB support
 SYSLOG2NG_DESC=		Install syslog2ng script
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
-
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 
@@ -51,7 +51,7 @@ USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
 			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
-PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
+PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--disable-pcre
 LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
-PLIST_FILES+=		lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so
+PLIST_FILES+=		lib/syslog-ng/libafsql.so
 .else
 CONFIGURE_ARGS+=	--disable-sql
 .endif
@@ -101,11 +101,11 @@ CONFIGURE_ARGS+=	--disable-sql
 .if ${PORT_OPTIONS:MJSON_GLIB}
 LIB_DEPENDS+=		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
 CONFIGURE_ARGS+=	--enable-json --with-json=json-glib
-PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+PLIST_FILES+=		lib/syslog-ng/libtfjson.so
 .elif ${PORT_OPTIONS:MJSON_C}
 LIB_DEPENDS+=		libjson.so:${PORTSDIR}/devel/json-c
 CONFIGURE_ARGS+=	--enable-json --with-json=json-c
-PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+PLIST_FILES+=		lib/syslog-ng/libtfjson.so
 .else
 CONFIGURE_ARGS+=	--disable-json
 .endif
diff --git a/sysutils/syslog-ng33/pkg-plist b/sysutils/syslog-ng33/pkg-plist
index c508c7d9c92d..93862bcc115c 100644
--- a/sysutils/syslog-ng33/pkg-plist
+++ b/sysutils/syslog-ng33/pkg-plist
@@ -73,36 +73,22 @@ include/syslog-ng/tlscontext.h
 include/syslog-ng/tlstransport.h
 include/syslog-ng/utils.h
 include/syslog-ng/value-pairs.h
-lib/libsyslog-ng.la
 lib/libsyslog-ng.so
 lib/libsyslog-ng-3.3.11.so
 libdata/pkgconfig/syslog-ng.pc
-lib/syslog-ng/libaffile.la
 lib/syslog-ng/libaffile.so
-lib/syslog-ng/libafmongodb.la
 lib/syslog-ng/libafmongodb.so
-lib/syslog-ng/libafprog.la
 lib/syslog-ng/libafprog.so
-lib/syslog-ng/libafsocket-notls.la
 lib/syslog-ng/libafsocket-notls.so
 lib/syslog-ng/libafsocket.so
-lib/syslog-ng/libafuser.la
 lib/syslog-ng/libafuser.so
-lib/syslog-ng/libbasicfuncs.la
 lib/syslog-ng/libbasicfuncs.so
-lib/syslog-ng/libconfgen.la
 lib/syslog-ng/libconfgen.so
-lib/syslog-ng/libconvertfuncs.la
 lib/syslog-ng/libconvertfuncs.so
-lib/syslog-ng/libcsvparser.la
 lib/syslog-ng/libcsvparser.so
-lib/syslog-ng/libdbparser.la
 lib/syslog-ng/libdbparser.so
-lib/syslog-ng/libdummy.la
 lib/syslog-ng/libdummy.so
-lib/syslog-ng/libsyslog-ng-crypto.la
 lib/syslog-ng/libsyslog-ng-crypto.so
-lib/syslog-ng/libsyslogformat.la
 lib/syslog-ng/libsyslogformat.so
 man/man1/loggen.1.gz
 man/man1/pdbtool.1.gz