From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:51:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F47ABAD; Sun, 15 Dec 2013 20:51:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B869112E; Sun, 15 Dec 2013 20:51:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKpc8g082761; Sun, 15 Dec 2013 20:51:38 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKpcqe082759; Sun, 15 Dec 2013 20:51:38 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201312152051.rBFKpcqe082759@svn.freebsd.org> From: Adam Weinberger Date: Sun, 15 Dec 2013 20:51:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336581 - in head/mail/spamprobe: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:51:38 -0000 Author: adamw Date: Sun Dec 15 20:51:37 2013 New Revision: 336581 URL: http://svnweb.freebsd.org/changeset/ports/336581 Log: Use OPTIONS instead of WITH_XYZ's Default to PBL as the data store (per the author's recommendations) Use OPTIONS helpers where possible Fix with clang PR: ports/184579 Approved by: stefan (maintainer) Added: head/mail/spamprobe/files/patch-src_includes_Ref.h (contents, props changed) Modified: head/mail/spamprobe/Makefile Modified: head/mail/spamprobe/Makefile ============================================================================== --- head/mail/spamprobe/Makefile Sun Dec 15 20:32:20 2013 (r336580) +++ head/mail/spamprobe/Makefile Sun Dec 15 20:51:37 2013 (r336581) @@ -1,10 +1,10 @@ # Created by: Matthew N. Dodd # $FreeBSD$ -PORTNAME= spamprobe +PORTNAME= spamprobe PORTVERSION= 1.4d PORTREVISION= 7 -CATEGORIES= mail +CATEGORIES= mail MASTER_SITES= SF MAINTAINER= stefan@FreeBSD.org @@ -15,53 +15,44 @@ CONFIGURE_ARGS= --enable-default-8bit PLIST_FILES= bin/spamprobe man/man1/spamprobe.1.gz -.include +OPTIONS_DEFINE= GIF JPEG PNG +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= PBL BDB +OPTIONS_DEFAULT=PBL GIF JPEG PNG +PBL_DESC= PBL database support (author's recommended data store) -.if ${OSVERSION} >= 1000024 -USE_GCC= yes -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # PBL support -.if !defined(WITHOUT_PBL) -BUILD_DEPENDS+= ${LOCALBASE}/include/pbl.h:${PORTSDIR}/databases/libpbl -CONFIGURE_ARGS+= --with-pbl=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpbl -.endif +PBL_BUILD_DEPENDS= ${LOCALBASE}/lib/libpbl.a:${PORTSDIR}/databases/libpbl +PBL_RUN_DEPENDS+= ${PBL_BUILD_DEPENDS} +PBL_CONFIGURE_WITH= pbl +PBL_LDFLAGS= -lpbl # BerkleyDB support -.if !defined(WITHOUT_BDB) -USE_BDB= 40+ -CONFIGURE_ARGS+= --enable-cdb -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -DUSE_DB=1 -LDFLAGS+= -L${LOCALBASE}/lib -l${BDB_LIB_NAME} -.endif +BDB_CONFIGURE_ENABLE= cdb +BDB_CONFIGURE_WITH= db +BDB_CPPFLAGS= -DUSE_DB=1 # giflib support -.if defined(WITHOUT_UNGIF) -CONFIGURE_ARGS+= --without-gif -.else -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif +GIF_CONFIGURE_WITH= gif +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib # PNG support -.if defined(WITHOUT_PNG) -CONFIGURE_ARGS+= --without-png -.else -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif +PNG_CONFIGURE_WITH= png +PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png # JPEG support -.if defined(WITHOUT_JPEG) -CONFIGURE_ARGS+= --without-jpeg -.else -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +JPEG_CONFIGURE_WITH=jpeg +JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg + +.include + +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 40+ +CPPFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -l${BDB_LIB_NAME} .endif -.include +.include Added: head/mail/spamprobe/files/patch-src_includes_Ref.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamprobe/files/patch-src_includes_Ref.h Sun Dec 15 20:51:37 2013 (r336581) @@ -0,0 +1,20 @@ +--- src/includes/Ref.h.orig 2013-12-07 13:41:33.000000000 -0500 ++++ src/includes/Ref.h 2013-12-07 13:41:49.000000000 -0500 +@@ -189,7 +189,7 @@ + + CRef &operator=(const CRef &other) + { +- assign(other); ++ this->assign(other); + return *this; + } + +@@ -245,7 +245,7 @@ + + Ref &operator=(const Ref &other) + { +- assign(other); ++ this->assign(other); + return *this; + } +