From owner-svn-ports-all@FreeBSD.ORG Sun Jun 22 18:44:19 2014 Return-Path: Delivered-To: svn-ports-all@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 CA372C2F; Sun, 22 Jun 2014 18:44:19 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6F422C24; Sun, 22 Jun 2014 18:44:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MIiIRT001427; Sun, 22 Jun 2014 18:44:18 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MIiIYK001423; Sun, 22 Jun 2014 18:44:18 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406221844.s5MIiIYK001423@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 22 Jun 2014 18:44:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358819 - in head/www/pecl-solr: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 18:44:19 -0000 Author: rakuco Date: Sun Jun 22 18:44:17 2014 New Revision: 358819 URL: http://svnweb.freebsd.org/changeset/ports/358819 QAT: https://qat.redports.org/buildarchive/r358819/ Log: Update to 1.1.1. PR: 191271 Submitted by: gaod@hychen.org (maintainer) Modified: head/www/pecl-solr/Makefile head/www/pecl-solr/distinfo head/www/pecl-solr/files/patch-config.m4 head/www/pecl-solr/files/patch-php_solr.c Modified: head/www/pecl-solr/Makefile ============================================================================== --- head/www/pecl-solr/Makefile Sun Jun 22 18:25:30 2014 (r358818) +++ head/www/pecl-solr/Makefile Sun Jun 22 18:44:17 2014 (r358819) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= solr -PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTVERSION= 1.1.1 CATEGORIES= www MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -13,7 +12,7 @@ MAINTAINER= gaod@hychen.org COMMENT= The Apache Solr PHP extension LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - xml2:${PORTSDIR}/textproc/libxml2 + xml2:${PORTSDIR}/textproc/libxml2 USE_PHP= json USE_PHPEXT= yes Modified: head/www/pecl-solr/distinfo ============================================================================== --- head/www/pecl-solr/distinfo Sun Jun 22 18:25:30 2014 (r358818) +++ head/www/pecl-solr/distinfo Sun Jun 22 18:44:17 2014 (r358819) @@ -1,2 +1,2 @@ -SHA256 (solr-1.0.2.tgz) = d5868daab01290f820b4b754e3c560dc6e983f82d9f6640b3146cede4d9a8581 -SIZE (solr-1.0.2.tgz) = 101292 +SHA256 (solr-1.1.1.tgz) = 2acc9026bdac5adf46e42e7faf95272f1bcd2c5ba447f7259efb03499749a138 +SIZE (solr-1.1.1.tgz) = 111188 Modified: head/www/pecl-solr/files/patch-config.m4 ============================================================================== --- head/www/pecl-solr/files/patch-config.m4 Sun Jun 22 18:25:30 2014 (r358818) +++ head/www/pecl-solr/files/patch-config.m4 Sun Jun 22 18:44:17 2014 (r358819) @@ -1,36 +1,11 @@ ---- config.m4.orig 2011-11-29 10:49:53.000000000 +0800 -+++ config.m4 2013-01-27 23:53:10.000000000 +0800 -@@ -56,8 +56,8 @@ else - fi - - PHP_ADD_INCLUDE($CURL_DIR/include) --PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) --PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD) -+PHP_EVAL_LIBLINE($CURL_LIBS, SOLR_SHARED_LIBADD) -+PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, SOLR_SHARED_LIBADD) - - PHP_ARG_ENABLE(solr, whether to enable the Solr extension, - [ --enable-solr Enable solr support]) -@@ -72,11 +72,11 @@ dnl Setting up the apache Solr extension - if test "$PHP_SOLR" != "no"; then - - if test "$PHP_CURL" = "no"; then -- AC_MSG_ERROR([SOAP extension requires curl extension, add --with-curl]) -+ AC_MSG_ERROR([SOLR extension requires curl extension, add --with-curl]) - fi +--- config.m4.orig 2014-06-22 18:58:51.253187297 +0800 ++++ config.m4 2014-06-22 19:01:04.313188083 +0800 +@@ -82,7 +82,7 @@ + + PHP_ADD_INCLUDE($CURL_DIR/include) + PHP_EVAL_LIBLINE($CURL_LIBS, SOLR_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, SOLR_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, SOLR_SHARED_LIBADD) if test "$PHP_LIBXML" = "no"; then -- AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml]) -+ AC_MSG_ERROR([SOLR extension requires LIBXML extension, add --enable-libxml]) - fi - - PHP_SETUP_LIBXML(SOLR_SHARED_LIBADD, [ -@@ -100,7 +100,7 @@ if test "$PHP_SOLR" != "no"; then - solr_functions_response.c \ - solr_functions_debug.c], - $ext_shared) -- PHP_SUBST(SOAP_SHARED_LIBADD) -+ PHP_SUBST(SOLR_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) - ]) + AC_MSG_ERROR([Solr extension requires LIBXML extension, add --enable-libxml]) Modified: head/www/pecl-solr/files/patch-php_solr.c ============================================================================== --- head/www/pecl-solr/files/patch-php_solr.c Sun Jun 22 18:25:30 2014 (r358818) +++ head/www/pecl-solr/files/patch-php_solr.c Sun Jun 22 18:44:17 2014 (r358819) @@ -1,11 +1,11 @@ ---- php_solr.c.orig 2013-01-28 00:00:42.000000000 +0800 -+++ php_solr.c 2013-01-28 00:00:54.000000000 +0800 -@@ -879,8 +879,6 @@ static zend_function_entry solr_utils_me +--- php_solr.c.orig 2014-06-22 19:01:39.785187204 +0800 ++++ php_solr.c 2014-06-22 19:02:20.171185939 +0800 +@@ -901,8 +901,6 @@ /* {{{ solr_module_deps */ static zend_module_dep solr_module_deps[] = { -- ZEND_MOD_REQUIRED(PHP_CURL_EXTENSION_NAME) - ZEND_MOD_REQUIRED(PHP_LIBXML_EXTENSION_NAME) - +- ZEND_MOD_REQUIRED(PHP_JSON_EXTENSION_NAME) { NULL, NULL, NULL } }; + /* }}} */