Bug 185947
| Summary: | [exp-run] unique file and package name support for python ports | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Marcus von Appen <mva> | ||||
| Component: | Individual Port(s) | Assignee: | Marcus von Appen <mva> | ||||
| Status: | Closed Overcome By Events | ||||||
| Severity: | Affects Only Me | CC: | portmgr | ||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Responsible Changed From-To: freebsd-ports-bugs->portmgr Over to maintainer(s). Responsible Changed From-To: portmgr->bdrewery take for exp-run (currently behind) Sorry about delay. exp-run is now started. Will have results tomorrow. -- Regards, Bryan Drewery I made a mistake and had to rerun. Results tomorrow. -- Regards, Bryan Drewery Logs: http://package21.nyi.freebsd.org/bulk/91amd64-default-pr_185947/2014-02-02_18h30m01s New failures (some false-positive): > + {"origin"=>"archivers/rpm5", "pkgname"=>"rpm5-5.2.1_4", "phase"=>"stage", "errortype"=>"process_failed"} > + {"origin"=>"audio/mp3splt-gtk", "pkgname"=>"mp3splt-gtk-0.8.2", "phase"=>"build", "errortype"=>"coredump"} > + {"origin"=>"deskutils/kdeplasma-addons", "pkgname"=>"kdeplasma-addons-4.10.5_1", "phase"=>"build", "errortype"=>"process_failed"} > + {"origin"=>"devel/pybugz", "pkgname"=>"py27-pybugz-0.9.3_1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"devel/tortoisehg2", "pkgname"=>"tortoisehg-2.10.1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"editors/openoffice-3", "pkgname"=>"apache-openoffice3-3.4.1_3", "phase"=>"build", "errortype"=>"missing_header"} > + {"origin"=>"editors/openoffice-devel", "pkgname"=>"apache-openoffice-devel-4.0.1517723_2,1", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"games/kye", "pkgname"=>"kye-1.0_3", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"games/plutocracy", "pkgname"=>"plutocracy-0.0.20081229_3", "phase"=>"stage", "errortype"=>"install_error"} > + {"origin"=>"games/pythonsudoku", "pkgname"=>"pythonsudoku-0.13", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"graphics/dcraw-m", "pkgname"=>"dcraw-m-9.17", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"graphics/mirage", "pkgname"=>"mirage-0.9.5.2_3", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"java/eclipse", "pkgname"=>"eclipse-3.7.1_4", "phase"=>"install", "errortype"=>"cluster"} > + {"origin"=>"java/eclipse-devel", "pkgname"=>"eclipse-devel-4.2.0_4", "phase"=>"patch", "errortype"=>"cluster"} > + {"origin"=>"lang/bigloo", "pkgname"=>"bigloo-4.0b", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"lang/ruby-doc-stdlib", "pkgname"=>"ruby19-doc-stdlib-1.9.3", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"mail/py-spf", "pkgname"=>"py27-spf-2.0.8", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"mail/pyzor", "pkgname"=>"pyzor-0.5.0_3", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"multimedia/py-openlp", "pkgname"=>"py27-OpenLP-2.0.3_2", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"multimedia/spotify-websocket-api", "pkgname"=>"py27-SpotifyWebsocketAPI-0.2_8", "phase"=>"stage", "errortype"=>"checksum"} > + {"origin"=>"net-mgmt/py-pyang", "pkgname"=>"py27-pyang-1.4.1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"security/zenmap", "pkgname"=>"zenmap-6.40_1", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"sysutils/cbsd", "pkgname"=>"cbsd-10.0.1", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"sysutils/py-salt-api", "pkgname"=>"py27-salt-api-0.8.3", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"sysutils/tentakel", "pkgname"=>"tentakel-2.2", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"textproc/jaxup", "pkgname"=>"jaxup-1.01_3", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"textproc/mdocml", "pkgname"=>"mdocml-1.12.3", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"www/py-prewikka", "pkgname"=>"py27-prewikka-1.0.1p1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"x11-wm/obmenu", "pkgname"=>"obmenu-1.0_6", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"x11/xpra", "pkgname"=>"xpra-0.10.10_1", "phase"=>"stage", "errortype"=>"install_error"} -- Regards, Bryan Drewery Responsible Changed From-To: bdrewery->mva exp-run done Responsible Changed From-To: mva->bdrewery Another exp-run is necessary for the new patch http://package18.nyi.freebsd.org/bulk/91amd64-default-pr_185947/2014-02-18_13h53m09s New failures: > + {"origin"=>"deskutils/tnote", "pkgname"=>"tnote-0.2.1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"devel/phpsh", "pkgname"=>"phpsh-20110513", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"devel/py-itools", "pkgname"=>"py27-itools-0.62.9", "phase"=>"install", "errortype"=>"cluster"} > + {"origin"=>"devel/pybugz", "pkgname"=>"py27-pybugz-0.9.3_1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"devel/ros_comm", "pkgname"=>"ros_comm-1.4.8_1", "phase"=>"build", "errortype"=>"new_compiler_error"} > + {"origin"=>"devel/tortoisehg2", "pkgname"=>"tortoisehg-2.10.1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"editors/kate", "pkgname"=>"kate-4.10.5_1", "phase"=>"build", "errortype"=>"process_failed"} > + {"origin"=>"french/aster", "pkgname"=>"fr-aster-10.8.0.3_1", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"games/gnubg", "pkgname"=>"gnubg-1.02.000_2", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"games/kye", "pkgname"=>"kye-1.0_3", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"games/plutocracy", "pkgname"=>"plutocracy-0.0.20081229_3", "phase"=>"stage", "errortype"=>"install_error"} > + {"origin"=>"games/pythonsudoku", "pkgname"=>"pythonsudoku-0.13", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"graphics/mirage", "pkgname"=>"mirage-0.9.5.2_3", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"java/jboss72", "pkgname"=>"jboss72-7.2.0_1", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"mail/postfix-policyd-spf-python", "pkgname"=>"py27-postfix-policyd-spf-python-1.2", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"mail/pyzor", "pkgname"=>"pyzor-0.5.0_3", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"net-mgmt/py-pyang", "pkgname"=>"py27-pyang-1.4.1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"science/gnudatalanguage", "pkgname"=>"gnudatalanguage-0.9.4_2", "phase"=>"build", "errortype"=>"missing_header"} > + {"origin"=>"security/zenmap", "pkgname"=>"zenmap-6.40_1", "phase"=>"stage", "errortype"=>"cluster"} > + {"origin"=>"sysutils/tentakel", "pkgname"=>"tentakel-2.2", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"textproc/archmage", "pkgname"=>"archmage-0.2.4_1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"www/py-prewikka", "pkgname"=>"py27-prewikka-1.0.1p1", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"x11-wm/obmenu", "pkgname"=>"obmenu-1.0_6", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"x11/xpra", "pkgname"=>"xpra-0.11.2", "phase"=>"stage", "errortype"=>"install_error"} -- Regards, Bryan Drewery Responsible Changed From-To: bdrewery->mva exp-run done 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$ <dd> <p> - 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. </p> </dd> @@ -17,12 +17,12 @@ $FreeBSD$ <h2><a name="_configuration"></a>CONFIGURATION</h2> <p>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.</p> -+%%PREFIX%%/etc/phpsh/config.</p> ++%%ETCDIR%%/config.</p> <p>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 <comm-file> <codebase-mode> [-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() _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mva Date: Sat Feb 22 10:50:28 2014 New Revision: 345623 URL: http://svnweb.freebsd.org/changeset/ports/345623 QAT: https://qat.redports.org/buildarchive/r345623/ Log: - Convert to PYDISTUTILS_AUTOPLIST PR: ports/185947 With hat: python@ Modified: head/devel/pybugz/Makefile Modified: head/devel/pybugz/Makefile ============================================================================== --- head/devel/pybugz/Makefile Sat Feb 22 10:48:08 2014 (r345622) +++ head/devel/pybugz/Makefile Sat Feb 22 10:50:28 2014 (r345623) @@ -2,7 +2,7 @@ PORTNAME= pybugz PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.bayofrum.net/dist/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,9 +15,6 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} USE_PYTHON= 2 USE_PYDISTUTILS=yes - -PLIST_FILES= bin/bugz -DATADIR= ${PYTHONPREFIX_SITELIBDIR}/bugz -PORTDATA= * +PYDISTUTILS_AUTOPLIST= yes .include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mva Date: Sat Feb 22 10:52:54 2014 New Revision: 345625 URL: http://svnweb.freebsd.org/changeset/ports/345625 QAT: https://qat.redports.org/buildarchive/r345625/ Log: - Respect DATADIR PR: ports/185947 With hat: python@ Modified: head/games/kye/Makefile Modified: head/games/kye/Makefile ============================================================================== --- head/games/kye/Makefile Sat Feb 22 10:52:50 2014 (r345624) +++ head/games/kye/Makefile Sat Feb 22 10:52:54 2014 (r345625) @@ -3,7 +3,7 @@ PORTNAME= kye PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games python MASTER_SITES= http://games.moria.org.uk/kye/download/ \ SF/nemysisfreebsdp/games/${PORTNAME}/:levels @@ -37,6 +37,11 @@ DESKTOP_ENTRIES="Python Kye" "" "Kye" \ .include <bsd.port.options.mk> +post-patch: + @${REINPLACE_CMD} -e 's|share/kye|${DATADIR_REL}|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/local/share/kye|${DATADIR}|' \ + ${WRKSRC}/kye/common.py + post-extract-script: @${MKDIR} ${WRKDIR}/${PORTNAME} .for l in kye-data_moria_levels.20121101.tar.gz kye-data_nuke_levels.20121101.tar.gz \ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mva Date: Sat Feb 22 15:22:03 2014 New Revision: 345658 URL: http://svnweb.freebsd.org/changeset/ports/345658 QAT: https://qat.redports.org/buildarchive/r345658/ Log: - Respect DOCSDIR PR: ports/185947 With hat: python@ Modified: head/mail/pyzor/Makefile Modified: head/mail/pyzor/Makefile ============================================================================== --- head/mail/pyzor/Makefile Sat Feb 22 15:20:18 2014 (r345657) +++ head/mail/pyzor/Makefile Sat Feb 22 15:22:03 2014 (r345658) @@ -3,7 +3,7 @@ PORTNAME= pyzor PORTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail python MASTER_SITES= SF @@ -23,6 +23,7 @@ PLIST_FILES= man/man1/pyzor.1.gz \ post-patch: ${REINPLACE_CMD} -e '1s,^#!/usr/bin/python,#!/usr/bin/env -S python -Wignore::DeprecationWarning,' \ ${WRKSRC}/scripts/pyzor ${WRKSRC}/scripts/pyzord + ${REINPLACE_CMD} -e 's|share/doc/pyzor|${DOCSDIR}|' ${WRKSRC}/setup.py post-install: ${CHMOD} ${SHAREMODE} ${STAGEDIR}${DOCSDIR}/usage.html _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mva Date: Sun Feb 23 09:14:50 2014 New Revision: 345692 URL: http://svnweb.freebsd.org/changeset/ports/345692 QAT: https://qat.redports.org/buildarchive/r345692/ Log: - Respect DOCSDIR PR: ports/185947 With hat: python@ Modified: head/sysutils/tentakel/Makefile Modified: head/sysutils/tentakel/Makefile ============================================================================== --- head/sysutils/tentakel/Makefile Sun Feb 23 06:51:56 2014 (r345691) +++ head/sysutils/tentakel/Makefile Sun Feb 23 09:14:50 2014 (r345692) @@ -3,6 +3,7 @@ PORTNAME= tentakel PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -15,4 +16,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/py USE_PYTHON= yes USE_PYDISTUTILS= yes +post-patch: + @${REINPLACE_CMD} -e 's|share/doc/tentakel|${DOCSDIR_REL}|' \ + ${WRKSRC}/setup.py + .include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" Author: mva Date: Sun Feb 23 09:41:15 2014 New Revision: 345693 URL: http://svnweb.freebsd.org/changeset/ports/345693 QAT: https://qat.redports.org/buildarchive/r345693/ Log: - Respect ETCDIR and DATADIR - Limit to the supported python versions - Convert to PYDISTUTILS_AUTOPLIST PR: ports/185947 With hat: python@ Deleted: head/textproc/archmage/pkg-plist Modified: head/textproc/archmage/Makefile Modified: head/textproc/archmage/Makefile ============================================================================== --- head/textproc/archmage/Makefile Sun Feb 23 09:14:50 2014 (r345692) +++ head/textproc/archmage/Makefile Sun Feb 23 09:41:15 2014 (r345693) @@ -6,6 +6,7 @@ PORTVERSION= 0.2.4 PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= SF +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Extensible reader/decompiler of files in CHM format @@ -17,16 +18,20 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/ch NO_BUILD= yes USE_BZIP2= yes -USE_PYTHON= yes +USE_PYTHON= 2 USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + +PLIST_FILES= man/man1/archmage.1.gz post-extract: @${GUNZIP_CMD} ${WRKSRC}/${PORTNAME}.1.gz post-patch: @${REINPLACE_CMD} -e "s,/usr/share/archmage,${DATADIR}," ${WRKSRC}/arch.conf - @${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc," ${WRKSRC}/archmod/CHM.py - @${REINPLACE_CMD} -e "s,/etc,etc,;/archmage.1/d" ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e "s,/etc/archmage,${ETCDIR}," ${WRKSRC}/archmod/__init__.py + @${REINPLACE_CMD} -e "s,/etc/archmage,${ETCDIR},;/archmage.1/d; \ + s,share/archmage,${DATADIR_REL}," ${WRKSRC}/setup.py post-install: @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" This has been superseded by http://svnweb.freebsd.org/ports?view=revision&revision=356921 |
The attached patch enables python ports (modules or packages), which use distutils as primary installation method to install themselves in a collision-free manner for different python versions at the same time. To keep issues with the change at a minimum, an exp-run is needed to detect and fix ports, which are configured in a way that will break them with the patch.