From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 14 11:09:28 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84A01106566B;
	Fri, 14 Sep 2012 11:09:28 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A6E98FC12;
	Fri, 14 Sep 2012 11:09:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8EB9RLP008082;
	Fri, 14 Sep 2012 11:09:27 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8EB9QHO008080;
	Fri, 14 Sep 2012 11:09:26 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201209141109.q8EB9QHO008080@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Fri, 14 Sep 2012 11:09:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304267 - head/lang/php53
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 11:09:28 -0000

Author: flo
Date: Fri Sep 14 11:09:26 2012
New Revision: 304267
URL: http://svn.freebsd.org/changeset/ports/304267

Log:
  - put GDBM and QDBM options into an OPTIONS_SINGLE, the cannot be used
    simultaneously (affects databases/php53-dba) [1]
  - fix a typo introduced in r300957 that prevents mail/php53-imap from
    building [2]
  
  PR:		ports/171636 [2]
  Submitted by:	<freebsd@nagilum.org> [2]
  Reported by:	Shahin Qurbanov <shahin.b.qurbanov@gmail.com> [1]

Modified:
  head/lang/php53/Makefile.ext   (contents, props changed)

Modified: head/lang/php53/Makefile.ext
==============================================================================
--- head/lang/php53/Makefile.ext	Fri Sep 14 10:18:11 2012	(r304266)
+++ head/lang/php53/Makefile.ext	Fri Sep 14 11:09:26 2012	(r304267)
@@ -40,8 +40,10 @@ CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=--enable-dba
 
-OPTIONS_DEFINE=	CDB DB4 GDBM QDBM INIFILE FLATFILE
+OPTIONS_DEFINE=	CDB DB4 DBM INIFILE FLATFILE
 OPTIONS_DEFAULT=	CDB INIFILE FLATFILE
+OPTIONS_SINGLE=	DBM
+OPTIONS_SINGLE_DBM=	GDBM QDBM
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
@@ -519,7 +521,7 @@ CONFIGURE_ARGS+=--enable-gd-jis-conv
 .if ${PHP_MODNAME} == "imap"
 .	if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
-LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -ssl
+LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 .	endif
 .endif