From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 4 01:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CE74795F for ; Tue, 4 Jun 2013 01:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B8EDF10BE for ; Tue, 4 Jun 2013 01:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r54100wT090658 for ; Tue, 4 Jun 2013 01:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r54100H5090649; Tue, 4 Jun 2013 01:00:00 GMT (envelope-from gnats) Resent-Date: Tue, 4 Jun 2013 01:00:00 GMT Resent-Message-Id: <201306040100.r54100H5090649@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from apollo.emma.line.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by hub.freebsd.org (Postfix) with ESMTP id 32F47938; Tue, 4 Jun 2013 00:55:23 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree by apollo.emma.line.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1UjfX0-0006hc-EG; Tue, 04 Jun 2013 02:55:22 +0200 Message-Id: Date: Tue, 04 Jun 2013 02:55:22 +0200 From: Matthias Andree To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179284: [PATCH] mail/spmfilter: convert to optionsNG Cc: ast@treibsand.com X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 01:00:01 -0000 >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 -.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: