On Wed, Nov 25, 2015 at 02:23:47PM +0100, Joerg Jung wrote:
>
> please find below an update for opensmtpd-extras to the most recent
> snapshot. This also now installs table-ldap, table-passwd, and
> table-sqlite which are likely going to be removed from base soon.
Please find below a tweaked diff after some input from Giovanni.
OK?
Regards,
Joerg
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 19 Jan 2015 14:08:02 -0000 1.4
+++ Makefile 26 Nov 2015 11:01:08 -0000
@@ -1,52 +1,143 @@
# $OpenBSD: Makefile,v 1.4 2015/01/19 14:08:02 giovanni Exp $
-COMMENT-main= extra tools for OpenSMTPD
-COMMENT-python= Python bindings for OpenSMTPD
-COMMENT-mysql= OpenSMTPD authentication support for MySQL
-COMMENT-pgsql= OpenSMTPD authentication support for PostgreSQL
-
-V= 20150119
-DISTNAME= OpenSMTPD-extras-${V}
-PKGNAME-main= ${DISTNAME:L}
-PKGNAME-mysql= opensmtpd-extras-mysql-${V}
-PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
-PKGNAME-python= opensmtpd-extras-python-${V}
-CATEGORIES= mail
-
-HOMEPAGE= http://www.opensmtpd.org/
-
-MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
-
-GH_PROJECT= OpenSMTPD-extras
-GH_ACCOUNT= OpenSMTPD
-GH_COMMIT= a9cc8a03f6ae16008d23f766d621192a52c59893
+COMMENT-main= extras for smtpd
+COMMENT-clamav= extras with clamav support for smtpd
+COMMENT-lua= extras with lua bindings for smtpd
+COMMENT-mysql= mysql based smtpd table support
+COMMENT-pgsql= postgresql based smtpd table support
+COMMENT-python= extras with python bindings for smtpd
+COMMENT-redis= redis based smtpd table support
+COMMENT-spamassassin= extras with spamassassin support for smtpd
+
+V= 201511230108
+DISTNAME= opensmtpd-extras-${V}
+PKGNAME-main= ${DISTNAME}
+PKGNAME-clamav= opensmtpd-extras-clamav-${V}
+PKGNAME-lua= opensmtpd-extras-lua-${V}
+PKGNAME-mysql= opensmtpd-extras-mysql-${V}
+PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
+PKGNAME-python= opensmtpd-extras-python-${V}
+PKGNAME-redis= opensmtpd-extras-redis-${V}
+PKGNAME-spamassassin= opensmtpd-extras-spamassassin-${V}
+
+CATEGORIES= mail
-MULTI_PACKAGES= -main -mysql -pgsql -python
+HOMEPAGE= https://www.opensmtpd.org/
-PREFIX= /usr
+MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
+
+MULTI_PACKAGES= -main -clamav -lua -mysql -pgsql -python -redis
\
+ -spamassassin
+
+PREFIX= /usr
# BSD
PERMIT_PACKAGE_CDROM= Yes
-MODULES= lang/python
-CONFIGURE_STYLE= none
-
+WANTLIB= c crypto event ssl m util sqlite3 perl
+WANTLIB-clamav= c crypto event ssl
+WANTLIB-lua= c crypto event ssl m ${MODLUA_WANTLIB}
+WANTLIB-mysql= c crypto event ssl m z pthread stdc++ mysqlclient
+WANTLIB-pgsql= c crypto event ssl pq
+WANTLIB-python= c crypto event ssl m util pthread
${MODPY_WANTLIB}
+WANTLIB-redis= c crypto event ssl hiredis
+WANTLIB-spamassassin= c crypto event ssl
+
+MASTER_SITES= ${HOMEPAGE}archives/
+
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-mysql= databases/mariadb,-main
LIB_DEPENDS-pgsql= databases/postgresql,-main
-
-WANTLIB-main= c util
-WANTLIB-mysql= c mysqlclient pthread util
-WANTLIB-pgsql= c pq util
-WANTLIB-python= c ${MODPY_WANTLIB} pthread util
-
-MODPY_RUNDEP= No
+LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS}
+LIB_DEPENDS-redis= databases/libhiredis
+RUN_DEPENDS-clamav= security/clamav
+RUN_DEPENDS-lua= ${MODLUA_RUN_DEPENDS}
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
+RUN_DEPENDS-spamassassin=\
+ mail/p5-Mail-SpamAssassin
-WRKDIST= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}/extras
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --bindir=${LOCALBASE}/bin \
+ --sbindir=${LOCALBASE}/sbin \
+ --mandir=${LOCALBASE}/man \
+ --libexecdir=${PREFIX}/libexec \
+ --sysconfdir=${SYSCONFDIR} \
+ --with-cppflags="${CFLAGS} -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/postgresql" \
+ --with-filter-dkim-signer \
+ --with-filter-dnsbl \
+ --with-filter-monkey \
+ --with-filter-pause \
+ --with-filter-perl \
+ --with-filter-regex \
+ --with-filter-stub \
+ --with-filter-trace \
+ --with-filter-void \
+ --with-queue-null \
+ --with-queue-ram \
+ --with-queue-stub \
+ --with-scheduler-ram \
+ --with-scheduler-stub \
+ --with-table-ldap \
+ --with-table-passwd \
+ --with-table-socketmap \
+ --with-table-sqlite \
+ --with-table-stub
+
+.include <bsd.port.arch.mk>
+
+.if ${BUILD_PACKAGES:M-clamav}
+CONFIGURE_ARGS+= --with-filter-clamav
+.endif
+
+.if ${BUILD_PACKAGES:M-lua}
+MODULES+= lang/lua
+CONFIGURE_ARGS+= --with-filter-lua \
+ --with-lua-type=lua${MODLUA_VERSION:S/.//g}
+.endif
+
+.if ${BUILD_PACKAGES:M-mysql}
+CONFIGURE_ARGS+= --with-table-mysql
+.endif
+
+.if ${BUILD_PACKAGES:M-pgsql}
+CONFIGURE_ARGS+= --with-table-postgres
+.endif
+
+.if ${BUILD_PACKAGES:M-python}
+MODULES+= lang/python
+CONFIGURE_ARGS+= --with-filter-python \
+ --with-queue-python \
+ --with-scheduler-python \
+ --with-table-python \
+ --with-python-type=python${MODPY_VERSION}
+.endif
+
+.if ${BUILD_PACKAGES:M-redis}
+CONFIGURE_ARGS+= --with-table-redis
+.endif
+
+.if ${BUILD_PACKAGES:M-spamassassin}
+CONFIGURE_ARGS+= --with-filter-spamassassin
+.endif
NO_TEST= Yes
-pre-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/smtpd
+pre-configure:
+ cd ${WRKSRC} && \
+ env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh ./bootstrap
+
+post-install:
+ ${INSTALL_DATA_DIR} \
+
${DESTDIR}/${LOCALBASE}/share/examples/opensmtpd-extras
+ cd ${WRKSRC} && ${INSTALL_DATA} \
+ extras/wip/filters/filter-regex/filter-regex.conf \
+
${DESTDIR}/${LOCALBASE}/share/examples/opensmtpd-extras
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 19 Jan 2015 14:08:02 -0000 1.3
+++ distinfo 26 Nov 2015 11:01:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (OpenSMTPD-extras-20150119.tar.gz) =
02CBxl8x/KZV8dER1S1g9toOcdsa8jB89kWU0BP8kpc=
-SIZE (OpenSMTPD-extras-20150119.tar.gz) = 80062
+SHA256 (opensmtpd-extras-201511230108.tar.gz) =
Fk1HyCdgW8gJf041KevKb0sfAouFb6Gr9DL0iHI/5us=
+SIZE (opensmtpd-extras-201511230108.tar.gz) = 135743
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+todo: configure argument --mandir is not picked up correctly,
+ therefore the mandir patch below
+
+python_type argument already submitted as pull-request to upstream
+
+--- configure.ac.orig Mon Nov 23 01:07:54 2015
++++ configure.ac Wed Nov 25 13:39:36 2015
+@@ -943,6 +943,9 @@ AC_ARG_ENABLE([strip],
+ AC_SUBST([STRIP_OPT])
+ #l4054
+
++mandir="/usr/local/man"
++AC_SUBST([mandir])
++
+ #l4176 (customized s/ssh.1/smtpd/smtpd.8/)
+ # Options from here on. Some of these are preset by platform above
+ AC_ARG_WITH([mantype],
+@@ -1411,6 +1414,14 @@ AC_ARG_WITH([python],
+ fi
+ ]
+ )
++AC_ARG_WITH([python-type],
++ [ --with-python-type=PATH Specify the type of python used ],
++ [
++ if test "x$withval" != "xno" ; then
++ python_type="${withval}"
++ fi
++ ]
++)
+
+ AC_ARG_WITH([perl],
+ [ --with-perl=PATH Specify prefix of perl installation ],
+@@ -1446,16 +1457,19 @@ PYTHON_CPPFLAGS=
+ PYTHON_LDFLAGS=
+ if test x"${need_python}" = x"yes"; then
+ PYTHON_CONFIG=
++ if test x"${python_type}" = x""; then
++ python_type="python"
++ fi
+ for path in /usr/local/bin /usr/bin; do
+- if test -f ${path}/python-config; then
+- PYTHON_CONFIG=${path}/python-config
++ if test -f ${path}/${python_type}-config; then
++ PYTHON_CONFIG=${path}/${python_type}-config
+ break
+ fi
+ done
+
+ # if python provided --with-python, override
+ if test x"${with_python}" != x""; then
+- PYTHON_CONFIG="${python_prefix}/bin/python-config"
++ PYTHON_CONFIG="${python_prefix}/bin/${python_type}-config"
+ fi
+
+ if ! test -f $PYTHON_CONFIG; then
Index: patches/patch-extras_wip_tables_table-ldap_ber_c
===================================================================
RCS file: patches/patch-extras_wip_tables_table-ldap_ber_c
diff -N patches/patch-extras_wip_tables_table-ldap_ber_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-extras_wip_tables_table-ldap_ber_c 26 Nov 2015 11:01:08
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+already submitted and merged in upstream, can be removed with next version
+
+--- extras/wip/tables/table-ldap/ber.c.orig Tue Nov 24 10:42:32 2015
++++ extras/wip/tables/table-ldap/ber.c Tue Nov 24 10:24:25 2015
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include <err.h> /* XXX for debug output */
+ #include <stdio.h> /* XXX for debug output */
+-#include <strings.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+
Index: patches/patch-filters_Makefile_inc
===================================================================
RCS file: patches/patch-filters_Makefile_inc
diff -N patches/patch-filters_Makefile_inc
--- patches/patch-filters_Makefile_inc 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-filters_Makefile_inc,v 1.1.1.1 2014/09/30 18:17:09 giovanni
Exp $
---- filters/Makefile.inc.orig Fri Aug 8 15:52:21 2014
-+++ filters/Makefile.inc Fri Aug 8 15:52:46 2014
-@@ -13,6 +13,6 @@ CFLAGS+= -I${.CURDIR}/../../api
- DPADD+= ${LIBUTIL} ${LIBEVENT}
- LDADD+= ${LIBUTIL} ${LIBEVENT}
-
--BINDIR = /usr/libexec/smtpd
-+BINDIR = ${TRUEPREFIX}/libexec/smtpd
-
- NOMAN = noman
Index: patches/patch-queues_Makefile_inc
===================================================================
RCS file: patches/patch-queues_Makefile_inc
diff -N patches/patch-queues_Makefile_inc
--- patches/patch-queues_Makefile_inc 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-queues_Makefile_inc,v 1.1.1.1 2014/09/30 18:17:09 giovanni Exp
$
---- queues/Makefile.inc.orig Fri Aug 8 15:59:34 2014
-+++ queues/Makefile.inc Fri Aug 8 15:59:49 2014
-@@ -1,6 +1,6 @@
- .PATH: ${.CURDIR}/../../api
-
--BINDIR=/usr/libexec/smtpd
-+BINDIR=${TRUEPREFIX}/libexec/smtpd
-
- SRCS+= log.c
- SRCS+= tree.c
Index: patches/patch-schedulers_Makefile_inc
===================================================================
RCS file: patches/patch-schedulers_Makefile_inc
diff -N patches/patch-schedulers_Makefile_inc
--- patches/patch-schedulers_Makefile_inc 30 Sep 2014 18:17:09 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-schedulers_Makefile_inc,v 1.1.1.1 2014/09/30 18:17:09 giovanni
Exp $
---- schedulers/Makefile.inc.orig Fri Aug 8 16:00:08 2014
-+++ schedulers/Makefile.inc Fri Aug 8 16:00:27 2014
-@@ -15,4 +15,4 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
- CFLAGS+= -Wsign-compare -Wbounded
- #CFLAGS+= -Werror # during development phase (breaks some archs)
-
--BINDIR = /usr/libexec/smtpd
-+BINDIR = ${TRUEPREFIX}/libexec/smtpd
Index: patches/patch-tables_Makefile_inc
===================================================================
RCS file: patches/patch-tables_Makefile_inc
diff -N patches/patch-tables_Makefile_inc
--- patches/patch-tables_Makefile_inc 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tables_Makefile_inc,v 1.1.1.1 2014/09/30 18:17:09 giovanni Exp
$
---- tables/Makefile.inc.orig Fri Aug 8 16:00:37 2014
-+++ tables/Makefile.inc Fri Aug 8 16:00:52 2014
-@@ -5,7 +5,7 @@ SRCS+= dict.c
- SRCS+= log.c
- NOMAN= noman
-
--BINDIR= /usr/libexec/smtpd
-+BINDIR= ${TRUEPREFIX}/libexec/smtpd
-
- DPADD+= ${LIBUTIL}
- LDADD+= -lutil
Index: pkg/DESCR-clamav
===================================================================
RCS file: pkg/DESCR-clamav
diff -N pkg/DESCR-clamav
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-clamav 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1 @@
+Extras with Clam AntiVirus support for OpenSMTPD.
Index: pkg/DESCR-lua
===================================================================
RCS file: pkg/DESCR-lua
diff -N pkg/DESCR-lua
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-lua 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1 @@
+Extras with Lua bindings for OpenSMTPD.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/DESCR-main 26 Nov 2015 11:01:08 -0000
@@ -1,3 +1 @@
-Extra tools for OpenSMTPD:
- * Null and RAM-only queues
- * Stub and socket-based table implementations
+Extras for OpenSMTPD, including several filters, queues, schedulers and tables.
Index: pkg/DESCR-mysql
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/DESCR-mysql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-mysql
--- pkg/DESCR-mysql 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/DESCR-mysql 26 Nov 2015 11:01:08 -0000
@@ -1 +1 @@
-OpenSMTPD authentication support for MySQL.
+MySQL based OpenSMTPD table.
Index: pkg/DESCR-pgsql
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/DESCR-pgsql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-pgsql
--- pkg/DESCR-pgsql 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/DESCR-pgsql 26 Nov 2015 11:01:08 -0000
@@ -1 +1 @@
-OpenSMTPD authentication support for PostgreSQL.
+PostgreSQL based OpenSMTPD table.
Index: pkg/DESCR-python
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/DESCR-python,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-python
--- pkg/DESCR-python 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/DESCR-python 26 Nov 2015 11:01:08 -0000
@@ -1 +1 @@
-Python bindings for OpenSMTPD.
+Extras with Python bindings for OpenSMTPD.
Index: pkg/DESCR-redis
===================================================================
RCS file: pkg/DESCR-redis
diff -N pkg/DESCR-redis
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-redis 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1 @@
+Redis based OpenSMTPD table.
Index: pkg/DESCR-spamassassin
===================================================================
RCS file: pkg/DESCR-spamassassin
diff -N pkg/DESCR-spamassassin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-spamassassin 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1 @@
+Extras with SpamAssassin support for OpenSMTPD.
Index: pkg/PLIST-clamav
===================================================================
RCS file: pkg/PLIST-clamav
diff -N pkg/PLIST-clamav
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-clamav 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@bin libexec/smtpd/filter-clamav
+@man local/man/man8/filter-clamav.8
Index: pkg/PLIST-lua
===================================================================
RCS file: pkg/PLIST-lua
diff -N pkg/PLIST-lua
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-lua 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@bin libexec/smtpd/filter-lua
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/PLIST-main 26 Nov 2015 11:01:08 -0000
@@ -1,17 +1,36 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2014/09/30 18:17:09 giovanni Exp $
-@comment @bin libexec/smtpd/filter-dkim-signer
-@comment @bin libexec/smtpd/filter-dnsbl
-@comment @bin libexec/smtpd/filter-monkey
-@comment @bin libexec/smtpd/filter-perl
-@comment @bin libexec/smtpd/filter-stub
-@comment @bin libexec/smtpd/filter-trace
-@comment @bin libexec/smtpd/filter-void
+@comment $OpenBSD$
+@bin libexec/smtpd/filter-dkim-signer
+@bin libexec/smtpd/filter-dnsbl
+@bin libexec/smtpd/filter-monkey
+@bin libexec/smtpd/filter-pause
+@bin libexec/smtpd/filter-perl
+@bin libexec/smtpd/filter-regex
+@bin libexec/smtpd/filter-stub
+@bin libexec/smtpd/filter-trace
+@bin libexec/smtpd/filter-void
@bin libexec/smtpd/queue-null
@bin libexec/smtpd/queue-ram
-@comment @bin libexec/smtpd/scheduler-ram
-@comment @bin libexec/smtpd/scheduler-stub
-@comment @bin libexec/smtpd/table-ldap
-@comment @bin libexec/smtpd/table-passwd
+@bin libexec/smtpd/queue-stub
+@bin libexec/smtpd/scheduler-ram
+@bin libexec/smtpd/scheduler-stub
+@bin libexec/smtpd/table-ldap
+@bin libexec/smtpd/table-passwd
@bin libexec/smtpd/table-socketmap
-@comment @bin libexec/smtpd/table-sqlite
+@bin libexec/smtpd/table-sqlite
@bin libexec/smtpd/table-stub
+@man local/man/man3/filter_api.3
+@man local/man/man5/filter-regex.conf.5
+@man local/man/man5/table_passwd.5
+@man local/man/man5/table_socketmap.5
+@man local/man/man5/table_sqlite.5
+@man local/man/man8/filter-dkim-signer.8
+@man local/man/man8/filter-dnsbl.8
+@man local/man/man8/filter-monkey.8
+@man local/man/man8/filter-pause.8
+@man local/man/man8/filter-regex.8
+@man local/man/man8/filter-stub.8
+@man local/man/man8/filter-trace.8
+@man local/man/man8/filter-void.8
+local/share/examples/opensmtpd-extras/
+local/share/examples/opensmtpd-extras/filter-regex.conf
+@sample ${SYSCONFDIR}/mail/filter-regex.conf
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-extras/pkg/PLIST-python,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-python
--- pkg/PLIST-python 30 Sep 2014 18:17:09 -0000 1.1.1.1
+++ pkg/PLIST-python 26 Nov 2015 11:01:08 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-python,v 1.1.1.1 2014/09/30 18:17:09 giovanni Exp $
-@comment @bin libexec/smtpd/filter-python
+@bin libexec/smtpd/filter-python
@bin libexec/smtpd/queue-python
-@comment @bin libexec/smtpd/scheduler-python
+@bin libexec/smtpd/scheduler-python
@bin libexec/smtpd/table-python
Index: pkg/PLIST-redis
===================================================================
RCS file: pkg/PLIST-redis
diff -N pkg/PLIST-redis
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-redis 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@bin libexec/smtpd/table-redis
+@man local/man/man5/table_redis.5
Index: pkg/PLIST-spamassassin
===================================================================
RCS file: pkg/PLIST-spamassassin
diff -N pkg/PLIST-spamassassin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-spamassassin 26 Nov 2015 11:01:08 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@bin libexec/smtpd/filter-spamassassin
+@man local/man/man8/filter-spamassassin.8
