Re: lang/go-bootstrap
On Wednesday 23 December 2015 03:02:25 Joel Sing wrote:
> On Wednesday 09 December 2015 00:40:28 Joel Sing wrote:
> > I'll rework go.port.mk and the relevant packages using /usr/local/go-pkg.
>
> This reworks go.port.mk to install packages in /usr/local/go-pkg and builds
> without -a, -work and without running things through sed and piping to
> shell. The net/websocketd and textproc/go-xlsx should now be fixed (along
> with their dependencies) - I still need to take a closer look at the other
> two...
>
> Comments or oks?
Here's a revised version that also fixes devel/go-tools - update to a more
recent version for starters, cmd/vet and cmd/cover are now part of the
Go base distribution, so we should not be building/installing these and
godoc requires special handling do to a 'go install' mapping that exists
for legacy reasons.
ok?
Index: devel/go-check-v1/Makefile
===
RCS file: /cvs/ports/devel/go-check-v1/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/go-check-v1/Makefile 19 Jun 2015 08:42:54 - 1.1.1.1
+++ devel/go-check-v1/Makefile 26 Dec 2015 07:00:42 -
@@ -7,6 +7,8 @@ HOMEPAGE = http://labix.org/gocheck
MAINTAINER = Dmitrij D. Czarkoff
+REVISION = 0
+
# 2-clause BSD
PERMIT_PACKAGE_CDROM = Yes
Index: devel/go-check-v1/pkg/PLIST
===
RCS file: /cvs/ports/devel/go-check-v1/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/go-check-v1/pkg/PLIST 19 Jun 2015 08:42:54 - 1.1.1.1
+++ devel/go-check-v1/pkg/PLIST 26 Dec 2015 07:00:42 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/19 08:42:54 czarkoff Exp $
+go-pkg/
+go-pkg/pkg/
${MODGO_PACKAGES}/
${MODGO_PACKAGES}/gopkg.in/
${MODGO_PACKAGES}/gopkg.in/check.v1.a
Index: devel/go-tools/Makefile
===
RCS file: /cvs/ports/devel/go-tools/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/go-tools/Makefile 11 Aug 2015 20:15:41 - 1.3
+++ devel/go-tools/Makefile 26 Dec 2015 07:00:42 -
@@ -3,9 +3,8 @@
COMMENT = various tools for the Go programming language
GH_ACCOUNT = golang
GH_PROJECT = tools
-GH_COMMIT =27e692e6ec36d8f48be794f32553e1400c70dbf2
-DISTNAME = go-tools-1.4.20150206
-REVISION = 1
+GH_COMMIT =99c318c742339e824d89d23ba3b3bff4f4ab27a8
+DISTNAME = go-tools-1.5.20151226
CATEGORIES = devel
HOMEPAGE = http://golang.org/
@@ -14,19 +13,19 @@ MAINTAINER =Dmitrij D. Czarkoff
Index: devel/go-tools/distinfo
===
RCS file: /cvs/ports/devel/go-tools/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/go-tools/distinfo 8 Jun 2015 09:41:03 - 1.1.1.1
+++ devel/go-tools/distinfo 26 Dec 2015 07:00:42 -
@@ -1,2 +1,2 @@
-SHA256 (go-tools-1.4.20150206.tar.gz) =
TeD9TrQh23FPay1LlAvHUTuTmEb7ZxsWx/okCb3vf+g=
-SIZE (go-tools-1.4.20150206.tar.gz) = 1625310
+SHA256 (go-tools-1.5.20151226.tar.gz) =
JDNfXzok6DwT7pexMzVL4DCxVSOXoYOJqcCkC8mLWd4=
+SIZE (go-tools-1.5.20151226.tar.gz) = 1661993
Index: devel/go-tools/pkg/DESCR
===
RCS file: /cvs/ports/devel/go-tools/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- devel/go-tools/pkg/DESCR8 Jun 2015 09:41:03 - 1.1.1.1
+++ devel/go-tools/pkg/DESCR26 Dec 2015 07:00:42 -
@@ -18,5 +18,3 @@ programming language:
* ssadump displays and interprets the SSA form of Go programs
* stress runs a given process in parallel in a loop and collects failures
* stringercreats of methods that satisfy the fmt.Stringer interface
- * cover analyzes the coverage profiles
- * vet examines Go source code and reports suspicious constructs
Index: devel/go-tools/pkg/PLIST
===
RCS file: /cvs/ports/devel/go-tools/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/go-tools/pkg/PLIST11 Aug 2015 20:15:41 - 1.3
+++ devel/go-tools/pkg/PLIST26 Dec 2015 07:00:42 -
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2015/08/11 20:15:41 jasper Exp $
-@pkgpath devel/gocover
-@pkgpath textproc/godoc
@conflict stress-*
+@pkgpath textproc/godoc
@bin bin/benchcmp
@bin bin/callgraph
@bin bin/digraph
@@ -17,6 +16,4 @@
@bin bin/ssadump
@bin bin/stress
@bin bin/stringer
-@bin ${MODGO_TOOLS}/cover
-@bin ${MODGO_TOOLS}/vet
@rcscript ${RCDIR}/godoc
Index: lang/go/go.port.mk
===
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.4
diff -u -p -r1.4 go.po
UPDATE: devel/flake8
This is an update to the latest version of flake8 which brings a few
improvements and bug fixes. This new version depends on the devel/py-mock
1.3.0 port that has not yet been committed and the devel/pep8 port that was
committed yesterday.
Bertrand
Index: Makefile
===
RCS file: /cvs/ports/devel/flake8/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile24 Dec 2015 15:36:54 - 1.4
+++ Makefile26 Dec 2015 00:17:20 -
@@ -2,13 +2,12 @@
COMMENT = modular python code checker wrapping pep8 and pyflakes
-MODPY_EGG_VERSION =2.2.5
+MODPY_EGG_VERSION =2.5.1
DISTNAME = flake8-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = devel
-HOMEPAGE = https://bitbucket.org/tarek/flake8/
+HOMEPAGE = https://gitlab.com/pycqa/flake8
MAINTAINER = Bertrand Janin
Index: distinfo
===
RCS file: /cvs/ports/devel/flake8/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo18 Nov 2014 12:10:58 - 1.1.1.1
+++ distinfo26 Dec 2015 00:17:20 -
@@ -1,2 +1,2 @@
-SHA256 (flake8-2.2.5.tar.gz) = KF6L1zDAtv374jwy0pNr/7pAHyPKsTLocixovoDW8YI=
-SIZE (flake8-2.2.5.tar.gz) = 28333
+SHA256 (flake8-2.5.1.tar.gz) = RIrtSLBnH+YGL0e5jDCB86Szb76Z3bisKjvm5ssTVgM=
+SIZE (flake8-2.5.1.tar.gz) = 83692
Index: patches/patch-flake8_tests_test_engine_py
===
RCS file: patches/patch-flake8_tests_test_engine_py
diff -N patches/patch-flake8_tests_test_engine_py
--- patches/patch-flake8_tests_test_engine_py 24 Dec 2015 15:36:54 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-flake8_tests_test_engine_py,v 1.1 2015/12/24 15:36:54 shadchin
Exp $
flake8/tests/test_engine.py.orig Sat Sep 13 20:16:36 2014
-+++ flake8/tests/test_engine.pyThu Dec 24 15:06:46 2015
-@@ -50,7 +50,7 @@ class TestEngine(unittest.TestCase):
- self.assertTrue(len(registered_exts[0]) > 0)
- for i in registered_exts[1:]:
- self.assertTrue(isinstance(i, list))
--register_check.assert_called()
-+self.assertTrue(register_check.called)
-
- def test_get_parser(self):
- # setup
-@@ -64,13 +64,13 @@ class TestEngine(unittest.TestCase):
- # actual call we're testing
- parser, hooks = engine.get_parser()
- # assertions
--re.assert_called()
--gpv.assert_called()
-+self.assertTrue(re.called)
-+self.assertTrue(gpv.called)
- pgp.assert_called_once_with(
- 'flake8',
- '%s (pyflakes: 0.7, mccabe: 0.2) Python Version' % __version__)
--m.remove_option.assert_called()
--m.add_option.assert_called()
-+self.assertTrue(m.remove_option.called)
-+self.assertTrue(m.add_option.called)
- self.assertEqual(parser, m)
- self.assertEqual(hooks, [])
- # clean-up
Index: patches/patch-flake8_tests_test_integration_py
===
RCS file: patches/patch-flake8_tests_test_integration_py
diff -N patches/patch-flake8_tests_test_integration_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-flake8_tests_test_integration_py 26 Dec 2015 00:17:20
-
@@ -0,0 +1,27 @@
+$OpenBSD$
+This test does not work on Python 2 since the mock library can't
+override sys.stdout.flush, so we mock sys.stdout instead. Patch was
+sent upstream: https://gitlab.com/pycqa/flake8/merge_requests/49
+--- flake8/tests/test_integration.py.orig Sat Mar 7 21:22:11 2015
flake8/tests/test_integration.py Fri Dec 25 01:12:13 2015
+@@ -40,17 +40,17 @@ class IntegrationTestCase(unittest.TestCase):
+
+ def _job_tester(self, jobs):
+ # mock stdout.flush so we can count the number of jobs created
+-with mock.patch('sys.stdout.flush') as mocked:
++with mock.patch('sys.stdout') as mocked:
+ guide, report = self.check_files(arglist=['--jobs=%s' % jobs])
+ if is_windows():
+ # The code path where guide.options.jobs gets converted to an
+ # int is not run on windows. So, do the int conversion here.
+ self.assertEqual(int(guide.options.jobs), jobs)
+ # On windows, call count is always zero.
+-self.assertEqual(mocked.call_count, 0)
++self.assertEqual(mocked.flush.call_count, 0)
+ else:
+ self.assertEqual(guide.options.jobs, jobs)
+-self.assertEqual(mocked.call_count, jobs)
++self.assertEqual(mocked.flush.call_count, jobs)
+
+ def test_jobs(self):
+ self._job_tester(2)
Index: patches/patch-setup_py
=
Re: Importing pkg_module
On Wed, Dec 16, 2015 at 10:33:33PM +0300, Vadim Zhukov wrote: > (some history) > > During this summer the Jannis Tsaraias worked on the pkg_module, an > automated port creation framework as a GSoC Project. The project > succeeded, and Jannis stayed to maintain the code and accept patches > from interested parties: > > https://github.com/diethyl/pkg_module > > (back to nowadays) > > A few months went, and we're still at the same place. pkg_module > proved to work by a few people already, and should be a nice addition > for 5.9. So I want to move on and finally import it. I'm attaching the > archive to be extracted under /usr/ports/infrastructure. After that > just type something like "pkg_module ruby dbf" and see how easy it > goes. :) > > Personally I use it about once a month, saving a hour or two of manual > work. In particular, I'm trying to reuse this code to make maintaining > KDE Frameworks easier: doing things manually, I have to re-start > porting a new version before finishing a previous one... > > Any comments/suggestions/objections/okays? Fwiw, i had a quick go at testing this because i wanted to play with LastFM::Export, and it just did the right thing. cd /tmp git clone https://github.com/diethyl/pkg_module cd pkg_module perl -Ilib pkg_module p5 LastFM::Export lots of installing stuff from cpan already in the portstree... and it generated the 4 missing ports i needed: /usr/ports/mystuff/cpan/p5-MooseX-StrictConstructor /usr/ports/mystuff/cpan/p5-Net-LastFM /usr/ports/mystuff/cpan/p5-Data-Stream-Bulk /usr/ports/mystuff/cpan/p5-LastFM-Export With all the correct runtime dependencies - only missing thing was p5-Test-Pod being a TDEP of p5-Net-LastFM but afaik this isnt handled yet by the tool. (oh, and of course in all this, the most awesome thing is that LastFM::Export actually works - plenty of ideas flowing now...) Landry
UPDATE: devel/py-futures 3.0.3
Hi,
This diff updates py-futures to the latest release.
Tested on amd64.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/devel/py-futures/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2015 10:51:53 - 1.3
+++ Makefile25 Dec 2015 18:39:04 -
@@ -2,11 +2,10 @@
COMMENT= futures implementation for Python
-MODPY_EGG_VERSION= 2.1.4
+MODPY_EGG_VERSION= 3.0.3
DISTNAME= futures-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES=devel
-REVISION= 0
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -15,5 +14,10 @@ MODPY_PI = Yes
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
+
+TEST_DEPENDS = lang/python/${MODPY_VERSION},-tests
+
+do-test:
+ cd ${WRKSRC} && ${MODPY_BIN} test_futures.py
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-futures/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo2 Oct 2013 07:55:04 - 1.1.1.1
+++ distinfo25 Dec 2015 18:39:04 -
@@ -1,2 +1,2 @@
-SHA256 (futures-2.1.4.tar.gz) = jE8mkbKU170cPWDs26wtQ2uxvmGITzIcBGhCUuDV7C0=
-SIZE (futures-2.1.4.tar.gz) = 11840
+SHA256 (futures-3.0.3.tar.gz) = L+I0K7T+i44hfw0htZIcvlQIv5Ztn5ICXnB+iBsZi+0=
+SIZE (futures-3.0.3.tar.gz) = 24959
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-futures/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 2 Oct 2013 07:55:05 - 1.1.1.1
+++ pkg/PLIST 25 Dec 2015 18:39:04 -
@@ -7,22 +7,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/_base.py
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/_base.pyc
-lib/python${MODPY_VERSION}/site-packages/concurrent/futures/_compat.py
-lib/python${MODPY_VERSION}/site-packages/concurrent/futures/_compat.pyc
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/process.py
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/process.pyc
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/thread.py
lib/python${MODPY_VERSION}/site-packages/concurrent/futures/thread.pyc
-lib/python${MODPY_VERSION}/site-packages/futures/
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/futures/__init__.py
-lib/python${MODPY_VERSION}/site-packages/futures/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/futures/process.py
-lib/python${MODPY_VERSION}/site-packages/futures/process.pyc
-lib/python${MODPY_VERSION}/site-packages/futures/thread.py
-lib/python${MODPY_VERSION}/site-packages/futures/thread.pyc
PATCH: geo/josm update
This is a simple geo/josm update to revision 9060.
Runs fine on my amd64 (-current) machine since many weeks now.
Holger
;-se
Index: Makefile
===
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile31 Oct 2015 18:44:31 - 1.30
+++ Makefile25 Dec 2015 09:43:03 -
@@ -2,7 +2,7 @@
COMMENT= OpenStreetMap map editor
-SVN_REV= 8969
+SVN_REV= 9060
DISTNAME= josm-snapshot-${SVN_REV}
EXTRACT_SUFX = .jar
EXTRACT_CASES+=*.jar) unzip -qa ${FULLDISTDIR}/$$archive -d
${WRKDIST};;
Index: distinfo
===
RCS file: /cvs/ports/geo/josm/distinfo,v
retrieving revision 1.14
diff -u -p -u -r1.14 distinfo
--- distinfo31 Oct 2015 18:44:31 - 1.14
+++ distinfo25 Dec 2015 09:43:03 -
@@ -1,2 +1,2 @@
-SHA256 (josm-snapshot-8969.jar) = b8ZfGEhp1wyWtQEh8Wkj+nVtuyG75qe5vPMNjdQ8riY=
-SIZE (josm-snapshot-8969.jar) = 10347546
+SHA256 (josm-snapshot-9060.jar) = QgKFYQK0CtvVUdItOEukJNrt2722i7Lq50mGPvQCODA=
+SIZE (josm-snapshot-9060.jar) = 10396174
