Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2015 17:30:36 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390589 - head/www/codeigniter
Message-ID:  <201506251730.t5PHUagn002440@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Jun 25 17:30:35 2015
New Revision: 390589
URL: https://svnweb.freebsd.org/changeset/ports/390589

Log:
  Fix depends:
  - DEFAULT_PHP_VER is deprecated
  - Using it after bsd.port.pre.mk was hazardous,  when php was not yet installed it
  was depending on /usr/local/lib/php/20131226/session.so:/usr/ports/www/php5-session,
  i.e. a php 5.6 file and a php 5.4 port

Modified:
  head/www/codeigniter/Makefile

Modified: head/www/codeigniter/Makefile
==============================================================================
--- head/www/codeigniter/Makefile	Thu Jun 25 16:53:31 2015	(r390588)
+++ head/www/codeigniter/Makefile	Thu Jun 25 17:30:35 2015	(r390589)
@@ -19,6 +19,7 @@ CONFLICTS=	codeigniter-1.[0-9]*
 NO_BUILD=	yes
 USE_PHP=	session pcre
 WANT_PHP_WEB=	yes
+PHP_DEFAULT=	5.4
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 CI_SYS_DIR=	system
@@ -84,8 +85,6 @@ PLIST_SUB+=	NOAPACHE="@comment "
 .endif
 PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
 
-DEFAULT_PHP_VER=5
-
 .if ${PORT_OPTIONS:MMSSQL}
 USE_PHP+=	mssql
 .endif



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