svn commit: r359355 - in head/sysutils: rsyslog7 rsyslog7-devel rsyslog8 rsyslog8-devel
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Jun 26 14:12:10 UTC 2014
Author: amdmi3
Date: Thu Jun 26 14:12:09 2014
New Revision: 359355
URL: http://svnweb.freebsd.org/changeset/ports/359355
QAT: https://qat.redports.org/buildarchive/r359355/
Log:
- Fix plist dependent on options
- Fix dependency on libdbi in rsyslog7
Approved by: portmgr blanked
Reported by: Yuriy Korobko <make dot kernel at gmail dot com>
Modified:
head/sysutils/rsyslog7-devel/Makefile
head/sysutils/rsyslog7/Makefile
head/sysutils/rsyslog8-devel/Makefile
head/sysutils/rsyslog8/Makefile
Modified: head/sysutils/rsyslog7-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog7-devel/Makefile Thu Jun 26 14:09:06 2014 (r359354)
+++ head/sysutils/rsyslog7-devel/Makefile Thu Jun 26 14:12:09 2014 (r359355)
@@ -42,8 +42,7 @@ USES= libtool pkgconfig
.if ${PORT_OPTIONS:MDBI}
LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
CONFIGURE_ARGS+=--enable-libdbi
-PLIST_FILES+= lib/rsyslog/omlibdbi.la \
- lib/rsyslog/omlibdbi.so
+PLIST_FILES+= lib/rsyslog/omlibdbi.so
.else
CONFIGURE_ARGS+=--disable-libdbi
.endif
@@ -52,19 +51,15 @@ CONFIGURE_ARGS+=--disable-libdbi
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
CONFIGURE_ARGS+=--enable-gnutls
-PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \
- lib/rsyslog/lmnsd_gtls.so
+PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so
.else
CONFIGURE_ARGS+=--disable-gnutls
.endif
.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+=--enable-gssapi-krb5
-PLIST_FILES+= lib/rsyslog/imgssapi.la \
- lib/rsyslog/imgssapi.so \
- lib/rsyslog/lmgssutil.la \
+PLIST_FILES+= lib/rsyslog/imgssapi.so \
lib/rsyslog/lmgssutil.so \
- lib/rsyslog/omgssapi.la \
lib/rsyslog/omgssapi.so
.else
CONFIGURE_ARGS+=--disable-gssapi-krb5
@@ -73,8 +68,7 @@ CONFIGURE_ARGS+=--disable-gssapi-krb5
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
-PLIST_FILES+= lib/rsyslog/ommysql.so \
- lib/rsyslog/ommysql.la
+PLIST_FILES+= lib/rsyslog/ommysql.so
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
@@ -82,8 +76,7 @@ CONFIGURE_ARGS+=--disable-mysql
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
-PLIST_FILES+= lib/rsyslog/ompgsql.so \
- lib/rsyslog/ompgsql.la
+PLIST_FILES+= lib/rsyslog/ompgsql.so
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
@@ -91,9 +84,7 @@ CONFIGURE_ARGS+=--disable-pgsql
.if ${PORT_OPTIONS:MRELP}
LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp
CONFIGURE_ARGS+=--enable-relp
-PLIST_FILES+= lib/rsyslog/imrelp.la \
- lib/rsyslog/imrelp.so \
- lib/rsyslog/omrelp.la \
+PLIST_FILES+= lib/rsyslog/imrelp.so \
lib/rsyslog/omrelp.so
.else
CONFIGURE_ARGS+=--disable-relp
@@ -102,8 +93,7 @@ CONFIGURE_ARGS+=--disable-relp
.if ${PORT_OPTIONS:MRFC3195}
LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging
CONFIGURE_ARGS+=--enable-rfc3195
-PLIST_FILES+= lib/rsyslog/im3195.la \
- lib/rsyslog/im3195.so
+PLIST_FILES+= lib/rsyslog/im3195.so
.else
CONFIGURE_ARGS+=--disable-rfc3195
.endif
@@ -111,8 +101,7 @@ CONFIGURE_ARGS+=--disable-rfc3195
.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=--enable-snmp
-PLIST_FILES+= lib/rsyslog/omsnmp.la \
- lib/rsyslog/omsnmp.so
+PLIST_FILES+= lib/rsyslog/omsnmp.so
.else
CONFIGURE_ARGS+=--disable-snmp
.endif
Modified: head/sysutils/rsyslog7/Makefile
==============================================================================
--- head/sysutils/rsyslog7/Makefile Thu Jun 26 14:09:06 2014 (r359354)
+++ head/sysutils/rsyslog7/Makefile Thu Jun 26 14:12:09 2014 (r359355)
@@ -40,10 +40,9 @@ USES= libtool pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDBI}
-LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
CONFIGURE_ARGS+=--enable-libdbi
-PLIST_FILES+= lib/rsyslog/omlibdbi.la \
- lib/rsyslog/omlibdbi.so
+PLIST_FILES+= lib/rsyslog/omlibdbi.so
.else
CONFIGURE_ARGS+=--disable-libdbi
.endif
@@ -51,19 +50,15 @@ CONFIGURE_ARGS+=--disable-libdbi
.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=--enable-gnutls
-PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \
- lib/rsyslog/lmnsd_gtls.so
+PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so
.else
CONFIGURE_ARGS+=--disable-gnutls
.endif
.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+=--enable-gssapi-krb5
-PLIST_FILES+= lib/rsyslog/imgssapi.la \
- lib/rsyslog/imgssapi.so \
- lib/rsyslog/lmgssutil.la \
+PLIST_FILES+= lib/rsyslog/imgssapi.so \
lib/rsyslog/lmgssutil.so \
- lib/rsyslog/omgssapi.la \
lib/rsyslog/omgssapi.so
.else
CONFIGURE_ARGS+=--disable-gssapi-krb5
@@ -72,8 +67,7 @@ CONFIGURE_ARGS+=--disable-gssapi-krb5
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
-PLIST_FILES+= lib/rsyslog/ommysql.so \
- lib/rsyslog/ommysql.la
+PLIST_FILES+= lib/rsyslog/ommysql.so
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
@@ -81,8 +75,7 @@ CONFIGURE_ARGS+=--disable-mysql
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
-PLIST_FILES+= lib/rsyslog/ompgsql.so \
- lib/rsyslog/ompgsql.la
+PLIST_FILES+= lib/rsyslog/ompgsql.so
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
@@ -90,9 +83,7 @@ CONFIGURE_ARGS+=--disable-pgsql
.if ${PORT_OPTIONS:MRELP}
LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp
CONFIGURE_ARGS+=--enable-relp
-PLIST_FILES+= lib/rsyslog/imrelp.la \
- lib/rsyslog/imrelp.so \
- lib/rsyslog/omrelp.la \
+PLIST_FILES+= lib/rsyslog/imrelp.so \
lib/rsyslog/omrelp.so
.else
CONFIGURE_ARGS+=--disable-relp
@@ -101,8 +92,7 @@ CONFIGURE_ARGS+=--disable-relp
.if ${PORT_OPTIONS:MRFC3195}
LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging
CONFIGURE_ARGS+=--enable-rfc3195
-PLIST_FILES+= lib/rsyslog/im3195.la \
- lib/rsyslog/im3195.so
+PLIST_FILES+= lib/rsyslog/im3195.so
.else
CONFIGURE_ARGS+=--disable-rfc3195
.endif
@@ -110,8 +100,7 @@ CONFIGURE_ARGS+=--disable-rfc3195
.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=--enable-snmp
-PLIST_FILES+= lib/rsyslog/omsnmp.la \
- lib/rsyslog/omsnmp.so
+PLIST_FILES+= lib/rsyslog/omsnmp.so
.else
CONFIGURE_ARGS+=--disable-snmp
.endif
Modified: head/sysutils/rsyslog8-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog8-devel/Makefile Thu Jun 26 14:09:06 2014 (r359354)
+++ head/sysutils/rsyslog8-devel/Makefile Thu Jun 26 14:12:09 2014 (r359355)
@@ -41,8 +41,7 @@ USES= libtool pkgconfig
.if ${PORT_OPTIONS:MDBI}
LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
CONFIGURE_ARGS+=--enable-libdbi
-PLIST_FILES+= lib/rsyslog/omlibdbi.la \
- lib/rsyslog/omlibdbi.so
+PLIST_FILES+= lib/rsyslog/omlibdbi.so
.else
CONFIGURE_ARGS+=--disable-libdbi
.endif
@@ -51,19 +50,15 @@ CONFIGURE_ARGS+=--disable-libdbi
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
CONFIGURE_ARGS+=--enable-gnutls
-PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \
- lib/rsyslog/lmnsd_gtls.so
+PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so
.else
CONFIGURE_ARGS+=--disable-gnutls
.endif
.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+=--enable-gssapi-krb5
-PLIST_FILES+= lib/rsyslog/imgssapi.la \
- lib/rsyslog/imgssapi.so \
- lib/rsyslog/lmgssutil.la \
+PLIST_FILES+= lib/rsyslog/imgssapi.so \
lib/rsyslog/lmgssutil.so \
- lib/rsyslog/omgssapi.la \
lib/rsyslog/omgssapi.so
.else
CONFIGURE_ARGS+=--disable-gssapi-krb5
@@ -72,8 +67,7 @@ CONFIGURE_ARGS+=--disable-gssapi-krb5
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
-PLIST_FILES+= lib/rsyslog/ommysql.so \
- lib/rsyslog/ommysql.la
+PLIST_FILES+= lib/rsyslog/ommysql.so
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
@@ -81,8 +75,7 @@ CONFIGURE_ARGS+=--disable-mysql
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
-PLIST_FILES+= lib/rsyslog/ompgsql.so \
- lib/rsyslog/ompgsql.la
+PLIST_FILES+= lib/rsyslog/ompgsql.so
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
@@ -90,9 +83,7 @@ CONFIGURE_ARGS+=--disable-pgsql
.if ${PORT_OPTIONS:MRELP}
LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp
CONFIGURE_ARGS+=--enable-relp
-PLIST_FILES+= lib/rsyslog/imrelp.la \
- lib/rsyslog/imrelp.so \
- lib/rsyslog/omrelp.la \
+PLIST_FILES+= lib/rsyslog/imrelp.so \
lib/rsyslog/omrelp.so
.else
CONFIGURE_ARGS+=--disable-relp
@@ -101,8 +92,7 @@ CONFIGURE_ARGS+=--disable-relp
.if ${PORT_OPTIONS:MRFC3195}
LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging
CONFIGURE_ARGS+=--enable-rfc3195
-PLIST_FILES+= lib/rsyslog/im3195.la \
- lib/rsyslog/im3195.so
+PLIST_FILES+= lib/rsyslog/im3195.so
.else
CONFIGURE_ARGS+=--disable-rfc3195
.endif
@@ -110,8 +100,7 @@ CONFIGURE_ARGS+=--disable-rfc3195
.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=--enable-snmp
-PLIST_FILES+= lib/rsyslog/omsnmp.la \
- lib/rsyslog/omsnmp.so
+PLIST_FILES+= lib/rsyslog/omsnmp.so
.else
CONFIGURE_ARGS+=--disable-snmp
.endif
Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile Thu Jun 26 14:09:06 2014 (r359354)
+++ head/sysutils/rsyslog8/Makefile Thu Jun 26 14:12:09 2014 (r359355)
@@ -41,8 +41,7 @@ USES= libtool pkgconfig
.if ${PORT_OPTIONS:MDBI}
LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
CONFIGURE_ARGS+=--enable-libdbi
-PLIST_FILES+= lib/rsyslog/omlibdbi.la \
- lib/rsyslog/omlibdbi.so
+PLIST_FILES+= lib/rsyslog/omlibdbi.so
.else
CONFIGURE_ARGS+=--disable-libdbi
.endif
@@ -51,19 +50,15 @@ CONFIGURE_ARGS+=--disable-libdbi
LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
CONFIGURE_ARGS+=--enable-gnutls
-PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \
- lib/rsyslog/lmnsd_gtls.so
+PLIST_FILES+= lib/rsyslog/lmnsd_gtls.so
.else
CONFIGURE_ARGS+=--disable-gnutls
.endif
.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+=--enable-gssapi-krb5
-PLIST_FILES+= lib/rsyslog/imgssapi.la \
- lib/rsyslog/imgssapi.so \
- lib/rsyslog/lmgssutil.la \
+PLIST_FILES+= lib/rsyslog/imgssapi.so \
lib/rsyslog/lmgssutil.so \
- lib/rsyslog/omgssapi.la \
lib/rsyslog/omgssapi.so
.else
CONFIGURE_ARGS+=--disable-gssapi-krb5
@@ -72,8 +67,7 @@ CONFIGURE_ARGS+=--disable-gssapi-krb5
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
-PLIST_FILES+= lib/rsyslog/ommysql.so \
- lib/rsyslog/ommysql.la
+PLIST_FILES+= lib/rsyslog/ommysql.so
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
@@ -81,8 +75,7 @@ CONFIGURE_ARGS+=--disable-mysql
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
-PLIST_FILES+= lib/rsyslog/ompgsql.so \
- lib/rsyslog/ompgsql.la
+PLIST_FILES+= lib/rsyslog/ompgsql.so
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
@@ -90,9 +83,7 @@ CONFIGURE_ARGS+=--disable-pgsql
.if ${PORT_OPTIONS:MRELP}
LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp
CONFIGURE_ARGS+=--enable-relp
-PLIST_FILES+= lib/rsyslog/imrelp.la \
- lib/rsyslog/imrelp.so \
- lib/rsyslog/omrelp.la \
+PLIST_FILES+= lib/rsyslog/imrelp.so \
lib/rsyslog/omrelp.so
.else
CONFIGURE_ARGS+=--disable-relp
@@ -101,8 +92,7 @@ CONFIGURE_ARGS+=--disable-relp
.if ${PORT_OPTIONS:MRFC3195}
LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging
CONFIGURE_ARGS+=--enable-rfc3195
-PLIST_FILES+= lib/rsyslog/im3195.la \
- lib/rsyslog/im3195.so
+PLIST_FILES+= lib/rsyslog/im3195.so
.else
CONFIGURE_ARGS+=--disable-rfc3195
.endif
@@ -110,8 +100,7 @@ CONFIGURE_ARGS+=--disable-rfc3195
.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+=--enable-snmp
-PLIST_FILES+= lib/rsyslog/omsnmp.la \
- lib/rsyslog/omsnmp.so
+PLIST_FILES+= lib/rsyslog/omsnmp.so
.else
CONFIGURE_ARGS+=--disable-snmp
.endif
More information about the svn-ports-all
mailing list