svn commit: r408070 - in head/devel/phpsh: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Feb 4 18:38:31 UTC 2016
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 <bsd.port.options.mk>
-
-.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",
More information about the svn-ports-all
mailing list