Re: UPDATE: games/scorched3d
On Sat, November 4, 2017 01:09, Anthony J. Bentley wrote: > Hi, > > Here's a straightforward update to scorched3d-44. > > The minor issues that needed patching (libpng compatibility, openal > detection) have been fixed (differently) upstream. > > ok? > Same with re-generated patches: https://marc.info/?l=openbsd-ports&m=150951798121421&w=2 Didn't try it without openal patch. Tested on amd64 and macppc.
Fix missing private includes in Qt5-base
Hi all,
some upcoming KDE applications use the internal private Qt headers. The
diff below will fix the (..qt5/cmake/Qt5*/Qt*Config.cmake) cmake files
to detect private headers like this:
find_package(Qt5Core ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Private)
Ok?
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile24 Oct 2017 10:12:19 - 1.15
+++ Makefile4 Nov 2017 08:50:12 -
@@ -15,6 +15,7 @@ PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
+REVISION-main =0
PKG_ARCH-global = *
PKG_ARCH-examples =*
@@ -222,6 +223,8 @@ post-extract:
cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h
${WRKDIST}/mkspecs/openbsd-clang/
pre-configure:
+ # Fix missing private includes
https://bugreports.qt.io/browse/QTBUG-37417
+ sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i
${WRKSRC}/mkspecs/features/create_cmake.prf
@gccbasedir=`ecpp -print-search-dirs | awk '/^install:/{print $$2}'`; \
perl ${PORTSDIR}/infrastructure/bin/pkg_subst \
-D OPENBSD_INCDIR_PREPEND="$${gccbasedir}include" \
Re: Remove some old pure ruby gem ports
I think these ports can be purged (FWIW, the only one I use is Bacon: a great little test framework). But honestly I just get my ruby software via `gem install` and have been doing so for many years. It works great. Once in awhile there is a gem that gives me a problem, for example nokogiri, but tweaking a few make flags usually fixes it right up. I've found this the best and easiest way to stay patched and get anything I need when I need it. With that said, Jeremy, I greatly appreciate your effort in keeping the ruby language and gem system up to date. Thank you. P.S. jcs@, I dearly miss the garbage podcast. When I see a new show was downloaded, I get excited. Thank you too man. Clint Jeremy Evans wrote on 11/03/17 09:16: I would like to remove the pure ruby gem ports listed below. I reviewed all of our pure ruby gem ports and used the following criteria: 1) No significant updates in the last few years 2) Gem version we are using was released over 7 years ago 3) No other port depends on it Here's a list of the ports and the year the gem version we are using was released: databases/ruby-validatable # 2008 devel/ruby-bacon # 2008 devel/ruby-clio # 2008 devel/ruby-color-tools # 2005 devel/ruby-ffi-inliner # 2010 devel/ruby-gem_plugin # 2007 devel/ruby-mspec # 2010 devel/ruby-needle # 2005 devel/ruby-stringex # 2009 net/ruby-nmap-parser # 2009 net/ruby-xmpp4r # 2008 security/ruby-ezcrypto # 2009 security/ruby-yadis # 2007 textproc/ruby-ascii85 # 2009 textproc/ruby-classifier # 2010 textproc/ruby-htmlentities # 2007 textproc/ruby-markaby # 2006 textproc/ruby-pdf-reader # 2009 textproc/ruby-rtex # 2009 textproc/ruby-templater # 2009 www/ruby-thin_http # 2008 OKs? Thanks, Jeremy
update www/apache-httpd 2.4.29
Hi,
here a proposal to update to 2.4.29, removing some patches LIBRESSL's
related pushed upstream in the process.
Hope it is good.
Kind regards.
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile18 Sep 2017 19:25:38 - 1.85
+++ Makefile4 Nov 2017 09:10:58 -
@@ -3,8 +3,7 @@
COMMENT-main= apache HTTP server
COMMENT-common=/var/www files for Apache HTTPd
-V= 2.4.27
-REVISION-main= 0
+V= 2.4.29
DISTNAME= httpd-${V}
PKGNAME= apache-httpd-${V}
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo14 Jul 2017 17:14:33 - 1.26
+++ distinfo4 Nov 2017 09:10:58 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.27.tar.gz) = NG3T0BauXXEBAW5ogFFQvc6QQKjSRsKJqnDminzYa2Y=
-SIZE (httpd-2.4.27.tar.gz) = 8603417
+SHA256 (httpd-2.4.29.tar.gz) = lI5KESeKWVRpi4gLMPQBsemrdDcT7ixygKVN1N3YcIU=
+SIZE (httpd-2.4.29.tar.gz) = 8638793
Index: patches/patch-modules_ssl_mod_ssl_c
===
RCS file: patches/patch-modules_ssl_mod_ssl_c
diff -N patches/patch-modules_ssl_mod_ssl_c
--- patches/patch-modules_ssl_mod_ssl_c 14 Jul 2017 17:04:12 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-modules_ssl_mod_ssl_c,v 1.3 2017/07/14 17:04:12 sthen Exp $
-
-Index: modules/ssl/mod_ssl.c
modules/ssl/mod_ssl.c.orig
-+++ modules/ssl/mod_ssl.c
-@@ -337,7 +337,7 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
- #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
- ENGINE_cleanup();
- #endif
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_COMP_free_compression_methods();
- #endif
-
-@@ -390,7 +390,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
- /* We must register the library in full, to ensure our configuration
- * code can successfully test the SSL environment.
- */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- CRYPTO_malloc_init();
- #else
- OPENSSL_malloc_init();
Index: patches/patch-modules_ssl_ssl_engine_init_c
===
RCS file: patches/patch-modules_ssl_ssl_engine_init_c
diff -N patches/patch-modules_ssl_ssl_engine_init_c
--- patches/patch-modules_ssl_ssl_engine_init_c 14 Jul 2017 17:04:12 -
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-$OpenBSD: patch-modules_ssl_ssl_engine_init_c,v 1.9 2017/07/14 17:04:12 sthen
Exp $
-
-Index: modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_init.c.orig
-+++ modules/ssl/ssl_engine_init.c
-@@ -47,7 +47,7 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, ini
- #define KEYTYPES "RSA or DSA"
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- /* OpenSSL Pre-1.1.0 compatibility */
- /* Taken from OpenSSL 1.1.0 snapshot 20160410 */
- static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-@@ -380,7 +380,7 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t
- modssl_init_app_data2_idx(); /* for modssl_get_app_data2() at request
time */
-
- init_dh_params();
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- init_bio_methods();
- #endif
-
-@@ -513,7 +513,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *
- char *cp;
- int protocol = mctx->protocol;
- SSLSrvConfigRec *sc = mySrvConfig(s);
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- int prot;
- #endif
-
-@@ -583,7 +583,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *
-
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
-
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- /* always disable SSLv2, as per RFC 6176 */
- SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
-
-@@ -2011,7 +2011,7 @@ apr_status_t ssl_init_ModuleKill(void *data)
-
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- free_bio_methods();
- #endif
- free_dh_params();
Index: patches/patch-modules_ssl_ssl_engine_io_c
===
RCS file: patches/patch-modules_ssl_ssl_engine_io_c
diff -N patches/patch-modules_ssl_ssl_engine_io_c
--- patches/patch-modules_ssl_ssl_engine_i
help
help
NEW: x11/grantlee-qt5
Hi All, Grantlee-qt5 is the Qt5 variant of x11/grantlee and is needed for upcoming KDE application. @conflict grantlee-<5.1.0 marker is set in PLIST. All tests are green on amd64: 100% tests passed, 0 tests failed out of 12 DESCR: Grantlee is a set of Free Software libraries written using the Qt framework. The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code. Ok? Comments? Best regards, Rafael Sadowski grantlee-qt5.tar.gz Description: application/tar-gz
NEW: math/libcerf
The following port is a direct dependency of the gnuplot update I am working on. %--- Self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions. %--- Also available on github: https://github.com/jasperla/openbsd-wip/tree/master/math/libcerf OK? libcerf.tgz Description: application/tar-gz
[UPDATE] libxslt
minor update, ok ?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxslt/Makefile,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile
--- Makefile14 Sep 2017 14:57:13 - 1.88
+++ Makefile4 Nov 2017 10:48:38 -
@@ -3,11 +3,10 @@
COMMENT-main= XSLT C Library for GNOME
COMMENT-python=Python bindings for libxslt
-VERSION= 1.1.30
+VERSION= 1.1.32
DISTNAME= libxslt-${VERSION}
PKGNAME-main= libxslt-${VERSION}
PKGNAME-python=py-libxslt-${VERSION}
-REVISION=0
SHARED_LIBS += xslt 4.0 # 2.28
SHARED_LIBS += exslt9.8 # 8.17
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxslt/distinfo,v
retrieving revision 1.33
diff -u -p -u -r1.33 distinfo
--- distinfo14 Sep 2017 14:57:13 - 1.33
+++ distinfo4 Nov 2017 10:48:38 -
@@ -1,2 +1,2 @@
-SHA256 (libxslt-1.1.30.tar.gz) = umUjYRbegybYM3iyvZKYefoYUZW8UwudGrpyEHkQtrM=
-SIZE (libxslt-1.1.30.tar.gz) = 3444029
+SHA256 (libxslt-1.1.32.tar.gz) = Um7NCrr0p3iQQWIsOVDA5/LEyINUcVFf137saEo1VGA=
+SIZE (libxslt-1.1.32.tar.gz) = 3440715
greyscanner homepage
https://bitbucket.org/bonetruck/greyscanner/ seems to no longer be valid. (The tarball gets downloaded from ftp.openbsd.org) Jan
Re: UPDATE: php revamp
On 11/03/17 21:56, Marc Espie wrote:> See, this is exactly what I'm afraid of.
>
> run-time depends can be a bitch. The stuff still packages, and stays that
> way until somebody notices an issue... which often happens a few months
> after the commits, and sometimes even after release.
This risk should be minimal, since I grepped through all the packages
in-tree that contain a .php file on all the functions and classes that
moved out of main. Aside from that, currently the risk is about equal
because the admin already has to enable the RUN_DEPENDS modules.
Also note that the admin can still easily install the required module
when needed and is nothing more than a nuisance.
>
> Does php complain as soon as you try to start the offending package, or
> only when you activate some functionality that depends on the extra
> plugin ?
>
For module-dependency (e.g. pecl) it's at startup time (during ini-parsing)
(but as a warning unfortunately) and for methods/classes required at runtime
it's done lazily unfortunately.
>
> I'm seriously way more happy with things breaking straight away during
> compilation than with these kinds of ticking time bombs.
I agree 100%, but unfortunately that's just how PHP works.
>
> Invariably leads to breakage being noticed at the most inconvenient
> times.
>
Agree, although I've done all I can think of to prevent this with this
move.
>
> In the past, we've always cut up php according to two criteria:
> - modules that actually use more libraries (as in: pulling in more
> external stuff)
> - modules that actually have security aspects.
>
> Getting more fine-grained is not really that useful, and will only
> lead to further issues down the road.
>
> We already went that way for other things like gstreamer plugins,
> invariably cutting back to FEWER coarse grained modules sooner or
> later.
PHP's usecase can't be compared to that of gstreamer, because it's a
general purpose programming language.
>
> I would rather this be done sooner rather than later.
>
So what would be the desired requirements for this merge?
- The module doesn't have any lib-depends to prevent pulling in all
kinds of random packages.
- The module must be a requirement for another port.
- The module must not have any security implications.
If these are the requirements than the following packages would be
merged back into -main (or more precisely the different -SAPI packages):
- bcmath
- calendar
- ctype
- dom (libxml is a required extension, so no new dependencies)
- exif
- fileinfo? (no external dependency)
- ftp
- json
- mysqlnd
- mysql (depends on mysqlnd driver)
- mysqli (depends on mysqlnd driver)
- pdo
- pdo_mysql (depends on mysqlnd and pdo driver)
- phar? (Would leave sparc64 broken)
- simplexml (see dom)
- soap (see dom)
- sockets
- sysvsem? (I currently don't know if this has security implications)
- sysvshm? (I currently don't know if this has security implications)
- tokenizer
- wddx (see dom)
- xmlreader (see dom)
- xmlrpc (see dom)
- xmlwrite (see dom)
- zip
But would still leave the following as an invariables:
- bz2 (external library - archivers/bzip2)
- curl (external libarary - net/curl)
- fileinfo? (security of this feature has been subject of debate before)
- gd (extrenal libraries - graphics/{jpeg,png}
- gettext (external library - devel/gettext)
- gpm (external library - devel/gmp)
- iconv (external library - converters/libiconv)
- imap (external library - mail/alpine,-c-client)
- intl (external library - textproc/icu4c)
- ldap (external library - databases/openldap)
- mbstring (external library - textproc/oniguruma)
- mcrypt (external libraries - security/libmcrypt, devel/libtool,ltdl)
- pcntl (security - process control)
- pdo_pgsql (external library - databases/postgresql)
- pgsql (external library - database/postgresql)
- phar? (Should allow to build on sparc64 if we ignore the module there)
- posix (security - does signals)
- pspell (external library - textproc/aspell/core)
- readline (libreadline, although that can be provided through base)
- snmp (external library - net/netsnmp)
- sqlite3 (external library - databases/sqlite3)
- sysvsem? (I currently don't know if this has security implications)
- sysvshm? (I currently don't know if this has security implications)
- xsl (external library - textproc/libxslt)
This list is about 50/50 and might seem completely unintuitive to the
end-user. What would people think about pdo_mysql being included over
pdo_pgsql or pdo_sqlite3 without knowledge of this discussion? -
They could assume mysql/mariadb is the preferred database for the
OpenBSD project, or think that the OpenBSD devs forgot to include the
pdo_mysql package and start asking questions on the mailing lists.
Or why do I have all my xml-tools and its kitchensink, but not xsl?
Same for sysvsem/sysvshm vs sysvmsg?
What about bzip2, curl? pretty widely used while the sysv* modules
are a rarity (I was surprised even a single port uses them).
Even with the above ruleset both list
UPDATE: math/gnuplot 5.2.1
Now that octave has been updated, here is an update to the latest
gnuplot version. It depends on libcerf which is a new port that I
posted earlier on the mailing list.
While at it take maintainership. OK?
Also available on github:
https://github.com/jasperla/openbsd-wip/tree/master/math/gnuplot
Index: Makefile
===
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.66
+++ Makefile4 Nov 2017 11:04:45 -
@@ -2,22 +2,24 @@
COMMENT = command-driven interactive function plotting program
-V =4.6
-PATCHLEVEL = 6
-REVISION = 3
+V =5.2
+PATCHLEVEL = 1
DISTNAME = gnuplot-${V}.${PATCHLEVEL}
CATEGORIES = math graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
HOMEPAGE = http://www.gnuplot.info/
+MAINTAINER = Paul Irofti
+
# see Copyright in source
# http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c m ncurses readline ${COMPILER_LIBCXX} z
+WANTLIB += c cerf m ncurses readline ${COMPILER_LIBCXX} z
BUILD_DEPENDS =emacs->=24:editors/emacs
+LIB_DEPENDS += math/libcerf
FLAVORS = no_cairo no_x11
FLAVOR ?=
@@ -26,15 +28,16 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --without-linux-vga \
--without-latex \
--without-tutorial \
- --with-readline \
- --with-lasergnu \
+ --with-readline=bsd \
--disable-wxwidgets \
- --disable-qt \
+ --with-qt=no \
--without-lua \
--without-pdf
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+USE_GMAKE =Yes
+
FAKE_FLAGS = appdefaultdir="${PREFIX}/lib/X11/app-defaults/"
TEST_IS_INTERACTIVE = x11
@@ -54,12 +57,9 @@ CONFIGURE_ARGS += --with-x
CONFIGURE_ARGS += --without-cairo
.else
LIB_DEPENDS += devel/gettext \
- devel/pango \
+ devel/pango \
graphics/cairo
WANTLIB += cairo gobject-2.0 glib-2.0 intl pango-1.0 pangocairo-1.0
.endif
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu
.include
Index: distinfo
===
RCS file: /cvs/ports/math/gnuplot/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo3 Jun 2015 07:28:28 - 1.14
+++ distinfo4 Nov 2017 11:04:45 -
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.6.6.tar.gz) = HxlZb9CQRfIiJa+/7BH6kbmtHZW59IQGNi9RfU8TAnQ=
-SIZE (gnuplot-4.6.6.tar.gz) = 5059214
+SHA256 (gnuplot-5.2.1.tar.gz) = fcaw+2syFpHonjRDhzEKjmYU8MTl6xWpDcdCpT2Afog=
+SIZE (gnuplot-5.2.1.tar.gz) = 5295961
Index: patches/patch-src_command_c
===
RCS file: patches/patch-src_command_c
diff -N patches/patch-src_command_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_command_c 4 Nov 2017 11:04:45 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+command.o: In function `report_error':
+command.c:(.text+0x5842): undefined reference to `WEXITSTATUS'
+
+Index: src/command.c
+--- src/command.c.orig
src/command.c
+@@ -119,6 +119,7 @@ int thread_rl_RetCode = -1; /* return code from readli
+
+ #ifndef _Windows
+ # include "help.h"
++# include
+ #endif /* _Windows */
+
+ #ifdef _Windows
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/gnuplot/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST 3 Jun 2015 07:28:28 - 1.18
+++ pkg/PLIST 4 Nov 2017 11:04:45 -
@@ -1,12 +1,7 @@
@comment $OpenBSD: PLIST,v 1.18 2015/06/03 07:28:28 pirofti Exp $
@bin bin/gnuplot
-bin/lasergnu
+@man man/man1/gnuplot-ja.1
@man man/man1/gnuplot.1
-@man man/man1/lasergnu.1
-share/emacs/site-lisp/gnuplot-gui.el
-share/emacs/site-lisp/gnuplot-gui.elc
-share/emacs/site-lisp/gnuplot.el
-share/emacs/site-lisp/gnuplot.elc
share/gnuplot/
!%%no_x11%%
share/gnuplot/${V}/
@@ -18,6 +13,7 @@ share/gnuplot/${V}/PostScript/8859-9.ps
share/gnuplot/${V}/PostScript/aglfn.txt
share/gnuplot/${V}/PostScript/cp1250.ps
share/gnuplot/${V}/PostScript/cp1251.ps
+share/gnuplot/${V}/PostScript/cp1252.ps
share/gnuplot/${V}/PostScript/cp437.ps
share/gnuplot/${V}/PostScript/cp850.ps
share/gnuplot/${V}/PostScript/cp852.ps
@@ -29,7 +25,6 @@ share/gnuplot/${V}/colors_default.gp
share/gnuplot/${V}/colors_mono.gp
share/gnuplot/${V}/colors_podo.gp
share/gnuplot/${V}/gnuplot.gih
-share/gnuplot/${V}/gnuplot.pdf
share/gnuplot/${V}/gnuplotrc
share/gnuplot/${V}/js/
share/gnuplot/${V}/js/README
@@ -44,6 +39,7 @@ share/gnuplot/${V}
Re: UPDATE: php revamp
On Sat, Nov 04, 2017 at 12:06:09PM +0100, Martijn van Duren wrote:
> So what would be the desired requirements for this merge?
> - The module doesn't have any lib-depends to prevent pulling in all
> kinds of random packages.
> - The module must be a requirement for another port.
> - The module must not have any security implications.
>
> If these are the requirements than the following packages would be
> merged back into -main (or more precisely the different -SAPI packages):
> - bcmath
> - calendar
> - ctype
> - dom (libxml is a required extension, so no new dependencies)
> - exif
> - fileinfo? (no external dependency)
> - ftp
> - json
> - mysqlnd
> - mysql (depends on mysqlnd driver)
> - mysqli (depends on mysqlnd driver)
> - pdo
> - pdo_mysql (depends on mysqlnd and pdo driver)
> - phar? (Would leave sparc64 broken)
> - simplexml (see dom)
> - soap (see dom)
> - sockets
> - sysvsem? (I currently don't know if this has security implications)
> - sysvshm? (I currently don't know if this has security implications)
> - tokenizer
> - wddx (see dom)
> - xmlreader (see dom)
> - xmlrpc (see dom)
> - xmlwrite (see dom)
> - zip
>
> But would still leave the following as an invariables:
> - bz2 (external library - archivers/bzip2)
> - curl (external libarary - net/curl)
> - fileinfo? (security of this feature has been subject of debate before)
> - gd (extrenal libraries - graphics/{jpeg,png}
> - gettext (external library - devel/gettext)
> - gpm (external library - devel/gmp)
> - iconv (external library - converters/libiconv)
> - imap (external library - mail/alpine,-c-client)
> - intl (external library - textproc/icu4c)
> - ldap (external library - databases/openldap)
> - mbstring (external library - textproc/oniguruma)
> - mcrypt (external libraries - security/libmcrypt, devel/libtool,ltdl)
> - pcntl (security - process control)
> - pdo_pgsql (external library - databases/postgresql)
> - pgsql (external library - database/postgresql)
> - phar? (Should allow to build on sparc64 if we ignore the module there)
> - posix (security - does signals)
> - pspell (external library - textproc/aspell/core)
> - readline (libreadline, although that can be provided through base)
> - snmp (external library - net/netsnmp)
> - sqlite3 (external library - databases/sqlite3)
> - sysvsem? (I currently don't know if this has security implications)
> - sysvshm? (I currently don't know if this has security implications)
> - xsl (external library - textproc/libxslt)
>
> This list is about 50/50 and might seem completely unintuitive to the
> end-user. What would people think about pdo_mysql being included over
> pdo_pgsql or pdo_sqlite3 without knowledge of this discussion? -
> They could assume mysql/mariadb is the preferred database for the
> OpenBSD project, or think that the OpenBSD devs forgot to include the
> pdo_mysql package and start asking questions on the mailing lists.
> Or why do I have all my xml-tools and its kitchensink, but not xsl?
> Same for sysvsem/sysvshm vs sysvmsg?
> What about bzip2, curl? pretty widely used while the sysv* modules
> are a rarity (I was surprised even a single port uses them).
Welcome to the world of actual distributions. We are supposed to
be the expert and to know better than the end user.
There's nothing that prevents you from adding this kind of rationale
to the actual package DESCR.
One strong point of OpenBSD is that we actuall make this kind of
decision. Choosing best paths for software components, so that the
end-user doesn't have to worry too much.
I've never been a fan of debian where they split stuff into so
many very small packages that you never know what to install.
Now, think like an end-user. Assume they want to use php. What do
they do ? They add the main package. They try to run something.
They discover one dependency is missing. They add that dependency.
They do it another time...
How many times are they going to do it ?
The safe bet is that they usually give up after the 4th dependency,
and just add *everything* that has php in it.
Congrats, you just gave them enough rope so that they add fileinfo
by default.
openscenegraph 3.4.1 + add qt5 flavor
Hi,
here's the update for OSG 3.4.1, and while here addded a qt5 FLAVOR i
need for the 3d globe in the upcoming qgis3, via osgearth for which a
port is in the works. I also enabled the gdal/ogr bits.
comments/testing welcome, especially with the other OSG consumers
(openmw?)
Landry
Index: Makefile
===
RCS file: /cvs/ports/graphics/openscenegraph/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile26 Jul 2017 22:45:24 - 1.12
+++ Makefile4 Nov 2017 11:31:18 -
@@ -4,10 +4,11 @@
COMMENT = 3D graphics toolkit
-V =3.4.0
-DISTNAME = OpenSceneGraph-${V}
-PKGNAME = openscenegraph-${V}
-REVISION = 2
+V =3.4.1
+GH_ACCOUNT = openscenegraph
+GH_PROJECT = OpenSceneGraph
+GH_TAGNAME = ${GH_PROJECT}-${V}
+DISTNAME = ${GH_PROJECT:L}-${V}
SUBST_VARS += V
@@ -40,27 +41,41 @@
# OSGPL (see LICENSE.txt)
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL Half Iex IlmImf IlmThread QtGui QtOpenGL SDL X11
+FLAVORS = qt5
+FLAVOR ?=
+
+WANTLIB += GL Half Iex IlmImf IlmThread SDL X11 gdal
WANTLIB += Xrandr avcodec avdevice avformat avresample avutil
WANTLIB += c cairo curl freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
WANTLIB += gobject-2.0 intl jasper jpeg m png poppler-glib pthread
WANTLIB += rsvg-2 ${COMPILER_LIBCXX} swresample swscale tiff z
-MASTER_SITES =
${HOMEPAGE}/downloads/stable_releases/OpenSceneGraph-$V/source/
-EXTRACT_SUFX = .zip
-
MODULES = devel/cmake \
- x11/qt4
+ x11/qt5
LIB_DEPENDS = graphics/openexr \
graphics/ffmpeg \
graphics/gdk-pixbuf2 \
graphics/giflib \
+ geo/gdal \
net/curl \
print/poppler \
x11/gnome/librsvg
-CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4 \
- -DOSG_USE_AGGRESSIVE_WARNINGS=OFF
+.if ${FLAVOR:Mqt5}
+MODULES += x11/qt5
+CONFIGURE_ARGS = -DDESIRED_QT_VERSION=5
+SHARED_LIBS += osgQt5 1.0 # 3.0
+WANTLIB += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+post-install:
+ ln ${PREFIX}/lib/libosgQt{,5}.so.${LIBosgQt_VERSION}
+
+.else
+MODULES += x11/qt4
+CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4
+WANTLIB += QtGui QtOpenGL
+.endif
+
+CONFIGURE_ARGS += -DOSG_USE_AGGRESSIVE_WARNINGS=OFF
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/openscenegraph/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo22 Sep 2015 18:49:15 - 1.3
+++ distinfo4 Nov 2017 11:31:18 -
@@ -1,2 +1,2 @@
-SHA256 (OpenSceneGraph-3.4.0.zip) =
XHJ9hHVdonat+MSko6i6nJVw/EtJafBvHS6fibHjBA4=
-SIZE (OpenSceneGraph-3.4.0.zip) = 7975023
+SHA256 (openscenegraph-3.4.1.tar.gz) =
kw60bwV4GnaIPsFsX0nPspoFlCHbExAF11vsTXhAH9U=
+SIZE (openscenegraph-3.4.1.tar.gz) = 5686385
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/openscenegraph/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt29 Jun 2017 09:35:45 - 1.6
+++ patches/patch-CMakeLists_txt4 Nov 2017 11:31:18 -
@@ -2,7 +2,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -658,13 +658,15 @@ ELSE()
+@@ -654,13 +654,15 @@ ELSE()
FIND_PACKAGE(COLLADA)
FIND_PACKAGE(FBX)
FIND_PACKAGE(ZLIB)
@@ -20,7 +20,7 @@
FIND_PACKAGE(OurDCMTK)
FIND_PACKAGE(FFmpeg)
FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
-@@ -848,12 +850,6 @@ IF(CYGWIN)
+@@ -844,12 +846,6 @@ IF(CYGWIN)
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
ENDIF()
Index: patches/patch-applications_present3D_Cluster_cpp
===
RCS file:
/cvs/ports/graphics/openscenegraph/patches/patch-applications_present3D_Cluster_cpp,v
retrieving revision 1.3
diff -u -r1.3 patch-applications_present3D_Cluster_cpp
--- patches/patch-applications_present3D_Cluster_cpp22 Sep 2015 18:49:15
- 1.3
+++ patches/patch-applications_present3D_Cluster_cpp4 Nov 2017 11:31:18
-
@@ -1,21 +1,22 @@
$OpenBSD: patch-applications_present3D_Cluster_cpp,v 1.3 2015/09/22 18:49:15
pascal Exp $
applications/present3D/Cluster.cpp.origMon Apr 13 12:43:56 2015
-+++ applications/present3D/Cluster.cpp Thu Sep 10 20:46:22 2015
+Index: applications/present3D/Cluster.cpp
+--- applications/present3D/Cluster.cpp.orig
applications/present3D/Cluster.cpp
@@ -33,7 +33,7 @@
#if defined(__linux)
#include
#include
--#elif defined(__Free
[new] osgearth 2.8
Hi, here's a port for osgearth (http://osgearth.org/) a c++ geospatial 3d toolkit used by the globe plugin in QGIS on which im working on. it depends on openscenegraph,qt5 flavor i just sent. comments welcome! Landry osgearth-2.8.tgz Description: application/tar-gz
Re: [update] www/p5-libwww 6.15 -> 6.26 now 6.27
Ping retested with perl 5.24.3 no issues seen. Ok for this update? On 09/24/17 23:02, Nigel Taylor wrote: > On 09/24/17 12:49, Stuart Henderson wrote: >> On 2017/09/23 23:21, Nigel Taylor wrote: >>> This has been taken over by new CPAN author. >>> >>> Changes most code cleanup and bug fixes. >>> >>> Built tested on amd64. >>> >>> Used with get_iplayer/get_flash_videos for some time on main desktop. >>> >>> Ok? >> >> I don't see any problem with the diff itself, but it's the wrong time to >> update a module affecting ~100 ports (not helped by being an interpreted >> language so problems in p5-* often don't show up until runtime). >> >> So, OK for after unlock. >> >> > Anyway version 6.27 is now out. I've moved on to that now. > > Built and tested on amd64. > > Change history for libwww-perl > > 6.27 2017-09-21 > - Switch to Getopt::Long in lwp-download (GH #262) > - Fix lwp-request -C (GH #261) > - Hide LWP::Protocol::http::Socket, > LWP::Protocol::http::SocketMethods and > LWP::Debug::TraceHTTP::Socket from PAUSE > - Add tests for the "get" & "head" functions (GH #252) > - Update lwpcook.pod (GH #256) > - Handle undefined values in ->credentials (GH #157) > - Fix lwp-mirror options checks. > - Update bin/ scripts to use $LWP::VERSION instead of ->Version() > - Improve lwp-download --help (GH #262) > > 6.26 2017-04-12 > - Perltidy all apps in the bin/ directory > - Make all apps in bin/ use strict and warnings (RT #92633) > - Fix bug tracker URL in metadata > > 6.25 2017-04-03 > - Fix LWP::UserAgent docs for request and request_simple that pointed to > functions in LWP::Simple rather than LWP::UserAgent > - Moved the official bug tracker to GitHub rather than RT. > > 6.24 2017-03-14 > - Document clone methods inability to clone cookie jars (RT #13542) > - It is now possible to set the proxy and no_proxy attributes from the > constructor of LWP::UserAgent. (GH #124) > > 6.23 2017-03-06 > - Fix bug where Protocol::NNTP called undef on a variable before > being done > using it. (GH PR #121) > - Ran perltidy on LWP::Protocol::NNTP > - Re-organized current documentation set. > > 6.22 2017-03-01 > - Update Travis-CI to test on minimum versions of prereqs. (GH PR #109) > - Fix tests that depended on a newer version of HTTP::Message (GH PR > #119) > - Update documentation to reflect behavior difference in ->put() > depending > on the version of HTTP::Message installed. (GH PR #120) > > 6.21 2017-02-21 > - Ensure that LWP::Simple re-exports some HTTP::Status functions > > 6.20 2017-02-21 > - Converted to use Dist::Zilla > - Moved several tests to xt/author > > 6.192017-02-14 > - Call HTTP::Status constant functions without & (GH#110) > - Make bin scripts use LWP's version and not maintain their own (PR #54) > - Fix bug triggered in some cases of auth challenges not having a viable > protocol (PR#111) > - Remove usage of the 'vars' pragma (GH#113) > > 6.182017-02-03 > - Update "timeout" when reusing sockets (PR#90) > - Fix bug triggered when calling simple_request() with a malformed URL > (PR#108) > > 6.172017-01-31 > - Noted another protocol failure message (PR#65) > - Removed old use of UNIVERSAL::isa() and swapped evals for > Try::Tiny (PR#105) > - Standardized the Changes file (GH#106) > - Fixed documentation error in lwp-request. > > 6.162017-01-18 > - Moved LWP::Protocol::GHTTP into its own dist and removed from here > (PR#81) > - Updated test suite to use strict/warnings and Test::More (PR#88) > - Additional tests for UserAgent coverage (PR#79) > - Cleaned up documentation formatting and fixed several typos > (PR#87, PR#93) > - Stop promoting use of HTTP::Cookies and instead use > HTTP::CookieJar::LWP (PR#102) > - Added some new documentation to UserAgent and tutorial (PR#68) > - Allow default header to carry over when using ->post() in UA (PR#100) >
Re: [UPDATE] libxslt
On Sat, Nov 04, 2017 at 10:51:50AM +, Steven Mestdagh wrote:
> minor update, ok ?
Yup
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/libxslt/Makefile,v
> retrieving revision 1.88
> diff -u -p -u -r1.88 Makefile
> --- Makefile 14 Sep 2017 14:57:13 - 1.88
> +++ Makefile 4 Nov 2017 10:48:38 -
> @@ -3,11 +3,10 @@
> COMMENT-main=XSLT C Library for GNOME
> COMMENT-python= Python bindings for libxslt
>
> -VERSION= 1.1.30
> +VERSION= 1.1.32
> DISTNAME=libxslt-${VERSION}
> PKGNAME-main=libxslt-${VERSION}
> PKGNAME-python= py-libxslt-${VERSION}
> -REVISION=0
>
> SHARED_LIBS += xslt 4.0 # 2.28
> SHARED_LIBS += exslt9.8 # 8.17
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/libxslt/distinfo,v
> retrieving revision 1.33
> diff -u -p -u -r1.33 distinfo
> --- distinfo 14 Sep 2017 14:57:13 - 1.33
> +++ distinfo 4 Nov 2017 10:48:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (libxslt-1.1.30.tar.gz) = umUjYRbegybYM3iyvZKYefoYUZW8UwudGrpyEHkQtrM=
> -SIZE (libxslt-1.1.30.tar.gz) = 3444029
> +SHA256 (libxslt-1.1.32.tar.gz) = Um7NCrr0p3iQQWIsOVDA5/LEyINUcVFf137saEo1VGA=
> +SIZE (libxslt-1.1.32.tar.gz) = 3440715
>
--
Antoine
Upcoming firefox 57 release notes
Hi, as some of you have read in the tech news all around, the upcoming firefox 57 is quite a 'reboot' of the user experience (https://hacks.mozilla.org/2017/09/firefox-quantum-developer-edition-fastest-firefox-ever/), with: - ui change (again) wrt tabs and toolbars look. Like it or not... - much faster rendering (multiprocess by default - and using the rust-based stylo css engine) - deprecation of 'legacy' extensions - you'll have to deal with it, your beloved extension unmaintained since 5+ years will stop working, nothing you can do about that. - and something which has been brought to my attention, the (somewhat hidden imo) feature of 'pasting an url anywhere in the firefox window would open it in a new tab' has been disabled by default, because it was confusing. See https://bugzilla.mozilla.org/show_bug.cgi?id=366945 for rationale, and if you dont like that, stop ranting and toggle middlemouse.contentLoadURL, or paste the url where it belongs, in the addressbra. No, i wont change the defaults :) That said, we're at beta14, and ETA is in ~10 days iirc. Landry
Re: UPDATE: php revamp
On Sat, Nov 4, 2017 at 12:13 PM, Marc Espie wrote: > Welcome to the world of actual distributions. We are supposed to > be the expert and to know better than the end user. > > There's nothing that prevents you from adding this kind of rationale > to the actual package DESCR. > > One strong point of OpenBSD is that we actuall make this kind of > decision. Choosing best paths for software components, so that the > end-user doesn't have to worry too much. > > I've never been a fan of debian where they split stuff into so > many very small packages that you never know what to install. > If you are a user, things like Drupal, Symfony, WordPress, Magento, ... have a requirements page that tells you what extensions you have to enable. It's up to the developers of those systems to tell you what the requirements are. If you are a PHP developer writing actual software, in my opinion, you should learn what the extensions are for. There is good documentation available on php.net for developers. Now, think like an end-user. Assume they want to use php. What do > they do ? They add the main package. They try to run something. > They discover one dependency is missing. They add that dependency. > They do it another time... > > How many times are they going to do it ? > > The safe bet is that they usually give up after the 4th dependency, > and just add *everything* that has php in it. > > Congrats, you just gave them enough rope so that they add fileinfo > by default. > Let's make a comparison with let's say PF. Users try to run something, they open a port, open another port, ... so how many ports do they open until they just allow any to any? If users are lazy there is not much you can do about it. What solution should OpenBSD provide for that? A default ruleset that assumes they run smtp, serve http, use skype, etc? No offense, I'm tying to understand your point of view.
[UPDATE] security/py-pefile
ping
Forwarded Message
Subject: [UPDATE] security/py-pefile
Date: Thu, 5 Oct 2017 07:06:17 +0200
From: Remi Pointel
To: The OpenBSD ports mailing-list
Hi,
this is the diff to update pefile to latest release. It needs the
py-future port.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/py-pefile/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 1 Oct 2016 11:54:17 - 1.7
+++ Makefile 5 Oct 2017 05:03:42 -
@@ -2,10 +2,9 @@
COMMENT = Python module to read and work with PE files
-MODPY_EGG_VERSION = 1.2.10.post139
-REVISION = 2
-DISTNAME = pefile-1.2.10-139
-PKGNAME = py-pefile-1.2.10.139
+MODPY_EGG_VERSION = 2017.9.3
+DISTNAME = pefile-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME}
CATEGORIES = security
@@ -18,10 +17,11 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_FTP = Yes
-MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=pefile/}
-
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
+MODPY_PI = Yes
+
+RUN_DEPENDS = devel/py-future
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/security/py-pefile/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 13 Apr 2014 07:06:26 - 1.2
+++ distinfo 5 Oct 2017 05:03:42 -
@@ -1,2 +1,2 @@
-SHA256 (pefile-1.2.10-139.tar.gz) = i3xdhTyXqSPQ9uEo0K52uWKqdf1gjVUvWjLkYnaQihY=
-SIZE (pefile-1.2.10-139.tar.gz) = 57322
+SHA256 (pefile-2017.9.3.tar.gz) = UPruMlnL/HjnJHTuhR7WmWlctsxavz/H8VXgwax0yMk=
+SIZE (pefile-2017.9.3.tar.gz) = 61722
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-pefile/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 29 Sep 2015 09:02:55 - 1.3
+++ pkg/PLIST 5 Oct 2017 05:03:42 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/09/29 09:02:55 edd Exp $
+@comment $OpenBSD$
lib/python${MODPY_VERSION}/site-packages/ordlookup/
lib/python${MODPY_VERSION}/site-packages/ordlookup/__init__.py
lib/python${MODPY_VERSION}/site-packages/ordlookup/__init__.pyc
@@ -10,6 +10,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pefile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pefile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pefile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pefile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pefile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pefile.py
lib/python${MODPY_VERSION}/site-packages/pefile.pyc
[UPDATE] security/plaso
Hi,
this is the diff to update plaso to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/plaso/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 23 Feb 2017 13:53:07 - 1.1.1.1
+++ Makefile 4 Nov 2017 12:02:51 -
@@ -2,7 +2,7 @@
COMMENT = engine and tools to automate creation of super timeline
-MODPY_EGG_VERSION = 1.5.1
+MODPY_EGG_VERSION = 20170930
DISTNAME = plaso-${MODPY_EGG_VERSION}
CATEGORIES = security
@@ -44,9 +44,12 @@ RUN_DEPENDS += devel/ipython \
sysutils/libvslvm \
devel/py-bencode \
devel/py-binplist \
+ devel/py-certifi \
+ textproc/py-chardet \
devel/py-construct \
devel/py-dateutil \
devel/py-efilter \
+ devel/py-future \
devel/py-hachoir-core \
devel/py-hachoir-metadata \
devel/py-hachoir-parser \
@@ -69,7 +72,8 @@ RUN_DEPENDS += devel/ipython \
sysutils/py-psutil \
sysutils/py-tsk \
textproc/py-yaml \
- www/py-requests
+ www/py-requests \
+ www/py-urllib3
TEST_DEPENDS += devel/py-test \
${RUN_DEPENDS}
Index: distinfo
===
RCS file: /cvs/ports/security/plaso/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 23 Feb 2017 13:53:07 - 1.1.1.1
+++ distinfo 4 Nov 2017 12:02:51 -
@@ -1,2 +1,2 @@
-SHA256 (plaso-1.5.1.tar.gz) = hgp+Q7gpdB1Pg7iSvYQVEGb6Rs0G4ESqEJTITjs/A6c=
-SIZE (plaso-1.5.1.tar.gz) = 112587008
+SHA256 (plaso-20170930.tar.gz) = v8v7gVRl/RAjVobtCUQXwZmCJTIMxH5uXGvY7KEFelI=
+SIZE (plaso-20170930.tar.gz) = 108785888
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/plaso/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 23 Feb 2017 13:53:07 - 1.1.1.1
+++ pkg/PLIST 4 Nov 2017 12:02:51 -
@@ -2,8 +2,8 @@
bin/image_export.py
bin/log2timeline.py
bin/pinfo.py
-bin/preg.py
bin/psort.py
+bin/psteal.py
lib/python${MODPY_VERSION}/site-packages/plaso/
lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -68,35 +68,65 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/plaso/cli/
lib/python${MODPY_VERSION}/site-packages/plaso/cli/__init__.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/plaso/cli/analysis_tool.py
-lib/python${MODPY_VERSION}/site-packages/plaso/cli/analysis_tool.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/extraction_tool.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/extraction_tool.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/__init__.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/analysis_plugins.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/analysis_plugins.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/artifact_definitions.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/artifact_definitions.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/data_location.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/data_location.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/database_config.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/database_config.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/date_filters.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/date_filters.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/dynamic_output.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/dynamic_output.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/elastic_output.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/elastic_output.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/event_filters.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/event_filters.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/extraction.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/extraction.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/filter_file.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/filter_file.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/hashers.py
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/hashers.pyc
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/interface.py
lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/interface.pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/language.py
+lib/python${MO
[UPDATE] security/py-dfvfs
Hi,
this is the diff to update py-dfvfs to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/py-dfvfs/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 7 Mar 2017 10:10:43 - 1.2
+++ Makefile 4 Nov 2017 11:59:23 -
@@ -2,7 +2,7 @@
COMMENT = Digital Forensics Virtual File System (dfVFS)
-MODPY_EGG_VERSION = 20170116
+MODPY_EGG_VERSION = 20170723
DISTNAME = py-dfvfs-${MODPY_EGG_VERSION}
GH_ACCOUNT = log2timeline
Index: distinfo
===
RCS file: /cvs/ports/security/py-dfvfs/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 7 Mar 2017 10:10:43 - 1.2
+++ distinfo 4 Nov 2017 11:59:23 -
@@ -1,2 +1,2 @@
-SHA256 (py-dfvfs-20170116.tar.gz) = gyztTdfmFs9ix+MfOFY7lJQtJ0zq52+FvbfbM4EWyzw=
-SIZE (py-dfvfs-20170116.tar.gz) = 77685960
+SHA256 (py-dfvfs-20170723.tar.gz) = aX9wUvuLOanDJyv0tJdsQRfgyVWjg/egwdm+f8gbqpo=
+SIZE (py-dfvfs-20170723.tar.gz) = 77691337
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-dfvfs/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 7 Mar 2017 10:10:43 - 1.2
+++ pkg/PLIST 4 Nov 2017 11:59:23 -
@@ -76,8 +76,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/keychain.pyc
lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/manager.py
lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/manager.pyc
-lib/python${MODPY_VERSION}/site-packages/dfvfs/dependencies.py
-lib/python${MODPY_VERSION}/site-packages/dfvfs/dependencies.pyc
lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/
lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/__init__.py
lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/__init__.pyc
@@ -189,6 +187,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/ewf.pyc
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/fvde.py
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/fvde.pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/glob2regex.py
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/glob2regex.pyc
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/lvm.py
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/lvm.pyc
lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/py2to3.py
Re: UPDATE: math/gnuplot 5.2.1
On Sat, Nov 04, 2017 at 01:07:56PM +0200, Paul Irofti wrote:
> Now that octave has been updated, here is an update to the latest
> gnuplot version. It depends on libcerf which is a new port that I
> posted earlier on the mailing list.
>
> While at it take maintainership. OK?
>
> Also available on github:
> https://github.com/jasperla/openbsd-wip/tree/master/math/gnuplot
Here is an updated version that uses GNU readline (thanks to input from
feinerer@).
Index: Makefile
===
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.66
+++ Makefile4 Nov 2017 12:35:02 -
@@ -2,22 +2,25 @@
COMMENT = command-driven interactive function plotting program
-V =4.6
-PATCHLEVEL = 6
-REVISION = 3
+V =5.2
+PATCHLEVEL = 1
DISTNAME = gnuplot-${V}.${PATCHLEVEL}
CATEGORIES = math graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
HOMEPAGE = http://www.gnuplot.info/
+MAINTAINER = Paul Irofti
+
# see Copyright in source
# http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c m ncurses readline ${COMPILER_LIBCXX} z
+WANTLIB += c cerf m ncurses ereadline ${COMPILER_LIBCXX} z
BUILD_DEPENDS =emacs->=24:editors/emacs
+LIB_DEPENDS += devel/readline \
+ math/libcerf
FLAVORS = no_cairo no_x11
FLAVOR ?=
@@ -26,15 +29,16 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --without-linux-vga \
--without-latex \
--without-tutorial \
- --with-readline \
- --with-lasergnu \
+ --with-readline=${LOCALBASE} \
--disable-wxwidgets \
- --disable-qt \
+ --with-qt=no \
--without-lua \
--without-pdf
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+USE_GMAKE =Yes
+
FAKE_FLAGS = appdefaultdir="${PREFIX}/lib/X11/app-defaults/"
TEST_IS_INTERACTIVE = x11
@@ -54,12 +58,9 @@ CONFIGURE_ARGS += --with-x
CONFIGURE_ARGS += --without-cairo
.else
LIB_DEPENDS += devel/gettext \
- devel/pango \
+ devel/pango \
graphics/cairo
WANTLIB += cairo gobject-2.0 glib-2.0 intl pango-1.0 pangocairo-1.0
.endif
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu
.include
Index: distinfo
===
RCS file: /cvs/ports/math/gnuplot/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo3 Jun 2015 07:28:28 - 1.14
+++ distinfo4 Nov 2017 12:35:02 -
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.6.6.tar.gz) = HxlZb9CQRfIiJa+/7BH6kbmtHZW59IQGNi9RfU8TAnQ=
-SIZE (gnuplot-4.6.6.tar.gz) = 5059214
+SHA256 (gnuplot-5.2.1.tar.gz) = fcaw+2syFpHonjRDhzEKjmYU8MTl6xWpDcdCpT2Afog=
+SIZE (gnuplot-5.2.1.tar.gz) = 5295961
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 4 Nov 2017 12:35:02 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+readline -> ereadline
+
+Index: configure
+--- configure.orig
configure
+@@ -10127,7 +10127,7 @@ fi
+ if test -d $with_readline/lib; then
+ LDFLAGS="$LDFLAGS -L$with_readline/lib"
+ fi
+-if test ! -d $with_readline/include/readline; then
++if test ! -d $with_readline/include/ereadline; then
+ if test -d $with_readline/include/editline; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $with_readline
contains libedit, not readline!" >&5
+ $as_echo "$as_me: WARNING: $with_readline contains libedit, not readline!"
>&2;}
+@@ -10220,7 +10220,7 @@ if ${ac_cv_lib_readline_remove_history+:} false; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline ${gp_tcap} $LIBS"
++LIBS="-lereadline ${gp_tcap} $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -10251,7 +10251,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_remove_history" >&5
+ $as_echo "$ac_cv_lib_readline_remove_history" >&6; }
+ if test "x$ac_cv_lib_readline_remove_history" = xyes; then :
+- TERMLIBS="-lreadline $gp_tcap $TERMLIBS"
++ TERMLIBS="-lereadline $gp_tcap $TERMLIBS"
+ fi
+
+ if test "$ac_cv_lib_readline_remove_history" = no; then
+@@ -10292,7 +10292,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_history_remove_history" >&5
+ $as_echo "$ac_cv_lib_history_remove_history" >&6; }
+ if t
update p5-Mojolicious to 7.52
Hi,
This is an update for Mojolicious. Lots of changes since 6.24, see
https://github.com/kraih/mojo/blob/v7.52/Changes.
There was a discussion about updating this port earlier this year:
https://marc.info/?t=14862982711&r=1&w=2
I think the reasons for holding it back are not present anymore.
The tests pass but with some warnings:
---%<---
t/mojolicious/validation_lite_app.t ok
Use of uninitialized value in numeric ge (>=) at
/usr/ports/pobj/p5-Mojolicious-7.52/Mojolicious-7.52/blib/lib/Mojo/Server/Daemon.pm
line 109.
Use of uninitialized value $loop in hash element at
/usr/ports/pobj/p5-Mojolicious-7.52/Mojolicious-7.52/blib/lib/Mojo/UserAgent.pm
line 220.
Mojo::Reactor::Poll: I/O watcher failed: Can't call method "remove" on an
undefined value at
/usr/ports/pobj/p5-Mojolicious-7.52/Mojolicious-7.52/blib/lib/Mojo/UserAgent.pm
line 296.
t/mojolicious/websocket_lite_app.t . ok
t/pod.t ok
t/pod_coverage.t ... ok
All tests successful.
Files=96, Tests=11556, 137 wallclock secs ( 2.96 usr 1.03 sys + 64.29 cusr
11.32 csys = 79.60 CPU)
Result: PASS
---%<---
Test of www/p5-MojoX-Session pass.
I'll send and update for www/p5-Mojolicious-Plugin-TtRenderer with the
next mail.
OK?
Remi
Index: Makefile
===
RCS file: /cvs/ports/www/p5-Mojo/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile20 Mar 2016 19:57:21 - 1.28
+++ Makefile4 Nov 2017 12:21:59 -
@@ -4,7 +4,7 @@ COMMENT = next generation web framework
MODULES = cpan
PKG_ARCH = *
-DISTNAME = Mojolicious-6.24
+DISTNAME = Mojolicious-7.52
CATEGORIES = www
MAINTAINER = Mark Patruck
@@ -19,15 +19,17 @@ CPAN_AUTHOR = SRI
RUN_DEPENDS = devel/p5-EV \
security/p5-IO-Socket-SSL>=1.94
-MAKE_ENV += TEST_CACHING=Yes
+TEST_DEPENDS +=net/p5-IO-Socket-Socks
+
MAKE_ENV += TEST_EV=Yes
MAKE_ENV += TEST_HYPNOTOAD=Yes
+MAKE_ENV += TEST_IPV6=Yes
MAKE_ENV += TEST_MORBO=Yes
MAKE_ENV += TEST_POD=Yes
MAKE_ENV += TEST_PREFORK=Yes
-
-# see pkg/README for certificate handling
-post-install:
- rm -rf ${PREFIX}/${P5SITE}/Mojo/IOLoop/certs/
+MAKE_ENV += TEST_SOCKS=Yes
+MAKE_ENV += TEST_SUBPROCESS=Yes
+MAKE_ENV += TEST_TLS=Yes
+MAKE_ENV += TEST_UNIX=YES
.include
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Mojo/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo15 Oct 2015 21:01:06 - 1.21
+++ distinfo4 Nov 2017 12:21:59 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-6.24.tar.gz) = bgEog361mgykZJuUjP/i1WVCiYur2fffAxesY5pFEiU=
-SIZE (Mojolicious-6.24.tar.gz) = 651857
+SHA256 (Mojolicious-7.52.tar.gz) = yohMIKqM4qAi+w4/AhdWCepeWM/uty1h/YQEb9vINso=
+SIZE (Mojolicious-7.52.tar.gz) = 695680
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/p5-Mojo/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 19 Jul 2015 14:23:45 - 1.10
+++ pkg/PLIST 4 Nov 2017 12:21:59 -
@@ -28,6 +28,7 @@ ${P5SITE}/Mojo/DOM/HTML.pm
${P5SITE}/Mojo/Date.pm
${P5SITE}/Mojo/EventEmitter.pm
${P5SITE}/Mojo/Exception.pm
+${P5SITE}/Mojo/File.pm
${P5SITE}/Mojo/Headers.pm
${P5SITE}/Mojo/HelloWorld.pm
${P5SITE}/Mojo/Home.pm
@@ -37,6 +38,11 @@ ${P5SITE}/Mojo/IOLoop/Client.pm
${P5SITE}/Mojo/IOLoop/Delay.pm
${P5SITE}/Mojo/IOLoop/Server.pm
${P5SITE}/Mojo/IOLoop/Stream.pm
+${P5SITE}/Mojo/IOLoop/Subprocess.pm
+${P5SITE}/Mojo/IOLoop/TLS.pm
+${P5SITE}/Mojo/IOLoop/resources/
+${P5SITE}/Mojo/IOLoop/resources/server.crt
+${P5SITE}/Mojo/IOLoop/resources/server.key
${P5SITE}/Mojo/JSON/
${P5SITE}/Mojo/JSON.pm
${P5SITE}/Mojo/JSON/Pointer.pm
@@ -57,7 +63,11 @@ ${P5SITE}/Mojo/Server.pm
${P5SITE}/Mojo/Server/CGI.pm
${P5SITE}/Mojo/Server/Daemon.pm
${P5SITE}/Mojo/Server/Hypnotoad.pm
+${P5SITE}/Mojo/Server/Morbo/
${P5SITE}/Mojo/Server/Morbo.pm
+${P5SITE}/Mojo/Server/Morbo/Backend/
+${P5SITE}/Mojo/Server/Morbo/Backend.pm
+${P5SITE}/Mojo/Server/Morbo/Backend/Poll.pm
${P5SITE}/Mojo/Server/PSGI.pm
${P5SITE}/Mojo/Server/Prefork.pm
${P5SITE}/Mojo/Template.pm
@@ -74,6 +84,7 @@ ${P5SITE}/Mojo/UserAgent/Proxy.pm
${P5SITE}/Mojo/UserAgent/Server.pm
${P5SITE}/Mojo/UserAgent/Transactor.pm
${P5SITE}/Mojo/Util.pm
+${P5SITE}/Mojo/WebSocket.pm
${P5SITE}/Mojolicious/
${P5SITE}/Mojolicious.pm
${P5SITE}/Mojolicious/Command/
@@ -105,11 +116,11 @@ ${P5SITE}/Mojolicious/Guides/FAQ.pod
${P5SITE}/Mojolicious/Guides/Growing.pod
${P5SITE}/Mojolicious/Guides/Rendering.pod
${P5SITE}/Mojolicious/Guides/Routing.pod
+${P5SITE}/Mojolicious/Guides/Testing.pod
${P5SITE}/Mojolicious/Guides/Tutorial.pod
${P5SITE}/Mojolicious/Lite.pm
${P5SITE}/Mojolicious/Plugin/
${P5SITE}/Mojolicious/Plugin.pm
-${P5SITE}/Mojolicious/Plugin/Charset.pm
${P5SITE}/Mojolicious/Plugin/Config.pm
$
update p5-Mojolicious-Plugin-TtRenderer to 1.59
Hi, This updates Mojolicious-Plugin-TtRenderer to 1.59. This is needed because of the p5-Mojolicious patch I sent before. OK? Remi Index: Makefile === RCS file: /cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile20 Mar 2016 19:57:06 - 1.5 +++ Makefile4 Nov 2017 12:42:47 - @@ -4,7 +4,7 @@ COMMENT = Template Renderer Plugin for M MODULES = cpan PKG_ARCH = * -DISTNAME = Mojolicious-Plugin-TtRenderer-1.56 +DISTNAME = Mojolicious-Plugin-TtRenderer-1.59 CATEGORIES = textproc # Perl @@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes CPAN_AUTHOR = PLICEASE -CONFIGURE_STYLE= modbuild +CONFIGURE_STYLE = modinst RUN_DEPENDS = sysutils/p5-Capture-Tiny \ textproc/p5-Template \ Index: distinfo === RCS file: /cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo27 Apr 2015 19:38:21 - 1.4 +++ distinfo4 Nov 2017 12:42:47 - @@ -1,2 +1,2 @@ -SHA256 (Mojolicious-Plugin-TtRenderer-1.56.tar.gz) = Tm3uvvu4m2nd+Yz85u4f7aXxABU6PHMMYnwBmKdQXf0= -SIZE (Mojolicious-Plugin-TtRenderer-1.56.tar.gz) = 25908 +SHA256 (Mojolicious-Plugin-TtRenderer-1.59.tar.gz) = kATgC7NAzsh7Kqj+uqpd/vHKWU67jRGWq9NBYufp4p0= +SIZE (Mojolicious-Plugin-TtRenderer-1.59.tar.gz) = 26180
Build chromedriver when building chrome
This builds chromedriver when building chrome. chromedriver is
chrome's implementation of the WebDriver protocol, which allows
for driving chrome via external software. Most commonly this
is used in automated testing, often with Selenium, which supports
many different browsers and programming languages.
chromedriver is about 10MB uncompressed, and considering the size
of the chrome package, I don't think it is worth it to subpackage.
Tested on amd64 using ruby with the capybara and selenium-webdriver
libraries. With only minor modifications to a test suite designed
for capybara-webkit, chromedriver was able to successfully complete
the test suite.
This does require one patch so that chromedriver can find the
chrome binary.
OKs?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.345
diff -u -p -u -p -r1.345 Makefile
--- Makefile29 Oct 2017 14:36:53 - 1.345
+++ Makefile4 Nov 2017 13:07:21 -
@@ -10,7 +10,7 @@ DPB_PROPERTIES= parallel
COMMENT= Chromium browser
V= 62.0.3202.62
-REVISION= 0
+REVISION= 1
DISTNAME= chromium-${V}
@@ -97,7 +97,7 @@ BUILDTYPE=Debug
BUILDTYPE= Release
.endif
-ALL_TARGET=chrome
+ALL_TARGET=chrome chromedriver
TEST_TARGET= base_unittests
CONFIGURE_STYLE=none # prevent python MODULE from overriding do-build
@@ -173,6 +173,7 @@ do-configure:
--no-clean -s --gn-gen-args "${GN_ARGS}"
@cd ${WRKSRC} && env -i ${CONFIGURE_ENV} ${WRKSRC}/out/Release/gn \
gen --args="${GN_ARGS}" out/${BUILDTYPE}
+ ${SUBST_PROGRAM}
${WRKSRC}/chrome/test/chromedriver/chrome/chrome_finder.cc
do-build:
@cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \
@@ -182,6 +183,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/chrome
${INSTALL_PROGRAM} ${BUILDDIR}/chrome ${PREFIX}/chrome
${SUBST_PROGRAM} ${FILESDIR}/chrome ${PREFIX}/bin/chrome
+ ${INSTALL_PROGRAM} ${BUILDDIR}/chromedriver ${PREFIX}/bin/chromedriver
${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${BUILDDIR}/*.pak ${PREFIX}/chrome
Index: patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
===
RCS file: patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
diff -N patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc 4 Nov
2017 13:07:21 -
@@ -0,0 +1,24 @@
+$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.3 2017/06/25 21:53:56
robert Exp $
+Index: chrome/test/chromedriver/chrome/chrome_finder.cc
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig Fri Nov 3
15:00:28 2017
chrome/test/chromedriver/chrome/chrome_finder.cc Fri Nov 3 15:01:35 2017
+@@ -45,6 +45,10 @@
+ installation_locations[i].Append(L"Chromium\\Application"));
+ }
+ }
++#elif 1
++void GetApplicationDirs(std::vector* locations) {
++ locations->push_back(base::FilePath("${PREFIX}/bin"));
++}
+ #elif defined(OS_LINUX)
+ void GetApplicationDirs(std::vector* locations) {
+ locations->push_back(base::FilePath("/opt/google/chrome"));
+@@ -102,7 +106,7 @@
+ base::FilePath("chromium-browser")
+ #else
+ // it will compile but won't work on other OSes
+- base::FilePath()
++ base::FilePath("chrome"),
+ #endif
+ };
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/chromium/pkg/PLIST,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 PLIST
--- pkg/PLIST 25 Oct 2017 13:47:07 - 1.72
+++ pkg/PLIST 4 Nov 2017 13:07:21 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.72 2017/10/25 13:47:07 robert Exp $
@pkgpath www/chromium,proprietary
bin/chrome
+@bin bin/chromedriver
chrome/
@bin chrome/chrome
chrome/chrome_100_percent.pak
Re: UPDATE: math/gnuplot 5.2.1
On Sat, Nov 04, 2017 at 02:36:58PM +0200, Paul Irofti wrote:
> On Sat, Nov 04, 2017 at 01:07:56PM +0200, Paul Irofti wrote:
> > Now that octave has been updated, here is an update to the latest
> > gnuplot version. It depends on libcerf which is a new port that I
> > posted earlier on the mailing list.
> >
> > While at it take maintainership. OK?
> >
> > Also available on github:
> > https://github.com/jasperla/openbsd-wip/tree/master/math/gnuplot
>
> Here is an updated version that uses GNU readline (thanks to input from
> feinerer@).
Also remove the now useless emacs build dependency.
Index: Makefile
===
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.66
+++ Makefile4 Nov 2017 13:35:50 -
@@ -2,22 +2,24 @@
COMMENT = command-driven interactive function plotting program
-V =4.6
-PATCHLEVEL = 6
-REVISION = 3
+V =5.2
+PATCHLEVEL = 1
DISTNAME = gnuplot-${V}.${PATCHLEVEL}
CATEGORIES = math graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
HOMEPAGE = http://www.gnuplot.info/
+MAINTAINER = Paul Irofti
+
# see Copyright in source
# http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c m ncurses readline ${COMPILER_LIBCXX} z
+WANTLIB += c cerf m ncurses ereadline ${COMPILER_LIBCXX} z
-BUILD_DEPENDS =emacs->=24:editors/emacs
+LIB_DEPENDS += devel/readline \
+ math/libcerf
FLAVORS = no_cairo no_x11
FLAVOR ?=
@@ -26,15 +28,16 @@ CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --without-linux-vga \
--without-latex \
--without-tutorial \
- --with-readline \
- --with-lasergnu \
+ --with-readline=${LOCALBASE} \
--disable-wxwidgets \
- --disable-qt \
+ --with-qt=no \
--without-lua \
--without-pdf
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+USE_GMAKE =Yes
+
FAKE_FLAGS = appdefaultdir="${PREFIX}/lib/X11/app-defaults/"
TEST_IS_INTERACTIVE = x11
@@ -54,12 +57,9 @@ CONFIGURE_ARGS += --with-x
CONFIGURE_ARGS += --without-cairo
.else
LIB_DEPENDS += devel/gettext \
- devel/pango \
+ devel/pango \
graphics/cairo
WANTLIB += cairo gobject-2.0 glib-2.0 intl pango-1.0 pangocairo-1.0
.endif
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu
.include
Index: distinfo
===
RCS file: /cvs/ports/math/gnuplot/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo3 Jun 2015 07:28:28 - 1.14
+++ distinfo4 Nov 2017 13:35:50 -
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.6.6.tar.gz) = HxlZb9CQRfIiJa+/7BH6kbmtHZW59IQGNi9RfU8TAnQ=
-SIZE (gnuplot-4.6.6.tar.gz) = 5059214
+SHA256 (gnuplot-5.2.1.tar.gz) = fcaw+2syFpHonjRDhzEKjmYU8MTl6xWpDcdCpT2Afog=
+SIZE (gnuplot-5.2.1.tar.gz) = 5295961
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 4 Nov 2017 13:35:50 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+readline -> ereadline
+
+Index: configure
+--- configure.orig
configure
+@@ -10127,7 +10127,7 @@ fi
+ if test -d $with_readline/lib; then
+ LDFLAGS="$LDFLAGS -L$with_readline/lib"
+ fi
+-if test ! -d $with_readline/include/readline; then
++if test ! -d $with_readline/include/ereadline; then
+ if test -d $with_readline/include/editline; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $with_readline
contains libedit, not readline!" >&5
+ $as_echo "$as_me: WARNING: $with_readline contains libedit, not readline!"
>&2;}
+@@ -10220,7 +10220,7 @@ if ${ac_cv_lib_readline_remove_history+:} false; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline ${gp_tcap} $LIBS"
++LIBS="-lereadline ${gp_tcap} $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -10251,7 +10251,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_remove_history" >&5
+ $as_echo "$ac_cv_lib_readline_remove_history" >&6; }
+ if test "x$ac_cv_lib_readline_remove_history" = xyes; then :
+- TERMLIBS="-lreadline $gp_tcap $TERMLIBS"
++ TERMLIBS="-lereadline $gp_tcap $TERMLIBS"
+ fi
+
+ if test "$ac_cv_lib_readline_remove_history" = no; then
+@@ -10292,7 +10292,7 @@ fi
+ { $as_echo
[NEW] print/brlaser
Hi ports@, Here is a new port: print/brlaser It is based on a WIP port from jcs@, submitting it for review at his request. Comments? OK? >From DESCR: CUPS driver for Brother laser printers. Most Brother printers support a standard printer language such as PCL or PostScript, but not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. It is known to support these printers: Brother DCP-7030 Brother DCP-7055 Brother DCP-7065DN brlaser.tar.gz Description: application/tar-gz
Re: [wip] howleditor 0.5.2
On Fri, Oct 27, 2017 at 10:43 PM, James Turner wrote: > On Fri, Oct 27, 2017 at 10:34:36PM +0200, Peter Ljung wrote: >> On Thu, Oct 26, 2017 at 3:18 PM, James Turner wrote: >> > On Wed, Oct 25, 2017 at 10:58:51PM +0200, Peter Ljung wrote: >> >> This is my first attempt to make a port for the howl editor >> >> (https://howl.io/). >> >> >> >> I think howl is a *really* good alternative editor which compares well >> >> with e.g. >> >> Sublime Text for my uses. >> >> >> >> Also it doesn't come with a huge baggage like the Electron based editors >> >> Atom and VS Code. >> >> >> >> * The upstream code builds cleanly on OpenBSD since 0.4 release >> >> * A stability issue (I found) on OpenBSD was fixed in last point release >> >> 0.5.2 >> >> >> >> I have tried my best to create a suitable port. >> >> >> >> The current port is available at: >> >> >> >> https://github.com/peterljung/howleditor >> >> >> >> Some things I have came across ... >> >> >> >> * I have installed and tested the port on 6.1 and 6.2 release (amd64) >> >> * It is called howleditor to avoid conflict with avahi >> >> * Avahi has a "@conflict howl-*" in PLIST >> >> * I made a small patch in the Makefile to force setting PREFIX variable >> >> which otherwise is set by ports infrastructure >> >> >> >> Any tips for improvements? >> >> >> > >> > Hi Peter, >> > >> > Port looks pretty good. Biggest thing you're going to want to fix is how >> > Howl downloads external dependencies and builds them locally. You will >> > want to use our ports versions. Ie. LuaJIT, LPEG and maybe others. >> > >> > -- >> > James Turner >> >> Thanks for feedback! >> >> I actually asked upstream about using ports versions: >> >> As @kirbyfan64 said, we embed LuaJIT ourselves and link in statically. It >> would >> be theoretically possible to use 2.0.5, but we switched to 2.1-beta two years >> ago so I can't say for sure. Also, any LuaJIT would need to be compiled with >> the >> correct compile options also (lua 5.2 compat enabled). We also patch >> LUA_IDSIZE >> to be slightly larger. >> >> In short I see the desire to use a system Lua version, but as we don't link >> it >> dynamically there's nothing to gain with regards to executable size, and the >> needed changes above makes it not worth the while IMO. Release tarballs >> already >> contain a bundled copy of LuaJIT. >> >> ... >> >> So there are some reasons not to use port versions, but someone with more >> lua/porting experience might be able to determine what to do? >> > > Makes sense, I guess I was more concerned with the port downloading > dependencies, but if they are bundled with the tarball that takes care > of that concern. > > What are other peoples thoughts? > > -- > James Turner I have made a few changes to the port from some suggestions by Edd. * I set PREFIX in MAKE_FLAGS as an alternative to patching the Makefile * Added c++abi to WANTLIB * Patched lpeg makefile to use clang (used gcc before) https://github.com/peterljung/howleditor/commits/master I also found an issue with the upstream release that need to be fixed. https://github.com/howl-editor/howl/issues/390
[UPDATE] math/blas
update to 3.7.1, switch to gfortran.
an update to math/lapack will follow soon.
Index: Makefile
===
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile
--- Makefile17 Jun 2017 15:25:37 - 1.26
+++ Makefile4 Nov 2017 16:03:57 -
@@ -2,47 +2,51 @@
COMMENT= Basic Linear Algebra Subprograms
-VERSION= 1.0
-DISTNAME= blas
-PKGNAME= ${DISTNAME}-${VERSION}
-REVISION= 8
-SHARED_LIBS= blas2.0
+VERSION= 3.7.1
+DISTNAME= blas-${VERSION}
+
+SHARED_LIBS= blas2.1
CATEGORIES=math
-DISTFILES= blas.tgz manpages.tgz:0
+DISTFILES= ${DISTNAME}.tgz manpages.tgz:0
HOMEPAGE= http://www.netlib.org/blas/
# freely available
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= https://spacehopper.org/mirrors/blas-20110419/ \
- ftp://ftp.netlib.org/blas/ \
+MASTER_SITES= http://www.netlib.org/blas/ \
+ https://spacehopper.org/mirrors/blas-20110419/ \
ftp://netlib.bell-labs.com/netlib/blas/ \
http://www.netlib.no/netlib/blas/
MASTER_SITES0= ${MASTER_SITES:S/blas/lapack/}
EXTRACT_SUFX= .tgz
-DIST_SUBDIR= ${DISTNAME}-${VERSION}
-WRKDIST= ${WRKDIR}/BLAS
+DIST_SUBDIR= ${DISTNAME}
+WRKDIST= ${WRKDIR}/${DISTNAME:U}
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBblas_VERSION:R} \
SHLIB_MINOR=${LIBblas_VERSION:E} \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
+USE_GROFF= Yes
-MANSRC=${WRKDIR}/manpages/blas/man/manl
+MANSRC=${WRKDIR}/man/man3
post-build:
- rm ${MANSRC}/{lsame,xerbla}.l
- @perl -pi -e 's/(\.TH\s+\w+)\s+l(.*)/\1 3f\2/' ${MANSRC}/*.l
- @cd ${MANSRC} && for m in *.l; do mv $$m $${m%\.l}.3f; done
+ @cd ${MANSRC} && for m in *.f.3 ; do perl -pi \
+ -e 'if ($$. == 1) {s/(\.TH\s+)"([^"]+)\.f"\s+3\s+("[^"]+")/\1
\2 3f \3 "BLAS Version ${VERSION}" "BLAS Version ${VERSION}"/}' \
+ -e 'if ($$. == 5) {s/^(\w+)\.f \\-/\1/}' $$m ; done
+ @cd ${MANSRC} && \
+ for m in BLAS_SRC*.f.3; do mv $$m $${m#BLAS_SRC_}; done && \
+ for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done
post-install:
- ${INSTALL_MAN} ${MANSRC}/*.3f ${PREFIX}/man/man3f
+ @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc` ; do \
+ ${INSTALL_MAN} $${m%.f}.3f ${PREFIX}/man/man3f ; done
.include
Index: distinfo
===
RCS file: /cvs/ports/math/blas/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo18 Jan 2015 03:14:26 - 1.7
+++ distinfo4 Nov 2017 16:03:57 -
@@ -1,4 +1,4 @@
-SHA256 (blas-1.0/blas.tgz) = 6offbcRIKe4KFzMibRMMVQsXoLxRyNv81mL7FVILI7U=
-SHA256 (blas-1.0/manpages.tgz) = YwVbokz8D974vOU5eMc/IW+1BaohRDkTgvhdMkX9CFo=
-SIZE (blas-1.0/blas.tgz) = 99927
-SIZE (blas-1.0/manpages.tgz) = 1066170
+SHA256 (blas-3.7.1/blas-3.7.1.tgz) =
xaZUNR8LBGpQK/BLFnQLmrScfYUS1tV606ZBhMjldcM=
+SHA256 (blas-3.7.1/manpages.tgz) = u1F5eMDMeWzCO/9NMLuw9LrXoo5pXbhsKf3J/tYKIsQ=
+SIZE (blas-3.7.1/blas-3.7.1.tgz) = 117283
+SIZE (blas-3.7.1/manpages.tgz) = 2673950
Index: files/Makefile
===
RCS file: /cvs/ports/math/blas/files/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- files/Makefile 19 Aug 2010 21:23:29 - 1.2
+++ files/Makefile 4 Nov 2017 16:03:57 -
@@ -24,6 +24,9 @@ SRCS =caxpy.f ccopy.f cdotc.f cdotu.
zhbmv.f zhemm.f zhemv.f zher.f zher2.f zher2k.f zherk.f \
zhpmv.f zhpr.f zhpr2.f zrotg.f zscal.f zswap.f zsymm.f \
zsyr2k.f zsyrk.f ztbmv.f ztbsv.f ztpmv.f ztpsv.f ztrmm.f \
- ztrmv.f ztrsm.f ztrsv.f
+ ztrmv.f ztrsm.f ztrsv.f xerbla_array.f
+
+printsrc:
+ @echo ${SRCS}
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/blas/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:49 - 1.7
+++ pkg/PLIST 4 Nov 2017 16:03:57 -
@@ -78,6 +78,7 @@ lib/libblas_p.a
@man man/man3f/idamax.3f
@man man/man3f/isamax.3f
@man man/man3f/izamax.3f
+@man man/man3f/lsame.3f
@man man/man3f/sasum.3f
@man man/man3f/saxpy.3f
@man man/man3f/scabs1.3f
@@ -115,6 +116,7 @@ lib/libblas_p.a
@man man/man3f/strmv.3f
@man man/man3f/strsm.3f
@man man/man3f/strsv.3f
+@man man/man3f/xerbla.3f
@man man/man3f/xerbla_array.3f
@man man/man3f/zaxpy.3f
@man man/man3f/zcopy.3f
[UPDATE] math/cblas
update after blas update, a rerolled distfile, and also use gfortran.
Index: Makefile
===
RCS file: /cvs/ports/math/cblas/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile16 Mar 2015 18:07:49 - 1.16
+++ Makefile4 Nov 2017 16:10:18 -
@@ -5,7 +5,7 @@ COMMENT=C interface to the BLAS library
VERSION= 1.0
DISTNAME= cblas
PKGNAME= ${DISTNAME}-${VERSION}
-REVISION= 3
+REVISION= 4
SHARED_LIBS= cblas 1.0
CATEGORIES=math
@@ -24,24 +24,27 @@ WRKDIST=${WRKDIR}/CBLAS
WRKSRC=${WRKDIST}/src
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS = math/blas
-WANTLIB = blas>=1.0
+WANTLIB = blas>=2.1
-CFLAGS+= -DADD_
+CFLAGS+= -DADD_ -I${WRKDIST}/include
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBcblas_VERSION:R} \
SHLIB_MINOR=${LIBcblas_VERSION:E} \
- FC=${FC}
-FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
-
-TEST_FLAGS=LOADER=${FC} CFLAGS="${CFLAGS}" INC="-I${WRKSRC}" \
- LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas"
+ FC="${MODFORTRAN_COMPILER} -cpp"
+FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib \
+ DEBUGLIBS=no
+
+TEST_FLAGS=LOADER=${MODFORTRAN_COMPILER} \
+ CFLAGS="${CFLAGS}" \
+ INC="-I${WRKSRC}" \
+ LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas -lgfortran"
post-install:
- ${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include
+ ${INSTALL_DATA} ${WRKDIST}/include/*.h ${PREFIX}/include
do-test:
@cd ${WRKDIST}/testing && \
Index: distinfo
===
RCS file: /cvs/ports/math/cblas/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:26 - 1.3
+++ distinfo4 Nov 2017 16:10:18 -
@@ -1,2 +1,2 @@
-SHA256 (cblas-1.0/cblas.tgz) = m0nXF3/aYrYUG/LKKeR16G8LEtj3LguUQFjQK0Od1So=
-SIZE (cblas-1.0/cblas.tgz) = 197694
+SHA256 (cblas-1.0/cblas.tgz) = D2NU/Wf6vZCbr1fO0u+E6WLbWPrhJuT0GyHdT+xgoqM=
+SIZE (cblas-1.0/cblas.tgz) = 197468
Index: patches/patch-testing_Makefile
===
RCS file: /cvs/ports/math/cblas/patches/patch-testing_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-testing_Makefile
--- patches/patch-testing_Makefile 2 Oct 2006 21:58:25 - 1.1.1.1
+++ patches/patch-testing_Makefile 4 Nov 2017 16:10:18 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-testing_Makefile,v 1.1.1.1 2006/10/02 21:58:25 steven Exp $
testing/Makefile.orig Sun Oct 1 15:52:32 2006
-+++ testing/Makefile Sun Oct 1 15:52:39 2006
+Index: testing/Makefile
+--- testing/Makefile.orig
testing/Makefile
@@ -3,7 +3,7 @@
#
dlvl = ../.
-include $(dlvl)/Makefile.in
+#include $(dlvl)/Makefile.in
- INC = -I$(CBDIR)/src
# Archive files necessary to compile
+ LIB = $(CBLIB) $(BLLIB)
dpb and ccache
Hi, I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and pointing CCACHE_DIR to a sensible location owned by _pbuild: USE_CCACHE=Yes CCACHE_DIR=/extra/ccache However, it seems as if this causes dpb to just quickly run though all the ports in my list without buiding anything, or even checking the port signatures. I'm running dpb like this: doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P "$HOME/packages.txt" Is it possible to enable ccache at all for dpb? I'm using dpb since it makes it easy to keep ports up to date on -current, and I'd really want to have the ability to run with ccache to speed up the rebuilding of some of the larger ports. Cheers, -- Andreas Kusalananda Kähäri, National Bioinformatics Infrastructure Sweden (NBIS), Uppsala University, Sweden.
[UPDATE] productivity/zim
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile29 Dec 2015 14:53:35 - 1.15
+++ Makefile4 Nov 2017 17:24:00 -
@@ -2,7 +2,7 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.65
+MODPY_EGG_VERSION =0.67
DISTNAME = zim-${MODPY_EGG_VERSION}
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo29 Dec 2015 14:53:35 - 1.6
+++ distinfo4 Nov 2017 17:24:00 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.65.tar.gz) = VELzM0OVor6vxbmiu+wuU+OCcNS61pa1xAU91R3B7ZY=
-SIZE (zim-0.65.tar.gz) = 1899614
+SHA256 (zim-0.67.tar.gz) = s3zvPUkGqiY6vMsUk5Kafqa56NEaUO2SzUN+j5P/q70=
+SIZE (zim-0.67.tar.gz) = 2034747
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 29 Dec 2015 14:53:35 - 1.9
+++ pkg/PLIST 4 Nov 2017 17:24:00 -
@@ -4,16 +4,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zim/__init__.py
lib/python${MODPY_VERSION}/site-packages/zim/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/_version.py
-lib/python${MODPY_VERSION}/site-packages/zim/_version.pyc
lib/python${MODPY_VERSION}/site-packages/zim/actions.py
lib/python${MODPY_VERSION}/site-packages/zim/actions.pyc
lib/python${MODPY_VERSION}/site-packages/zim/applications.py
lib/python${MODPY_VERSION}/site-packages/zim/applications.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/base.py
-lib/python${MODPY_VERSION}/site-packages/zim/base.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/command.py
-lib/python${MODPY_VERSION}/site-packages/zim/command.pyc
lib/python${MODPY_VERSION}/site-packages/zim/config/
lib/python${MODPY_VERSION}/site-packages/zim/config/__init__.py
lib/python${MODPY_VERSION}/site-packages/zim/config/__init__.pyc
@@ -112,14 +106,50 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/inc/arithmetic.pyc
lib/python${MODPY_VERSION}/site-packages/zim/inc/xdot.py
lib/python${MODPY_VERSION}/site-packages/zim/inc/xdot.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/index.py
-lib/python${MODPY_VERSION}/site-packages/zim/index.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/ipc.py
-lib/python${MODPY_VERSION}/site-packages/zim/ipc.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/main.py
-lib/python${MODPY_VERSION}/site-packages/zim/main.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/notebook.py
-lib/python${MODPY_VERSION}/site-packages/zim/notebook.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main/
+lib/python${MODPY_VERSION}/site-packages/zim/main/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main/command.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/command.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main/ipc.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/ipc.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/base.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/base.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/helpers.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/local.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/local.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/mock.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/mock.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/base.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/base.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/files.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/files.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/links.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/links.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/pages.py
+lib/python${M
[UPDATE] math/lapack
long overdue update, and switch to gfortran. ok?
working on ports that depend on it.
Index: Makefile
===
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile26 Aug 2016 14:31:46 - 1.25
+++ Makefile4 Nov 2017 17:20:15 -
@@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.25 2016/08/26 14:31:46 jca Exp $
-COMMENT= library of Fortran 77 linear algebra subroutines
+COMMENT= library of Fortran linear algebra subroutines
-DISTNAME= lapack-3.1.1
-REVISION= 5
+VERSION= 3.7.1
+DISTNAME= lapack-${VERSION}
-SHARED_LIBS= lapack 5.0
+SHARED_LIBS= lapack 6.0
CATEGORIES=math
+DISTFILES= ${DISTNAME}.tgz manpages.tgz:0
HOMEPAGE= http://www.netlib.org/lapack/
@@ -16,42 +17,65 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://www.netlib.org/lapack/ \
http://www.netlib.no/netlib/lapack/
+MASTER_SITES0= http://www.netlib.org/lapack/
EXTRACT_SUFX= .tgz
+DIST_SUBDIR= ${DISTNAME}
LIB_DEPENDS = math/blas
WANTLIB = blas>=1
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
MAKE_ENV= SHLIB_MAJOR=${LIBlapack_VERSION:R} \
SHLIB_MINOR=${LIBlapack_VERSION:E} \
TIMER=EXT_ETIME \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
USE_GROFF =Yes
-TEST_FLAGS=PLAT= OPTS= FORTRAN=${FC} LOADER=${FC} \
+
+TEST_DEPENDS= devel/gmake
+TEST_FLAGS=PLAT= OPTS= FORTRAN=${MODFORTRAN_COMPILER} \
+ LOADER=${MODFORTRAN_COMPILER} \
LAPACKLIB=SRC/liblapack.a \
- BLASLIB=${LOCALBASE}/lib/libblas.a
+ BLASLIB="${LOCALBASE}/lib/libblas.a
${LOCALBASE}/lib/libgfortran.a"
MAKE_FILE= ${FILESDIR}/Makefile
WRKSRC=${WRKDIST}/SRC
+MANSRC=${WRKDIR}/man/man3
+
# avoid 'unknown manpage type' errors and move manpages to section 3
pre-configure:
- cd ${WRKDIST}/manpages/man/manl && \
- perl -pi -e 's/(\.TH\s+\w+)\s+1(.*)/\1 3f\2/' *.l && \
- for m in *.l ; do if ! egrep -q '^\.TH' $$m ; then \
-perl -pi -e "s/(.SH NAME)/.TH \U$${m%\.l} 3f\n\1/" $$m ; fi ; \
- mv $$m $${m%\.l}.3f ; done
- cp ${WRKDIST}/make.inc.example ${WRKDIST}/make.inc
+ @cp ${WRKDIST}/make.inc.example ${WRKDIST}/make.inc
+ @cd ${WRKSRC} && for f in *.F ; do mv $$f $${f%.F}.f ; done
+
+post-build:
+ @cd ${MANSRC} && for m in *.f.3 ; do perl -pi \
+ -e 'if ($$. == 1) {s/(\.TH\s+)"([^"]+)\.f"\s+3\s+("[^"]+")/\1
\2 3f \3 "LAPACK Version ${VERSION}" "LAPACK Version ${VERSION}"/}' \
+ -e 'if ($$. == 5) {s/^(\w+)\.f \\-/\1/}' $$m ; done
+ @cd ${MANSRC} && \
+ for m in SRC_*.f.3; do mv $$m $${m#SRC_}; done && \
+ for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done
post-install:
- ${INSTALL_MAN} ${WRKDIST}/manpages/man/manl/*.3f ${PREFIX}/man/man3f/
+ @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc | \
+ perl -p -e 's/\s/\n/g' | \
+ grep -v TIME | \
+ grep -v ssytrd_sb2st.f | \
+ grep -v dsytrd_sb2st.f | \
+ grep -v chetrd_hb2st.f | \
+ grep -v zhetrd_hb2st.f | \
+ grep -v iparam2stage.f | \
+ grep -v lsame.f | \
+ grep -v xerbla.f | \
+ grep -v xerbla_array.f` ; do \
+ ${INSTALL_MAN} `basename $${m%.f}.3f` ${PREFIX}/man/man3f ; done
+ @${INSTALL_MAN} ${MANSRC}/*TIME*.3f ${PREFIX}/man/man3f
do-test:
- cd ${WRKDIST}/TESTING/MATGEN && ${MAKE} ${ALL_TEST_FLAGS}
- cd ${WRKDIST}/TESTING && ${MAKE} ${ALL_TEST_FLAGS}
+ cd ${WRKDIST}/TESTING/MATGEN && gmake ${ALL_TEST_FLAGS}
+ cd ${WRKDIST}/TESTING && gmake ${ALL_TEST_FLAGS}
.include
Index: distinfo
===
RCS file: /cvs/ports/math/lapack/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo18 Jan 2015 03:14:27 - 1.5
+++ distinfo4 Nov 2017 17:20:15 -
@@ -1,2 +1,4 @@
-SHA256 (lapack-3.1.1.tgz) = 5MM1swtDlPliDWCBgxn/Eq8q6mOCdRXp9+YriN/3oCo=
-SIZE (lapack-3.1.1.tgz) = 10407595
+SHA256 (lapack-3.7.1/lapack-3.7.1.tgz) =
9sU/2fVpMvPds9XiTBwH5M2bOwjn+J3pyGcSXuzJocg=
+SHA256 (lapack-3.7.1/manpages.tgz) =
u1F5eMDMeWzCO/9NMLuw9LrXoo5pXbhsKf3J/tYKIsQ=
+SIZE (lapack-3.7.1/lapack-3.7.1.tgz) = 9137261
+SIZE (lapack-3.7.1/manpages.tgz) = 2673950
Index: files/Makefile
===
RCS file: /cvs/ports/math/lapack/files/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- files/Makefile 1 Sep 2016 10:53:27 -0
Re: openscenegraph 3.4.1 + add qt5 flavor
On Sat, 4 Nov 2017 12:38:06 +0100, Landry Breuil wrote:
> Hi,
>
> here's the update for OSG 3.4.1, and while here addded a qt5 FLAVOR i
> need for the 3d globe in the upcoming qgis3, via osgearth for which a
> port is in the works. I also enabled the gdal/ogr bits.
>
> comments/testing welcome, especially with the other OSG consumers
> (openmw?)
Hold on, OpenMW might be fine with Qt5. If so, a FLAVOR is unnecessary.
I'll do some testing tomorrow.
> Landry
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/openscenegraph/Makefile,v
> retrieving revision 1.12
> diff -u -r1.12 Makefile
> --- Makefile 26 Jul 2017 22:45:24 - 1.12
> +++ Makefile 4 Nov 2017 11:31:18 -
> @@ -4,10 +4,11 @@
>
> COMMENT =3D graphics toolkit
>
> -V = 3.4.0
> -DISTNAME = OpenSceneGraph-${V}
> -PKGNAME =openscenegraph-${V}
> -REVISION = 2
> +V = 3.4.1
> +GH_ACCOUNT = openscenegraph
> +GH_PROJECT = OpenSceneGraph
> +GH_TAGNAME = ${GH_PROJECT}-${V}
> +DISTNAME = ${GH_PROJECT:L}-${V}
>
> SUBST_VARS +=V
>
> @@ -40,27 +41,41 @@
> # OSGPL (see LICENSE.txt)
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += GL Half Iex IlmImf IlmThread QtGui QtOpenGL SDL X11
> +FLAVORS = qt5
> +FLAVOR ?=
> +
> +WANTLIB += GL Half Iex IlmImf IlmThread SDL X11 gdal
> WANTLIB += Xrandr avcodec avdevice avformat avresample avutil
> WANTLIB += c cairo curl freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
> WANTLIB += gobject-2.0 intl jasper jpeg m png poppler-glib pthread
> WANTLIB += rsvg-2 ${COMPILER_LIBCXX} swresample swscale tiff z
>
> -MASTER_SITES =
> ${HOMEPAGE}/downloads/stable_releases/OpenSceneGraph-$V/source/
> -EXTRACT_SUFX = .zip
> -
> MODULES =devel/cmake \
> - x11/qt4
> + x11/qt5
> LIB_DEPENDS =graphics/openexr \
> graphics/ffmpeg \
> graphics/gdk-pixbuf2 \
> graphics/giflib \
> + geo/gdal \
> net/curl \
> print/poppler \
> x11/gnome/librsvg
>
> -CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4 \
> - -DOSG_USE_AGGRESSIVE_WARNINGS=OFF
> +.if ${FLAVOR:Mqt5}
> +MODULES += x11/qt5
> +CONFIGURE_ARGS = -DDESIRED_QT_VERSION=5
> +SHARED_LIBS += osgQt5 1.0 # 3.0
> +WANTLIB += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
> +post-install:
> + ln ${PREFIX}/lib/libosgQt{,5}.so.${LIBosgQt_VERSION}
> +
> +.else
> +MODULES += x11/qt4
> +CONFIGURE_ARGS = -DDESIRED_QT_VERSION=4
> +WANTLIB += QtGui QtOpenGL
> +.endif
> +
> +CONFIGURE_ARGS +=-DOSG_USE_AGGRESSIVE_WARNINGS=OFF
>
> NO_TEST =Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/openscenegraph/distinfo,v
> retrieving revision 1.3
> diff -u -r1.3 distinfo
> --- distinfo 22 Sep 2015 18:49:15 - 1.3
> +++ distinfo 4 Nov 2017 11:31:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (OpenSceneGraph-3.4.0.zip) =
> XHJ9hHVdonat+MSko6i6nJVw/EtJafBvHS6fibHjBA4=
> -SIZE (OpenSceneGraph-3.4.0.zip) = 7975023
> +SHA256 (openscenegraph-3.4.1.tar.gz) =
> kw60bwV4GnaIPsFsX0nPspoFlCHbExAF11vsTXhAH9U=
> +SIZE (openscenegraph-3.4.1.tar.gz) = 5686385
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/graphics/openscenegraph/patches/patch-CMakeLists_txt,v
> retrieving revision 1.6
> diff -u -r1.6 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 29 Jun 2017 09:35:45 - 1.6
> +++ patches/patch-CMakeLists_txt 4 Nov 2017 11:31:18 -
> @@ -2,7 +2,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -658,13 +658,15 @@ ELSE()
> +@@ -654,13 +654,15 @@ ELSE()
> FIND_PACKAGE(COLLADA)
> FIND_PACKAGE(FBX)
> FIND_PACKAGE(ZLIB)
> @@ -20,7 +20,7 @@
> FIND_PACKAGE(OurDCMTK)
> FIND_PACKAGE(FFmpeg)
> FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
> -@@ -848,12 +850,6 @@ IF(CYGWIN)
> +@@ -844,12 +846,6 @@ IF(CYGWIN)
> SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
> ENDIF()
>
> Index: patches/patch-applications_present3D_Cluster_cpp
> ===
> RCS file:
> /cvs/ports/graphics/openscenegraph/patches/patch-applications_present3D_Cluster_cpp,v
> retrieving revision 1.3
> diff -u -r1.3 patch-applications_present3D_Cluster_cpp
> --- patches/patch-applications_present3D_Cluster_cpp 22 Sep 2015 18:49:15
> - 1.3
> +++ patches/patch-applications_present3D_Cluster_cpp 4 Nov 2017 11:31:18
> -
> @@ -1,21 +1,22 @@
> $OpenBSD: patch-applications_present3D_Cluster_cpp,v 1.3 2015
Re: openscenegraph 3.4.1 + add qt5 flavor
On Sat, Nov 04, 2017 at 06:58:25PM +0100, Pascal Stumpf wrote: > On Sat, 4 Nov 2017 12:38:06 +0100, Landry Breuil wrote: > > Hi, > > > > here's the update for OSG 3.4.1, and while here addded a qt5 FLAVOR i > > need for the 3d globe in the upcoming qgis3, via osgearth for which a > > port is in the works. I also enabled the gdal/ogr bits. > > > > comments/testing welcome, especially with the other OSG consumers > > (openmw?) > > Hold on, OpenMW might be fine with Qt5. If so, a FLAVOR is unnecessary. > I'll do some testing tomorrow. Oh wow, then that would just be perfect :)
[UPDATE] editors/joe
Hi ports@,
Here is a diff to update joe to 4.5.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile1 Jun 2017 14:18:06 - 1.49
+++ Makefile4 Nov 2017 17:43:59 -
@@ -2,8 +2,7 @@
COMMENT= Joe's Own Editor
-DISTNAME = joe-4.4
-REVISION = 0
+DISTNAME= joe-4.5
CATEGORIES=editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
@@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c ncurses m util
-BUILD_DEPENDS =converters/libiconv
+BUILD_DEPENDS= converters/libiconv
CONFIGURE_STYLE= gnu
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo11 May 2017 14:01:57 - 1.13
+++ distinfo4 Nov 2017 17:43:59 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.4.tar.gz) = pXBIKLvKKay54gBBT+9SLGbN+c4oFQ9ALWdn2kNGCXk=
-SIZE (joe-4.4.tar.gz) = 1350062
+SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
+SIZE (joe-4.5.tar.gz) = 1275486
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 1 Nov 2016 21:07:25 - 1.18
+++ pkg/PLIST 4 Nov 2017 17:43:59 -
@@ -40,6 +40,16 @@ share/examples/joe/shell.sh
share/joe/
share/joe/charmaps/
share/joe/charmaps/klingon
+share/joe/colors/
+share/joe/colors/default.jcf
+share/joe/colors/gruvbox.jcf
+share/joe/colors/ir_black.jcf
+share/joe/colors/molokai.jcf
+share/joe/colors/solarized.jcf
+share/joe/colors/wombat.jcf
+share/joe/colors/xoria.jcf
+share/joe/colors/zenburn-hc.jcf
+share/joe/colors/zenburn.jcf
share/joe/lang/
@sample ${SYSCONFDIR}/joe/lang/
share/joe/lang/de.po
@@ -121,6 +131,7 @@ share/joe/syntax/iptables.jsf
@sample ${SYSCONFDIR}/joe/syntax/iptables.jsf
share/joe/syntax/java.jsf
@sample ${SYSCONFDIR}/joe/syntax/java.jsf
+share/joe/syntax/jcf.jsf
share/joe/syntax/joerc.jsf
@sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
share/joe/syntax/js.jsf
Re: dpb and ccache
On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri wrote: > Hi, > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and > pointing CCACHE_DIR to a sensible location owned by _pbuild: > > USE_CCACHE=Yes > CCACHE_DIR=/extra/ccache > > However, it seems as if this causes dpb to just quickly run though all > the ports in my list without buiding anything, or even checking the port > signatures. > > I'm running dpb like this: > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P > "$HOME/packages.txt" > > Is it possible to enable ccache at all for dpb? I'm using dpb since it > makes it easy to keep ports up to date on -current, and I'd really want > to have the ability to run with ccache to speed up the rebuilding of some > of the larger ports. I'm not going to go debug that from scratch. It's likely dpb produced at least some output, like some logs. So there might be an indication of why it doesn't work.
Re: UPDATE: www/netsurf
On Fri, Oct 27, 2017 at 5:47 AM, Anthony J. Bentley wrote: > On Tue, Oct 24, 2017 at 1:59 AM, Anthony J. Bentley > wrote: >> Hi, >> >> This updates the NetSurf browser to 3.7. >> >> As always, I'm interested in test reports on as many architectures >> as possible, particularly sparc64, powerpc, loongson. > > Here's an updated diff using a port for the new libnslog library. > > -- > Anthony J. Bentley A minor nit: which you can ignore. I would just add the libnslog version to browser/Makefile and netsurf-fb/Makefile, just to be consistent with other pieces which have versions. Everything else looks good on amd64! Thanks
Re: [UPDATE] editors/joe
On 11/04/17 14:20, Frederic Cambus wrote:
Hi ports@,
Here is a diff to update joe to 4.5.
Comments? OK?
One nit.
Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile1 Jun 2017 14:18:06 - 1.49
+++ Makefile4 Nov 2017 17:43:59 -
@@ -2,8 +2,7 @@
COMMENT= Joe's Own Editor
-DISTNAME = joe-4.4
-REVISION = 0
+DISTNAME= joe-4.5
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
@@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c ncurses m util
-BUILD_DEPENDS = converters/libiconv
+BUILD_DEPENDS= converters/libiconv
CONFIGURE_STYLE= gnu
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo11 May 2017 14:01:57 - 1.13
+++ distinfo4 Nov 2017 17:43:59 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.4.tar.gz) = pXBIKLvKKay54gBBT+9SLGbN+c4oFQ9ALWdn2kNGCXk=
-SIZE (joe-4.4.tar.gz) = 1350062
+SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
+SIZE (joe-4.5.tar.gz) = 1275486
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 1 Nov 2016 21:07:25 - 1.18
+++ pkg/PLIST 4 Nov 2017 17:43:59 -
@@ -40,6 +40,16 @@ share/examples/joe/shell.sh
share/joe/
share/joe/charmaps/
share/joe/charmaps/klingon
+share/joe/colors/
+share/joe/colors/default.jcf
+share/joe/colors/gruvbox.jcf
+share/joe/colors/ir_black.jcf
+share/joe/colors/molokai.jcf
+share/joe/colors/solarized.jcf
+share/joe/colors/wombat.jcf
+share/joe/colors/xoria.jcf
+share/joe/colors/zenburn-hc.jcf
+share/joe/colors/zenburn.jcf
share/joe/lang/
@sample ${SYSCONFDIR}/joe/lang/
share/joe/lang/de.po
@@ -121,6 +131,7 @@ share/joe/syntax/iptables.jsf
@sample ${SYSCONFDIR}/joe/syntax/iptables.jsf
share/joe/syntax/java.jsf
@sample ${SYSCONFDIR}/joe/syntax/java.jsf
+share/joe/syntax/jcf.jsf
Missing the @sample line for this.
Otherwise ok.
~Brian
share/joe/syntax/joerc.jsf
@sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
share/joe/syntax/js.jsf
[NEW] databases/tdbc-postgres
Provides a database interface that conforms to Tcl DataBase Connectivity (TDBC) and allows a Tcl script to connect to a PostgreSQL database. Tested on i386 and amd64 - in Canada! Stu tdbc-postgres-1.0.5-port.tar.gz Description: application/gzip
Re: dpb and ccache
On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote: > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri wrote: > > Hi, > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and > > pointing CCACHE_DIR to a sensible location owned by _pbuild: > > > > USE_CCACHE=Yes > > CCACHE_DIR=/extra/ccache > > > > However, it seems as if this causes dpb to just quickly run though all > > the ports in my list without buiding anything, or even checking the port > > signatures. > > > > I'm running dpb like this: > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P > > "$HOME/packages.txt" > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since it > > makes it easy to keep ports up to date on -current, and I'd really want > > to have the ability to run with ccache to speed up the rebuilding of some > > of the larger ports. > > I'm not going to go debug that from scratch. > > It's likely dpb produced at least some output, like some logs. > So there might be an indication of why it doesn't work. > Sorry, the summary log, which I don't fully uderstand, seems to say nothing is being built because of circular dependencies between ccache and xz(?): x11/dbus not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz x11/dbus,-main same as x11/dbus x11/dbus,-suid not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz x11/dbus-glib not built devel/glib2 -> x11/dbus -> textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz x11/gnome/adwaita-icon-theme not built x11/icontool -> textproc/p5-XML-Simple -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gnome/at-spi2-atk not built textproc/intltool -> textproc/p5-XML-Parser -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gnome/at-spi2-core not built textproc/intltool -> textproc/p5-XML-Parser -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gnome/libgnome-keyring not built devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gnome/librsvg not built textproc/libxml -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gnome/libsecret not built textproc/intltool -> textproc/p5-XML-Parser -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/gtk+3 not built devel/json-glib -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz x11/gtk+3,-guic not built devel/json-glib -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz x11/gtk+3,-main same as x11/gtk+3 x11/hicolor-icon-theme not built devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/icontool not built textproc/p5-XML-Simple -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache x11/tk/8.5 not built lang/tcl/8.5 -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache -- Andreas Kusalananda Kähäri, National Bioinformatics Infrastructure Sweden (NBIS), Uppsala University, Sweden.
Re: dpb and ccache
On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote: > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote: > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri wrote: > > > Hi, > > > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and > > > pointing CCACHE_DIR to a sensible location owned by _pbuild: > > > > > > USE_CCACHE=Yes > > > CCACHE_DIR=/extra/ccache > > > > > > However, it seems as if this causes dpb to just quickly run though all > > > the ports in my list without buiding anything, or even checking the port > > > signatures. > > > > > > I'm running dpb like this: > > > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P > > > "$HOME/packages.txt" > > > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since it > > > makes it easy to keep ports up to date on -current, and I'd really want > > > to have the ability to run with ccache to speed up the rebuilding of some > > > of the larger ports. > > > > I'm not going to go debug that from scratch. > > > > It's likely dpb produced at least some output, like some logs. > > So there might be an indication of why it doesn't work. > > > > Sorry, the summary log, which I don't fully uderstand, seems to say > nothing is being built because of circular dependencies between ccache > and xz(?): > > x11/dbus not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools -> > archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> > archivers/xz > x11/dbus,-main same as x11/dbus > x11/dbus,-suid not built textproc/xmlto -> misc/gnugetopt -> > devel/gettext-tools -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> > devel/help2man -> archivers/xz > x11/dbus-glib not built devel/glib2 -> x11/dbus -> textproc/xmlto -> > misc/gnugetopt -> devel/gettext-tools -> archivers/xz -> devel/ccache -> > devel/autoconf/2.69 -> devel/help2man -> archivers/xz > x11/gnome/adwaita-icon-theme not built x11/icontool -> textproc/p5-XML-Simple > -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> > devel/ccache > x11/gnome/at-spi2-atk not built textproc/intltool -> textproc/p5-XML-Parser > -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> > devel/ccache > x11/gnome/at-spi2-core not built textproc/intltool -> textproc/p5-XML-Parser > -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> > devel/ccache > x11/gnome/libgnome-keyring not built devel/ccache -> devel/autoconf/2.69 -> > devel/help2man -> archivers/xz -> devel/ccache > x11/gnome/librsvg not built textproc/libxml -> devel/ccache -> > devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache > x11/gnome/libsecret not built textproc/intltool -> textproc/p5-XML-Parser -> > devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> > devel/ccache > x11/gtk+3 not built devel/json-glib -> archivers/xz -> devel/ccache -> > devel/autoconf/2.69 -> devel/help2man -> archivers/xz > x11/gtk+3,-guic not built devel/json-glib -> archivers/xz -> devel/ccache -> > devel/autoconf/2.69 -> devel/help2man -> archivers/xz > x11/gtk+3,-main same as x11/gtk+3 > x11/hicolor-icon-theme not built devel/ccache -> devel/autoconf/2.69 -> > devel/help2man -> archivers/xz -> devel/ccache > x11/icontool not built textproc/p5-XML-Simple -> devel/ccache -> > devel/autoconf/2.69 -> devel/help2man -> archivers/xz -> devel/ccache > x11/tk/8.5 not built lang/tcl/8.5 -> devel/ccache -> devel/autoconf/2.69 -> > devel/help2man -> archivers/xz -> devel/ccache Well, that's useful information. I'll have to think about some smart way to avoid the loop.
Re: dpb and ccache
On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote: > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote: > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri wrote: > > > Hi, > > > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and > > > pointing CCACHE_DIR to a sensible location owned by _pbuild: > > > > > > USE_CCACHE=Yes > > > CCACHE_DIR=/extra/ccache > > > > > > However, it seems as if this causes dpb to just quickly run though all > > > the ports in my list without buiding anything, or even checking the port > > > signatures. > > > > > > I'm running dpb like this: > > > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P > > > "$HOME/packages.txt" > > > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since it > > > makes it easy to keep ports up to date on -current, and I'd really want > > > to have the ability to run with ccache to speed up the rebuilding of some > > > of the larger ports. > > > > I'm not going to go debug that from scratch. > > > > It's likely dpb produced at least some output, like some logs. > > So there might be an indication of why it doesn't work. > > > > Sorry, the summary log, which I don't fully uderstand, seems to say > nothing is being built because of circular dependencies between ccache > and xz(?): > > x11/dbus not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools -> > archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> > archivers/xz There's a dependency cycle in the build dependencies for ccache whek USE_CCACHE is set to "Yes": $ make print-build-depends This port requires package(s) "tsort: cycle in data tsort: devel/autoconf/2.69 tsort: devel/ccache tsort: cycle in data tsort: devel/ccache tsort: devel/metaauto autoconf-2.69p2 ccache-3.3.4p0 metaauto-1.0p1 xz-5.2.3p0" to build. My guess is that all of those port ought to have NO_CCACHE=Yes. -- Andreas Kusalananda Kähäri, National Bioinformatics Infrastructure Sweden (NBIS), Uppsala University, Sweden.
Re: UPDATE: www/netsurf
On Fri, Oct 27, 2017 at 04:47:37AM -0600, Anthony J. Bentley wrote: > On Tue, Oct 24, 2017 at 1:59 AM, Anthony J. Bentley > wrote: > > Hi, > > > > This updates the NetSurf browser to 3.7. > > > > As always, I'm interested in test reports on as many architectures > > as possible, particularly sparc64, powerpc, loongson. > > Here's an updated diff using a port for the new libnslog library. ok fo the 3.7 update and libnslog import.
Re: dpb and ccache
On 2017/11/04 20:38, Andreas Kusalananda Kähäri wrote:
> On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote:
> > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote:
> > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri
> > > wrote:
> > > > Hi,
> > > >
> > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and
> > > > pointing CCACHE_DIR to a sensible location owned by _pbuild:
> > > >
> > > > USE_CCACHE=Yes
> > > > CCACHE_DIR=/extra/ccache
> > > >
> > > > However, it seems as if this causes dpb to just quickly run though all
> > > > the ports in my list without buiding anything, or even checking the port
> > > > signatures.
> > > >
> > > > I'm running dpb like this:
> > > >
> > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P
> > > > "$HOME/packages.txt"
> > > >
> > > > Is it possible to enable ccache at all for dpb? I'm using dpb since it
> > > > makes it easy to keep ports up to date on -current, and I'd really want
> > > > to have the ability to run with ccache to speed up the rebuilding of
> > > > some
> > > > of the larger ports.
> > >
> > > I'm not going to go debug that from scratch.
> > >
> > > It's likely dpb produced at least some output, like some logs.
> > > So there might be an indication of why it doesn't work.
> > >
> >
> > Sorry, the summary log, which I don't fully uderstand, seems to say
> > nothing is being built because of circular dependencies between ccache
> > and xz(?):
> >
> > x11/dbus not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools
> > -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man ->
> > archivers/xz
>
> There's a dependency cycle in the build dependencies for ccache whek
> USE_CCACHE is set to "Yes":
>
> $ make print-build-depends
> This port requires package(s) "tsort: cycle in data
> tsort: devel/autoconf/2.69
> tsort: devel/ccache
> tsort: cycle in data
> tsort: devel/ccache
> tsort: devel/metaauto
> autoconf-2.69p2 ccache-3.3.4p0 metaauto-1.0p1 xz-5.2.3p0" to build.
>
>
> My guess is that all of those port ought to have NO_CCACHE=Yes.
This was just a mistake when bulk-fixing autoconf scripts wih nested
functions shortly before 6.2.
Index: Makefile
===
RCS file: /cvs/ports/devel/ccache/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile25 Sep 2017 19:55:19 - 1.39
+++ Makefile4 Nov 2017 19:47:47 -
@@ -17,9 +17,9 @@ WANTLIB += c m z
MASTER_SITES = http://samba.org/ftp/ccache/
-CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.69
+CONFIGURE_STYLE = gnu
+# This port should not have dependencies.
NO_CCACHE =Yes
.include
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 4 Nov 2017 19:47:47 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
configure
+@@ -4544,10 +4544,11 @@ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include
++void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
+ int
+ main ()
+ {
+-void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
++
+ ;
+ return 0;
+ }
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 25 Sep 2017 19:55:19 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2017/09/25 19:55:19 sthen Exp $
-
-Index: configure.ac
configure.ac.orig
-+++ configure.ac
-@@ -65,8 +65,9 @@ AC_CHECK_FUNCS(utimes)
-
- AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
- AC_TRY_COMPILE(
--[#include ],
--[void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
-+[#include
-+void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
-+ [],
- ccache_cv_COMPAR_FN_T=yes,
- ccache_cv_COMPAR_FN_T=no)])
- if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then
Re: dpb and ccache
On Sat, Nov 04, 2017 at 08:38:37PM +0100, Andreas Kusalananda Kähäri wrote: > On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote: > > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote: > > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri > > > wrote: > > > > Hi, > > > > > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and > > > > pointing CCACHE_DIR to a sensible location owned by _pbuild: > > > > > > > > USE_CCACHE=Yes > > > > CCACHE_DIR=/extra/ccache > > > > > > > > However, it seems as if this causes dpb to just quickly run though all > > > > the ports in my list without buiding anything, or even checking the port > > > > signatures. > > > > > > > > I'm running dpb like this: > > > > > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P > > > > "$HOME/packages.txt" > > > > > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since it > > > > makes it easy to keep ports up to date on -current, and I'd really want > > > > to have the ability to run with ccache to speed up the rebuilding of > > > > some > > > > of the larger ports. > > > > > > I'm not going to go debug that from scratch. > > > > > > It's likely dpb produced at least some output, like some logs. > > > So there might be an indication of why it doesn't work. > > > > > > > Sorry, the summary log, which I don't fully uderstand, seems to say > > nothing is being built because of circular dependencies between ccache > > and xz(?): > > > > x11/dbus not built textproc/xmlto -> misc/gnugetopt -> devel/gettext-tools > > -> archivers/xz -> devel/ccache -> devel/autoconf/2.69 -> devel/help2man -> > > archivers/xz > > There's a dependency cycle in the build dependencies for ccache whek > USE_CCACHE is set to "Yes": > > $ make print-build-depends > This port requires package(s) "tsort: cycle in data > tsort: devel/autoconf/2.69 > tsort: devel/ccache > tsort: cycle in data > tsort: devel/ccache > tsort: devel/metaauto > autoconf-2.69p2 ccache-3.3.4p0 metaauto-1.0p1 xz-5.2.3p0" to build. > > > My guess is that all of those port ought to have NO_CCACHE=Yes. Talking that over with sthen@ Turns out it's a side-effect of the required fixes for clang, where we had to fix lots of configure scripts. The fix in configure.in should be regenerated as configure script. autoconf and help2man are happy with no ccache, since they're not compiled, but the FSF moved to xz-only archives 3 years ago, and you get tripped by help2man requiring xz to extract. Fix coming in soon.
Re: dpb and ccache
On Sat, Nov 04, 2017 at 07:49:20PM +, Stuart Henderson wrote:
> On 2017/11/04 20:38, Andreas Kusalananda Kähäri wrote:
> > On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote:
> > > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote:
> > > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri
> > > > wrote:
> > > > > Hi,
> > > > >
> > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and
> > > > > pointing CCACHE_DIR to a sensible location owned by _pbuild:
> > > > >
> > > > > USE_CCACHE=Yes
> > > > > CCACHE_DIR=/extra/ccache
> > > > >
> > > > > However, it seems as if this causes dpb to just quickly run though all
> > > > > the ports in my list without buiding anything, or even checking the
> > > > > port
> > > > > signatures.
> > > > >
> > > > > I'm running dpb like this:
> > > > >
> > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P
> > > > > "$HOME/packages.txt"
> > > > >
> > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since
> > > > > it
> > > > > makes it easy to keep ports up to date on -current, and I'd really
> > > > > want
> > > > > to have the ability to run with ccache to speed up the rebuilding of
> > > > > some
> > > > > of the larger ports.
> > > >
> > > > I'm not going to go debug that from scratch.
> > > >
> > > > It's likely dpb produced at least some output, like some logs.
> > > > So there might be an indication of why it doesn't work.
> > > >
> > >
> > > Sorry, the summary log, which I don't fully uderstand, seems to say
> > > nothing is being built because of circular dependencies between ccache
> > > and xz(?):
> > >
> > > x11/dbus not built textproc/xmlto -> misc/gnugetopt ->
> > > devel/gettext-tools -> archivers/xz -> devel/ccache ->
> > > devel/autoconf/2.69 -> devel/help2man -> archivers/xz
> >
> > There's a dependency cycle in the build dependencies for ccache whek
> > USE_CCACHE is set to "Yes":
> >
> > $ make print-build-depends
> > This port requires package(s) "tsort: cycle in data
> > tsort: devel/autoconf/2.69
> > tsort: devel/ccache
> > tsort: cycle in data
> > tsort: devel/ccache
> > tsort: devel/metaauto
> > autoconf-2.69p2 ccache-3.3.4p0 metaauto-1.0p1 xz-5.2.3p0" to build.
> >
> >
> > My guess is that all of those port ought to have NO_CCACHE=Yes.
>
> This was just a mistake when bulk-fixing autoconf scripts wih nested
> functions shortly before 6.2.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/ccache/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 25 Sep 2017 19:55:19 - 1.39
> +++ Makefile 4 Nov 2017 19:47:47 -
> @@ -17,9 +17,9 @@ WANTLIB += c m z
>
> MASTER_SITES = http://samba.org/ftp/ccache/
>
> -CONFIGURE_STYLE =autoconf
> -AUTOCONF_VERSION = 2.69
> +CONFIGURE_STYLE =gnu
>
> +# This port should not have dependencies.
> NO_CCACHE = Yes
>
> .include
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure 4 Nov 2017 19:47:47 -
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
> configure
> +@@ -4544,10 +4544,11 @@ else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h. */
> + #include
> ++void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
> + int
> + main ()
> + {
> +-void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
> ++
> + ;
> + return 0;
> + }
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- patches/patch-configure_ac25 Sep 2017 19:55:19 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-configure_ac,v 1.1 2017/09/25 19:55:19 sthen Exp $
> -
> -Index: configure.ac
> configure.ac.orig
> -+++ configure.ac
> -@@ -65,8 +65,9 @@ AC_CHECK_FUNCS(utimes)
> -
> - AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
> - AC_TRY_COMPILE(
> --[#include ],
> --[void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
> -+[#include
> -+void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
> -+[],
> - ccache_cv_COMPAR_FN_T=yes,
> - ccache_cv_COMPAR_FN_T=no)])
> - if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then
Obvious okay espie@
sparc64 bulk build report
bulk build on sparc64-1.ports.openbsd.org started on Sun Oct 29 13:36:33 MDT 2017 finished at Sat Nov 4 13:13:13 MDT 2017 lasted 06D16h36m done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 21:27:53 MDT 2017 built packages:6972 Oct 29:190 Oct 30:244 Oct 31:167 Nov 1:160 Nov 2:574 Nov 3:1439 Nov 4:4197 build failures: 32 http://build-failures.rhaalovely.net//sparc64/2017-10-29/archivers/woff2.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/comms/gammu.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/arm-none-eabi/gcc-linaro.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/astyle.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/cbmc.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/dlib.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/harfbuzz.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/keystone.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/reposurgeon.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/devel/spidermonkey52.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/liblcf.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/lugaru.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/openrct2.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/tome4,-data.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/geo/pdal.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/geo/pgpointcloud.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/graphics/dcmtk.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/graphics/glm.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/lang/apl.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/lang/verilator.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/mail/isync.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/net/avahi,bootstrap,no_gui.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/print/poppler.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/security/encfs.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/security/sslscan,openssl.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/security/yara/main.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/sysutils/facter.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/sysutils/upower.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/textproc/link-grammar,,-main.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/x11/gnome/totem-pl-parser.log http://build-failures.rhaalovely.net//sparc64/2017-10-29/x11/worker.log recurrent failures failures/devel/cbmc.log failures/devel/keystone.log failures/games/liblcf.log failures/games/lugaru.log failures/games/openrct2.log failures/geo/pdal.log failures/geo/pgpointcloud.log failures/graphics/dcmtk.log failures/lang/apl.log failures/mail/isync.log failures/security/encfs.log failures/security/sslscan,openssl.log failures/sysutils/facter.log failures/textproc/link-grammar,,-main.log failures/x11/worker.log new failures +++ ls-failures Sat Nov 4 13:13:43 2017 +failures/archivers/woff2.log +failures/comms/gammu.log +failures/devel/arm-none-eabi/gcc-linaro.log +failures/devel/astyle.log +failures/devel/dlib.log +failures/devel/harfbuzz.log +failures/devel/reposurgeon.log +failures/devel/spidermonkey52.log +failures/games/cataclysm-dda.log +failures/graphics/glm.log +failures/lang/verilator.log +failures/net/avahi,bootstrap,no_gui.log +failures/print/poppler.log +failures/security/yara/main.log +failures/sysutils/upower.log +failures/x11/gnome/totem-pl-parser.log resolved failures --- ../old/sparc64/last//ls-failuresSun Oct 15 05:01:05 2017 -failures/audio/grip.log -failures/converters/k2pdfopt.log -failures/devel/arm-none-eabi/gcc-linaro,aarch64.log -failures/emulators/fuse-utils.log -failures/emulators/gr-lida.log -failures/graphics/gdcm.log -failures/graphics/pqiv.log -failures/graphics/slop.log -failures/mail/kopano/core,-mapi.log -failures/math/gnumeric.log -failures/misc/gtk3mm-documentation.log -failures/net/farstream.log -failures/net/libnids.log -failures/net/owncloudclient.log -failures/net/telegram-purple.log -failures/print/texlive/base.log -failures/telephony/asterisk,imap,-calendar.log -failures/www/ruby-capybara-webkit,ruby24.log -failures/www/webkitgtk4.log -failures/x11/nitrogen.log -failures/x11/qt5/qt3d,-examples.log -failures/x11/qt5/qtgraphicaleffects.log -failures/x11/qt5/qtquickcontrols.log -failures/x11/qt5/qtquickcontrols2,,-main.log -failures/x11/xfce4/xfce4-pulseaudio.log Base libs: crypto.42.0 c.91.0 X libs:
Re: UPDATE: php revamp
On 2017/11/04 12:57, Tom Van Looy wrote: > If you are a user, things like Drupal, Symfony, WordPress, Magento, ... > have a requirements page that tells you what extensions you have to enable. Yeah. Sometimes they even get it right..
Re: UPDATE: php revamp
On 2017/11/04 12:06, Martijn van Duren wrote: > On 11/03/17 21:56, Marc Espie wrote:> See, this is exactly what I'm afraid of. > > > > run-time depends can be a bitch. The stuff still packages, and stays that > > way until somebody notices an issue... which often happens a few months > > after the commits, and sometimes even after release. > > This risk should be minimal, since I grepped through all the packages > in-tree that contain a .php file on all the functions and classes that > moved out of main. The problem is, people updating or importing any php-package need to do the same. And then it's harder than doing a bulk search at the tine of change. It's trickier than perl/python packages using modules, because there are no build time checks.
Re: [UPDATE] libxml
On Fri, Nov 03 2017, Steven Mestdagh wrote: > could someone put this in a bulk build? The update looks good to me, the installed headers don't change much. One (small) problem though: the "compute_minrun" function isn't exported any more, thus you should bump the lib major version. It would probably be safe to cheat and omit the bump, since compute_minrun shouldn't have been exported in the first place, but I don't think it's worth it here. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] net/prosody 0.9.12 -> 0.10.0
On 17-11-01 16:33:46, Henrik Friedrichsen wrote: > Hey > > Could a developer with commit rights look at this and pull it in, if OK? Ping?
Re: dpb and ccache
The committed fix seems to work as advertised. Thanks for sorting it
out so quickly!
Andreas
On Sat, Nov 04, 2017 at 07:49:20PM +, Stuart Henderson wrote:
> On 2017/11/04 20:38, Andreas Kusalananda Kähäri wrote:
> > On Sat, Nov 04, 2017 at 08:15:48PM +0100, Andreas Kusalananda Kähäri wrote:
> > > On Sat, Nov 04, 2017 at 07:23:01PM +0100, Marc Espie wrote:
> > > > On Sat, Nov 04, 2017 at 05:46:26PM +0100, Andreas Kusalananda Kähäri
> > > > wrote:
> > > > > Hi,
> > > > >
> > > > > I tried using dpb(1) with ccache today by adding USE_CCACHE=Yes and
> > > > > pointing CCACHE_DIR to a sensible location owned by _pbuild:
> > > > >
> > > > > USE_CCACHE=Yes
> > > > > CCACHE_DIR=/extra/ccache
> > > > >
> > > > > However, it seems as if this causes dpb to just quickly run though all
> > > > > the ports in my list without buiding anything, or even checking the
> > > > > port
> > > > > signatures.
> > > > >
> > > > > I'm running dpb like this:
> > > > >
> > > > > doas /usr/ports/infrastructure/bin/dpb -p4 -suUR -J0 -P
> > > > > "$HOME/packages.txt"
> > > > >
> > > > > Is it possible to enable ccache at all for dpb? I'm using dpb since
> > > > > it
> > > > > makes it easy to keep ports up to date on -current, and I'd really
> > > > > want
> > > > > to have the ability to run with ccache to speed up the rebuilding of
> > > > > some
> > > > > of the larger ports.
> > > >
> > > > I'm not going to go debug that from scratch.
> > > >
> > > > It's likely dpb produced at least some output, like some logs.
> > > > So there might be an indication of why it doesn't work.
> > > >
> > >
> > > Sorry, the summary log, which I don't fully uderstand, seems to say
> > > nothing is being built because of circular dependencies between ccache
> > > and xz(?):
> > >
> > > x11/dbus not built textproc/xmlto -> misc/gnugetopt ->
> > > devel/gettext-tools -> archivers/xz -> devel/ccache ->
> > > devel/autoconf/2.69 -> devel/help2man -> archivers/xz
> >
> > There's a dependency cycle in the build dependencies for ccache whek
> > USE_CCACHE is set to "Yes":
> >
> > $ make print-build-depends
> > This port requires package(s) "tsort: cycle in data
> > tsort: devel/autoconf/2.69
> > tsort: devel/ccache
> > tsort: cycle in data
> > tsort: devel/ccache
> > tsort: devel/metaauto
> > autoconf-2.69p2 ccache-3.3.4p0 metaauto-1.0p1 xz-5.2.3p0" to build.
> >
> >
> > My guess is that all of those port ought to have NO_CCACHE=Yes.
>
> This was just a mistake when bulk-fixing autoconf scripts wih nested
> functions shortly before 6.2.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/ccache/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 25 Sep 2017 19:55:19 - 1.39
> +++ Makefile 4 Nov 2017 19:47:47 -
> @@ -17,9 +17,9 @@ WANTLIB += c m z
>
> MASTER_SITES = http://samba.org/ftp/ccache/
>
> -CONFIGURE_STYLE =autoconf
> -AUTOCONF_VERSION = 2.69
> +CONFIGURE_STYLE =gnu
>
> +# This port should not have dependencies.
> NO_CCACHE = Yes
>
> .include
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure 4 Nov 2017 19:47:47 -
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
> configure
> +@@ -4544,10 +4544,11 @@ else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h. */
> + #include
> ++void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
> + int
> + main ()
> + {
> +-void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }
> ++
> + ;
> + return 0;
> + }
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- patches/patch-configure_ac25 Sep 2017 19:55:19 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-configure_ac,v 1.1 2017/09/25 19:55:19 sthen Exp $
> -
> -Index: configure.ac
> configure.ac.orig
> -+++ configure.ac
> -@@ -65,8 +65,9 @@ AC_CHECK_FUNCS(utimes)
> -
> - AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
> - AC_TRY_COMPILE(
> --[#include ],
> --[void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
> -+[#include
> -+void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
> -+[],
> - ccache_cv_COMPAR_FN_T=yes,
> - ccache_cv_COMPAR_FN_T=no)])
> - if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then
>
--
Andreas Kusalananda Kähäri,
National Bioinformatics Infrastructure Sweden (NBIS),
Uppsala University, Sweden.
Re: [UPDATE] net/prosody 0.9.12 -> 0.10.0
On Sat, Nov 04, 2017 at 10:34:01PM +0100, viq wrote: > On 17-11-01 16:33:46, Henrik Friedrichsen wrote: > > Hey > > > > Could a developer with commit rights look at this and pull it in, if OK? > > Ping? Well, which of your diffs should be commited ? :)
games/cgames -- use make instead of gmake
Hi ports --
The attached patch switches games/cgames from using gmake to build to
make. Lets us remove an old-school perl -pi -e replacement line.
Re-take MAINTAINER, since this port was originally my fault.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/games/cgames/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 25 Aug 2015 13:18:26 - 1.3
+++ Makefile 4 Nov 2017 21:42:48 -
@@ -5,9 +5,10 @@ PORTROACH = limit:.*[^a]$$
COMMENT = free console games suite
DISTNAME = cgames-2.2a
CATEGORIES = games
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://www.muppetlabs.com/~breadbox/software/cgames.html
+MAINTAINER = Brian Callahan
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -21,15 +22,10 @@ CONFIGURE_ARGS = --datarootdir="${LOCALB
--disable-mouse \
--with-ncurses
-USE_GMAKE = Yes
-
FAKE_FLAGS = bindir="${DESTDIR}${PREFIX}/bin" \
datadir="${DESTDIR}${PREFIX}/share/cgames" \
mandir="${DESTDIR}${PREFIX}/man"
NO_TEST = Yes
-
-pre-configure:
- perl -pi -e "s,make,${GMAKE},g" ${WRKSRC}/Makefile
.include
Index: patches/patch-cblocks_Makefile_in
===
RCS file: /cvs/ports/games/cgames/patches/patch-cblocks_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-cblocks_Makefile_in
--- patches/patch-cblocks_Makefile_in 1 Dec 2014 23:12:08 - 1.1.1.1
+++ patches/patch-cblocks_Makefile_in 4 Nov 2017 21:42:48 -
@@ -1,7 +1,16 @@
$OpenBSD: patch-cblocks_Makefile_in,v 1.1.1.1 2014/12/01 23:12:08 bcallah Exp $
cblocks/Makefile.in.orig Sun Nov 30 22:38:49 2014
-+++ cblocks/Makefile.in Sun Nov 30 22:39:23 2014
-@@ -33,8 +33,8 @@ install: cblocks
+Index: cblocks/Makefile.in
+--- cblocks/Makefile.in.orig
cblocks/Makefile.in
+@@ -22,6 +22,7 @@ LOADLIBES =@LOADLIBES@@MOUSELIBS@
+ OBJS = cblocks.o movelist.o parse.o fileread.o answers.o play.o dirio.o userio.o
+
+ cblocks: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) cblocks
+@@ -33,8 +34,8 @@ install: cblocks
install -c ./cblocks $(bindir)/cblocks
install -d $(mandir)/man6
install -c ./cblocks.6 $(mandir)/man6/cblocks.6
Index: patches/patch-cmines_Makefile_in
===
RCS file: patches/patch-cmines_Makefile_in
diff -N patches/patch-cmines_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmines_Makefile_in 4 Nov 2017 21:42:48 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: cmines/Makefile.in
+--- cmines/Makefile.in.orig
cmines/Makefile.in
+@@ -21,6 +21,7 @@ LOADLIBES =@LOADLIBES@@MOUSELIBS@
+ OBJS = cmines.o userio.o
+
+ cmines: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) cmines
Index: patches/patch-csokoban_Makefile_in
===
RCS file: /cvs/ports/games/cgames/patches/patch-csokoban_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-csokoban_Makefile_in
--- patches/patch-csokoban_Makefile_in 1 Dec 2014 23:12:08 - 1.1.1.1
+++ patches/patch-csokoban_Makefile_in 4 Nov 2017 21:42:48 -
@@ -1,7 +1,16 @@
$OpenBSD: patch-csokoban_Makefile_in,v 1.1.1.1 2014/12/01 23:12:08 bcallah Exp $
csokoban/Makefile.in.orig Sun Nov 30 22:39:33 2014
-+++ csokoban/Makefile.in Sun Nov 30 22:39:51 2014
-@@ -32,8 +32,8 @@ install: csokoban
+Index: csokoban/Makefile.in
+--- csokoban/Makefile.in.orig
csokoban/Makefile.in
+@@ -21,6 +21,7 @@ LOADLIBES =@LOADLIBES@
+ OBJS = csokoban.o movelist.o fileread.o answers.o play.o dirio.o userio.o
+
+ csokoban: $(OBJS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LOADLIBES)
+
+ clean:
+ rm -f $(OBJS) csokoban
+@@ -32,8 +33,8 @@ install: csokoban
install -c ./csokoban $(bindir)/csokoban
install -d $(mandir)/man6
install -c ./csokoban.6 $(mandir)/man6/csokoban.6
Re: [UPDATE] math/lapack
Steven Mestdagh [2017-11-04, 18:55:19]:
> long overdue update, and switch to gfortran. ok?
> working on ports that depend on it.
this should take care of dependent ports, and switches them to gfortran.
Index: math/arpack/Makefile
===
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- math/arpack/Makefile16 Mar 2015 18:07:49 - 1.15
+++ math/arpack/Makefile4 Nov 2017 21:54:46 -
@@ -4,7 +4,7 @@ COMMENT=solve large scale eigenvalue pr
DISTNAME= arpack96
PKGNAME= arpack-96
-REVISION= 4
+REVISION= 5
SHARED_LIBS= arpack 1.0
CATEGORIES=math
@@ -18,7 +18,7 @@ DISTFILES=${DISTNAME}.tar.gz patch.tar.
DIST_SUBDIR= arpack
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS = math/lapack \
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIST}/SRC
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBarpack_VERSION:R} \
SHLIB_MINOR=${LIBarpack_VERSION:E} \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
post-extract:
Index: math/arpack/patches/patch-SRC_second_f
===
RCS file: math/arpack/patches/patch-SRC_second_f
diff -N math/arpack/patches/patch-SRC_second_f
--- /dev/null 1 Jan 1970 00:00:00 -
+++ math/arpack/patches/patch-SRC_second_f 4 Nov 2017 21:54:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: SRC/second.f
+--- SRC/second.f.orig
SRC/second.f
+@@ -21,7 +21,7 @@
+ * ..
+ * .. External Functions ..
+ REAL ETIME
+- EXTERNAL ETIME
++* EXTERNAL ETIME
+ * ..
+ * .. Executable Statements ..
+ *
Index: math/octave/Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.98
diff -u -p -u -r1.98 Makefile
--- math/octave/Makefile3 Nov 2017 12:28:53 - 1.98
+++ math/octave/Makefile4 Nov 2017 21:54:46 -
@@ -4,6 +4,7 @@ COMMENT = high-level language for numeri
VERSION = 4.2.1
DISTNAME = octave-${VERSION}
+REVISION = 0
CATEGORIES = math
SHARED_LIBS += octave 8.0
@@ -44,6 +45,8 @@ BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPEN
textproc/gsed \
math/gnuplot
+MODFORTRAN_COMPILER = gfortran
+
# configure checks for desktop-file-install(1)
BUILD_DEPENDS +=devel/desktop-file-utils
@@ -78,8 +81,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
-I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LRELEASE="${MODQT_LRELEASE}" \
- F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
-
+ CXXFLAGS="${CXXFLAGS} -std=gnu++11"
# needed to build on amd64
GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
Index: math/py-numpy/Makefile
===
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.46
diff -u -p -u -r1.46 Makefile
--- math/py-numpy/Makefile 3 Jan 2017 19:23:48 - 1.46
+++ math/py-numpy/Makefile 4 Nov 2017 21:54:46 -
@@ -7,7 +7,7 @@ COMMENT=fast array and numeric program
MODPY_EGG_VERSION= 1.9.2
DISTNAME= numpy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 0
+REVISION= 1
CATEGORIES=math devel
@@ -33,7 +33,7 @@ MODPY_SETUP= setupegg.py
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS=math/lapack \
Index: math/suitesparse/Makefile
===
RCS file: /cvs/ports/math/suitesparse/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- math/suitesparse/Makefile 27 Feb 2017 23:08:14 - 1.5
+++ math/suitesparse/Makefile 4 Nov 2017 21:54:46 -
@@ -6,6 +6,7 @@ COMMENT=suite of sparse matrix algorit
DISTNAME= SuiteSparse-4.4.6
PKGNAME= ${DISTNAME:L}
+REVISION= 0
CATEGORIES=math
@@ -28,6 +29,7 @@ WANTLIB += ${MODFORTRAN_WANTLIB} blas la
MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/
MODULES= fortran
+MODFORTRAN_COMPILER= gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
@@ -89,7 +91,7 @@ post-build:
libcolamd.so.${LIBcolamd_VERSION} \
libccolamd.s
[WIP] lua-sandbox + hindsight
Hi, here's a WIP port for hindsight, (http://mozilla-services.github.io/hindsight/) a 'C-based data processing infrastructure pipeline' for log/metrics analysis and distribution, akin to the ELK stack. It replaces 'heka' which was also a mozilla too (see https://mail.mozilla.org/pipermail/heka/2016-May/001059.html) So far i have it running in basic testing with hacks around, getting system logs via udp input, or nginx access logfile parsing on the fly - didnt try yet to output the messages to ES or something else. If ppl are interested in this topic/trying it, let me know. Im not sure i'll pursue this, given that some stuff relies on linux stuff (pthread_timedjoin_np) or inotify to reload config on the fly, posix semaphores to notify threads... and i know nothing to lua porting :) More info on how its used at mozilla: https://docs.telemetry.mozilla.org/concepts/data_pipeline.html Landry hindsight-luasandbox+extensions.tgz Description: application/tar-gz
Update emulators/mednafen 0.9.46 -> 0.9.48
Routine update to mednafen. It appears all improvements are to the Sega Saturn emulation. I need to do more testing of this, so I don't plan on committing it for about a week. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/emulators/mednafen/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- Makefile2 Sep 2017 21:42:41 - 1.21 +++ Makefile4 Nov 2017 22:50:00 - @@ -3,7 +3,7 @@ BROKEN-hppa = ../../include/mednafen/state.h:21:7: error: 'exception_ptr' in namespace 'std' does not name a type COMMENT = emulates numerous game consoles -DISTNAME = mednafen-0.9.46 +DISTNAME = mednafen-0.9.48 CATEGORIES = emulators games HOMEPAGE = https://mednafen.github.io Index: distinfo === RCS file: /cvs/ports/emulators/mednafen/distinfo,v retrieving revision 1.9 diff -u -p -u -p -r1.9 distinfo --- distinfo2 Sep 2017 21:42:41 - 1.9 +++ distinfo4 Nov 2017 22:50:08 - @@ -1,2 +1,2 @@ -SHA256 (mednafen-0.9.46.tar.xz) = Z0+vQr2wrVZJrqZdomawvjQomVyqp74YP8bT7XcyRno= -SIZE (mednafen-0.9.46.tar.xz) = 3187988 +SHA256 (mednafen-0.9.48.tar.xz) = 08wMg49JZRGUbW6hj9pZZdK3FXfGEKzIEYNcyH0VIQI= +SIZE (mednafen-0.9.48.tar.xz) = 3203080
Re: sparc64 bulk build report
On Sat, November 4, 2017 3:13 pm, lan...@openbsd.org wrote: > bulk build on sparc64-1.ports.openbsd.org > started on Sun Oct 29 13:36:33 MDT 2017 > finished at Sat Nov 4 13:13:13 MDT 2017 > lasted 06D16h36m > done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 > 21:27:53 MDT 2017 > > http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log > > new failures > +failures/games/cataclysm-dda.log > Cataclysm won't build with base gcc because of missing -std=c++11 which is what seems to be happening here. I chose to configure the build for clang over gcc out of ports. Is there a quick flag to disable this on non-clang archs? Would anyone think I should make this work on gcc archs? Still wouldn't mean it will compile and run and I can't test it. Tim.
Re: sparc64 bulk build report
Hi Tim, On Sat, Nov 04 2017, "trondd" wrote: > On Sat, November 4, 2017 3:13 pm, lan...@openbsd.org wrote: >> bulk build on sparc64-1.ports.openbsd.org >> started on Sun Oct 29 13:36:33 MDT 2017 >> finished at Sat Nov 4 13:13:13 MDT 2017 >> lasted 06D16h36m >> done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 >> 21:27:53 MDT 2017 >> >> http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log >> >> new failures >> +failures/games/cataclysm-dda.log >> > > Cataclysm won't build with base gcc because of missing -std=c++11 which is > what seems to be happening here. > > I chose to configure the build for clang over gcc out of ports. > > Is there a quick flag to disable this on non-clang archs? Would anyone > think I should make this work on gcc archs? Still wouldn't mean it will > compile and run and I can't test it. I think that everybody should make an effort to support stuff on all archs*. The transition to clang makes this a bit worse than before, but people forget that they can test both clang and base gcc on their fast amd64 machine. So nope, you can build it, and you can test it. ;) * when it is doable, obviously; some ports are highly arch-dependent. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
borgbackup tweaks
Hi,
Minor tweaks for borgbackup. lang/python/3.6 now provides a python3
symlink, so the patch shouldn't be needed.
ok?
Index: patches/patch-src_borg__endian_h
===
RCS file: /d/cvs/ports/sysutils/borgbackup/patches/patch-src_borg__endian_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_borg__endian_h
--- patches/patch-src_borg__endian_h4 Nov 2017 12:29:38 - 1.1
+++ patches/patch-src_borg__endian_h4 Nov 2017 23:27:19 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_borg__endian_h,v 1.1 2017/11/04 12:29:38 jasper Exp $
-__builtin_bswap32 unavailable at least on sparc6
+__builtin_bswap32 unavailable at least on sparc64
Index: src/borg/_endian.h
--- src/borg/_endian.h.orig
Index: patches/patch-src_borg_testsuite_archiver_py
===
RCS file: patches/patch-src_borg_testsuite_archiver_py
diff -N patches/patch-src_borg_testsuite_archiver_py
--- patches/patch-src_borg_testsuite_archiver_py4 Nov 2017 12:29:38
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_borg_testsuite_archiver_py,v 1.1 2017/11/04 12:29:38
jasper Exp $
-
-Index: src/borg/testsuite/archiver.py
src/borg/testsuite/archiver.py.orig
-+++ src/borg/testsuite/archiver.py
-@@ -2452,7 +2452,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
- def test_with_lock(self):
- self.cmd('init', '--encryption=repokey', self.repository_location)
- lock_path = os.path.join(self.repository_path, 'lock.exclusive')
--cmd = 'python3', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
-+cmd = 'python${MODPY_VERSION}', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
- self.cmd('with-lock', self.repository_location, *cmd, fork=True,
exit_code=42)
-
- def test_recreate_list_output(self):
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Update comms/c3270 3.3.11ga6 -> 3.5ga11
Simple update to the latest version of c3270, a mainframe terminal
emulator.
Upsteam stopped offering a separate distfile for c3270, and now they
only off one distfile for the whole *3270 suite. gmake is now required.
A patch is necessary because their OpenSSL detection appears to
think we support OpenSSL 1.1 API.
I don't plan on committing this for a week or so until I can test
connecting to a mainframe and make sure it still works.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/comms/c3270/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile9 Apr 2016 20:14:48 - 1.6
+++ Makefile4 Nov 2017 23:58:17 -
@@ -2,8 +2,8 @@
COMMENT= curses-based 3270 terminal editor
-DISTNAME= suite3270-3.3.11ga6-src
-PKGNAME= c3270-3.3.11.6
+DISTNAME= suite3270-3.5ga11-src
+PKGNAME= c3270-3.5.11
EXTRACT_SUFX= .tgz
CATEGORIES=comms
@@ -19,10 +19,24 @@ LIB_DEPENDS=converters/libiconv
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/}
-WRKDIST= ${WRKDIR}/c3270-3.3
+WRKDIST= ${WRKDIR}/suite3270-3.5
+USE_GMAKE =Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS=--disable-unix \
+ --disable-windows \
+ --disable-x3270 \
+ --enable-c3270 \
+ --disable-s3270 \
+ --disable-tcl3270 \
+ --disable-pr3287 \
+ --disable-lib \
+ --disable-wc3270 \
+ --disable-ws3270 \
+ --disable-wpr3287 \
+ --disable-windows-lib
post-install:
rm ${WRKINST}/etc/x3270/ibm_hosts
Index: distinfo
===
RCS file: /cvs/ports/comms/c3270/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:12:55 - 1.4
+++ distinfo4 Nov 2017 23:58:17 -
@@ -1,2 +1,2 @@
-SHA256 (suite3270-3.3.11ga6-src.tgz) =
Hu3intshIo+T6ifFei/xxZsl1AsldYrcDVCpYcTNn6k=
-SIZE (suite3270-3.3.11ga6-src.tgz) = 6470645
+SHA256 (suite3270-3.5ga11-src.tgz) =
G+3KytCbHiUMKGgseTWxcw/YzvzF99Gzc1Qd7iy38uc=
+SIZE (suite3270-3.5ga11-src.tgz) = 3413903
Index: patches/patch-Common_telnet_c
===
RCS file: patches/patch-Common_telnet_c
diff -N patches/patch-Common_telnet_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Common_telnet_c 4 Nov 2017 23:58:17 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Work around bad SSL library detection.
+
+Index: Common/telnet.c
+--- Common/telnet.c.orig
Common/telnet.c
+@@ -3688,7 +3688,7 @@ ssl_base_init(char *cl_hostname, bool *pending)
+ ssl_pending = pending;
+ }
+
+-#if !defined(_WIN32) && OPENSSL_VERSION_NUMBER < 0x1010L /*[*/
++#if !defined(_WIN32)
+ SSL_load_error_strings();
+ SSL_library_init();
+ #else /*][*/
+@@ -3696,7 +3696,7 @@ ssl_base_init(char *cl_hostname, bool *pending)
+ #endif /*]*/
+ try_again:
+ ssl_passwd_gui_reset();
+-#if !defined(_WIN32) && OPENSSL_VERSION_NUMBER < 0x1010L /*[*/
++#if !defined(_WIN32)
+ ssl_ctx = SSL_CTX_new(SSLv23_method());
+ #else /*][*/
+ ssl_ctx = SSL_CTX_new(TLS_method());
Index: pkg/PLIST
===
RCS file: /cvs/ports/comms/c3270/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 14 Mar 2011 23:26:48 - 1.3
+++ pkg/PLIST 4 Nov 2017 23:58:17 -
@@ -1,3 +1,2 @@
@comment $OpenBSD: PLIST,v 1.3 2011/03/14 23:26:48 jeremy Exp $
@bin bin/c3270
-@bin bin/x3270if
Re: sparc64 bulk build report
On Sun, Nov 05 2017, Jeremie Courreges-Anglas wrote: > Hi Tim, > > On Sat, Nov 04 2017, "trondd" wrote: >> On Sat, November 4, 2017 3:13 pm, lan...@openbsd.org wrote: >>> bulk build on sparc64-1.ports.openbsd.org >>> started on Sun Oct 29 13:36:33 MDT 2017 >>> finished at Sat Nov 4 13:13:13 MDT 2017 >>> lasted 06D16h36m >>> done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 >>> 21:27:53 MDT 2017 >>> >>> http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log >>> >>> new failures >>> +failures/games/cataclysm-dda.log >>> >> >> Cataclysm won't build with base gcc because of missing -std=c++11 which is >> what seems to be happening here. >> >> I chose to configure the build for clang over gcc out of ports. >> >> Is there a quick flag to disable this on non-clang archs? Would anyone >> think I should make this work on gcc archs? Still wouldn't mean it will >> compile and run and I can't test it. > > I think that everybody should make an effort to support stuff on all > archs*. The transition to clang makes this a bit worse than before, but > people forget that they can test both clang and base gcc on their fast > amd64 machine. > > So nope, you can build it, and you can test it. ;) Landry rightfully pointed out that I could have been more helpful. To test a build with base gcc, I just use this: make clean all repackage CC=gcc CXX=g++ Obviously with a reinstall if you want to test runtime. > * when it is doable, obviously; some ports are highly arch-dependent. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: sparc64 bulk build report
On Sat, November 4, 2017 7:54 pm, Jeremie Courreges-Anglas wrote: > > Hi Tim, > > On Sat, Nov 04 2017, "trondd" wrote: >> On Sat, November 4, 2017 3:13 pm, lan...@openbsd.org wrote: >>> bulk build on sparc64-1.ports.openbsd.org >>> started on Sun Oct 29 13:36:33 MDT 2017 >>> finished at Sat Nov 4 13:13:13 MDT 2017 >>> lasted 06D16h36m >>> done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 >>> 21:27:53 MDT 2017 >>> >>> http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log >>> >>> new failures >>> +failures/games/cataclysm-dda.log >>> >> >> Cataclysm won't build with base gcc because of missing -std=c++11 which >> is >> what seems to be happening here. >> >> I chose to configure the build for clang over gcc out of ports. >> >> Is there a quick flag to disable this on non-clang archs? Would anyone >> think I should make this work on gcc archs? Still wouldn't mean it will >> compile and run and I can't test it. > > I think that everybody should make an effort to support stuff on all > archs*. The transition to clang makes this a bit worse than before, but > people forget that they can test both clang and base gcc on their fast > amd64 machine. > > So nope, you can build it, and you can test it. ;) Yes, I know I can test the different compilers, I already have. I was refering to your astrisk. :) Is 'COMPILER= gcc' the right way to fix this situation? It builds with base clang and devel/gcc/4.9. Thanks. Tim. > > * when it is doable, obviously; some ports are highly arch-dependent. > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 > E7EE >
Re: sparc64 bulk build report
On Sat, Nov 04 2017, "trondd" wrote: > On Sat, November 4, 2017 7:54 pm, Jeremie Courreges-Anglas wrote: >> >> Hi Tim, >> >> On Sat, Nov 04 2017, "trondd" wrote: >>> On Sat, November 4, 2017 3:13 pm, lan...@openbsd.org wrote: bulk build on sparc64-1.ports.openbsd.org started on Sun Oct 29 13:36:33 MDT 2017 finished at Sat Nov 4 13:13:13 MDT 2017 lasted 06D16h36m done with kern.version=OpenBSD 6.2-current (GENERIC) #323: Sat Oct 28 21:27:53 MDT 2017 http://build-failures.rhaalovely.net//sparc64/2017-10-29/games/cataclysm-dda.log new failures +failures/games/cataclysm-dda.log >>> >>> Cataclysm won't build with base gcc because of missing -std=c++11 which >>> is >>> what seems to be happening here. >>> >>> I chose to configure the build for clang over gcc out of ports. >>> >>> Is there a quick flag to disable this on non-clang archs? Would anyone >>> think I should make this work on gcc archs? Still wouldn't mean it will >>> compile and run and I can't test it. >> >> I think that everybody should make an effort to support stuff on all >> archs*. The transition to clang makes this a bit worse than before, but >> people forget that they can test both clang and base gcc on their fast >> amd64 machine. >> >> So nope, you can build it, and you can test it. ;) > > Yes, I know I can test the different compilers, I already have. I was > refering to your astrisk. :) Ah, ok. :) > Is 'COMPILER= gcc' the right way to fix this situation? It builds with > base clang and devel/gcc/4.9. The situation is muddy. COMPILER = gcc is supported, but now we're not using it for new ports. You should pick stuff from base-clang (first in the list), ports-gcc and ports-clang. > Thanks. > Tim. > >> >> * when it is doable, obviously; some ports are highly arch-dependent. >> -- >> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 >> E7EE >> > > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: Help update port 'mail/mlmmj' to the latest 1.3.0
> On Nov 2, 2017, at 11:45 PM, Zhang Huangbin wrote: > > Thanks for the instruction. Here’s the full patch. Anyone? Zhang Huangbin, founder of iRedMail project: http://www.iredmail.org/ Time zone: GMT+8 (China/Beijing). Available on Telegram: https://t.me/iredmail
NEW: lang/snobol4
Hi ports -- Attached is a new port, lang/snobol4, the CSNOBOL4 suite including interpreter, debugger and utilities. --- pkg/DESCR: CSNOBOL4 is a free port of the original SIL (SNOBOL4 Implementation Language) "macro" version of SNOBOL4 (developed at Bell Labs) with the `C' language as a target. SNOBOL4, while known primarily as a string language excels at any task involving symbolic manipulations. It provides dynamic typing, garbage collection, user data types, and on the fly compilation. CSNOBOL4 supports the full SNOBOL4 language plus BLOCKS and SPITBOL and other extensions. --- This port is a joint work between myself and STeve Andre', who takes MAINTAINER. OK? ~Brian snobol4.tgz Description: Binary data
Re: Build chromedriver when building chrome
On 11/04 06:18, Jeremy Evans wrote:
> This builds chromedriver when building chrome. chromedriver is
> chrome's implementation of the WebDriver protocol, which allows
> for driving chrome via external software. Most commonly this
> is used in automated testing, often with Selenium, which supports
> many different browsers and programming languages.
>
> chromedriver is about 10MB uncompressed, and considering the size
> of the chrome package, I don't think it is worth it to subpackage.
>
> Tested on amd64 using ruby with the capybara and selenium-webdriver
> libraries. With only minor modifications to a test suite designed
> for capybara-webkit, chromedriver was able to successfully complete
> the test suite.
>
> This does require one patch so that chromedriver can find the
> chrome binary.
Last patch was broken because it used SUBST_PROGRAM instead of
SUBST_CMD. Breakage pointed out by ian@. Hopefully this works,
I don't want to wait 14 hours to confirm.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.345
diff -u -p -u -p -r1.345 Makefile
--- Makefile29 Oct 2017 14:36:53 - 1.345
+++ Makefile5 Nov 2017 01:22:24 -
@@ -10,7 +10,7 @@ DPB_PROPERTIES= parallel
COMMENT= Chromium browser
V= 62.0.3202.62
-REVISION= 0
+REVISION= 1
DISTNAME= chromium-${V}
@@ -97,7 +97,7 @@ BUILDTYPE=Debug
BUILDTYPE= Release
.endif
-ALL_TARGET=chrome
+ALL_TARGET=chrome chromedriver
TEST_TARGET= base_unittests
CONFIGURE_STYLE=none # prevent python MODULE from overriding do-build
@@ -173,6 +173,7 @@ do-configure:
--no-clean -s --gn-gen-args "${GN_ARGS}"
@cd ${WRKSRC} && env -i ${CONFIGURE_ENV} ${WRKSRC}/out/Release/gn \
gen --args="${GN_ARGS}" out/${BUILDTYPE}
+ ${SUBST_CMD} ${WRKSRC}/chrome/test/chromedriver/chrome/chrome_finder.cc
do-build:
@cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \
@@ -182,6 +183,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/chrome
${INSTALL_PROGRAM} ${BUILDDIR}/chrome ${PREFIX}/chrome
${SUBST_PROGRAM} ${FILESDIR}/chrome ${PREFIX}/bin/chrome
+ ${INSTALL_PROGRAM} ${BUILDDIR}/chromedriver ${PREFIX}/bin/chromedriver
${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${BUILDDIR}/*.pak ${PREFIX}/chrome
Index: patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
===
RCS file: patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
diff -N patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-chrome_test_chromedriver_chrome_chrome_finder_cc 4 Nov
2017 11:56:05 -
@@ -0,0 +1,24 @@
+$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.3 2017/06/25 21:53:56
robert Exp $
+Index: chrome/test/chromedriver/chrome/chrome_finder.cc
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig Fri Nov 3
15:00:28 2017
chrome/test/chromedriver/chrome/chrome_finder.cc Fri Nov 3 15:01:35 2017
+@@ -45,6 +45,10 @@
+ installation_locations[i].Append(L"Chromium\\Application"));
+ }
+ }
++#elif 1
++void GetApplicationDirs(std::vector* locations) {
++ locations->push_back(base::FilePath("${PREFIX}/bin"));
++}
+ #elif defined(OS_LINUX)
+ void GetApplicationDirs(std::vector* locations) {
+ locations->push_back(base::FilePath("/opt/google/chrome"));
+@@ -102,7 +106,7 @@
+ base::FilePath("chromium-browser")
+ #else
+ // it will compile but won't work on other OSes
+- base::FilePath()
++ base::FilePath("chrome"),
+ #endif
+ };
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/chromium/pkg/PLIST,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 PLIST
--- pkg/PLIST 25 Oct 2017 13:47:07 - 1.72
+++ pkg/PLIST 3 Nov 2017 20:34:41 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.72 2017/10/25 13:47:07 robert Exp $
@pkgpath www/chromium,proprietary
bin/chrome
+@bin bin/chromedriver
chrome/
@bin chrome/chrome
chrome/chrome_100_percent.pak
Re: borgbackup tweaks
On Sun 05/11/2017 00:50, Jeremie Courreges-Anglas wrote:
>
> Hi,
>
> Minor tweaks for borgbackup. lang/python/3.6 now provides a python3
> symlink, so the patch shouldn't be needed.
>
> ok?
Makefile needs some attention as well. See diff below.
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
index e7210a25829..399887932c7 100644
--- sysutils/borgbackup/Makefile
+++ sysutils/borgbackup/Makefile
@@ -35,9 +35,6 @@ TEST_DEPENDS += ${RUN_DEPENDS} \
MODPY_SETUPTOOLS = Yes
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/src/borg/testsuite/archiver.py
-
post-build:
${MODPY_CMD} build_ext --inplace
cd ${WRKSRC}/docs; env PYTHONPATH=${WRKSRC} \
@@ -45,7 +42,6 @@ post-build:
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/_build/man/borg.1
${PREFIX}/man/man1/borg.1
- rm
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/borg/testsuite/archiver.py.beforesubst
do-test: fake
cd ${WRKSRC}; \
diff --git sysutils/borgbackup/patches/patch-src_borg__endian_h
sysutils/borgbackup/patches/patch-src_borg__endian_h
index ad7acf235eb..86a2d38b011 100644
--- sysutils/borgbackup/patches/patch-src_borg__endian_h
+++ sysutils/borgbackup/patches/patch-src_borg__endian_h
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_borg__endian_h,v 1.1 2017/11/04 12:29:38 jasper Exp $
-__builtin_bswap32 unavailable at least on sparc6
+__builtin_bswap32 unavailable at least on sparc64
Index: src/borg/_endian.h
--- src/borg/_endian.h.orig
diff --git sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
deleted file mode 100644
index 274f2c64c99..000
--- sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_borg_testsuite_archiver_py,v 1.1 2017/11/04 12:29:38
jasper Exp $
-
-Index: src/borg/testsuite/archiver.py
src/borg/testsuite/archiver.py.orig
-+++ src/borg/testsuite/archiver.py
-@@ -2452,7 +2452,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
- def test_with_lock(self):
- self.cmd('init', '--encryption=repokey', self.repository_location)
- lock_path = os.path.join(self.repository_path, 'lock.exclusive')
--cmd = 'python3', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
-+cmd = 'python${MODPY_VERSION}', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
- self.cmd('with-lock', self.repository_location, *cmd, fork=True,
exit_code=42)
-
- def test_recreate_list_output(self):
Re: UPDATE: php revamp
Theoretically, it's possible to include with the base package a script that, given a path, would inspect the PHP code there and provide a list of modules that should be enabled, based on the official list of modules (http://php.net/manual/en/funcref.php) and the functions/classes list for each. It won't be 100% reliable like C compilation/linking, but in practice it could be a rather working approach for most users. Even more theoretically, the base package could perform this operation semi-automatically, e.g. take the PHP code paths from the configs (though php could be started with alternative config via a cli param, but this is not the mainstream case), then check it, then install needed modules. *From:* Stuart Henderson *Sent:* Saturday, November 04, 2017 17:50 *To:* Martijn Van Duren *Cc:* Antoine Jacoutot, Tom Van Looy, Robert Nagy, Ports, Kirill Bychkov, Gonzalo L. Rodriguez, Marc Espie *Subject:* Re: UPDATE: php revamp On 2017/11/04 12:06, Martijn van Duren wrote: On 11/03/17 21:56, Marc Espie wrote:> See, this is exactly what I'm afraid of. run-time depends can be a bitch. The stuff still packages, and stays that way until somebody notices an issue... which often happens a few months after the commits, and sometimes even after release. This risk should be minimal, since I grepped through all the packages in-tree that contain a .php file on all the functions and classes that moved out of main. The problem is, people updating or importing any php-package need to do the same. And then it's harder than doing a bulk search at the tine of change. It's trickier than perl/python packages using modules, because there are no build time checks.
Re: borgbackup tweaks
On Sun, Nov 05 2017, Bjorn Ketelaars wrote: > On Sun 05/11/2017 00:50, Jeremie Courreges-Anglas wrote: >> >> Hi, >> >> Minor tweaks for borgbackup. lang/python/3.6 now provides a python3 >> symlink, so the patch shouldn't be needed. >> >> ok? > > Makefile needs some attention as well. See diff below. Duh, indeed. Committed, thanks. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
