From owner-svn-ports-all@freebsd.org Thu Feb 4 18:38:30 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF0E4A9B592; Thu, 4 Feb 2016 18:38:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 97F061DEF; Thu, 4 Feb 2016 18:38:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14IcTie077446; Thu, 4 Feb 2016 18:38:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14IcTHQ077444; Thu, 4 Feb 2016 18:38:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602041838.u14IcTHQ077444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 4 Feb 2016 18:38:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408070 - in head/devel/phpsh: . 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.20 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: Thu, 04 Feb 2016 18:38:31 -0000 Author: amdmi3 Date: Thu Feb 4 18:38:29 2016 New Revision: 408070 URL: https://svnweb.freebsd.org/changeset/ports/408070 Log: - Switch to options helpers - Always set config dir to %%ETCDIR%% to avoid stage-qa warnings when building as non-root - Add NO_ARCH Approved by: portmgr blanket Modified: head/devel/phpsh/Makefile head/devel/phpsh/files/patch-setup.py Modified: head/devel/phpsh/Makefile ============================================================================== --- head/devel/phpsh/Makefile Thu Feb 4 18:36:58 2016 (r408069) +++ head/devel/phpsh/Makefile Thu Feb 4 18:38:29 2016 (r408070) @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python tar:bzip2 USE_PYTHON= distutils autoplist USE_PHP= pcre posix tokenizer +NO_ARCH= yes WANT_PHP_CLI= yes @@ -26,12 +27,7 @@ PYDISTUTILS_PKGVERSION= 1.3 OPTIONS_DEFINE= PCNTL PCNTL_DESC= Fork on every command (pcntl PHP extension) - -.include - -.if ${PORT_OPTIONS:MPCNTL} -USE_PHP+= pcntl -.endif +PCNTL_USE= PHP=pcntl post-patch: @${GREP} -Rl '%%ETCDIR%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ Modified: head/devel/phpsh/files/patch-setup.py ============================================================================== --- head/devel/phpsh/files/patch-setup.py Thu Feb 4 18:36:58 2016 (r408069) +++ head/devel/phpsh/files/patch-setup.py Thu Feb 4 18:38:29 2016 (r408070) @@ -1,6 +1,6 @@ ---- setup.py.orig +--- setup.py.orig 2011-05-13 22:16:32 UTC +++ setup.py -@@ -7,15 +7,15 @@ +@@ -7,17 +7,14 @@ import os sys.path.insert(0, 'src') from phpsh import __version__ @@ -16,13 +16,15 @@ +### EMACS: os.waitpid(p.pid, 0) # something better than this? - if os.getenv("USER") == "root": +-if os.getenv("USER") == "root": - config_dir = "/etc/phpsh" -+ config_dir = "%%ETCDIR%%" - else: - config_dir = os.getenv("HOME") + "/.phpsh" +-else: +- config_dir = os.getenv("HOME") + "/.phpsh" ++config_dir = "%%ETCDIR%%" -@@ -33,7 +33,7 @@ + setup( + name="phpsh", +@@ -33,7 +30,7 @@ setup( "xdebug-clients/geben/LICENSE", "xdebug-clients/geben/Makefile", "xdebug-clients/geben/geben.el",