CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/06/14 23:49:32 Modified files: geo/pygeoapi : Makefile distinfo geo/pygeoapi/pkg: PLIST Log message: Update to pygeoapi 0.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 22:11:02 Modified files: x11/kde-applications/kdenetwork-filesharing: Makefile Log message: Rename DISTNAME, unbreak build
[Update]devel/p5-IO-Pager: Update to 1.03
Hi, ports@:
Here is a patch for devel/p5-IO-Pager to update to 1.03.
It build well, only 1 test failed but not caused by this patch.
No other ports depends on devel/p5-IO-Pager.
Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-IO-Pager/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:44:57 - 1.20
+++ Makefile15 Jun 2020 02:51:43 -
@@ -4,7 +4,7 @@ COMMENT = select a pager if destination
MODULES = cpan
PKG_ARCH = *
-DISTNAME = IO-Pager-0.39
+DISTNAME = IO-Pager-1.03
CATEGORIES = devel
# Perl
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-IO-Pager/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo14 May 2017 19:54:42 - 1.10
+++ distinfo15 Jun 2020 02:51:43 -
@@ -1,2 +1,2 @@
-SHA256 (IO-Pager-0.39.tgz) = z9EmDj5t6a/zpHxR0CcpbD0eqjPYRHBm8q55CDhrVE8=
-SIZE (IO-Pager-0.39.tgz) = 17552
+SHA256 (IO-Pager-1.03.tgz) = rIZsDJOr4AY5KvwPCZNy4UHia/4HJD45QSWksfL0tY4=
+SIZE (IO-Pager-1.03.tgz) = 41635
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-IO-Pager/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 14 May 2017 19:54:42 - 1.2
+++ pkg/PLIST 15 Jun 2020 02:51:43 -
@@ -4,8 +4,13 @@ ${P5SITE}/IO/Pager/
${P5SITE}/IO/Pager.pm
${P5SITE}/IO/Pager/Buffered.pm
${P5SITE}/IO/Pager/Page.pm
+${P5SITE}/IO/Pager/Perl.pm
${P5SITE}/IO/Pager/Unbuffered.pm
+${P5SITE}/IO/Pager/less.pm
+${P5SITE}/IO/Pager/tp
@man man/man3p/IO::Pager.3p
@man man/man3p/IO::Pager::Buffered.3p
@man man/man3p/IO::Pager::Page.3p
+@man man/man3p/IO::Pager::Perl.3p
@man man/man3p/IO::Pager::Unbuffered.3p
+@man man/man3p/IO::Pager::less.3p
Re: [update] devel/p5-Test-Compile 2.3.1 -> 2.4.0
On Mon, Jun 08, 2020 at 07:35:27PM +0200, Charlene Wendling wrote:
> Hi,
>
> Here is an update for Test::Compile; the only change is to let the
> verbose mode being more verbose [0]
>
> I've tested consumers, and there are no new failures due to that update
> in mail/grepmail and mail/p5-Mail-Mbox-MessageParser.
>
>
> Comments/feedback are welcome,
OK afresh1@
>
>
> Charlène.
>
>
> [0]
> https://metacpan.org/diff/file?target=EGILES/Test-Compile-v2.4.0/=EGILES%2FTest-Compile-v2.3.1
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-Test-Compile/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile 24 Nov 2019 14:24:39 - 1.3
> +++ Makefile 8 Jun 2020 16:59:20 -
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.3 2019/11/24 14:24:39 cwen Exp $
>
> COMMENT =check whether Perl files compile correctly
> -DISTNAME = Test-Compile-v2.3.1
> +DISTNAME = Test-Compile-v2.4.0
> PKGNAME =p5-${DISTNAME:S/v//g}
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/p5-Test-Compile/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo 24 Nov 2019 14:24:39 - 1.2
> +++ distinfo 8 Jun 2020 16:59:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (Test-Compile-v2.3.1.tar.gz) =
> EXTP8BABGuQ+ZGJ1XM2KbPA3LKUGcFxgWG97F0j/Td8=
> -SIZE (Test-Compile-v2.3.1.tar.gz) = 18096
> +SHA256 (Test-Compile-v2.4.0.tar.gz) =
> 7/fjIFJ9ejPZsnRDhxwenV2+sRQI+5hDxWSW9nuZrXg=
> +SIZE (Test-Compile-v2.4.0.tar.gz) = 18314
>
--
andrew - http://afresh1.com
Beta. Software undergoes beta testing shortly before it's released.
Beta is Latin for "still doesn't work."
Re: [UPdate] devel/p5-Test-MockModule : Update to 0.173.0
On Sat, Jun 13, 2020 at 11:52:23PM +, wen heping wrote:
> Hi,
>
> Here is a simple patch for devel/p5-Test-MockModule to update to 0.173.0.
> It build well and pass all tests on amd64-6.6 system.
>
>Three ports TEST-depends on devel/p5-Test-MockModule:
> 1) archivers/p5-Archive-Zip : 1 test failed, not caused by this patch
> 2) databases/p5-DBIx-Connector: All tests passed
> 3) net/p5-Net-TFTP : All tests passed
>
>
> Regards,
> wen
This seems to be missing TEST_DEPENDS=devel/p5-Test-Warnings, no idea if
that's new or not.
Other than that, OK afresh1@
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-Test-MockModule/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 20 Feb 2020 12:08:34 - 1.16
> +++ Makefile 13 Jun 2020 23:31:40 -
> @@ -4,7 +4,7 @@ COMMENT = override subroutines in a modu
>
> MODULES =cpan
> PKG_ARCH = *
> -DISTNAME = Test-MockModule-v0.172.0
> +DISTNAME = Test-MockModule-v0.173.0
> PKGNAME =p5-${DISTNAME:S/-v/-/}
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/p5-Test-MockModule/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 20 Feb 2020 12:08:34 - 1.7
> +++ distinfo 13 Jun 2020 23:31:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (Test-MockModule-v0.172.0.tar.gz) =
> WVth7ui3BiPDEs4zFA7ywrqShfmjUSg2czG+2+M1Q7k=
> -SIZE (Test-MockModule-v0.172.0.tar.gz) = 28291
> +SHA256 (Test-MockModule-v0.173.0.tar.gz) =
> 2jxIDcabXG3FaVBuWLocvL/vPS5yJO1RiTlr5eMX20I=
> +SIZE (Test-MockModule-v0.173.0.tar.gz) = 28708
--
andrew - http://afresh1.com
The power The nightmares The strange medication
Re: [update] devel/p5-Devel-Hide 0.0013
On Wed, Jun 10, 2020 at 12:49:49PM +0200, Charlene Wendling wrote: > Hi, > > Here is an update for Devel::Hide. The changelog can be found there [0]. > > Port-wise it's a simple update, i've just changed my maintainer email > address while here. > > I've tested the direct depends [1] and they still pass. I've run tested > databases/ports-readme-dancer successfully so openports.pl won't blow > up :) > > Comments/feedback are welcome, OK afresh1@ > > Charlène. > > > [0] https://metacpan.org/changes/distribution/Devel-Hide > [1] https://bin.charlenew.xyz/p5-Devel-Hide.tgz > > > Index: Makefile > === > RCS file: /cvs/ports/devel/p5-Devel-Hide/Makefile,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 Makefile > --- Makefile 12 Jul 2019 20:44:51 - 1.2 > +++ Makefile 10 Jun 2020 10:36:36 - > @@ -2,10 +2,10 @@ > > COMMENT =forces the unavailability of specified Perl modules > > -DISTNAME = Devel-Hide-0.0010 > +DISTNAME = Devel-Hide-0.0013 > CATEGORIES = devel > > -MAINTAINER = Charlene Wendling > +MAINTAINER = Charlene Wendling > > MODULES =cpan > PKG_ARCH = * > Index: distinfo > === > RCS file: /cvs/ports/devel/p5-Devel-Hide/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 distinfo > --- distinfo 5 Jan 2019 10:50:38 - 1.1.1.1 > +++ distinfo 10 Jun 2020 10:36:36 - > @@ -1,2 +1,2 @@ > -SHA256 (Devel-Hide-0.0010.tar.gz) = > dW/vpg/r8djbyFFCa/sIRSDbRfdF01yOhiOUXW3aXoI= > -SIZE (Devel-Hide-0.0010.tar.gz) = 7225 > +SHA256 (Devel-Hide-0.0013.tar.gz) = > b8O7z08CU6blFoKWyQmTjBPIhpI6eZWslp5Hrfzwfss= > +SIZE (Devel-Hide-0.0013.tar.gz) = 9787 > -- andrew - http://afresh1.com A hacker does for love what others would not do for money.
Re: update print/poppler
> here's an update to poppler-0.89.0. Survived a bulk build on amd64,
> but I coould'nt yet test it (because of flaky internet, and I'm
> doing the builds on a remote machine, not at home).
>
> According to check_sym, library bumps are fine.
>
> I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded
> SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work
> around spurious build failures.
>
> Any tests are appreciated.
I tried to build the poppler package on a -current (+ pirofti@'s gettime)
system and ran into a problem. I have libreoffice installed, so the
previous version of poppler is in use.
$ make clean=all
...
$ make package
...
===> Building package for poppler-0.89.0
Create /usr/ports/packages/amd64/all/poppler-0.89.0.tgz
Creating package poppler-0.89.0
Creating package debug-poppler-0.89.0
Link to /usr/ports/packages/amd64/ftp/poppler-0.89.0.tgz
Link to /usr/ports/packages/amd64/ftp/debug-poppler-0.89.0.tgz
`/usr/ports/pobj/poppler-0.89.0/fake-amd64/.fake_done' is up to date.
===> Building package for poppler-qt5-0.89.0
Create /usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz
Creating package poppler-qt5-0.89.0
|library poppler.64.0 not found
| /usr/local/lib/libpoppler.so.63.0 (poppler-0.88.0): bad major
Direct dependencies for poppler-qt5-0.89.0 resolve to poppler-0.88.0
qtbase-5.13.2p0
Full dependency tree is pcre-8.41p2 libpsl-0.20.2p1 jpeg-2.0.4p0v0
gnutls-3.6.14 librsvg-2.48.7 geoclue-0.12.99p9 libsoup-2.70.0
dbus-glib-0.110p1v0 gtk-update-icon-cache-3.24.20 cairo-1.16.0
qtbase-5.13.2p0 openjp2-2.3.1p0 lzo2-2.10p2
gsettings-desktop-schemas-3.36.1 dconf-0.36.0p0 p11-kit-0.23.20
libunbound-1.10.1 double-conversion-3.1.5 shared-mime-info-2.0
gdk-pixbuf-2.40.0p2 zstd-1.4.5 xz-5.2.5 avahi-0.8 bzip2-1.0.8
harfbuzz-2.6.7 at-spi2-atk-2.34.2 sqlite3-3.31.1p0 fribidi-1.0.9
libproxy-0.4.15p4 png-1.6.37 desktop-file-utils-0.24p0 poppler-data-0.4.9
gmp-6.2.0 lcms2-2.9p0 libtasn1-4.16.0 cups-libs-2.3.3 libffi-3.3
glib2-2.64.3 atk-2.36.0 jasper-2.0.14 gettext-runtime-0.20.2 tiff-4.1.0
graphite2-1.3.14 libxml-2.9.10p1 icu4c-67.1 dbus-1.12.18v0 poppler-0.88.0
pcre2-10.34 libunistring-0.9.7 dbus-daemon-launch-helper-1.12.18
libexecinfo-0.3p2v0 glib2-networking-2.64.3 python-3.7.7
libxkbcommon-0.10.0p0 pango-1.44.7p0 lz4-1.9.2p0 gdbm-1.18.1p0
libidn2-2.3.0p0 at-spi2-core-2.36.0 libnettle-3.6 libdaemon-0.14p1
adwaita-icon-theme-3.36.1 brotli-1.0.7 boost-1.66.0p11 libevent-2.1.11
libiconv-1.16p0 iodbc-3.52.12p0 hicolor-icon-theme-0.17 gtk+3-3.24.20
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2121
'/usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz': @trap "cd
/usr/ports...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2602
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas
-...)
*** Error 2 in /home/greg/ports/print/poppler (/usr/ports/infrastructure/mk/
bsd.port.mk:2581 'package': @lock=poppler-0.89.0; export _LOCKS...)
--
nest.cx is Gmail hosted, use PGP:
https://pgp.key-server.io/0x0B1542BD8DF5A1B0
Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0
update print/poppler
Hi,
here's an update to poppler-0.89.0. Survived a bulk build on amd64,
but I coould'nt yet test it (because of flaky internet, and I'm
doing the builds on a remote machine, not at home).
According to check_sym, library bumps are fine.
I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded
SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work
around spurious build failures.
Any tests are appreciated.
Ciao,
Kil
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile
--- Makefile16 May 2020 18:41:15 - 1.158
+++ Makefile14 Jun 2020 22:07:37 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.88.0
+V= 0.89.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 63.0 # 99.0
-SHARED_LIBS += poppler-glib 19.5 # 8.16
+SHARED_LIBS += poppler 64.0 # 100.0
+SHARED_LIBS += poppler-glib 19.6 # 8.17
SHARED_LIBS += poppler-qt5 8.4 # 1.24
-SHARED_LIBS += poppler-cpp 16.1 # 0.8
+SHARED_LIBS += poppler-cpp 16.2 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.83
diff -u -p -r1.83 distinfo
--- distinfo16 May 2020 18:41:15 - 1.83
+++ distinfo14 Jun 2020 22:07:37 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.88.0.tar.xz) = tEU4BOmlpRnmzu4KyPXvwinjsL9wQZJjwjkSRHTSVsc=
-SIZE (poppler-0.88.0.tar.xz) = 1604348
+SHA256 (poppler-0.89.0.tar.xz) = +6IwNkU3eCzF1DsI1pPvacNlhihjSWg8exJxVqjvm1w=
+SIZE (poppler-0.89.0.tar.xz) = 1612156
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 17 May 2020 18:29:37 - 1.5
+++ patches/patch-glib_CMakeLists_txt 14 Jun 2020 22:07:37 -
@@ -9,7 +9,7 @@ Index: glib/CMakeLists.txt
${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
--set_target_properties(poppler-glib PROPERTIES VERSION 8.16.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.17.0 SOVERSION 8)
set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 17 Feb 2020 20:33:00 - 1.6
+++ patches/patch-poppler_Form_cc 14 Jun 2020 22:07:37 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.6 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
#include
#include
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: patches/patch-qt5_src_CMakeLists_txt
diff -N patches/patch-qt5_src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-qt5_src_CMakeLists_txt14 Jun 2020 22:07:37 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+- Remove hardcoded SOVERSION
+
+Index: qt5/src/CMakeLists.txt
+--- qt5/src/CMakeLists.txt.orig
qt5/src/CMakeLists.txt
+@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+ poppler-version.cpp
+ )
+ add_library(poppler-qt5 ${poppler_qt5_SRCS})
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.24.0 SOVERSION 1)
+ if(MINGW AND BUILD_SHARED_LIBS)
+ get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
+ set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST-main
--- pkg/PLIST-main 16 May 2020 18:41:15 - 1.36
+++ pkg/PLIST-main 14 Jun 2020 22:07:37 -
@@ -82,6 +82,7 @@ include/poppler/cpp/
include/poppler/cpp/poppler-destination.h
include/poppler/cpp/poppler-document.h
include/poppler/cpp/poppler-embedded-file.h
+include/poppler/cpp/poppler-font-private.h
Re: remove education/anki
On Sun Jun 14, 2020 at 09:51:57PM +0100, Stuart Henderson wrote: > On 2020/06/14 09:40, Andrea Fleckenstein wrote: > > Stuart Henderson writes: > > > > > The port was stuck due to not having qtwebengine which is needed > > > for newer versions. > > > > > > There is a big enough change in build layout for the newer version > > > that the current port isn't a good basis, so OK sthen@ to remove it. > > > > I'm keen to start work on the update. Anyone else been working on it? > > Will the old port really be no use at all that I should just start from > > scratch? > > I had a look at it a few times in the past, before we had qtwebengine (trying > to switch it back to qtwebkit) but didn't get anywhere with that approach. > Compared to the existing port, the files are in a different location, > the dependencies are different with the move to qt5, and the file layout > is different enough that the install target wasn't usable. There's not > much else left to the existing port. > > I wasn't really interested enough in it to pick it up again. And, like > Calibre, upstream's advice to users to avoid OS packages isn't really > encouraging. If you or someone else want to pick it up, thr first thing > it will need is pyqtwebengine to be ported. > Do you mean www/py-qtwebengine? > > Then I would suggest looking > for the last Anki version before they added the Rust bits so there is > less to deal with all at once. >
Re: remove education/anki
On 2020/06/14 09:40, Andrea Fleckenstein wrote: > Stuart Henderson writes: > > > The port was stuck due to not having qtwebengine which is needed > > for newer versions. > > > > There is a big enough change in build layout for the newer version > > that the current port isn't a good basis, so OK sthen@ to remove it. > > I'm keen to start work on the update. Anyone else been working on it? > Will the old port really be no use at all that I should just start from > scratch? I had a look at it a few times in the past, before we had qtwebengine (trying to switch it back to qtwebkit) but didn't get anywhere with that approach. Compared to the existing port, the files are in a different location, the dependencies are different with the move to qt5, and the file layout is different enough that the install target wasn't usable. There's not much else left to the existing port. I wasn't really interested enough in it to pick it up again. And, like Calibre, upstream's advice to users to avoid OS packages isn't really encouraging. If you or someone else want to pick it up, thr first thing it will need is pyqtwebengine to be ported. Then I would suggest looking for the last Anki version before they added the Rust bits so there is less to deal with all at once.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 14:35:48 Modified files: x11/kde-applications/kleopatra: Makefile x11/kde-applications/kleopatra/pkg: PLIST Log message: Merge wrong (double) import
angr: update to angr 8.20.6.8
Here's the regular update, angr-vex however is still at 0.1 because 0.2
introduced issues in py-pyvex that I have not been able to fix yet.
Simple version bump and patch adjustment; in angrop I recorded the RDEP
on py3-progressbar explicitly as it is currently just pulled in
implicitly through the RDEP on angr.
py3-angr needed another itanium_demangler removal and recent py3-unicorn
which jasper already committed.
Keeps working for me with poking around, but there might be rough edges
(since import) I haven't used/tested.
Index: devel/angr/Makefile.inc
===
RCS file: /cvs/ports/devel/angr/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- devel/angr/Makefile.inc 15 Feb 2020 18:36:18 - 1.6
+++ devel/angr/Makefile.inc 14 Jun 2020 12:36:23 -
@@ -21,7 +21,7 @@ MODPY_PI ?= Yes
MODPY_SETUPTOOLS ?=Yes
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION ?= 8.20.1.7
+MODPY_EGG_VERSION ?= 8.20.6.8
DISTNAME ?=${ANGR_PYTHON_MODULE}-${MODPY_EGG_VERSION}
PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME}
.endif
Index: devel/angr/py-ailment/distinfo
===
RCS file: /cvs/ports/devel/angr/py-ailment/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/angr/py-ailment/distinfo 15 Feb 2020 18:36:18 - 1.4
+++ devel/angr/py-ailment/distinfo 14 Jun 2020 12:36:27 -
@@ -1,2 +1,2 @@
-SHA256 (ailment-8.20.1.7.tar.gz) = H8EQcF+d0c/spmh2+9h/vs6gBaHTVVRJLEUFKi1aplI=
-SIZE (ailment-8.20.1.7.tar.gz) = 10548
+SHA256 (ailment-8.20.6.8.tar.gz) = A1/OFwKhgeo5NfaAUukxr/AcNT2qveSWlUt7fNj5naU=
+SIZE (ailment-8.20.6.8.tar.gz) = 13211
Index: devel/angr/py-angr/Makefile
===
RCS file: /cvs/ports/devel/angr/py-angr/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/angr/py-angr/Makefile 14 Jun 2020 10:14:14 - 1.9
+++ devel/angr/py-angr/Makefile 14 Jun 2020 17:09:34 -
@@ -3,7 +3,6 @@
COMMENT = multi-architecture binary analysis toolkit
ANGR_PYTHON_MODULE = angr
-REVISION = 0
HOMEPAGE = https://angr.io/
@@ -14,7 +13,7 @@ COMPILER =base-clang ports-gcc
# XXX: py-unicorn ships unicorn.so, but angr links against .1 - why?!
# Missing lib: libunicorn.so.1
(/usr/local/lib/python3.7/site-packages/angr/lib/angr_native.so) (NOT REACHABLE)
-LIB_DEPENDS = devel/py-unicorn${MODPY_FLAVOR}
+LIB_DEPENDS = devel/py-unicorn${MODPY_FLAVOR}>=1.0.2rc2
BUILD_DEPENDS =devel/angr/py-pyvex>=${MODPY_EGG_VERSION} \
devel/py-bitstring${MODPY_FLAVOR} \
@@ -44,7 +43,7 @@ RUN_DEPENDS = devel/angr/py-ailment>=${M
USE_GMAKE =Yes
-MAKE_ENV +=C++C=${CXX}
+MAKE_ENV = CXX=${CXX}
CFLAGS += -I${LOCALBASE}/include/angr-vex/
Index: devel/angr/py-angr/distinfo
===
RCS file: /cvs/ports/devel/angr/py-angr/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/angr/py-angr/distinfo 15 Feb 2020 18:36:18 - 1.4
+++ devel/angr/py-angr/distinfo 14 Jun 2020 12:36:29 -
@@ -1,2 +1,2 @@
-SHA256 (angr-8.20.1.7.tar.gz) = 9sZ4BiQLXuXjCex1Ze91YQevsR9i1UJOR04LDMBjfOo=
-SIZE (angr-8.20.1.7.tar.gz) = 894100
+SHA256 (angr-8.20.6.8.tar.gz) = ZBuLQptX3bw7bmoOnXPsqWeXiT48z0j7CfFMLYT7Kc0=
+SIZE (angr-8.20.6.8.tar.gz) = 979851
Index:
devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
===
RCS file:
/cvs/ports/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-angr_knowledge_plugins_functions_function_py
---
devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
10 Nov 2019 09:29:32 - 1.3
+++
devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
14 Jun 2020 12:40:11 -
@@ -5,16 +5,16 @@ Drop itanium_demangler dependency
Index: angr/knowledge_plugins/functions/function.py
--- angr/knowledge_plugins/functions/function.py.orig
+++ angr/knowledge_plugins/functions/function.py
-@@ -6,8 +6,6 @@ import itertools
- from collections import defaultdict
- from typing import Union
+@@ -7,8 +7,6 @@ from collections import defaultdict
+ from typing import Union, Optional, Iterable
+ from typing import Type # For some reasons the linter doesn't recognize the
use in apply_definition but PyCharm needs it imported to correctly recognize it
# pylint: disable=unused-import
-from itanium_demangler import parse
-
from cle.backends.symbol import Symbol
from archinfo.arch_arm import get_real_address_if_arm
import claripy
-@@ -1272,10 +1270,12 @@ class Function(Serializable):
+@@ -1449,10 +1447,12 @@ class Function(Serializable):
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/06/14 14:11:48 Modified files: devel/angr/py-z3-solver: Makefile distinfo devel/angr/py-z3-solver/patches: patch-core_scripts_mk_util_py Log message: Update to z3-solver 4.8.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/14 13:54:31 Modified files: graphics/libplacebo: Makefile distinfo graphics/libplacebo/pkg: DESCR PLIST Log message: Majpr update to libplacebo-2.72.0. Tested with mpv and vlc by Brad from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/06/14 13:27:20 Removed files: productivity/gbirthday: Makefile distinfo productivity/gbirthday/patches: patch-src_gbirthday_databases_lightning_py productivity/gbirthday/pkg: DESCR PLIST Log message: remove gbirthday, unmaintained upstream, python2/gtk+2 only suggested and OK jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/06/14 13:23:09 Modified files: productivity : Makefile Log message: +qbirthday -gbirthday
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/06/14 13:21:01 Log message: QBirthday is a birthday reminder application that helps you to remember your contacts' birthdays. It can be used with Thunderbird/Icedove Lightning, Sunbird/Iceowl Events, CSV-files, MySQL-Databases. It puts an icon on notification area which will blink when there is any of your contacts' birthday today. You can also check if there is any of your contacts' birhday on next days. This is a python3/qt5 replacement of Gbirthday. Tweaks and OK jasper@ Status: Vendor Tag: kirby Release Tags: kirby_20200614 N ports/productivity/qbirthday/Makefile N ports/productivity/qbirthday/distinfo N ports/productivity/qbirthday/pkg/PLIST N ports/productivity/qbirthday/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2020/06/14 12:09:11 Modified files: devel/openmpi : Makefile distinfo Log message: Update Open MPI to 4.0.4.
Re: update: devel/py-wbem (and drop py2)
OK kn
Re: update: devel/py-wbem (and drop py2)
On Sat, 13 Jun 2020, Paco Esteban wrote:
> On Sat, 13 Jun 2020, Paco Esteban wrote:
>
> > Hi,
> >
> > As suggested by sthen@ we can drop py2 for devel/py-wbem.
> >
> > I took the opportunity to update it to its latest version. I cannot
> > (or don't know how to) test this myself and the pypi distfile does not
> > include the tests (I opened an issue for this on their github repo), so
> > if somebody can test it it would be nice.
> >
> > Comments ? ok ?
>
> Here it is again against the latest version in the ports tree and
> including some suggestions from sthen@
And here it is one more time to adapt to the latest commit by ajacoutot@
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wbem/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile14 Jun 2020 09:08:00 - 1.16
+++ Makefile14 Jun 2020 16:41:18 -
@@ -2,8 +2,7 @@
COMMENT= CIM operations over HTTP in Python
-MODPY_EGG_VERSION= 0.12.2
-REVISION= 2
+MODPY_EGG_VERSION= 0.17.2
DISTNAME= pywbem-${MODPY_EGG_VERSION}
PKGNAME= py-wbem-${MODPY_EGG_VERSION}
CATEGORIES=devel
@@ -11,30 +10,29 @@ CATEGORIES= devel
HOMEPAGE= https://pywbem.github.io/
# LGPLv2
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
MODULES= lang/python
MODPY_PI= Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/py-pbr${MODPY_FLAVOR}>=1.10.0 \
- devel/py-ply${MODPY_FLAVOR} \
+RUN_DEPENDS= devel/py-ply${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
- security/py-M2Crypto${MODPY_FLAVOR} \
- textproc/py-yaml${MODPY_FLAVOR}
+ textproc/py-yaml${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR}
TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} \
- devel/py-ply${MODPY_FLAVOR}>=3.11
+ devel/py-ply${MODPY_FLAVOR}>=3.10
MODPY_SETUPTOOLS= Yes
+# the pypi tarball does not include tests
+NO_TEST = Yes
+
post-install:
rm ${PREFIX}/bin/*.bat
- mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
- mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
- mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
.include
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wbem/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo25 Apr 2018 10:10:48 - 1.5
+++ distinfo13 Jun 2020 17:03:39 -
@@ -1,2 +1,2 @@
-SHA256 (pywbem-0.12.2.tar.gz) = 2VzrGDW/sk4Uk2W8dhMzPYD68IWQ1+elTXUe+OWslMo=
-SIZE (pywbem-0.12.2.tar.gz) = 3852210
+SHA256 (pywbem-0.17.2.tar.gz) = hNrDP3fV/yw9jrQvx94v+20z9eSVTvidsNvz/mRqKAk=
+SIZE (pywbem-0.17.2.tar.gz) = 326882
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wbem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 10 May 2018 07:32:16 - 1.5
+++ pkg/PLIST 13 Jun 2020 21:48:34 -
@@ -1,66 +1,79 @@
@comment $OpenBSD: PLIST,v 1.5 2018/05/10 07:32:16 ajacoutot Exp $
-bin/mof_compiler${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}
-bin/wbemcli${MODPY_BIN_SUFFIX}.py
+@conflict py-wbem-*
+@pkgpath devel/py-wbem
+bin/mof_compiler
+bin/wbemcli
+bin/wbemcli.py
lib/python${MODPY_VERSION}/site-packages/pywbem/
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pywbem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
lib/python${MODPY_VERSION}/site-packages/pywbem/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pywbem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/06/14 09:47:39 Modified files: sysutils/ruby-puppet/6: Makefile distinfo sysutils/ruby-puppet/6/pkg: PLIST Log message: Upgrade to Puppet 6.16.0 https://puppet.com/docs/puppet/latest/release_notes_puppet.html#release_notes_puppet_x-16-0
[BE_ARCHS] Fix sysutils/smartmontools runtime
Hi, As i took a peek at misc@, i've noticed that there was a smartmontools fix for big endian archs [0] proposed by Marek on upstream's GitHub [1]. Note that i'm only backporting that, the switch to the new interface for OpenBSD requires way more patching. It builds and works fine on macppc (M.2 SSD with PATA adapter), and i tested it on amd64 as well. Comments/feedback are welcome, Charlène. [0] https://marc.info/?l=openbsd-misc=159138099215533=2 [1] https://github.com/smartmontools/smartmontools/pull/56 Index: Makefile === RCS file: /cvs/ports/sysutils/smartmontools/Makefile,v retrieving revision 1.43 diff -u -p -u -p -r1.43 Makefile --- Makefile19 Feb 2020 17:46:52 - 1.43 +++ Makefile14 Jun 2020 14:13:59 - @@ -4,6 +4,7 @@ COMMENT=control and monitor storage sy # XXX at update time check whether C++11 is actually needed DISTNAME= smartmontools-7.1 +REVISION= 0 CATEGORIES=sysutils HOMEPAGE= https://www.smartmontools.org/ Index: patches/patch-os_openbsd_cpp === RCS file: patches/patch-os_openbsd_cpp diff -N patches/patch-os_openbsd_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-os_openbsd_cpp14 Jun 2020 14:13:59 - @@ -0,0 +1,123 @@ +$OpenBSD$ + +From 61c49a66d6ee9df516fb9757c7fcce18ea508f6a Mon Sep 17 00:00:00 2001 +From: Marek Benc +Date: Thu, 4 Jun 2020 16:49:48 +0200 +Subject: [PATCH] Fix runtime problems on big-engian OpenBSD platforms. +Can be removed for smarmontools>7.1 + +Index: os_openbsd.cpp +--- os_openbsd.cpp.orig os_openbsd.cpp +@@ -184,7 +184,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.timeout = 1000; + copydata = 1; + break; +@@ -194,7 +194,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.timeout = 1000; + copydata = 1; + break; +@@ -204,7 +204,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.sec_num = select; + req.sec_count = 1; + req.timeout = 1000; +@@ -217,7 +217,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.sec_num = select; + req.sec_count = 1; + req.timeout = 1000; +@@ -242,14 +242,14 @@ ata_command_interface(int fd, smart_command_set comman + req.flags = ATACMD_READ; + req.features = ATA_SMART_ENABLE; + req.command = ATAPI_SMART; +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.timeout = 1000; + break; + case DISABLE: + req.flags = ATACMD_READ; + req.features = ATA_SMART_DISABLE; + req.command = ATAPI_SMART; +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.timeout = 1000; + break; + case AUTO_OFFLINE: +@@ -259,7 +259,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.sec_num = select; + req.sec_count = 1; + req.timeout = 1000; +@@ -268,7 +268,7 @@ ata_command_interface(int fd, smart_command_set comman + req.flags = ATACMD_READ; + req.features = ATA_SMART_AUTOSAVE;/* XXX missing from wdcreg.h */ + req.command = ATAPI_SMART; +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.sec_count = 0xf1; + /* to enable autosave */ + req.timeout = 1000; +@@ -280,7 +280,7 @@ ata_command_interface(int fd, smart_command_set comman + req.command = ATAPI_SMART; + req.databuf = (caddr_t) inbuf; + req.datalen = sizeof(inbuf); +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.sec_num = select; + req.sec_count = 1; + req.timeout = 1000; +@@ -291,7 +291,7 @@ ata_command_interface(int fd, smart_command_set comman + req.flags = ATACMD_READ; + req.features = ATA_SMART_STATUS; + req.command = ATAPI_SMART; +-req.cylinder = htole16(WDSMART_CYL); ++req.cylinder = WDSMART_CYL; + req.timeout = 1000; + break; + case CHECK_POWER_MODE: +@@ -316,11 +316,11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 08:24:33 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm x11/kde-applications/kdenetwork-filesharing: Makefile x11/kde-applications/kdenetwork-filesharing/pkg: PLIST Log message: Rename kdenetwork-filesharing to kdenetwork-filesharing-kf5
mumble: update to 1.3.1
https://github.com/mumble-voip/mumble/releases/tag/1.3.1 has mostly
fixes for both client and server, although some do not effect our port
and at least the client has never bisbehaved for me on amd64 so far.
Simple update below which I'll commit in a few days, I briefly tested
murmur as well, but that certainly did not cover the entire server side
of features.
I'd like to take MAINTAINER as well, mostly to see updates in portroach.
Index: Makefile
===
RCS file: /cvs/ports/audio/mumble/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile21 May 2020 11:28:05 - 1.50
+++ Makefile14 Jun 2020 13:30:27 -
@@ -3,20 +3,21 @@
COMMENT-main = low-latency voice chat client
COMMENT-server = low-latency voice chat server
-VERSION = 1.3.0
+VERSION = 1.3.1
DISTNAME = mumble-${VERSION}
PKGNAME-main = mumble-${VERSION}
PKGNAME-server = murmur-${VERSION}
-REVISION-main =9
CATEGORIES = audio net
HOMEPAGE = https://www.mumble.info/
-MASTER_SITES =
https://github.com/mumble-voip/mumble/releases/download/1.3.0/
+MASTER_SITES =
https://github.com/mumble-voip/mumble/releases/download/${VERSION}/
# BSD3
PERMIT_PACKAGE = Yes
+
+MAINTAINER = Klemens Nanni
WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network
WANTLIB-main += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xi c crypto
Index: distinfo
===
RCS file: /cvs/ports/audio/mumble/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo19 Mar 2020 21:20:36 - 1.16
+++ distinfo14 Jun 2020 13:31:36 -
@@ -1,2 +1,2 @@
-SHA256 (mumble-1.3.0.tar.gz) = mo3iVHNEliqBwAw3tdi9WjcbtoX6Ns8Do/E043x5uA0=
-SIZE (mumble-1.3.0.tar.gz) = 8788587
+SHA256 (mumble-1.3.1.tar.gz) = tiu3xW9HJwC8XDYT8V7NPacZHU4mnLAJEVUeEngSc/0=
+SIZE (mumble-1.3.1.tar.gz) = 8587417
Index: patches/patch-scripts_murmur_ini
===
RCS file: /cvs/ports/audio/mumble/patches/patch-scripts_murmur_ini,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scripts_murmur_ini
--- patches/patch-scripts_murmur_ini14 May 2020 18:01:48 - 1.2
+++ patches/patch-scripts_murmur_ini14 Jun 2020 13:34:16 -
@@ -41,7 +41,7 @@ Index: scripts/murmur.ini
; If you want to expose Murmur's experimental gRPC API, you
; need to specify an address to bind on.
-@@ -102,7 +102,7 @@ icesecretwrite=
+@@ -93,7 +93,7 @@ icesecretwrite=
; logs to the file 'murmur.log'. If you leave this field blank
; on Unix-like systems, Murmur will force itself into foreground
; mode which logs to the console.
@@ -50,7 +50,7 @@ Index: scripts/murmur.ini
; If set, Murmur will write its process ID to this file
; when running in daemon mode (when the -fg flag is not
-@@ -272,6 +272,6 @@ allowping=true
+@@ -375,6 +375,6 @@ allowping=true
; leave the defaults as they are.
; Please note that this section has to be last in the configuration file.
;
Re: remove education/anki
Stuart Henderson writes: > The port was stuck due to not having qtwebengine which is needed > for newer versions. > > There is a big enough change in build layout for the newer version > that the current port isn't a good basis, so OK sthen@ to remove it. I'm keen to start work on the update. Anyone else been working on it? Will the old port really be no use at all that I should just start from scratch? Cheers, Andrea
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 07:26:28 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register KDE4 removals - amor - audiocd-kio - baloo-widgets - ffmpegthumbs - jovie - kaccessible - kactivities - kde-base-artwork - kde-emoticons - kde-runtime - kde-shared-data - kde-wallpapers - kde-workspace - kde4-kopete-sounds - kde4-langlist - kde4-locale - kde4-locale-en_US - kdegraphics-strigi-analyzer - kdelibs - kdenetwork - kdenetwork-strigi-analyzers - kdepim - kdepim-runtime - kdepimlibs - kdeplasma-addons - kdesdk-strigi-analyzers - kdewebdev - kfilemetadata - kgamma - kgpg - kimono - kopete - korundum - kpat - kppp - kremotecontrol - kross-java - kscd - ktux - kuser - libkcddb - libkcompactdisc - libkdeedu - libkdegames - libkexiv2 - mplayerthumbs - nepomuk-core - nepomuk-widgets - p5-kde - p5-qt - pairs - parley - py-kde - qyoto - ruby26-qt4 - smokegen - smokekde - smokeqt - superkaramba
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 07:21:01 Modified files: x11/kde-applications/baloo-widgets: Makefile x11/kde-applications/kdepim-runtime: Makefile Log message: Set -kf5 suffix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/14 07:12:19 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.23.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/06/14 07:07:23 Modified files: editors: Makefile Log message: + kakoune
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/06/14 07:07:04 Log message: Import kakoune-2020.01.16 Kakoune is a code editor that implements Vi's "keystrokes as a text editing language" model. As it's also a modal editor, it is somewhat similar to the Vim editor (after which Kakoune was originally inspired). Kakoune can operate in two modes, normal and insertion. In insertion mode, keys are directly inserted into the current buffer. In normal mode, keys are used to manipulate the current selection and to enter insertion mode. Kakoune has a strong focus on interactivity, most commands provide immediate and incremental results, while still being competitive (as in keystroke count) with Vim. Kakoune works on selections, which are oriented, inclusive range of characters, selections have an anchor and a cursor character. Most commands move both of them, except when extending selection where the anchor character stays fixed and the cursor one moves around. ok kn@ Port submitted by maintainer Frederic Galusik Status: Vendor Tag: solene Release Tags: solene_20200614 N ports/editors/kakoune/Makefile N ports/editors/kakoune/distinfo N ports/editors/kakoune/pkg/DESCR N ports/editors/kakoune/pkg/PLIST N ports/editors/kakoune/patches/patch-src_Makefile No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 07:02:42 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm x11/kde-applications/svgpart: Makefile x11/kde-applications/svgpart/pkg: PLIST Log message: Rename svgpart to svgpart-kf5
cups-filters-1.27 problem? [Re: Input Filter and LPD]
i think this belongs to ports@. though base lpd(8) is in the Subject:, this is probably abount cups-filters-1.27 failing on us. i do not snip anything, ports@-people see this for the first time. for the misc@ thread see https://marc.info/?t=15916537163 punoseva...@gmail.com (Predrag Punosevac), 2020.06.09 (Tue) 16:28 (CEST): > Marcus MERIGHI wrote: > > punoseva...@gmail.com (Predrag Punosevac), 2020.06.08 (Mon) 23:57 (CEST): > > > It seems that there is another change on 6.7 perhaps among packages > > > which broke printing for me. I am using built in LPD to print onto the > > > network connected Brother HL-5250DN. I am getting row PostScript output > > > on the printer instead of the document. > > > > I think I've seen the same. Though I could still print simple text > > files, like "cat foo.txt | lpr". > > Thanks for confirming the issue. I am 95% sure that this is related to > the upgrade of > > cups-filters > > package. > > Namely, there are two packages involved with my printing setup. > > a2ps and cups-filters > > a2ps has not been changed since 6.6 relase and it is still the same old > > a2ps-4.14p15 > > However, cups-filters is significantly "upgraded". OpenBSD 6.6 was > shipped with cups-filters-1.25.6. OpenBSD 6.7 was shipped with > cups-filters-1.27.4p0. Looking through internet archive and the commit log > > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/print/cups-filters/Makefile > > cups-filters-1.27 branch was nothing but the trouble. I am not sure why > upstream quickly ditched cups-filters-1.26. When I say trouble I really > mean it. This thing broke printing on CentOS and Ubuntu not just on > OpenBSD. > > > I upgraded my package to cups-filters-1.27.5 and that didn't fix the > problems for me. I tried yesterday to go back to the last 1.25 version > > cups-filters-1.25.13 > > I was unable to compile program quickly. It requires more work. I am > surprised to find out that I am the first one reporting the issue as I > would expect more people to use LPD than CUPS. thanks, Predrag, for finding this out! regarding LPD vs. CUPS I'm afraid it's the other way round :-( > I fixed cups-filter package probably would be worth of stable binary > package effort. > > > Printing PDFs from xournal failed, with raw PS output as you describe. > > > > The machine is currently not available, probably online this afternoon, > > will post the configs then. here we go, better late than never: $ cat /etc/printcap lp|brother-mfc9120cn|Brother-MFC9120CN:\ :lp=9100@brother:\ :if=/etc/printcap.sh:\ :sd=/var/spool/output/lpd:\ :lf=/var/log/lpd-errs:\ :sh: $ cat /etc/printcap.sh #!/bin/sh -e /usr/local/bin/a2ps -BRq --columns=1 -o - | \ /usr/local/bin/foomatic-rip --ppd \ /etc/foomatic/direct/brother-mfc9120cn.ppd \ -P brother-mfc9120cn Marcus
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 06:50:56 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm x11/kde-applications/kdegraphics-thumbnailers: Makefile x11/kde-applications/kdegraphics-thumbnailers/pkg: PLIST Log message: Rename kdegraphics-thumbnailers to kdegraphics-thumbnailers-kf5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 06:44:43 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm x11/kde-applications/kdegraphics-mobipocket: Makefile x11/kde-applications/kdegraphics-mobipocket/pkg: PLIST Log message: Rename kdegraphics-mobipocket => kdegraphics-mobipocket-kf5
Re: New port : editors/kakoune
Le Sunday 14 Jun 2020 à 11:23 (+0200), Solene Rapenne a écrit : > looks good, I'm ok to import it with a minor change. > > Comparing to Makefile.template, the variables MASTER_SITES and > EXTRACT_SUFX should be moved below WANTLIB. Fixed in the attached tarball. Thank you. fredg kakoune-v3.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 05:54:49 Modified files: devel/kf5/prison: Makefile devel/kf5/prison/pkg: PLIST devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Rename prison to prison-kf5 Avoid conflicts with kde4 prison and kde5. prison-1.0p4->prison-kf5-5.68.0p0: ok prison-5.68.0->prison-kf5-5.68.0p0: ok
update www/composer 1.8.6 -> 1.10.7
Hello, I was trying to run a php application when I've seen that www/composer was a bit outdated, so here's a trivial patch to update it. You can find the complete changelog on github[0], but the TL;DR is something along these lines: (skipping the various bugfix) 1.9.0: - breaking change regarding repositories that require authentication - added options 1.10.0: - breaking change: ``composer global exec'' executes in the current working directory - deprecated something about class autoloading due to classmap optimizations - added options 1.10.2: - added options I personally don't use it, so I've done only a light testing. It seems also that no ports depends directly on it, but www/drush and net/librenms uses it behind the scenes to generate the distfile. [0]: https://github.com/composer/composer/releases Index: Makefile === RCS file: /cvs/ports/www/composer/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile26 Sep 2019 22:01:47 - 1.12 +++ Makefile14 Jun 2020 11:21:07 - @@ -6,7 +6,7 @@ CATEGORIES= www devel PORTROACH= site:https://github.com/composer/composer/releases -V= 1.8.6 +V= 1.10.7 EPOCH= 0 MASTER_SITES= https://getcomposer.org/download/$V/ DISTNAME= composer-$V Index: distinfo === RCS file: /cvs/ports/www/composer/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo12 Jul 2019 17:05:59 - 1.7 +++ distinfo14 Jun 2020 11:21:07 - @@ -1,2 +1,2 @@ -SHA256 (composer-1.8.6.phar) = tm+bU9tyxRF0CN7+ih4AUV/nSel84bCui9qmpaQ91UI= -SIZE (composer-1.8.6.phar) = 1915161 +SHA256 (composer-1.10.7.phar) = uUuHJylmjeW1+/YvFv9YjSojSA3aiMDkXLQ7cht1rik= +SIZE (composer-1.10.7.phar) = 1976232
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 04:28:26 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register kde-l10n-* removals
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/14 04:19:46 Modified files: databases/postgresql: Makefile databases/postgresql/pkg: README-server Log message: don't hardcode the PHP version of phppgadmin in README; it was outdated and in this context it suffices to say it uses PHP
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 04:18:15 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register KDE4 meta removals
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org 2020/06/14 04:14:14
Modified files:
devel/angr/py-angr: Makefile
devel/py-cflow2dot: Makefile
www/py-bokeh : Makefile
Log message:
math/py-networkx -> math/py-networkx${MODPY_FLAVOR}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/14 04:13:55 Modified files: math/py-networkx: Makefile math/py-networkx/pkg: PLIST Log message: Move from MODPY_DEFAULT_VERSION_3 to python3 FLAVOR. ok jasper@ (maintainer)
Re: net/telegram-desktop port
Yes, Qt5 is big and complicated because it's very flexible. I'll be reading. Thanks by your feedback. On 2020-06-14 12:07, Stuart Henderson wrote: On 2020/06/14 06:58, Romero Pérez, Abel wrote: Hello, I am thinking to port telegram-desktop from FreeBSD to OpenBSD. But I am not sure if it will be accepted by the security policy. As I always start the practical thing before to read the theory, because I always think that I don't know if I am able to do, and that makes me to read on the road, I ask first if somebody experienced is wondering to do this work also. Because I see a project for a long time and this is my first port. Nothing else to say, just hoping it to be well accepted as web.telegram.org is working fine on Firefox but it is not complete and flexible. Have a nice day, thanks by reading. I don't see why not. For some reason I assumed this was an Electron app (tricky to port, I don't think anybody has got any to work in ports) but actually it's Qt5, they aren't always the easiest of things to port but I don't see any big obstacles.
Re: update: devel/py-wbem (and drop py2)
On 2020/06/14 03:23, Klemens Nanni wrote:
> On Sat, Jun 13, 2020 at 11:50:22PM +0200, Paco Esteban wrote:
> > Here it is again against the latest version in the ports tree and
> > including some suggestions from sthen@
> OK kn, but one thought inline.
>
> > post-install:
> > rm ${PREFIX}/bin/*.bat
> > - mv ${PREFIX}/bin/mof_compiler{,${MODPY_BIN_SUFFIX}}
> > - mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}
> > - mv ${PREFIX}/bin/wbemcli{,${MODPY_BIN_SUFFIX}}.py
> That renames executables for the python3 flavor which is used by
> net/nagios/check_esxi_hardware: did you check whether this port needs
> adjustment regarding calls to one of these executables?
>
check_esxi_hardware doesn't use them, only the python module.
Update is ok with me.
Re: net/telegram-desktop port
On 2020/06/14 06:58, Romero Pérez, Abel wrote: > Hello, > > I am thinking to port telegram-desktop from FreeBSD to OpenBSD. But I am not > sure if it will be accepted by the security policy. > > As I always start the practical thing before to read the theory, because I > always think that I don't know if I am able to do, and that makes me to read > on the road, I ask first if somebody experienced is wondering to do this > work also. Because I see a project for a long time and this is my first > port. Nothing else to say, just hoping it to be well accepted as > web.telegram.org is working fine on Firefox but it is not complete and > flexible. > > Have a nice day, > > thanks by reading. > I don't see why not. For some reason I assumed this was an Electron app (tricky to port, I don't think anybody has got any to work in ports) but actually it's Qt5, they aren't always the easiest of things to port but I don't see any big obstacles.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/06/14 04:07:26 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register some KDE4 removals - klogicg - sopranog - automocg - qimageblitzg - cagibig - libkvkontakteg - libkfbapig - libkgapig - akonadig - atticag - kwebkitpartg - grantleeg - libkscreeng - polkit-qtg - phonon-gstreamerg - phonon-gstreamer-iconsg - phonon-vlcg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/06/14 04:05:14 Modified files: security/emldump: Makefile Log message: switch to python3 ok rpointel@ (MAINTAINER)
Re: New port : editors/kakoune
On Sun, 14 Jun 2020 03:51:02 +0200 Klemens Nanni : > On Sat, Jun 13, 2020 at 10:15:01PM +0200, Frédéric GALUSIK wrote: > [...] > Thanks to cmake, this is relatively straight forward; only a few > things I could spot for now: > > PKGNAME defaults to DISTNAME, so the former is redundant. > > WANTLIB is incomplete, you'll want to see "make > port-lib-depends-check". > > COMPILER is set correctly, however a comment is appropiate to tell > *why* such a selection is needed; here it's probably the use of > -std=c++17, so you could just add "# -std=c++17" above the COMPILER > line, that's it. > > For readability, "=" is usually followed by tabs in ports Makefiles to > align the second column. > > I've done all of this in the attached tarball, thanks a lot for > working on kakoune :-) looks good, I'm ok to import it with a minor change. Comparing to Makefile.template, the variables MASTER_SITES and EXTRACT_SUFX should be moved below WANTLIB.
Re: UPDATE x11/icewm-1.6.5
On Sun 24/05/2020 14:03, Bjorn Ketelaars wrote:
> On Wed 08/04/2020 10:21, Bjorn Ketelaars wrote:
> > Diff below brings icewm to 1.6.5, which is a maintenance release.
> > Changes: https://github.com/bbidulock/icewm/blob/1.6.5/ChangeLog.
> >
> > Run tested on amd64.
> >
> > Comments/OK?
>
> I was contacted off list by Greg Jones who found an issue with the
> taskbar that has been fixed upstream [0]. For now cherrypick this fix.
> New diff enclosed.
>
> Comments/OK?
Upstream of icewm released a new version (1.6.6), which fixes the
taskbar. Overview on changes can be found at
https://github.com/ice-wm/icewm/releases/tag/1.6.6.
Comments/OK?
diff --git Makefile Makefile
index a0f97493575..febd21b6cba 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.6.4
+V= 1.6.6
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
diff --git distinfo distinfo
index 54fa162eb04..f50c9813398 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
-SIZE (icewm-1.6.4.tar.lz) = 1684348
+SHA256 (icewm-1.6.6.tar.lz) = d/US4LzcnG7I4aEMgiuCOFSCZbq8cN/k63a0Ug1gwBw=
+SIZE (icewm-1.6.6.tar.lz) = 1684639
diff --git patches/patch-doc_icewm_adoc patches/patch-doc_icewm_adoc
index f013af21948..8bb9a04dfec 100644
--- patches/patch-doc_icewm_adoc
+++ patches/patch-doc_icewm_adoc
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_icewm_adoc,v 1.1 2019/03/14 13:48:23
bcallah Exp $
Index: doc/icewm.adoc
--- doc/icewm.adoc.orig
+++ doc/icewm.adoc
-@@ -395,10 +395,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm; $HOME/.icewm
+@@ -396,10 +396,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm; $HOME/.icewm
The first of these which is defined and existent is used to search
for the user's personal customization.
@@ -16,7 +16,7 @@ Index: doc/icewm.adoc
the compiled-in default directory with default files
The directories are searched in the above order, so any file located
-@@ -407,8 +407,8 @@ creating the same directory hierarchy under `$HOME/.ic
+@@ -408,8 +408,8 @@ creating the same directory hierarchy under `$HOME/.ic
To customize icewm yourself, you could create the `$HOME/.icewm`
directory and copy the files that you wish to modify, like
diff --git patches/patch-lib_Makefile_in patches/patch-lib_Makefile_in
index 9840ac6de6e..e08cc79fb0b 100644
--- patches/patch-lib_Makefile_in
+++ patches/patch-lib_Makefile_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-lib_Makefile_in,v 1.5 2019/11/09 14:06:33
fcambus Exp $
Index: lib/Makefile.in
--- lib/Makefile.in.orig
+++ lib/Makefile.in
-@@ -362,7 +362,7 @@ target_vendor = @target_vendor@
+@@ -365,7 +365,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
diff --git patches/patch-man_icewm-preferences_pod
patches/patch-man_icewm-preferences_pod
index 5ca305f477d..3fe1a64ae85 100644
--- patches/patch-man_icewm-preferences_pod
+++ patches/patch-man_icewm-preferences_pod
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_pod,v 1.5 2020/02/01
19:48:20 bket Exp $
Index: man/icewm-preferences.pod
--- man/icewm-preferences.pod.orig
+++ man/icewm-preferences.pod
-@@ -982,7 +982,7 @@ B to allow B for B to allow B for B /dev/null && watch -t ss -putswl
|| netstat -c'")
XSV(const char *, netClassHint, "ss.XTerm")
#else
diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
index ef1b8f21f55..eae728da32e 100644
--- patches/patch-src_icesh_cc
+++ patches/patch-src_icesh_cc
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
Index: src/icesh.cc
--- src/icesh.cc.orig
+++ src/icesh.cc
-@@ -1930,6 +1930,8 @@ void IceSh::doSync()
+@@ -2197,6 +2197,8 @@ void IceSh::doSync()
bool IceSh::colormaps()
{
@@ -14,7 +14,7 @@ Index: src/icesh.cc
if ( !isAction("colormaps", 0))
return false;
-@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
+@@ -2205,7 +2207,7 @@ bool IceSh::colormaps()
tlog("colormaps");
running = true;
@@ -23,7 +23,7 @@ Index: src/icesh.cc
while (running) {
int n = 0;
Colormap* map = XListInstalledColormaps(display, root, );
-@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
+@@ -2307,11 +2309,13 @@ bool IceSh::delay()
bool IceSh::guiEvents()
{
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index fab224c3c15..7712e7e4144 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.9 2020/02/01 19:48:20 bket Exp $
Index: src/yapp.cc
--- src/yapp.cc.orig
+++ src/yapp.cc
-@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
+@@ -280,7 +280,7 @@ int YApplication::mainLoop() {
// This is irrelevant when using monotonic clocks:
// if time travel to past, decrease the timeouts
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/14 03:08:00 Modified files: devel/py-wbem : Makefile Log message: Unbreak: re-add BDEP removed in previous.
UPDATE audio/mpd-0.21.24
Enclosed a simple diff for updating mpd to 0.21.24, which is a minor
bugfix release. Changes:
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.24/NEWS
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index 10bd4364af0..4e318d160c1 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.21.23
+VER = 0.21.24
DISTNAME = mpd-${VER}
EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
diff --git distinfo distinfo
index ccf6eac028f..f2a7087b16b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.21.23.tar.xz) = Q59SLKmADzdeT7RZ7DHmGz2CT8XAWA/wbaxItdISB6M=
-SIZE (mpd-0.21.23.tar.xz) = 680060
+SHA256 (mpd-0.21.24.tar.xz) = hGMqfoLmcrOm1xZRp10F+3rNYmRcM+Pzr1oQZ8+mTNY=
+SIZE (mpd-0.21.24.tar.xz) = 681576
fix x11/xzoom
Hi!
Recently I was looking for some zooming tool in our ports and found xzoom.
It looks like it wasn't used by anyone for a long time. These days noone
uses 8bpp in desktop I gusess. This patch adds support for 15, 16, 24 and
32 bpp displays.
Taken from FreeBSD.
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/xzoom/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile14 Jul 2019 00:39:40 - 1.20
+++ Makefile30 May 2020 10:04:02 -
@@ -3,7 +3,7 @@
COMMENT= magnify, rotate, mirror the image on the X11 screen
DISTNAME= xzoom-0.3
-REVISION= 0
+REVISION= 1
CATEGORIES=x11
MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/}
Index: patches/patch-scale_h
===
RCS file: patches/patch-scale_h
diff -N patches/patch-scale_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scale_h 30 May 2020 10:04:02 -
@@ -0,0 +1,108 @@
+$OpenBSD$
+
+Index: scale.h
+--- scale.h.orig
scale.h
+@@ -0,0 +1,102 @@
++/* scale image from SRC to DST - parameterized by type T */
++
++/* get pixel address of point (x,y) in image t */
++#define getP(t,x,y) \
++ (T *) ([t]->data[(ximage[t]->xoffset+(x))*sizeof(T) + \
++ (y)*ximage[t]->bytes_per_line])
++
++{
++ int i, j, k;
++
++ /* copy scaled lines from SRC to DST */
++ j = flipxy ? width[SRC] - 1 : height[SRC] - 1;
++ do {
++ T *p1;
++ T *p2;
++ int p2step;
++ T *p1_save;
++
++ /* p1 point to begining of scanline j*magy in DST */
++ p1 = getP(DST,0,j*magy);
++ p1_save = p1;
++ /* p2 point to begining of scanline j in SRC */
++ /* if flipy then line height[SRC]-1-j */
++ p2 = getP(SRC,0,flipy ? (height[SRC]-1-j) : j);
++
++ if (flipxy)
++ {
++ p2 = getP(SRC,flipy ? j : (width[SRC]-1-j),0);
++ p2step = ximage[SRC]->bytes_per_line / sizeof(T);
++
++ if (flipx)
++ {
++ p2 += p2step * (height[SRC]-1);
++ p2step = -p2step;
++ }
++
++ i = height[SRC];
++ do {
++ T c = *p2; p2 += p2step;
++ k = magx; do *p1++ = c; while (--k > 0);
++ } while (--i > 0);
++ }
++ else if (flipx)
++ {
++ p2 += width[SRC];
++ i = width[SRC];
++ do {
++ T c = *--p2;
++ k = magx; do *p1++ = c; while (--k > 0);
++ } while (--i > 0);
++ }
++ else
++ {
++ i = width[SRC];
++ do {
++ T c = *p2++;
++ k = magx; do *p1++ = c; while (--k > 0);
++ } while (--i > 0);
++ }
++
++ /* draw vertical grid */
++ if (gridy && magx >= 2)
++ {
++ p1 = p1_save - 1;
++ i = magx;
++ k = flipxy ? height[SRC] : width[SRC];
++ do {
++ p1 += i;
++ *p1 ^= ~((T)0);
++ } while (--k > 0);
++ }
++
++ /* duplicate that line as needed */
++ if (magy > 1)
++ {
++ /* p1 point to begining of scanline j*magy in DST */
++ p1 = p1_save;
++ /* p2 points to begining of next line */
++ p2 = p1;
++ p2step = ximage[DST]->bytes_per_line / sizeof(T);
++
++ i = width[DST] * sizeof(T);
++ k = magy - 1;
++ do {
++ p2 += p2step;
++ memcpy(p2, p1, i);
++ } while (--k > 0);
++
++ /* draw horizontal grid */
++ if (gridx && magy >= 2)
++ {
++ k = width[DST];
++ do {
++ *p2++ ^= ~((T)0);
++ } while (--k > 0);
++ }
++ }
++ } while (--j >= 0);
++}
++
++#undef getP
++
Index: patches/patch-xzoom_c
===
RCS file: patches/patch-xzoom_c
diff -N patches/patch-xzoom_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-xzoom_c 30 May 2020
Re: New port : editors/kakoune
Le Sunday 14 Jun 2020 à 03:51 (+0200), Klemens Nanni a écrit : > On Sat, Jun 13, 2020 at 10:15:01PM +0200, Frédéric GALUSIK wrote: > > Then, it was built and tested on amd64, it needs some love on others > > platforms. > Thanks to cmake, this is relatively straight forward; only a few things > I could spot for now: > > PKGNAME defaults to DISTNAME, so the former is redundant. > > WANTLIB is incomplete, you'll want to see "make port-lib-depends-check". > > COMPILER is set correctly, however a comment is appropiate to tell *why* > such a selection is needed; here it's probably the use of -std=c++17, > so you could just add "# -std=c++17" above the COMPILER line, that's it. > > For readability, "=" is usually followed by tabs in ports Makefiles to > align the second column. > > I've done all of this in the attached tarball, thanks a lot for working > on kakoune :-) It is noted. Thank you very much. fredg
Re: CVS: cvs.openbsd.org: ports
On Sat, Jun 13, 2020 at 04:05:41PM +0200, Antoine Jacoutot wrote: > On Thu, Jun 11, 2020 at 04:39:43AM -0600, Frederic Cambus wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: fcam...@cvs.openbsd.org 2020/06/11 04:39:43 > > > > Modified files: > > audio/ocp : Makefile distinfo > > audio/ocp/pkg : PLIST > > > > Log message: > > Update ocp to 0.2.2. > > Missing dependency? (amd64) Indeed, this update introduces a new BUILD_DEPENDS on devel/xa. Fixed, thanks for pointing this out.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/06/14 02:19:32 Modified files: audio/ocp : Makefile Log message: Add missing BUILD_DEPENDS on devel/xa. Pointed out by aja@, thanks!
[UPDATE] textproc/uncrustify
Hi, this is the diff to update uncrustify to latest release. Ok? Remi. Index: Makefile === RCS file: /cvs/ports/textproc/uncrustify/Makefile,v retrieving revision 1.24 diff -u -p -u -p -r1.24 Makefile --- Makefile 26 Oct 2019 22:52:56 - 1.24 +++ Makefile 14 Jun 2020 08:14:20 - @@ -2,9 +2,7 @@ COMMENT = source code beautifier -DISTNAME = uncrustify-0.69.0 - -REVISION = 0 +DISTNAME = uncrustify-0.71.0 CATEGORIES = textproc devel Index: distinfo === RCS file: /cvs/ports/textproc/uncrustify/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo 16 May 2019 07:58:50 - 1.13 +++ distinfo 14 Jun 2020 08:14:20 - @@ -1,2 +1,2 @@ -SHA256 (uncrustify-0.69.0.tar.gz) = 9k7NvVzos+PQNxhvfM5ZWz5zy9KGO3BnrXohnDSuH7g= -SIZE (uncrustify-0.69.0.tar.gz) = 1601218 +SHA256 (uncrustify-0.71.0.tar.gz) = G3Zd/TbJhbtB6NLajSJq6Ldpvnn7Lh4sYKeLm64jqMM= +SIZE (uncrustify-0.71.0.tar.gz) = 1703222 Index: pkg/PLIST === RCS file: /cvs/ports/textproc/uncrustify/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 2 Nov 2017 09:42:27 - 1.4 +++ pkg/PLIST 14 Jun 2020 08:14:20 - @@ -1,6 +1,25 @@ @comment $OpenBSD: PLIST,v 1.4 2017/11/02 09:42:27 rpointel Exp $ @bin bin/uncrustify @man man/man1/uncrustify.1 +share/doc/uncrustify/ +share/doc/uncrustify/examples/ +share/doc/uncrustify/examples/MS-calling_conventions.cfg +share/doc/uncrustify/examples/amxmodx.cfg +share/doc/uncrustify/examples/ben.cfg +share/doc/uncrustify/examples/ben2.cfg +share/doc/uncrustify/examples/d.cfg +share/doc/uncrustify/examples/defaults.cfg +share/doc/uncrustify/examples/freebsd.cfg +share/doc/uncrustify/examples/gnu-indent.cfg +share/doc/uncrustify/examples/klaus.cfg +share/doc/uncrustify/examples/kr-indent.cfg +share/doc/uncrustify/examples/linux-indent.cfg +share/doc/uncrustify/examples/linux.cfg +share/doc/uncrustify/examples/mono.cfg +share/doc/uncrustify/examples/msvc.cfg +share/doc/uncrustify/examples/objc.cfg +share/doc/uncrustify/examples/sun.cfg +share/doc/uncrustify/examples/xsupplicant.cfg share/uncrustify/ share/uncrustify/MS-calling_conventions.cfg share/uncrustify/amxmodx.cfg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/06/14 01:35:36 Modified files: databases/redis: Makefile distinfo databases/redis/patches: patch-src_networking_c Log message: Update to Redis 6.0.5 ok danj kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/06/14 01:29:03 Modified files: games/tuxpaint-stamps: Makefile Log message: Match pkgname version with distname.
[macppc] Unbreak x11/agar/agar
Hi,
> http://build-failures.rhaalovely.net/powerpc/2020-05-26/x11/agar/agar.log
`rlwimi' needs a 32-bit integer to work with, taken from another
upstream for the same code [0].
Later it breaks with:
> cpuinfo.c:289:23: error: use of undeclared identifier 'IllegalInsn'
> cpuinfo.c:290:14: error: use of undeclared identifier 'jmpbuf'
It did not occur in this ifdef hell back in the gcc days, because unlike
clang, it does not define __ppc__. Dropping AltiVec support fixes the
issue.
With the below diff it builds on macppc, x11/agar/test runs fine.
Comments/feedback are welcome,
Charlène.
[0] https://github.com/DCurrent/openbor/pull/188
Index: Makefile
===
RCS file: /cvs/ports/x11/agar/agar/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Oct 2017 17:11:03 - 1.5
+++ Makefile14 Jun 2020 06:31:49 -
@@ -3,7 +3,7 @@
COMMENT = cross-platform widget toolkit
PKGNAME = agar-$V
-REVISION = 2
+REVISION = 3
SHARED_LIBS += ag_au 0.0 # 5.0
SHARED_LIBS += ag_core 0.0 # 5.0
@@ -28,6 +28,7 @@ LIB_DEPENDS = audio/libsndfile \
CONFIGURE_ARGS += --with-gl=${X11BASE} \
--with-x=${X11BASE} \
--with-portaudio=${LOCALBASE} \
- --with-sndfile=${LOCALBASE}
+ --with-sndfile=${LOCALBASE} \
+ --with-altivec=no
.include
Index: patches/patch-core_byteswap_h
===
RCS file: patches/patch-core_byteswap_h
diff -N patches/patch-core_byteswap_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-core_byteswap_h 14 Jun 2020 06:31:49 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+powerpc fix for:
+unsupported inline asm: input with type 'int' matching output with type
+'u_int16_t' (aka 'unsigned short')
+
+Index: core/byteswap.h
+--- core/byteswap.h.orig
core/byteswap.h
+@@ -37,11 +37,11 @@ AG_Swap16(Uint16 x)
+ static __inline__ Uint16
+ AG_Swap16(Uint16 x)
+ {
+- Uint16 rv;
++ Uint32 rv;
+ __asm__("rlwimi %0,%2,8,16,23" :
+ "=" (rv) :
+ "0" (x >> 8), "r" (x));
+- return (rv);
++ return (Uint16)(rv);
+ }
+ #else
+ static __inline__ Uint16
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/agar/agar/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Oct 2016 09:33:17 - 1.1.1.1
+++ pkg/PLIST 14 Jun 2020 06:31:49 -
@@ -34,7 +34,6 @@ include/agar/agar/config/ag_debug_gui.h
include/agar/agar/config/ag_legacy.h
include/agar/agar/config/ag_network.h
include/agar/agar/config/ag_threads.h
-include/agar/agar/config/altivec_cflags.h
include/agar/agar/config/bindir.h
include/agar/agar/config/clock_cflags.h
include/agar/agar/config/clock_libs.h
@@ -406,22 +405,22 @@ include/agar/agar/vg/vg_text.h
include/agar/agar/vg/vg_tool.h
include/agar/agar/vg/vg_tools.h
include/agar/agar/vg/vg_view.h
-lib/libag_au.a
+@static-lib lib/libag_au.a
lib/libag_au.la
@lib lib/libag_au.so.${LIBag_au_VERSION}
-lib/libag_core.a
+@static-lib lib/libag_core.a
lib/libag_core.la
@lib lib/libag_core.so.${LIBag_core_VERSION}
-lib/libag_dev.a
+@static-lib lib/libag_dev.a
lib/libag_dev.la
@lib lib/libag_dev.so.${LIBag_dev_VERSION}
-lib/libag_gui.a
+@static-lib lib/libag_gui.a
lib/libag_gui.la
@lib lib/libag_gui.so.${LIBag_gui_VERSION}
-lib/libag_math.a
+@static-lib lib/libag_math.a
lib/libag_math.la
@lib lib/libag_math.so.${LIBag_math_VERSION}
-lib/libag_vg.a
+@static-lib lib/libag_vg.a
lib/libag_vg.la
@lib lib/libag_vg.so.${LIBag_vg_VERSION}
@man man/man3/AG_Anim.3
