Index: mail/Makefile =================================================================== --- mail/Makefile +++ mail/Makefile @@ -296,9 +296,18 @@ SUBDIR += opensmtpd-extras-filter-clamav SUBDIR += opensmtpd-extras-filter-dkim SUBDIR += opensmtpd-extras-filter-dnsbl + SUBDIR += opensmtpd-extras-filter-lua + SUBDIR += opensmtpd-extras-filter-monkey SUBDIR += opensmtpd-extras-filter-pause + SUBDIR += opensmtpd-extras-filter-perl + SUBDIR += opensmtpd-extras-filter-python SUBDIR += opensmtpd-extras-filter-regex SUBDIR += opensmtpd-extras-filter-spamassassin + SUBDIR += opensmtpd-extras-queue-python + SUBDIR += opensmtpd-extras-queue-ram + SUBDIR += opensmtpd-extras-scheduler-python + SUBDIR += opensmtpd-extras-scheduler-ram + SUBDIR += opensmtpd-extras-table-ldap SUBDIR += opensmtpd-extras-table-mysql SUBDIR += opensmtpd-extras-table-passwd SUBDIR += opensmtpd-extras-table-postgresql @@ -306,6 +315,7 @@ SUBDIR += opensmtpd-extras-table-redis SUBDIR += opensmtpd-extras-table-socketmap SUBDIR += opensmtpd-extras-table-sqlite + SUBDIR += opensmtpd-extras-tool-stats SUBDIR += openwebmail SUBDIR += osbf-lua SUBDIR += ovs Index: mail/opensmtpd-extras-filter-clamav/Makefile =================================================================== --- mail/opensmtpd-extras-filter-clamav/Makefile +++ mail/opensmtpd-extras-filter-clamav/Makefile @@ -1,20 +1,21 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-clamav +PKGNAMESUFFIX= -filter-clamav +PORTREVISION= 4 -COMMENT= Check messages with ClamAV in OpenSMTPD -MAINTAINER= adamw@FreeBSD.org +COMMENT= Check messages with ClamAV in OpenSMTPD +MAINTAINER= adamw@FreeBSD.org -RUN_DEPENDS= clamscan:security/clamav +RUN_DEPENDS= clamscan:security/clamav -PLIST_FILES= libexec/opensmtpd/filter-clamav \ +PLIST_FILES= libexec/opensmtpd/filter-clamav \ man/man8/filter-clamav.8.gz -CONFIGURE_ARGS+= --with-filter-clamav +CONFIGURE_ARGS+=--with-filter-clamav -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes # These have to be set at compile-time. These are the # defaults for ClamAV. Index: mail/opensmtpd-extras-filter-dkim/Makefile =================================================================== --- mail/opensmtpd-extras-filter-dkim/Makefile +++ mail/opensmtpd-extras-filter-dkim/Makefile @@ -1,17 +1,18 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-dkim +PKGNAMESUFFIX= -filter-dkim +PORTREVISION= 4 -COMMENT= DKIM-signing filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org +COMMENT= DKIM-signing filter for OpenSMTPD +MAINTAINER= adamw@FreeBSD.org -PLIST_FILES= libexec/opensmtpd/filter-dkim-signer \ - man/man8/filter-dkim-signer.8.gz +PLIST_FILES= libexec/opensmtpd/filter-dkim-signer \ + man/man8/filter-dkim-signer.8.gz -CONFIGURE_ARGS+= --with-filter-dkim-signer +CONFIGURE_ARGS+=--with-filter-dkim-signer -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes .include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-dnsbl/Makefile =================================================================== --- mail/opensmtpd-extras-filter-dnsbl/Makefile +++ mail/opensmtpd-extras-filter-dnsbl/Makefile @@ -1,19 +1,18 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-dnsbl +PKGNAMESUFFIX= -filter-dnsbl +PORTREVISION= 4 -COMMENT= DNSBL-checking filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org +COMMENT= DNSBL-checking filter for OpenSMTPD +MAINTAINER= adamw@FreeBSD.org -LIB_DEPENDS= libasr.so:dns/libasr +PLIST_FILES= libexec/opensmtpd/filter-dnsbl \ + man/man8/filter-dnsbl.8.gz -PLIST_FILES= libexec/opensmtpd/filter-dnsbl \ - man/man8/filter-dnsbl.8.gz +CONFIGURE_ARGS+=--with-filter-dnsbl -CONFIGURE_ARGS+= --with-filter-dnsbl +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes - .include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-lua/Makefile =================================================================== --- mail/opensmtpd-extras-filter-lua/Makefile +++ mail/opensmtpd-extras-filter-lua/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -filter-lua +PORTREVISION= 0 + +COMMENT= LUA-script filter support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/filter-lua + +CONFIGURE_ARGS+=--with-filter-lua --with-lua-type=lua-${LUA_VER} + +USES= lua pkgconfig + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-monkey/Makefile =================================================================== --- mail/opensmtpd-extras-filter-monkey/Makefile +++ mail/opensmtpd-extras-filter-monkey/Makefile @@ -0,0 +1,26 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -filter-monkey +PORTREVISION= 0 + +COMMENT= Arbitrary delay or reject filter for OpenSMTPD + +CONFIGURE_ARGS+=--with-filter-monkey + +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +post-patch: + @${REINPLACE_CMD} -e \ + 's|/etc/mail/filter-monkey.conf|${PREFIX}&|' \ + ${WRKSRC}/extras/wip/filters/filter-monkey/filter_monkey.c \ + ${WRKSRC}/extras/wip/filters/filter-monkey/filter-monkey.8 + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail + ${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-monkey/filter-monkey.conf \ + ${STAGEDIR}${PREFIX}/etc/mail/filter-monkey.conf.sample + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-monkey/pkg-plist =================================================================== --- mail/opensmtpd-extras-filter-monkey/pkg-plist +++ mail/opensmtpd-extras-filter-monkey/pkg-plist @@ -0,0 +1,4 @@ +@sample etc/mail/filter-monkey.conf.sample +libexec/opensmtpd/filter-monkey +man/man5/filter-monkey.conf.5.gz +man/man8/filter-monkey.8.gz Index: mail/opensmtpd-extras-filter-pause/Makefile =================================================================== --- mail/opensmtpd-extras-filter-pause/Makefile +++ mail/opensmtpd-extras-filter-pause/Makefile @@ -1,17 +1,18 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-pause +PKGNAMESUFFIX= -filter-pause +PORTREVISION= 4 -COMMENT= Pause incoming OpenSMTPD messages to reduce spam -MAINTAINER= adamw@FreeBSD.org +COMMENT= Pause incoming OpenSMTPD messages to reduce spam +MAINTAINER= adamw@FreeBSD.org -PLIST_FILES= libexec/opensmtpd/filter-pause \ - man/man8/filter-pause.8.gz +PLIST_FILES= libexec/opensmtpd/filter-pause \ + man/man8/filter-pause.8.gz -CONFIGURE_ARGS+= --with-filter-pause +CONFIGURE_ARGS+=--with-filter-pause -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes .include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-perl/Makefile =================================================================== --- mail/opensmtpd-extras-filter-perl/Makefile +++ mail/opensmtpd-extras-filter-perl/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -filter-perl +PORTREVISION= 0 + +COMMENT= Perl-script filter support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/filter-perl + +CONFIGURE_ARGS+=--with-filter-perl --with-perl-type=${perl_VERSION} + +USES= perl5 + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-python/Makefile =================================================================== --- mail/opensmtpd-extras-filter-python/Makefile +++ mail/opensmtpd-extras-filter-python/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -filter-python +PORTREVISION= 0 + +COMMENT= Python-script filter support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/filter-python + +CONFIGURE_ARGS+=--with-filter-python --with-python-type=${PYTHON_VERSION} + +USES= python pkgconfig + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-filter-regex/Makefile =================================================================== --- mail/opensmtpd-extras-filter-regex/Makefile +++ mail/opensmtpd-extras-filter-regex/Makefile @@ -1,16 +1,17 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-regex +PKGNAMESUFFIX= -filter-regex +PORTREVISION= 4 -COMMENT= Regular expression filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org +COMMENT= Regular expression filter for OpenSMTPD +MAINTAINER= adamw@FreeBSD.org -CONFIGURE_ARGS+= --with-filter-regex +CONFIGURE_ARGS+=--with-filter-regex -PLIST= ${.CURDIR}/pkg-plist -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes post-patch: @${REINPLACE_CMD} -e \ Index: mail/opensmtpd-extras-filter-spamassassin/Makefile =================================================================== --- mail/opensmtpd-extras-filter-spamassassin/Makefile +++ mail/opensmtpd-extras-filter-spamassassin/Makefile @@ -1,18 +1,19 @@ # Created by: Adam Weinberger # $FreeBSD$ -PKGNAMESUFFIX= -filter-spamassassin +PKGNAMESUFFIX= -filter-spamassassin +PORTREVISION= 4 -COMMENT= Spamassassin filter addon for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org +COMMENT= Spamassassin filter addon for OpenSMTPD +MAINTAINER= adamw@FreeBSD.org -PLIST_FILES= libexec/opensmtpd/filter-spamassassin \ - man/man8/filter-spamassassin.8.gz +PLIST_FILES= libexec/opensmtpd/filter-spamassassin \ + man/man8/filter-spamassassin.8.gz -CONFIGURE_ARGS+= --with-filter-spamassassin +CONFIGURE_ARGS+=--with-filter-spamassassin -MASTERDIR= ${.CURDIR}/../opensmtpd-extras -SLAVE_PORT= yes +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes # These have to be set at compile-time. These are the # defaults for spamassassin. Index: mail/opensmtpd-extras-queue-python/Makefile =================================================================== --- mail/opensmtpd-extras-queue-python/Makefile +++ mail/opensmtpd-extras-queue-python/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -queue-python +PORTREVISION= 0 + +COMMENT= Python queue support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/queue-python + +CONFIGURE_ARGS+=--with-queue-python --with-python-type=${PYTHON_VERSION} + +USES= python pkgconfig + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-queue-ram/Makefile =================================================================== --- mail/opensmtpd-extras-queue-ram/Makefile +++ mail/opensmtpd-extras-queue-ram/Makefile @@ -0,0 +1,16 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -queue-ram +PORTREVISION= 0 + +COMMENT= RAM queue support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/queue-ram + +CONFIGURE_ARGS+=--with-queue-ram + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-scheduler-python/Makefile =================================================================== --- mail/opensmtpd-extras-scheduler-python/Makefile +++ mail/opensmtpd-extras-scheduler-python/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -scheduler-python +PORTREVISION= 0 + +COMMENT= Python scheduler support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/scheduler-python + +CONFIGURE_ARGS+=--with-scheduler-python --with-python-type=${PYTHON_VERSION} + +USES= python pkgconfig + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-scheduler-ram/Makefile =================================================================== --- mail/opensmtpd-extras-scheduler-ram/Makefile +++ mail/opensmtpd-extras-scheduler-ram/Makefile @@ -0,0 +1,16 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -scheduler-ram +PORTREVISION= 0 + +COMMENT= RAM scheduler support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/scheduler-ram + +CONFIGURE_ARGS+=--with-scheduler-ram + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-table-ldap/Makefile =================================================================== --- mail/opensmtpd-extras-table-ldap/Makefile +++ mail/opensmtpd-extras-table-ldap/Makefile @@ -0,0 +1,18 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -table-ldap +PORTREVISION= 0 + +COMMENT= LDAP table support for OpenSMTPD + +PLIST_FILES= libexec/opensmtpd/table-ldap + +CONFIGURE_ARGS+=--with-table-ldap + +USE_OPENLDAP= client + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile" Index: mail/opensmtpd-extras-table-mysql/Makefile =================================================================== --- mail/opensmtpd-extras-table-mysql/Makefile +++ mail/opensmtpd-extras-table-mysql/Makefile @@ -2,12 +2,14 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-mysql +PORTREVISION= 4 -COMMENT= MySQL table support for opensmtpd +COMMENT= MySQL table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-mysql -CONFIGURE_ARGS= --with-table-mysql +CONFIGURE_ARGS+=--with-table-mysql +CFLAGS+= -I${LOCALBASE}/include/mysql LDFLAGS+= -L${LOCALBASE}/lib/mysql USE_MYSQL= client Index: mail/opensmtpd-extras-table-passwd/Makefile =================================================================== --- mail/opensmtpd-extras-table-passwd/Makefile +++ mail/opensmtpd-extras-table-passwd/Makefile @@ -2,13 +2,14 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-passwd +PORTREVISION= 4 -COMMENT= passwd(5) table support for opensmtpd +COMMENT= passwd(5) table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-passwd \ man/man5/table-passwd.5.gz -CONFIGURE_ARGS= --with-table-passwd +CONFIGURE_ARGS+=--with-table-passwd LDFLAGS+= -L${LOCALBASE}/lib/mysql MASTERDIR= ${.CURDIR}/../opensmtpd-extras Index: mail/opensmtpd-extras-table-postgresql/Makefile =================================================================== --- mail/opensmtpd-extras-table-postgresql/Makefile +++ mail/opensmtpd-extras-table-postgresql/Makefile @@ -2,12 +2,13 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-postgresql +PORTREVISION= 4 -COMMENT= PostgreSQL table support for opensmtpd +COMMENT= PostgreSQL table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-postgres -CONFIGURE_ARGS= --with-table-postgres +CONFIGURE_ARGS+=--with-table-postgres USES= pgsql Index: mail/opensmtpd-extras-table-python/Makefile =================================================================== --- mail/opensmtpd-extras-table-python/Makefile +++ mail/opensmtpd-extras-table-python/Makefile @@ -2,14 +2,15 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-python +PORTREVISION= 5 -COMMENT= Python table support for opensmtpd +COMMENT= Python table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-python -CONFIGURE_ARGS= --with-table-python --with-python-type=${PYTHON_VERSION} +CONFIGURE_ARGS+=--with-table-python --with-python-type=${PYTHON_VERSION} -USES= python +USES= python pkgconfig MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes Index: mail/opensmtpd-extras-table-redis/Makefile =================================================================== --- mail/opensmtpd-extras-table-redis/Makefile +++ mail/opensmtpd-extras-table-redis/Makefile @@ -2,15 +2,16 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-redis +PORTREVISION= 4 -COMMENT= Redis table support for opensmtpd +COMMENT= Redis table support for OpenSMTPD LIB_DEPENDS= libhiredis.so:databases/hiredis PLIST_FILES= libexec/opensmtpd/table-redis \ - man/man5/table-redis.5.gz + man/man5/table-redis.5.gz -CONFIGURE_ARGS= --with-table-redis +CONFIGURE_ARGS+=--with-table-redis CONFIGURE_ENV= REDIS_CONFIG=${LOCALBASE}/bin/pkgconf CFLAGS+= -I${LOCALBASE}/include/hiredis Index: mail/opensmtpd-extras-table-socketmap/Makefile =================================================================== --- mail/opensmtpd-extras-table-socketmap/Makefile +++ mail/opensmtpd-extras-table-socketmap/Makefile @@ -2,13 +2,14 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-socketmap +PORTREVISION= 4 -COMMENT= Socketmap table support for opensmtpd +COMMENT= Socketmap table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-socketmap \ man/man5/table-socketmap.5.gz -CONFIGURE_ARGS= --with-table-socketmap +CONFIGURE_ARGS+=--with-table-socketmap MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes Index: mail/opensmtpd-extras-table-sqlite/Makefile =================================================================== --- mail/opensmtpd-extras-table-sqlite/Makefile +++ mail/opensmtpd-extras-table-sqlite/Makefile @@ -2,15 +2,16 @@ # $FreeBSD$ PKGNAMESUFFIX= -table-sqlite +PORTREVISION= 4 -COMMENT= SQLite table support for opensmtpd +COMMENT= SQLite table support for OpenSMTPD PLIST_FILES= libexec/opensmtpd/table-sqlite \ man/man5/table-sqlite.5.gz -CONFIGURE_ARGS= --with-table-sqlite +CONFIGURE_ARGS+=--with-table-sqlite -USES= sqlite +USES= sqlite pkgconfig MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes Index: mail/opensmtpd-extras-tool-stats/Makefile =================================================================== --- mail/opensmtpd-extras-tool-stats/Makefile +++ mail/opensmtpd-extras-tool-stats/Makefile @@ -0,0 +1,17 @@ +# Created by: fluffy +# $FreeBSD$ + +PKGNAMESUFFIX= -tool-stats +PORTREVISION= 0 + +COMMENT= Statistics tool for OpenSMTPD + +PLIST_FILES= bin/tool-stats \ + man/man8/tool-stats.8.gz + +CONFIGURE_ARGS+=--with-tool-stats + +MASTERDIR= ${.CURDIR}/../opensmtpd-extras +SLAVE_PORT= yes + +.include "${MASTERDIR}/Makefile"