CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 03:46:24 Modified files: www/p5-SOAP-WSDL: Makefile distinfo www/p5-SOAP-WSDL/pkg: PLIST Log message: Update to p5-SOAP-WSDL-3.003.
UPDATE: emulators/mgba
Hi,
Here's an update to mgba-0.3.0.
Removes a patch, adds manpages and a desktop file. Couple of relevant
bugfixes too (fixes use-after-free when deleting breakpoints in the
debugger, for example).
ok?
Index: Makefile
===
RCS file: /cvs/ports/emulators/mgba/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile19 Jul 2015 21:00:00 - 1.1.1.1
+++ Makefile17 Aug 2015 08:59:08 -
@@ -3,7 +3,7 @@
COMMENT-main = Game Boy Advance emulator
COMMENT-qt = Game Boy Advance emulator with GUI
-V =0.2.1
+V =0.3.0
DISTNAME = mgba-$V
PKGNAME-main = mgba-$V
PKGNAME-qt = mgba-qt-$V
@@ -23,10 +23,11 @@ MAINTAINER =Anthony J. Bentley anthon
# MPL 2.0
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB-main = GL GLU MagickCore MagickWand SDL avcodec avformat \
+cWANTLIB = GL GLU MagickCore MagickWand SDL avcodec avformat \
avresample avutil c edit m png pthread swscale \
termcap z zip
-WANTLIB-qt = ${WANTLIB-main} Qt5Core Qt5Gui Qt5Multimedia \
+WANTLIB-main = ${cWANTLIB} pixman-1 pthread-stubs
+WANTLIB-qt = ${cWANTLIB} Qt5Core Qt5Gui Qt5Multimedia \
Qt5Network Qt5OpenGL Qt5Widgets estdc++ mgba
GH_ACCOUNT = mgba-emu
@@ -44,6 +45,8 @@ LIB_DEPENDS-main =archivers/libzip \
LIB_DEPENDS-qt = ${LIB_DEPENDS-main} \
${MODQT_LIB_DEPENDS} \
emulators/mgba,-main
+RUN_DEPENDS-qt = devel/desktop-file-utils \
+ x11/gtk+3,-guic
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt5
Index: distinfo
===
RCS file: /cvs/ports/emulators/mgba/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo19 Jul 2015 21:00:00 - 1.1.1.1
+++ distinfo17 Aug 2015 08:59:08 -
@@ -1,2 +1,2 @@
-SHA256 (mgba-0.2.1.tar.gz) = JK2rn//mCnmv0vgleHl7ImQmDUIr11exy+jt90qJCrM=
-SIZE (mgba-0.2.1.tar.gz) = 2243315
+SHA256 (mgba-0.3.0.tar.gz) = 1R1MSCekQ7ixQOIyv9S+4PKKNHCOqXbi6S5kztoy/ws=
+SIZE (mgba-0.3.0.tar.gz) = 2559946
Index: patches/patch-src_platform_sdl_CMakeLists_txt
===
RCS file: patches/patch-src_platform_sdl_CMakeLists_txt
diff -N patches/patch-src_platform_sdl_CMakeLists_txt
--- patches/patch-src_platform_sdl_CMakeLists_txt 19 Jul 2015 22:24:11
- 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_platform_sdl_CMakeLists_txt,v 1.2 2015/07/19 22:24:11
bentley Exp $
-Pixman code is busted, workaround suggested by upstream.
-Only an issue on SDL 1.2 platforms like OpenBSD.
src/platform/sdl/CMakeLists.txt.orig Tue Apr 7 01:54:02 2015
-+++ src/platform/sdl/CMakeLists.txtTue Apr 7 01:54:02 2015
-@@ -17,7 +17,6 @@ if(SDL_VERSION EQUAL 1.2 OR NOT SDL2_FOUND)
- find_package(SDL 1.2)
- set(SDL_VERSION 1.2 PARENT_SCOPE)
- set(SDL_VERSION_DEBIAN 1.2debian)
-- set(USE_PIXMAN ON)
- endif()
-
- if (NOT SDL2_FOUND AND NOT SDL_FOUND)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/emulators/mgba/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 19 Jul 2015 21:00:00 - 1.1.1.1
+++ pkg/PLIST-main 17 Aug 2015 08:59:08 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2015/07/19 21:00:00 bentley Exp $
@bin bin/mgba
@lib lib/libmgba.so.${LIBmgba_VERSION}
+@man man/man6/mgba-qt.6
+@man man/man6/mgba.6
share/doc/mGBA/
share/doc/mGBA/CHANGES
share/doc/mGBA/README.md
Index: pkg/PLIST-qt
===
RCS file: /cvs/ports/emulators/mgba/pkg/PLIST-qt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST-qt
--- pkg/PLIST-qt19 Jul 2015 21:00:00 - 1.1.1.1
+++ pkg/PLIST-qt17 Aug 2015 08:59:08 -
@@ -1,2 +1,16 @@
@comment $OpenBSD: PLIST-qt,v 1.1.1.1 2015/07/19 21:00:00 bentley Exp $
@bin bin/mgba-qt
+share/applications/mgba-qt.desktop
+share/icons/hicolor/128x128/apps/mgba.png
+share/icons/hicolor/16x16/apps/mgba.png
+share/icons/hicolor/24x24/apps/mgba.png
+share/icons/hicolor/256x256/apps/mgba.png
+share/icons/hicolor/32x32/apps/mgba.png
+share/icons/hicolor/48x48/apps/mgba.png
+share/icons/hicolor/512x512/apps/mgba.png
+share/icons/hicolor/64x64/apps/mgba.png
+share/icons/hicolor/96x96/apps/mgba.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2015/08/17 06:06:27
Modified files:
audio/libcanberra: Makefile
Log message:
Adjust WANTLIB-gtk{,3} and bump.
ok aja@ with some nit picking about adding new lines ;-)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2015/08/17 03:02:36 Modified files: lang/moarvm: Makefile Log message: remove mips64 from the ONLY_FOR_ARCH list for it doesn't build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2015/08/17 03:07:22 Log message: Import colortree-1.7.0. From David Dahlberg. ok zhuk@ Status: Vendor Tag: bentley Release Tags: bentley_20150817 N ports/sysutils/colortree/Makefile N ports/sysutils/colortree/distinfo N ports/sysutils/colortree/patches/patch-doc_tree_1 N ports/sysutils/colortree/pkg/DESCR N ports/sysutils/colortree/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/08/17 04:39:37 Modified files: x11/gnome/control-center: Makefile Added files: x11/gnome/control-center/patches: patch-panels_datetime_data_timezone_8_5_dim_png patch-panels_datetime_data_timezone_8_5_png patch-panels_datetime_datetime_gresource_xml Log message: Unbreak after recent North Korea timezone change. breakage reported by G anymede, thanks!
py-jsonschema (Re: CVS: cvs.openbsd.org: ports)
Hi,
On Sun, Aug 16, 2015 at 01:46:22PM -0600, Edd Barrett wrote:
CVSROOT: /cvs
Module name: ports
Changes by: e...@cvs.openbsd.org2015/08/16 13:46:22
Log message:
Import py-jsonschema.
OK rpointel@, with input from rpointel@ and daniel@.
Thanks
Status:
Vendor Tag: edd
Release Tags: edd_20150816
N ports/devel/py-jsonschema/Makefile
N ports/devel/py-jsonschema/distinfo
N ports/devel/py-jsonschema/pkg/DESCR
N ports/devel/py-jsonschema/pkg/PLIST
N
ports/devel/py-jsonschema/patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
No conflicts created by this import
This tries to download additional stuff during build:
=== Building for py-jsonschema-2.5.1
Download error on https://pypi.python.org/simple/vcversioner/: [Errno 65] No
route to host -- Some packages may not be found!
Couldn't find index page for 'vcversioner' (maybe misspelled?)
Download error on https://pypi.python.org/simple/: [Errno 65] No route to host
-- Some packages may not be found!
No local packages or download links found for vcversioner
Traceback (most recent call last):
File ./setup.py, line 44, in module
vcversioner={version_module_paths : [jsonschema/_version.py]},
File /usr/local/lib/python2.7/distutils/core.py, line 111, in setup
_setup_distribution = dist = klass(attrs)
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 239,
in __init__
self.fetch_build_eggs(attrs.pop('setup_requires'))
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 264,
in fetch_build_eggs
replace_conflicting=True
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 620, in
resolve
dist = best[req.key] = env.best_match(req, ws, installer)
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 858, in
best_match
return self.obtain(req, installer) # try and download/install
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 870, in
obtain
return installer(requirement)
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 314,
in fetch_build_egg
return cmd.easy_install(req)
File
/usr/local/lib/python2.7/site-packages/setuptools/command/easy_install.py,
line 587, in easy_install
raise DistutilsError(msg)
distutils.errors.DistutilsError: Could not find suitable distribution for
Requirement.parse('vcversioner')
Download error on https://pypi.python.org/simple/vcversioner/: [Errno 65] No
route to host -- Some packages may not be found!
Couldn't find index page for 'vcversioner' (maybe misspelled?)
Download error on https://pypi.python.org/simple/: [Errno 65] No route to host
-- Some packages may not be found!
No local packages or download links found for vcversioner
Traceback (most recent call last):
File ./setup.py, line 44, in module
vcversioner={version_module_paths : [jsonschema/_version.py]},
File /usr/local/lib/python2.7/distutils/core.py, line 111, in setup
_setup_distribution = dist = klass(attrs)
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 239,
in __init__
self.fetch_build_eggs(attrs.pop('setup_requires'))
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 264,
in fetch_build_eggs
replace_conflicting=True
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 620, in
resolve
dist = best[req.key] = env.best_match(req, ws, installer)
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 858, in
best_match
return self.obtain(req, installer) # try and download/install
File /usr/local/lib/python2.7/site-packages/pkg_resources.py, line 870, in
obtain
return installer(requirement)
File /usr/local/lib/python2.7/site-packages/setuptools/dist.py, line 314,
in fetch_build_egg
return cmd.easy_install(req)
File
/usr/local/lib/python2.7/site-packages/setuptools/command/easy_install.py,
line 587, in easy_install
raise DistutilsError(msg)
distutils.errors.DistutilsError: Could not find suitable distribution for
Requirement.parse('vcversioner')
*** Error 1 in devel/py-jsonschema (/usr/ports/lang/python/python.port.mk:172
'do-build': @: ;cd /home/ports/pobj/p2/py-jsonschema-2.5.1/jso...)
*** Error 1 in devel/py-jsonschema
(/usr/ports/infrastructure/mk/bsd.port.mk:2763
'/home/ports/pobj/p2/py-jsonschema-2.5.1/.build_done')
*** Error 1 in devel/py-jsonschema
(/usr/ports/infrastructure/mk/bsd.port.mk:2488 'build')
=== Exiting devel/py-jsonschema with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build')
Error: job failed 256
Ciao,
Kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2015/08/17 03:08:09 Modified files: sysutils : Makefile Log message: +colortree
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
On 17 August 2015 at 15:37, Kenneth Westerback kwesterb...@gmail.com wrote: On 17 August 2015 at 15:30, Anil Madhavapeddy a...@recoil.org wrote: On 16 Aug 2015, at 09:18, Jonathan Gray j...@jsg.id.au wrote: On Sun, I built coccinelle on armv7 with the -2 version of the patch without problem. It appears this is not native as infrastructure/mk/arch-defines.mk has: OCAML_NATIVE_ARCHS = i386 sparc amd64 OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64 ? I'm not really in a position to do a bulk build but if there is some sort of ocaml regression test or the like you'd like run let me know. Thanks! After your and krw's tests, the final -4 patchset here should build all the ports on everything: http://recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-4.patch.txt OCaml does support ARM native code, but our port currently doesn't use it until the configure glue is in. I'll have a followup patch to enable this, but got sidetracked with compiling up a custom u-Boot for my Cubieboard2 since the current snapshots don't seem to boot successfully on it. For now, the portable bytecode is sufficient (but there aren't any interesting ARM-specific regress tests until native code support lands). Would a ports person be able to give me an ok to commit the patchset? -a Firing up -4 on my i386 test box while you wait for the ports@ ok. :-) What was the issue with ocaml-camlimage? Ken i386 bulk build finished with no problems. Well, no problems related to ocaml. Just my usual tmpfs losing a file or two issues. :-) Ken
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: yasu...@cvs.openbsd.org 2015/08/17 21:12:21 Modified files: mail/mew : Makefile distinfo mail/mew/pkg : PLIST Log message: Update mew to 6.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 06:26:20 Modified files: www/p5-Rose-URI: Makefile distinfo Log message: Update to p5-Rose-URI-1.00.
CMake-3.3.1
Hi all,
An update to CMake-3.3.1.
As usual, before committing I'd appreciate a bulk build with the
diff below.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.131
diff -u -p -u -p -r1.131 Makefile
--- Makefile3 Aug 2015 06:11:50 - 1.131
+++ Makefile17 Aug 2015 14:20:29 -
@@ -9,17 +9,15 @@ CFLAGS += -O1 -fno-stack-protector
COMMENT = portable build system
-VER = 3.2.3
+VER = 3.3.1
DISTNAME = cmake-${VER}
-REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://www.cmake.org/
MAINTAINER = David Coppa dco...@openbsd.org
-MASTER_SITES = ${HOMEPAGE}files/v3.3/ \
- ${HOMEPAGE}files/v${VER:R}/
+MASTER_SITES = ${HOMEPAGE}files/v${VER:R}/
# BSD
PERMIT_PACKAGE_CDROM = Yes
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 cmake.port.mk
--- cmake.port.mk 1 Jul 2015 08:08:18 - 1.46
+++ cmake.port.mk 17 Aug 2015 14:20:29 -
@@ -1,6 +1,6 @@
# $OpenBSD: cmake.port.mk,v 1.46 2015/07/01 08:08:18 dcoppa Exp $
-BUILD_DEPENDS+=devel/cmake=3.2.3p1
+BUILD_DEPENDS+=devel/cmake=3.3.1
.for _n _v in ${SHARED_LIBS}
CONFIGURE_ENV+=LIB${_n}_VERSION=${_v}
Index: distinfo
===
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 distinfo
--- distinfo3 Jun 2015 08:25:30 - 1.34
+++ distinfo17 Aug 2015 14:20:29 -
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.2.3.tar.gz) = oevK9tKI60yWZxTqRX47lnfN/eeIINDwiHEtcyCFApc=
-SIZE (cmake-3.2.3.tar.gz) = 6438938
+SHA256 (cmake-3.3.1.tar.gz) = zWUCLGoHB/HHES+Z6cmBZ3/dVRj33foPd41M7nET49Y=
+SIZE (cmake-3.3.1.tar.gz) = 6577869
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt26 Mar 2015 07:10:02 - 1.16
+++ patches/patch-CMakeLists_txt17 Aug 2015 14:20:29 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.16 2015/03/26 07:10:02 dcoppa Exp $
CMakeLists.txt.origTue Mar 10 09:38:44 2015
-+++ CMakeLists.txt Wed Mar 18 06:23:59 2015
-@@ -249,6 +249,15 @@ macro (CMAKE_BUILD_UTILITIES)
+--- CMakeLists.txt.origThu Aug 13 16:56:59 2015
CMakeLists.txt Mon Aug 17 15:39:13 2015
+@@ -257,6 +257,15 @@ macro (CMAKE_BUILD_UTILITIES)
# (a macro defined in this file)
CMAKE_HANDLE_SYSTEM_LIBRARIES()
Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake
===
RCS file:
/cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Modules_Compiler_GNU-Fortran_cmake
--- patches/patch-Modules_Compiler_GNU-Fortran_cmake26 Mar 2015 07:10:02
- 1.4
+++ patches/patch-Modules_Compiler_GNU-Fortran_cmake17 Aug 2015 14:20:29
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.4 2015/03/26 07:10:02
dcoppa Exp $
Modules/Compiler/GNU-Fortran.cmake.origTue Mar 10 09:38:44 2015
-+++ Modules/Compiler/GNU-Fortran.cmake Wed Mar 18 06:15:27 2015
-@@ -4,9 +4,5 @@ __compiler_gnu(Fortran)
+--- Modules/Compiler/GNU-Fortran.cmake.origThu Aug 13 16:56:59 2015
Modules/Compiler/GNU-Fortran.cmake Mon Aug 17 15:39:13 2015
+@@ -4,10 +4,6 @@ __compiler_gnu(Fortran)
set(CMAKE_Fortran_FORMAT_FIXED_FLAG -ffixed-form)
set(CMAKE_Fortran_FORMAT_FREE_FLAG -ffree-form)
@@ -9,5 +9,6 @@ $OpenBSD: patch-Modules_Compiler_GNU-For
-set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT -Os)
-set(CMAKE_Fortran_FLAGS_RELEASE_INIT -O3)
-
- # Fortran-specific feature flags.
- set(CMAKE_Fortran_MODDIR_FLAG -J)
+ # No -isystem for Fortran because it will not find .mod files.
+ unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
+
Index: patches/patch-Modules_FindBoost_cmake
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindBoost_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_FindBoost_cmake
--- patches/patch-Modules_FindBoost_cmake 1 Jul 2015 08:08:18 -
1.7
+++ patches/patch-Modules_FindBoost_cmake 17 Aug 2015 14:20:29 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_FindBoost_cmake,v 1.7 2015/07/01 08:08:18 dcoppa Exp $
Modules/FindBoost.cmake.orig Mon Jun 1 17:56:08 2015
-+++ Modules/FindBoost.cmakeWed Jul 1 08:07:12 2015
-@@ -447,6 +447,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
+--- Modules/FindBoost.cmake.orig Thu Aug 13 16:56:59 2015
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2015/08/17 07:37:48 Modified files: security/ccid : Makefile distinfo security/ccid/patches: patch-src_Makefile_in Log message: Update to ccid-1.4.20
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2015/08/17 07:36:38 Modified files: security/pcsc-lite: Makefile distinfo Log message: Update to pcsc-lite-1.8.14
[update] lang/node 0.10.35 - 0.12.7
Hi ports!
Here is an update for lang/node, it brings it to the latest and also
includes my pkg fix which allows for creating completely self
contained module packages (sqlite3 for example, ends up with a self
contained node_modules directory.. with all its dependencies and
dependencies of dependencies contained within.).
Also attached is a script to build a distfile out of a npm module.
I still haven't done enough testing for this to go in.. and the big jump
breaks a great number of the node-* ports currently in the tree.. So
updating will take some coordination.
There is also an issue with npm somewhere deep that is causing full
paths to be output in a modules build. This causes issues when someone
has a different WRKOBJDIR (or friends) defined.
I am also looking for suggestions on how to move forward with this.. As
I see it we have two options.. 1) keep waiting until I sort out the issues
with npm.. and keep everything at an older version for now.. or 2) update
node to 0.12.7 and mark the current node-* ports as broken (maybe even
remove them?).
Cheers,
Aaron
Index: Makefile
===
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 3 Feb 2015 15:48:20 - 1.33
+++ Makefile 12 Aug 2015 18:06:20 -
@@ -8,7 +8,7 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= V8 JavaScript for clients and servers
-NODE_VERSION= v0.10.35
+NODE_VERSION= v0.12.7
DISTNAME= node-${NODE_VERSION}
PKGNAME= ${DISTNAME:S/v//g}
@@ -33,6 +33,7 @@ LIB_DEPENDS= devel/libexecinfo
USE_GMAKE= Yes
BUILD_DEPENDS= devel/gyp \
+ devel/ninja \
sysutils/flock
# node-gyp uses it at runtime
@@ -42,7 +43,9 @@ RUN_DEPENDS= devel/gmake \
TEST_TARGET= test
CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --openssl-use-sys \
+CONFIGURE_ARGS= --ninja \
+ --openssl-use-sys \
+ --prefix=${PREFIX} \
--shared-zlib
SUBST_VARS+= CFLAGS
Index: distinfo
===
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo 3 Feb 2015 15:48:20 - 1.23
+++ distinfo 12 Aug 2015 18:06:20 -
@@ -1,2 +1,2 @@
-SHA256 (node-v0.10.35.tar.gz) = AENla7FyTLCdvclgov1u4307rbL5x1VistESNdqkCgM=
-SIZE (node-v0.10.35.tar.gz) = 14417025
+SHA256 (node-v0.12.7.tar.gz) = sj1k3wUcnJabDFg/gC1dcd40LlMGcSelBhQVvn4S850=
+SIZE (node-v0.12.7.tar.gz) = 20063992
Index: node.port.mk
===
RCS file: /cvs/ports/lang/node/node.port.mk,v
retrieving revision 1.4
diff -u -p -r1.4 node.port.mk
--- node.port.mk 5 Nov 2013 16:21:26 - 1.4
+++ node.port.mk 12 Aug 2015 18:06:20 -
@@ -8,6 +8,11 @@ BUILD_DEPENDS += lang/node=0.6.17p2
RUN_DEPENDS += lang/node=0.6.17p2
.if ${CONFIGURE_STYLE:L:Mnpm}
+. if ${CONFIGURE_STYLE:L:Mpkg}
+# fully packaged node modules - basically we need to run npm build on them.
+SHARED_ONLY = Yes
+WANTLIB += m stdc++ crypto pthread ssl z
+. endif
. if ${CONFIGURE_STYLE:L:Mext}
# Node C++ extensions are specific to an arch and are loaded as
# shared libraries, so set SHARED_ONLY and make sure PKG_ARCH=* is
@@ -35,9 +40,14 @@ EXTRACT_SUFX ?= .tgz
PKGNAME ?= node-${DISTNAME:S/^node-//}
MODNODE_BIN_NPM = ${LOCALBASE}/bin/npm
-NPM_INSTALL_FILE = ${WRKDIR}/${DISTNAME}.tgz
+MODNODE_BIN_NODE_GYP = ${LOCALBASE}/bin/node-gyp
+NPM_INSTALL_FILE = ${WRKDIR}/${DISTNAME}${EXTRACT_SUFX}
NPM_TAR_DIR = package
+.if ${CONFIGURE_STYLE:L:Mpkg}
+WRKDIST = ${WRKDIR}/${NPM_NAME}
+.else
WRKDIST = ${WRKDIR}/${NPM_TAR_DIR}
+.endif
.if ${CONFIGURE_STYLE:L:Mexpresso}
TEST_DEPENDS += devel/node-expresso
@@ -58,26 +68,47 @@ MODNODE_DEPENDS ?=
# Link all dependencies first so that npm will install without complaining.
# Then rebuild the distfile, since it may contain local patches.
# Then use npm install to install the package to a local node_modules dir.
+.if ${CONFIGURE_STYLE:L:Mpkg}
+MODNODE_BUILD_TARGET = \
+ mkdir -p ${WRKDIR}/node_modules; \
+ cd ${WRKDIR} tar -zcf ${NPM_INSTALL_FILE} -C ${WRKDIST}; \
+ ln -s ${WRKDIST} ${WRKDIR}/node_modules/${NPM_NAME}; \
+ cd ${WRKDIST} find . -type f -name '*.orig' -print0 | \
+ xargs -r0 rm; \
+ cd ${WRKDIR} ${MODNODE_BIN_NPM} rebuild
+.else
MODNODE_BUILD_TARGET = \
cd ${WRKDIST} find . -type f -name '*.orig' -print0 | \
xargs -r0 rm; \
for dep in ${MODNODE_DEPENDS}; do \
cd ${WRKDIR} ${MODNODE_BIN_NPM} link $$dep; \
- done; \
+ done;
cd ${WRKDIR} tar -zcf ${NPM_INSTALL_FILE} ${NPM_TAR_DIR}; \
cd ${WRKDIR} HOME=${WRKDIR} ${MODNODE_BIN_NPM} install \
- ${NPM_INSTALL_FILE}
+ ${NPM_INSTALL_FILE}; \
+
+.endif
+
# Move just this package from the local node_modules dir to the global
# node_modules dir. If there are any binaries in the package, create
# symlinks in the default PATH that point to them.
+.if ${CONFIGURE_STYLE:L:Mpkg}
+MODNODE_PKG=${WRKSRC}
+.else
Re: py-jsonschema (Re: CVS: cvs.openbsd.org: ports)
On Mon, Aug 17, 2015 at 12:39:03PM +0200, Matthias Kilian wrote: This tries to download additional stuff during build: Bah, that's annoying. Looks like I need to port a couple more bits. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2015/08/17 11:56:28 ports/net/p5-NetAddr-IP/patches Update of /cvs/ports/net/p5-NetAddr-IP/patches In directory cvs.openbsd.org:/tmp/cvs-serv20717/patches Log Message: Directory /cvs/ports/net/p5-NetAddr-IP/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2015/08/17 11:21:31 Modified files: www/iridium: Makefile Added files: www/iridium/patches: patch-third_party_libusb_libusb_gyp patch-third_party_libusb_src_libusb_core_c Removed files: www/iridium/patches: patch-device_usb_usb_context_cc patch-device_usb_usb_error_cc patch-device_usb_usb_service_impl_cc patch-device_usb_usb_service_impl_h Log message: merge the patches from chromium that make iridium use the internal libusb as well
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2015/08/17 09:33:05 Modified files: math/R : Makefile distinfo math/R/pkg : PLIST README Removed files: math/R/patches : patch-src_main_connections_c patch-src_main_gram_y Log message: Update to R 3.2.2 OK aja@
UPDATE: net/synergy 1.6.2 = 1.7.4
Hi Ports,
As there is a new version of synergy released and including the comments
from the last diff I proposed, attached is an updated diff. Works ok for
me to Win 7 client.
Comments/tests welcome.
Index: Makefile
===
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 5 Apr 2015 13:31:14 - 1.28
+++ Makefile 12 Aug 2015 18:02:21 -
@@ -3,12 +3,13 @@
COMMENT= mouse and keyboard sharing utility
DISTNAME= synergy-${GH_TAGNAME}
-REVISION= 0
+PKGNAME= synergy-${V}
CATEGORIES= net x11
GH_ACCOUNT= synergy
GH_PROJECT= synergy
-GH_TAGNAME= 1.6.2
+GH_TAGNAME= v${V}-stable
+V= 1.7.4
HOMEPAGE= http://synergy-foss.org/
@@ -16,10 +17,9 @@ HOMEPAGE= http://synergy-foss.org/
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= ICE SM X11 Xext Xi Xinerama Xrandr Xtst \
- c cryptopp curl m pthread stdc++
+ c curl m pthread stdc++
-LIB_DEPENDS= devel/cryptopp \
- net/curl
+LIB_DEPENDS= net/curl
MODULES= devel/cmake
Index: distinfo
===
RCS file: /cvs/ports/net/synergy/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 3 Jan 2015 04:59:27 - 1.11
+++ distinfo 12 Aug 2015 18:02:21 -
@@ -1,2 +1,2 @@
-SHA256 (synergy-1.6.2.tar.gz) = NsCiyeocOhOmE0zh52rY3S9EIQDdYHXFPzGzmdJUO6M=
-SIZE (synergy-1.6.2.tar.gz) = 4411385
+SHA256 (synergy-v1.7.4-stable.tar.gz) = 215dc3918b9f3ddfb57cc963f8df6751e5e834fd90c0a8b2767091589b012bdf
+SIZE (synergy-v1.7.4-stable.tar.gz) = 13665193
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/synergy/patches/patch-CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 3 Jan 2015 04:59:27 - 1.7
+++ patches/patch-CMakeLists_txt 12 Aug 2015 18:02:21 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.7 2015/01/03 04:59:27 bcallah Exp $
CMakeLists.txt.orig Thu Nov 6 13:09:27 2014
-+++ CMakeLists.txt Thu Nov 6 19:59:59 2014
+--- CMakeLists.txt.orig Tue May 26 11:56:21 2015
CMakeLists.txt Mon Aug 3 17:14:36 2015
@@ -76,7 +76,7 @@ if (UNIX)
# warnings as errors:
@@ -8,9 +8,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Werror)
+ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- # For config.h, detect the libraries, functions, etc.
- include(CheckIncludeFiles)
-@@ -98,7 +98,7 @@ if (UNIX)
+ if (NOT APPLE)
+ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC)
+@@ -102,7 +102,7 @@ if (UNIX)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
check_include_files(sys/select.h HAVE_SYS_SELECT_H)
@@ -19,7 +19,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
check_include_files(sys/time.h HAVE_SYS_TIME_H)
check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
-@@ -109,7 +109,6 @@ if (UNIX)
+@@ -113,7 +113,6 @@ if (UNIX)
check_function_exists(gmtime_r HAVE_GMTIME_R)
check_function_exists(nanosleep HAVE_NANOSLEEP)
check_function_exists(poll HAVE_POLL)
@@ -27,7 +27,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
check_function_exists(strftime HAVE_STRFTIME)
check_function_exists(vsnprintf HAVE_VSNPRINTF)
check_function_exists(inet_aton HAVE_INET_ATON)
-@@ -152,6 +151,8 @@ if (UNIX)
+@@ -156,6 +155,8 @@ if (UNIX)
message(FATAL_ERROR Missing library: pthread)
endif()
@@ -36,7 +36,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
# curl is used on both Linux and Mac
find_package(CURL)
if (CURL_FOUND)
-@@ -196,78 +197,60 @@ if (UNIX)
+@@ -200,77 +201,59 @@ if (UNIX)
else() # not-apple
@@ -142,20 +142,11 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201
+ if(X11_Xrandr_FOUND)
+ set(HAVE_X11_EXTENSIONS_XRANDR_H 1)
+ list(APPEND libs ${X11_Xrandr_LIB})
- endif()
++ endif()
+
+ if (CMAKE_SYSTEM_NAME MATCHES OpenBSD)
+ include_directories(${OPENBSD_LOCALBASE}/include)
+ link_directories(${OPENBSD_LOCALBASE}/lib)
-+ endif()
+ endif()
endif()
-
-@@ -319,7 +302,6 @@ else() # not-unix
- endif()
-
- add_subdirectory(src)
--add_subdirectory(ext)
-
- if (WIN32)
- # TODO: consider using /analyze to uncover potential bugs in the source code.
Index: patches/patch-src_CMakeLists_txt
===
RCS file: /cvs/ports/net/synergy/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 1 May 2014 14:46:53 - 1.2
+++ patches/patch-src_CMakeLists_txt 12 Aug 2015 18:02:21 -
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2014/05/01 14:46:53 bcallah Exp $
src/CMakeLists.txt.orig Tue Apr 15 22:26:08 2014
-+++ src/CMakeLists.txt Tue Apr 15 22:26:13 2014
-@@ -18,7 +18,3 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2015/08/17 12:29:15 Modified files: net/p5-NetAddr-IP: Makefile distinfo Added files: net/p5-NetAddr-IP/patches: patch-Lite_Util_Makefile_PL Log message: update p5-NetAddr-IP to 4.077
Re: [update] lang/node 0.10.35 - 0.12.7
Aaron Bieber aaron at bolddaemon.com writes: I am also looking for suggestions on how to move forward with this.. As I see it we have two options.. 1) keep waiting until I sort out the issues with npm.. and keep everything at an older version for now.. or 2) update node to 0.12.7 and mark the current node-* ports as broken (maybe even remove them?). We discussed this previously: how about modules with native lib binding? node-java is the example. Do you have plans to remove them too?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2015/08/17 13:04:51 Modified files: www/linkchecker: Makefile Log message: remove maintainer per his request
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/08/17 13:10:12 Modified files: x11/ede/desktop: Makefile x11/ede/lib: Makefile x11/emelfm2: Makefile geo/emerillon : Makefile security/erl-bcrypt: Makefile net/ettercap : Makefile graphics/evince: Makefile mail/exim : Makefile emulators/fceux: Makefile multimedia/ffmpeg2theora: Makefile graphics/ffmpegthumbnailer: Makefile devel/fossil : Makefile devel/fox : Makefile lang/fpc : Makefile graphics/freeglut: Makefile games/frozen-bubble: Makefile graphics/ftgl : Makefile emulators/fuse-utils: Makefile Log message: sync WANTLIB
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 01:16:12 Modified files: textproc/p5-Lingua-Stem-Snowball-Se: Makefile distinfo textproc/p5-Lingua-Stem-Snowball-Se/pkg: PLIST Log message: Update to p5-Lingua-Stem-Snowball-Se-1.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 01:23:41 Modified files: textproc/p5-Lingua-Stem-Snowball-No: Makefile distinfo textproc/p5-Lingua-Stem-Snowball-No/pkg: PLIST Log message: Update to p5-Lingua-Stem-Snowball-No-1.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/08/17 01:38:28 Modified files: www/phpvirtualbox: Makefile distinfo www/phpvirtualbox/pkg: PLIST Log message: Update to phpvirtualbox-5.0.2. - VirtualBox 5.X compatibility
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 01:41:59 Modified files: textproc/p5-Lingua-EN-Sentence: Makefile distinfo Log message: Update to p5-Lingua-EN-Sentence-0.29.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 01:47:13 Modified files: textproc/p5-Lingua-EN-Fathom: Makefile distinfo Log message: Update to p5-Lingua-EN-Fathom-1.18.
Re: Chrome 40+ FIDO U2F Security Keys
On Sun, Aug 16, 2015 at 5:44 PM Robert Nagy rob...@openbsd.org wrote: On (2015-08-14 13:02), Martin Pieuchot wrote: On 14/08/15(Fri) 12:22, Alexey Suslikov wrote: [...] I have a question about USB. Is there any sort of multipath in USB standard, like in SCSI, so USB stack can see same device attached to different controllers/buses? Is it possible? Not that I know. With the commit I did today to chromium, it at least can use USB devices now, so it might worth a try to test this device now. I built everything today, but my browser still crashes in the same fashion it did before.
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
On 17 August 2015 at 15:30, Anil Madhavapeddy a...@recoil.org wrote: On 16 Aug 2015, at 09:18, Jonathan Gray j...@jsg.id.au wrote: On Sun, I built coccinelle on armv7 with the -2 version of the patch without problem. It appears this is not native as infrastructure/mk/arch-defines.mk has: OCAML_NATIVE_ARCHS = i386 sparc amd64 OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64 ? I'm not really in a position to do a bulk build but if there is some sort of ocaml regression test or the like you'd like run let me know. Thanks! After your and krw's tests, the final -4 patchset here should build all the ports on everything: http://recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-4.patch.txt OCaml does support ARM native code, but our port currently doesn't use it until the configure glue is in. I'll have a followup patch to enable this, but got sidetracked with compiling up a custom u-Boot for my Cubieboard2 since the current snapshots don't seem to boot successfully on it. For now, the portable bytecode is sufficient (but there aren't any interesting ARM-specific regress tests until native code support lands). Would a ports person be able to give me an ok to commit the patchset? -a Firing up -4 on my i386 test box while you wait for the ports@ ok. :-) What was the issue with ocaml-camlimage? Ken
Re: [update] lang/node 0.10.35 - 0.12.7
Alexey Suslikov writes:
On Mon, Aug 17, 2015 at 9:29 PM, Aaron Bieber aa...@bolddaemon.com wrote:
Alexey Suslikov writes:
Aaron Bieber aaron at bolddaemon.com writes:
I am also looking for suggestions on how to move forward with this.. As
I see it we have two options.. 1) keep waiting until I sort out the issues
with npm.. and keep everything at an older version for now.. or 2) update
node to 0.12.7 and mark the current node-* ports as broken (maybe even
remove them?).
We discussed this previously: how about modules with native lib
binding?
The new pkg type (see the diff for node.port.mk) supports native
modules. Basically every thing is built as a self contained tarball,
then the native stuff is rebuilt during build.
I have attached an example of how the databases/sqlite3 (a native
module) port would be updated.
I remember you did post an example how to build such a pkg.
Could you please point to this example or re-post it so I can try
to adapt (long stalled) updates to new scheme?
Executing the previously attached mk_npm_dist script creates a .tar.gz
of a given npm package that can be used as a distfile for a port.
Example usage:
./mk_npm_dist sqlite3
...lots of output...
Created: /tmp/tmp.74ehtPh8Ur/sqlite3-3.0.10.tar.gz
Upload the sqlite3 tarball and add the new location to MASTER_SITES in
the makefile, then change CONFIGURE_STYLE to be npm pkg, regen your
PLIST and you should be good to go! (except for the path thing I
mentioned earlier :P)
Index: Makefile
===
RCS file: /cvs/ports/databases/node-sqlite3/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile3 Feb 2015 15:49:42 - 1.14
+++ Makefile13 Aug 2015 18:44:45 -
@@ -2,9 +2,8 @@
COMMENT = sqlite3 bindings for Node.js
-NPM_VERSION = 2.2.3
+NPM_VERSION = 3.0.10
NPM_NAME = sqlite3
-REVISION = 1
CATEGORIES = databases
MAINTAINER = Aaron Bieber abie...@openbsd.org
@@ -16,7 +15,10 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/node
-CONFIGURE_STYLE = npm ext
+EXTRACT_SUFX = .tar.gz
+MASTER_SITES = http://deftly.net/
+
+CONFIGURE_STYLE = npm pkg
WANTLIB = sqlite3
Index: distinfo
===
RCS file: /cvs/ports/databases/node-sqlite3/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 Jun 2014 17:42:44 - 1.5
+++ distinfo13 Aug 2015 18:44:45 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-2.2.3.tgz) = uKDcTEhArEvZxKwUeafcm2c71ICqQBgr4Q3DmNpsjMM=
-SIZE (sqlite3-2.2.3.tgz) = 2740801
+SHA256 (sqlite3-3.0.10.tar.gz) =
gszxoyjYLobrUZOFAUbZ9zu7+2yJd8/NqUiQ9ycxMLc=
+SIZE (sqlite3-3.0.10.tar.gz) = 7645915
Index: patches/patch-binding_gyp
===
RCS file: /cvs/ports/databases/node-sqlite3/patches/patch-binding_gyp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-binding_gyp
--- patches/patch-binding_gyp 4 Jun 2014 17:42:44 - 1.3
+++ patches/patch-binding_gyp 13 Aug 2015 18:44:45 -
@@ -2,10 +2,10 @@ $OpenBSD: patch-binding_gyp,v 1.3 2014/0
Build against the system sqlite3.
binding.gyp.orig Sat Apr 12 21:04:48 2014
-+++ binding.gypFri May 23 08:32:51 2014
-@@ -17,9 +17,13 @@
- conditions: [ [ OS=='linux',
{libraries+:[-Wl,-rpath=@(sqlite)/lib]} ] ]
+--- binding.gyp.orig Wed Feb 11 03:59:50 2015
binding.gypSun Apr 26 13:36:04 2015
+@@ -25,9 +25,13 @@
+ }
},
{
-dependencies: [
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/node-sqlite3/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Jun 2014 17:42:44 - 1.3
+++ pkg/PLIST 13 Aug 2015 18:44:46 -
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/06/04 17:42:44 abieber Exp $
+@comment $OpenBSD$
lib/node_modules/sqlite3/
lib/node_modules/sqlite3/CHANGELOG.md
lib/node_modules/sqlite3/LICENSE
lib/node_modules/sqlite3/README.md
+lib/node_modules/sqlite3/appveyor.yml
lib/node_modules/sqlite3/binding.gyp
lib/node_modules/sqlite3/binding.gyp.beforesubst
lib/node_modules/sqlite3/build/
@@ -19,7 +20,15 @@ lib/node_modules/sqlite3/build/Release/.
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/database.o.d
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/node_sqlite3.o.d
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/statement.o.d
-lib/node_modules/sqlite3/build/Release/linker.lock
+lib/node_modules/sqlite3/build/Release/.deps/usr/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/08/17 13:52:40 Modified files: lang/gcc/4.8 : Makefile x11/gcolor2: Makefile devel/gconf-editor: Makefile graphics/gd: Makefile comms/gnokii : Makefile games/gnome-mastermind: Makefile x11/gromit : Makefile multimedia/gstreamer1/plugins-bad: Makefile multimedia/gstreamer1/plugins-good: Makefile x11/gtk+ : Makefile x11/xfce4/gtk-xfce-engine: Makefile x11/gtk2-rezlooks-engine: Makefile x11/gtk3-unico-engine: Makefile x11/gtkdatabox : Makefile x11/gtkglarea : Makefile x11/gtkglext : Makefile x11/gtkhotkey : Makefile x11/gtksourceview: Makefile print/gutenprint: Makefile Log message: sync WANTLIB
Re: [update] lang/node 0.10.35 - 0.12.7
On Mon, Aug 17, 2015 at 9:29 PM, Aaron Bieber aa...@bolddaemon.com wrote:
Alexey Suslikov writes:
Aaron Bieber aaron at bolddaemon.com writes:
I am also looking for suggestions on how to move forward with this.. As
I see it we have two options.. 1) keep waiting until I sort out the issues
with npm.. and keep everything at an older version for now.. or 2) update
node to 0.12.7 and mark the current node-* ports as broken (maybe even
remove them?).
We discussed this previously: how about modules with native lib
binding?
The new pkg type (see the diff for node.port.mk) supports native
modules. Basically every thing is built as a self contained tarball,
then the native stuff is rebuilt during build.
I have attached an example of how the databases/sqlite3 (a native
module) port would be updated.
I remember you did post an example how to build such a pkg.
Could you please point to this example or re-post it so I can try
to adapt (long stalled) updates to new scheme?
Index: Makefile
===
RCS file: /cvs/ports/databases/node-sqlite3/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile3 Feb 2015 15:49:42 - 1.14
+++ Makefile13 Aug 2015 18:44:45 -
@@ -2,9 +2,8 @@
COMMENT = sqlite3 bindings for Node.js
-NPM_VERSION = 2.2.3
+NPM_VERSION = 3.0.10
NPM_NAME = sqlite3
-REVISION = 1
CATEGORIES = databases
MAINTAINER = Aaron Bieber abie...@openbsd.org
@@ -16,7 +15,10 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/node
-CONFIGURE_STYLE = npm ext
+EXTRACT_SUFX = .tar.gz
+MASTER_SITES = http://deftly.net/
+
+CONFIGURE_STYLE = npm pkg
WANTLIB = sqlite3
Index: distinfo
===
RCS file: /cvs/ports/databases/node-sqlite3/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 Jun 2014 17:42:44 - 1.5
+++ distinfo13 Aug 2015 18:44:45 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-2.2.3.tgz) = uKDcTEhArEvZxKwUeafcm2c71ICqQBgr4Q3DmNpsjMM=
-SIZE (sqlite3-2.2.3.tgz) = 2740801
+SHA256 (sqlite3-3.0.10.tar.gz) = gszxoyjYLobrUZOFAUbZ9zu7+2yJd8/NqUiQ9ycxMLc=
+SIZE (sqlite3-3.0.10.tar.gz) = 7645915
Index: patches/patch-binding_gyp
===
RCS file: /cvs/ports/databases/node-sqlite3/patches/patch-binding_gyp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-binding_gyp
--- patches/patch-binding_gyp 4 Jun 2014 17:42:44 - 1.3
+++ patches/patch-binding_gyp 13 Aug 2015 18:44:45 -
@@ -2,10 +2,10 @@ $OpenBSD: patch-binding_gyp,v 1.3 2014/0
Build against the system sqlite3.
binding.gyp.orig Sat Apr 12 21:04:48 2014
-+++ binding.gypFri May 23 08:32:51 2014
-@@ -17,9 +17,13 @@
- conditions: [ [ OS=='linux',
{libraries+:[-Wl,-rpath=@(sqlite)/lib]} ] ]
+--- binding.gyp.orig Wed Feb 11 03:59:50 2015
binding.gypSun Apr 26 13:36:04 2015
+@@ -25,9 +25,13 @@
+ }
},
{
-dependencies: [
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/node-sqlite3/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Jun 2014 17:42:44 - 1.3
+++ pkg/PLIST 13 Aug 2015 18:44:46 -
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/06/04 17:42:44 abieber Exp $
+@comment $OpenBSD$
lib/node_modules/sqlite3/
lib/node_modules/sqlite3/CHANGELOG.md
lib/node_modules/sqlite3/LICENSE
lib/node_modules/sqlite3/README.md
+lib/node_modules/sqlite3/appveyor.yml
lib/node_modules/sqlite3/binding.gyp
lib/node_modules/sqlite3/binding.gyp.beforesubst
lib/node_modules/sqlite3/build/
@@ -19,7 +20,15 @@ lib/node_modules/sqlite3/build/Release/.
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/database.o.d
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/node_sqlite3.o.d
lib/node_modules/sqlite3/build/Release/.deps/Release/obj.target/node_sqlite3/src/statement.o.d
-lib/node_modules/sqlite3/build/Release/linker.lock
+lib/node_modules/sqlite3/build/Release/.deps/usr/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/${FULLPKGNAME}/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/${FULLPKGNAME}/sqlite3/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/${FULLPKGNAME}/sqlite3/lib/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/${FULLPKGNAME}/sqlite3/lib/binding/
+lib/node_modules/sqlite3/build/Release/.deps/usr/ports/pobj/${FULLPKGNAME}/sqlite3/lib/binding/node-v14-openbsd-${M}/
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
On 16 Aug 2015, at 09:18, Jonathan Gray j...@jsg.id.au wrote: On Sun, I built coccinelle on armv7 with the -2 version of the patch without problem. It appears this is not native as infrastructure/mk/arch-defines.mk has: OCAML_NATIVE_ARCHS = i386 sparc amd64 OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64 ? I'm not really in a position to do a bulk build but if there is some sort of ocaml regression test or the like you'd like run let me know. Thanks! After your and krw's tests, the final -4 patchset here should build all the ports on everything: http://recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-4.patch.txt OCaml does support ARM native code, but our port currently doesn't use it until the configure glue is in. I'll have a followup patch to enable this, but got sidetracked with compiling up a custom u-Boot for my Cubieboard2 since the current snapshots don't seem to boot successfully on it. For now, the portable bytecode is sufficient (but there aren't any interesting ARM-specific regress tests until native code support lands). Would a ports person be able to give me an ok to commit the patchset? -a
Re: NEW: devel/py-path.py
On Sun, Aug 16, 2015 at 10:28:59PM +0100, Edd Barrett wrote:
Hey,
A dependency I was supposed to submit along with py-pickleshare.
Attached is:
* The port.
* A diff to py-pickleshare to pull in this.
Sorry, theres another missing dep (setuptools_scm) whose tests are
currently broken. For now, I've patched away the need for
setuptools_scm.
Revised work attached.
OK?
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Index: Makefile
===
RCS file: /home/edd/cvsync/ports/databases/py-pickleshare/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile16 Aug 2015 19:37:17 - 1.1.1.1
+++ Makefile16 Aug 2015 21:24:49 -
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/08/16 19:37:17 edd Exp $
+# $OpenBSD: Makefile.template,v 1.72 2015/04/08 17:53:19 sthen Exp $
COMMENT = tiny 'shelve'-like database with concurrency support
MODPY_EGG_VERSION =0.5
+REVISION = 0
DISTNAME = pickleshare-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM =Yes
MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS = devel/py-path.py
NO_TEST = Yes
py-path.py2.tgz
Description: application/tar-gz
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
On 17 Aug 2015, at 12:37, Kenneth Westerback kwesterb...@gmail.com wrote: Firing up -4 on my i386 test box while you wait for the ports@ ok. :-) What was the issue with ocaml-camlimage? It was missing an explicit dependency on lablgtk, and so it got skipped from the configure script when rebuilt on a clean package-free bulk build. I also synced WANTLIB and added a LIB_DEPENDS on libexif while there as well. It now builds cleanly on sparc64/amd64 in my tests. -a
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 01:04:16 Modified files: net/p5-RPC-XML : Makefile distinfo Log message: Update to p5-RPC-XML-0.79.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/08/17 01:10:34 Modified files: sysutils/consolekit: Makefile Log message: Missing build dependency on devel/libtool. breakage reported by Pavel Korovin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 00:49:41 Modified files: math/p5-Math-GMP: Makefile distinfo Log message: Update to p5-Math-GMP-2.11.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/08/17 14:04:17 Modified files: security/hydra : Makefile multimedia/imagination: Makefile www/iridium: Makefile net/jabberd: Makefile multimedia/k3b : Makefile multimedia/kaffeine: Makefile x11/kde/graphics3: Makefile x11/kde/accessibility3: Makefile x11/kde/artwork3: Makefile x11/kde/games3 : Makefile x11/kde/multimedia3: Makefile x11/kde/network3: Makefile multimedia/kguitar: Makefile Log message: sync WANTLIB
Re: lang/ghc update preview
Hi,
seeing this, I'd like to note that I've got some of your patches to
GHC HEAD which will become 7.12 once released probably so this may
easy your job a little bit. I've also done some testing and switched
on dynamic libraries and full PIE stuff. Got some optimistic results
(means majority of tests pass), but so far the biggest obstacle on the
way is how port's libffi is linked. Unfortunately my email[1] about it
is kind of ignored. Perhaps you may say your word about it so I'll
know what's the preferred way here? Thanks! Karel
[1]: http://marc.info/?l=openbsd-portsm=143590886630557w=2
On Sun, Aug 16, 2015 at 11:11 PM, Matthias Kilian
k...@outback.escape.de wrote:
Hi,
this is a quick and dirty update of ghc to version 7.10.2, meant
for people who want to play with it.
I've not built anything else in the ports tree with it yet, because
hs-libraries are now stored in a completely different way, (look
at that *_SIG blurb in the Makefile and in PLIST-main).
Ciao,
Kili
On Sun, Aug 16, 2015 at 11:11 PM, Matthias Kilian
k...@outback.escape.de wrote:
Hi,
this is a quick and dirty update of ghc to version 7.10.2, meant
for people who want to play with it.
I've not built anything else in the ports tree with it yet, because
hs-libraries are now stored in a completely different way, (look
at that *_SIG blurb in the Makefile and in PLIST-main).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- Makefile25 Jun 2015 11:40:08 - 1.118
+++ Makefile9 Aug 2015 22:28:44 -
@@ -11,14 +11,12 @@ COMMENT-doc = documentation for GHC
DISTNAME = ghc-${MODGHC_VER}
PKGNAME-main = ghc-${MODGHC_VER}
-REVISION-main =2
PKGNAME-doc = ghc-doc-${MODGHC_VER}
-REVISION-doc = 0
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/
# Version of the precompiled binaries
-BIN_VER = 7.8.3.20150623
+BIN_VER = 7.8.4.20150803
# Pull in lang/ghc to get MODGHC_VER and ONLY_FOR_ARCHS, which is maintained
# in ghc.port.mk. lang/python needed for regression tests.
@@ -62,6 +60,78 @@ BINDISTFILE-$m = ghc-${BIN_VER}-$m-unkno
SUPDISTFILES +=${BINDISTFILE-$m}
.endfor
+# Newest madness from the haskell world: packages are now stored in a
+# directory named after the package 'key', which is made out of an
+# abbreviation of the package name and the package 'signature'.
+CABAL_SIG =96aI7pZyaxU3dsgngOxbdK
+ARRAY_SIG =E0sTtauuKsGDLZoT7lTbgZ
+BASE_SIG = GDytRqRVSUX7zckgKqJjgw
+BINARY_SIG = IvYoLp9H6Xy3zEH13MmZwd
+BIN_PACKAGE_DB_SIG = HeqFuAPxbeUAPK6hSBHejU
+BYTESTRING_SIG = 6elQVSg5cWdFrvRnfxTUrH
+CONTAINERS_SIG = LKCPrTJwOTOLk4OU37YmeN
+DEEPSEQ_SIG = LbCWUlehDDeLxurARKDH5o
+DIRECTORY_SIG =KowvXytSqazBcvN7MGpFtg
+FILEPATH_SIG = KsGE6pHE5eZHSN90ZVax6A
+GHC_SIG = JzwEp1oQ8kA7NFNTGk1ho5
+GHC_PRIM_SIG = 8TmvWUcS1U1IKHT0levwg3
+HASKELINE_SIG =1dVCRhdIH7hAQWJrKwByYv
+HOOPL_SIG =DoMsb793VEWGUzPylcUNJi
+HPC_SIG = EoBo26ZW1TCDX9aShnDKTF
+INTEGER_GMP_SIG = 2aU3IZNMF9a7mQ0OzsZ0dS
+PRETTY_SIG = 7UQTOB05U7lIYPkFOVraeR
+PROCESS_SIG = FLTz0SLwyG6LJUpZ52HjkU
+TEMPLATE_HASKELL_SIG = 1ejK907jvoTHoZ6iZtHeyN
+TERMINFO_SIG = KvtqTNXWuWjKicEYaZ7qsx
+TIME_SIG = AXTdBF9VRQoBOqJT6qtmVH
+TRANSFORMERS_SIG = 3eG64VdP2vzGjP6wJiCp5X
+UNIX_SIG = A3WgcI5QiHK4PDo4jSYdwQ
+XHTML_SIG =FxPylgBilld3tRCpn3X21N
+
+SUBST_VARS += CABAL_SIG ARRAY_SIG BASE_SIG BINARY_SIG \
+ BIN_PACKAGE_DB_SIG BYTESTRING_SIG \
+ CONTAINERS_SIG DEEPSEQ_SIG DIRECTORY_SIG \
+ FILEPATH_SIG GHC_SIG GHC_PRIM_SIG \
+ HASKELINE_SIG HOOPL_SIG HPC_SIG \
+ INTEGER_GMP_SIG PRETTY_SIG PROCESS_SIG \
+ TEMPLATE_HASKELL_SIG TERMINFO_SIG TIME_SIG \
+ TRANSFORMERS_SIG UNIX_SIG XHTML_SIG
+
+# At this point, we can as well factor out package version numbers to
+# get smaller PLIST diffs for future updates.
+# But don't include GHC_VER (already covered by MODGHC_VER) nor
+# BIN_PACKAGE_DB_VER (always 0.0.0.0).
+CABAL_VER =1.22.4.0
+ARRAY_VER =0.5.1.0
+BASE_VER = 4.8.1.0
+BINARY_VER = 0.7.5.0
+BYTESTRING_VER = 0.10.6.0
+CONTAINERS_VER = 0.5.6.2
+DEEPSEQ_VER = 1.4.1.1
+DIRECTORY_VER =1.2.2.0
+FILEPATH_VER = 1.4.0.0
+GHC_PRIM_VER = 0.4.0.0
+HASKELINE_VER =0.7.2.1
+HOOPL_VER =3.10.0.2
+HPC_VER =
Re: [update] lang/node 0.10.35 - 0.12.7
On Mon, Aug 17, 2015 at 10:38 PM, Aaron Bieber aa...@bolddaemon.com wrote: Alexey Suslikov writes: On Mon, Aug 17, 2015 at 9:29 PM, Aaron Bieber aa...@bolddaemon.com wrote: Alexey Suslikov writes: Aaron Bieber aaron at bolddaemon.com writes: I am also looking for suggestions on how to move forward with this.. As I see it we have two options.. 1) keep waiting until I sort out the issues with npm.. and keep everything at an older version for now.. or 2) update node to 0.12.7 and mark the current node-* ports as broken (maybe even remove them?). We discussed this previously: how about modules with native lib binding? The new pkg type (see the diff for node.port.mk) supports native modules. Basically every thing is built as a self contained tarball, then the native stuff is rebuilt during build. I have attached an example of how the databases/sqlite3 (a native module) port would be updated. I remember you did post an example how to build such a pkg. Could you please point to this example or re-post it so I can try to adapt (long stalled) updates to new scheme? Executing the previously attached mk_npm_dist script creates a .tar.gz of a given npm package that can be used as a distfile for a port. Example usage: ./mk_npm_dist sqlite3 ...lots of output... Created: /tmp/tmp.74ehtPh8Ur/sqlite3-3.0.10.tar.gz Upload the sqlite3 tarball and add the new location to MASTER_SITES in the makefile, then change CONFIGURE_STYLE to be npm pkg, regen your PLIST and you should be good to go! (except for the path thing I mentioned earlier :P) Thanks. On deleting packages. Can port quirks help with proper upgrade path? For instance, node-pg being a dual package (native js and native binding), now is the couple of packages: one for native js, one for native binding. If node-pg port will be upgraded, upgrade path should be to replace what we currently have (dual) with native binding port only (because there is no point to package native js version). My 2 cents.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/08/17 14:34:21 Modified files: graphics/kipi-plugins: Makefile cad/klogic : Makefile x11/kmplayer : Makefile x11/kde/graphics3: Makefile math/kst : Makefile net/ktorrent : Makefile devel/cudf : Makefile databases/libdbi-drivers: Makefile net/libepc : Makefile security/libfprint: Makefile graphics/libkdcraw: Makefile graphics/libkexif: Makefile graphics/libkexiv2: Makefile Log message: sync WANTLIB
[NEW] games/gemrb
Hello! This is a port of open-source implementation of Bioware's Infinity Engine. Tested with Baldur's Gate 2, Icewind Dale 2 and Planescape Torment by me and with Baldur's gate 1 by edd@ OK to import? gemrb.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/08/17 02:40:13 Modified files: sysutils/consolekit: Makefile sysutils/consolekit/pkg: PLIST Log message: Missing @conflict marker.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/08/17 02:42:01 Modified files: www/p5-WWW-Search-Ebay: Makefile distinfo Log message: Update to p5-WW-Search-Ebay-3.041.
