sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unconditionally define PORTREVISION in subports

Browse source 
to skip unneccessary bump slaves by master port touching
- Pass master's CONFIGURE_ARGS to slaves
- Option to select mail/opensmtpd[-devel] as build/run dependency
    (and corresponding libasr via this)
- Pass pkgconfig dependency only to subports which need it.
- Adjust dependencies in subports

Submitted by:	myself
Reviewed by:	adamw, gahr
Approved by:	adamw, gahr, miwi (mentor, implicit)
Sponsored by:	milk and cookies
Differential Revision:	https://reviews.freebsd.org/D6607
This commit is contained in:
Dima Panov 2016-05-27 18:29:53 +00:00
parent e728417c0b
commit e1a0c39c75
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=415954
14 changed files with 58 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/opensmtpd-extras-filter-clamav/Makefile
View file

@ -2,10 +2,13 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-clamav PKGNAMESUFFIX= -filter-clamav
PORTREVISION= 1
COMMENT= Check messages with ClamAV in OpenSMTPD COMMENT= Check messages with ClamAV in OpenSMTPD
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org
RUN_DEPENDS= clamscan:security/clamav
PLIST_FILES= libexec/opensmtpd/filter-clamav \ PLIST_FILES= libexec/opensmtpd/filter-clamav \
man/man8/filter-clamav.8.gz man/man8/filter-clamav.8.gz

1
mail/opensmtpd-extras-filter-dkim/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-dkim PKGNAMESUFFIX= -filter-dkim
PORTREVISION= 1
COMMENT= DKIM-signing filter for OpenSMTPD COMMENT= DKIM-signing filter for OpenSMTPD
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org

3
mail/opensmtpd-extras-filter-dnsbl/Makefile
View file

@ -2,12 +2,11 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-dnsbl PKGNAMESUFFIX= -filter-dnsbl
PORTREVISION= 1
COMMENT= DNSBL-checking filter for OpenSMTPD COMMENT= DNSBL-checking filter for OpenSMTPD
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org
LIB_DEPENDS= libasr.so:dns/libasr
PLIST_FILES= libexec/opensmtpd/filter-dnsbl \ PLIST_FILES= libexec/opensmtpd/filter-dnsbl \
man/man8/filter-dnsbl.8.gz man/man8/filter-dnsbl.8.gz

1
mail/opensmtpd-extras-filter-pause/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-pause PKGNAMESUFFIX= -filter-pause
PORTREVISION= 1
COMMENT= Pause incoming OpenSMTPD messages to reduce spam COMMENT= Pause incoming OpenSMTPD messages to reduce spam
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org

1
mail/opensmtpd-extras-filter-regex/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-regex PKGNAMESUFFIX= -filter-regex
PORTREVISION= 1
COMMENT= Regular expression filter for OpenSMTPD COMMENT= Regular expression filter for OpenSMTPD
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org

1
mail/opensmtpd-extras-filter-spamassassin/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -filter-spamassassin PKGNAMESUFFIX= -filter-spamassassin
PORTREVISION= 1
COMMENT= Spamassassin filter addon for OpenSMTPD COMMENT= Spamassassin filter addon for OpenSMTPD
MAINTAINER= adamw@FreeBSD.org MAINTAINER= adamw@FreeBSD.org

6
mail/opensmtpd-extras-table-mysql/Makefile
View file

@ -2,12 +2,14 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-mysql PKGNAMESUFFIX= -table-mysql
PORTREVISION= 1
COMMENT= MySQL table support for opensmtpd COMMENT= MySQL table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-mysql 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 LDFLAGS+= -L${LOCALBASE}/lib/mysql
USES= mysql USES= mysql

6
mail/opensmtpd-extras-table-passwd/Makefile
View file

@ -2,14 +2,14 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-passwd PKGNAMESUFFIX= -table-passwd
PORTREVISION= 1
COMMENT= passwd(5) table support for opensmtpd COMMENT= passwd(5) table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-passwd \ PLIST_FILES= libexec/opensmtpd/table-passwd \
man/man5/table-passwd.5.gz 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 MASTERDIR= ${.CURDIR}/../opensmtpd-extras
SLAVE_PORT= yes SLAVE_PORT= yes

5
mail/opensmtpd-extras-table-postgresql/Makefile
View file

@ -2,12 +2,13 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-postgresql PKGNAMESUFFIX= -table-postgresql
PORTREVISION= 1
COMMENT= PostgreSQL table support for opensmtpd COMMENT= PostgreSQL table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-postgres PLIST_FILES= libexec/opensmtpd/table-postgres
CONFIGURE_ARGS= --with-table-postgres CONFIGURE_ARGS+= --with-table-postgres
USES= pgsql USES= pgsql

7
mail/opensmtpd-extras-table-python/Makefile
View file

@ -2,14 +2,15 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-python PKGNAMESUFFIX= -table-python
PORTREVISION= 1
COMMENT= Python table support for opensmtpd COMMENT= Python table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-python 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 MASTERDIR= ${.CURDIR}/../opensmtpd-extras
SLAVE_PORT= yes SLAVE_PORT= yes

7
mail/opensmtpd-extras-table-redis/Makefile
View file

@ -2,18 +2,21 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-redis PKGNAMESUFFIX= -table-redis
PORTREVISION= 1
COMMENT= Redis table support for opensmtpd COMMENT= Redis table support for OpenSMTPD
LIB_DEPENDS= libhiredis.so:databases/hiredis LIB_DEPENDS= libhiredis.so:databases/hiredis
PLIST_FILES= libexec/opensmtpd/table-redis \ 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 CONFIGURE_ENV= REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
CFLAGS+= -I${LOCALBASE}/include/hiredis CFLAGS+= -I${LOCALBASE}/include/hiredis
USES= pkgconfig
MASTERDIR= ${.CURDIR}/../opensmtpd-extras MASTERDIR= ${.CURDIR}/../opensmtpd-extras
SLAVE_PORT= yes SLAVE_PORT= yes

5
mail/opensmtpd-extras-table-socketmap/Makefile
View file

@ -2,13 +2,14 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-socketmap PKGNAMESUFFIX= -table-socketmap
PORTREVISION= 1
COMMENT= Socketmap table support for opensmtpd COMMENT= Socketmap table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-socketmap \ PLIST_FILES= libexec/opensmtpd/table-socketmap \
man/man5/table-socketmap.5.gz man/man5/table-socketmap.5.gz
CONFIGURE_ARGS= --with-table-socketmap CONFIGURE_ARGS+= --with-table-socketmap
MASTERDIR= ${.CURDIR}/../opensmtpd-extras MASTERDIR= ${.CURDIR}/../opensmtpd-extras
SLAVE_PORT= yes SLAVE_PORT= yes

7
mail/opensmtpd-extras-table-sqlite/Makefile
View file

@ -2,15 +2,16 @@
# $FreeBSD$ # $FreeBSD$
PKGNAMESUFFIX= -table-sqlite PKGNAMESUFFIX= -table-sqlite
PORTREVISION= 1
COMMENT= SQLite table support for opensmtpd COMMENT= SQLite table support for OpenSMTPD
PLIST_FILES= libexec/opensmtpd/table-sqlite \ PLIST_FILES= libexec/opensmtpd/table-sqlite \
man/man5/table-sqlite.5.gz 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 MASTERDIR= ${.CURDIR}/../opensmtpd-extras
SLAVE_PORT= yes SLAVE_PORT= yes

29
mail/opensmtpd-extras/Makefile
View file

@ -3,34 +3,53 @@
PORTNAME= opensmtpd-extras PORTNAME= opensmtpd-extras
PORTVERSION= 201605232202 PORTVERSION= 201605232202
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES+= mail CATEGORIES+= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ MASTER_SITES= http://www.opensmtpd.org/archives/
# NB: Please reset PORTREVISION to 0 in all slave subports
# while updating PORTVERSION for master port
MAINTAINER?= gahr@FreeBSD.org MAINTAINER?= gahr@FreeBSD.org
COMMENT?= Addons for OpenSMTPD COMMENT?= Addons for OpenSMTPD
LICENSE?= ISCL LICENSE?= ISCL
LIB_DEPENDS+= libevent.so:devel/libevent2 LIB_DEPENDS+= libevent.so:devel/libevent2
RUN_DEPENDS+= ${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
USES+= autoreconf libtool pkgconfig USES+= autoreconf libtool
USE_OPENSSL= yes USE_OPENSSL= yes
WITH_OPENSSL_PORT= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir="${PREFIX}/etc/mail"
# NB: Please *DO NOT* add the following; they are NOT for end-users: # NB: Please *DO NOT* add the following; they are NOT for end-users:
# filter-monkey, filter-stub, filter-trace, filter-void # filter-stub, filter-trace, filter-void
# queue-null, queue-stub # queue-null, queue-stub
# scheduler-stub # scheduler-stub
# table-stub # table-stub
#
# Pass OpenSMTPD branch selection to all extras
#
OPTIONS_DEFINE= OPENSMTP_DEVEL
OPENSMTP_DEVEL_DESC= Depend on opensmtpd-devel (opensmtpd if off)
OPENSMTP_DEVEL_BUILD_DEPENDS_OFF= smtpctl:${PORTSDIR}/mail/opensmtpd
OPENSMTP_DEVEL_RUN_DEPENDS_OFF= smtpctl:${PORTSDIR}/mail/opensmtpd
OPENSMTP_DEVEL_BUILD_DEPENDS= smtpctl:${PORTSDIR}/mail/opensmtpd-devel
OPENSMTP_DEVEL_RUN_DEPENDS= smtpctl:${PORTSDIR}/mail/opensmtpd-devel
.if empty(SLAVE_PORT) .if empty(SLAVE_PORT)
OPTIONS_GROUP= FILTER TABLE OPTIONS_GROUP= FILTER TABLE
OPTIONS_GROUP_FILTER= CLAMAV DKIM DNSBL PAUSE REGEX SPAMASSASSIN OPTIONS_GROUP_FILTER= CLAMAV DKIM DNSBL PAUSE REGEX SPAMASSASSIN
OPTIONS_GROUP_TABLE= LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE OPTIONS_GROUP_TABLE= LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
OPTIONS_DEFAULT= ${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE} OPTIONS_DEFAULT= ${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
# Groups
FILTER_DESC= BASE FILTERS
TABLE_DESC= BASE TABLES
# Filters # Filters
CLAMAV_DESC= Check messages with ClamAV CLAMAV_DESC= Check messages with ClamAV
DKIM_DESC= Sign messages with DKIM DKIM_DESC= Sign messages with DKIM