Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Sep 2012 11:09:26 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r304267 - head/lang/php53
Message-ID:  <201209141109.q8EB9QHO008080@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209141109.q8EB9QHO008080>