diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-03-22 20:13:47 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-03-22 20:13:47 +0000 |
| commit | d432f3bc600d4844ec44f8698b40a5e480f55b80 (patch) | |
| tree | d74758fae27b030c66aad751024fa5f35049eb84 | |
| parent | f225722fd79221535ee9d026ed9145c870df10c6 (diff) | |
| download | ports-d432f3bc600d4844ec44f8698b40a5e480f55b80.tar.gz ports-d432f3bc600d4844ec44f8698b40a5e480f55b80.zip | |
- Update to 4.1.4
PR: ports/131181
Submitted by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=230696
60 files changed, 354 insertions, 348 deletions
diff --git a/sysutils/rsyslog4-dbi/Makefile b/sysutils/rsyslog4-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog4-dbi/Makefile +++ b/sysutils/rsyslog4-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-dbi/Makefile b/sysutils/rsyslog4-devel-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog4-devel-dbi/Makefile +++ b/sysutils/rsyslog4-devel-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-gnutls/Makefile b/sysutils/rsyslog4-devel-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog4-devel-gnutls/Makefile +++ b/sysutils/rsyslog4-devel-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-gssapi/Makefile b/sysutils/rsyslog4-devel-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog4-devel-gssapi/Makefile +++ b/sysutils/rsyslog4-devel-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-mysql/Makefile b/sysutils/rsyslog4-devel-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog4-devel-mysql/Makefile +++ b/sysutils/rsyslog4-devel-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-pgsql/Makefile b/sysutils/rsyslog4-devel-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog4-devel-pgsql/Makefile +++ b/sysutils/rsyslog4-devel-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-relp/Makefile b/sysutils/rsyslog4-devel-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog4-devel-relp/Makefile +++ b/sysutils/rsyslog4-devel-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel-snmp/Makefile b/sysutils/rsyslog4-devel-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog4-devel-snmp/Makefile +++ b/sysutils/rsyslog4-devel-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-devel/Makefile b/sysutils/rsyslog4-devel/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog4-devel/Makefile +++ b/sysutils/rsyslog4-devel/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog4-devel/bsd.rsyslog.mk b/sysutils/rsyslog4-devel/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog4-devel/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog4-devel/distinfo b/sysutils/rsyslog4-devel/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog4-devel/distinfo +++ b/sysutils/rsyslog4-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 diff --git a/sysutils/rsyslog4-gnutls/Makefile b/sysutils/rsyslog4-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog4-gnutls/Makefile +++ b/sysutils/rsyslog4-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-gssapi/Makefile b/sysutils/rsyslog4-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog4-gssapi/Makefile +++ b/sysutils/rsyslog4-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-mysql/Makefile b/sysutils/rsyslog4-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog4-mysql/Makefile +++ b/sysutils/rsyslog4-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-pgsql/Makefile b/sysutils/rsyslog4-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog4-pgsql/Makefile +++ b/sysutils/rsyslog4-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-relp/Makefile b/sysutils/rsyslog4-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog4-relp/Makefile +++ b/sysutils/rsyslog4-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4-snmp/Makefile b/sysutils/rsyslog4-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog4-snmp/Makefile +++ b/sysutils/rsyslog4-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog4/Makefile b/sysutils/rsyslog4/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog4/Makefile +++ b/sysutils/rsyslog4/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog4/bsd.rsyslog.mk b/sysutils/rsyslog4/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog4/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog4/distinfo b/sysutils/rsyslog4/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog4/distinfo +++ b/sysutils/rsyslog4/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 diff --git a/sysutils/rsyslog5-dbi/Makefile b/sysutils/rsyslog5-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog5-dbi/Makefile +++ b/sysutils/rsyslog5-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-dbi/Makefile b/sysutils/rsyslog5-devel-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog5-devel-dbi/Makefile +++ b/sysutils/rsyslog5-devel-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-gnutls/Makefile b/sysutils/rsyslog5-devel-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog5-devel-gnutls/Makefile +++ b/sysutils/rsyslog5-devel-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-gssapi/Makefile b/sysutils/rsyslog5-devel-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog5-devel-gssapi/Makefile +++ b/sysutils/rsyslog5-devel-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-mysql/Makefile b/sysutils/rsyslog5-devel-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog5-devel-mysql/Makefile +++ b/sysutils/rsyslog5-devel-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-pgsql/Makefile b/sysutils/rsyslog5-devel-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog5-devel-pgsql/Makefile +++ b/sysutils/rsyslog5-devel-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-relp/Makefile b/sysutils/rsyslog5-devel-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog5-devel-relp/Makefile +++ b/sysutils/rsyslog5-devel-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel-snmp/Makefile b/sysutils/rsyslog5-devel-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog5-devel-snmp/Makefile +++ b/sysutils/rsyslog5-devel-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog5-devel/Makefile +++ b/sysutils/rsyslog5-devel/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog5-devel/bsd.rsyslog.mk b/sysutils/rsyslog5-devel/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog5-devel/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog5-devel/distinfo b/sysutils/rsyslog5-devel/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog5-devel/distinfo +++ b/sysutils/rsyslog5-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 diff --git a/sysutils/rsyslog5-gnutls/Makefile b/sysutils/rsyslog5-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog5-gnutls/Makefile +++ b/sysutils/rsyslog5-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-gssapi/Makefile b/sysutils/rsyslog5-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog5-gssapi/Makefile +++ b/sysutils/rsyslog5-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-mysql/Makefile b/sysutils/rsyslog5-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog5-mysql/Makefile +++ b/sysutils/rsyslog5-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-pgsql/Makefile b/sysutils/rsyslog5-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog5-pgsql/Makefile +++ b/sysutils/rsyslog5-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-relp/Makefile b/sysutils/rsyslog5-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog5-relp/Makefile +++ b/sysutils/rsyslog5-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5-snmp/Makefile b/sysutils/rsyslog5-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog5-snmp/Makefile +++ b/sysutils/rsyslog5-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog5/Makefile +++ b/sysutils/rsyslog5/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog5/bsd.rsyslog.mk b/sysutils/rsyslog5/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog5/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog5/distinfo b/sysutils/rsyslog5/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog5/distinfo +++ b/sysutils/rsyslog5/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 diff --git a/sysutils/rsyslog55-dbi/Makefile b/sysutils/rsyslog55-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog55-dbi/Makefile +++ b/sysutils/rsyslog55-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-gnutls/Makefile b/sysutils/rsyslog55-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog55-gnutls/Makefile +++ b/sysutils/rsyslog55-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-gssapi/Makefile b/sysutils/rsyslog55-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog55-gssapi/Makefile +++ b/sysutils/rsyslog55-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-mysql/Makefile b/sysutils/rsyslog55-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog55-mysql/Makefile +++ b/sysutils/rsyslog55-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-pgsql/Makefile b/sysutils/rsyslog55-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog55-pgsql/Makefile +++ b/sysutils/rsyslog55-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-relp/Makefile b/sysutils/rsyslog55-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog55-relp/Makefile +++ b/sysutils/rsyslog55-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55-snmp/Makefile b/sysutils/rsyslog55-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog55-snmp/Makefile +++ b/sysutils/rsyslog55-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog55/Makefile b/sysutils/rsyslog55/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog55/Makefile +++ b/sysutils/rsyslog55/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog55/bsd.rsyslog.mk b/sysutils/rsyslog55/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog55/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog55/distinfo b/sysutils/rsyslog55/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog55/distinfo +++ b/sysutils/rsyslog55/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 diff --git a/sysutils/rsyslog6-devel-dbi/Makefile b/sysutils/rsyslog6-devel-dbi/Makefile index 6c415fd8e0ac..d2df260c5123 100644 --- a/sysutils/rsyslog6-devel-dbi/Makefile +++ b/sysutils/rsyslog6-devel-dbi/Makefile @@ -5,12 +5,11 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ @@ -21,4 +20,5 @@ do-install: ${WRKSRC}/plugins/omlibdbi/.libs/omlibdbi.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omlibdbi/omlibdbi.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> + +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile index a3b75e607f06..e53a54b18762 100644 --- a/sysutils/rsyslog6-devel-gnutls/Makefile +++ b/sysutils/rsyslog6-devel-gnutls/Makefile @@ -6,12 +6,11 @@ # COMMENT= GNUTLS module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/runtime/.libs/lmnsd_gtls.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/runtime/lmnsd_gtls.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-gssapi/Makefile b/sysutils/rsyslog6-devel-gssapi/Makefile index e9bb7fae1e4e..e7a883f4f57b 100644 --- a/sysutils/rsyslog6-devel-gssapi/Makefile +++ b/sysutils/rsyslog6-devel-gssapi/Makefile @@ -6,16 +6,10 @@ # COMMENT= GSS API input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= gssapi -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -IGNORE= with gssapi module is only supported on FreeBSD 7.x or later -.endif - CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ @@ -38,4 +32,4 @@ do-install: ${WRKSRC}/.libs/lmgssutil.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/lmgssutil.la ${PREFIX}/lib/rsyslog -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-mysql/Makefile b/sysutils/rsyslog6-devel-mysql/Makefile index b79f1b0acb65..586d3222ff25 100644 --- a/sysutils/rsyslog6-devel-mysql/Makefile +++ b/sysutils/rsyslog6-devel-mysql/Makefile @@ -6,12 +6,11 @@ # COMMENT= MySQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= mysql USE_MYSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-mysql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql ${EXAMPLESDIR}/mysql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-pgsql/Makefile b/sysutils/rsyslog6-devel-pgsql/Makefile index 18bf4d0f723b..9ffdb409c8b3 100644 --- a/sysutils/rsyslog6-devel-pgsql/Makefile +++ b/sysutils/rsyslog6-devel-pgsql/Makefile @@ -6,12 +6,11 @@ # COMMENT= PostgreSQL output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= pgsql USE_PGSQL= yes -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-pgsql do-install: @@ -24,4 +23,4 @@ post-install: @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql ${EXAMPLESDIR}/pgsql_createDB.sql .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile index c1d976478c78..695f551c2557 100644 --- a/sysutils/rsyslog6-devel-relp/Makefile +++ b/sysutils/rsyslog6-devel-relp/Makefile @@ -6,13 +6,12 @@ # COMMENT= RELP input/output module for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= relp -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config +BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= relp.0:${PORTSDIR}/devel/librelp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ @@ -29,4 +28,4 @@ do-install: ${WRKSRC}/plugins/imrelp/.libs/imrelp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/imrelp/imrelp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel-snmp/Makefile b/sysutils/rsyslog6-devel-snmp/Makefile index b255830dd784..be7c95329280 100644 --- a/sysutils/rsyslog6-devel-snmp/Makefile +++ b/sysutils/rsyslog6-devel-snmp/Makefile @@ -6,12 +6,11 @@ # COMMENT= SNMP trap sender for rsyslog +MASTERDIR= ${.CURDIR}/../rsyslog4 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -.include "${.CURDIR}/../rsyslog4/bsd.rsyslog.mk" - CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ @@ -22,4 +21,4 @@ do-install: ${WRKSRC}/plugins/omsnmp/.libs/omsnmp.so ${PREFIX}/lib/rsyslog @${INSTALL_DATA} \ ${WRKSRC}/plugins/omsnmp/omsnmp.la ${PREFIX}/lib/rsyslog -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index 27c9f654f9e0..2c5fec163b5f 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -6,25 +6,44 @@ # PORTNAME= rsyslog -PORTVERSION= 4.1.3 +PORTVERSION= 4.1.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ +.ifdef MNAME +PKGNAMESUFFIX?= -${MNAME} +.endif MAINTAINER= cristianorolim@hotmail.com -COMMENT= Syslogd supporting SQL, TCP and TLS +COMMENT?= Syslogd supporting SQL, TCP and TLS -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 +.ifdef MNAME +RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 -CONFLICTS= rsyslog-[2-3].[0-9]* -USE_RC_SUBR= ${PORTNAME}d -SUB_FILES= pkg-message +PLIST= ${.CURDIR}/pkg-plist +.endif +CONFLICTS= rsyslog-[2-3].[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.ifndef MNAME +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate post-patch: @@ -46,5 +65,18 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} +.endif + +.ifdef MNAME + +.if ${MNAME} == "gssapi" && ${OSVERSION} < 700000 +IGNORE= with gssapi module is only supported on FreeBSD 7.x or later +.endif + +CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog + +DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog6-devel/bsd.rsyslog.mk b/sysutils/rsyslog6-devel/bsd.rsyslog.mk deleted file mode 100644 index 56f65a30417d..000000000000 --- a/sysutils/rsyslog6-devel/bsd.rsyslog.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME?= rsyslog -PORTVERSION?= 4.1.3 -CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= cristianorolim@hotmail.com - -CONFLICTS= rsyslog-[2-3].[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -.ifdef MNAME -PKGNAMESUFFIX?= -${MNAME} -CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -RUN_DEPENDS= rsyslog>=4:${PORTSDIR}/sysutils/rsyslog4 - -DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo -.endif diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo index ea1636588ace..a883c1b82a46 100644 --- a/sysutils/rsyslog6-devel/distinfo +++ b/sysutils/rsyslog6-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-4.1.3.tar.gz) = d598cbed2066321bd4b156300a39b9ed -SHA256 (rsyslog-4.1.3.tar.gz) = 5a2e139f47b41ed59828e7dc04df79837f23179eed6e83a948570fff40ace66d -SIZE (rsyslog-4.1.3.tar.gz) = 1349408 +MD5 (rsyslog-4.1.4.tar.gz) = 02132e48919be3b0f0464d7b192dbcc5 +SHA256 (rsyslog-4.1.4.tar.gz) = 4411cec54cf021b7518055e0193d0ac9d591f4ec833943a05676acf782cef425 +SIZE (rsyslog-4.1.4.tar.gz) = 1350013 |