Batch update for fcitx and related pkgs + Note for KDE Plasma

2024-01-17 Thread Yifei Zhan
Another wave of fcitx/opencc updates, in general nothing major, just
bugfixes here and there. A note is added to the fcitx pkg readme for
KDE Plasma users on using KDE's input configurator.

converters/opencc: 1.1.6 -> 1.1.7
  - minor bugfixes for build infra
  - translation updates
  https://github.com/BYVoid/OpenCC/compare/ver.1.1.6...ver.1.1.7

inputmethods/xcb-imdkit: 1.0.5 -> 1.0.6
  - minor bugfix on setting XCB event mask
  
https://github.com/fcitx/xcb-imdkit/commit/2553f2ec1397cd93facde4bff9fd841056611ddc

inputmethods/fcitx: 5.0.23 -> 5.1.7
  - libevent has been replaced by libuv
  - bugfixes on xcb, dbus interface, ui
  - bump major for Fcitx5Core, Fcitx5Utils
  - slightly rework of existing patch for detecting OpenBSD
  - translation updates
  https://github.com/fcitx/fcitx5/commits/master/

inputmethods/fcitx-qt: 5.0.17 -> 5.1.4
  - disable nonfunctional qtwayland support for now
  - add qt support for widgets addons and guiwrapper 
  - new shared library: Fcitx5Qt6WidgetsAddons
  - bugfixes on ui
  - translation updates
  https://github.com/fcitx/fcitx5-qt/commits/master/

inputmethods/fcitx-gtk: 5.0.23 -> 5.1.1
  - minor bugfixes
  - new binary for probing IM module
  https://github.com/fcitx/fcitx5-gtk/commits/master/

inputmethods/fcitx-lua: 5.0.10 -> 5.0.12
  - translation updates
  https://github.com/fcitx/fcitx5-lua/commits/master/

inputmethods/libime: 1.0.17 -> 1.1.5
  - static data/table updates, new table
  - drop outdated C11 patch
  - minor bugfixes
  https://github.com/fcitx/libime/commits/master/

inputmethods/fcitx-chinese-addons: 5.0.17 -> 5.1.3
  - bugfixes and translation updates
  https://github.com/fcitx/fcitx5-chinese-addons/commits/master/

inputmethods/fcitx-config-qt: 5.0.17 -> 5.1.3
  - add support for Qt6, translation updates
 https://github.com/fcitx/fcitx5-configtool/commits/master/
 
inputmethods/fcitx-table-extra: 5.0.13 -> 5.1.2
  - translation and tables update
  https://github.com/fcitx/fcitx5-table-extra/commits/master/
diff --git a/inputmethods/fcitx/Makefile b/inputmethods/fcitx/Makefile
index da7e9eba824..877b97fc38c 100644
--- a/inputmethods/fcitx/Makefile
+++ b/inputmethods/fcitx/Makefile
@@ -1,12 +1,11 @@
 COMMENT =	flexible input method framework
 
-DISTNAME =	fcitx5-5.0.23
+DISTNAME =	fcitx5-5.1.7
 PKGNAME =	${DISTNAME:S/fcitx5/fcitx/}
-REVISION =	0
 
 SHARED_LIBS +=  Fcitx5Config			0.0 # 0.0
-SHARED_LIBS +=  Fcitx5Core			0.0 # 0.0
-SHARED_LIBS +=  Fcitx5Utils			0.0 # 0.0
+SHARED_LIBS +=  Fcitx5Core			1.0 # 0.0
+SHARED_LIBS +=  Fcitx5Utils			1.0 # 0.0
 
 CATEGORIES =	inputmethods chinese japanese korean
 
@@ -17,13 +16,13 @@ MAINTAINER =	Yifei Zhan 
 # LGPLv2.1+
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} c cairo dbus-1 enchant-2 event_core
+WANTLIB += ${COMPILER_LIBCXX} c cairo dbus-1 enchant-2
 WANTLIB += execinfo expat gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gobject-2.0 harfbuzz intl json-c kvm m pango-1.0
 WANTLIB += pangocairo-1.0 pthread uuid xcb xcb-ewmh xcb-icccm
 WANTLIB += xcb-imdkit xcb-keysyms xcb-randr xcb-render
 WANTLIB += xcb-shape xcb-util xcb-xfixes xcb-xinerama xcb-xkb
-WANTLIB += xkbcommon xkbcommon-x11 xkbfile z
+WANTLIB += xkbcommon xkbcommon-x11 xkbfile z uv
 
 SITES =		https://download.fcitx-im.org/fcitx5/fcitx5/
 SITES.data =	https://download.fcitx-im.org/data/
@@ -46,7 +45,7 @@ RUN_DEPENDS =		devel/desktop-file-utils \
 
 LIB_DEPENDS =		devel/harfbuzz,-main \
 			devel/json-c \
-			devel/libevent2 \
+			devel/libuv \
 			devel/pango \
 			graphics/gdk-pixbuf2 \
 			inputmethods/xcb-imdkit \
diff --git a/inputmethods/fcitx/distinfo b/inputmethods/fcitx/distinfo
index 78db898cd73..d61607725ab 100644
--- a/inputmethods/fcitx/distinfo
+++ b/inputmethods/fcitx/distinfo
@@ -1,4 +1,4 @@
 SHA256 (fcitx/en_dict-20121020.tar.gz) = xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs=
-SHA256 (fcitx/fcitx5-5.0.23.tar.xz) = BPIJpkBiJc4ZeF+NnTvbJTlEWG7c+pYBQU/N2oobE6A=
+SHA256 (fcitx/fcitx5-5.1.7.tar.xz) = LvOOuqWcBHNOZJFXhBxPTif/OJ2szZkjPb+CtoZ7i4s=
 SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
-SIZE (fcitx/fcitx5-5.0.23.tar.xz) = 6828856
+SIZE (fcitx/fcitx5-5.1.7.tar.xz) = 6867544
diff --git a/inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake b/inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake
index bdd9d834b97..de8c13c1e12 100644
--- a/inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake
+++ b/inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake
@@ -1,12 +1,12 @@
 Index: cmake/Fcitx5CompilerSettings.cmake
 --- cmake/Fcitx5CompilerSettings.cmake.orig
 +++ cmake/Fcitx5CompilerSettings.cmake
-@@ -7,8 +7,6 @@ set(CMAKE_C_STANDARD 99)
- 
+@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 99)
  set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
  set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}")
--set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
--

batch update for fcitx and related pkgs

2023-04-13 Thread Yifei Zhan
/hicolor/24x24/apps/fcitx-punc-active.png
 share/icons/hicolor/24x24/apps/fcitx-punc-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-remind-active.png
+share/icons/hicolor/24x24/apps/fcitx-remind-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-shuangpin.png
+share/icons/hicolor/24x24/apps/fcitx-wbpy.png
+share/icons/hicolor/24x24/apps/fcitx-wubi.png
+share/icons/hicolor/24x24/apps/fcitx-ziranma.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cangjie.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chn.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-erbi.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-pinyin.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-inactive.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wubi.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
 share/icons/hicolor/48x48/apps/fcitx-cangjie.png
 share/icons/hicolor/48x48/apps/fcitx-chn.png
 share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
@@ -122,8 +175,6 @@ 
share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wubi.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-active-symbolic.svg
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-active.svg
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive-symbolic.svg
@@ -149,7 +200,6 @@ share/locale/ko/LC_MESSAGES/fcitx5-chinese-addons.mo
 share/locale/ru/LC_MESSAGES/fcitx5-chinese-addons.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5-chinese-addons.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5-chinese-addons.mo
-share/metainfo/
 @tag update-desktop-database
 share/metainfo/org.fcitx.Fcitx5.Addon.ChineseAddons.metainfo.xml
 @tag gtk-update-icon-cache %D/share/icons/hicolor
diff --git a/inputmethods/fcitx-config-qt/Makefile 
b/inputmethods/fcitx-config-qt/Makefile
index c89da2bff..0cef0e0f9 100644
--- a/inputmethods/fcitx-config-qt/Makefile
+++ b/inputmethods/fcitx-config-qt/Makefile
@@ -1,9 +1,8 @@
 COMMENT =  GUI configure tool for fcitx5
 
-V =5.0.12
+V =5.0.17
 DISTNAME = fcitx5-configtool-$V
 PKGNAME =  fcitx-configtool-qt-$V
-REVISION = 0
 
 CATEGORIES =   inputmethods
 
@@ -14,11 +13,12 @@ MAINTAINER =Yifei Zhan 
 # GPLv2.0+
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets
-WANTLIB += Fcitx5Config Fcitx5Core Fcitx5Qt5DBusAddons Fcitx5Qt5WidgetsAddons
-WANTLIB += Fcitx5Utils KF5CoreAddons KF5I18n KF5ItemViews KF5QuickAddons
-WANTLIB += KF5WidgetsAddons Qt5Qml Qt5QmlModels Qt5Quick Qt5X11Extras
-WANTLIB += X11 c m xkbcommon xkbfile
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5DBusAddons
+WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils KF5ConfigCore KF5CoreAddons
+WANTLIB += KF5I18n KF5IconThemes KF5ItemViews KF5Package KF5Plasma
+WANTLIB += KF5QuickAddons KF5Service KF5WidgetsAddons Qt5Core
+WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick
+WANTLIB += Qt5Widgets Qt5X11Extras X11 c m xkbcommon xkbfile
 
 MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-configtool/
 DIST_SUBDIR =  fcitx
@@ -37,6 +37,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
 
 LIB_DEPENDS =  inputmethods/fcitx-qt \
x11/qt5/qtx11extras \
+   devel/kf5/plasma-framework \
devel/kf5/kdeclarative \
devel/kf5/ki18n \
devel/kf5/kitemviews
diff --git a/inputmethods/fcitx-config-qt/distinfo 
b/inputmethods/fcitx-config-qt/distinfo
index 930c0bc3a..8a41d8509 100644
--- a/inputmethods/fcitx-config-qt/distinfo
+++ b/inputmethods/fcitx-config-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx5-configtool-5.0.12.tar.xz) = 
KT2lLbrJh6PEiAQzpKk7+LO0XirD13ywJfdtyFkwKhs=
-SIZE (fcitx/fcitx5-configtool-5.0.12.tar.xz) = 106168
+SHA256 (fcitx/fcitx5-configtool-5.0.17.tar.xz) = 
+LYZbSPRSmrMmis9vDdytuWy46UUe3i2SSOKPXdXhtU=
+SIZE (fcitx/fcitx5-configtool-5.0.17.tar.xz) = 113760
diff -

Re: [Update] inputmethods/fcitx 5.0.22

2023-03-20 Thread Yifei Zhan
On 23/03/18 10:34AM, lux wrote:
> Hi,
> 
> Update for fcitx5 to 5.0.22.
> 

Thanks for taking care of it :)

As Stuart mentioned, we will be focusing on testing existing ports instead of 
updating as the next release is approching. After the release I will refresh 
[1] 
and try to update the fcitx family and other related packages.

[1]: https://marc.info/?l=openbsd-ports&m=167134126418231&w=2



Re: new: productivity/xournalpp: handwriting notetaking and PDF annotation

2023-02-20 Thread Yifei Zhan
ping with patch & tarball reattached :)


On 23/02/11 03:45AM, Yifei Zhan wrote:
> Hi,
> 
> xournalpp (Xournal++) is a handwriting notetaking software with PDF 
> annotation 
> support. It has good balance in terms of lightweightness and feature and has 
> been part of my notetaking workflow.
> 
> Tested on amd64, audio recording needs extra steps to enable and has been 
> documented in README, PDF annotation with text and images also works fine.
> 
> This port requires cxx binding to be enabled for audio/portaudio-svn, a patch 
> is 
> included for that.
> 
> Both xournalpp and patched portaudio-svn passed portcheck and 
> port-lib-depends-check. Builtin testing is not ported but any help is 
> welcomed.
> 
> any comments? 


Index: Makefile
===
RCS file: /cvs/ports/audio/portaudio-svn/Makefile,v
retrieving revision 1.22
diff -u -p -u -r1.22 Makefile
--- Makefile11 Mar 2022 18:20:26 -  1.22
+++ Makefile11 Feb 2023 03:24:31 -
@@ -6,19 +6,23 @@ CATEGORIES=   audio
 MASTER_SITES = http://files.portaudio.com/archives/
 EXTRACT_SUFX = .tgz
 
-SHARED_LIBS =  portaudio   1.2
+SHARED_LIBS += portaudio   1.2
+SHARED_LIBS += portaudiocpp0.12
 
 HOMEPAGE=  http://www.portaudio.com/
 
 # MIT
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   m pthread sndio
+WANTLIB += ${COMPILER_LIBCXX} m sndio
+
+COMPILER = base-clang ports-gcc
 
 USE_GMAKE= Yes
 AUTOCONF_VERSION = 2.69
 CONFIGURE_STYLE=   autoconf no-autoheader
-CONFIGURE_ARGS=--without-alsa --without-oss --without-jack
+CONFIGURE_ARGS=--without-alsa --without-oss --without-jack \
+   --enable-cxx
 
 # builds non-automated, interactive tests in ${WRKBUILD}/bin
 TEST_TARGET=   tests
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/portaudio-svn/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:27 -  1.5
+++ pkg/PLIST   11 Feb 2023 03:24:31 -
@@ -1,5 +1,29 @@
 include/portaudio.h
+include/portaudiocpp/
+include/portaudiocpp/AutoSystem.hxx
+include/portaudiocpp/BlockingStream.hxx
+include/portaudiocpp/CFunCallbackStream.hxx
+include/portaudiocpp/CallbackInterface.hxx
+include/portaudiocpp/CallbackStream.hxx
+include/portaudiocpp/CppFunCallbackStream.hxx
+include/portaudiocpp/Device.hxx
+include/portaudiocpp/DirectionSpecificStreamParameters.hxx
+include/portaudiocpp/Exception.hxx
+include/portaudiocpp/HostApi.hxx
+include/portaudiocpp/InterfaceCallbackStream.hxx
+include/portaudiocpp/MemFunCallbackStream.hxx
+include/portaudiocpp/PortAudioCpp.hxx
+include/portaudiocpp/SampleDataFormat.hxx
+include/portaudiocpp/Stream.hxx
+include/portaudiocpp/StreamParameters.hxx
+include/portaudiocpp/System.hxx
+include/portaudiocpp/SystemDeviceIterator.hxx
+include/portaudiocpp/SystemHostApiIterator.hxx
 @static-lib lib/libportaudio.a
 lib/libportaudio.la
 @lib lib/libportaudio.so.${LIBportaudio_VERSION}
+@lib lib/libportaudiocpp.so.${LIBportaudiocpp_VERSION}
+@static-lib lib/libportaudiocpp.a
+lib/libportaudiocpp.la
 lib/pkgconfig/portaudio-2.0.pc
+lib/pkgconfig/portaudiocpp.pc


xournalpp.tar
Description: Unix tar archive


Re: new: multimedia/karlyriceditor: synchronize music lyrics editor

2023-02-20 Thread Yifei Zhan
On 23/02/17 12:55PM, Omar Polo wrote:
> 
> plist needs to be re-generated, share/applications is owned by
> desktop-file-utils:
> 

plist regen-ed for the attached port:

@bin bin/karlyriceditor
share/applications/karlyriceditor.desktop
share/pixmaps/
share/pixmaps/karlyriceditor.png
@tag update-desktop-database


> 
> not really runtested, I just opened the GUI and clicked around, but
> seems to work and ports looks fine to me.  With plist fixed, ok op@
> for import if someone wants to :)


Thanks :)



karlyriceditor.tar
Description: Unix tar archive


new: multimedia/karlyriceditor: synchronize music lyrics editor

2023-02-11 Thread Yifei Zhan

(manual bump of [1], used it today on -current, works fine as usual)

Attached is a port for multimedia/karlyriceditor:

Karaoke Lyrics Editor is a program lets you edit and synchronize lyrics with
karaoke songs in various formats. Currently supported formats include LRC,
LRCv2 (supported by XBMC) and Ultrastar (without pitch).

Tested on OpenBSD-current/{amd64,arm64}, I've used it to edit lyrics for a few 
months now, no problem so far.

port-lib-depends-check and portcheck are happy.

any comments?

[1]: https://marc.info/?l=openbsd-ports&m=165459827212836&w=2



karlyriceditor.tar
Description: Unix tar archive


Re: [NEW] devel/pax-utils

2023-02-11 Thread Yifei Zhan
On 23/02/10 12:44PM, Frederic Cambus wrote:

> Originally focused only on PaX, it has been expanded to be generally
> security focused.  It still has a good number of PaX helpers for people
> interested in that.
> 

This has been very useful for analyzing elf files even for non security usage, 
I 
used it as a better objdump. the result looks accurate and I'm happy to have it 
here on OpenBSD.



Re: amd64-clang bulk build report

2023-02-10 Thread Yifei Zhan
On 23/02/11 05:02AM, Theo Buehler wrote:
> My clang 15 ports queue is empty. Below is the list of remaining build
> failures with some quick notes. Some of them still have obvious fixes.
> Either there is a maintainer who can look or the ports involve languages
> or build systems I don't enjoy dealing with.
> 
> www/midoricvs rm? [-Wint-conversion]

I think cvs rm is the way to go, from offical README[1]:

> ...built on top of Electron and React.

Seems like the midori as we know has been discontinued.

[1]: https://gitlab.com/midori-web/midori-desktop/-/blob/master/README.md



new: productivity/xournalpp: handwriting notetaking and PDF annotation

2023-02-10 Thread Yifei Zhan
Hi,

xournalpp (Xournal++) is a handwriting notetaking software with PDF annotation 
support. It has good balance in terms of lightweightness and feature and has 
been part of my notetaking workflow.

Tested on amd64, audio recording needs extra steps to enable and has been 
documented in README, PDF annotation with text and images also works fine.

This port requires cxx binding to be enabled for audio/portaudio-svn, a patch 
is 
included for that.

Both xournalpp and patched portaudio-svn passed portcheck and 
port-lib-depends-check. Builtin testing is not ported but any help is welcomed.

any comments? 


xournalpp.tar
Description: Unix tar archive
Index: Makefile
===
RCS file: /cvs/ports/audio/portaudio-svn/Makefile,v
retrieving revision 1.22
diff -u -p -u -r1.22 Makefile
--- Makefile11 Mar 2022 18:20:26 -  1.22
+++ Makefile11 Feb 2023 03:24:31 -
@@ -6,19 +6,23 @@ CATEGORIES=   audio
 MASTER_SITES = http://files.portaudio.com/archives/
 EXTRACT_SUFX = .tgz
 
-SHARED_LIBS =  portaudio   1.2
+SHARED_LIBS += portaudio   1.2
+SHARED_LIBS += portaudiocpp0.12
 
 HOMEPAGE=  http://www.portaudio.com/
 
 # MIT
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   m pthread sndio
+WANTLIB += ${COMPILER_LIBCXX} m sndio
+
+COMPILER = base-clang ports-gcc
 
 USE_GMAKE= Yes
 AUTOCONF_VERSION = 2.69
 CONFIGURE_STYLE=   autoconf no-autoheader
-CONFIGURE_ARGS=--without-alsa --without-oss --without-jack
+CONFIGURE_ARGS=--without-alsa --without-oss --without-jack \
+   --enable-cxx
 
 # builds non-automated, interactive tests in ${WRKBUILD}/bin
 TEST_TARGET=   tests
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/portaudio-svn/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:27 -  1.5
+++ pkg/PLIST   11 Feb 2023 03:24:31 -
@@ -1,5 +1,29 @@
 include/portaudio.h
+include/portaudiocpp/
+include/portaudiocpp/AutoSystem.hxx
+include/portaudiocpp/BlockingStream.hxx
+include/portaudiocpp/CFunCallbackStream.hxx
+include/portaudiocpp/CallbackInterface.hxx
+include/portaudiocpp/CallbackStream.hxx
+include/portaudiocpp/CppFunCallbackStream.hxx
+include/portaudiocpp/Device.hxx
+include/portaudiocpp/DirectionSpecificStreamParameters.hxx
+include/portaudiocpp/Exception.hxx
+include/portaudiocpp/HostApi.hxx
+include/portaudiocpp/InterfaceCallbackStream.hxx
+include/portaudiocpp/MemFunCallbackStream.hxx
+include/portaudiocpp/PortAudioCpp.hxx
+include/portaudiocpp/SampleDataFormat.hxx
+include/portaudiocpp/Stream.hxx
+include/portaudiocpp/StreamParameters.hxx
+include/portaudiocpp/System.hxx
+include/portaudiocpp/SystemDeviceIterator.hxx
+include/portaudiocpp/SystemHostApiIterator.hxx
 @static-lib lib/libportaudio.a
 lib/libportaudio.la
 @lib lib/libportaudio.so.${LIBportaudio_VERSION}
+@lib lib/libportaudiocpp.so.${LIBportaudiocpp_VERSION}
+@static-lib lib/libportaudiocpp.a
+lib/libportaudiocpp.la
 lib/pkgconfig/portaudio-2.0.pc
+lib/pkgconfig/portaudiocpp.pc


Re: WIP/Help wanted: use MULTI_PACKAGES for net/snowflake_proxy

2022-12-23 Thread Yifei Zhan
Many thanks to Struct and Omar for clearing my doubt around this :)

I agree the following patch is a better idea, I tested caspar's tweaked diff 
and 
it builds/runs with no issue.

> 
> So below is a diff with a slightly tweaked COMMENT. How about this?
> This is OK caspar@
> 
> Caspar
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snowflake_proxy/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  6 Oct 2022 17:05:25 -   1.7
> +++ Makefile  22 Dec 2022 18:01:19 -
> @@ -1,7 +1,8 @@
> -COMMENT= proxy providing Tor access to others with censored net
> +COMMENT= proxy, pluggable transport for Tor access with censored net
>  
>  MODGO_MODNAME=   git.torproject.org/pluggable-transports/snowflake.git/v2
>  V=   2.3.1
> +REVISION=0
>  MODGO_VERSION=   v$V
>  
>  DISTNAME=snowflake.git-${MODGO_VERSION}
> @@ -17,7 +18,7 @@ PERMIT_PACKAGE= Yes
>  WANTLIB += c pthread
>  
>  MODULES= lang/go
> -ALL_TARGET=   ./proxy/
> +ALL_TARGET=   ./proxy/ ./client/ ./server/
>  
>  # done as a sed instead of patch because the path includes the version number
>  post-extract:
> @@ -25,7 +26,9 @@ post-extract:
>   ${WRKSRC}/proxy/lib/pt_event_logger.go
>  
>  post-install:
> - cd ${PREFIX}/bin && mv proxy snowflake_proxy
> +.for i in proxy client server
> + mv ${PREFIX}/bin/$i ${PREFIX}/bin/snowflake_$i
> +.endfor
>  
>  .include "modules.inc"
>  .include 
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/net/snowflake_proxy/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 28 Feb 2022 16:54:13 -  1.1.1.1
> +++ pkg/DESCR 22 Dec 2022 18:01:19 -
> @@ -12,5 +12,6 @@ e.g. by configuring it in Tor Browser.
>  Technical information is in
>  
> https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/Technical%20Overview
>  
> -This package provides a proxy, for those who would like to use their
> -internet connection to provide access to others via this protocol.
> +This package provides a standalone proxy, for those who would like to use
> +their internet connection to provide access to others via this protocol,
> +and pluggable transports for Tor to allow using snowflake proxies. 
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/snowflake_proxy/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 4 Mar 2022 10:46:34 -   1.3
> +++ pkg/PLIST 22 Dec 2022 18:01:19 -
> @@ -1,6 +1,8 @@
>  @newgroup _snowflakeproxy:874
>  @newuser _snowflakeproxy:874:_snowflakeproxy::snowflake_proxy 
> user:/nonexistent:/sbin/nologin
>  @rcscript ${RCDIR}/snowflake_proxy
> +@bin bin/snowflake_client
>  @bin bin/snowflake_proxy
> +@bin bin/snowflake_server
>  share/examples/login.conf.d/snowflake_proxy
>  @sample ${SYSCONFDIR}/login.conf.d/snowflake_proxy



Re: NEW: net/snowflake_client

2022-12-21 Thread Yifei Zhan
On 22/12/21 07:04PM, Caspar Schutijser wrote:
> I tested it with Tor Browser and it seems to work. Do we want this in
> ports? And do we want a separate port like this or do we want to
> tweak and move net/snowflake_proxy to use MULTI_PACKAGES?

I think it's better to use MULTI_PACKAGES because they are all built from a 
common codebase and having a single port of snowflake can make it easier for 
future updates.



Re: Tor Browser: why is there no built-in bridges?

2022-12-20 Thread Yifei Zhan
On 22/12/16 06:22PM, Caspar Schutijser wrote:
> Dear users in this thread, if possible, can you give this a spin?
> 
> With some help and feedback from the Tor Browser developers I
> came up with the following diff. I verified that I can use
> the meek-azure and obfs4 Pluggable Transports. With a
> local (uncommitted) snowflake_client port Snowflake also worked but
> I'll get back to that some other time.
> 

This works exactly as it should :)
I tested meek/obfs/snowflake and all three worked without issue.

It seems like TBB changed the way bridges integrate since I last attempt to get 
this working on OpenBSD, so my old patchset is no longer applicable, I'm happy 
to help testing tho.

> No REVISION bump is included in this diff since I'm planning on
> gathering feedback first and I'll probably commit this after
> Tor Browser 12.0.1 is out.
> 
> Caspar
> 
> 
> Index: browser/Makefile
> ===
> RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
> retrieving revision 1.98
> diff -u -p -r1.98 Makefile
> --- browser/Makefile  13 Dec 2022 19:35:35 -  1.98
> +++ browser/Makefile  16 Dec 2022 17:15:02 -
> @@ -16,7 +16,8 @@ DISTNAME =  src-firefox-tor-browser-102.
>  
>  FIX_EXTRACT_PERMISSIONS  = Yes
>  DISTFILES += ${DISTNAME}.tar.xz \
> - tor-browser-linux64-${TB_VERSION}_ALL.tar.xz
> + tor-browser-linux64-${TB_VERSION}_ALL.tar.xz \
> + tor-expert-bundle-${TB_VERSION}-linux-x86_64.tar.gz
>  
>  SO_VERSION = 8.0
>  MOZILLA_LIBS =   xul clearkey lgpllibs mozavcodec mozavutil 
> mozgtk
> @@ -74,7 +75,8 @@ MAKE_ENV += BUILD_OPT=1 \
>   NSS_ENABLE_ECC=1 \
>   XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
>  
> -RUN_DEPENDS +=   net/tor>=0.4.7.12
> +RUN_DEPENDS +=   net/obfs4proxy>=0.0.14 \
> + net/tor>=0.4.7.12
>  
>  CONFIGURE_ARGS +=--enable-release #1386371
>  CONFIGURE_ARGS +=--enable-sandbox
> @@ -103,7 +105,16 @@ post-patch:
>   # Not using a patch for this; patch context would contain UTF-8
>   sed -i 's/#ifdef XP_LINUX/#if defined(XP_LINUX) || 
> defined(XP_OPENBSD)/' \
>   ${WRKSRC}/browser/app/profile/000-tor-browser.js
> - ln -s ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
> + ln -fs ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
> +
> + # add bridges that we support
> +.for pt in meek-azure obfs4
> + I=1; \
> + cat ${WRKDIR}/tor/pluggable_transports/bridges_list.${pt}.txt | while 
> read -r line ; do \
> + echo "pref(\"extensions.torlauncher.default_bridge.${pt}.$$I\", 
> \"$$line\");" >>${WRKSRC}/browser/app/profile/000-tor-browser.js; \
> + I=$$((I + 1)); \
> + done
> +.endfor
>  
>   ${SUBST_CMD} ${WRKSRC}/xpcom/build/BinaryPath.h
>  
> Index: browser/distinfo
> ===
> RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
> retrieving revision 1.59
> diff -u -p -r1.59 distinfo
> --- browser/distinfo  13 Dec 2022 19:35:35 -  1.59
> +++ browser/distinfo  16 Dec 2022 17:15:02 -
> @@ -1,4 +1,6 @@
>  SHA256 (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = 
> 1lAT1yT2ACsBRz5800oRco3PXjOQu3FlAYwfQuQugtQ=
>  SHA256 (mozilla/tor-browser-linux64-12.0_ALL.tar.xz) = 
> hQzmAdgVusY+T1k3ZG0rSXFzviiyezCnUm67lGpFmHQ=
> +SHA256 (mozilla/tor-expert-bundle-12.0-linux-x86_64.tar.gz) = 
> ksI//Z32/KB6fgamVCtk1ew2LnNKJopBEN7H1caZWc8=
>  SIZE (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = 
> 512766100
>  SIZE (mozilla/tor-browser-linux64-12.0_ALL.tar.xz) = 105202872
> +SIZE (mozilla/tor-expert-bundle-12.0-linux-x86_64.tar.gz) = 17666538
> Index: browser/files/torrc-defaults
> ===
> RCS file: /cvs/ports/www/tor-browser/browser/files/torrc-defaults,v
> retrieving revision 1.1
> diff -u -p -r1.1 torrc-defaults
> --- browser/files/torrc-defaults  13 Feb 2020 07:41:53 -  1.1
> +++ browser/files/torrc-defaults  16 Dec 2022 17:15:02 -
> @@ -20,7 +20,10 @@ GeoIPv6File ${LOCALBASE}/share/tor/geoip
>  #ClientTransportPlugin fte exec fteproxy --managed
>  
>  ## obfs4proxy configuration
> -#ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec obfs4proxy
> +ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec 
> /usr/local/bin/obfs4proxy
> +
> +## snowflake configuration
> +#ClientTransportPlugin snowflake exec /usr/local/bin/snowflake_client
>  
>  ## flash proxy configuration
>  #



Re: [update] i2pd-2.44.0

2022-12-18 Thread Yifei Zhan
On 22/11/21 09:15PM, Ganymede wrote:
> Hi,
> 
> Here's an update for net/i2pd.
> 
> The main feature of this release is that SSU2, a novel UDP-based
> communication protocol developed for the I2P network, is now enabled by
> default. It also brings other improvements and bug fixes.
> 
> Changelog : https://github.com/PurpleI2P/i2pd/releases/tag/2.44.0
> 
> I could build and run i2pd-2.44.0 on -current and -stable on amd64. It has
> been working flawlessly for me on -stable for 24 hours.

Tested on arm64 and amd64, I'm able to browse sites hosted within the i2p 
network, it takes sometime to bootstrap but after which it's very usable.



ping: butch update: fcitx and related pkgs

2022-12-17 Thread Yifei Zhan
ping

On 22/11/26 03:40AM, Yifei Zhan wrote:
> This is a butch update for fcitx* and its dependence, mainly translation 
> updates 
> and bugfixes, nothing major.
> 
> Tested on amd64 with gedit/kate/sakura, no problem found.
> 
> I'm trying to automate my workflow and patch generation is largely automated 
> in 
> this email, please let me know if you encountered any problem applying them.
> 
> opencc 1.1.3 -> 1.1.4
>   - Add support for Python 3.10
>   - Remove build for Python 2.7/3/5/3.6 and Node 10 (EOL)
> 
> libime 1.0.11 -> 1.0.15
>   - Updates for language models
> 
> xcb-imdkit 1.0.3 -> 1.0.4
>   - Bumped so version
> 
> fcitx 5.0.15 -> 5.0.21
>   - Updated path to dictionary
>   - Updated emoji dictionaries
> (not useful for us yet, emoji display/input outside browsers are largely 
> broken)
> 
> fcitx-lua 5.0.5 -> 5.0.10
>   - New hacky patch introduced to fix broken bundled _RESOLVE_LIBRARY_PATH
> 
> fcitx-table-extra 5.0.9 -> 5.0.12
> fcitx-gtk 5.0.13 -> 5.0.21
> fcitx-chinese-addons  5.0.12 -> 5.0.16
> fcitx-qt  5.0.9 -> 5.0.16
>   - Mainly translation updates
> 
> fcitx-config-qt 5.0.12 -> 5.0.16
>   - regen WANTLIB
>   - New libdep KF5Plasma
>   - make lib-depends-check complains:
>  Missing: KF5Plasma.12 from plasma-framework-5.100.1 
> (/usr/local/bin/fcitx5-plasma-theme-generator)
>  WANTLIB += KF5Plasma
>  ... but I already had KF5Plasma decleared in WANTLIB, anyone got an idea on 
> what I missed?
> 

> Index: inputmethods/fcitx-chinese-addons/Makefile
> ===
> RCS file: /cvs/ports/inputmethods/fcitx-chinese-addons/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- inputmethods/fcitx-chinese-addons/Makefile15 May 2022 09:14:56 
> -  1.3
> +++ inputmethods/fcitx-chinese-addons/Makefile26 Nov 2022 03:26:15 
> -
> @@ -1,9 +1,8 @@
>  COMMENT =addons related to Chinese with IME bundled inside fcitx
>  
> -V =  5.0.12
> +V =  5.0.16
>  DISTNAME =   fcitx5-chinese-addons-$V
>  PKGNAME =${DISTNAME:S/fcitx5/fcitx/}
> -REVISION =   0
>  
>  CATEGORIES = inputmethods chinese
>  
> Index: inputmethods/fcitx-chinese-addons/distinfo
> ===
> RCS file: /cvs/ports/inputmethods/fcitx-chinese-addons/distinfo,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 distinfo
> --- inputmethods/fcitx-chinese-addons/distinfo13 May 2022 15:37:47 
> -  1.1
> +++ inputmethods/fcitx-chinese-addons/distinfo26 Nov 2022 03:26:15 
> -
> @@ -1,6 +1,6 @@
> -SHA256 (fcitx/fcitx5-chinese-addons-5.0.12.tar.xz) = 
> +HLHVSkMqGEOv9IuFJK94GUCjG51tZVVtKgrA3e3kAU=
> +SHA256 (fcitx/fcitx5-chinese-addons-5.0.16.tar.xz) = 
> pGpmzCA8401HOi1qnHQphDePqisaNnjWIIs9NcK6/PA=
>  SHA256 (fcitx/py_stroke-20121124.tar.gz) = 
> jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=
>  SHA256 (fcitx/py_table-20121124.tar.gz) = 
> QhRqyX3mwT1V+eme2HORX0xmc56cEVMqNFVrrfl5LAQ=
> -SIZE (fcitx/fcitx5-chinese-addons-5.0.12.tar.xz) = 229780
> +SIZE (fcitx/fcitx5-chinese-addons-5.0.16.tar.xz) = 233420
>  SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601
>  SIZE (fcitx/py_table-20121124.tar.gz) = 186822
> Index: inputmethods/fcitx-chinese-addons/pkg/PLIST
> ===
> RCS file: /cvs/ports/inputmethods/fcitx-chinese-addons/pkg/PLIST,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 PLIST
> --- inputmethods/fcitx-chinese-addons/pkg/PLIST   13 May 2022 15:37:47 
> -  1.1
> +++ inputmethods/fcitx-chinese-addons/pkg/PLIST   26 Nov 2022 03:26:15 
> -
> @@ -1,7 +1,4 @@
>  @bin bin/scel2org5
> -include/Fcitx5/
> -include/Fcitx5/Module/
> -include/Fcitx5/Module/fcitx-module/
>  include/Fcitx5/Module/fcitx-module/pinyinhelper/
>  include/Fcitx5/Module/fcitx-module/pinyinhelper/pinyinhelper_public.h
>  include/Fcitx5/Module/fcitx-module/punctuation/
> @@ -12,17 +9,13 @@ lib/cmake/Fcitx5ModulePinyinHelper/Fcitx
>  lib/cmake/Fcitx5ModulePunctuation/
>  lib/cmake/Fcitx5ModulePunctuation/Fcitx5ModulePunctuationConfig.cmake
>  lib/cmake/Fcitx5ModulePunctuation/Fcitx5ModulePunctuationConfigVersion.cmake
> -lib/fcitx5/
>  @so lib/fcitx5/libchttrans.so
>  @so lib/fcitx5/libfullwidth.so
>  @so lib/fcitx5/libpinyin.so
>  @so lib/fcitx5/libpinyinhelper.so
>  @so lib/fcitx5/libpunctuation.so
>  @so lib/fcitx5/libtable.so
> -lib/fcitx5/qt5/
>  @so lib/fcitx5/qt5/libpinyindictmanager.so
> -share/fcitx5/
> -share/fcitx5/addon/
>  share/fcitx5/addon/chttrans.con

Re: NEW: sysutils/xmem

2022-12-17 Thread Yifei Zhan
On 22/12/05 01:59PM, Michael wrote:
> Ping.

Tested on arm64 and amd64, works fine.
This needs one more ok to get in, anyone wants to do it?


> 
> On Wed, Nov 23, 2022 at 09:13:48PM +0100, Michael wrote:
> > Ping.
> > 
> > On Mon, Nov 14, 2022 at 10:41:30AM +0100, Omar Polo wrote:
> > > Hello,
> > > 
> > > On 2022/11/13 11:05:51 +0100, Michael  wrote:
> > > > Hi ports,
> > > > 
> > > > another attempt to get sysutils/xmem in, last one was 2021 [1]. This 
> > > > revision has the RCS IDs removed and HOMEPAGE [2] updated.
> > > > 
> > > > From pkg/DESCR:
> > > > Graphical application that displays memory and swap usage.
> > > > 
> > > > Tested on amd64.
> > > 
> > > Oh, i remember this one!
> > > 
> > > The "restrictions" in the license comment is just the following
> > > clausole added to the MIT license:
> > > 
> > > : Except as contained in this notice, the name of the X Consortium shall
> > > : not be used in advertising or otherwise to promote the sale, use or
> > > : other dealings in this Software without prior written authorization from
> > > : the X Consortium.
> > > 
> > > that I guess it's not a blocker for PERMIT_PACKAGE.
> > > 
> > > ok op@ to import.
> > > 
> > > > [1] https://marc.info/?l=openbsd-ports&m=161521843031914&w=2
> > > > [2] https://git.sdf.org/bch/xmem
> > > 
> 



Re: [new] mail/rssgoemail: send RSS/Atom/Gemini feeds to email

2022-12-17 Thread Yifei Zhan
On 22/12/16 09:29PM, Omar Polo wrote:
> Hi,
> 
> I've been using this for quite some time, it's really handy.  It's
> meant to be run from cron and is similar otherwise to rss2email, but
> supports Gemini feeds and Rss/Atom served via the Gemini protocol too.
> 


I like how simple this is, tested on arm64 with a few RSS sources, works great 
so far.



Re: UPDATE: Tor Browser 12.0

2022-12-12 Thread Yifei Zhan
On 22/12/08 06:27PM, Caspar Schutijser wrote:
> Hi,
> 
> Below is a diff that updates Tor Browser to 12.0 (the actual release,
> not an alpha version). Tested on amd64. (Extensive) release notes:
> https://blog.torproject.org/new-release-tor-browser-120/
> 
> Diff for 7.2-stable to follow.
> 
> Comments or OKs?
> 

Looks good to me, JS blocking/fonts/.onion access all work fine, the new 
language switcher doesn't work (only English available), but I18N never worked 
before so let's handle it next time.



butch update: fcitx and related pkgs

2022-11-25 Thread Yifei Zhan
x.Fcitx5.fcitx-chn.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-chttrans-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-erbi.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-pinyin.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-active.png
 share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-punc-inactive.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-active.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-remind-inactive.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-shuangpin.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wubi.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
 share/icons/hicolor/48x48/apps/fcitx-cangjie.png
 share/icons/hicolor/48x48/apps/fcitx-chn.png
 share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
@@ -122,8 +175,6 @@ share/icons/hicolor/48x48/apps/org.fcitx
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wbpy.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wubi.png
 share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-ziranma.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-active-symbolic.svg
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-active.svg
 share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive-symbolic.svg
@@ -149,7 +200,6 @@ share/locale/ko/LC_MESSAGES/fcitx5-chine
 share/locale/ru/LC_MESSAGES/fcitx5-chinese-addons.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5-chinese-addons.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5-chinese-addons.mo
-share/metainfo/
 @tag update-desktop-database
 share/metainfo/org.fcitx.Fcitx5.Addon.ChineseAddons.metainfo.xml
 @tag gtk-update-icon-cache %D/share/icons/hicolor
Index: inputmethods/fcitx-config-qt/Makefile
===
RCS file: /cvs/ports/inputmethods/fcitx-config-qt/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- inputmethods/fcitx-config-qt/Makefile   13 May 2022 18:59:19 -  
1.2
+++ inputmethods/fcitx-config-qt/Makefile   26 Nov 2022 03:26:27 -
@@ -1,9 +1,8 @@
 COMMENT =  GUI configure tool for fcitx5
 
-V =5.0.12
+V =5.0.16
 DISTNAME = fcitx5-configtool-$V
 PKGNAME =  fcitx-configtool-qt-$V
-REVISION = 0
 
 CATEGORIES =   inputmethods
 
@@ -14,11 +13,12 @@ MAINTAINER =Yifei Zhan https://download.fcitx-im.org/fcitx5/fcitx5-configtool/
 DIST_SUBDIR =  fcitx
@@ -38,8 +38,10 @@ RUN_DEPENDS =devel/desktop-file-utils 
 LIB_DEPENDS =  inputmethods/fcitx-qt \
x11/qt5/qtx11extras \
devel/kf5/kdeclarative \
+   devel/kf5/plasma-framework \
devel/kf5/ki18n \
devel/kf5/kitemviews
+
 
 CONFIGURE_ARGS =   -DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5/cmake
 
Index: inputmethods/fcitx-config-qt/distinfo
===
RCS file: /cvs/ports/inputmethods/fcitx-config-qt/distinfo,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 distinfo
--- inputmethods/fcitx-config-qt/distinfo   13 May 2022 15:37:47 -  
1.1
+++ inputmethods/fcitx-config-qt/distinfo   26 Nov 2022 03:26:27 -
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx5-configtool-5.0.12.tar.xz) = 
KT2lLbrJh6PEiAQzpKk7+LO0XirD13ywJfdtyFkwKhs=
-SIZE (fcitx/fcitx5-configtool-5.0.12.tar.xz) = 106168
+SHA256 (fcitx/fcitx5-configtool-5.0.16.tar.xz) = 
7ivOWmVQi4BKyOtrLsBrIA7VSODqgw0tAblWNSv0yBo=
+SIZE (fcitx/fcitx5-configtool-5.0.16.tar.xz) = 113112
Index: inputmethods/fcitx-config-qt/pkg/PLIST
===
RCS file: /cvs/ports/inputmethods/fcitx-config-qt/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST
--- inputmethods/fcitx-config-qt/pkg/PLIST  13 May 2022 15:37:47 -  
1.1
+++ inputmethods/fcitx-config-qt/pkg/PLIST  26 Nov 2022 03:26:27 -
@@ -1,4 +1,5 @@
 @bin bin/fcitx5-config-qt
+@bin bin/fcitx5-plasma-theme-generator
 @bin bin/kbd-layout-viewer5
 lib/qt5/plugins/kcms/
 @so lib/qt5/plugins/kcms/kcm_fcitx5.so
@@ -30,7 +31,6 @@ share/kpackage/kcms/org.fcitx.fcitx5.kcm
 share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/utils.js
 share/kpackage/kcms/org.fcitx.fcitx5.kcm/metadata.desktop
 share/kpackage/kcms/org.fcitx.fcitx5.kcm/metadata.json
-share/kservices5/
 share/kservices5/kcm_fcitx5.desktop
 share/locale/ca/LC_MESSAGES/fcitx5-configtool.mo
 share/locale/ca/LC_MESSAGES/org

Re: Tor Browser: why is there no built-in bridges?

2022-11-24 Thread Yifei Zhan
On 22/11/24 10:22PM, Caspar Schutijser wrote:
> Hi,
> 
> On Thu, Nov 24, 2022 at 05:27:59PM +0300, u...@disroot.org wrote:
> > > OK, I think you need to install obfs4proxy and then  configure your
> > > Tor Browser.  Here is my configuration in file ~/TorBrowser-Data/torrc:
> > 
> > > ClientOnionAuthDir ...
> > > ClientTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
> > > DataDirectory ...
> > > UseBridges 1
> > > Bridge obfs4 ...
> > > Bridge obfs4 ...
> > 
> > Thank you! This works. Though I still wonder why on OpenBSD I need
> > to know how to configure torrc in order to get my bridges to work,
> > where on other os's I could just select built-in ones or paste
> > bridges as normal. Maybe somebody knows why this is the case? Do
> > maintainers on other os's just do additional configuration for
> > their users, but OpenBSD sticks to vanilla experience? Or was it a
> > change to reduce the attack surface for the majority of people who
> > don't live in a country where Tor is blocked?
> 

(Adding to what Caspar said)

OpenBSD's Tor Browser port is built differently from Linux's, as far as I know 
most Linux distros' TBB package is based on Tor Project's prebuilt binary, 
while 
OpenBSD needs to build it from source, and the part of the work for bridge 
integration is still WIP.

> 
> If anyone wants to help, that's appreciated. I saw some configuration
> snippets in some other emails, that already helps a bit. If anyone has
> drafts for diffs to Tor Browser, that would help as well.
> www/tor-browser/browser/files/torrc-defaults seems to be one piece of
> the puzzle.

I have some WIP diffs which I will send out soon, once I finished some other 
updates.



fix veracrypt mount volume, vnconfig no longer accepts -c option

2022-11-23 Thread Yifei Zhan
vnconfig used to accept a -c option for configuring virtual disk node, but this 
option is not required as configuring virtual disk node is always the default 
operation. Since OpenBSD 5.6, this option is no longer accepted and will result 
in an error, preventing veracrypt from mounting any volume.

This change removes the -c option when invoking vnconfig. I've taken this patch 
upstream[1], before that got merged, we can have it in-tree.

also cc' maintainer

[1]: https://github.com/veracrypt/VeraCrypt/pull/1002


Index: Makefile
===
RCS file: /cvs/ports/security/veracrypt/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile14 Mar 2022 11:07:46 -  1.3
+++ Makefile23 Nov 2022 00:00:52 -
@@ -5,6 +5,7 @@ DISTNAME=   VeraCrypt_${V}_Source
 PKGNAME=   veracrypt-${V}
 CATEGORIES=security
 HOMEPAGE=  https://www.veracrypt.fr/
+REVISION=  0
 
 MAINTAINER=Tietoturvamies 
 
Index: patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp
===
RCS file: patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp
diff -N patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Core_Unix_OpenBSD_CoreOpenBSD_cpp 23 Nov 2022 00:00:52 
-
@@ -0,0 +1,14 @@
+The -c option is no more
+
+Index: Core/Unix/OpenBSD/CoreOpenBSD.cpp
+--- Core/Unix/OpenBSD/CoreOpenBSD.cpp.orig
 Core/Unix/OpenBSD/CoreOpenBSD.cpp
+@@ -69,8 +69,6 @@ namespace VeraCrypt
+   if (freeVnd == -1)
+   throw "couldn't find free vnd";
+ 
+-  args.push_back ("-c");
+-
+   stringstream freePath;
+   freePath << "vnd" << freeVnd;
+   args.push_back (freePath.str());



Re: [new] textproc/opensearch

2022-06-13 Thread Yifei Zhan
On 22/05/26 11:20AM, Omar Polo wrote:
> Hello ports,
> 
> now that we have an updated jna, here's the port that I was working on:
> 
> % pkg_info opensearch
> Information for inst:opensearch-1.3.2
> 

I tested this on my amd64 box, the package can be built, but I'm unable to 
start it:

# doas -u _opensearch /usr/local/opensearch/bin/opensearch

# There is insufficient memory for the Java Runtime Environment to continue.
# Native memory allocation (mmap) failed to map 1073741824 bytes for Failed to 
commit area from 0xc000 to 0x0001 of length 1073741824.
# An error report file with more information is saved as:
# /var/log/opensearch/hs_err_pid11809.log
error:
OpenJDK 64-Bit Server VM warning: INFO: os::commit_memory(0xc000, 
1073741824, 0) failed; error='ENOMEM' (errno=12)
at 
org.opensearch.tools.launchers.JvmErgonomics.flagsFinal(JvmErgonomics.java:139)
at 
org.opensearch.tools.launchers.JvmErgonomics.finalJvmOptions(JvmErgonomics.java:101)
at 
org.opensearch.tools.launchers.JvmErgonomics.choose(JvmErgonomics.java:72)
at 
org.opensearch.tools.launchers.JvmOptionsParser.jvmOptions(JvmOptionsParser.java:152)
at 
org.opensearch.tools.launchers.JvmOptionsParser.main(JvmOptionsParser.java:110)

(full log file was sent off-list)

I've bumped the maxfiles, login class and allocated 22GB of RAM to this test 
box:

$ sysctl | grep files
kern.maxfiles=65535

$ vmstat
  
 procsmemory   pagediskstraps  cpu
 r   s   avm fre  flt  re  pi  po  fr  sr wd0 cd0  int   sys   cs us sy id
 1  73  224M  19920M 5988   0   0   0   0   0 144   0  167  8965 1401  4  5 91

login.conf:

opensearch:\
:openfiles=65536:\
:tc=daemon:

I also tried:

opensearch:\
:datasize-cur=infinity:\
:datasize-max=infinity:\
:openfiles-max=16384:\
:openfiles-cur=16384:\
:tc=daemon:

... but the errors remain

If I try to start it with rcctl, it will fail after a few seconds:

$ doas rcctl start opensearch; sleep 10; doas rcctl check opensearch;
opensearch(ok)
opensearch(failed)

Have I missed something?



Re: Use correct IM_MODULE variables for setting up scim

2021-10-08 Thread Yifei Zhan
=On 21/10/06 03:05PM, Shawn Chiou wrote:
> Hi,
> 
> I've tested your setting with SCIM on OpenBSD 7.0, but it's not working.
> 
> I also tested with "old setting" (see below), but it's not working, too.
> 
> > LC_LANG=C
> > LC_CTYPE=zh_TW.UTF-8
> >
> export XMODIFIERS="@im=SCIM"
> > export GTK_IM_MODULE="scim"
> > export QT_IM_MODULE="scim"
> > /usr/local/bin/scim -d
> >
> 
> Can you provide more information about your environment? for example, your


My configuration is pretty simple:

export LC_ALL="en_US.UTF-8"
export GTK_IM_MODULE="xim"
export QT_IM_MODULE="xim"
export XMODIFIERS="@im=SCIM"
/usr/local/bin/scim -d

Do you have any input schemes installed? (e.g. scim-chewing/scim-pinyin) 
scim on its own is generally not very useful.




Re: Use correct IM_MODULE variables for setting up scim

2021-10-04 Thread Yifei Zhan
ping

On 21/09/22 10:52PM, Yifei Zhan wrote:
> At the moment, the readme file for scim asks users to set QT_IM_MODULE 
> and GTK_IM_MODULE to "scim", which is incorrect and prevent scim from 
> being activated. To make scim usable, they should be set to "xim".
> 
> Tested on OpenBSD 7.0 GENERIC.MP#223 @amd64
> 
> This problem is reported by f5b from gobsd.org
> 
> Index: README
> ===
> RCS file: /cvs/ports/inputmethods/scim/pkg/README,v
> retrieving revision 1.3
> diff -u -r1.3 README
> --- README4 Sep 2018 12:46:14 -   1.3
> +++ README22 Sep 2021 22:38:20 -
> @@ -7,8 +7,8 @@
>  To make SCIM work when X is started add the following lines to
>  ~/.xinitrc or ~/.xsession:
>  
> -export GTK_IM_MODULE="scim"
> -export QT_IM_MODULE="scim"
> +export GTK_IM_MODULE="xim"
> +export QT_IM_MODULE="xim"
>  export XMODIFIERS="@im=SCIM"
>  ${TRUEPREFIX}/bin/scim -d
>  
> 



Re: net/onionshare-gui broken and net/onionshare maybe broken

2021-09-23 Thread Yifei Zhan
On 21/09/21 10:13AM, Stuart Henderson wrote:
...
>
> Looks like the problem is entirely down to py-stem which is incompatible
> with Python 3.8. This update fixes it (change to py3-only while there
> because the py2 version is unused, and it removes some mess from the port)
> 
> net/nyx also uses py-stem. It doesn't work with the update, but it
> didn't work before either.

Nyx works for me here with this update, tested on OpenBSD 7.0 
GENERIC.MP#223 amd64. What error have you encountered?



Use correct IM_MODULE variables for setting up scim

2021-09-22 Thread Yifei Zhan
At the moment, the readme file for scim asks users to set QT_IM_MODULE 
and GTK_IM_MODULE to "scim", which is incorrect and prevent scim from 
being activated. To make scim usable, they should be set to "xim".

Tested on OpenBSD 7.0 GENERIC.MP#223 @amd64

This problem is reported by f5b from gobsd.org

Index: README
===
RCS file: /cvs/ports/inputmethods/scim/pkg/README,v
retrieving revision 1.3
diff -u -r1.3 README
--- README  4 Sep 2018 12:46:14 -   1.3
+++ README  22 Sep 2021 22:38:20 -
@@ -7,8 +7,8 @@
 To make SCIM work when X is started add the following lines to
 ~/.xinitrc or ~/.xsession:
 
-export GTK_IM_MODULE="scim"
-export QT_IM_MODULE="scim"
+export GTK_IM_MODULE="xim"
+export QT_IM_MODULE="xim"
 export XMODIFIERS="@im=SCIM"
 ${TRUEPREFIX}/bin/scim -d
 



Re: add unveil path required by fcitx to chromium

2021-09-12 Thread Yifei Zhan
On 21/09/10 01:29PM, Kevin Lo wrote:
> 
> When I used fcitx-chewing, I also needed to add the line "~/.chewing r" 
> to unveil.main for both firefox and chromium in order to make it work.
> It seems that there's no need to add that anymore.
> The diff below enables fcitx input method by expending unveiled directories.
> ok?
> 
> Index: www/mozilla-firefox/files/unveil.main
> ===
> RCS file: /cvs/ports/www/mozilla-firefox/files/unveil.main,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 unveil.main
> --- www/mozilla-firefox/files/unveil.main 13 Jul 2021 15:25:30 -  
> 1.10
> +++ www/mozilla-firefox/files/unveil.main 10 Sep 2021 05:21:59 -
> @@ -56,6 +56,7 @@ $XDG_RUNTIME_DIR/dconf rwc
>  $XDG_CACHE_HOME/thumbnails rwc
>  $XDG_CACHE_HOME/mozilla/firefox rwc
>  $XDG_CONFIG_HOME/dconf rw
> +$XDG_CONFIG_HOME/fcitx r
>  $XDG_CONFIG_HOME/fontconfig r
>  $XDG_CONFIG_HOME/gtk-3.0 r
>  $XDG_CONFIG_HOME/mimeapps.list r

I'm not sure if change to firefox is actually needed because I can use 
fcitx on firefox without any change to its unveil configuration.

(I tested with fcitx-{pinyin,chewing,anthy})



Re: add unveil path required by fcitx to chromium

2021-09-09 Thread Yifei Zhan
On 21/09/09 02:35PM, Kevin Lo wrote:
>
> This has been discussed before:
> https://marc.info/?t=15781134382&r=1&w=2

Is there an unified path list for IME that I'm not aware of? I've read 
that thread before but it doesn't mention chromium and I still have to 
add that path manually here.



add unveil path required by fcitx to chromium

2021-09-09 Thread Yifei Zhan
Hi,

At the moment fcitx and ibus don't work with chromium, after some 
hacking around with ktrace/kdump, it looks like read access to 
~/.config/fcitx is required for fcitx to work, which is what the 
following patch does.

I don't know how to make ibus work with chromium yet, ktrace/kdump 
didn't show me any access error related to that. Any idea?

Tested with:
chromium 93.0.4577.63
fcitx-4.2.9.8p1
fcitx-anthy-0.2.4p0

Index: www/chromium/files/unveil.main
===
RCS file: /cvs/ports/www/chromium/files/unveil.main,v
retrieving revision 1.8
diff -u -r1.8 unveil.main
--- www/chromium/files/unveil.main  6 Jan 2020 16:05:06 -   1.8
+++ www/chromium/files/unveil.main  9 Sep 2021 05:15:18 -
@@ -1,5 +1,4 @@
 # $OpenBSD: unveil.main,v 1.8 2020/01/06 16:05:06 robert Exp $
-
 # needed for video(4)
 /dev/video rw
 
@@ -8,6 +7,9 @@
 
 # needed for chromium
 /etc/chromium r
+
+# needed for fcitx
+~/.config/fcitx r
 
 # needed for fontconfig
 /etc/fonts r




Re: update: audio/ffmpeg-normalize: 1.20.0 -> 1.22.1

2021-09-02 Thread Yifei Zhan
friendly ping...

anyone wants to commit this and the new dep 
multimedia/py-ffmpeg-progress-yield?

On 21/08/10 11:46PM, Kurt Mosiejczuk wrote:
> On Tue, Aug 10, 2021 at 10:02:49AM +0100, Stuart Henderson wrote:
> 
> > Missing ${MODPY_FLAVOR}
> 
> > >   devel/py-tqdm${MODPY_FLAVOR} \
> > >   graphics/ffmpeg
> 
> > > +TEST_DEPENDS =   devel/py3-test
> 
> > Missing ${MODPY_FLAVOR}, and there is no port devel/py3-test, it is 
> > devel/py-test
> 
> > >  do-test:
> > >   cd ${WRKSRC} && ${MODPY_BIN} test/test.py
> 
> Here's a version that fixes those issues and gets rid of the custom py-test
> stuff since MODPY_PYTEST was created to _not_ do that sort of thing.
> 
> --Kurt
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/ffmpeg-normalize/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  23 Feb 2021 19:39:09 -  1.2
> +++ Makefile  11 Aug 2021 03:43:55 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =audio normalization
>  
> -MODPY_EGG_VERSION =  1.20.0
> +MODPY_EGG_VERSION =  1.22.1
>  DISTNAME =   ffmpeg-normalize-${MODPY_EGG_VERSION}
>  
>  CATEGORIES = audio
> @@ -16,12 +16,12 @@ MODULES = lang/python
>  
>  MODPY_PI =   Yes
>  MODPY_SETUPTOOLS =   Yes
> +MODPY_PYTEST =   Yes
> +MODPY_PYTEST_ARGS =  test/test.py
>  
>  RUN_DEPENDS =devel/py-colorama${MODPY_FLAVOR} \
> + multimedia/py-ffmpeg-progress-yield${MODPY_FLAVOR} \
>   devel/py-tqdm${MODPY_FLAVOR} \
>   graphics/ffmpeg
> -
> -do-test:
> - cd ${WRKSRC} && ${MODPY_BIN} test/test.py
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/ffmpeg-normalize/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  15 Jul 2020 20:39:52 -  1.1.1.1
> +++ distinfo  11 Aug 2021 03:43:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (ffmpeg-normalize-1.20.0.tar.gz) = 
> jMQ1HOBupKbuTHXzzV7jUhunxn1009elFlScOIbIFmM=
> -SIZE (ffmpeg-normalize-1.20.0.tar.gz) = 1961421
> +SHA256 (ffmpeg-normalize-1.22.1.tar.gz) = 
> 34JgUyEtVAqxu+mBlYf8vzYWL4wlNa6FuIslLkfW1jI=
> +SIZE (ffmpeg-normalize-1.22.1.tar.gz) = 1965311



Re: update: devel/apktool 2.4.0 -> 2.5.0

2021-09-01 Thread Yifei Zhan
On 21/08/14 01:33PM, octeep wrote:
> 
> I've tested apktool 2.5.0 with this patch. Decompiling works, however
> re-compiling from the decompiled files do not work.

Thanks for testing that, I totally forgot apktool can compile apk as 
well. However it looks like this is not a problem with apktool itself, 
but a problem with aapt2, which does not support *BSD. I doubt if it can 
be fixed in near term due to the complexity of the android building 
infrastructure. 

I don't have strong opinions on whatever this should be merged in the 
current state so I will leave it here.



Re: teach PortGen to not use MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}

2021-08-19 Thread Yifei Zhan
On 21/08/14 02:05PM, Stuart Henderson wrote:
...
> 
> That's not quite right, it needs to do the following:
> 
> - if the port is python 2 only, set MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> 
> - if the port is python 3 only, set FLAVOR = python3 / FLAVORS = python3
> 
> - undecided about ports which support py2+3; I think at this point we should
> probably treat them the same as py3-only because we don't really want to be
> importing new py2 ports, i.e. also FLAVOR = python3 / FLAVORS = python3

Thanks for your feedback, I made a new patch aims to do the above. I 
tested it on a few different PyPI packages and the output Makefile 
matched my expectation. However since I'm not exactly sure how portgen 
worked, it probably needs more tweaking.

> (Related issue with portgen, get_deps returns all deps, it should skip py2
> deps for a py3 port, otherwise it tries to create ports for things which
> are unused in py3-land because they're part of python itself, it would
> be nice to solve this automatically, but at least it means that when
> portgen-created ports are reviewed that should be taken into account).
> 

I worked on this for a bit, but it's been quite difficult as I can't 
debug portgen effectively, do you know if there is a way to trace it? 
(e.g. like `bash -x`)

P.S. I left the Makefile template untouched since it seems to be for 
ordering things only.

Index: PyPI.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm,v
retrieving revision 1.19
diff -u -r1.19 PyPI.pm
--- PyPI.pm 30 Apr 2020 23:04:48 -  1.19
+++ PyPI.pm 19 Aug 2021 08:44:56 -
@@ -114,16 +114,13 @@
@{ $di->{info}{classifiers} };
};
 
-   if ( @versions > 1 ) {
-   shift @versions;# remove default, lowest
-   $self->{reset_values}{MODPY_VERSION} = 1;
+   if ( @versions > 1 ) {  # support both py2/py3
+   shift @versions;# remove lowest version, use py3 only
$self->set_other( 'FLAVORS', "python$_" ) for @versions;
$self->set_other( 'FLAVOR', "python$versions[-1]" );
-   } elsif ( @versions && $versions[0] != 2 ) {
-   $self->{reset_values}{$_} = 1 for qw( FLAVORS FLAVOR );
+   } elsif ( @versions && $versions[0] == 2 ) { # python2 only
$self->set_other(
-   MODPY_VERSION => "\${MODPY_DEFAULT_VERSION_$_}" )
-   for @versions;
+   MODPY_VERSION => "\${MODPY_DEFAULT_VERSION_$versions[0]}" )
}
 }
 



teach PortGen to not use MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}

2021-08-14 Thread Yifei Zhan
Hi,

At the moment portgen will add 

  `MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}` 

to new python3 port's Makefile by default, which seems to be outdated.

The following patch stop that from happening.

comment? feedback?

Index: infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm,v
retrieving revision 1.19
diff -u -r1.19 PyPI.pm
--- infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm 30 Apr 2020 23:04:48 
-  1.19
+++ infrastructure/lib/OpenBSD/PortGen/Port/PyPI.pm 14 Aug 2021 11:48:17 
-
@@ -119,7 +119,7 @@
$self->{reset_values}{MODPY_VERSION} = 1;
$self->set_other( 'FLAVORS', "python$_" ) for @versions;
$self->set_other( 'FLAVOR', "python$versions[-1]" );
-   } elsif ( @versions && $versions[0] != 2 ) {
+   } elsif ( @versions && $versions[0] != 2 && $versions[0] != 3 ) {
$self->{reset_values}{$_} = 1 for qw( FLAVORS FLAVOR );
$self->set_other(
MODPY_VERSION => "\${MODPY_DEFAULT_VERSION_$_}" )



Re: update: devel/apktool 2.4.0 -> 2.5.0

2021-08-13 Thread Yifei Zhan
ping

On 21/08/03 01:12PM, Yifei Zhan wrote:
> Hi,
> 
> The following patchset update devel/apktool from 2.4.0 to 2.5.0. Tested 
> on amd64 with a few different apk files, works fine.
> 
> This update adds support for Android 11 along with some small buxfixes.
> 
> P.S.: There is a line in the changelog saying[1]:
> 
> Deprecate 32 bit operating systems.
> 
> ... but I don't have any 32bit machine to test if this affect OpenBSD, 
> so I didn't add a NOT_FOR_ARCHS line.
> 
> [1]: https://github.com/iBotPeaches/Apktool/issues/2053#issuecomment-735302628
> 
> changelog: 
> https://connortumbleson.com/2020/12/02/apktool-v2-5-0-released/
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/apktool/Makefile,v
> retrieving revision 1.22
> diff -u -p -u -r1.22 Makefile
> --- Makefile  19 May 2021 01:50:29 -  1.22
> +++ Makefile  3 Aug 2021 12:06:58 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT =tool for reverse engineering Android apk files
>  
> -DISTNAME =   apktool_2.4.0
> -REVISION =   2
> +DISTNAME =   apktool_2.5.0
>  PKGNAME =${DISTNAME:S/_/-/}
>  
>  CATEGORIES = devel security java
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/apktool/distinfo,v
> retrieving revision 1.15
> diff -u -p -u -r1.15 distinfo
> --- distinfo  15 Mar 2019 10:49:42 -  1.15
> +++ distinfo  3 Aug 2021 12:06:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (apktool_2.4.0.jar) = oPEW6JFtbyEWDhVZhHu4uMMu5xkA8yHK/q2+N7h+vME=
> -SIZE (apktool_2.4.0.jar) = 16314178
> +SHA256 (apktool_2.5.0.jar) = s5LXy5m1kunFrMPAbxsPGA7d6WxmuGs9aTK3wMQHn+Q=
> +SIZE (apktool_2.5.0.jar) = 19300357
> 



Re: UPDATE: Tor Browser 10.5.4

2021-08-11 Thread Yifei Zhan
On 21/08/11 06:32PM, Caspar Schutijser wrote:
> Hi,
> 
> The diff below updates Tor Browser to 10.5.4. Tested on amd64. More
> information can be found here:
> https://blog.torproject.org/new-release-tor-browser-1054

Tested here on another amd64 box, no issue so far.
Plugins work as well.



Re: update: audio/ffmpeg-normalize: 1.20.0 -> 1.22.1

2021-08-10 Thread Yifei Zhan
On 21/08/10 10:05AM, Stuart Henderson wrote:
> 
> If MODPY_PYTEST=Yes works then that would be better. (That automatically
> adds the dependency and sets a default test command).
> 

That doesn't seem to work here:

===>  Regression tests for ffmpeg-normalize-1.22.1
running test
WARNING: Testing via this command is deprecated and will be removed in a future 
version. Users looking for a generic test entry point independent of test 
runner are encouraged to use tox.
running egg_info
writing ffmpeg_normalize.egg-info/PKG-INFO
writing dependency_links to ffmpeg_normalize.egg-info/dependency_links.txt
writing entry points to ffmpeg_normalize.egg-info/entry_points.txt
writing requirements to ffmpeg_normalize.egg-info/requires.txt
writing top-level names to ffmpeg_normalize.egg-info/top_level.txt
reading manifest file 'ffmpeg_normalize.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'CONTRIBUTING.md'
adding license file 'LICENSE'
writing manifest file 'ffmpeg_normalize.egg-info/SOURCES.txt'
running build_ext

--
Ran 0 tests in 0.000s


It appears like the default command is deprecated and tox is now required for 
that.
Should I try to update tox in the tree and make it work that way?



Re: update: audio/ffmpeg-normalize: 1.20.0 -> 1.22.1

2021-08-10 Thread Yifei Zhan
On 21/08/10 08:36AM, Laurence Tratt wrote:
> 
> There is no such dependency (though there is a package of that name!) and so
> "make test" immediately fails. I guess you meant:
> 
>   TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
> 
> It then looks like the way the tests are run has changed and we now need to
> change do-test to something like:
> 
>   do-test:
>   cd ${WRKSRC} && py.test test/test.py
> 

oops, seems like I attached the debugging version before, sorry about 
that. Here is an improved version with those issues fixed.

 - added missing ${MODPY_FLAVOR}
 - updated do-test section
   > 25 passed in 55.46 seconds


Index: distinfo
===
RCS file: /cvs/ports/audio/ffmpeg-normalize/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo15 Jul 2020 20:39:52 -  1.1.1.1
+++ distinfo11 Aug 2021 01:50:37 -
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-normalize-1.20.0.tar.gz) = 
jMQ1HOBupKbuTHXzzV7jUhunxn1009elFlScOIbIFmM=
-SIZE (ffmpeg-normalize-1.20.0.tar.gz) = 1961421
+SHA256 (ffmpeg-normalize-1.22.1.tar.gz) = 
34JgUyEtVAqxu+mBlYf8vzYWL4wlNa6FuIslLkfW1jI=
+SIZE (ffmpeg-normalize-1.22.1.tar.gz) = 1965311

Index: Makefile
===
RCS file: /cvs/ports/audio/ffmpeg-normalize/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile23 Feb 2021 19:39:09 -  1.2
+++ Makefile11 Aug 2021 01:50:23 -
@@ -2,7 +2,7 @@
 
 COMMENT =  audio normalization
 
-MODPY_EGG_VERSION =1.20.0
+MODPY_EGG_VERSION =1.22.1
 DISTNAME = ffmpeg-normalize-${MODPY_EGG_VERSION}
 
 CATEGORIES =   audio
@@ -18,10 +18,13 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 
 RUN_DEPENDS =  devel/py-colorama${MODPY_FLAVOR} \
+   multimedia/py-ffmpeg-progress-yield${MODPY_FLAVOR} \
devel/py-tqdm${MODPY_FLAVOR} \
graphics/ffmpeg
 
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
+
 do-test:
-   cd ${WRKSRC} && ${MODPY_BIN} test/test.py
+   cd ${WRKSRC} && py.test test/test.py
 
 .include 



Re: new: multimedia/py-ffmpeg-progress-yield

2021-08-10 Thread Yifei Zhan
Thanks for the feedbacks!

Here is a tweaked version:

- comment and pkg/DESCR is changed to 'Python FFmpeg progress wrapper'

I agree this is a more discoverable line.

- MODPY_VERSION is replaced with FLAVORS=python3


py-ffmpeg-progress-yield.tgz
Description: GNU Zip compressed data


new: multimedia/py-ffmpeg-progress-yield

2021-08-10 Thread Yifei Zhan
Hi,

The attached port, py-ffmpeg-progress-yield, is a wrapper for ffmpeg, it 
executes an ffmpeg command with its progress yielded. It is a new rundep 
for new versions of audio/ffmpeg-normalize.

Tested on amd64 with ffmpeg-normalize.

web:
https://github.com/ZhanYF/static/raw/main/py-ffmpeg-progress-yield.tgz

comments? ok to import?


py-ffmpeg-progress-yield.tgz
Description: GNU Zip compressed data


update: audio/ffmpeg-normalize: 1.20.0 -> 1.22.1

2021-08-10 Thread Yifei Zhan
Hi,

This is an update for ffmpeg-nomalize from 1.20.0 to 1.22.1. It contains 
many minor bugfixes. I also added a missing TESTDEP.

Tested on amd64.

P.S.: This update requires multimedia/py-ffmpeg-progress-yield to be 
imported first.

Index: distinfo
===
RCS file: /cvs/ports/audio/ffmpeg-normalize/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo15 Jul 2020 20:39:52 -  1.1.1.1
+++ distinfo10 Aug 2021 04:22:45 -
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-normalize-1.20.0.tar.gz) = 
jMQ1HOBupKbuTHXzzV7jUhunxn1009elFlScOIbIFmM=
-SIZE (ffmpeg-normalize-1.20.0.tar.gz) = 1961421
+SHA256 (ffmpeg-normalize-1.22.1.tar.gz) = 
34JgUyEtVAqxu+mBlYf8vzYWL4wlNa6FuIslLkfW1jI=
+SIZE (ffmpeg-normalize-1.22.1.tar.gz) = 1965311

Index: Makefile
===
RCS file: /cvs/ports/audio/ffmpeg-normalize/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile23 Feb 2021 19:39:09 -  1.2
+++ Makefile10 Aug 2021 05:29:39 -
@@ -2,7 +2,7 @@
 
 COMMENT =  audio normalization
 
-MODPY_EGG_VERSION =1.20.0
+MODPY_EGG_VERSION =1.22.1
 DISTNAME = ffmpeg-normalize-${MODPY_EGG_VERSION}
 
 CATEGORIES =   audio
@@ -18,8 +18,11 @@ MODPY_PI =   Yes
 MODPY_SETUPTOOLS = Yes
 
 RUN_DEPENDS =  devel/py-colorama${MODPY_FLAVOR} \
+   multimedia/py-ffmpeg-progress-yield \
devel/py-tqdm${MODPY_FLAVOR} \
graphics/ffmpeg
+
+TEST_DEPENDS = devel/py3-test
 
 do-test:
cd ${WRKSRC} && ${MODPY_BIN} test/test.py



Re: Unbreak archivers/innoextract on all clang+ld.bfd archs (macppc AND mips64) (Was: Re: mips64 bulk build report)

2021-08-09 Thread Yifei Zhan
On 21/08/06 01:59PM, Charlene Wendling wrote:
> 
> I've tested on macppc where it builds OK; there is no changes for
> clang+ld.lld archs. I've no mips64 machine, so i can't test.
> 

Hi, I tested your patchset on mips64(octane), it builds fine.
I don't have any test case for it so can't test it further.



Re: new: devel/libmarisa: tire library wanted by some IME pkgs

2021-08-06 Thread Yifei Zhan
On 21/08/06 04:13PM, Stuart Henderson wrote:
> 
> make test fails to build, do you have any ideas about that?
> 
> 
> marisa-test.cc:21:23: error: expected unqualified-id
>   EXCEPT(trie.write(::fileno(stdout)), MARISA_STATE_ERROR);
>   ^
> /usr/include/stdio.h:410:19: note: expanded from macro 'fileno'
> #define fileno(p)   (!__isthreaded ? __sfileno(p) : (fileno)(p))
> ^
> 1 error generated.
> 

Thanks for your feedback, it seems like I need to remove the semicolons 
before `fileno()` in marisa-test.cc:

-  EXCEPT(trie.write(::fileno(stdout)), MARISA_STATE_ERROR);
+  EXCEPT(trie.write(fileno(stdout)), MARISA_STATE_ERROR);

The attached port is based on your tweaked version, and I include a 
patch for this issue. With that, all tests are passing, but I have to 
admit I'm not sure why this change is required for OpenBSD.

This version is also on the web:
https://github.com/ZhanYF/static/raw/main/libmarisa.tgz


libmarisa.tgz
Description: GNU Zip compressed data


new: devel/libmarisa: tire library wanted by some IME pkgs

2021-08-06 Thread Yifei Zhan
Hi,

The attached port is a C++ library for MARISA, which is a static and 
space-efficient trie data structure. This library is used by IME related 
packages such as libskk and librime, which I would like to import in 
future. 

I tested it on the following platforms using the included 
marisa-benchmark command, and with all titles in English wikipedia as 
input. It works fine.

Tested on:
   amd64
   aarch64 (rpi4)
   mips64el (loongson) (with reduced input)

... all running the latest snapshot.

The tarball is also available on the web:
https://github.com/ZhanYF/static/raw/main/libmarisa.tar

comments? ok to import?


libmarisa.tar
Description: Unix tar archive


Re: NEW: fonts/mononoki - re-post: any feedback?

2021-08-03 Thread Yifei Zhan
ping

On 21/07/22 02:10PM, Yifei Zhan wrote:
> Thanks! Also another friendly ping to this ML. :)
> 
> On 21/06/08 02:54PM, Stuart Henderson wrote:
> > On 2021/06/08 12:32, openbsd@zhan.science wrote:
> > > Hi,
> > > 
> > > Mononoki is a font created to enhance code formatting. It works well on 
> > > high and low resolution displays, and characters are distinguishable 
> > > from similar looking characters.
> > > 
> > > I have tested it on OpenBSD -CURRENT @amd64 and have been using it for
> > > 6 months.
> > > 
> > > Please help me check/import this port.
> > > 
> > > P.S.: this is a re-post of [1] as that mail haven't got any reply for the
> > > past 6 months.
> > > 
> > > [1]: https://marc.info/?l=openbsd-ports&m=161069664227175&w=2
> > 
> > 
> > 
> > Tweaked and updated version attached, this one is OK sthen@
> > 
> > 
> 
> 



Re: processor-dependent optimizations / libmarisa

2021-08-03 Thread Yifei Zhan
*ping*

(sorry if this comes up too often, but I really want to get this port 
imported as there are many updates on IME require it, or will require it 
soon.)

On 21/07/30 04:30AM, openbsd wrote:
> On 21/07/26 02:36PM, Stuart Henderson wrote:
> > Ports must not use cpu features detected at build time in the default
> > build.
> > 
> > In some special cases it might make sense to have a "native" flavour
> > that is not linked to the build by default (i.e. so packages are not
> > normally built) as long as that doesn't change the ABI.
> > 
> > On amd64 you can use SSE2 which is present on all 64-bit capable CPUs,
> > anything else should either have a runtime cpuid check and fall back to
> > another implementation, or in some special cases where something else
> > is required for the software to work at all (e.g. in textproc/hyperscan)
> > then it will need something else which we'd probably want to look at
> > case-by-case.
> 
> Thanks. Perhaps I should put this into faq/ports/specialtopics.html and 
> send a patch?
> 
> > > 
> > > marisa 0.2.6 configuration:
> > > ---
> > >   HOST:  x86_64-unknown-openbsd6.9
> > >   CXX:   c++
> > >   CXXFLAGS:  -g -O2 -DMARISA_USE_POPCNT -mpopcnt -DMARISA_USE_SSE4 -msse4
> > 
> > also this suggests the port isn't passing in CXXFLAGS from ports to the
> > build environment (port shouldn't hardcode -O2).
> 
> I tried different combination of CONFIGURE_ENV / CONFIGURE_ARGS but -O2 
> and -pipe are still there:
> 
>   HOST:  x86_64-unknown-openbsd6.9
>   CXX:   c++
>   CXXFLAGS:  -O2 -pipe
>   LDFLAGS:
>   PREFIX:/usr/local   
> 
> How should I debug this?
> 
> Here is my WIP port in case anyone wants to take a look at it: `make 
> install` works and I can use it, but I'm not sure if I did things in the 
> right way.
> 
> https://raw.githubusercontent.com/ZhanYF/static/main/libmarisa-wip.tar
> 
> (also attached in this email)




update: devel/apktool 2.4.0 -> 2.5.0

2021-08-03 Thread Yifei Zhan
Hi,

The following patchset update devel/apktool from 2.4.0 to 2.5.0. Tested 
on amd64 with a few different apk files, works fine.

This update adds support for Android 11 along with some small buxfixes.

P.S.: There is a line in the changelog saying[1]:

Deprecate 32 bit operating systems.

... but I don't have any 32bit machine to test if this affect OpenBSD, 
so I didn't add a NOT_FOR_ARCHS line.

[1]: https://github.com/iBotPeaches/Apktool/issues/2053#issuecomment-735302628

changelog: 
https://connortumbleson.com/2020/12/02/apktool-v2-5-0-released/

Index: Makefile
===
RCS file: /cvs/ports/devel/apktool/Makefile,v
retrieving revision 1.22
diff -u -p -u -r1.22 Makefile
--- Makefile19 May 2021 01:50:29 -  1.22
+++ Makefile3 Aug 2021 12:06:58 -
@@ -2,8 +2,7 @@
 
 COMMENT =  tool for reverse engineering Android apk files
 
-DISTNAME = apktool_2.4.0
-REVISION = 2
+DISTNAME = apktool_2.5.0
 PKGNAME =  ${DISTNAME:S/_/-/}
 
 CATEGORIES =   devel security java
Index: distinfo
===
RCS file: /cvs/ports/devel/apktool/distinfo,v
retrieving revision 1.15
diff -u -p -u -r1.15 distinfo
--- distinfo15 Mar 2019 10:49:42 -  1.15
+++ distinfo3 Aug 2021 12:06:58 -
@@ -1,2 +1,2 @@
-SHA256 (apktool_2.4.0.jar) = oPEW6JFtbyEWDhVZhHu4uMMu5xkA8yHK/q2+N7h+vME=
-SIZE (apktool_2.4.0.jar) = 16314178
+SHA256 (apktool_2.5.0.jar) = s5LXy5m1kunFrMPAbxsPGA7d6WxmuGs9aTK3wMQHn+Q=
+SIZE (apktool_2.5.0.jar) = 19300357



update: textproc/cloc 1.86 -> 1.90

2021-07-29 Thread Yifei Zhan
Hi,

This is an update to cloc 1.90, which fixes some minor bugs and adds 
support for more languages. I also updated the MASTER_SITES link to the 
new syntax and added a missing TESTDEP. All included tests except one 
related to git submodule are successful which is expected since we are 
using tarball instead of git clone.

Index: Makefile
===
RCS file: /cvs/ports/textproc/cloc/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile14 Jun 2021 23:57:16 -  1.16
+++ Makefile30 Jul 2021 01:14:37 -
@@ -2,9 +2,8 @@
 
 COMMENT=   count lines of code
 
-V= 1.86
+V= 1.90
 DISTNAME=  cloc-${V}
-REVISION=  0
 
 CATEGORIES=textproc devel
 
@@ -15,15 +14,19 @@ MAINTAINER= Joerg Jung https://github.com/AlDanial/cloc/releases/download/${V}/
+MASTER_SITES=  
https://github.com/AlDanial/cloc/releases/download/v${V}/
 
 NO_BUILD=  Yes
 PKG_ARCH=  *
 
 RUN_DEPENDS=   devel/p5-Algorithm-Diff \
devel/p5-Parallel-ForkManager \
-   textproc/p5-Regexp-Common
+   textproc/p5-Regexp-Common \
+   security/p5-Digest-Perl-MD5
+
 BUILD_DEPENDS+=${RUN_DEPENDS}
+
+TEST_DEPENDS+= archivers/unzip
 
 FAKE_FLAGS=prefix="${PREFIX}" \
man_prefix="${PREFIX}" \

Index: distinfo
===
RCS file: /cvs/ports/textproc/cloc/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo1 Jun 2020 21:24:48 -   1.11
+++ distinfo30 Jul 2021 01:15:08 -
@@ -1,2 +1,2 @@
-SHA256 (cloc-1.86.tar.gz) = Z7flCgOwKQMULiA4DHcWvbUwYRMtXg353kpjiycSZ+M=
-SIZE (cloc-1.86.tar.gz) = 554097
+SHA256 (cloc-1.90.tar.gz) = FSUCph1LrkpAagWgG/UkibMQ7APb2MZF0LsFH6Rxfds=
+SIZE (cloc-1.90.tar.gz) = 614306



Re: update: textproc/p5-ack 3.3.1 -> 3.5.0

2021-07-29 Thread Yifei Zhan
On 21/07/29 12:00PM, Stuart Henderson wrote:
> 
> oh, all tests are successful here, which failed for you?

nevermind, I messed up a dep (partial upgrade due to bad connection), 
now they are successful here too.



Re: update: textproc/p5-ack 3.3.1 -> 3.5.0

2021-07-29 Thread Yifei Zhan
On 21/07/29 11:47AM, Stuart Henderson wrote:
...snip...
> >  RUN_DEPENDS=   devel/p5-File-Next>=1.16
> 
> That's >=1.18 now, but 1.18 has been in the tree for a couple of releases
> now, think I'll just drop the version check.

Thanks! I just wonder where did you get this information from? I checked 
the official changelog and homepage but can't seem to find this updated 
requirement.



update: textproc/p5-ack 3.3.1 -> 3.5.0

2021-07-29 Thread Yifei Zhan
Hi,

This patch updates ack from 3.3.1 to 3.5.0, with a small cosmetic change 
to keep spacing consistent. A few test cases failed but that's 
consistent with the old version.

Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-ack/Makefile,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile
--- Makefile16 Apr 2020 09:02:47 -  1.29
+++ Makefile29 Jul 2021 09:48:13 -
@@ -4,7 +4,7 @@ COMMENT=grep like tool, aimed at progr
 
 MODULES=   cpan
 PKG_ARCH=  *
-V= 3.3.1
+V= 3.5.0
 DISTNAME=  ack-v$V
 PKGNAME=   p5-ack-$V
 CPAN_AUTHOR=   PETDANCE
@@ -13,7 +13,7 @@ CATEGORIES=   textproc
 HOMEPAGE = https://beyondgrep.com/
 
 # perl
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
 RUN_DEPENDS=   devel/p5-File-Next>=1.16
 



Re: fix net/neochat: missing RUN_DEPENDS item

2021-07-27 Thread Yifei Zhan
On 21/07/27 02:55AM, Yifei Zhan wrote:
> Hi,
> 
> The current Makefile does not list devel/kf5/kitemmodels as a 
> RUN_DEPENDS but neochat will crush without it. The following patch add 
> devel/kf5/kitemmodels to the list of RUN_DEPENDS. Lightly tested on amd64.
> 

repost, forgot to bump REVISION.

Index: neochat/Makefile
===
RCS file: /cvs/ports/net/neochat/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- neochat/Makefile26 May 2021 22:18:54 -  1.2
+++ neochat/Makefile27 Jul 2021 03:22:10 -
@@ -4,7 +4,7 @@ COMMENT =   client for Matrix chat
 VERSION =  1.1.1
 DISTNAME = neochat-${VERSION}
 
-REVISION = 0
+REVISION = 1
 
 CATEGORIES=net
 
@@ -24,6 +24,7 @@ MODULES = devel/kf5
 
 RUN_DEPENDS =  devel/desktop-file-utils \
graphics/kquickimageeditor \
+   devel/kf5/kitemmodels \
x11/gtk+3,-guic
 
 



fix net/neochat: missing RUN_DEPENDS item

2021-07-26 Thread Yifei Zhan
Hi,

The current Makefile does not list devel/kf5/kitemmodels as a 
RUN_DEPENDS but neochat will crush without it. The following patch add 
devel/kf5/kitemmodels to the list of RUN_DEPENDS. Lightly tested on amd64.

Index: Makefile
===
RCS file: /cvs/ports/net/neochat/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile26 May 2021 22:18:54 -  1.2
+++ Makefile27 Jul 2021 01:38:48 -
@@ -24,6 +24,7 @@ MODULES = devel/kf5
 
 RUN_DEPENDS =  devel/desktop-file-utils \
graphics/kquickimageeditor \
+   devel/kf5/kitemmodels \
x11/gtk+3,-guic
 
 



update shells/fish: 3.2.2 -> 3.3.1

2021-07-25 Thread Yifei Zhan
Hi,

Here is a patchset for updating shells/fish from 3.2.2 to 3.3.1. This 
covers some minor updates according to the changelog[0]. Lightly tested 
on amd64 by using it for some time, no issue found. Some of the included 
test cases failed but that's similar to the previous version.

[0]: https://github.com/fish-shell/fish-shell/releases

Index: distinfo
===
RCS file: /cvs/ports/shells/fish/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo24 Apr 2021 13:26:32 -  1.9
+++ distinfo25 Jul 2021 06:38:03 -
@@ -1,2 +1,2 @@
-SHA256 (fish-3.2.2.tar.xz) = WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk=
-SIZE (fish-3.2.2.tar.xz) = 3411748
+SHA256 (fish-3.3.1.tar.xz) = tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=
+SIZE (fish-3.3.1.tar.xz) = 3489152

Index: Makefile
===
RCS file: /cvs/ports/shells/fish/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile6 Jul 2021 16:55:33 -   1.25
+++ Makefile25 Jul 2021 06:37:33 -
@@ -2,9 +2,8 @@
 
 COMMENT =  friendly interactive shell
 
-V =3.2.2
+V =3.3.1
 DISTNAME = fish-$V
-REVISION = 0
 
 CATEGORIES =   shells
 
Index: ./pkg/PLIST
===
RCS file: /cvs/ports/shells/fish/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST
--- ./pkg/PLIST 6 Jul 2021 16:55:34 -   1.10
+++ ./pkg/PLIST 25 Jul 2021 06:37:16 -
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.10 2021/07/06 16:55:34 daniel Exp $
-@shell bin/fish
+@comment $OpenBSD: PLIST,v$
+@bin bin/fish
 @bin bin/fish_indent
 @bin bin/fish_key_reader
 @man man/man1/fish.1
@@ -100,6 +100,7 @@ share/doc/fish/cmds/or.html
 share/doc/fish/cmds/popd.html
 share/doc/fish/cmds/prevd.html
 share/doc/fish/cmds/printf.html
+share/doc/fish/cmds/prompt_login.html
 share/doc/fish/cmds/prompt_pwd.html
 share/doc/fish/cmds/psub.html
 share/doc/fish/cmds/pushd.html
@@ -148,6 +149,8 @@ share/doc/fish/faq.html
 share/doc/fish/fish_for_bash_users.html
 share/doc/fish/genindex.html
 share/doc/fish/index.html
+share/doc/fish/interactive.html
+share/doc/fish/language.html
 share/doc/fish/license.html
 share/doc/fish/objects.inv
 share/doc/fish/relnotes.html
@@ -156,7 +159,6 @@ share/doc/fish/searchindex.js
 share/doc/fish/tutorial.html
 share/examples/fish/
 share/examples/fish/config.fish
-@sample ${SYSCONFDIR}/config.fish
 share/fish/
 share/fish/__fish_build_paths.fish
 share/fish/completions/
@@ -396,8 +398,10 @@ share/fish/completions/fgrep.fish
 share/fish/completions/figlet.fish
 share/fish/completions/file.fish
 share/fish/completions/find.fish
+share/fish/completions/firewall-cmd.fish
 share/fish/completions/fish.fish
 share/fish/completions/fish_add_path.fish
+share/fish/completions/fish_config.fish
 share/fish/completions/fish_indent.fish
 share/fish/completions/fish_key_reader.fish
 share/fish/completions/flac.fish
@@ -508,7 +512,6 @@ share/fish/completions/kitchen.fish
 share/fish/completions/kitty.fish
 share/fish/completions/kldload.fish
 share/fish/completions/kldunload.fish
-share/fish/completions/la.fish
 share/fish/completions/latex.fish
 share/fish/completions/latexmk.fish
 share/fish/completions/launchctl.fish
@@ -517,7 +520,6 @@ share/fish/completions/lein.fish
 share/fish/completions/less.fish
 share/fish/completions/light.fish
 share/fish/completions/lightdm.fish
-share/fish/completions/ll.fish
 share/fish/completions/ln.fish
 share/fish/completions/localectl.fish
 share/fish/completions/locate.fish
@@ -800,6 +802,7 @@ share/fish/completions/string.fish
 share/fish/completions/su.fish
 share/fish/completions/subl.fish
 share/fish/completions/sudo.fish
+share/fish/completions/sv.fish
 share/fish/completions/svn.fish
 share/fish/completions/sylpheed.fish
 share/fish/completions/synclient.fish
@@ -1102,6 +1105,8 @@ share/fish/functions/fish_breakpoint_pro
 share/fish/functions/fish_clipboard_copy.fish
 share/fish/functions/fish_clipboard_paste.fish
 share/fish/functions/fish_command_not_found.fish
+share/fish/functions/fish_commandline_append.fish
+share/fish/functions/fish_commandline_prepend.fish
 share/fish/functions/fish_config.fish
 share/fish/functions/fish_default_key_bindings.fish
 share/fish/functions/fish_default_mode_prompt.fish
@@ -1142,6 +1147,7 @@ share/fish/functions/popd.fish
 share/fish/functions/prevd-or-backward-word.fish
 share/fish/functions/prevd.fish
 share/fish/functions/prompt_hostname.fish
+share/fish/functions/prompt_login.fish
 share/fish/functions/prompt_pwd.fish
 share/fish/functions/psub.fish
 share/fish/functions/pushd.fish
@@ -1195,6 +1201,8 @@ share/fish/man/man1/
 @man share/fish/man/man1/fish-doc.1
 @man share/fish/man/man1/fish-faq.1
 @man share/fish/man/man1/fish-for-bash-users.1
+@man share/fish/man/man1/fish-interactiv

mail/mutt-wizard is broken due to hardcoded names

2021-07-23 Thread Yifei Zhan
Hi,

mail/mutt-wizard is currently broken due to hardcoded strings of gnu 
tool names including grep, seq and other Linux-only command. It will 
generate corrupted config files because of that. I will try to fix this 
in upstream and then update this port.

Below is a patch for adding ggrep as a dependence.

Index: Makefile
===
RCS file: /cvs/ports/mail/mutt-wizard/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile24 May 2021 16:23:43 -  1.5
+++ Makefile23 Jul 2021 07:19:58 -
@@ -19,7 +19,8 @@
mail/isync \
mail/msmtp \
security/password-store \
-   sysutils/coreutils
+   sysutils/coreutils \
+   sysutils/ggrep
 
 NO_BUILD = Yes
 NO_TEST =  Yes



Re: NEW: fonts/mononoki - re-post: any feedback?

2021-07-22 Thread Yifei Zhan
Thanks! Also another friendly ping to this ML. :)

On 21/06/08 02:54PM, Stuart Henderson wrote:
> On 2021/06/08 12:32, openbsd@zhan.science wrote:
> > Hi,
> > 
> > Mononoki is a font created to enhance code formatting. It works well on 
> > high and low resolution displays, and characters are distinguishable 
> > from similar looking characters.
> > 
> > I have tested it on OpenBSD -CURRENT @amd64 and have been using it for
> > 6 months.
> > 
> > Please help me check/import this port.
> > 
> > P.S.: this is a re-post of [1] as that mail haven't got any reply for the
> > past 6 months.
> > 
> > [1]: https://marc.info/?l=openbsd-ports&m=161069664227175&w=2
> 
> 
> 
> Tweaked and updated version attached, this one is OK sthen@
> 
> 




NEW: fonts/mononoki

2021-01-15 Thread Yifei ZHAN
Hi,

Mononoki is a font created to enhance code formatting. It works well on 
high and low resolution displays, and every character is clearly 
distinguishable from similar looking characters.

I have tested it on OpenBSD -CURRENT @amd64.

Please help me check/import this port.

mononoki.tar
Description: Binary data