Date: Tue, 4 Mar 2014 20:52:09 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347071 - in head/sysutils: syslog-ng syslog-ng-devel syslog-ng33 Message-ID: <201403042052.s24Kq94J007071@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Mar 4 20:52:09 2014 New Revision: 347071 URL: http://svnweb.freebsd.org/changeset/ports/347071 QAT: https://qat.redports.org/buildarchive/r347071/ Log: Fix some standards issues. Modified: head/sysutils/syslog-ng-devel/Makefile head/sysutils/syslog-ng/Makefile head/sysutils/syslog-ng33/Makefile Modified: head/sysutils/syslog-ng-devel/Makefile ============================================================================== --- head/sysutils/syslog-ng-devel/Makefile Tue Mar 4 20:50:14 2014 (r347070) +++ head/sysutils/syslog-ng-devel/Makefile Tue Mar 4 20:52:09 2014 (r347071) @@ -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 Modified: head/sysutils/syslog-ng/Makefile ============================================================================== --- head/sysutils/syslog-ng/Makefile Tue Mar 4 20:50:14 2014 (r347070) +++ head/sysutils/syslog-ng/Makefile Tue Mar 4 20:52:09 2014 (r347071) @@ -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 Modified: head/sysutils/syslog-ng33/Makefile ============================================================================== --- head/sysutils/syslog-ng33/Makefile Tue Mar 4 20:50:14 2014 (r347070) +++ head/sysutils/syslog-ng33/Makefile Tue Mar 4 20:52:09 2014 (r347071) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403042052.s24Kq94J007071>