Re: update youtube-dl 2019.06.08
Björn Ketelaars writes: > On Mon 17/06/2019 19:50, Nam Nguyen wrote: >> The generated PLIST has four lines of the form: >> -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ >> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ >> >> I had to manually intervene in the generated PLIST and remove the >> leading ${MODPY_COMMENT} to keep it the same as the older PLIST. This >> seems safe, given targeting only python 3 and given port-modules(5): >> >> "The python module defines variables to allow a single PLIST to be used >> for both versions. Generate or update the PLIST using the python3 >> FLAVOR, then edit it to prefix any lines creating MODPY_PYCACHE >> directories with MODPY_COMMENT." > > I trust update-plist to do the right thing, and would keep the > ${MODPY_COMMENT}-bits in. It doesn't seem to do any harm. That said, > removing these bits also doesn't do any harm. > > Tested the port by grabbing content from a couple of websites other than > youtube. Works for me. > > OK bket@ This is an updated diff with generated PLIST as suggested. Index: Makefile === RCS file: /cvs/ports/www/youtube-dl/Makefile,v retrieving revision 1.188 diff -u -r1.188 Makefile --- Makefile14 May 2019 15:03:52 - 1.188 +++ Makefile18 Jun 2019 05:44:25 - @@ -2,7 +2,7 @@ COMMENT = CLI program to download videos from YouTube and other sites -VERSION = 2019.05.11 +VERSION = 2019.06.08 MODPY_EGG_VERSION =${VERSION:S/.0/./g} DISTNAME = youtube-dl-${VERSION} Index: distinfo === RCS file: /cvs/ports/www/youtube-dl/distinfo,v retrieving revision 1.173 diff -u -r1.173 distinfo --- distinfo14 May 2019 15:03:52 - 1.173 +++ distinfo18 Jun 2019 05:44:25 - @@ -1,2 +1,2 @@ -SHA256 (youtube-dl-2019.05.11.tar.gz) = QSYiGmVnwceN+p2au/NAvF6xPkCWOvylFQ5y3J4UR/g= -SIZE (youtube-dl-2019.05.11.tar.gz) = 3167002 +SHA256 (youtube-dl-2019.06.08.tar.gz) = J1qFBuzWxyWJv8ZrdJzYCEfnOT3x1uG+zR0RupCYCDc= +SIZE (youtube-dl-2019.06.08.tar.gz) = 3169571 Index: pkg/PLIST === RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v retrieving revision 1.126 diff -u -r1.126 PLIST --- pkg/PLIST 14 May 2019 15:03:52 - 1.126 +++ pkg/PLIST 18 Jun 2019 05:44:25 - @@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages/youtube_dl/YoutubeDL.py lib/python${MODPY_VERSION}/site-packages/youtube_dl/__init__.py lib/python${MODPY_VERSION}/site-packages/youtube_dl/__main__.py -lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}YoutubeDL.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc @@ -29,7 +29,7 @@ lib/python${MODPY_VERSION}/site-packages/youtube_dl/compat.py lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/ lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/__init__.py -lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}dash.${MODPY_PYC_MAGIC_TAG}pyc @@ -53,7 +53,7 @@ lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/rtsp.py lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/__init__.py -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}abcnews.${MODPY_PYC_MAGIC_TAG}pyc @@ -179,7 +179,6 @@ lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}coub.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cracked.${MODPY_PYC_MAGIC_TAG}pyc
UPDATE: devel/py-html5lib
Hi, this updates py-html5lib to 1.0.1. Works fine with www/buku on amd64. OK? Index: Makefile === RCS file: /cvs/ports/devel/py-html5lib/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile15 May 2019 12:04:36 - 1.18 +++ Makefile18 Jun 2019 05:06:09 - @@ -2,11 +2,10 @@ COMMENT= HTML parser/tokeniser based for HTML5 -MODPY_EGG_VERSION= 0.9 +MODPY_EGG_VERSION= 1.0.1 DISTNAME= html5lib-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} CATEGORIES=devel www textproc -REVISION= 1 HOMEPAGE= https://github.com/html5lib/html5lib-python/ Index: distinfo === RCS file: /cvs/ports/devel/py-html5lib/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo28 Jun 2017 18:02:23 - 1.4 +++ distinfo18 Jun 2019 05:06:09 - @@ -1,2 +1,2 @@ -SHA256 (html5lib-0.9.tar.gz) = 7nR8D/0wKNJyIGGTa1xl7k/hPI5GE1GbREcSP8RUYpg= -SIZE (html5lib-0.9.tar.gz) = 245488 +SHA256 (html5lib-1.0.1.tar.gz) = ZssNz9u8T5w7oaY/21Ef/b1PUTsrbYG4DNJs5rP7NzY= +SIZE (html5lib-1.0.1.tar.gz) = 252959
Re: update youtube-dl 2019.06.08
On Mon 17/06/2019 19:50, Nam Nguyen wrote: > This is a diff to update youtube-dl to 2019.06.08. > > Release notes: > https://github.com/ytdl-org/youtube-dl/releases/tag/2019.06.08 > > Tested on amd64 with youtube using mpv. > > The same number of tests fail. (I ran tests on two different computers > so ignore the duration.) > > old version: > Ran 2386 tests in 199.938s > > FAILED (errors=44) > > latest version: > Ran 2380 tests in 120.676s > > FAILED (errors=44) > > The generated PLIST has four lines of the form: > -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ > > I had to manually intervene in the generated PLIST and remove the > leading ${MODPY_COMMENT} to keep it the same as the older PLIST. This > seems safe, given targeting only python 3 and given port-modules(5): > > "The python module defines variables to allow a single PLIST to be used > for both versions. Generate or update the PLIST using the python3 > FLAVOR, then edit it to prefix any lines creating MODPY_PYCACHE > directories with MODPY_COMMENT." I trust update-plist to do the right thing, and would keep the ${MODPY_COMMENT}-bits in. It doesn't seem to do any harm. That said, removing these bits also doesn't do any harm. Tested the port by grabbing content from a couple of websites other than youtube. Works for me. OK bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/06/17 22:13:54 Modified files: devel/git-cola : Makefile distinfo devel/git-cola/pkg: PLIST Log message: Update to git-cola-3.4. Changelog can be found at https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst
update youtube-dl 2019.06.08
This is a diff to update youtube-dl to 2019.06.08. Release notes: https://github.com/ytdl-org/youtube-dl/releases/tag/2019.06.08 Tested on amd64 with youtube using mpv. The same number of tests fail. (I ran tests on two different computers so ignore the duration.) old version: Ran 2386 tests in 199.938s FAILED (errors=44) latest version: Ran 2380 tests in 120.676s FAILED (errors=44) The generated PLIST has four lines of the form: -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/ I had to manually intervene in the generated PLIST and remove the leading ${MODPY_COMMENT} to keep it the same as the older PLIST. This seems safe, given targeting only python 3 and given port-modules(5): "The python module defines variables to allow a single PLIST to be used for both versions. Generate or update the PLIST using the python3 FLAVOR, then edit it to prefix any lines creating MODPY_PYCACHE directories with MODPY_COMMENT." Index: Makefile === RCS file: /cvs/ports/www/youtube-dl/Makefile,v retrieving revision 1.188 diff -u -p -r1.188 Makefile --- Makefile14 May 2019 15:03:52 - 1.188 +++ Makefile18 Jun 2019 02:17:18 - @@ -2,7 +2,7 @@ COMMENT = CLI program to download videos from YouTube and other sites -VERSION = 2019.05.11 +VERSION = 2019.06.08 MODPY_EGG_VERSION =${VERSION:S/.0/./g} DISTNAME = youtube-dl-${VERSION} Index: distinfo === RCS file: /cvs/ports/www/youtube-dl/distinfo,v retrieving revision 1.173 diff -u -p -r1.173 distinfo --- distinfo14 May 2019 15:03:52 - 1.173 +++ distinfo18 Jun 2019 02:17:18 - @@ -1,2 +1,2 @@ -SHA256 (youtube-dl-2019.05.11.tar.gz) = QSYiGmVnwceN+p2au/NAvF6xPkCWOvylFQ5y3J4UR/g= -SIZE (youtube-dl-2019.05.11.tar.gz) = 3167002 +SHA256 (youtube-dl-2019.06.08.tar.gz) = J1qFBuzWxyWJv8ZrdJzYCEfnOT3x1uG+zR0RupCYCDc= +SIZE (youtube-dl-2019.06.08.tar.gz) = 3169571 Index: pkg/PLIST === RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v retrieving revision 1.126 diff -u -p -r1.126 PLIST --- pkg/PLIST 14 May 2019 15:03:52 - 1.126 +++ pkg/PLIST 18 Jun 2019 02:17:18 - @@ -179,7 +179,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}coub.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cracked.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crackle.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}criterion.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crooksandliars.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crunchyroll.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cspan.${MODPY_PYC_MAGIC_TAG}pyc @@ -476,7 +475,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}normalboots.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nosvideo.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nova.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}novamov.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nowness.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}noz.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}npo.${MODPY_PYC_MAGIC_TAG}pyc @@ -534,7 +532,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}popcorntv.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}porn91.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}porncom.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornflip.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornhd.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornhub.${MODPY_PYC_MAGIC_TAG}pyc
Re: [NEW] security/ghidra
Hi Lawrence, Thanks for working on this. Lawrence Teo writes: > Here is an updated diff now that Gradle has been imported. It doesn't build for me. cd /ptmp/pobj/ghidra-9.0.4/ghidra-Ghidra_9.0.4_build && /usr/bin/env -i PO= RTSDIR=3D"/ptmp/ports" LIBTOOL=3D"/usr/bin/libtool" CCACHE_DIR=3D/ptmp/po= bj/.ccache PATH=3D'/ptmp/pobj/ghidra-9.0.4/bin:/usr/bin:/bin:/usr/sbin:/s= bin:/usr/local/bin:/usr/X11R6/bin' PREFIX=3D'/usr/local' LOCALBASE=3D'/us= r/local' X11BASE=3D'/usr/X11R6' CFLAGS=3D'-O2 -pipe -g' TRUEPREFIX=3D'/u= sr/local' DESTDIR=3D'' HOME=3D'/ghidra-9.0.4_writes_to_HOME' COMPILER_VER= SION=3Dclang PICFLAG=3D"-fpic" BINGRP=3Dbin BINOWN=3Droot BINMODE=3D755 = NONBINMODE=3D644 DIRMODE=3D755 INSTALL_COPY=3D-c INSTALL_STRIP=3D MANGR= P=3Dbin MANOWN=3Droot MANMODE=3D644 BSD_INSTALL_PROGRAM=3D"/ptmp/pobj/ghid= ra-9.0.4/bin/install -c -m 755" BSD_INSTALL_SCRIPT=3D"/ptmp/pobj/ghidra-= 9.0.4/bin/install -c -m 755" BSD_INSTALL_DATA=3D"/ptmp/pobj/ghidra-9.0.4/= bin/install -c -m 644" BSD_INSTALL_MAN=3D"/ptmp/pobj/ghidra-9.0.4/bin/ins= tall -c -m 644" BSD_INSTALL_PROGRAM_DIR=3D"/ptmp/pobj/ghidra-9.0.4/bin/in= stall -d -m 755" BSD_INSTALL_SCRIPT_DIR=3D"/ptmp/pobj/ghidra-9.0.4/bin/in= stall -d -m 755" BSD_INSTALL_DATA_DIR=3D"/ptmp/pobj/ghidra-9.0.4/bin/inst= all -d -m 755" BSD_INSTALL_MAN_DIR=3D"/ptmp/pobj/ghidra-9.0.4/bin/install= -d -m 755" gradle -g /ptmp/pobj/ghidra-9.0.4/gradle --no-daemon -I /ptmp= /pobj/ghidra-9.0.4/repos.gradle yajswDevUnpack Welcome to Gradle 5.4.1! Here are the highlights of this release: - Run builds with JDK12 - New API for Incremental Tasks - Updates to native projects, including Swift 5 support For more details see https://docs.gradle.org/5.4.1/release-notes.html To honour the JVM settings for this build a new JVM will be forked. Please= consider using the daemon: https://docs.gradle.org/5.4.1/userguide/gradle= _daemon.html. Daemon will be stopped at the end of the build stopping after processing FAILURE: Build failed with an exception. * Where: Build file '/ptmp/pobj/ghidra-9.0.4/ghidra-Ghidra_9.0.4_build/Ghidra/Featu= res/Python/build.gradle' line: 28 * What went wrong: A problem occurred evaluating project ':Python'. > Could not resolve all files for configuration ':Python:jython'. > Could not resolve org.python:jython-standalone:2.7.1. Required by: project :Python > Could not resolve org.python:jython-standalone:2.7.1. > Could not get resource 'https://repo.maven.apache.org/maven2/or= g/python/jython-standalone/2.7.1/jython-standalone-2.7.1.pom'. > Could not GET 'https://repo.maven.apache.org/maven2/org/pyth= on/jython-standalone/2.7.1/jython-standalone-2.7.1.pom'. > repo.maven.apache.org: no address associated with name > Could not resolve org.python:jython-standalone:2.7.1. > Could not get resource 'https://jcenter.bintray.com/org/python/= jython-standalone/2.7.1/jython-standalone-2.7.1.pom'. > Could not GET 'https://jcenter.bintray.com/org/python/jython= -standalone/2.7.1/jython-standalone-2.7.1.pom'. > jcenter.bintray.com: no address associated with name * Try: Run with --stacktrace option to get the stack trace. Run with --info or --= debug option to get more log output. Run with --scan to get full insights. * Get more help at https://help.gradle.org BUILD FAILED in 1m 34s *** Error 1 in . (Makefile:85 'pre-build') -- = Anthony J. Bentley
Re: mldonkey: use custom build of OCaml 3.12
On Mon, 17 Jun 2019 21:59:57 +0100 Stuart Henderson wrote: > If people do want to keep this port in the tree, I'd suggest > rearranging things so that the changes are grouped together as much > as possible (separate CONFIGURE_ARGS+= / LIB_DEPENDS+= blocks) to > make it more obvious which are the parts for the compiler change and > make it easier to switch back to a system compiler when upstream > updates it. > > Really not sure about the value of having early 2000's pirac^W file > sharing software in OpenBSD ports though ... I would be ok with removing it, too. Anyone else we should ask before killing it? -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1 pgpkSazC4uzG0.pgp Description: OpenPGP digital signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/06/17 16:30:49 Modified files: textproc/py-natsort: Makefile Log message: Changes to allow py-natsort tests to work completely. Added TEST_DEPENDS, MODPY_PYTEST, and changed PERMIT_ line while here. OK jasper@ (maintainer)
Re: [UPDATE] www/honk
Update to v0.7.0 - codename Father Mother Maiden Crone Honker Bonker Zonker Changelog: +++ Auto fetching and inlining of hoots. ++ A new xzone to view and import data not otherwise visible. ++ Preview before honking. ++ Some extra commands for better database retention management. ++ A changelog. + Default robots.txt. + Misc UI touchups. + Read only support for qonks. + About page. + More reliable (retries) meta messages such as follow requests. + Better thread support for missing context. + Upgrade image library for cleaner screenshots. + Not all summaries need labels. + Add max-width for video tag. On 6/14/19, Aaron Bieber wrote: > On Wed, 12 Jun 2019 at 22:53:45 -0400, Horia Racoviceanu wrote: >> - bump REVISION >> - change PERMIT_PACKAGE_CDROM to PERMIT_PACKAGE >> - change user _honk home directory mode, no longer group writable >> - update README, add icon and favicon > > Tests fine here! OK abieber@ if anyone wants to commit. > > -- > PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 > ADCE > Index: Makefile === RCS file: /cvs/ports/www/honk/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile4 Jun 2019 02:41:49 - 1.6 +++ Makefile17 Jun 2019 22:12:20 - @@ -2,13 +2,13 @@ COMMENT = federated status updater -DISTNAME = honk-0.6.0 +DISTNAME = honk-0.7.0 CATEGORIES = www HOMEPAGE = https://humungus.tedunangst.com/r/honk # ISC -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE = Yes WANTLIB += c pthread sqlite3 Index: distinfo === RCS file: /cvs/ports/www/honk/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo4 Jun 2019 02:41:49 - 1.4 +++ distinfo17 Jun 2019 22:12:20 - @@ -1,2 +1,2 @@ -SHA256 (honk-0.6.0.tgz) = OjBaohbkm8Y/i1RawsOG/qF7dQluuKIGxvnApf+gwGE= -SIZE (honk-0.6.0.tgz) = 166970 +SHA256 (honk-0.7.0.tgz) = O9DLHXEGo6Ws+In7u1tdHwj690tyejst50oDiNSmfoU= +SIZE (honk-0.7.0.tgz) = 178891 Index: pkg/PLIST === RCS file: /cvs/ports/www/honk/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 4 Jun 2019 02:41:50 - 1.3 +++ pkg/PLIST 17 Jun 2019 22:12:20 - @@ -5,24 +5,23 @@ @bin bin/honk share/doc/honk/ share/doc/honk/README +share/doc/honk/changelog.txt share/doc/honk/manual.txt share/doc/honk/ping.txt share/doc/honk/security.txt share/doc/honk/spec.txt share/doc/pkg-readmes/${PKGSTEM} -@mode 770 +@mode 750 @owner _honk @group _honk @sample ${VARBASE}/honk/ -@mode 750 @sample ${VARBASE}/honk/views/ -@mode -@owner -@group share/examples/honk/ share/examples/honk/schema.sql @sample ${VARBASE}/honk/schema.sql share/examples/honk/views/ +share/examples/honk/views/about.html +@sample ${VARBASE}/honk/views/about.html share/examples/honk/views/account.html @sample ${VARBASE}/honk/views/account.html share/examples/honk/views/combos.html @@ -41,5 +40,7 @@ share/examples/honk/views/login.html @sample ${VARBASE}/honk/views/login.html share/examples/honk/views/style.css @sample ${VARBASE}/honk/views/style.css +share/examples/honk/views/xzone.html +@sample ${VARBASE}/honk/views/xzone.html share/examples/honk/views/zonkers.html @sample ${VARBASE}/honk/views/zonkers.html Index: pkg/README === RCS file: /cvs/ports/www/honk/pkg/README,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 README --- pkg/README 30 Apr 2019 07:58:17 - 1.1.1.1 +++ pkg/README 17 Jun 2019 22:12:20 - @@ -15,11 +15,18 @@ acme-client(1) # acme-client.conf(5) domain honk.example.com { domain key "/etc/ssl/private/honk.example.com.key" - domain certificate "/etc/ssl/honk.example.com.crt" domain full chain certificate "/etc/ssl/honk.example.com.fullchain.pem" sign with letsencrypt } +Icon and favicon + + +honk# mkdir /var/www/htdocs/honk +honk# ftp -o /var/www/htdocs/honk/icon.png https://honk.tedunangst.com/icon.png +honk# ftp -o /var/www/htdocs/honk/favicon.ico \ + https://honk.tedunangst.com/favicon.ico + httpd(8) @@ -30,6 +37,9 @@ server "honk.example.com" { root "/acme" request strip 2 } + location "/*icon.*" { +root "/htdocs/honk" + } location "*" { block return 302 "https://honk.example.com$REQUEST_URI; } @@ -37,7 +47,7 @@ server "honk.example.com" { honk# rcctl enable httpd honk# rcctl start httpd -honk# acme-client -ADv honk.example.com +honk# acme-client -v honk.example.com relayd(8) - @@ -55,6 +65,8 @@ http protocol https { value "$SERVER_ADDR:$SERVER_PORT" match request header set "Connection" value "close" + match request path "/*icon.*" forward to + tcp { sack, backlog 128 } } @@ -63,6 +75,7 @@ relay wwwtls {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/06/17 15:33:45 Modified files: devel/include-what-you-use: Makefile devel/include-what-you-use/pkg: PLIST Log message: Ship docs, use Python 3, enable tests, drop libexecinfo dependency libexecinfo is not used at all and Python is merely a RUN_DEPENDS. Use TLS and derive PKGNAME from DISTNAME while here. Documentation input ingo WANTLIB help and OK sthen
Re: mldonkey: use custom build of OCaml 3.12
> On Jun 17, 2019, at 5:18 PM, Anil Madhavapeddy wrote: > >> On 17 Jun 2019, at 20:35, Stuart Henderson wrote: >> >>> On 2019/06/17 21:20, Christopher Zimmermann wrote: >>> Hi, >>> >>> Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. >>> Its build system has the option to build against a private build of >>> OCaml 3.12 and a copy of lablgtk. >>> I adapted the port to use this option and therefore get rid of the >>> dependency on a system wide OCaml installation. >>> Tested to build and start up on amd64. >>> Not tested on bytecode-only archs. >>> >>> Is this the way to go? OK to commit? >>> Is this port still in use? >>> >>> Christopher >> >> My vote would be for rm.. > > I have changed my mind after thinking about it a bit. There have been > _so_ many bugfixes in OCaml since 3.12 that it's probably unsafe to > ship a 3.12 runtime with a modern release of OpenBSD. > > I'd vote for disabling the port (in the hope of a 4.08.0 future port) rather > than regressing to an OCaml 3.12.1 build with those potential unsafe > bugs baked into a statically linked binary. > > Anil > No objection to rm from me. :-) Ken
Re: mldonkey: use custom build of OCaml 3.12
On 17 Jun 2019, at 20:35, Stuart Henderson wrote: > > On 2019/06/17 21:20, Christopher Zimmermann wrote: >> Hi, >> >> Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. >> Its build system has the option to build against a private build of >> OCaml 3.12 and a copy of lablgtk. >> I adapted the port to use this option and therefore get rid of the >> dependency on a system wide OCaml installation. >> Tested to build and start up on amd64. >> Not tested on bytecode-only archs. >> >> Is this the way to go? OK to commit? >> Is this port still in use? >> >> Christopher > > My vote would be for rm.. I have changed my mind after thinking about it a bit. There have been _so_ many bugfixes in OCaml since 3.12 that it's probably unsafe to ship a 3.12 runtime with a modern release of OpenBSD. I'd vote for disabling the port (in the hope of a 4.08.0 future port) rather than regressing to an OCaml 3.12.1 build with those potential unsafe bugs baked into a statically linked binary. Anil
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/06/17 15:11:43 Modified files: devel/p5-forks : Makefile Added files: devel/p5-forks/patches: patch-lib_forks_pm Log message: Use version(3p) for comparing Perl module versions. Hint and OK sthen
Re: p5-forks: use version(3p)
On 2019/06/17 23:02, Klemens Nanni wrote: > On Mon, Jun 10, 2019 at 03:03:30PM +0200, Klemens Nanni wrote: > > Some Perl module versions in base use non-numerical version strings, but > > forks.pm assumes numerical values. > > > > Thanks to sthen for pointing at version(3p) here's a patch to fix it? > > > > This lets me use p5-forks in my upcoming Slic3r port. > > > > OK? > Ping. OK. Thanks for re-inlining the diff rather than just relying on the quote :)
xwallpaper update
Minor update. (I'm somewhat responsible for the new features). okay ? Index: Makefile === RCS file: /cvs/ports/x11/xwallpaper/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile10 May 2019 04:59:49 - 1.12 +++ Makefile17 Jun 2019 20:59:35 - @@ -2,7 +2,7 @@ COMMENT = wallpaper setting utility for X -V =0.5.0 +V =0.6.0 DISTNAME = xwallpaper-${V} CATEGORIES = x11 graphics Index: distinfo === RCS file: /cvs/ports/x11/xwallpaper/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo10 May 2019 04:59:49 - 1.8 +++ distinfo17 Jun 2019 20:59:35 - @@ -1,2 +1,2 @@ -SHA256 (xwallpaper-0.5.0_1.tar.xz) = xb2SZT1c8KKaJ8C20Zl6OqLdYtbe8alAOAUm/MMBnAw= -SIZE (xwallpaper-0.5.0_1.tar.xz) = 81000 +SHA256 (xwallpaper-0.6.0_1.tar.xz) = UIx36bYpwcjmS5G7CMlkKj34UpyUxhkZuIsyVzZzfDc= +SIZE (xwallpaper-0.6.0_1.tar.xz) = 82100
Re: p5-forks: use version(3p)
On Mon, Jun 10, 2019 at 03:03:30PM +0200, Klemens Nanni wrote: > Some Perl module versions in base use non-numerical version strings, but > forks.pm assumes numerical values. > > Thanks to sthen for pointing at version(3p) here's a patch to fix it? > > This lets me use p5-forks in my upcoming Slic3r port. > > OK? Ping. Index: Makefile === RCS file: /cvs/ports/devel/p5-forks/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile12 May 2019 22:25:45 - 1.1.1.1 +++ Makefile17 Jun 2019 21:02:16 - @@ -3,6 +3,7 @@ COMMENT = forks - emulate threads with fork DISTNAME = forks-0.36 +REVISION = 0 CATEGORIES = devel Index: patches/patch-lib_forks_pm === RCS file: patches/patch-lib_forks_pm diff -N patches/patch-lib_forks_pm --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_forks_pm 17 Jun 2019 21:02:16 - @@ -0,0 +1,26 @@ +$OpenBSD$ + +Argument "3.08_01" isn't numeric in numeric ge (>=) at /usr/local/libdata/perl5/site_perl/amd64-openbsd/forks.pm line 1570. + +Index: lib/forks.pm +--- lib/forks.pm.orig lib/forks.pm +@@ -44,6 +44,7 @@ use strict; + use warnings; + use warnings::register; + use Carp (); ++use version; + + #--- + # Set when to execute check and end blocks +@@ -1567,8 +1568,8 @@ sub _server { + + # Localize Storable variables to allow CODE refs, if using Storable >= 2.05 + +-local $Storable::Deparse = 1 if $Storable::VERSION >= 2.05; +-local $Storable::Eval = 1 if $Storable::VERSION >= 2.05; ++local $Storable::Deparse = 1 if version->parse($Storable::VERSION) >= version->parse(2.05); ++local $Storable::Eval = 1 if version->parse($Storable::VERSION) >= version->parse(2.05); + + # Initialize the number of polls + # While we're running in the main dispatch loop
Re: include-what-you-use: ship docs, use python 3, other nits
On Wed, Jun 12, 2019 at 06:28:13PM +0100, Stuart Henderson wrote: > I think it's correct to remove those extras. > > libexecinfo is an extra specially annoying case because many ports are only > prepared to deal with Linux (execinfo.h header but the backtrace functions are > in libc). I'm not sure where it originally came from in the i-w-y-u port but > reviewing the source/build infrastructure there is nothing that uses it, so > we are ok to remove this from the port too (LIB_DEPENDS as well as the > WANTLIB). Thanks for working this out. Updated diff below stripping WANTLIB and LIB_DEPENDS, the README is now installed besides the rest of the documentation. OK? Index: Makefile === RCS file: /cvs/ports/devel/include-what-you-use/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile16 Feb 2019 12:06:23 - 1.15 +++ Makefile17 Jun 2019 20:56:03 - @@ -3,28 +3,38 @@ COMMENT= tool to analyse \#includes in C and C++ source files CATEGORIES=devel DISTNAME= include-what-you-use-0.11.src -PKGNAME= include-what-you-use-0.11 -REVISION= 0 +PKGNAME= ${DISTNAME:.src=} +REVISION= 1 -HOMEPAGE= http://include-what-you-use.org +HOMEPAGE= https://include-what-you-use.org MASTER_SITES= ${HOMEPAGE}/downloads/ WRKDIST= ${WRKDIR}/include-what-you-use MAINTAINER=Jonathan Gray # BSD -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE=Yes -WANTLIB= c curses execinfo form m pthread z +WANTLIB= ${COMPILER_LIBCXX} c m pthread LLVM_V=7.0.1 BUILD_DEPENDS= devel/llvm>=${LLVM_V} RUN_DEPENDS= devel/llvm>=${LLVM_V} -LIB_DEPENDS= devel/libexecinfo MODULES= devel/cmake lang/python +MODPY_BUILDDEP=No +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} +MODPY_ADJ_FILES= *.py + COMPILER= base-clang ports-gcc COMPILER_LANGS=c++ -MODPY_ADJ_FILES = fix_includes.py iwyu_tool.py +DOCDIR=${PREFIX}/share/doc/include-what-you-use + +do-test: + cd ${WRKSRC} && ./run_iwyu_tests.py + +post-install: + ${INSTALL_DATA_DIR} ${DOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/docs/* ${DOCDIR}/ .include Index: pkg/PLIST === RCS file: /cvs/ports/devel/include-what-you-use/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 1 Jan 2017 06:58:37 - 1.2 +++ pkg/PLIST 13 Jun 2019 23:21:13 - @@ -2,9 +2,20 @@ bin/fix_includes.py @bin bin/include-what-you-use bin/iwyu_tool.py +share/doc/include-what-you-use/ +share/doc/include-what-you-use/IWYUMappings.md +share/doc/include-what-you-use/IWYUPragmas.md +share/doc/include-what-you-use/README.md +share/doc/include-what-you-use/WhatIsAUse.md +share/doc/include-what-you-use/WhyIWYU.md +share/doc/include-what-you-use/WhyIWYUIsDifficult.md share/include-what-you-use/ +share/include-what-you-use/boost-1.64-all-private.imp +share/include-what-you-use/boost-1.64-all.imp share/include-what-you-use/boost-all-private.imp share/include-what-you-use/boost-all.imp +share/include-what-you-use/clang-6.intrinsics.imp +share/include-what-you-use/gcc-8.intrinsics.imp share/include-what-you-use/gcc.libc.imp share/include-what-you-use/gcc.stl.headers.imp share/include-what-you-use/gcc.symbols.imp
Re: mldonkey: use custom build of OCaml 3.12
If people do want to keep this port in the tree, I'd suggest rearranging things so that the changes are grouped together as much as possible (separate CONFIGURE_ARGS+= / LIB_DEPENDS+= blocks) to make it more obvious which are the parts for the compiler change and make it easier to switch back to a system compiler when upstream updates it. Really not sure about the value of having early 2000's pirac^W file sharing software in OpenBSD ports though ... On 2019/06/17 16:24, Kenneth R Westerback wrote: > On Mon, Jun 17, 2019 at 09:20:09PM +0200, Christopher Zimmermann wrote: > > Hi, > > > > Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. > > Its build system has the option to build against a private build of > > OCaml 3.12 and a copy of lablgtk. > > I adapted the port to use this option and therefore get rid of the > > dependency on a system wide OCaml installation. > > Tested to build and start up on amd64. > > Not tested on bytecode-only archs. > > > > Is this the way to go? OK to commit? > > Is this port still in use? > > > > Christopher > > I have never used mldonkey, but I have no objection to this approach. > > Ken > > > > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/net/mldonkey/Makefile,v > > retrieving revision 1.30 > > diff -u -p -r1.30 Makefile > > --- Makefile20 May 2019 22:15:19 - 1.30 > > +++ Makefile17 Jun 2019 19:07:35 - > > @@ -21,13 +21,21 @@ WANTLIB += pthread rsvg-2 ${COMPILER_LIB > > > > COMPILER = base-clang ports-gcc base-gcc > > > > -MASTER_SITES = > > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > > +MASTER_SITES0 = > > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > > +MASTER_SITES1 =http://caml.inria.fr/pub/distrib/ocaml-3.12/ > > +MASTER_SITES2 = > > http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/ > > > > +OCAML_SRC =ocaml-3.12.0.tar.gz > > +LAMLGTK_SRC = lablgtk-2.14.2.tar.gz > > EXTRACT_SUFX = .tar.bz2 > > +DISTFILES =${DISTNAME}${EXTRACT_SUFX}:0 ${OCAML_SRC}:1 > > ${LAMLGTK_SRC}:2 > > + > > > > CONFIGURE_STYLE = gnu > > CONFIGURE_ARGS += --enable-gui=newgui2 \ > > - --enable-upnp-natpmp > > + --enable-upnp-natpmp \ > > + --enable-force-ocaml \ > > + --enable-batch > > CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ > > LDFLAGS='${LDFLAGS}' \ > > ac_cv_prog_RPMBUILD="" \ > > @@ -44,8 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/con > > WRKCONF = ${WRKSRC}/config > > > > USE_GMAKE =Yes > > -MODULES = lang/ocaml > > -BUILD_DEPENDS =lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > > +#MODULES = lang/ocaml > > +#BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > > LIB_DEPENDS = archivers/bzip2 \ > > devel/gettext,-runtime \ > > devel/libmagic \ > > @@ -53,6 +61,7 @@ LIB_DEPENDS = archivers/bzip2 \ > > net/miniupnp/libnatpmp \ > > net/miniupnp/miniupnpc>=1.9 \ > > x11/gnome/librsvg \ > > + devel/libglade2 \ > > x11/gtk+2 > > > > ALL_TARGET = depend all > > @@ -67,6 +76,11 @@ FAKE_FLAGS = OCAML_NATIVE=no > > NO_TEST = Yes > > > > .include > > + > > +post-extract: > > + ln -s ${FULLDISTDIR}/${OCAML_SRC} ${WRKSRC}/patches > > + ln -s ${FULLDISTDIR}/${LAMLGTK_SRC} ${WRKSRC}/patches > > + > > pre-patch: > > @cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f` > > > > Index: distinfo > > === > > RCS file: /cvs/ports/net/mldonkey/distinfo,v > > retrieving revision 1.6 > > diff -u -p -r1.6 distinfo > > --- distinfo17 Aug 2017 10:06:12 - 1.6 > > +++ distinfo17 Jun 2019 19:07:35 - > > @@ -1,2 +1,6 @@ > > +SHA256 (lablgtk-2.14.2.tar.gz) = > > SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= > > SHA256 (mldonkey-3.1.6.tar.bz2) = > > Gza1fAWoPC42PAhb+OgGMIhMbJLs3v/BrV4cOamOBD0= > > +SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks= > > +SIZE (lablgtk-2.14.2.tar.gz) = 779803 > > SIZE (mldonkey-3.1.6.tar.bz2) = 2886916 > > +SIZE (ocaml-3.12.0.tar.gz) = 3271024 > > Index: patches/patch-config_Makefile_in > > === > > RCS file: /cvs/ports/net/mldonkey/patches/patch-config_Makefile_in,v > > retrieving revision 1.6 > > diff -u -p -r1.6 patch-config_Makefile_in > > --- patches/patch-config_Makefile_in4 Mar 2019 12:51:16 - > > 1.6 > > +++ patches/patch-config_Makefile_in17 Jun 2019 19:07:35 - > > @@ -2,34 +2,6 @@ $OpenBSD: patch-config_Makefile_in,v 1.6 > > Index: config/Makefile.in > > ---
Re: mldonkey: use custom build of OCaml 3.12
I think this approach is fine for this particular package, since upstream lags in recent times. The opam package for mldonkey is on ocaml<4.06, but I'm CCing the current maintainer Ygrek in case there is a 4.08 port in the offing. cheers, Anil > On 17 Jun 2019, at 20:20, Christopher Zimmermann wrote: > > Hi, > > Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. > Its build system has the option to build against a private build of > OCaml 3.12 and a copy of lablgtk. > I adapted the port to use this option and therefore get rid of the > dependency on a system wide OCaml installation. > Tested to build and start up on amd64. > Not tested on bytecode-only archs. > > Is this the way to go? OK to commit? > Is this port still in use? > > Christopher > > > > Index: Makefile > === > RCS file: /cvs/ports/net/mldonkey/Makefile,v > retrieving revision 1.30 > diff -u -p -r1.30 Makefile > --- Makefile 20 May 2019 22:15:19 - 1.30 > +++ Makefile 17 Jun 2019 19:07:35 - > @@ -21,13 +21,21 @@ WANTLIB += pthread rsvg-2 ${COMPILER_LIB > > COMPILER =base-clang ports-gcc base-gcc > > -MASTER_SITES = > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > +MASTER_SITES0 = > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > +MASTER_SITES1 = http://caml.inria.fr/pub/distrib/ocaml-3.12/ > +MASTER_SITES2 = > http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/ > > +OCAML_SRC = ocaml-3.12.0.tar.gz > +LAMLGTK_SRC =lablgtk-2.14.2.tar.gz > EXTRACT_SUFX =.tar.bz2 > +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}:0 ${OCAML_SRC}:1 ${LAMLGTK_SRC}:2 > + > > CONFIGURE_STYLE = gnu > CONFIGURE_ARGS += --enable-gui=newgui2 \ > - --enable-upnp-natpmp > + --enable-upnp-natpmp \ > + --enable-force-ocaml \ > + --enable-batch > CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ > LDFLAGS='${LDFLAGS}' \ > ac_cv_prog_RPMBUILD="" \ > @@ -44,8 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/con > WRKCONF = ${WRKSRC}/config > > USE_GMAKE = Yes > -MODULES =lang/ocaml > -BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > +#MODULES = lang/ocaml > +#BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > LIB_DEPENDS = archivers/bzip2 \ > devel/gettext,-runtime \ > devel/libmagic \ > @@ -53,6 +61,7 @@ LIB_DEPENDS = archivers/bzip2 \ > net/miniupnp/libnatpmp \ > net/miniupnp/miniupnpc>=1.9 \ > x11/gnome/librsvg \ > + devel/libglade2 \ > x11/gtk+2 > > ALL_TARGET = depend all > @@ -67,6 +76,11 @@ FAKE_FLAGS = OCAML_NATIVE=no > NO_TEST = Yes > > .include > + > +post-extract: > + ln -s ${FULLDISTDIR}/${OCAML_SRC} ${WRKSRC}/patches > + ln -s ${FULLDISTDIR}/${LAMLGTK_SRC} ${WRKSRC}/patches > + > pre-patch: > @cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f` > > Index: distinfo > === > RCS file: /cvs/ports/net/mldonkey/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 17 Aug 2017 10:06:12 - 1.6 > +++ distinfo 17 Jun 2019 19:07:35 - > @@ -1,2 +1,6 @@ > +SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= > SHA256 (mldonkey-3.1.6.tar.bz2) = Gza1fAWoPC42PAhb+OgGMIhMbJLs3v/BrV4cOamOBD0= > +SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks= > +SIZE (lablgtk-2.14.2.tar.gz) = 779803 > SIZE (mldonkey-3.1.6.tar.bz2) = 2886916 > +SIZE (ocaml-3.12.0.tar.gz) = 3271024 > Index: patches/patch-config_Makefile_in > === > RCS file: /cvs/ports/net/mldonkey/patches/patch-config_Makefile_in,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-config_Makefile_in > --- patches/patch-config_Makefile_in 4 Mar 2019 12:51:16 - 1.6 > +++ patches/patch-config_Makefile_in 17 Jun 2019 19:07:35 - > @@ -2,34 +2,6 @@ $OpenBSD: patch-config_Makefile_in,v 1.6 > Index: config/Makefile.in > --- config/Makefile.in.orig > +++ config/Makefile.in > -@@ -13,6 +13,9 @@ changequote([[, ]]) > - > - include config/Makefile.config > - > -+OCAMLC:=$(OCAMLC) -unsafe-string > -+OCAMLOPT:=$(OCAMLOPT) -unsafe-string > -+ > - ifneq ("$(GLIBC_VERSION)" , "") > - GLIBC_VERSION_ARCH = "_glibc-"$(GLIBC_VERSION) > - endif > -@@ -93,7 +96,7 @@ SRC_FILETP=src/networks/fileTP > - SUBDIRS=$(EXTLIB) $(CDK) $(BITSTRING) $(LIB) $(RSS) $(XML) $(NET) tools \ > -$(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES) > - > --INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4 > -+INCLUDES += $(foreach file, $(SUBDIRS),
Re: mldonkey: use custom build of OCaml 3.12
On Mon, Jun 17, 2019 at 09:20:09PM +0200, Christopher Zimmermann wrote: > Hi, > > Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. > Its build system has the option to build against a private build of > OCaml 3.12 and a copy of lablgtk. > I adapted the port to use this option and therefore get rid of the > dependency on a system wide OCaml installation. > Tested to build and start up on amd64. > Not tested on bytecode-only archs. > > Is this the way to go? OK to commit? > Is this port still in use? > > Christopher I have never used mldonkey, but I have no objection to this approach. Ken > > > > Index: Makefile > === > RCS file: /cvs/ports/net/mldonkey/Makefile,v > retrieving revision 1.30 > diff -u -p -r1.30 Makefile > --- Makefile 20 May 2019 22:15:19 - 1.30 > +++ Makefile 17 Jun 2019 19:07:35 - > @@ -21,13 +21,21 @@ WANTLIB += pthread rsvg-2 ${COMPILER_LIB > > COMPILER = base-clang ports-gcc base-gcc > > -MASTER_SITES = > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > +MASTER_SITES0 = > https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ > +MASTER_SITES1 = http://caml.inria.fr/pub/distrib/ocaml-3.12/ > +MASTER_SITES2 = > http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/ > > +OCAML_SRC = ocaml-3.12.0.tar.gz > +LAMLGTK_SRC =lablgtk-2.14.2.tar.gz > EXTRACT_SUFX = .tar.bz2 > +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}:0 ${OCAML_SRC}:1 ${LAMLGTK_SRC}:2 > + > > CONFIGURE_STYLE =gnu > CONFIGURE_ARGS +=--enable-gui=newgui2 \ > - --enable-upnp-natpmp > + --enable-upnp-natpmp \ > + --enable-force-ocaml \ > + --enable-batch > CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ > LDFLAGS='${LDFLAGS}' \ > ac_cv_prog_RPMBUILD="" \ > @@ -44,8 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/con > WRKCONF =${WRKSRC}/config > > USE_GMAKE = Yes > -MODULES =lang/ocaml > -BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > +#MODULES = lang/ocaml > +#BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num > LIB_DEPENDS =archivers/bzip2 \ > devel/gettext,-runtime \ > devel/libmagic \ > @@ -53,6 +61,7 @@ LIB_DEPENDS = archivers/bzip2 \ > net/miniupnp/libnatpmp \ > net/miniupnp/miniupnpc>=1.9 \ > x11/gnome/librsvg \ > + devel/libglade2 \ > x11/gtk+2 > > ALL_TARGET = depend all > @@ -67,6 +76,11 @@ FAKE_FLAGS = OCAML_NATIVE=no > NO_TEST =Yes > > .include > + > +post-extract: > + ln -s ${FULLDISTDIR}/${OCAML_SRC} ${WRKSRC}/patches > + ln -s ${FULLDISTDIR}/${LAMLGTK_SRC} ${WRKSRC}/patches > + > pre-patch: > @cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f` > > Index: distinfo > === > RCS file: /cvs/ports/net/mldonkey/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 17 Aug 2017 10:06:12 - 1.6 > +++ distinfo 17 Jun 2019 19:07:35 - > @@ -1,2 +1,6 @@ > +SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= > SHA256 (mldonkey-3.1.6.tar.bz2) = > Gza1fAWoPC42PAhb+OgGMIhMbJLs3v/BrV4cOamOBD0= > +SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks= > +SIZE (lablgtk-2.14.2.tar.gz) = 779803 > SIZE (mldonkey-3.1.6.tar.bz2) = 2886916 > +SIZE (ocaml-3.12.0.tar.gz) = 3271024 > Index: patches/patch-config_Makefile_in > === > RCS file: /cvs/ports/net/mldonkey/patches/patch-config_Makefile_in,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-config_Makefile_in > --- patches/patch-config_Makefile_in 4 Mar 2019 12:51:16 - 1.6 > +++ patches/patch-config_Makefile_in 17 Jun 2019 19:07:35 - > @@ -2,34 +2,6 @@ $OpenBSD: patch-config_Makefile_in,v 1.6 > Index: config/Makefile.in > --- config/Makefile.in.orig > +++ config/Makefile.in > -@@ -13,6 +13,9 @@ changequote([[, ]]) > - > - include config/Makefile.config > - > -+OCAMLC:=$(OCAMLC) -unsafe-string > -+OCAMLOPT:=$(OCAMLOPT) -unsafe-string > -+ > - ifneq ("$(GLIBC_VERSION)" , "") > - GLIBC_VERSION_ARCH = "_glibc-"$(GLIBC_VERSION) > - endif > -@@ -93,7 +96,7 @@ SRC_FILETP=src/networks/fileTP > - SUBDIRS=$(EXTLIB) $(CDK) $(BITSTRING) $(LIB) $(RSS) $(XML) $(NET) tools \ > -$(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES) > - > --INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4 > -+INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4 -I +num > - > - CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS) > - > -@@ -124,7 +127,7 @@
Re: mldonkey: use custom build of OCaml 3.12
On 2019/06/17 21:20, Christopher Zimmermann wrote: > Hi, > > Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. > Its build system has the option to build against a private build of > OCaml 3.12 and a copy of lablgtk. > I adapted the port to use this option and therefore get rid of the > dependency on a system wide OCaml installation. > Tested to build and start up on amd64. > Not tested on bytecode-only archs. > > Is this the way to go? OK to commit? > Is this port still in use? > > Christopher My vote would be for rm..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/06/17 13:23:40 Modified files: devel/jdk/11 : Makefile devel/jdk/11/patches: patch-src_java_base_unix_native_libjava_childproc_c Added files: devel/jdk/11/patches: patch-src_java_base_bsd_native_libjava_ProcessHandleImpl_bsd_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_h Log message: Upstream fixes: * Fix return value from closeDescriptors() * Emulate waitid(2) with kqueue(2)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2019/06/17 13:21:38 Modified files: devel/jdk/1.8 : Makefile devel/jdk/1.8/patches: patch-jdk_src_solaris_native_java_lang_childproc_c Log message: Fix return value from closeDescriptors().
mldonkey: use custom build of OCaml 3.12
Hi, Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml. Its build system has the option to build against a private build of OCaml 3.12 and a copy of lablgtk. I adapted the port to use this option and therefore get rid of the dependency on a system wide OCaml installation. Tested to build and start up on amd64. Not tested on bytecode-only archs. Is this the way to go? OK to commit? Is this port still in use? Christopher Index: Makefile === RCS file: /cvs/ports/net/mldonkey/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile20 May 2019 22:15:19 - 1.30 +++ Makefile17 Jun 2019 19:07:35 - @@ -21,13 +21,21 @@ WANTLIB += pthread rsvg-2 ${COMPILER_LIB COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES = https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ +MASTER_SITES0 = https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/ +MASTER_SITES1 =http://caml.inria.fr/pub/distrib/ocaml-3.12/ +MASTER_SITES2 = http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/ +OCAML_SRC =ocaml-3.12.0.tar.gz +LAMLGTK_SRC = lablgtk-2.14.2.tar.gz EXTRACT_SUFX = .tar.bz2 +DISTFILES =${DISTNAME}${EXTRACT_SUFX}:0 ${OCAML_SRC}:1 ${LAMLGTK_SRC}:2 + CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --enable-gui=newgui2 \ - --enable-upnp-natpmp + --enable-upnp-natpmp \ + --enable-force-ocaml \ + --enable-batch CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \ LDFLAGS='${LDFLAGS}' \ ac_cv_prog_RPMBUILD="" \ @@ -44,8 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/con WRKCONF = ${WRKSRC}/config USE_GMAKE =Yes -MODULES = lang/ocaml -BUILD_DEPENDS =lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num +#MODULES = lang/ocaml +#BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num LIB_DEPENDS = archivers/bzip2 \ devel/gettext,-runtime \ devel/libmagic \ @@ -53,6 +61,7 @@ LIB_DEPENDS = archivers/bzip2 \ net/miniupnp/libnatpmp \ net/miniupnp/miniupnpc>=1.9 \ x11/gnome/librsvg \ + devel/libglade2 \ x11/gtk+2 ALL_TARGET = depend all @@ -67,6 +76,11 @@ FAKE_FLAGS = OCAML_NATIVE=no NO_TEST = Yes .include + +post-extract: + ln -s ${FULLDISTDIR}/${OCAML_SRC} ${WRKSRC}/patches + ln -s ${FULLDISTDIR}/${LAMLGTK_SRC} ${WRKSRC}/patches + pre-patch: @cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f` Index: distinfo === RCS file: /cvs/ports/net/mldonkey/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo17 Aug 2017 10:06:12 - 1.6 +++ distinfo17 Jun 2019 19:07:35 - @@ -1,2 +1,6 @@ +SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= SHA256 (mldonkey-3.1.6.tar.bz2) = Gza1fAWoPC42PAhb+OgGMIhMbJLs3v/BrV4cOamOBD0= +SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks= +SIZE (lablgtk-2.14.2.tar.gz) = 779803 SIZE (mldonkey-3.1.6.tar.bz2) = 2886916 +SIZE (ocaml-3.12.0.tar.gz) = 3271024 Index: patches/patch-config_Makefile_in === RCS file: /cvs/ports/net/mldonkey/patches/patch-config_Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-config_Makefile_in --- patches/patch-config_Makefile_in4 Mar 2019 12:51:16 - 1.6 +++ patches/patch-config_Makefile_in17 Jun 2019 19:07:35 - @@ -2,34 +2,6 @@ $OpenBSD: patch-config_Makefile_in,v 1.6 Index: config/Makefile.in --- config/Makefile.in.orig +++ config/Makefile.in -@@ -13,6 +13,9 @@ changequote([[, ]]) - - include config/Makefile.config - -+OCAMLC:=$(OCAMLC) -unsafe-string -+OCAMLOPT:=$(OCAMLOPT) -unsafe-string -+ - ifneq ("$(GLIBC_VERSION)" , "") - GLIBC_VERSION_ARCH = "_glibc-"$(GLIBC_VERSION) - endif -@@ -93,7 +96,7 @@ SRC_FILETP=src/networks/fileTP - SUBDIRS=$(EXTLIB) $(CDK) $(BITSTRING) $(LIB) $(RSS) $(XML) $(NET) tools \ -$(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES) - --INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4 -+INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4 -I +num - - CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS) - -@@ -124,7 +127,7 @@ endif - - ### - --LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)" -+LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)" -I +num - - ifeq ("$(OS_FILES2)", "mingw") - LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32
Re: Sudden problems logging into websites
> There are two websites (a bank and a healthcare provider) that I can > access using Firefox ESR or Chromium on Linux (OpenSUSE Leap 15.0). > > But just starting a few weeks ago, I cannot log into these sites using > my OpenBSD 6.4 machine. I could log in last month, but I am not able to > log in now. I have tried both Firefox ESR and Iridium on OpenBSD. I've I'd like to report that this problem was solved when I upgraded to OpenBSD 6.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/06/17 11:11:38 Modified files: audio/speexdsp : Makefile distinfo Log message: update to 1.2.0 release; reminded by Brad
Re: print/poppler build failure
Matthias Kilian: > I'd like to drop the default FLAVOR?=no_qt5 bootstrap and also the > pseudo flavor bootstrap in the next update of poppler (poppler-0.77.0), > unless full bulk builders protest. > > BTW: is it really a problem if the default poppler build also needs > qt5 during bulk builds? I don't think it's a problem in bulk builds. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: New: DepotDownloader - downloader for Steam depots (i.e. games)
I left a TODO list in Makefile.. removed it (it was out of date anyway); otherwise no changes. New tarball without the TODO attached. *ping* ? On Sat, Jun 08, 2019 at 09:36:56PM -0700, Thomas Frohwein wrote: > Hi, > > I am pleased to offer this port as a solution for obtaining games > purchased on Steam without needing to boot into another OS. It was > discovered by anthk_ on the Freenode channel #openbsd-gaming and I > turned it into a port with a few quality-of-life enhancements in the > wrapper script. > > The port downloads the CIL assemblies and installs a wrapper script. > Building would require msbuild which don't have (yet). > > The wrapper script adds 2 modifications to make this more usable (until > they may be included into upstream): > > 1. add '-appname ' to download game by name instead of (numeric) >AppId > 2. install to ~/games/steamdepots/ unless `-dir` is specified >- this prevents installing in $PWD by default > > I've tested it with a few of my games (CometStriker, Salt and > Sanctuary, Cryptark, One Finger Death Punch) without problems. Note > that the appname needs to be in quotes/double-quotes; it may also work > with whitespace escaped. The assembly seems to assume "linux" as OS; > therefore if trying to download a game that is only distributed for > Windows, you need to add '-os windows'. > > More info in the README of the repo [1], including how to download > Steam Workshop items/mods (not tested by me). > > Of note, this works with the 2FA "SteamGuard" via email code. I don't > use the 2FA via the Steam mobile app and don't know if that also works. > Testing by someone who uses the Steam mobile app as the second factor > would be appreciated. > > ok? > > [1] https://github.com/SteamRE/DepotDownloader depotdownloader.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2019/06/17 07:52:54 Modified files: games/ioquake3 : Makefile distinfo games/ioquake3/pkg: PLIST Log message: Bump ioquake3 to 95b9cab4d644fa3bf757cfff821cc4f7d76e38b0 OK kirby@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/06/17 04:55:37 Modified files: infrastructure/lib/DPB/PortBuilder: Rebuild.pm Log message: changing ids and chrooting only happens during exec. turns out my setup has links so that dpb -R is happy in chroot's... and no ownership issue either. Fix it so it works. Also put the uptodate check earlier since that's internal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2019/06/17 03:39:44 Modified files: archivers/unzip: Makefile Log message: update HOMEPAGE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2019/06/17 03:12:37 Modified files: net/seafile: Makefile.inc net/seafile/client: Makefile distinfo net/seafile/seafile: distinfo Log message: update to deafile-7.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ra...@cvs.openbsd.org 2019/06/17 02:17:49 Modified files: audio/soundtouch: Makefile distinfo audio/soundtouch/patches: patch-Makefile_am patch-source_SoundStretch_Makefile_am patch-source_SoundTouch_Makefile_am Removed files: audio/soundtouch/patches: patch-configure_ac Log message: Update soundtouch to 2.1.2 Help and ok sthen@