From owner-svn-ports-all@FreeBSD.ORG Sat Feb 22 10:48:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8A4EC80; Sat, 22 Feb 2014 10:48:10 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B422B1A65; Sat, 22 Feb 2014 10:48:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1MAmAWi096782; Sat, 22 Feb 2014 10:48:10 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1MAm8gE096769; Sat, 22 Feb 2014 10:48:08 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201402221048.s1MAm8gE096769@svn.freebsd.org> From: Marcus von Appen Date: Sat, 22 Feb 2014 10:48:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345622 - 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.17 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: Sat, 22 Feb 2014 10:48:11 -0000 Author: mva Date: Sat Feb 22 10:48:08 2014 New Revision: 345622 URL: http://svnweb.freebsd.org/changeset/ports/345622 QAT: https://qat.redports.org/buildarchive/r345622/ Log: - Convert to PYDISTUTILS_AUTOPLIST - Use ETCDIR PR: ports/185947 With hat: python@ Deleted: head/devel/phpsh/pkg-plist Modified: head/devel/phpsh/Makefile head/devel/phpsh/files/patch-README.md head/devel/phpsh/files/patch-setup.py head/devel/phpsh/files/patch-src_doc_phpsh.1 head/devel/phpsh/files/patch-src_doc_phpsh.1.html head/devel/phpsh/files/patch-src_doc_phpsh.1.txt head/devel/phpsh/files/patch-src_manual.py head/devel/phpsh/files/patch-src_phpsh head/devel/phpsh/files/patch-src_phpsh.php head/devel/phpsh/files/patch-src_phpsh.py Modified: head/devel/phpsh/Makefile ============================================================================== --- head/devel/phpsh/Makefile Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/Makefile Sat Feb 22 10:48:08 2014 (r345622) @@ -3,6 +3,7 @@ PORTNAME= phpsh PORTVERSION= 20110513 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ ${MASTER_SITE_LOCAL} @@ -14,6 +15,7 @@ COMMENT= An interactive shell for PHP USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes USE_PHP= pcre posix tokenizer WANT_PHP_CLI= yes @@ -33,8 +35,8 @@ USE_PHP+= pcntl .endif post-patch: - @${GREP} -Rl '%%PREFIX%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ - -e 's,%%PREFIX%%,${PREFIX},g' + @${GREP} -Rl '%%ETCDIR%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ + -e 's,%%ETCDIR%%,${ETCDIR},g' post-install: @${CAT} ${PKGMESSAGE} Modified: head/devel/phpsh/files/patch-README.md ============================================================================== --- head/devel/phpsh/files/patch-README.md Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-README.md Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ Installing Globally =================== -_Note that this install currently clobbers any previous /etc/phpsh/rc.php_ -+_Note that this install currently clobbers any previous %%PREFIX%%/etc/phpsh/rc.php_ ++_Note that this install currently clobbers any previous %%ETCDIR%%/rc.php_ * `python setup.py build` * `sudo python setup.py install` * `phpsh` @@ -17,7 +17,7 @@ $FreeBSD$ Autoloading ----------- -* Modify /etc/phpsh/rc.php. Then: -+* Modify %%PREFIX%%/etc/phpsh/rc.php. Then: ++* Modify %%ETCDIR%%/rc.php. Then: * `cd ~/www` * `phpsh` * And for times when you just want vanilla php: Modified: head/devel/phpsh/files/patch-setup.py ============================================================================== --- head/devel/phpsh/files/patch-setup.py Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-setup.py Sat Feb 22 10:48:08 2014 (r345622) @@ -21,7 +21,7 @@ $FreeBSD$ # something better than this? if os.getenv("USER") == "root": - config_dir = "/etc/phpsh" -+ config_dir = "%%PREFIX%%/etc/phpsh" ++ config_dir = "%%ETCDIR%%" else: config_dir = os.getenv("HOME") + "/.phpsh" Modified: head/devel/phpsh/files/patch-src_doc_phpsh.1 ============================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1 Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1 Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ .TP \-c, \-\-codebase\-mode -Use "\-c none" to load no codebase\&. See /etc/phpsh/phpshrc\&.php for other codebase modes\&. -+Use "\-c none" to load no codebase\&. See %%PREFIX%%/etc/phpsh/phpshrc\&.php for other codebase modes\&. ++Use "\-c none" to load no codebase\&. See %%ETCDIR%%/phpshrc\&.php for other codebase modes\&. .TP \-t, \-\-test\-file Run a saved\-phpsh\-session unit test file\&. See test/ in the phpsh distribution for examples\&. @@ -17,7 +17,7 @@ $FreeBSD$ .SH "CONFIGURATION" -Config file support was added in phpsh\-1\&.2\&. When phpsh starts up it tries to read its configuration from /etc/phpsh/config, then from $HOME/\&.phpsh/config\&. If either file is not present or not readable, it is ignored\&. Entries in the per\-user config file $HOME/\&.phpsh/config override the corresponding entries in the host\-wide config file /etc/phpsh/config\&. -+Config file support was added in phpsh\-1\&.2\&. When phpsh starts up it tries to read its configuration from %%PREFIX%%/etc/phpsh/config, then from $HOME/\&.phpsh/config\&. If either file is not present or not readable, it is ignored\&. Entries in the per\-user config file $HOME/\&.phpsh/config override the corresponding entries in the host\-wide config file %%PREFIX%%/etc/phpsh/config\&. ++Config file support was added in phpsh\-1\&.2\&. When phpsh starts up it tries to read its configuration from %%ETCDIR%%/config, then from $HOME/\&.phpsh/config\&. If either file is not present or not readable, it is ignored\&. Entries in the per\-user config file $HOME/\&.phpsh/config override the corresponding entries in the host\-wide config file %%ETCDIR%%/config\&. The config file consists of sections containing key:value pairs\&. Lines starting with # are ignored\&. All settings are optional and have reasonable default values\&. Section names are in brackets\&. A section name must be present in the config file if any settings in that section are present\&. The following configuration settings are supported: Modified: head/devel/phpsh/files/patch-src_doc_phpsh.1.html ============================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1.html Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1.html Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$

- Use "-c none" to load no codebase. See /etc/phpsh/phpshrc.php for -+ Use "-c none" to load no codebase. See %%PREFIX%%/etc/phpsh/phpshrc.php for ++ Use "-c none" to load no codebase. See %%ETCDIR%%/phpshrc.php for other codebase modes.

@@ -17,12 +17,12 @@ $FreeBSD$

CONFIGURATION

Config file support was added in phpsh-1.2. When phpsh starts up it -tries to read its configuration from /etc/phpsh/config, then from -+tries to read its configuration from %%PREFIX%%/etc/phpsh/config, then from ++tries to read its configuration from %%ETCDIR%%/config, then from $HOME/.phpsh/config. If either file is not present or not readable, it is ignored. Entries in the per-user config file $HOME/.phpsh/config override the corresponding entries in the host-wide config file -/etc/phpsh/config.

-+%%PREFIX%%/etc/phpsh/config.

++%%ETCDIR%%/config.

The config file consists of sections containing key:value pairs. Lines starting with # are ignored. All settings are optional and have reasonable default values. Section names are in brackets. A section Modified: head/devel/phpsh/files/patch-src_doc_phpsh.1.txt ============================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1.txt Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1.txt Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ -c:: --codebase-mode:: - Use "-c none" to load no codebase. See /etc/phpsh/phpshrc.php for -+ Use "-c none" to load no codebase. See %%PREFIX%%/etc/phpsh/phpshrc.php for ++ Use "-c none" to load no codebase. See %%ETCDIR%%/phpshrc.php for other codebase modes. -t:: @@ -17,12 +17,12 @@ $FreeBSD$ ------------- Config file support was added in phpsh-1.2. When phpsh starts up it -tries to read its configuration from /etc/phpsh/config, then from -+tries to read its configuration from %%PREFIX%%/etc/phpsh/config, then from ++tries to read its configuration from %%ETCDIR%%/config, then from $HOME/.phpsh/config. If either file is not present or not readable, it is ignored. Entries in the per-user config file $HOME/.phpsh/config override the corresponding entries in the host-wide config file -/etc/phpsh/config. -+%%PREFIX%%/etc/phpsh/config. ++%%ETCDIR%%/config. The config file consists of sections containing key:value pairs. Lines starting with # are ignored. All settings are optional and have Modified: head/devel/phpsh/files/patch-src_manual.py ============================================================================== --- head/devel/phpsh/files/patch-src_manual.py Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_manual.py Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ manual_path = os.path.join(os.getenv("HOME"), ".phpsh", manual_file) if not os.path.exists(manual_path): - manual_path = os.path.join("/etc/phpsh", manual_file) -+ manual_path = os.path.join("%%PREFIX%%/etc/phpsh", manual_file) ++ manual_path = os.path.join("%%ETCDIR%%", manual_file) conn = sqlite.connect(manual_path) cursor = conn.cursor() Modified: head/devel/phpsh/files/patch-src_phpsh ============================================================================== --- head/devel/phpsh/files/patch-src_phpsh Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_phpsh Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ p.add_option("-c", "--codebase-mode", help="""Use "-c none" to load no codebase. -See /etc/phpsh/rc.php for other codebase modes.""") -+See %%PREFIX%%/etc/phpsh/rc.php for other codebase modes.""") ++See %%ETCDIR%%/rc.php for other codebase modes.""") p.add_option("-t", "--test-file", help="""Run a saved-phpsh-session unit test file. See test/ in the phpsh distribution for examples.""") Modified: head/devel/phpsh/files/patch-src_phpsh.php ============================================================================== --- head/devel/phpsh/files/patch-src_phpsh.php Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_phpsh.php Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ // phpsh.php [-c] // -// use '' for default codebase-mode, define others in /etc/phpsh/rc.php -+// use '' for default codebase-mode, define others in %%PREFIX%%/etc/phpsh/rc.php ++// use '' for default codebase-mode, define others in %%ETCDIR%%/rc.php // -c turns off color // set the TFBENV to script @@ -17,7 +17,7 @@ $FreeBSD$ require_once $___phpsh___homerc; } else { - require_once '/etc/phpsh/rc.php'; -+ require_once '%%PREFIX%%/etc/phpsh/rc.php'; ++ require_once '%%ETCDIR%%/rc.php'; } $___phpsh___do_color = true; @@ -26,7 +26,7 @@ $FreeBSD$ 'Not executing input: Possible call to undefined function '. $undefd_func."()\n". - 'See /etc/phpsh/config.sample to disable UndefinedFunctionCheck.'; -+ 'See %%PREFIX%%/etc/phpsh/config.sample to disable UndefinedFunctionCheck.'; ++ 'See %%ETCDIR%%/config.sample to disable UndefinedFunctionCheck.'; } } if ($err_msg) { Modified: head/devel/phpsh/files/patch-src_phpsh.py ============================================================================== --- head/devel/phpsh/files/patch-src_phpsh.py Sat Feb 22 10:44:06 2014 (r345621) +++ head/devel/phpsh/files/patch-src_phpsh.py Sat Feb 22 10:48:08 2014 (r345622) @@ -8,7 +8,7 @@ $FreeBSD$ def read(self): - config_files = ["/etc/phpsh/config"] -+ config_files = ["%%PREFIX%%/etc/phpsh/config"] ++ config_files = ["%%ETCDIR%%/config"] home = os.getenv("HOME") if home: homestr = home.strip()