Date: Tue, 04 Jun 2013 02:55:22 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: ast@treibsand.com Subject: ports/179284: [PATCH] mail/spmfilter: convert to optionsNG Message-ID: <E1UjfX0-0006hc-EG@apollo.emma.line.org> Resent-Message-ID: <201306040100.r54100H5090649@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179284
>Category: ports
>Synopsis: [PATCH] mail/spmfilter: convert to optionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 04 01:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:
- convert to optionsNG
- cook Makefile header while here
Port maintainer (ast@treibsand.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- spmfilter-0.4.2_4.patch begins here ---
diff -ruN ../../../ports/mail/spmfilter/Makefile ./Makefile
--- ../../../ports/mail/spmfilter/Makefile 2013-05-16 14:13:17.000000000 +0200
+++ ./Makefile 2013-06-04 01:15:40.000000000 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: mail/spmfilter/Makefile 318310 2013-05-16 12:13:17Z zeising $
+# $FreeBSD: head/mail/spmfilter/Makefile 318310 2013-05-16 12:13:17Z zeising $
PORTNAME= spmfilter
PORTVERSION= 0.4.2
@@ -14,10 +14,7 @@
BUILD_DEPENDS= gmime-24>=2.4:${PORTSDIR}/mail/gmime24 \
libesmtp>=1.0:${PORTSDIR}/mail/libesmtp \
glib>=2.14:${PORTSDIR}/devel/glib20
-
-RUN_DEPENDS= gmime-24>=2.4:${PORTSDIR}/mail/gmime24 \
- libesmtp>=1.0:${PORTSDIR}/mail/libesmtp \
- glib>=2.14:${PORTSDIR}/devel/glib20
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= cmake pkgconfig
CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
@@ -25,29 +22,27 @@
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
USE_RC_SUBR= ${PORTNAME}
-OPTIONS= DB4 "Enable DB4 backend" on \
- DEBUG "Enable Debugging" off \
- LDAP "Enable LDAP backend" off \
- MYSQL "Enable MYSQL backend" off \
- PGSQL "Enable PGSQL backend" off
+OPTIONS_DEFINE= DB4 DEBUG LDAP MYSQL PGSQL
+OPTIONS_DEFAULT= DB4
+DB4_DESC= Enable Berkeley DB 4+ backend
# Default requirement for spmfilter rc script
_REQUIRE= LOGIN
.include <bsd.port.pre.mk>
-.if !defined(WITH_DB4) || defined(WITHOUT_DB4)
+.if ! ${PORT_OPTIONS:MDB4}
CMAKE_ARGS+= -DWITHOUT_DB4=TRUE
.else
USE_BDB= yes
CMAKE_ARGS+= -DDB4_INCLUDE_DIR="${BDB_INCLUDE_DIR}"
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CMAKE_ARGS+= -DENABLE_DEBUG=TRUE
.endif
-.if !defined(WITH_LDAP) || defined(WITHOUT_LDAP)
+.if ! ${PORT_OPTIONS:MLDAP}
CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE
.else
USE_OPENLDAP= yes
@@ -57,18 +52,18 @@
_REQUIRE+= slapd
.endif
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
CMAKE_ARGS+= -DWITHOUT_ZDB=TRUE
.else
LIB_DEPENDS+= zdb:${PORTSDIR}/databases/libzdb
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
_REQUIRE+= mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
_REQUIRE+= postgresql
.endif
--- spmfilter-0.4.2_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1UjfX0-0006hc-EG>