svn commit: r360752 - in head/sysutils: syslog-ng syslog-ng33 syslog-ng34
Tijl Coosemans
tijl at FreeBSD.org
Sat Jul 5 14:45:11 UTC 2014
Author: tijl
Date: Sat Jul 5 14:45:09 2014
New Revision: 360752
URL: http://svnweb.freebsd.org/changeset/ports/360752
QAT: https://qat.redports.org/buildarchive/r360752/
Log:
- Add USES=libtool
- Rearrange Makefile a little
Modified:
head/sysutils/syslog-ng/Makefile
head/sysutils/syslog-ng/pkg-plist
head/sysutils/syslog-ng33/Makefile
head/sysutils/syslog-ng33/pkg-plist
head/sysutils/syslog-ng34/Makefile
head/sysutils/syslog-ng34/pkg-plist
Modified: head/sysutils/syslog-ng/Makefile
==============================================================================
--- head/sysutils/syslog-ng/Makefile Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng/Makefile Sat Jul 5 14:45:09 2014 (r360752)
@@ -3,13 +3,16 @@
PORTNAME= syslog-ng
PORTVERSION= 3.5.4.1
+PORTREVISION= 1
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
DISTFILES= syslog-ng_${DISTVERSION}.tar.gz
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/
MAINTAINER= cy at FreeBSD.org
-COMMENT= A powerful syslogd replacement
+COMMENT= Powerful syslogd replacement
+
+LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog
CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
syslog-ng[0-9][0-9]-[0-9]* \
@@ -33,9 +36,7 @@ JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
REDIS_DESC= Build with Redis support
-LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog
-
-USES= gmake pkgconfig pathfix
+USES= gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
USE_RC_SUBR= syslog-ng
GNU_CONFIGURE= yes
@@ -47,6 +48,8 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE
--enable-debug \
--datadir=${PREFIX}/share/syslog-ng/
+BROKEN_sparc64= Does not compile on sparc64: gcc core dump
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
@@ -54,7 +57,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
@@ -63,12 +66,6 @@ CONFIGURE_ARGS+= --disable-ssl
WITH_OPENSSL_PORT= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64: gcc core dump
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
@@ -102,7 +99,7 @@ CONFIGURE_ARGS+= --disable-pcre
CONFIGURE_ARGS+= --enable-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
+PLIST_FILES+= lib/syslog-ng/libtfgeoip.so
.else
CONFIGURE_ARGS+= --disable-geoip
.endif
@@ -110,7 +107,7 @@ CONFIGURE_ARGS+= --disable-geoip
.if ${PORT_OPTIONS:MREDIS}
CONFIGURE_ARGS+= --enable-redis
LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis
-PLIST_FILES+= lib/syslog-ng/libredis.so lib/syslog-ng/libredis.la
+PLIST_FILES+= lib/syslog-ng/libredis.so
.else
CONFIGURE_ARGS+= --disable-redis
.endif
@@ -119,7 +116,7 @@ CONFIGURE_ARGS+= --disable-redis
.if ${PORT_OPTIONS:MSMTP}
CONFIGURE_ARGS+= --with-libesmtp=/usr/local/
LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp
-PLIST_FILES+= lib/syslog-ng/libafsmtp.la lib/syslog-ng/libafsmtp.so
+PLIST_FILES+= lib/syslog-ng/libafsmtp.so
.else
CONFIGURE_ARGS+= --disable-smtp
.endif
@@ -128,7 +125,7 @@ CONFIGURE_ARGS+= --disable-smtp
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
@@ -136,7 +133,7 @@ CONFIGURE_ARGS+= --disable-sql
.if ${PORT_OPTIONS:MJSON}
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
+PLIST_FILES+= lib/syslog-ng/libjson-plugin.so
.else
CONFIGURE_ARGS+= --disable-json
.endif
@@ -165,4 +162,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.dist ${STAGEDIR}${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h ${STAGEDIR}${PREFIX}/include/syslog-ng/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/syslog-ng/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng/pkg-plist Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng/pkg-plist Sat Jul 5 14:45:09 2014 (r360752)
@@ -120,40 +120,23 @@ include/syslog-ng/rewrite/rewrite-subst.
include/syslog-ng/rewrite/rewrite-expr-parser.h
include/syslog-ng/template/templates.h
lib/libsyslog-ng-3.5.4.1.so
-lib/libsyslog-ng.la
lib/libsyslog-ng.so
-lib/syslog-ng/libafamqp.la
lib/syslog-ng/libafamqp.so
-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/libafstomp.la
lib/syslog-ng/libafstomp.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/libcryptofuncs.la
lib/syslog-ng/libcryptofuncs.so
-lib/syslog-ng/libcsvparser.la
lib/syslog-ng/libcsvparser.so
-lib/syslog-ng/libdbparser.la
lib/syslog-ng/libdbparser.so
-lib/syslog-ng/liblinux-kmsg-format.la
lib/syslog-ng/liblinux-kmsg-format.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
-lib/syslog-ng/libsystem-source.la
lib/syslog-ng/libsystem-source.so
libdata/pkgconfig/syslog-ng.pc
man/man1/loggen.1.gz
Modified: head/sysutils/syslog-ng33/Makefile
==============================================================================
--- head/sysutils/syslog-ng33/Makefile Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng33/Makefile Sat Jul 5 14:45:09 2014 (r360752)
@@ -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).ta
MAINTAINER= cy at 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
Modified: head/sysutils/syslog-ng33/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng33/pkg-plist Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng33/pkg-plist Sat Jul 5 14:45:09 2014 (r360752)
@@ -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
Modified: head/sysutils/syslog-ng34/Makefile
==============================================================================
--- head/sysutils/syslog-ng34/Makefile Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng34/Makefile Sat Jul 5 14:45:09 2014 (r360752)
@@ -3,7 +3,7 @@
PORTNAME= syslog-ng
PORTVERSION= 3.4.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
PKGNAMESUFFIX= 34
@@ -11,7 +11,9 @@ DISTFILES= syslog-ng_${DISTVERSION}.tar.
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/
MAINTAINER= cy at FreeBSD.org
-COMMENT= A powerful syslogd replacement
+COMMENT= Powerful syslogd replacement
+
+LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog
CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
syslog-ng[0-9][0-9]-[0-9]* \
@@ -33,12 +35,7 @@ SMTP_DESC= Build with SMTP support
JSON_DESC= Build with JSON-C support
GEOIP_DESC= Build with GeoIP support
-USES= gmake pkgconfig pathfix
-
-.include <bsd.port.options.mk>
-
-LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog
-
+USES= gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
USE_RC_SUBR= syslog-ng
GNU_CONFIGURE= yes
@@ -49,12 +46,16 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE
--enable-dynamic-linking \
--enable-debug
+BROKEN_sparc64= Does not compile on sparc64: gcc core dump
+
+.include <bsd.port.options.mk>
+
.if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL}
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
@@ -63,12 +64,6 @@ CONFIGURE_ARGS+= --disable-ssl
WITH_OPENSSL_PORT= yes
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64: gcc core dump
-.endif
-
.if ${PORT_OPTIONS:MTCP_WRAPPERS}
CONFIGURE_ARGS+= --enable-tcp-wrapper
.else
@@ -102,7 +97,7 @@ CONFIGURE_ARGS+= --disable-pcre
CONFIGURE_ARGS+= --enable-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
+PLIST_FILES+= lib/syslog-ng/libtfgeoip.so
.else
CONFIGURE_ARGS+= --disable-geoip
.endif
@@ -110,7 +105,7 @@ CONFIGURE_ARGS+= --disable-geoip
.if ${PORT_OPTIONS:MSMTP}
CONFIGURE_ARGS+= --with-libesmtp=/usr/local/
LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp
-PLIST_FILES+= lib/syslog-ng/libafsmtp.la lib/syslog-ng/libafsmtp.so
+PLIST_FILES+= lib/syslog-ng/libafsmtp.so
.else
CONFIGURE_ARGS+= --disable-smtp
.endif
@@ -119,7 +114,7 @@ CONFIGURE_ARGS+= --disable-smtp
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
@@ -127,7 +122,7 @@ CONFIGURE_ARGS+= --disable-sql
.if ${PORT_OPTIONS:MJSON}
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
+PLIST_FILES+= lib/syslog-ng/libjson-plugin.so
.else
CONFIGURE_ARGS+= --disable-json
.endif
@@ -152,4 +147,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${STAGEDIR}${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.dist ${STAGEDIR}${PREFIX}/etc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/syslog-ng34/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng34/pkg-plist Sat Jul 5 14:41:44 2014 (r360751)
+++ head/sysutils/syslog-ng34/pkg-plist Sat Jul 5 14:45:09 2014 (r360752)
@@ -89,36 +89,21 @@ include/syslog-ng/value-pairs.h
include/syslog-ng/versioning.h
include/syslog-ng/vptransform.h
lib/libsyslog-ng-3.4.8.so
-lib/libsyslog-ng.la
lib/libsyslog-ng.so
-lib/syslog-ng/libafamqp.la
lib/syslog-ng/libafamqp.so
-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/libcryptofuncs.la
lib/syslog-ng/libcryptofuncs.so
-lib/syslog-ng/libcsvparser.la
lib/syslog-ng/libcsvparser.so
-lib/syslog-ng/libdbparser.la
lib/syslog-ng/libdbparser.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
-lib/syslog-ng/libsystem-source.la
lib/syslog-ng/libsystem-source.so
libdata/pkgconfig/syslog-ng.pc
man/man1/loggen.1.gz
More information about the svn-ports-all
mailing list