Re: Testing requested: math/jags
On Sat, Aug 29, 2015 at 07:43:33PM +0200, Ingo Feinerer wrote:
Some comments (with my changes attached to this posting):
- COMMENT: Better use Gibbs than gibbs as it is a last name
- COMMENT: I prefer the wording from the upstream homepage
- Reduced/fixed WANTLIB
- MODULES= fortran defines MODFORTRAN_BUILD_DEPENDS so no need to ask
for lang/g77. Moreover, g77 is the default for MODFORTRAN_COMPILER.
See man port-modules for details.
- Add comment why USE_LIBTOOL = gnu is needed (which should normally be
avoided).
- Use YACC Makefile variable (automatically passed to GNU configure).
See man bsd.port.mk.
- Use SEPARATE_BUILD = Yes
- Do not pass CFLAGS and CPPFLAGS as the build appears to work out of the box
- Pass ${CONFIGURE_SHARED} to CONFIGURE_ARGS (as we have SHARED_LIBS)
- Add devel/flex build dependency and enforce its use (ac_cv_prog_LEX).
The build fails with flex from base. Did it work for you?
Open issues:
- Would you like to take MAINTAINERship?
- The port directory is jags whereas the package name is JAGS. I do
not know if this might cause problems and is good practice.
- PFRAG.shared could probably be eliminated by moving corresponding
lines to PLIST. make plist however creates PFRAG.shared (whereas often
it is capable of this folding in), so I guess that is fine.
Two more thing to consider:
- When running configure:
checking for ltdl.h... no
checking where to find libltdl headers... -I${top_srcdir}/libltdl
checking where to find libltdl library...
${top_build_prefix}libltdl/libltdlc.la
This can be addressed with
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib
in CONFIGURE_ARGS. But I am unsure what we need to set for
--[en|dis]able-ltdl-install, --with[out]-included-ltdl as we use
USE_LIBTOOL = gnu. Moreover, devel/libtool,-ltdl might be necessary in
LIB_DEPENDS.
- There are PDF manuals available (in doc/manual/). Especially
jags_user_manual.pdf looks useful (whereas jags_developer_manual.pdf
and jags_installation_manual probably do not need to be shipped).
However, this needs a BUILD_DEPENDS on print/texlive/base,
ALL_TARGET = all docs, and a custom post-install to include the PDF
(as I did not find a working Makefile target for installing the PDFs).
update for geo/josm
Here is a straight forward josm update 8339 - 8677.
Builds/installs/runs fine on my amd64 machine (-current).
Holger
;-se
Index: Makefile
===
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.28
diff -u -p -u -r1.28 Makefile
--- Makefile17 May 2015 09:57:07 - 1.28
+++ Makefile29 Aug 2015 19:17:35 -
@@ -2,7 +2,7 @@
COMMENT= OpenStreetMap map editor
-SVN_REV= 8339
+SVN_REV= 8677
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.12
diff -u -p -u -r1.12 distinfo
--- distinfo17 May 2015 09:57:07 - 1.12
+++ distinfo29 Aug 2015 19:17:35 -
@@ -1,2 +1,2 @@
-SHA256 (josm-snapshot-8339.jar) = wd+HjPEZnqnEOyyOQVXSTYYCOKIFmtvZSDkNwH9ZIuQ=
-SIZE (josm-snapshot-8339.jar) = 9910071
+SHA256 (josm-snapshot-8677.jar) = gSWi2HZoR+dr7MAPoq/juLf4uEps1LXw5j0mFk/c67Q=
+SIZE (josm-snapshot-8677.jar) = 10232801
[NEW] fonts/hack-font-ttf
Greetings ports@ As featured on Slashdot a few hours ago, here's hack-font-ttf. I appended 'font' since 'hack' is generic, and appended 'ttf' since there's also an OTF and webfonts versions, which I can also send along. DESCR Hack is an open source typeface designed specifically for source code. It has a large x-height, wide aperature and a low-contrast design in order to be clearly legible at common code text sizes. This port is the TrueType version of Hack. /DESCR If any qualified committer is available offline to review, at their pace of course, a lot of new font ports, please ping me offlist. TIA g hack-font-ttf.tgz Description: Binary data
Re: opendnssec and softhsm revisited
Patrik Lundin pat...@sigterm.se writes:
On Wed, Jun 24, 2015 at 07:10:33AM +0200, Patrik Lundin wrote:
The summary for now looks like this:
Working: amd64, sparc64
Broken: i386, macppc
Is there some relation between threading and 32/64 bit? It is the main
thing that sticks out currently, since sparc64 rules out an endian issue
as far as i can tell.
Hi Patrik. Sorry if I kinda ignored this opendnssec problem, I couldn't
find a solution quickly enough.
So there might be some light at the end of the opendnssec tunnel.
I have noticed that the thread stack size is smaller on i386 than it is
on amd64 using this code snippet:
---
#include stdio.h
#include pthread.h
pthread_attr_t attr;
size_t stacksize;
int main (){
pthread_attr_init(attr);
pthread_attr_getstacksize(attr, stacksize);
printf(stacksize: %d\n, stacksize);
return 0;
}
---
While amd64 and sparc64 reports 524288, i386 says 262144. It looks like I have
been able to stop opendnssec from crashing by modifying a wrapper function to
pass an attribute variable to pthread_create(), increasing the stack size:
---
pthread_attr_t attr;
size_t stacksize;
pthread_attr_init(attr);
pthread_attr_getstacksize(attr, stacksize);
pthread_attr_setstacksize(attr, stacksize * 2);
---
The above was inspired from this thread:
http://openbsd-archive.7691.n7.nabble.com/Default-Posix-thread-stack-size-td47465.html
Anyway, I have sent a message regarding this to one of the nlnet people. I
will
report back with how things goes. I am not sure if this is the correct fix, or
if one should instead store less data on the stack or something.
Very nice! Yes, asking upstream is the right thing to do.
If they don't plan to do a release with that stack size problem
addressed, I think it would be ok to import opendnssec with a temporary
patch.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2015/08/30 08:30:22 Modified files: textproc/igor : Makefile distinfo textproc/igor/patches: patch-igor patch-igor_1 Log message: Maintainer update to igor-1.555: * catches more misspellings * new option -V * some bugfixes * improved verbose diagnostics * use sed -i rather than perl -pi * regenerate patches
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:38:32 Modified files: lang/ocaml : Makefile distinfo lang/ocaml/pkg : PFRAG.native-main PLIST-main Log message: update to ocaml-4.02.3 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:50:24 Modified files: databases/ocaml-sqlite3: Makefile distinfo databases/ocaml-sqlite3/pkg: PLIST Log message: update to ocaml-sqlite3-2.0.9 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:02:11 Modified files: devel/ocaml-net: Makefile distinfo devel/ocaml-net/pkg: PFRAG.native PLIST Log message: update to ocaml-net-4.0.2 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:58:32 Modified files: devel/ocaml-graph: Makefile devel/ocaml-graph/pkg: PLIST Log message: bump REVISION on ocaml-graph due to ocaml 4.02.3 update also mark a few installed files as @bin ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:20:29 Modified files: devel/cudf : Makefile Log message: bump cudf REVISION due to OCaml 4.02.3 update ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:26:32 Modified files: devel/utop : Makefile Log message: bump utop REVISION due to OCaml 4.02.3 update ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:24:35 Modified files: devel/ounit: Makefile Log message: bump ounit REVISION due to OCaml 4.02.3 bump ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:30:45 Modified files: sysutils/opam/pkg: DESCR-main PFRAG.native-lib PLIST-lib PLIST-main Added files: sysutils/opam/files: aspcud Log message: update to opam-1.2.2 Because the Aspcud constraint solver is not ported to OpenBSD yet, this package is configured to use the IRILL online solver by default. To disable this and use the internal solver, set the OPAMNOASPCUD env variable to 1. You will need to do this if you want to use OPAM when offline. ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:29:26 ports/sysutils/opam/files Update of /cvs/ports/sysutils/opam/files In directory cvs.openbsd.org:/tmp/cvs-serv23365/files Log Message: Directory /cvs/ports/sysutils/opam/files added to the repository
Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade
On 25 Aug 2015, at 18:15, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote: ok jca@ Thanks! All committed now. - regarding bison, it's complicated I'm just trying to figure out if it's worth the hassle of removing the minor bison feature used in the aspcud porting chain, or wait for a bison update to land in ports (which presumably depends on a corresponding m4 update in base). I'm not volunteering to help with the latter, much as I'd like to :-) - this is a pretty big diff, I didn't review everything, only the bits I care about. (I don't use opam, for example.) For next updates, can we expect OCaml to be updated alone, along with updates required because of incompatibilities with the new ocaml port? Well, OCaml will always need a large number of REVISION bumps due to the lack of binary compatibility. However, this was a particularly large one since I swept the tree for version updates as well. I'll try to commit those in a more timely way for the future... That being said, the parts I reviewed looked pretty good, and the extensive testing on other archs make me confident that this can go in. This includes an ok to import devel/ocaml-ppx-tools (which could use NO_TEST=Yes, btw). NO_TEST also added before import. Thanks again for looking over the patch! -a
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:33:02 Modified files: textproc/ocaml-xmlm: Makefile distinfo textproc/ocaml-xmlm/pkg: PFRAG.native PFRAG.no-native PLIST Log message: update to ocaml-xmlm-1.2.0 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:31:26 Modified files: textproc/ocaml-csv: Makefile distinfo textproc/ocaml-csv/pkg: PLIST Log message: update to ocaml-csv-1.4.1 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:32:25 Modified files: textproc/ocaml-xml-light: Makefile Log message: bump ocaml-xml-light REVISION due to OCaml 4.02.3 upgrade ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:31:57 Modified files: textproc/ocaml-rss: Makefile Log message: bump ocaml-rss REVISION due to OCaml 4.02.3 upgrade ok jca@, tested by krw@ daniel@ jsg@
Re: opendnssec and softhsm revisited
On Wed, Jun 24, 2015 at 07:10:33AM +0200, Patrik Lundin wrote:
The summary for now looks like this:
Working: amd64, sparc64
Broken: i386, macppc
Is there some relation between threading and 32/64 bit? It is the main
thing that sticks out currently, since sparc64 rules out an endian issue
as far as i can tell.
So there might be some light at the end of the opendnssec tunnel.
I have noticed that the thread stack size is smaller on i386 than it is
on amd64 using this code snippet:
---
#include stdio.h
#include pthread.h
pthread_attr_t attr;
size_t stacksize;
int main (){
pthread_attr_init(attr);
pthread_attr_getstacksize(attr, stacksize);
printf(stacksize: %d\n, stacksize);
return 0;
}
---
While amd64 and sparc64 reports 524288, i386 says 262144. It looks like I have
been able to stop opendnssec from crashing by modifying a wrapper function to
pass an attribute variable to pthread_create(), increasing the stack size:
---
pthread_attr_t attr;
size_t stacksize;
pthread_attr_init(attr);
pthread_attr_getstacksize(attr, stacksize);
pthread_attr_setstacksize(attr, stacksize * 2);
---
The above was inspired from this thread:
http://openbsd-archive.7691.n7.nabble.com/Default-Posix-thread-stack-size-td47465.html
Anyway, I have sent a message regarding this to one of the nlnet people. I will
report back with how things goes. I am not sure if this is the correct fix, or
if one should instead store less data on the stack or something.
--
Patrik Lundin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/08/30 07:17:31 Modified files: archivers/lz4 : Makefile Log message: Fix lz4's installed .pc file to avoid using the fake prefix. From Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:57:25 Modified files: devel/ocaml-cmdliner: Makefile distinfo Log message: update to ocaml-cmdliner-0.9.7 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:04:25 Modified files: devel/ocaml-uutf: Makefile distinfo Log message: update to ocaml-uutf-0.9.4 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:02:58 Modified files: devel/ocaml-pcre: Makefile distinfo devel/ocaml-pcre/pkg: PFRAG.native PLIST Log message: update to ocaml-pcre-7.0.5 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:49:08 Modified files: databases/ocaml-postgresql: Makefile distinfo databases/ocaml-postgresql/pkg: PFRAG.native PLIST Log message: update to ocaml-postgresql-3.2.1 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:47:06 Log message: ocaml-ppx-tools-0.99.2 port Status: Vendor Tag: avsm Release Tags: avsm_2015-Aug-30 N ports/devel/ocaml-ppx-tools/Makefile N ports/devel/ocaml-ppx-tools/distinfo N ports/devel/ocaml-ppx-tools/patches/patch-Makefile N ports/devel/ocaml-ppx-tools/pkg/DESCR N ports/devel/ocaml-ppx-tools/pkg/PFRAG.dynlink-native N ports/devel/ocaml-ppx-tools/pkg/PFRAG.native N ports/devel/ocaml-ppx-tools/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:59:21 Modified files: devel/ocaml-lambda-term: Makefile distinfo devel/ocaml-lambda-term/pkg: PFRAG.native PLIST Log message: update to lambda-term-1.9 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:03:42 Modified files: devel/ocaml-re : Makefile distinfo devel/ocaml-re/pkg: PFRAG.native PLIST Log message: update to ocaml-re-1.4.1 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:23:41 Modified files: devel/ocaml-react: Makefile Log message: bump ocaml-react REVISION due to OCaml 4.02.3 update ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:24:09 Modified files: devel/omake: Makefile Log message: bump omake REVISION due to OCaml 4.02.3 bump ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:06:35 Modified files: graphics/ocaml-camlimages: Makefile distinfo graphics/ocaml-camlimages/pkg: PFRAG.native PFRAG.shared PLIST Removed files: graphics/ocaml-camlimages/patches: patch-OMakefile patch-src_gifread_c patch-src_gifwrite_c patch-src_pngread_c patch-src_pngwrite_c patch-src_tiffread_c patch-src_tiffwrite_c Log message: update to ocaml-camlimages-4.2.1 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:07:09 Modified files: security/ocaml-cryptokit: Makefile distinfo security/ocaml-cryptokit/pkg: PLIST Log message: update to cryptokit-1.10 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:27:32 Modified files: security/ocaml-ssl: Makefile Log message: bump ocaml-ssl REVISION due to OCaml 4.02.3 upgrade ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:52:33 Modified files: devel/ocaml-batteries: Makefile distinfo devel/ocaml-batteries/pkg: PFRAG.native PLIST Removed files: devel/ocaml-batteries/patches: patch-Makefile patch-build_prefilter_ml patch-src_batPrintf_mliv patch-src_batPrintf_mlv Log message: update to ocaml-batteries-2.3.1 Removes OCaml 4.02.0+ patches which are now upstreamed ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:05:12 Modified files: devel/ocaml-zed: Makefile distinfo devel/ocaml-zed/pkg: PLIST Log message: update to ocaml-zed-1.4 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:18:48 Modified files: devel/coccinelle: Makefile devel/ocaml-bitstring: Makefile devel/ocaml-calendar: Makefile devel/ocaml-camomile: Makefile devel/ocaml-curses: Makefile devel/ocaml-extlib: Makefile Log message: bump REVISION for OCaml 4.02.3 update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:41:01 Modified files: lang/ocaml-camlp4: Makefile distinfo Log message: update to ocaml-camlp4-4.02+6 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:43:47 Modified files: sysutils/findlib: Makefile distinfo sysutils/findlib/pkg: PLIST Removed files: sysutils/findlib/patches: patch-src_findlib_Makefile Log message: update to findlib-1.5.5 This introduces a strong dependency on ocaml-camlp4 in order to get the safe_camlp4 script. This could be split into a subpackage in the future, to get a base findlib package that does not depend on camlp4 ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:01:16 Modified files: devel/ocaml-lwt: Makefile distinfo devel/ocaml-lwt/pkg: PFRAG.dynlink-native PFRAG.native PLIST Removed files: devel/ocaml-lwt/patches: patch-setup_ml Log message: update to ocaml-lwt-2.4.8 This is not the latest upstream version, but the last one that is most compatible due to an API change. Be careful about upgrading to lwt-2.5.0 without checking that no in-tree ports break due to new buffer APIs. ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 09:56:12 Modified files: devel/ocaml-dose: Makefile distinfo devel/ocaml-dose/patches: patch-Makefile patch-algo_depsolver_ml patch-applications_distcheck_ml patch-common_util_ml devel/ocaml-dose/pkg: PFRAG.dynlink-native PFRAG.native PLIST Added files: devel/ocaml-dose/patches: patch-algo_defaultgraphs_ml patch-algo_depsolver_int_ml patch-algo_diagnostic_ml patch-algo_dominators_ml patch-algo_flatten_ml patch-algo_statistics_ml patch-algo_strongconflicts_int_ml patch-algo_strongconflicts_ml patch-algo_strongdeps_int_ml patch-algo_strongdeps_ml patch-applications_ceve_ml patch-applications_challenged_ml patch-applications_deb-buildcheck_ml patch-applications_deb-coinstall_ml patch-applications_dominators-graph_ml patch-applications_outdated_ml patch-applications_smallworld_ml patch-applications_strong-deps_ml patch-common_cudfAdd_ml patch-common_cudfSolver_ml patch-common_edosSolver_ml patch-common_input_ml patch-common_input_mli patch-common_url_ml patch-common_util_mli patch-cv_cvcudf_ml patch-deb_apt_ml patch-deb_architecture_ml patch-deb_debcudf_ml patch-deb_debutil_ml patch-deb_edsp_ml patch-deb_format822_ml patch-deb_packages_ml patch-deb_sources_ml patch-doseparse_stdDebug_ml patch-doseparse_stdLoaders_ml patch-doseparse_stdOptions_ml patch-doseparse_stdUtils_ml patch-eclipse_packages_ml patch-eclipse_version_ml patch-opencsw_packages_ml patch-opencsw_version_ml patch-rpm_hdlists_ml patch-rpm_packages_ml patch-rpm_rpmcudf_ml Removed files: devel/ocaml-dose/patches: patch-algo_depsolver_mli patch-myocamlbuild_ml Log message: update to ocaml-dose-3.3 Includes local patches for OPAM compatibility, as with the previous version ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:23:06 Modified files: devel/ocaml-jsonm: Makefile Log message: bump REVISION on ocaml-jsonm due to OCaml 4.02.3 update ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:22:15 Modified files: devel/frama-c : Makefile distinfo devel/frama-c/pkg: PFRAG.native PLIST Removed files: devel/frama-c/patches: patch-configure Log message: update to framac-1.11 (the Sodium release upstream) ok jca@, tested by krw@ daniel@ jsg@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:34:41 Modified files: math/coq : Makefile Log message: bump coq REVISION due to OCaml 4.02.3 update ok jca@, tested by krw@ daniel@ jsg@
update: net/lftp 4.6.3a - 4.6.4
hi @ports,
simple maintainer update to next stable version.
Version 4.6.4 - 2015-08-20
mirror: new option --transfer-all.
torrent: new setting torrent:timeout to limit time without any progress.
torrent: fixed handling of udp tracker without explicit port number.
torrent: improved transfer start time after metadata download.
improved sftp put -c to use a single FSETSTAT.
mirror --skip-noaccess now uses user name to check for permissions.
don't rename temporary file to the target name when transfer fails.
new cmd:prompt escapes \l and \L for local working directory.
translations updated (pl, ru, uk).
new configure option --disable-ipv6.
fixed compilation with an old gcc.
Tested on amd64.
Cheers, Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.106
diff -u -p -u -p -r1.106 Makefile
--- Makefile17 Jun 2015 15:13:05 - 1.106
+++ Makefile30 Aug 2015 16:29:31 -
@@ -2,7 +2,7 @@
COMMENT= shell-like command line ftp and sftp client
-DISTNAME= lftp-4.6.3a
+DISTNAME= lftp-4.6.4
CATEGORIES=net
HOMEPAGE= http://lftp.yar.ru/
Index: distinfo
===
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- distinfo17 Jun 2015 15:13:05 - 1.65
+++ distinfo30 Aug 2015 16:29:31 -
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.6.3a.tar.gz) = qLU+XKLBrL7NGByH8hqGc8qQONyfK+arjCN5C9kf1EY=
-SIZE (lftp-4.6.3a.tar.gz) = 2645906
+SHA256 (lftp-4.6.4.tar.gz) = eR54N3nT1rUZ0MIxVUMLl4XyhUAj64NMcW9bp4hzsVo=
+SIZE (lftp-4.6.4.tar.gz) = 2656129
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-configure
--- patches/patch-configure 17 Jun 2015 15:13:05 - 1.10
+++ patches/patch-configure 30 Aug 2015 16:29:31 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.10 2015/06
Use GNU readline as our base readline lacks add_history_time().
configure.orig Wed Jun 17 16:04:35 2015
-+++ configure Wed Jun 17 16:36:48 2015
-@@ -47773,7 +47773,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
+--- configure.orig Thu Aug 20 11:49:32 2015
configure Sun Aug 30 17:51:08 2015
+@@ -47962,7 +47962,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
else
old_LIBS=$LIBS
@@ -13,7 +13,7 @@ Use GNU readline as our base readline la
cat confdefs.h - _ACEOF conftest.$ac_ext
/* end confdefs.h. */
extern int (*rl_getc_function)();
-@@ -47813,7 +47813,7 @@ if test $lftp_cv_precompiled_readline = yes; then
+@@ -48002,7 +48002,7 @@ if test $lftp_cv_precompiled_readline = yes; then
READLINE_DIR=''
{ $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
$as_echo yes 6; }
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 24 Apr 2014 16:29:03 - 1.9
+++ patches/patch-src_Makefile_in 30 Aug 2015 16:29:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.9 2014/04/24 16:29:03 benoit Exp $
src/Makefile.in.orig Fri Jan 24 08:59:54 2014
-+++ src/Makefile.inSun Apr 13 08:55:09 2014
-@@ -225,7 +225,7 @@ am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(p
+--- src/Makefile.in.orig Thu Aug 20 11:49:33 2015
src/Makefile.inSun Aug 30 17:51:08 2015
+@@ -227,7 +227,7 @@ am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(p
$(DESTDIR)$(pkgdatadir)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
$(pkgverlib_LTLIBRARIES)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: a...@cvs.openbsd.org2015/08/30 10:35:15 Modified files: x11/lablgtk2 : Makefile Log message: bump lablgtk2 REVISION due to OCaml 4.02.3 upgrade ok jca@, tested by krw@ daniel@ jsg@
Update audio/aqualung 1.0rc1 - 1.0
This updates Aqualung to the final 1.0 release. Code wise, not much
has changed. Upstream development has now switched to my GitHub.
Most patches go away, but there is a patch added, which is needed
because the audio/mac port is lagging behind upstream a bit.
I'll be committing this in a few days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile26 Jul 2015 05:46:02 - 1.40
+++ Makefile30 Aug 2015 20:10:57 -
@@ -2,12 +2,12 @@
COMMENT= advanced music player
-DISTNAME= aqualung-1.0-rc1
-PKGNAME= aqualung-1.0rc1
+VERSION= 1.0
+DISTNAME= aqualung-${VERSION}
EPOCH= 0
CATEGORIES=audio
-HOMEPAGE= http://aqualung.factorial.hu/
+HOMEPAGE= https://github.com/jeremyevans/aqualung
MAINTAINER=Jeremy Evans jer...@openbsd.org
@@ -24,7 +24,7 @@ WANTLIB += gdk_pixbuf-2.0 xml2 mac mad m
WANTLIB += avformat avutil wavpack lrdf oggz speex cddb cdio
WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/}
+MASTER_SITES=
https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
MODULES= devel/gettext \
lang/lua
Index: distinfo
===
RCS file: /cvs/ports/audio/aqualung/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo26 Jul 2015 05:46:02 - 1.5
+++ distinfo30 Aug 2015 20:09:09 -
@@ -1,2 +1,2 @@
-SHA256 (aqualung-1.0-rc1.tar.gz) = S2x+ijivnwP7BC+BM8zoNPh9f1SJyvKoXp0tHkKK4ks=
-SIZE (aqualung-1.0-rc1.tar.gz) = 1939271
+SHA256 (aqualung-1.0.tar.gz) = wobBQywUdRJ/TpUlcCvLSG7YX8YlOb0+80TZIzPoQ0c=
+SIZE (aqualung-1.0.tar.gz) = 2014854
Index: patches/patch-src_core_c
===
RCS file: patches/patch-src_core_c
diff -N patches/patch-src_core_c
--- patches/patch-src_core_c26 Jul 2015 05:49:37 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-$OpenBSD: patch-src_core_c,v 1.3 2015/07/26 05:49:37 jeremy Exp $
-
-Fix use-after-free when sample rate switches. This isn't a perfect fix,
-as it does result in some uninitialized memory be used (displayed for
-a split second if the sample rate switches), but it's better than
-crashing.
-
src/core.c.origTue Jun 3 08:08:19 2014
-+++ src/core.c Fri Jul 17 23:54:46 2015
-@@ -372,7 +372,8 @@ disk_thread(void * arg) {
- (fdec-pdec != NULL)) {
-
- decoder_t * dec = (decoder_t
*)fdec-pdec;
--
-+ fileinfo_t fileinfo_sent;
-+
- cdda_decoder_reopen(dec,
filename);
- fdec-samples_left =
fdec-fileinfo.total_samples;
-
-@@ -382,9 +383,11 @@ disk_thread(void * arg) {
- sample_offset = 0;
-
- send_cmd = CMD_FILEINFO;
-+ fileinfo_sent = fdec-fileinfo;
-+ fileinfo_sent.format_str =
strdup(fdec-fileinfo.format_str);
- rb_write(rb_disk2gui, send_cmd,
-
sizeof(send_cmd));
-- rb_write(rb_disk2gui, (char
*)(fdec-fileinfo),
-+ rb_write(rb_disk2gui, (char
*)fileinfo_sent,
-
sizeof(fileinfo_t));
-
- info-is_streaming = 1;
-@@ -411,6 +414,8 @@ disk_thread(void * arg) {
- rb_write(rb_disk2gui,
send_cmd, 1);
- goto sleep;
- } else {
-+ fileinfo_t fileinfo_sent;
-+
- file_decoder_set_rva(fdec,
cue.voladj);
- info-in_SR_prev = info-in_SR;
- info-in_SR =
fdec-fileinfo.sample_rate;
-@@ -430,9 +435,11 @@ disk_thread(void * arg) {
- sample_offset = 0;
-
- send_cmd = CMD_FILEINFO;
-+ fileinfo_sent = fdec-fileinfo;
-+ fileinfo_sent.format_str =
strdup(fdec-fileinfo.format_str);
-
Re: [NEW] audio/libdiscid
Donovan Watteau tso...@gmail.com writes:
On Sat, 29 Aug 2015, Stuart Henderson wrote:
On 2015/08/29 11:16, Donovan Watteau wrote:
Hi,
Here's a new port for libdiscid, which my next audio/cmus update
will use.
I tried cleaning some strcpy(), strcat() and sprintf(). make test
is still fine. If patch-src_disc_c looks good to you, I'll submit it
to upstream.
Tested on macppc.
Upstream will need some glue to make that work on OS with deficient
versions of libc. In most cases we don't add this type of patch in ports
as it often gets in the way of updates, but feeding upstream (if they'll
take it) is good.
Yes, I was working on submitting it to upstream with all the necessary
libc glue, but OK.
So here's the port again, without the patch.
Looks fine to me, two nits:
1.
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
ac_cv_header_musicbrainz5_mb5_c_h=no
If there is no dep on other packages then there is no need to tweak
CPP/LDFLAGS. And if usr/local isn't in those flags,
ac_cv_header_musicbrainz5_mb5_c_h=no is not needed (but you may want to
keep it for documentation).
2. Any idea why two tests out of four are skipped?
=== Cleaning for libdiscid-0.6.1
=== Checking files for libdiscid-0.6.1
`/home/distfiles/libdiscid-0.6.1.tar.gz' is up to date.
(SHA256) libdiscid-0.6.1.tar.gz: OK
=== Extracting for libdiscid-0.6.1
=== Patching for libdiscid-0.6.1
=== Configuring for libdiscid-0.6.1
Using /usr/obj/pobj/libdiscid-0.6.1/config.site (generated)
configure: WARNING: unrecognized options: --disable-gtk-doc
configure: loading site script /usr/obj/pobj/libdiscid-0.6.1/config.site
checking for a BSD-compatible install...
/usr/obj/pobj/libdiscid-0.6.1/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether make sets $(MAKE)... (cached) yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking whether cc understands -c and -o together... yes
checking dependency style of cc... gcc3
checking for ar... (cached) ar
checking the archiver (ar) interface... ar
checking build system type... x86_64-unknown-openbsd5.8
checking host system type... x86_64-unknown-openbsd5.8
configure: Using disc read implementation for: netbsd
checking how to print strings... print -r
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands +=... no
checking how to convert x86_64-unknown-openbsd5.8 file names to
x86_64-unknown-openbsd5.8 format... func_convert_file_noop
checking how to convert x86_64-unknown-openbsd5.8 file names to toolchain
format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... match_pattern
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$
checking for dlltool... no
checking how to associate runtime and link libraries... print -r --
checking for archiver @FILE support... @
checking for strip... (cached) strip
checking for ranlib... (cached) ranlib
checking command to parse /usr/bin/nm -B output from cc object... ok
checking for sysroot... no
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for memory.h... (cached) yes
checking for strings.h... (cached) yes
checking for inttypes.h... (cached) yes
checking for stdint.h... (cached) yes
checking for unistd.h... (cached) yes
checking for dlfcn.h... (cached) yes
checking for objdir... .libs
checking if cc supports -fno-rtti -fno-exceptions... no
checking for cc option to produce PIC...
security/p5-Crypt-SSLeay SSLv3 fallout
Hi,
security/p5-Crypt-SSLeay regression tests fail with
/usr/bin/perl:/usr/ports/pobj/p5-Crypt-SSLeay-0.72/Crypt-SSLeay-0.72/blib/arch/auto/Crypt/SSLeay/SSLeay.so:
undefined symbol 'SSLv3_client_method'
Is it the right approach to remove all calls to SSLv2 and SSLv3 and
keep only SSLv23?
The patch-Makefile_PL chunk is no real change but happend with make
update-patches.
ok?
bluhm
Index: security/p5-Crypt-SSLeay/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/security/p5-Crypt-SSLeay/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- security/p5-Crypt-SSLeay/Makefile 4 May 2015 21:52:31 - 1.37
+++ security/p5-Crypt-SSLeay/Makefile 30 Aug 2015 22:28:39 -
@@ -5,7 +5,7 @@ SHARED_ONLY = Yes
COMMENT = library to provide LWP https support via OpenSSL
DISTNAME = Crypt-SSLeay-0.72
-REVISION = 1
+REVISION = 2
CATEGORIES = security
Index: security/p5-Crypt-SSLeay/patches/patch-Makefile_PL
===
RCS file:
/data/mirror/openbsd/cvs/ports/security/p5-Crypt-SSLeay/patches/patch-Makefile_PL,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_PL
--- security/p5-Crypt-SSLeay/patches/patch-Makefile_PL 4 May 2015 21:52:31
- 1.7
+++ security/p5-Crypt-SSLeay/patches/patch-Makefile_PL 30 Aug 2015 22:43:31
-
@@ -8,7 +8,7 @@ if p5-Crypt-SSLeay was compiled when p5-
Use the libraries we have on OpenBSD and do not use Devel::CheckLib.
--- Makefile.PL.orig Thu Apr 24 16:50:29 2014
-+++ Makefile.PLSun May 3 14:35:59 2015
Makefile.PLMon Aug 31 00:40:37 2015
@@ -11,7 +11,7 @@ use Try::Tiny;
use inc::IO::Interactive::Tiny;
@@ -18,12 +18,12 @@ Use the libraries we have on OpenBSD and
sub run {
my $argv = shift;
-@@ -76,8 +76,6 @@ sub run {
+@@ -75,8 +75,6 @@ sub run {
+ exit 0;
};
}
-
--$libs = filter_libs(\%opt, $libs);
-
+-$libs = filter_libs(\%opt, $libs);
+
unless ($ENV{AUTOMATED_TESTING}) {
show_do_you_need_crypt_ssleay();
- }
Index: security/p5-Crypt-SSLeay/patches/patch-SSLeay_xs
===
RCS file: security/p5-Crypt-SSLeay/patches/patch-SSLeay_xs
diff -N security/p5-Crypt-SSLeay/patches/patch-SSLeay_xs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ security/p5-Crypt-SSLeay/patches/patch-SSLeay_xs30 Aug 2015 22:43:34
-
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- SSLeay.xs.orig Thu Apr 24 00:36:24 2014
SSLeay.xs Mon Aug 31 00:43:25 2015
+@@ -45,13 +45,6 @@ extern C {
+ }
+ #endif
+
+-
+-#if SSLEAY_VERSION_NUMBER = 0x0900
+-#define CRYPT_SSL_CLIENT_METHOD SSLv3_client_method()
+-#else
+-#define CRYPT_SSL_CLIENT_METHOD SSLv2_client_method()
+-#endif
+-
+ static void InfoCallback(const SSL *s,int where,int ret)
+ {
+ const char *str;
+@@ -145,22 +138,7 @@ SSL_CTX_new(packname, ssl_version)
+ RAND_seed(buf, CRYPT_SSLEAY_RAND_BUFSIZE);
+ }
+
+-if(ssl_version == 23) {
+-ctx = SSL_CTX_new(SSLv23_client_method());
+-}
+-else if(ssl_version == 3) {
+-ctx = SSL_CTX_new(SSLv3_client_method());
+-}
+-else {
+-#ifndef OPENSSL_NO_SSL2
+-/* v2 is the default */
+-ctx = SSL_CTX_new(SSLv2_client_method());
+-#else
+-/* v3 is the default */
+-ctx = SSL_CTX_new(SSLv3_client_method());
+-#endif
+-}
+-
++ctx = SSL_CTX_new(SSLv23_client_method());
+ SSL_CTX_set_options(ctx,SSL_OP_ALL|0);
+ SSL_CTX_set_default_verify_paths(ctx);
+ SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
Re: security/p5-Crypt-SSLeay SSLv3 fallout
Alexander Bluhm alexander.bl...@gmx.net writes: Hi, Hi Alexander, security/p5-Crypt-SSLeay regression tests fail with /usr/bin/perl:/usr/ports/pobj/p5-Crypt-SSLeay-0.72/Crypt-SSLeay-0.72/blib/arch/auto/Crypt/SSLeay/SSLeay.so: undefined symbol 'SSLv3_client_method' Is it the right approach to remove all calls to SSLv2 and SSLv3 and keep only SSLv23? I think so, and I see no reason for upstream to object. SSLv23 is the most portable approach, using SSLv3 unconditionally is insane and doesn't work any more since other OSes have started to disable SSLv3 by default. The patch-Makefile_PL chunk is no real change but happend with make update-patches. ok? ok jca@ (That code is gross...) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2015/08/30 19:21:39 Modified files: games/golly: Makefile distinfo Log message: Update to golly-2.7, from Donovan Watteau (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2015/08/30 18:47:20 Modified files: net/py-twitter : Makefile distinfo net/py-twitter/pkg: PLIST Log message: Update to py-twitter-1.17.0 and unbreak. From Daniel Winters.
Remove rubinius and ruby 1.9 handling from ruby.port.mk
This removes ruby 1.9 and rubinius support from ruby.port.mk. Both ports
were removed recently, so this is just dead code removal.
Fairly well tested on amd64, though I haven't run a bulk of the ruby
ports with it yet.
I plan on committing this in a few days unless I hear objections.
Thanks,
Jeremy
Index: ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.84
diff -u -p -r1.84 ruby.port.mk
--- ruby.port.mk27 Aug 2015 14:36:14 - 1.84
+++ ruby.port.mk29 Aug 2015 16:47:46 -
@@ -24,7 +24,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
# If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
# for each ruby interpreter
.if !defined(FLAVORS)
-FLAVORS= ruby18 ruby19 ruby20 ruby21 ruby22 rbx
+FLAVORS= ruby18 ruby20 ruby21 ruby22
. if !${CONFIGURE_STYLE:L:Mext} !${CONFIGURE_STYLE:L:Mextconf}
FLAVORS+= jruby
. endif
@@ -53,13 +53,13 @@ FLAVOR =ruby22
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-.for i in ruby18 ruby19 ruby20 ruby21 ruby22 jruby rbx
+.for i in ruby18 ruby20 ruby21 ruby22 jruby
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
-.if ${FLAVOR:N$i:Mruby18} || ${FLAVOR:N$i:Mruby19} || \
+.if ${FLAVOR:N$i:Mruby18} || \
${FLAVOR:N$i:Mruby20} || ${FLAVOR:N$i:Mruby21} || \
${FLAVOR:N$i:Mruby22} || \
- ${FLAVOR:N$i:Mjruby} || ${FLAVOR:N$i:Mrbx}
+ ${FLAVOR:N$i:Mjruby}
ERRORS += Fatal: Conflicting flavors used: ${FLAVOR}
.endif
. endif
@@ -92,11 +92,6 @@ MODRUBY_BINREV = 18
MODRUBY_PKG_PREFIX = ruby
MODRUBY_FLAVOR = ruby18
GEM_BIN_SUFFIX = 18
-.elif ${MODRUBY_REV} == 1.9
-MODRUBY_LIBREV = 1.9.1
-MODRUBY_BINREV = 19
-MODRUBY_FLAVOR = ruby19
-GEM_BIN_SUFFIX = 19
.elif ${MODRUBY_REV} == 2.0
MODRUBY_LIBREV = 2.0
MODRUBY_BINREV = 20
@@ -124,12 +119,6 @@ MODRUBY_LIBREV = 2.2.0
MODRUBY_FLAVOR = jruby
GEM_MAN_SUFFIX = -${MODRUBY_FLAVOR}
-.elif ${MODRUBY_REV} == rbx
-MODRUBY_LIBREV = 2.1
-#.poison MODRUBY_BINREV
-#.poison MODRUBY_WANTLIB
-MODRUBY_FLAVOR = rbx
-GEM_MAN_SUFFIX = -${MODRUBY_FLAVOR}
.endif
MODRUBY_RSPEC_DEPENDS =devel/ruby-rspec/1,${MODRUBY_FLAVOR}2.0
@@ -144,12 +133,6 @@ RAKE= ${RUBY} -S rake
RSPEC= ${RUBY} -S spec
MODRUBY_BIN_RSPEC =${RUBY} -S rspec
MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
-.elif ${MODRUBY_REV} == rbx
-RUBY= ${LOCALBASE}/bin/rbx
-RAKE= ${RUBY} -S rake
-RSPEC= ${RUBY} -S spec
-MODRUBY_BIN_RSPEC =${RUBY} -S rspec
-MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
.else
RUBY= ${LOCALBASE}/bin/ruby${MODRUBY_BINREV}
RAKE= ${LOCALBASE}/bin/rake${MODRUBY_BINREV}
@@ -187,8 +170,6 @@ ERRORS += Fatal: Ruby C extensions are
. else
MODRUBY_RUN_DEPENDS= lang/jruby
. endif
-.elif ${MODRUBY_REV} == rbx
-MODRUBY_RUN_DEPENDS= lang/rubinius
.else
MODRUBY_WANTLIB= ruby${MODRUBY_BINREV}
MODRUBY_RUN_DEPENDS= lang/ruby/${MODRUBY_REV}
@@ -200,8 +181,6 @@ MODRUBY_BUILD_DEPENDS= ${MODRUBY_RUN_DEP
# location of ruby libraries
.if ${MODRUBY_REV} == jruby
MODRUBY_LIBDIR=${LOCALBASE}/jruby/lib/ruby
-.elif ${MODRUBY_REV} == rbx
-MODRUBY_LIBDIR=${LOCALBASE}/lib/rubinius
.else
MODRUBY_LIBDIR=${LOCALBASE}/lib/ruby
.endif
@@ -218,10 +197,6 @@ SUBST_VARS += ^MODRUBY_RELDOCDIR ^MODRU
MODRUBY_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-java
MODRUBY_SITEDIR = jruby/lib/ruby/site_ruby/${MODRUBY_LIBREV}
MODRUBY_SITEARCHDIR = ${MODRUBY_SITEDIR}/java
-.elif ${MODRUBY_REV} == rbx
-MODRUBY_ARCH= ${MACHINE_ARCH}-openbsd
-MODRUBY_SITEDIR = lib/rubinius/site/
-MODRUBY_SITEARCHDIR = ${MODRUBY_SITEDIR}/${MODRUBY_ARCH}
.else
MODRUBY_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd
MODRUBY_SITEDIR = lib/ruby/site_ruby/${MODRUBY_LIBREV}
@@ -298,12 +273,8 @@ EXTRACT_SUFX= .gem
. if ${MODRUBY_REV} == 1.8
BUILD_DEPENDS+=devel/ruby-gems=1.8.23p3
RUN_DEPENDS+= devel/ruby-gems=1.3.7p0
-. elif ${MODRUBY_REV} == 1.9
-BUILD_DEPENDS+=lang/ruby/1.9=1.9.3.0
. elif ${MODRUBY_REV} == jruby
BUILD_DEPENDS+=lang/jruby=1.6.5
-. elif ${MODRUBY_REV} == rbx
-BUILD_DEPENDS+=lang/rubinius=2.1.1
. elif ${MODRUBY_REV} == 2.1
# Require version that fixes extensions directory path
BUILD_DEPENDS+=lang/ruby/2.1=2.1.0p0
@@ -335,11 +306,6 @@ GEM= ${RUBY} -S gem
GEM_BIN = jruby/bin
GEM_LIB = jruby/lib/ruby/gems/1.8
GEM_BASE_LIB= ${GEM_BASE}/jruby/${MODRUBY_LIBREV}
-. elif ${MODRUBY_REV} == rbx
-GEM= ${RUBY} -S gem
-GEM_BASE_LIB= ${GEM_BASE}/rbx/${MODRUBY_LIBREV}
-GEM_BIN
