Fix some standards issues.

3 files changed, 18 insertions, 19 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index bdb8e6059342..44b01b2533bc 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -35,13 +35,13 @@ JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
 REDIS_DESC=		Build with Redis support
 
-LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
+LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig pathfix
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gnomehack
+USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
@@ -94,14 +94,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.la lib/syslog-ng/libtfgeoip.so
 .else
@@ -110,7 +110,7 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis
-LIB_DEPENDS+=           hiredis.0:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so lib/syslog-ng/libredis.la
 .else
 CONFIGURE_ARGS+=        --disable-redis
@@ -119,14 +119,14 @@ CONFIGURE_ARGS+=        --disable-redis
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		esmtp.7:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.la lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		dbi.2:${PORTSDIR}/databases/libdbi
+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
@@ -135,7 +135,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		json:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson.so:${PORTSDIR}/devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.la lib/syslog-ng/libjson-plugin.so
 .else
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 7f6aa7ea4900..9641d7a39236 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -33,17 +33,16 @@ SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
 
-USES=		pkgconfig
+USES=		gmake pkgconfig pathfix
 
 .include <bsd.port.options.mk>
 
-LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
+LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack
+USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
@@ -94,14 +93,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.la lib/syslog-ng/libtfgeoip.so
 .else
@@ -110,14 +109,14 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		esmtp.7:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.la lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		dbi.2:${PORTSDIR}/databases/libdbi
+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
@@ -126,7 +125,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		json:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson.so:${PORTSDIR}/devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.la lib/syslog-ng/libjson-plugin.so
 .else
diff --git a/sysutils/syslog-ng33/Makefile b/sysutils/syslog-ng33/Makefile
index fbc8b32607dc..c0c20df997ce 100644
--- a/sysutils/syslog-ng33/Makefile
+++ b/sysutils/syslog-ng33/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		dbi.2:${PORTSDIR}/databases/libdbi
+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