Re: U-Boot 2024.07 for RK356x/RK3588

[Kevin Lo]

On Wed, Jul 03, 2024 at 05:06:10PM +0200, Patrick Wildt wrote:
> 
> Hi,
> 
> this diff updates the U-Boot ports to 2024.07.  It builds, but I haven't
> actually tried it on a machine so far; and I don't have all machines
> either.
> 
> Would be happy if someone could give it a try.  For now, sharing that it
> doesn't get lost (or if someone wants to pick it up).

First of all, thanks for sharing.

Tested on Pine64 Quartz64 Model B (RK3568), Radxa ROCK 3A (RK3568) and
Orange Pi 5 Plus (RK3588), except for OPI 5+, which still needs to disable
ohci [1], everything else is fine.

Do we need to test all machines? If not, then ok kevlo@

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

> Cheers,
> Patrick

Regards,
Kevin

Re: Update arm-trusted-firmware 2.10.2

[Kevin Lo]

On Sat, Feb 17, 2024 at 05:34:49PM +0100, Mark Kettenis wrote:
> 
> I tested rk3328, rk3399, sun50i_a64 and sun50i_h616.  Earlier releases
> don't work on the H618 board that I have.
> 
> Debug builds no longer fit the SRAM constraints on at least A64.  So
> this switches to release builds.

Working fine on my Pine H64 model b (sun50i_h6).

> ok?

ok kevlo@

Full log:
U-Boot SPL 2021.10 (Feb 18 2024 - 10:41:19 +0800)
DRAM: 4096 MiB
Trying to boot from MMC1
NOTICE:  BL31: v2.10.2(release):lts-2.10.2
NOTICE:  BL31: Built : 10:27:40, Feb 18 2024
NOTICE:  BL31: Detected Allwinner H6 SoC (1728)
NOTICE:  BL31: Found U-Boot DTB at 0xa08ebc0, model: Pine H64 model B


U-Boot 2021.10 (Feb 18 2024 - 10:41:19 +0800) Allwinner Technology

CPU:   Allwinner H6 (SUN50I)
Model: Pine H64 model B
DRAM:  3 GiB
MMC:   mmc@402: 0, mmc@4021000: 2, mmc@4022000: 1
Loading Environment from FAT... Unable to read "uboot.env" from mmc0:1... In:   
 serial@500
Out:   serial@500
Err:   serial@500
Net:   phy interface8
Could not get PHY for ethernet@502: addr 1
No ethernet found.

starting USB...
Bus usb@5101000: USB EHCI 1.00
Bus usb@5101400: USB OHCI 1.0
Bus usb@5311000: USB EHCI 1.00
Bus usb@5311400: USB OHCI 1.0
scanning bus usb@5101000 for devices... 1 USB Device(s) found
scanning bus usb@5101400 for devices... 1 USB Device(s) found
scanning bus usb@5311000 for devices... 2 USB Device(s) found
scanning bus usb@5311400 for devices... 1 USB Device(s) found
   scanning usb for storage devices... 0 Storage Device(s) found
Hit any key to stop autoboot:  0
switch to partitions #0, OK
mmc0 is current device
Scanning mmc 0:1...
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
Scanning disk m...@402.blk...
Card did not respond to voltage select! : -110
Scanning disk m...@4021000.blk...
Disk m...@4021000.blk not ready
Card did not respond to voltage select! : -110
Scanning disk m...@4022000.blk...
Disk m...@4022000.blk not ready
Found 3 disks
No EFI system partition
phy interface8
mdio_register: non unique device name 'ethernet@502'
Could not get PHY for ethernet@502: addr 1
phy interface8
mdio_register: non unique device name 'ethernet@502'
Could not get PHY for ethernet@502: addr 1
BootOrder not defined
EFI boot manager: Cannot load any image
Found EFI removable media binary efi/boot/bootaa64.efi
227963 bytes read in 15 ms (14.5 MiB/s)
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
Booting /efi\boot\bootaa64.efi
disks: sd0*
>> OpenBSD/arm64 BOOTAA64 1.18
boot>
booting sd0a:/bsd: 11448612+2731216+300888+88 
[901763+91+1300920+804273]=0x13f5f50
[ using 3007832 bytes of bsd ELF symbol table ]
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California.  All rights reserved.
Copyright (c) 1995-2024 OpenBSD. All rights reserved.  https://www.OpenBSD.org

OpenBSD 7.5-beta (GENERIC.MP) #93: Sat Feb 17 23:41:29 MST 2024
dera...@arm64.openbsd.org:/usr/src/sys/arch/arm64/compile/GENERIC.MP
real mem  = 3135033344 (2989MB)
avail mem = 2997657600 (2858MB)
random: good seed from bootblocks
mainbus0 at root: Pine H64 model B
psci0 at mainbus0: PSCI 1.1, SMCCC 1.4 Minicom 2.8 | VT102 | ?? | ttyUSB0   


 efi0 at mainbus0: UEFI 2.8 8N1 | NOR | 
Minicom 2.8 | VT102 | ?? 0:0 | ttyUSB0  

  
efi0: Das U-Boot rev 0x20211000
smbios0 at efi0: SMBIOS 3.0
smbios0: vendor U-Boot version "2021.10" date 10/01/2021
smbios0: Unknown Unknown Product
cpu0 at mainbus0 mpidr 0: ARM Cortex-A53 r0p4
cpu0: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 512KB 64b/line 16-way L2 cache
cpu0: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu1 at mainbus0 mpidr 1: ARM Cortex-A53 r0p4
cpu1: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu1: 512KB 64b/line 16-way L2 cache
cpu1: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu2 at mainbus0 mpidr 2: ARM Cortex-A53 r0p4
cpu2: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu2: 512KB 64b/line 16-way L2 cache
cpu2: CRC32,SHA2,SHA1,AES+PMULL,ASID16
cpu3 at mainbus0 mpidr 3: ARM Cortex-A53 r0p4
cpu3: 32KB 64b/line 2-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu3: 512KB 64b/line 16-way L2 cache
cpu3: CRC32,SHA2,SHA1,AES+PMULL,ASID16
apm0 at mainbus0
"display-engine" at mainbus0 not configured
"osc24M_clk" at mainbus0 not configured
"pmu" at mainbus0 not configured
agtimer0 at mainbus0: 24000 kHz
simplebus0 at mainbus0: "soc"
sxisyscon0 at simplebus0
sxiccmu0 at simplebus0
sxisid0 at simplebus0
sxipio0 at simplebus0: 108 pins
ampintc0 at simplebus0 nirq 192, ncpu 4 ipi: 0, 1, 2: "interrupt-controller"
sxiccmu1 at simple

Re: Update u-boot-rk356x to 2024.01

[Kevin Lo]

On Fri, Feb 16, 2024 at 12:43:15AM +0100, Mark Kettenis wrote:
> 
> Also adds a few more more boards and sorts them in alphabetical order.
> Tested on the rock-3a-rk3568 with the latest -current.

Tested on Quartz64 model b and Rock 3A, no fallout.

> ok?

ok kevlo@

> 
> P.S. Also tried to update u-boot-rk3588 to 2024.01, but that one is
>  borked.  I'll try again for 2024.04.

Quartz64-b:

OpenBSD 7.4-current (GENERIC.MP) #90: Fri Feb 16 14:16:20 MST 2024
dera...@arm64.openbsd.org:/usr/src/sys/arch/arm64/compile/GENERIC.MP
real mem  = 4022771712 (3836MB)
avail mem = 3815542784 (3638MB)
random: good seed from bootblocks
mainbus0 at root: Pine64 RK3566 Quartz64-B Board
psci0 at mainbus0: PSCI 1.1, SMCCC 1.2, SYSTEM_SUSPEND
efi0 at mainbus0: UEFI 2.10
efi0: Das U-Boot rev 0x20240100
smbios0 at efi0: SMBIOS 3.0
smbios0: vendor U-Boot version "2024.01" date 01/01/2024
smbios0: Unknown Unknown Product
cpu0 at mainbus0 mpidr 0: ARM Cortex-A55 r2p0
cpu0: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 512KB 64b/line 16-way L2 cache
cpu0: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu1 at mainbus0 mpidr 100: ARM Cortex-A55 r2p0
cpu1: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu1: 512KB 64b/line 16-way L2 cache
cpu1: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu2 at mainbus0 mpidr 200: ARM Cortex-A55 r2p0
cpu2: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu2: 512KB 64b/line 16-way L2 cache
cpu2: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu3 at mainbus0 mpidr 300: ARM Cortex-A55 r2p0
cpu3: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu3: 512KB 64b/line 16-way L2 cache
cpu3: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
scmi0 at mainbus0: SCMI 2.0
apm0 at mainbus0
agintc0 at mainbus0 mbi shift 4:4 nirq 352 nredist 4 ipi: 0, 1, 2: 
"interrupt-controller"
syscon0 at mainbus0: "syscon"
rkiovd0 at syscon0
syscon1 at mainbus0: "syscon"
syscon2 at mainbus0: "syscon"
syscon3 at mainbus0: "syscon"
syscon4 at mainbus0: "syscon"
syscon5 at mainbus0: "syscon"
syscon6 at mainbus0: "syscon"
rkclock0 at mainbus0: PMUCRU
rkclock1 at mainbus0: CRU
syscon7 at mainbus0: "power-management"
"power-controller" at syscon7 not configured
syscon8 at mainbus0: "qos"
syscon9 at mainbus0: "qos"
syscon10 at mainbus0: "qos"
syscon11 at mainbus0: "qos"
syscon12 at mainbus0: "qos"
syscon13 at mainbus0: "qos"
syscon14 at mainbus0: "qos"
syscon15 at mainbus0: "qos"
syscon16 at mainbus0: "qos"
syscon17 at mainbus0: "qos"
syscon18 at mainbus0: "qos"
syscon19 at mainbus0: "qos"
syscon20 at mainbus0: "qos"
syscon21 at mainbus0: "qos"
syscon22 at mainbus0: "qos"
syscon23 at mainbus0: "qos"
syscon24 at mainbus0: "qos"
syscon25 at mainbus0: "qos"
syscon26 at mainbus0: "qos"
syscon27 at mainbus0: "qos"
syscon28 at mainbus0: "qos"
syscon29 at mainbus0: "qos"
syscon30 at mainbus0: "qos"
syscon31 at mainbus0: "qos"
rkcomphy0 at mainbus0
rkcomphy1 at mainbus0
rkusbphy0 at mainbus0: phy 0
rkusbphy1 at mainbus0: phy 1
rkpinctrl0 at mainbus0: "pinctrl"
rkgpio0 at rkpinctrl0
rkgpio1 at rkpinctrl0
rkgpio2 at rkpinctrl0
rkgpio3 at rkpinctrl0
rkgpio4 at rkpinctrl0
"fit-images" at mainbus0 not configured
"opp-table-0" at mainbus0 not configured
rkdrm0 at mainbus0
drm0 at rkdrm0
"firmware" at mainbus0 not configured
"opp-table-1" at mainbus0 not configured
simpleaudio0 at mainbus0
"pmu" at mainbus0 not configured
agtimer0 at mainbus0: 24000 kHz
"xin24m" at mainbus0 not configured
"xin32k" at mainbus0 not configured
"sram" at mainbus0 not configured
xhci0 at mainbus0, xHCI 1.10
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Generic xHCI root hub" rev 3.00/1.00 
addr 1
xhci1 at mainbus0, xHCI 1.10
usb1 at xhci1: USB revision 3.0
uhub1 at usb1 configuration 1 interface 0 "Generic xHCI root hub" rev 3.00/1.00 
addr 1
ehci0 at mainbus0
usb2 at ehci0: USB revision 2.0
uhub2 at usb2 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00 
addr 1
ohci0 at mainbus0: version 1.0
rkiic0 at mainbus0
iic0 at rkiic0
fanpwr0 at iic0 addr 0x1c: TCS4525, 1.02 VDC
rkpmic0 at iic0 addr 0x20: RK809
"gpu" at mainbus0 not configured
"video-codec" at mainbus0 not configured
"iommu" at mainbus0 not configured
"video-codec" at mainbus0 not configured
"iommu" at mainbus0 not configured
dwqe0 at mainbus0 gmac 1: rev 0x51, address 46:97:ce:0f:5f:46
rgephy0 at dwqe0 phy 1: RTL8169S/8110S/8211 PHY, rev. 6
"vop" at mainbus0 not configured
"iommu" at mainbus0 not configured
"hdmi" at mainbus0 not configured
dwpcie0 at mainbus0
dwmmc0 at mainbus0: 50 MHz base clock
sdmmc0 at dwmmc0: 4-bit, sd high-speed, dma
dwmmc1 at mainbus0: 50 MHz base clock
sdmmc1 at dwmmc1: 4-bit, sd high-speed, dma
"spi" at mainbus0 not configured
dwmshc0 at mainbus0
dwmshc0: SDHC 4.20, 20

Re: UPDATE: chinese/libchewing 0.6.0

[Kevin Lo]

Ping

On Sun, Jan 28, 2024 at 11:20:13PM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This is an update for libchewing to 0.6.0.
> Tested with fcitx-chewing on amd64.
> 
> OK? Comments?
> 
> Index: chinese/libchewing/Makefile
> ===
> RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- chinese/libchewing/Makefile   20 Sep 2023 06:33:31 -  1.14
> +++ chinese/libchewing/Makefile   28 Jan 2024 15:03:10 -
> @@ -1,11 +1,10 @@
>  COMMENT =intelligent phonetic input method library
>  
> -V =  0.5.1
> +V =  0.6.0
>  DISTNAME =   libchewing-$V
>  PKGNAME =zh-libchewing-$V
> -REVISION =   0
>  
> -SHARED_LIBS =chewing 0.1 # .3.3
> +SHARED_LIBS =chewing 0.2 # .3.3.1
>  
>  CATEGORIES = chinese inputmethods
>  
> @@ -16,19 +15,16 @@ MAINTAINER =  Kevin Lo   # LGPLv2.1 only
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB +=   m pthread sqlite3 z
> +WANTLIB +=   c sqlite3
>  
>  SITES =  
> https://github.com/chewing/libchewing/releases/download/v$V/
>  
> -EXTRACT_SUFX=.tar.bz2
> +EXTRACT_SUFX =   .tar.xz
>  
> -BUILD_DEPENDS =  print/texinfo
> +MODULES =devel/cmake
>  LIB_DEPENDS =databases/sqlite3
>  
> -MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo
> -
> -CONFIGURE_STYLE =gnu
> -CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> +CFLAGS +=-I${LOCALBASE}/include
> +MODCMAKE_LDFLAGS =  -L${LOCALBASE}/lib -lc
>  
>  .include 
> Index: chinese/libchewing/distinfo
> ===
> RCS file: /cvs/ports/chinese/libchewing/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- chinese/libchewing/distinfo   13 Nov 2017 13:21:35 -  1.5
> +++ chinese/libchewing/distinfo   28 Jan 2024 15:03:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (libchewing-0.5.1.tar.bz2) = 
> lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
> -SIZE (libchewing-0.5.1.tar.bz2) = 3141084
> +SHA256 (libchewing-0.6.0.tar.xz) = 
> wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
> +SIZE (libchewing-0.6.0.tar.xz) = 3473564
> Index: chinese/libchewing/patches/patch-CMakeLists_txt
> ===
> RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
> diff -N chinese/libchewing/patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ chinese/libchewing/patches/patch-CMakeLists_txt   28 Jan 2024 15:03:10 
> -
> @@ -0,0 +1,19 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
>  CMakeLists.txt
> +@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
> + enable_testing()
> + 
> + if(UNIX)
> +-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
> ++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
> + add_compile_definitions(UNDER_POSIX PIC)
> + endif()
> + 
> +@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
> + set(CPACK_SOURCE_IGNORE_FILES "/out" "/..*")
> + set(CPACK_SOURCE_GENERATOR TXZ)
> + set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
> +-include(CPack)
> +\ No newline at end of file
> ++include(CPack)
> Index: chinese/libchewing/patches/patch-configure
> ===
> RCS file: chinese/libchewing/patches/patch-configure
> diff -N chinese/libchewing/patches/patch-configure
> --- chinese/libchewing/patches/patch-configure11 Mar 2022 18:25:21 
> -  1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -Index: configure
>  configure.orig
> -+++ configure
> -@@ -15425,7 +15425,7 @@ fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5
> - $as_echo "$ac_cv_no_undefined" >&6; }
> - if test x$ac_cv_no_undefined = "xyes"; then :
> --  NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined"
> -+  NO_UNDEFINED_LDFLAGS=""
> - fi
> - 
> - 
> Index: chinese/libchewing/pkg/PLIST
> ===
> RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- chinese/libchewing/pkg/PLIST  11 Mar 2022 18:25:21 -  1.5
> +++ chinese/libchewing/pkg/PLIST  28 Jan 2024 15:03:10 -
> @@ -4,9 +4,6 @@ include/chewing/chewing.h
>  include/chewing/chewingio.h
>  include/chewing/global.h
>  include/chewing/mod_aux.h
> -@info info/libchewing.info
> -lib/libchewing.a
> -lib/libchewing.la
>  @lib lib/libchewing.so.${LIBchewing_VERSION}
>  lib/pkgconfig/chewing.pc
>  share/libchewing/
> 

UPDATE: chinese/libchewing 0.6.0

[Kevin Lo]

Hi,

This is an update for libchewing to 0.6.0.
Tested with fcitx-chewing on amd64.

OK? Comments?

Index: chinese/libchewing/Makefile
===
RCS file: /cvs/ports/chinese/libchewing/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- chinese/libchewing/Makefile 20 Sep 2023 06:33:31 -  1.14
+++ chinese/libchewing/Makefile 28 Jan 2024 15:03:10 -
@@ -1,11 +1,10 @@
 COMMENT =  intelligent phonetic input method library
 
-V =0.5.1
+V =0.6.0
 DISTNAME = libchewing-$V
 PKGNAME =  zh-libchewing-$V
-REVISION = 0
 
-SHARED_LIBS =  chewing 0.1 # .3.3
+SHARED_LIBS =  chewing 0.2 # .3.3.1
 
 CATEGORIES =   chinese inputmethods
 
@@ -16,19 +15,16 @@ MAINTAINER =Kevin Lo https://github.com/chewing/libchewing/releases/download/v$V/
 
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX = .tar.xz
 
-BUILD_DEPENDS =print/texinfo
+MODULES =  devel/cmake
 LIB_DEPENDS =  databases/sqlite3
 
-MAKE_FLAGS =   MAKEINFO=${LOCALBASE}/bin/gmakeinfo
-
-CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS =   CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS +=  -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =  -L${LOCALBASE}/lib -lc
 
 .include 
Index: chinese/libchewing/distinfo
===
RCS file: /cvs/ports/chinese/libchewing/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- chinese/libchewing/distinfo 13 Nov 2017 13:21:35 -  1.5
+++ chinese/libchewing/distinfo 28 Jan 2024 15:03:10 -
@@ -1,2 +1,2 @@
-SHA256 (libchewing-0.5.1.tar.bz2) = 
lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
-SIZE (libchewing-0.5.1.tar.bz2) = 3141084
+SHA256 (libchewing-0.6.0.tar.xz) = wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
+SIZE (libchewing-0.6.0.tar.xz) = 3473564
Index: chinese/libchewing/patches/patch-CMakeLists_txt
===
RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
diff -N chinese/libchewing/patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ chinese/libchewing/patches/patch-CMakeLists_txt 28 Jan 2024 15:03:10 
-
@@ -0,0 +1,19 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ enable_testing()
+ 
+ if(UNIX)
+-set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
+ add_compile_definitions(UNDER_POSIX PIC)
+ endif()
+ 
+@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
+ set(CPACK_SOURCE_IGNORE_FILES "/out" "/..*")
+ set(CPACK_SOURCE_GENERATOR TXZ)
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
+-include(CPack)
+\ No newline at end of file
++include(CPack)
Index: chinese/libchewing/patches/patch-configure
===
RCS file: chinese/libchewing/patches/patch-configure
diff -N chinese/libchewing/patches/patch-configure
--- chinese/libchewing/patches/patch-configure  11 Mar 2022 18:25:21 -  
1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: configure
 configure.orig
-+++ configure
-@@ -15425,7 +15425,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5
- $as_echo "$ac_cv_no_undefined" >&6; }
- if test x$ac_cv_no_undefined = "xyes"; then :
--  NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined"
-+  NO_UNDEFINED_LDFLAGS=""
- fi
- 
- 
Index: chinese/libchewing/pkg/PLIST
===
RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- chinese/libchewing/pkg/PLIST11 Mar 2022 18:25:21 -  1.5
+++ chinese/libchewing/pkg/PLIST28 Jan 2024 15:03:10 -
@@ -4,9 +4,6 @@ include/chewing/chewing.h
 include/chewing/chewingio.h
 include/chewing/global.h
 include/chewing/mod_aux.h
-@info info/libchewing.info
-lib/libchewing.a
-lib/libchewing.la
 @lib lib/libchewing.so.${LIBchewing_VERSION}
 lib/pkgconfig/chewing.pc
 share/libchewing/

Re: [NEW] firmware for qwx(4)

[Kevin Lo]

On Fri, Jan 26, 2024 at 10:25:24PM +0100, Peter Hessler wrote:
> On 2024 Jan 25 (Thu) at 18:20:49 +0100 (+0100), Peter Hessler wrote:
> :This is the firmware for the qwx(4) driver, OK?
> :
> :Based on the qcpas-firmware port
> :
> :
> :Note: this depends on the new firmware paths as of 2024-01-25.
> 
> 
> Some minor updates and include firmware files that kevlo@ needed.

Works for me, thanks.

> still looking for OKs.

ok kevlo@

> 
> -- 
> And I heard Jeff exclaim,
> As they strolled out of sight,
> "Merry Christmas to all --
> You take credit cards, right?"
>   -- "Outsiders" comic

inputmethods/fcitx-chewing: update to 5.1.1

[Kevin Lo]

This is an update of inputmethods/fcitx-chewing to its latest version 5.1.1.
It's pretty straight forward.

ok?

Index: inputmethods/fcitx-chewing/Makefile
===
RCS file: /cvs/ports/inputmethods/fcitx-chewing/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- inputmethods/fcitx-chewing/Makefile 24 Apr 2023 11:41:20 -  1.9
+++ inputmethods/fcitx-chewing/Makefile 23 Jan 2024 08:33:06 -
@@ -1,8 +1,7 @@
 COMMENT =  chewing wrapper for fcitx5
 
-V =5.0.14
+V =5.1.1
 PKGNAME =  fcitx-chewing-$V
-REVISION =  0
 
 GH_ACCOUNT =fcitx
 GH_PROJECT =fcitx5-chewing
Index: inputmethods/fcitx-chewing/distinfo
===
RCS file: /cvs/ports/inputmethods/fcitx-chewing/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- inputmethods/fcitx-chewing/distinfo 20 Apr 2023 09:09:05 -  1.4
+++ inputmethods/fcitx-chewing/distinfo 23 Jan 2024 08:33:06 -
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-chewing-5.0.14.tar.gz) = 
sofFbsitZYu7HHzKZIKA/Arp4Ng6o/DSMvbnrp9PlAI=
-SIZE (fcitx5-chewing-5.0.14.tar.gz) = 26314
+SHA256 (fcitx5-chewing-5.1.1.tar.gz) = 
PyQD7xc6Y6EC2GhlWcoVAfNqnYak0qlqUAIbv7b44qY=
+SIZE (fcitx5-chewing-5.1.1.tar.gz) = 26454

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

[Kevin Lo]

On Fri, Jan 19, 2024 at 08:42:15PM +0100, Omar Polo wrote:
> 
> On 2024/01/18 15:07:29 +1100, Yifei Zhan  wrote:
> > 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
> 
> only build-tested.
> 
> diffs looks good but while here I noticed that it abuses CXXFLAGS for
> linker flags.  Should be better to use MODCMAKE_LDFLAGS, updated diff
> below.
> 
> ok op@ anyway, it can be fixed in a follow-up.
> 
> > inputmethods/xcb-imdkit: 1.0.5 -> 1.0.6
> >   - minor bugfix on setting XCB event mask
> >   
> > https://github.com/fcitx/xcb-imdkit/commit/2553f2ec1397cd93facde4bff9fd841056611ddc
> 
> ok op@
> 
> > 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/
> 
> ok op@
> 
> > 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/
> 
> Few tweaks needed:
> 
>  - x11/qt6/qtwayland needs to be added to LIB_DEPENDS, not BUILD_DEPENDS.
>  - needed to regen the wantlibs, see updated diff below.
>  - libFcitx5Qt5WidgetsAddons needs a major bump since it lost a symbol
>(according to check_sym)
>  - libFcitx5Qt5DBusAddons and libFcitx5Qt6DBusAddons both need a minor bump
>due to new symbol exported.
> 
> otherwise, ok op@
> 
> > 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/
> 
> this growed a WANTLIB on libc, otherwise ok op@
> 
> > inputmethods/fcitx-lua: 5.0.10 -> 5.0.12
> >   - translation updates
> >   https://github.com/fcitx/fcitx5-lua/commits/master/
> 
> only build-tested.  ok op@
> 
> (why isn't this one using MODULE=lang/lua ?)
> 
> > 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/
> 
> only build-tested.
> 
>  - libIMECore and libIMEPinyin need a minor bump for new symbols
>addition
>  - libIMETable needs a major bump for symbols removal
> 
> otherwise ok op@
> 
> > inputmethods/fcitx-chinese-addons: 5.0.17 -> 5.1.3
> >   - bugfixes and translation updates
> >   https://github.com/fcitx/fcitx5-chinese-addons/commits/master/
> 
> only build-tested.  was missing a make update-plist, otherwise ok op@
> 
> btw, this could just inline $V since it's used only once.
> 
> > inputmethods/fcitx-config-qt: 5.0.17 -> 5.1.3
> >   - add support for Qt6, translation updates
> >  https://github.com/fcitx/fcitx5-configtool/commits/master/
> 
> ok op@
> 
> nit: i'd make sure to leave @tag update-desktop-database as the last
> entry in the file, even if make update-plist adds a few stuff under it.
> 
> > inputmethods/fcitx-table-extra: 5.0.13 -> 5.1.2
> >   - translation and tables update
> >   https://github.com/fcitx/fcitx5-table-extra/commits/master/
> 
> only build-tested.  ok op@
> 
> This is my current setup for japanese:
> 
>   % pkg_info | grep fcitx
>   fcitx-5.1.7 flexible input method framework
>   fcitx-anthy-5.0.14p0 anthy wrapper for fcitx5
>   fcitx-configtool-qt-5.1.3 GUI configure tool for fcitx5
>   fcitx-gtk-5.1.1 GTK IM module for fcitx5
>   fcitx-qt-5.1.4  Qt library and IM module for fcitx5
> 
> which works just as well as before.
> 
> I'm attaching an updated diff that covers all the ports with the tweaks
> as per above.

Thanks Yifei for updating fcitx related ports and op@ reviewed/updated diffs.
Installed fcitx for Chinese input on kde, it works as usual.

fcitx-5.1.7 flexible input method framework
fcitx-chewing-5.0.14p0 chewing wrapper for fcitx5
fcitx-chinese-addons-5.1.3 addons related to Chinese with IME bundled inside 
fcitx
fcitx-configtool-qt-5.1.3 GUI configure tool for fcitx5
fcitx-gtk-5.1.1 GTK IM module for fcitx5
fcitx-lua-5.0.12Lua support for fcitx5
fcitx-m17n-5.0.11   m17n wrapper for fcitx5
fcitx-qt-5.1.4  Qt library and IM module for fcitx5
fcitx-table-extra-5.1.2 extra table for Fcitx5
opencc-1.1.7convert between traditional and simplified Chinese
libime-1.1.5library to support generic input method implementation
xcb-imdkit-1.0.6implementation of xim protocol in xcb

I'll commit op@'s updated diff today later

Re: Fix rk356x u-boot device trees

[Kevin Lo]

On Thu, Nov 23, 2023 at 02:14:59PM +0100, Mark Kettenis wrote:
> 
> The ranges provided by the "official" device tree still don't seem to
> work correctly.  At least iwx(4) fails to load its firmware with the
> default device tree.  The diff below fixes this.  This matches the
> device tree I built myself some time ago.

iwx(4) works on my Rock 3A withouth this patch.
What board did you test?  Thanks.

OpenBSD 7.4-current (GENERIC.MP) #27: Thu Nov 23 13:42:34 MST 2023
dera...@arm64.openbsd.org:/usr/src/sys/arch/arm64/compile/GENERIC.MP
real mem  = 8317829120 (7932MB)
avail mem = 7981862912 (7612MB)
random: good seed from bootblocks
mainbus0 at root: Radxa ROCK3 Model A
psci0 at mainbus0: PSCI 1.1, SMCCC 1.2, SYSTEM_SUSPEND
efi0 at mainbus0: UEFI 2.10
efi0: Das U-Boot rev 0x20231000
smbios0 at efi0: SMBIOS 3.0
smbios0: vendor U-Boot version "2023.10" date 10/01/2023
smbios0: Unknown Unknown Product
cpu0 at mainbus0 mpidr 0: ARM Cortex-A55 r2p0
cpu0: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 512KB 64b/line 16-way L2 cache
cpu0: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu1 at mainbus0 mpidr 100: ARM Cortex-A55 r2p0
cpu1: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu1: 512KB 64b/line 16-way L2 cache
cpu1: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu2 at mainbus0 mpidr 200: ARM Cortex-A55 r2p0
cpu2: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu2: 512KB 64b/line 16-way L2 cache
cpu2: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
cpu3 at mainbus0 mpidr 300: ARM Cortex-A55 r2p0
cpu3: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu3: 512KB 64b/line 16-way L2 cache
cpu3: 
DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,LRCPC,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,SBSS
scmi0 at mainbus0: SCMI 2.0
apm0 at mainbus0
agintc0 at mainbus0 mbi shift 4:4 nirq 352 nredist 4 ipi: 0, 1, 2: 
"interrupt-controller"
syscon0 at mainbus0: "syscon"
rkiovd0 at syscon0
syscon1 at mainbus0: "syscon"
syscon2 at mainbus0: "syscon"
syscon3 at mainbus0: "syscon"
syscon4 at mainbus0: "syscon"
syscon5 at mainbus0: "syscon"
syscon6 at mainbus0: "syscon"
rkclock0 at mainbus0: PMUCRU
rkclock1 at mainbus0: CRU
syscon7 at mainbus0: "power-management"
"power-controller" at syscon7 not configured
syscon8 at mainbus0: "qos"
syscon9 at mainbus0: "qos"
syscon10 at mainbus0: "qos"
syscon11 at mainbus0: "qos"
syscon12 at mainbus0: "qos"
syscon13 at mainbus0: "qos"
syscon14 at mainbus0: "qos"
syscon15 at mainbus0: "qos"
syscon16 at mainbus0: "qos"
syscon17 at mainbus0: "qos"
syscon18 at mainbus0: "qos"
syscon19 at mainbus0: "qos"
syscon20 at mainbus0: "qos"
syscon21 at mainbus0: "qos"
syscon22 at mainbus0: "qos"
syscon23 at mainbus0: "qos"
syscon24 at mainbus0: "qos"
syscon25 at mainbus0: "qos"
syscon26 at mainbus0: "qos"
syscon27 at mainbus0: "qos"
syscon28 at mainbus0: "qos"
syscon29 at mainbus0: "qos"
syscon30 at mainbus0: "qos"
syscon31 at mainbus0: "qos"
rkcomphy0 at mainbus0
rkcomphy1 at mainbus0
rkusbphy0 at mainbus0: phy 0
rkusbphy1 at mainbus0: phy 1
rkpinctrl0 at mainbus0: "pinctrl"
rkgpio0 at rkpinctrl0
rkgpio1 at rkpinctrl0
rkgpio2 at rkpinctrl0
rkgpio3 at rkpinctrl0
rkgpio4 at rkpinctrl0
syscon32 at mainbus0: "syscon"
syscon33 at mainbus0: "qos"
syscon34 at mainbus0: "qos"
syscon35 at mainbus0: "qos"
syscon36 at mainbus0: "syscon"
rkpciephy0 at mainbus0
rkcomphy2 at mainbus0
"opp-table-0" at mainbus0 not configured
rkdrm0 at mainbus0
drm0 at rkdrm0
"firmware" at mainbus0 not configured
"opp-table-1" at mainbus0 not configured
simpleaudio0 at mainbus0
"pmu" at mainbus0 not configured
agtimer0 at mainbus0: 24000 kHz
"xin24m" at mainbus0 not configured
"xin32k" at mainbus0 not configured
"sram" at mainbus0 not configured
xhci0 at mainbus0, xHCI 1.10
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Generic xHCI root hub" rev 3.00/1.00 
addr 1
xhci1 at mainbus0, xHCI 1.10
usb1 at xhci1: USB revision 3.0
uhub1 at usb1 configuration 1 interface 0 "Generic xHCI root hub" rev 3.00/1.00 
addr 1
ehci0 at mainbus0
usb2 at ehci0: USB revision 2.0
uhub2 at usb2 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00 
addr 1
ohci0 at mainbus0: version 1.0
ehci1 at mainbus0
usb3 at ehci1: USB revision 2.0
uhub3 at usb3 configuration 1 interface 0 "Generic EHCI root hub" rev 2.00/1.00 
addr 1
ohci1 at mainbus0: version 1.0
rkiic0 at mainbus0
iic0 at rkiic0
fanpwr0 at iic0 addr 0x1c: TCS4525, 0.90 VDC
rkpmic0 at iic0 addr 0x20: RK809
"gpu" at mainbus0 not configured
"video-codec" at mainbus0 not configured
"iommu" at mainbus0 not configured
"rga" at mainbus0 not configured
"video-codec" at mainbus0 not configured
"iommu" at mainbus0 not configured
dwmmc0 at mainbus0: 50 MHz base clock
sdmmc0 at dwmmc0: 4-bit, sd high-speed, dma
dwqe0 at mainbus0 gmac 1: rev 0x51, address aa:1

Re: Fix rk356x u-boot device trees

[Kevin Lo]

On Fri, Nov 24, 2023 at 10:08:52AM +0100, Mark Kettenis wrote:
> > Date: Fri, 24 Nov 2023 16:27:07 +0800
> > From: Kevin Lo 
> > 
> > On Thu, Nov 23, 2023 at 02:14:59PM +0100, Mark Kettenis wrote:
> > > 
> > > The ranges provided by the "official" device tree still don't seem to
> > > work correctly.  At least iwx(4) fails to load its firmware with the
> > > default device tree.  The diff below fixes this.  This matches the
> > > device tree I built myself some time ago.
> > 
> > iwx(4) works on my Rock 3A withouth this patch.
> > What board did you test?  Thanks.
> 
> Also Rock 3A.  Mine is a 2G model with AX200 though.
> 
> Are you sure that you don't have a device tree on the ms-dos partition
> that is getting picked up by u-boot?

Ah, I do have a dtb on the msdos partition.  Sorry for the noise.
I confirmed your diff works correctly, thanks.

ok kevlo@

Re: U-Boot for RK356x SoCs (take 2)

[Kevin Lo]

On Fri, Oct 13, 2023 at 07:30:43PM +0200, Mark Kettenis wrote:
> 
> Now that U-Boot 2023.10 has been release, here is an update.  This
> adds a few more boards and now uses a script that U-Boot provides to
> switch the serial console baudrate to 115200.  This way I don't need
> to patch the configs anymore.

Works for me on rock-3a and quartz64-b.

> ok?

ok kevlo@

> Index: sysutils/u-boot/rk356x/Makefile
> ===
> RCS file: sysutils/u-boot/rk356x/Makefile
> diff -N sysutils/u-boot/rk356x/Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/u-boot/rk356x/Makefile   13 Oct 2023 17:17:03 -
> @@ -0,0 +1,43 @@
> +VERSION= 2023.10
> +
> +SOC= rk356x
> +
> +BOARDS=\
> + odroid-m1-rk3568 \
> + quartz64-a-rk3566 \
> + quartz64-b-rk3566 \
> + radxa-cm3-io-rk3566 \
> + soquartz-blade-rk3566 \
> + soquartz-cm4-rk3566 \
> + soquartz-model-a-rk3566 \
> + nanopi-r5c-rk3568 \
> + nanopi-r5s-rk3568 \
> + radxa-e25-rk3568 \
> + rock-3a-rk3568
> +
> +BUILD_DEPENDS+= devel/arm-none-eabi/gcc,aarch64 \
> + devel/py-elftools${MODPY_FLAVOR} \
> + shells/bash \
> + sysutils/e2fsprogs
> +CROSS_COMPILE=   aarch64-none-elf-
> +
> +RK3566_TPL=  rk3566_ddr_1056MHz_v1.18.bin
> +RK3568_TPL=  rk3568_ddr_1560MHz_v1.18.bin
> +RK356X_BL31= rk3568_bl31_v1.43.elf
> +
> +DISTFILES.rkbin= ${RK3566_TPL} ${RK3568_TPL} ${RK356X_BL31}
> +SITES.rkbin= https://github.com/rockchip-linux/rkbin/raw/master/bin/rk35/
> +EXTRACT_ONLY=${DISTNAME}${EXTRACT_SUFX}
> +
> +MAKE_ENV+=   BL31=${FULLDISTDIR}/${RK356X_BL31}
> +
> +pre-build:
> + cc -o ${WRKSRC}/rkbinpatch ${FILESDIR}/rkbinpatch.c 
> + cd ${WRKSRC} && \
> + cp ${FULLDISTDIR}/${RK3566_TPL} . && \
> + ./rkbinpatch ${RK3566_TPL}
> + cd ${WRKSRC} && \
> + cp ${FULLDISTDIR}/${RK3568_TPL} . && \
> + ./rkbinpatch ${RK3568_TPL}
> +
> +.include 
> Index: sysutils/u-boot/rk356x/distinfo
> ===
> RCS file: sysutils/u-boot/rk356x/distinfo
> diff -N sysutils/u-boot/rk356x/distinfo
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/u-boot/rk356x/distinfo   13 Oct 2023 17:17:03 -
> @@ -0,0 +1,8 @@
> +SHA256 (rk3566_ddr_1056MHz_v1.18.bin) = 
> 3ABjVq4NHR9mhYo3Yub1pSlMruHKFz7lsMRTG9QgjU8=
> +SHA256 (rk3568_bl31_v1.43.elf) = U7k3G+6qDGo8AjWg8Gmtxxn/kCinhjdyzl7vJBVqsHw=
> +SHA256 (rk3568_ddr_1560MHz_v1.18.bin) = 
> nmIAyhP4RjebrnA7A21C4oCIirOoFDmZOAvcmJjQQyI=
> +SHA256 (u-boot-2023.10.tar.bz2) = 
> 4A5sbwFOBGEBc50I0G8yiBHOvPWuEBNI9AnLvVXOaQA=
> +SIZE (rk3566_ddr_1056MHz_v1.18.bin) = 55296
> +SIZE (rk3568_bl31_v1.43.elf) = 402376
> +SIZE (rk3568_ddr_1560MHz_v1.18.bin) = 55296
> +SIZE (u-boot-2023.10.tar.bz2) = 19645392
> Index: sysutils/u-boot/rk356x/files/rkbinpatch.c
> ===
> RCS file: sysutils/u-boot/rk356x/files/rkbinpatch.c
> diff -N sysutils/u-boot/rk356x/files/rkbinpatch.c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/u-boot/rk356x/files/rkbinpatch.c 13 Oct 2023 17:17:04 -
> @@ -0,0 +1,46 @@
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +int
> +main(int argc, char *argv[])
> +{
> + struct stat st;
> + void *start, *end;
> + uint32_t *word;
> + uint32_t data;
> + int fd;
> +
> + fd = open(argv[1], O_RDWR);
> + if (fd == -1)
> + err(1, "%s", argv[1]);
> +
> + if (fstat(fd, &st) == -1)
> + err(1, "%s: stat", argv[1]);
> +
> + start = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE,
> + MAP_SHARED, fd, 0);
> + if (start == MAP_FAILED)
> + err(1, "%s: mmap", argv[1]);
> +
> + end = (char *)start + st.st_size;
> + for (word = start; (void *)word < end; word++) {
> + if (*word == 0x12345678 && (void *)(word + 10) < end) {
> + data = *(word + 9);
> + if ((data & 0xff) == 150) {
> + data &= 0xff00;
> + data |= 115200;
> + *(word + 9) = data;
> + close(fd);
> + return 0;
> + }
> + }
> + }
> +
> + warnx("%s: can't find parameters", argv[1]);
> +
> + close(fd);
> + return 1;
> +}
> Index: sysutils/u-boot/rk356x/pkg/DESCR
> ===
> RCS file: sysutils/u-boot/rk356x/pkg/DESCR
> diff -N sysutils/u-boot/rk356x/pkg/DESCR
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ sysutils/u-boot/rk356x/pkg/DESCR  13 Oct 2023 17:17:04 -
> @@ -0,0 +1,9 @@
> +U-Boot is a firmware for embedded boards based on PowerPC, ARM, MIPS and
> +several other processors, which can be installed in a boot ROM and used to
> +initialize and test the hardware or to 

NEW: editors/qownnotes

[Kevin Lo]

Hi,

Attached is a port of qownnotes-23.9.4. an open source notepad with markdown 
support and todo list manager, which works together with nextcloud notes.

OK to import?


qownnotes.tar.gz
Description: application/tar-gz

Re: Remove: print/bg5ps

[Kevin Lo]

On Tue, Aug 29, 2023 at 11:46:14AM +0200, Rafael Sadowski wrote:
> 
> I know there is no alternative to print/bg5ps. The world has stopped
> distributing it. To get rid of freetype1, I would also like to get rid
> of it.
> 
> 
> If there is someone who needs it, speak up. Otherwise OK to remove?

ok kevlo@ to drop it.

> Rafael

Re: UPDATE: arm-compute-library 23.05.1

[Kevin Lo]

I would like to commit it in a couple of days if there is no objection, thanks.

On Wed, Jul 12, 2023 at 09:49:51AM +0800, Kevin Lo wrote:
> 
> Friendly ping.
> 
> On Sat, Jul 08, 2023 at 01:20:58PM +0800, Kevin Lo wrote:
> > 
> > Hi,
> > 
> > This is an update of devel/arm-compute-library to its latest version 
> > 23.05.1.
> > For a list of changes, please read
> > https://arm-software.github.io/ComputeLibrary/v23.05/versions_changelogs.xhtml#S2_2_changelog
> > 
> > The update of the port itself is pretty straight forward.
> > Works for me on arm64.
> > 
> > ok?
> > 
> > Index: devel/arm-compute-library/Makefile
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -u -p -r1.10 Makefile
> > --- devel/arm-compute-library/Makefile  14 May 2023 14:23:40 -  
> > 1.10
> > +++ devel/arm-compute-library/Makefile  8 Jul 2023 05:13:51 -
> > @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
> >  
> >  COMMENT =  Arm compute library
> >  
> > -V =23.02.1
> > +V =23.05.1
> >  PKGNAME =  arm-compute-library-${V}
> >  
> >  GH_ACCOUNT =   ARM-software
> > @@ -16,8 +16,8 @@ HOMEPAGE =https://github.com/ARM-softwa
> >  MAINTAINER =   Kevin Lo 
> >  
> >  CORE_SO_V =2.0
> > -GRAPH_SO_V =   2.1
> > -COMPUTE_SO_V = 3.3
> > +GRAPH_SO_V =   2.2
> > +COMPUTE_SO_V = 3.4
> >  
> >  SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
> >  SHARED_LIBS += arm_compute_core ${CORE_SO_V}
> > Index: devel/arm-compute-library/distinfo
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
> > retrieving revision 1.7
> > diff -u -p -u -p -r1.7 distinfo
> > --- devel/arm-compute-library/distinfo  14 May 2023 14:23:40 -  
> > 1.7
> > +++ devel/arm-compute-library/distinfo  8 Jul 2023 05:13:51 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (ComputeLibrary-23.02.1.tar.gz) = 
> > w6RD4mU5+GaWkkLmkM8GUe9ikUl0HuGHMvlUxzTaZ2M=
> > -SIZE (ComputeLibrary-23.02.1.tar.gz) = 13595273
> > +SHA256 (ComputeLibrary-23.05.1.tar.gz) = 
> > xMoymnjaOAFjsthukbpyg0m28O6X1m4mCmlO838LDZM=
> > +SIZE (ComputeLibrary-23.05.1.tar.gz) = 13615969
> > Index: devel/arm-compute-library/patches/patch-SConscript
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
> > retrieving revision 1.8
> > diff -u -p -u -p -r1.8 patch-SConscript
> > --- devel/arm-compute-library/patches/patch-SConscript  14 May 2023 
> > 14:23:40 -  1.8
> > +++ devel/arm-compute-library/patches/patch-SConscript  8 Jul 2023 
> > 05:13:51 -
> > @@ -1,7 +1,7 @@
> >  Index: SConscript
> >  --- SConscript.orig
> >  +++ SConscript
> > -@@ -643,7 +643,7 @@ else:
> > +@@ -650,7 +650,7 @@ else:
> >   elif 'sve' in env['arch']:
> >   lib_files += lib_files_sve
> >   
> > @@ -10,7 +10,7 @@ Index: SConscript
> >   
> >   Export('arm_compute_a')
> >   
> > -@@ -662,7 +662,7 @@ if env['os'] == 'macos':
> > +@@ -669,7 +669,7 @@ if env['os'] == 'macos':
> >   # macos static library archiver fails if given an empty list of files
> >   arm_compute_core_a = build_library('arm_compute_core-static', 
> > arm_compute_env, lib_files, static=True)
> >   else:
> > @@ -19,7 +19,7 @@ Index: SConscript
> >   
> >   Export('arm_compute_core_a')
> >   
> > -@@ -675,7 +675,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> > +@@ -682,7 +682,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> >   # Build graph libraries
> >   arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
> > '-Wno-pessimizing-move'])
> >   
> > Index: devel/arm-compute-library/patches/patch-SConstruct
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
> > retrieving revision 1.8
> > diff -u -p -u -p -r1.8 patch-SConstruct
> > --- devel/arm-compute-library/patches/patch-SConstruct  14 May 2023 
> > 14:23:40 -  1.8
> > +++ devel/arm-compute-library/patches/patch-SConstruct  8 Jul 

Re: UPDATE: arm-compute-library 23.05.1

[Kevin Lo]

Friendly ping.

On Sat, Jul 08, 2023 at 01:20:58PM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This is an update of devel/arm-compute-library to its latest version 23.05.1.
> For a list of changes, please read
> https://arm-software.github.io/ComputeLibrary/v23.05/versions_changelogs.xhtml#S2_2_changelog
> 
> The update of the port itself is pretty straight forward.
> Works for me on arm64.
> 
> ok?
> 
> Index: devel/arm-compute-library/Makefile
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 Makefile
> --- devel/arm-compute-library/Makefile14 May 2023 14:23:40 -  
> 1.10
> +++ devel/arm-compute-library/Makefile8 Jul 2023 05:13:51 -
> @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =  aarch64
>  
>  COMMENT =Arm compute library
>  
> -V =  23.02.1
> +V =  23.05.1
>  PKGNAME =arm-compute-library-${V}
>  
>  GH_ACCOUNT = ARM-software
> @@ -16,8 +16,8 @@ HOMEPAGE =  https://github.com/ARM-softwa
>  MAINTAINER = Kevin Lo 
>  
>  CORE_SO_V =  2.0
> -GRAPH_SO_V = 2.1
> -COMPUTE_SO_V =   3.3
> +GRAPH_SO_V = 2.2
> +COMPUTE_SO_V =   3.4
>  
>  SHARED_LIBS +=   arm_compute ${COMPUTE_SO_V}
>  SHARED_LIBS +=   arm_compute_core ${CORE_SO_V}
> Index: devel/arm-compute-library/distinfo
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- devel/arm-compute-library/distinfo14 May 2023 14:23:40 -  
> 1.7
> +++ devel/arm-compute-library/distinfo8 Jul 2023 05:13:51 -
> @@ -1,2 +1,2 @@
> -SHA256 (ComputeLibrary-23.02.1.tar.gz) = 
> w6RD4mU5+GaWkkLmkM8GUe9ikUl0HuGHMvlUxzTaZ2M=
> -SIZE (ComputeLibrary-23.02.1.tar.gz) = 13595273
> +SHA256 (ComputeLibrary-23.05.1.tar.gz) = 
> xMoymnjaOAFjsthukbpyg0m28O6X1m4mCmlO838LDZM=
> +SIZE (ComputeLibrary-23.05.1.tar.gz) = 13615969
> Index: devel/arm-compute-library/patches/patch-SConscript
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 patch-SConscript
> --- devel/arm-compute-library/patches/patch-SConscript14 May 2023 
> 14:23:40 -  1.8
> +++ devel/arm-compute-library/patches/patch-SConscript8 Jul 2023 
> 05:13:51 -
> @@ -1,7 +1,7 @@
>  Index: SConscript
>  --- SConscript.orig
>  +++ SConscript
> -@@ -643,7 +643,7 @@ else:
> +@@ -650,7 +650,7 @@ else:
>   elif 'sve' in env['arch']:
>   lib_files += lib_files_sve
>   
> @@ -10,7 +10,7 @@ Index: SConscript
>   
>   Export('arm_compute_a')
>   
> -@@ -662,7 +662,7 @@ if env['os'] == 'macos':
> +@@ -669,7 +669,7 @@ if env['os'] == 'macos':
>   # macos static library archiver fails if given an empty list of files
>   arm_compute_core_a = build_library('arm_compute_core-static', 
> arm_compute_env, lib_files, static=True)
>   else:
> @@ -19,7 +19,7 @@ Index: SConscript
>   
>   Export('arm_compute_core_a')
>   
> -@@ -675,7 +675,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> +@@ -682,7 +682,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
>   # Build graph libraries
>   arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
> '-Wno-pessimizing-move'])
>   
> Index: devel/arm-compute-library/patches/patch-SConstruct
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 patch-SConstruct
> --- devel/arm-compute-library/patches/patch-SConstruct14 May 2023 
> 14:23:40 -  1.8
> +++ devel/arm-compute-library/patches/patch-SConstruct8 Jul 2023 
> 05:13:51 -
> @@ -1,7 +1,7 @@
>  Index: SConstruct
>  --- SConstruct.orig
>  +++ SConstruct
> -@@ -245,17 +245,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
> +@@ -253,17 +253,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
>   if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' 
> not in c_compiler ):
>   print( "WARNING: Only clang is officially supported to build the 
> Compute Library for Android")
>   
> @@ -20,7 +20,7 @@ Index: SConstruct
>   if env['cppthreads']:
>   env.Append(CPPDEFIN

Re: Update: fonts/zh-iansui 1.000

[Kevin Lo]

Friendly ping.

On Fri, Jul 07, 2023 at 09:47:45PM +0800, Kevin Lo wrote:
> 
> A trivial update to zh-iansui.
> ok?
> 
> Index: fonts/zh-iansui/Makefile
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- fonts/zh-iansui/Makefile  7 May 2022 13:31:36 -   1.4
> +++ fonts/zh-iansui/Makefile  7 Jul 2023 13:38:17 -
> @@ -1,6 +1,6 @@
>  COMMENT =Chinese truetype font derived from Klee One
>  
> -V =  0.943
> +V =  1.000
>  PKGNAME =zh-iansui-${V}
>  
>  GH_ACCOUNT = ButTaiwan
> @@ -20,10 +20,11 @@ NO_BUILD =Yes
>  NO_TEST =Yes
>  
>  FONTDIR =${PREFIX}/share/fonts/iansui
> +DOCDIR = ${PREFIX}/share/doc/iansui
>  
>  do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> - ${INSTALL_DATA} ${WRKSRC}/Iansui${V:S/.//:C/.$//}-Regular.ttf \
> - ${FONTDIR}/Iansui-Regular.ttf
> + ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
> + ${INSTALL_DATA} ${WRKSRC}/Iansui-Regular.ttf ${FONTDIR}
> + ${INSTALL_DATA} ${WRKSRC}/{README.md,OFL.txt} ${DOCDIR}
>  
>  .include 
> Index: fonts/zh-iansui/distinfo
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- fonts/zh-iansui/distinfo  7 May 2022 13:31:36 -   1.3
> +++ fonts/zh-iansui/distinfo  7 Jul 2023 13:38:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (iansui-0.943.tar.gz) = Unb7KH2p/Or1kxl52wt6aGclALAgmmyJCGiXG/n/CEQ=
> -SIZE (iansui-0.943.tar.gz) = 6206740
> +SHA256 (iansui-1.000.tar.gz) = 69INAxXV8EcFkIDqmI7/h7aCZzZupo6BbjB18L2gT1I=
> +SIZE (iansui-1.000.tar.gz) = 9740773
> Index: fonts/zh-iansui/pkg/PLIST
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- fonts/zh-iansui/pkg/PLIST 11 Mar 2022 19:00:28 -  1.2
> +++ fonts/zh-iansui/pkg/PLIST 7 Jul 2023 13:38:17 -
> @@ -1,4 +1,7 @@
>  @pkgpath chinese/iansui
> +share/doc/iansui/
> +share/doc/iansui/OFL.txt
> +share/doc/iansui/README.md
>  share/fonts/
>  @fontdir share/fonts/iansui/
>  share/fonts/iansui/Iansui-Regular.ttf
> 

UPDATE: arm-compute-library 23.05.1

[Kevin Lo]

Hi,

This is an update of devel/arm-compute-library to its latest version 23.05.1.
For a list of changes, please read
https://arm-software.github.io/ComputeLibrary/v23.05/versions_changelogs.xhtml#S2_2_changelog

The update of the port itself is pretty straight forward.
Works for me on arm64.

ok?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- devel/arm-compute-library/Makefile  14 May 2023 14:23:40 -  1.10
+++ devel/arm-compute-library/Makefile  8 Jul 2023 05:13:51 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =23.02.1
+V =23.05.1
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -16,8 +16,8 @@ HOMEPAGE =https://github.com/ARM-softwa
 MAINTAINER =   Kevin Lo 
 
 CORE_SO_V =2.0
-GRAPH_SO_V =   2.1
-COMPUTE_SO_V = 3.3
+GRAPH_SO_V =   2.2
+COMPUTE_SO_V = 3.4
 
 SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
 SHARED_LIBS += arm_compute_core ${CORE_SO_V}
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- devel/arm-compute-library/distinfo  14 May 2023 14:23:40 -  1.7
+++ devel/arm-compute-library/distinfo  8 Jul 2023 05:13:51 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-23.02.1.tar.gz) = 
w6RD4mU5+GaWkkLmkM8GUe9ikUl0HuGHMvlUxzTaZ2M=
-SIZE (ComputeLibrary-23.02.1.tar.gz) = 13595273
+SHA256 (ComputeLibrary-23.05.1.tar.gz) = 
xMoymnjaOAFjsthukbpyg0m28O6X1m4mCmlO838LDZM=
+SIZE (ComputeLibrary-23.05.1.tar.gz) = 13615969
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  14 May 2023 14:23:40 
-  1.8
+++ devel/arm-compute-library/patches/patch-SConscript  8 Jul 2023 05:13:51 
-
@@ -1,7 +1,7 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -643,7 +643,7 @@ else:
+@@ -650,7 +650,7 @@ else:
  elif 'sve' in env['arch']:
  lib_files += lib_files_sve
  
@@ -10,7 +10,7 @@ Index: SConscript
  
  Export('arm_compute_a')
  
-@@ -662,7 +662,7 @@ if env['os'] == 'macos':
+@@ -669,7 +669,7 @@ if env['os'] == 'macos':
  # macos static library archiver fails if given an empty list of files
  arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
  else:
@@ -19,7 +19,7 @@ Index: SConscript
  
  Export('arm_compute_core_a')
  
-@@ -675,7 +675,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+@@ -682,7 +682,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
  # Build graph libraries
  arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
  
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  14 May 2023 14:23:40 
-  1.8
+++ devel/arm-compute-library/patches/patch-SConstruct  8 Jul 2023 05:13:51 
-
@@ -1,7 +1,7 @@
 Index: SConstruct
 --- SConstruct.orig
 +++ SConstruct
-@@ -245,17 +245,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
+@@ -253,17 +253,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
  if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not 
in c_compiler ):
  print( "WARNING: Only clang is officially supported to build the Compute 
Library for Android")
  
@@ -20,7 +20,7 @@ Index: SConstruct
  if env['cppthreads']:
  env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)])
  
-@@ -412,25 +403,6 @@ if not GetOption("help"):
+@@ -424,25 +415,6 @@ if not GetOption("help"):
  except OSError:
  print("ERROR: Compiler '%s' not found" % env['CXX'])
  Exit(1)
Index: devel/arm-compute-library/pkg/PLIST
===
RCS file: /cvs/ports/devel/arm-compute-library/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- devel/arm-compute-library/pkg/PLIST 14 May 2023 14:23:40 -  1.7
+++ devel/arm-compute-library/pkg/PLIST 8 Jul 2023 05:13:51 -
@@ -141,8 +141,10 @@ include/arm_compute

Update: fonts/zh-iansui 1.000

[Kevin Lo]

A trivial update to zh-iansui.
ok?

Index: fonts/zh-iansui/Makefile
===
RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- fonts/zh-iansui/Makefile7 May 2022 13:31:36 -   1.4
+++ fonts/zh-iansui/Makefile7 Jul 2023 13:38:17 -
@@ -1,6 +1,6 @@
 COMMENT =  Chinese truetype font derived from Klee One
 
-V =0.943
+V =1.000
 PKGNAME =  zh-iansui-${V}
 
 GH_ACCOUNT =   ButTaiwan
@@ -20,10 +20,11 @@ NO_BUILD =  Yes
 NO_TEST =  Yes
 
 FONTDIR =  ${PREFIX}/share/fonts/iansui
+DOCDIR =   ${PREFIX}/share/doc/iansui
 
 do-install:
-   ${INSTALL_DATA_DIR} ${FONTDIR}
-   ${INSTALL_DATA} ${WRKSRC}/Iansui${V:S/.//:C/.$//}-Regular.ttf \
-   ${FONTDIR}/Iansui-Regular.ttf
+   ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
+   ${INSTALL_DATA} ${WRKSRC}/Iansui-Regular.ttf ${FONTDIR}
+   ${INSTALL_DATA} ${WRKSRC}/{README.md,OFL.txt} ${DOCDIR}
 
 .include 
Index: fonts/zh-iansui/distinfo
===
RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- fonts/zh-iansui/distinfo7 May 2022 13:31:36 -   1.3
+++ fonts/zh-iansui/distinfo7 Jul 2023 13:38:17 -
@@ -1,2 +1,2 @@
-SHA256 (iansui-0.943.tar.gz) = Unb7KH2p/Or1kxl52wt6aGclALAgmmyJCGiXG/n/CEQ=
-SIZE (iansui-0.943.tar.gz) = 6206740
+SHA256 (iansui-1.000.tar.gz) = 69INAxXV8EcFkIDqmI7/h7aCZzZupo6BbjB18L2gT1I=
+SIZE (iansui-1.000.tar.gz) = 9740773
Index: fonts/zh-iansui/pkg/PLIST
===
RCS file: /cvs/ports/fonts/zh-iansui/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- fonts/zh-iansui/pkg/PLIST   11 Mar 2022 19:00:28 -  1.2
+++ fonts/zh-iansui/pkg/PLIST   7 Jul 2023 13:38:17 -
@@ -1,4 +1,7 @@
 @pkgpath chinese/iansui
+share/doc/iansui/
+share/doc/iansui/OFL.txt
+share/doc/iansui/README.md
 share/fonts/
 @fontdir share/fonts/iansui/
 share/fonts/iansui/Iansui-Regular.ttf

UPDATE: arm-compute-library 23.02.1

[Kevin Lo]

Hi,

Here is a straight forward update to arm-compute-library bringing us to 23.02.1.
For a list of changes, please read
https://arm-software.github.io/ComputeLibrary/v23.02.1/versions_changelogs.xhtml#S2_2_changelog

ok?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- devel/arm-compute-library/Makefile  6 Jan 2023 00:51:51 -   1.9
+++ devel/arm-compute-library/Makefile  14 May 2023 04:04:53 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =22.11
+V =23.02.1
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -17,7 +17,7 @@ MAINTAINER =  Kevin Lo 
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- devel/arm-compute-library/distinfo  6 Jan 2023 00:51:51 -   1.6
+++ devel/arm-compute-library/distinfo  14 May 2023 04:04:53 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-22.11.tar.gz) = 
4goGDTxPgDiJ2WwvC4ZQBLo+9OIoKZpEM56hwbqCfIU=
-SIZE (ComputeLibrary-22.11.tar.gz) = 13316795
+SHA256 (ComputeLibrary-23.02.1.tar.gz) = 
w6RD4mU5+GaWkkLmkM8GUe9ikUl0HuGHMvlUxzTaZ2M=
+SIZE (ComputeLibrary-23.02.1.tar.gz) = 13595273
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  6 Jan 2023 00:51:51 
-   1.7
+++ devel/arm-compute-library/patches/patch-SConscript  14 May 2023 04:04:53 
-
@@ -1,7 +1,7 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -638,7 +638,7 @@ else:
+@@ -643,7 +643,7 @@ else:
  elif 'sve' in env['arch']:
  lib_files += lib_files_sve
  
@@ -10,7 +10,7 @@ Index: SConscript
  
  Export('arm_compute_a')
  
-@@ -657,7 +657,7 @@ if env['os'] == 'macos':
+@@ -662,7 +662,7 @@ if env['os'] == 'macos':
  # macos static library archiver fails if given an empty list of files
  arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
  else:
@@ -19,7 +19,7 @@ Index: SConscript
  
  Export('arm_compute_core_a')
  
-@@ -670,7 +670,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+@@ -675,7 +675,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
  # Build graph libraries
  arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
  
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  6 Jan 2023 00:51:51 
-   1.7
+++ devel/arm-compute-library/patches/patch-SConstruct  14 May 2023 04:04:53 
-
@@ -20,7 +20,7 @@ Index: SConstruct
  if env['cppthreads']:
  env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)])
  
-@@ -407,25 +398,6 @@ if not GetOption("help"):
+@@ -412,25 +403,6 @@ if not GetOption("help"):
  except OSError:
  print("ERROR: Compiler '%s' not found" % env['CXX'])
  Exit(1)
Index: devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
===
RCS file: devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
diff -N devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp
--- devel/arm-compute-library/patches/patch-include_libnpy_npy_hpp  6 Jan 
2023 00:51:51 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: include/libnpy/npy.hpp
 include/libnpy/npy.hpp.orig
-+++ include/libnpy/npy.hpp
-@@ -103,7 +103,7 @@ struct Typestring {
- inline std::string str() {
-   const size_t max_buflen = 16;
-   char buf[max_buflen];
--  std::sprintf(buf, "%c%c%u", c_endian, c_type, len);
-+  std::snprintf(buf, sizeof(buf), "%c%c%u", c_endian, c_type, len);
-   return std::string(buf);
- }
- 
Index: devel/arm-compute-library/pkg/PLIST
===
RCS file: /cvs/ports/devel/arm-compute-library/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- devel/arm-compute-library/pkg/PLIST 6 Jan 2023 00:51:51 -   1.6
+++ devel/arm-compute-library/pkg/PLIST 14 May 202

Re: batch update for fcitx and related pkgs

[Kevin Lo]

On Fri, Apr 14, 2023 at 01:13:59AM +, Yifei Zhan wrote:
> 
> 
> Bringing the fcitx family and opencc up to date, mostly routine translation
> updates and bugfixes, no major change.
> 
> Tested on amd64 with gedit/kate/xterm, no issue so far. Any testing, 
> especially
>  in the area of the relatively untested hangul/m17n/kkc package is welcomed :)
> 
> (also cc lux who might be interested)

Thank you for your diff!

A WANTLIB seem to be missing for fcitx 5.0.23:

$ make port-lib-depends-check
fcitx-5.0.23(inputmethods/fcitx):
Missing: z.7 (/usr/local/lib/fcitx5/libemoji.so) (system lib)
WANTLIB += z

The rest of diffs looks ok.

I specifically tested fcitx-m17n with konsole, typed 'Han4yu3 Pin1yin1' to
get 'Hànyǔ Pīnyīn'.

If there is no objection, I'd like to commit it in a couple of days, thanks.

> converters/opencc 1.1.3 -> 1.1.6
>   - Language mapping updates
>   - Bumped major
> 
> inputmethods/xcb-imdkit 1.0.3 -> 1.0.5
>   - Bumped major
> 
> inputmethods/fcitx-chinese-addons 5.0.12 -> 5.0.17
>   - Language model update
> 
> inputmethods/libime 1.0.11 -> 1.0.17
> inputmethods/fcitx-lua 5.0.5 -> 5.0.10
> inputmethods/fcitx 5.0.15 -> 5.0.23
> inputmethods/fcitx-config-qt 5.0.12 -> 5.0.17
> inputmethods/fcitx-table-extra 5.0.9 -> 5.0.13
> inputmethods/fcitx-qt 5.0.9 -> 5.0.17
> inputmethods/fcitx-gtk 5.0.13 -> 5.0.23   
> inputmethods/fcitx-anthy 5.0.10 -> 5.0.14
> inputmethods/fcitx-unikey 5.0.9 -> 5.0.13
> inputmethods/fcitx-hangul 5.0.8 -> 5.0.11
> inputmethods/fcitx-m17n 5.0.8 -> 5.0.11
> inputmethods/fcitx-chewing 5.0.10 -> 5.0.14
> inputmethods/fcitx-kkc 5.0.8 -> 5.0.12
>   - Mostly Translations/Icons updates and/or minor bugfixes
> 
> 
> diff --git a/converters/opencc/Makefile b/converters/opencc/Makefile
> index cbae9dbd7..2a4e9768e 100644
> --- a/converters/opencc/Makefile
> +++ b/converters/opencc/Makefile
> @@ -1,14 +1,13 @@
>  COMMENT =convert between traditional and simplified Chinese
>  
> -V =  1.1.3
> +V =  1.1.6
>  DISTNAME =   opencc-$V
> -REVISION =   0
>  
>  GH_ACCOUNT = BYVoid
>  GH_PROJECT = OpenCC
>  GH_TAGNAME = ver.$V
>  
> -SHARED_LIBS +=   opencc0.0 # 1.0
> +SHARED_LIBS +=   opencc1.0 # 2.0
>  
>  CATEGORIES = converters textproc
>  
> diff --git a/converters/opencc/distinfo b/converters/opencc/distinfo
> index f95f2d103..67305bef1 100644
> --- a/converters/opencc/distinfo
> +++ b/converters/opencc/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (opencc-1.1.3.tar.gz) = mamviDswTxHzsPbfMNn7QWHxW4SIA/n/nGWpbVnOh38=
> -SIZE (opencc-1.1.3.tar.gz) = 2805430
> +SHA256 (opencc-1.1.6.tar.gz) = Fpv/QHH/6BTcFt99GA/2YQ20GPSBbpwM4Cz4dL3wWN8=
> +SIZE (opencc-1.1.6.tar.gz) = 3325614
> diff --git a/inputmethods/fcitx-anthy/Makefile 
> b/inputmethods/fcitx-anthy/Makefile
> index 09ddbebc0..9fa6d09c2 100644
> --- a/inputmethods/fcitx-anthy/Makefile
> +++ b/inputmethods/fcitx-anthy/Makefile
> @@ -1,8 +1,7 @@
>  COMMENT =anthy wrapper for fcitx5
>  
> -V =  5.0.10
> +V =  5.0.14
>  PKGNAME =fcitx-anthy-$V
> -REVISION =  0
>  
>  GH_ACCOUNT =fcitx
>  GH_PROJECT =fcitx5-anthy
> diff --git a/inputmethods/fcitx-anthy/distinfo 
> b/inputmethods/fcitx-anthy/distinfo
> index 99d49f898..0a6d87d8a 100644
> --- a/inputmethods/fcitx-anthy/distinfo
> +++ b/inputmethods/fcitx-anthy/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (fcitx5-anthy-5.0.10.tar.gz) = 
> CnZnkwwvwu+pkQYNco+QAkeRhe4Ya5HHdFMjEx9lz1g=
> -SIZE (fcitx5-anthy-5.0.10.tar.gz) = 99003
> +SHA256 (fcitx5-anthy-5.0.14.tar.gz) = 
> rOCKrrZFLkxDbW7vq0SHdUMIaLcm6U2nauLC+16w0yQ=
> +SIZE (fcitx5-anthy-5.0.14.tar.gz) = 104560
> diff --git a/inputmethods/fcitx-anthy/pkg/PLIST 
> b/inputmethods/fcitx-anthy/pkg/PLIST
> index e7b8d9b9b..2990771f8 100644
> --- a/inputmethods/fcitx-anthy/pkg/PLIST
> +++ b/inputmethods/fcitx-anthy/pkg/PLIST
> @@ -1,7 +1,4 @@
> -lib/fcitx5/
>  @so lib/fcitx5/anthy.so
> -share/fcitx5/
> -share/fcitx5/addon/
>  share/fcitx5/addon/anthy.conf
>  share/fcitx5/anthy/
>  share/fcitx5/anthy/101kana.sty
> @@ -22,18 +19,16 @@ share/fcitx5/anthy/vje-delta.sty
>  share/fcitx5/anthy/wnn.sty
>  share/fcitx5/inputmethod/
>  share/fcitx5/inputmethod/anthy.conf
> -share/icons/
> -share/icons/hicolor/
> -share/icons/hicolor/22x22/
> -share/icons/hicolor/22x22/status/
> +share/icons/hicolor/16x16/apps/fcitx-anthy.png
> +share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-anthy.png
> +share/icons/hicolor/22x22/apps/fcitx-anthy.png
> +share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-anthy.png
>  share/icons/hicolor/22x22/status/fcitx-anthy-symbol.png
>  share/icons/hicolor/22x22/status/org.fcitx.Fcitx5.fcitx-anthy-symbol.png
> -share/icons/hicolor/48x48/
> -share/icons/hicolor/48x48/status/
> -share/icons/hicolor/48x48/status/fcitx-anthy.png
> -share/icons/hicolor/48x48/status/org.fcitx.Fcitx5.fcitx-anthy.png
> -share/icons/hicolor/scalable/
> -share/icons/hicolor/scalable/status/
> +share/icons/hicolor/24x24/apps/fcitx-a

Re: aarch64 bulk build report

[Kevin Lo]

On Sat, Feb 25, 2023 at 04:11:52PM +0100, Theo Buehler wrote:
> 
> > http://build-failures.rhaalovely.net/aarch64/2023-02-22/devel/riscv-elf/gcc.log
> 
> This fails to build if lang/gcc/8 is installed because it picks up the
> old ansidecl.h which misses a few #defines.
> 
> One option is to define the missing ones away. Defining them to the
> right thing is harder since they are passed through several shells, so
> getting the quoting right is tricky.
> 
> Hopefully someone else has a better idea.

Today I tried to install devel/riscv-elf/gcc on amd64 and encountered the same
error.  I confirm that your diff fixes the problem, thanks.

Re: Update riscv64 cross compiler toolchain for OpenSBI 1.2

[Kevin Lo]

On Sat, Feb 04, 2023 at 05:43:17PM +0100, Patrick Wildt wrote:
> 
> Hi,

Hi Patrick,

> I was looking at upgrading sysutils/opensbi to version 1.2, and then
> realized that our current gcc/binutils fail to compile it because of
> some instruction set errors (which I forgot to write down).
> 
> So I figured maybe we should update the toolchain to GCC 12.2.0 and
> binutils 2.40.  Unfortunately that breaks the old U-Boot we have in
> our tree, but there's an easy fix one can cherry pick from upstream:
> 
> https://source.denx.de/u-boot/u-boot/-/commit/1dde977518f13824b847e23275001191139bc384
> 
> Thoughts?

Thanks for the update.  I tested those ports on amd64:

riscv-elf-binutils-2.40 binutils for riscv-elf cross-development
riscv-elf-gcc-12.2.0 gcc for riscv-elf cross-development
opensbi-1.2 RISC-V Supervisor Binary Interface
u-boot-riscv64-2021.10p4 U-Boot firmware 

Running OpenBSD/riscv64 on QEMU works fine for me.
ok kevlo@

OpenSBI v1.2
   _  _
  / __ \  / |  _ \_   _|
 | |  | |_ __   ___ _ __ | (___ | |_) || |  
 | |  | | '_ \ / _ \ '_ \ \___ \|  _ < | |
 | |__| | |_) |  __/ | | |) | |_) || |_ 
  \/| .__/ \___|_| |_|_/|/_| 
| | 
|_| 

Platform Name : riscv-virtio,qemu 
Platform Features : medeleg 
Platform HART Count   : 2
Platform IPI Device   : aclint-mswi
Platform Timer Device : aclint-mtimer @ 1000Hz
Platform Console Device   : uart8250
Platform HSM Device   : ---
Platform PMU Device   : ---
Platform Reboot Device: sifive_test
Platform Shutdown Device  : sifive_test
Firmware Base : 0x8000
Firmware Size : 220 KB
Runtime SBI Version   : 1.0

Domain0 Name  : root
Domain0 Boot HART : 1
Domain0 HARTs : 0*,1*
Domain0 Region00  : 0x0200-0x0200 (I)
Domain0 Region01  : 0x8000-0x8003 ()
Domain0 Region02  : 0x-0x (R,W,X)
Domain0 Next Address  : 0x8020
Domain0 Next Arg1 : 0x8220
Domain0 Next Mode : S-mode
Domain0 SysReset  : yes

Boot HART ID  : 1
Boot HART Domain  : root
Boot HART Priv Version: v1.12
Boot HART Base ISA: rv64imafdch
Boot HART ISA Extensions  : time,sstc
Boot HART PMP Count   : 16
Boot HART PMP Granularity : 4
Boot HART PMP Address Bits: 54
Boot HART MHPM Count  : 16
Boot HART MIDELEG : 0x1666
Boot HART MEDELEG : 0x00f0b509
 

U-Boot 2021.10 (Feb 06 2023 - 11:52:28 +0800)

CPU:   rv64imafdch_zicsr_zifencei_zihintpause_zba_zbb_zbc_zbs_sstc
Model: riscv-virtio,qemu
DRAM:  2 GiB
Flash: 32 MiB
Loading Environment from nowhere... OK
In:serial@1000
Out:   serial@1000
Err:   serial@1000
Net:   eth0: virtio-net#1
Hit any key to stop autoboot:  0 

Device 0: 1af4 VirtIO Block Device
Type: Hard Disk
Capacity: 8192.0 MB = 8.0 GB (16777216 x 512)
... is now current device
Scanning virtio 0:1...
** Unable to read file / **
Failed to load '/'
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
Scanning disk virtio-blk#8...
Found 3 disks
No EFI system partition
BootOrder not defined
EFI boot manager: Cannot load any image
Found EFI removable media binary efi/boot/bootriscv64.efi
152954 bytes read in 2 ms (72.9 MiB/s)
libfdt fdt_check_header(): FDT_ERR_BADMAGIC
Booting /efi\boot\bootriscv64.efi
disks: sd0*
>> OpenBSD/riscv64 BOOTRISCV64 1.5
boot> 
booting sd0a:/bsd: 5548504+1350272+214012+701380 [359916+122+503472+359393]=0xa0
a488
bootargs: 
all mapped
type 0x4 pa 0x8000 va 0x8000 pages 0x40 attr 0x8
type 0x7 pa 0x8004 va 0x8004 pages 0x1c0 attr 0x8
type 0x2 pa 0x8020 va 0x8020 pages 0x4000 attr 0x8
type 0x7 pa 0x8420 va 0x8420 pages 0x3cfb attr 0x8
type 0x9 pa 0x87efb000 va 0x87efb000 pages 0xa attr 0x8
type 0x7 pa 0x87f05000 va 0x87f05000 pages 0x766f1 attr 0x8
type 0x2 pa 0xfe5f6000 va 0xfe5f6000 pages 0x3 attr 0x8
type 0x4 pa 0xfe5f9000 va 0xfe5f9000 pages 0x1 attr 0x8
type 0x7 pa 0xfe5fa000 va 0xfe5fa000 pages 0x1 attr 0x8
type 0x2 pa 0xfe5fb000 va 0xfe5fb000 pages 0x100 attr 0x8
type 0x1 pa 0xfe6fb000 va 0xfe6fb000 pages 0x26 attr 0x8
type 0x4 pa 0xfe721000 va 0xfe721000 pages 0x8 attr 0x8
type 0x6 pa 0xfe729000 va 0xfe729000 pages 0x1 attr 0x8008
type 0x4 pa 0xfe72a000 va 0xfe72a000 pages 0x3 attr 0x8
type 0x6 pa 0xfe72d000 va 0xfe72d000 pages 0x3 attr

Re: UPDATE: arm-compute-library 22.11

[Kevin Lo]

I'm going to commit it today later if there's no objection, thanks.

On Tue, Dec 27, 2022 at 10:15:13AM +0800, Kevin Lo wrote:
> 
> Ping?
> 
> On Sun, Dec 18, 2022 at 06:48:09PM +0800, Kevin Lo wrote:
> > 
> > Hi,
> > 
> > This updates arm-compute-library to 22.11. Changes are listed here 
> > https://arm-software.github.io/ComputeLibrary/v22.11/versions_changelogs.xhtml#S2_2_changelog
> > 
> > ok?
> > 
> > Index: devel/arm-compute-library/Makefile
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -u -p -r1.8 Makefile
> > --- devel/arm-compute-library/Makefile  13 Sep 2022 08:59:48 -  
> > 1.8
> > +++ devel/arm-compute-library/Makefile  18 Dec 2022 10:39:29 -
> > @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
> >  
> >  COMMENT =  Arm compute library
> >  
> > -V =22.08
> > +V =22.11
> >  PKGNAME =  arm-compute-library-${V}
> >  
> >  GH_ACCOUNT =   ARM-software
> > @@ -17,7 +17,7 @@ MAINTAINER =  Kevin Lo  >  
> >  CORE_SO_V =2.0
> >  GRAPH_SO_V =   2.1
> > -COMPUTE_SO_V = 3.1
> > +COMPUTE_SO_V = 3.2
> >  
> >  SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
> >  SHARED_LIBS += arm_compute_core ${CORE_SO_V}
> > @@ -32,7 +32,7 @@ COMPILER =base-clang ports-gcc
> >  
> >  # "build=native" here just means "not cross-compiled"
> >  MODSCONS_FLAGS =   Werror=0 neon=1 opencl=0 embed_kernels=0 examples=0 \
> > -   os=openbsd arch=arm64-v8a build=native
> > +   os=openbsd arch=armv8a build=native
> >  
> >  MODULES =  devel/scons
> >  
> > Index: devel/arm-compute-library/distinfo
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 distinfo
> > --- devel/arm-compute-library/distinfo  13 Sep 2022 08:59:48 -  
> > 1.5
> > +++ devel/arm-compute-library/distinfo  18 Dec 2022 10:39:29 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (ComputeLibrary-22.08.tar.gz) = 
> > rCzntWNumfF1sIQ2L4P+JNcubOsL1i7lhmdy9zVdAk0=
> > -SIZE (ComputeLibrary-22.08.tar.gz) = 13257068
> > +SHA256 (ComputeLibrary-22.11.tar.gz) = 
> > 4goGDTxPgDiJ2WwvC4ZQBLo+9OIoKZpEM56hwbqCfIU=
> > +SIZE (ComputeLibrary-22.11.tar.gz) = 13316795
> > Index: devel/arm-compute-library/patches/patch-SConscript
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-SConscript
> > --- devel/arm-compute-library/patches/patch-SConscript  13 Sep 2022 
> > 08:59:48 -  1.6
> > +++ devel/arm-compute-library/patches/patch-SConscript  18 Dec 2022 
> > 10:39:29 -
> > @@ -1,7 +1,7 @@
> >  Index: SConscript
> >  --- SConscript.orig
> >  +++ SConscript
> > -@@ -632,7 +632,7 @@ else:
> > +@@ -638,7 +638,7 @@ else:
> >   elif 'sve' in env['arch']:
> >   lib_files += lib_files_sve
> >   
> > @@ -10,7 +10,7 @@ Index: SConscript
> >   
> >   Export('arm_compute_a')
> >   
> > -@@ -651,7 +651,7 @@ if env['os'] == 'macos':
> > +@@ -657,7 +657,7 @@ if env['os'] == 'macos':
> >   # macos static library archiver fails if given an empty list of files
> >   arm_compute_core_a = build_library('arm_compute_core-static', 
> > arm_compute_env, lib_files, static=True)
> >   else:
> > @@ -19,7 +19,7 @@ Index: SConscript
> >   
> >   Export('arm_compute_core_a')
> >   
> > -@@ -664,7 +664,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> > +@@ -670,7 +670,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> >   # Build graph libraries
> >   arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
> > '-Wno-pessimizing-move'])
> >   
> > Index: devel/arm-compute-library/patches/patch-SConstruct
> > ===
> > RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-SConstruct
> > --- devel/arm-compute-library/patches/pa

Re: UPDATE: arm-compute-library 22.11

[Kevin Lo]

Ping?

On Sun, Dec 18, 2022 at 06:48:09PM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This updates arm-compute-library to 22.11. Changes are listed here 
> https://arm-software.github.io/ComputeLibrary/v22.11/versions_changelogs.xhtml#S2_2_changelog
> 
> ok?
> 
> Index: devel/arm-compute-library/Makefile
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- devel/arm-compute-library/Makefile13 Sep 2022 08:59:48 -  
> 1.8
> +++ devel/arm-compute-library/Makefile18 Dec 2022 10:39:29 -
> @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =  aarch64
>  
>  COMMENT =Arm compute library
>  
> -V =  22.08
> +V =  22.11
>  PKGNAME =arm-compute-library-${V}
>  
>  GH_ACCOUNT = ARM-software
> @@ -17,7 +17,7 @@ MAINTAINER =Kevin Lo   
>  CORE_SO_V =  2.0
>  GRAPH_SO_V = 2.1
> -COMPUTE_SO_V =   3.1
> +COMPUTE_SO_V =   3.2
>  
>  SHARED_LIBS +=   arm_compute ${COMPUTE_SO_V}
>  SHARED_LIBS +=   arm_compute_core ${CORE_SO_V}
> @@ -32,7 +32,7 @@ COMPILER =  base-clang ports-gcc
>  
>  # "build=native" here just means "not cross-compiled"
>  MODSCONS_FLAGS = Werror=0 neon=1 opencl=0 embed_kernels=0 examples=0 \
> - os=openbsd arch=arm64-v8a build=native
> + os=openbsd arch=armv8a build=native
>  
>  MODULES =devel/scons
>  
> Index: devel/arm-compute-library/distinfo
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- devel/arm-compute-library/distinfo13 Sep 2022 08:59:48 -  
> 1.5
> +++ devel/arm-compute-library/distinfo18 Dec 2022 10:39:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (ComputeLibrary-22.08.tar.gz) = 
> rCzntWNumfF1sIQ2L4P+JNcubOsL1i7lhmdy9zVdAk0=
> -SIZE (ComputeLibrary-22.08.tar.gz) = 13257068
> +SHA256 (ComputeLibrary-22.11.tar.gz) = 
> 4goGDTxPgDiJ2WwvC4ZQBLo+9OIoKZpEM56hwbqCfIU=
> +SIZE (ComputeLibrary-22.11.tar.gz) = 13316795
> Index: devel/arm-compute-library/patches/patch-SConscript
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-SConscript
> --- devel/arm-compute-library/patches/patch-SConscript13 Sep 2022 
> 08:59:48 -  1.6
> +++ devel/arm-compute-library/patches/patch-SConscript18 Dec 2022 
> 10:39:29 -
> @@ -1,7 +1,7 @@
>  Index: SConscript
>  --- SConscript.orig
>  +++ SConscript
> -@@ -632,7 +632,7 @@ else:
> +@@ -638,7 +638,7 @@ else:
>   elif 'sve' in env['arch']:
>   lib_files += lib_files_sve
>   
> @@ -10,7 +10,7 @@ Index: SConscript
>   
>   Export('arm_compute_a')
>   
> -@@ -651,7 +651,7 @@ if env['os'] == 'macos':
> +@@ -657,7 +657,7 @@ if env['os'] == 'macos':
>   # macos static library archiver fails if given an empty list of files
>   arm_compute_core_a = build_library('arm_compute_core-static', 
> arm_compute_env, lib_files, static=True)
>   else:
> @@ -19,7 +19,7 @@ Index: SConscript
>   
>   Export('arm_compute_core_a')
>   
> -@@ -664,7 +664,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
> +@@ -670,7 +670,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
>   # Build graph libraries
>   arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
> '-Wno-pessimizing-move'])
>   
> Index: devel/arm-compute-library/patches/patch-SConstruct
> ===
> RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-SConstruct
> --- devel/arm-compute-library/patches/patch-SConstruct13 Sep 2022 
> 08:59:48 -  1.6
> +++ devel/arm-compute-library/patches/patch-SConstruct18 Dec 2022 
> 10:39:29 -
> @@ -1,7 +1,7 @@
>  Index: SConstruct
>  --- SConstruct.orig
>  +++ SConstruct
> -@@ -244,17 +244,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
> +@@ -245,17 +245,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
>   if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' 
> not in c_compiler ):
>   print( "WARNING: Only clang is officially supported to build the 
&

UPDATE: arm-compute-library 22.11

[Kevin Lo]

Hi,

This updates arm-compute-library to 22.11. Changes are listed here 
https://arm-software.github.io/ComputeLibrary/v22.11/versions_changelogs.xhtml#S2_2_changelog

ok?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- devel/arm-compute-library/Makefile  13 Sep 2022 08:59:48 -  1.8
+++ devel/arm-compute-library/Makefile  18 Dec 2022 10:39:29 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =22.08
+V =22.11
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -17,7 +17,7 @@ MAINTAINER =  Kevin Lo 

inputmethods/fcitx-qt: enable Qt6

[Kevin Lo]

Hi Yifei,

The diff belows enable Qt6 support in fcitx-qt.
With this diff, I can type Chinese on net/tdesktop.

OK?

Index: inputmethods/fcitx-qt/Makefile
===
RCS file: /cvs/ports/inputmethods/fcitx-qt/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- inputmethods/fcitx-qt/Makefile  13 May 2022 18:59:19 -  1.2
+++ inputmethods/fcitx-qt/Makefile  10 Oct 2022 06:06:10 -
@@ -2,10 +2,11 @@ COMMENT = Qt library and IM module for f
 
 DISTNAME = fcitx5-qt-5.0.9
 PKGNAME =  ${DISTNAME:S/fcitx5/fcitx/}
-REVISION = 0
+REVISION = 1
 
 SHARED_LIBS += Fcitx5Qt5WidgetsAddons  0.0 # 0.0
 SHARED_LIBS += Fcitx5Qt5DBusAddons 0.0 # 0.0
+SHARED_LIBS += Fcitx5Qt6DBusAddons 0.0 # 0.0
 
 CATEGORIES =   inputmethods
 
@@ -17,12 +18,14 @@ MAINTAINER =Yifei Zhan https://download.fcitx-im.org/fcitx5/fcitx5-qt/
 
-MODULES =  devel/kf5
+MODULES =  devel/kf5 \
+   x11/qt6
 
 BUILD_DEPENDS =devel/gettext,-tools \
inputmethods/fcitx \
@@ -35,6 +38,7 @@ RUN_DEPENDS = devel/desktop-file-utils 
 
 LIB_DEPENDS =  inputmethods/fcitx
 
-CONFIGURE_ARGS =   -DENABLE_QT4=OFF
+CONFIGURE_ARGS =   -DENABLE_QT4=OFF \
+   -DENABLE_QT6=ON
 
 .include 
Index: inputmethods/fcitx-qt/pkg/PLIST
===
RCS file: /cvs/ports/inputmethods/fcitx-qt/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST
--- inputmethods/fcitx-qt/pkg/PLIST 13 May 2022 15:37:49 -  1.1
+++ inputmethods/fcitx-qt/pkg/PLIST 10 Oct 2022 06:06:10 -
@@ -15,6 +15,15 @@ include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/
 include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqtkeysequencewidget.h
 include/Fcitx5Qt5/fcitx5qt5dbusaddons_version.h
 include/Fcitx5Qt5/fcitx5qt5widgetsaddons_version.h
+include/Fcitx5Qt6/
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitx5qt6dbusaddons_export.h
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtcontrollerproxy.h
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtdbustypes.h
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputcontextproxy.h
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputmethodproxy.h
+include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtwatcher.h
+include/Fcitx5Qt6/fcitx5qt6dbusaddons_version.h
 lib/cmake/Fcitx5Qt5DBusAddons/
 lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsConfig.cmake
 lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsConfigVersion.cmake
@@ -25,11 +34,18 @@ lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Q
 lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsConfigVersion.cmake
 
lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsTargets${MODCMAKE_BUILD_SUFFIX}
 lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsTargets.cmake
+lib/cmake/Fcitx5Qt6DBusAddons/
+lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfig.cmake
+lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfigVersion.cmake
+lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets.cmake
 lib/fcitx5/qt5/
 @so lib/fcitx5/qt5/libfcitx-quickphrase-editor5.so
 @lib lib/libFcitx5Qt5DBusAddons.so.${LIBFcitx5Qt5DBusAddons_VERSION}
 @lib lib/libFcitx5Qt5WidgetsAddons.so.${LIBFcitx5Qt5WidgetsAddons_VERSION}
+@lib lib/libFcitx5Qt6DBusAddons.so.${LIBFcitx5Qt6DBusAddons_VERSION}
 @so 
lib/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so
+@so 
lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so
 @bin libexec/fcitx5-qt5-gui-wrapper
 share/locale/ca/LC_MESSAGES/fcitx5-qt.mo
 share/locale/da/LC_MESSAGES/fcitx5-qt.mo

UPDATE: arm-compute-library 22.08

[Kevin Lo]

Hi,

Here is a straight forward update to arm-compute-library bringing us to 22.08.
For a list of changes, please read
https://arm-software.github.io/ComputeLibrary/v22.08/versions_changelogs.xhtml#S2_2_changelog

ok?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- devel/arm-compute-library/Makefile  13 Jul 2022 08:12:21 -  1.7
+++ devel/arm-compute-library/Makefile  13 Sep 2022 07:51:32 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =22.05
+V =22.08
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -15,12 +15,13 @@ HOMEPAGE =  https://github.com/ARM-softwa
 
 MAINTAINER =   Kevin Lo 
 
-SO_VERSION =   2.0
-COMPUTE_SO_V = 3.0
+CORE_SO_V =2.0
+GRAPH_SO_V =   2.1
+COMPUTE_SO_V = 3.1
 
 SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
-SHARED_LIBS += arm_compute_core ${SO_VERSION}
-SHARED_LIBS += arm_compute_graph ${SO_VERSION}
+SHARED_LIBS += arm_compute_core ${CORE_SO_V}
+SHARED_LIBS += arm_compute_graph ${GRAPH_SO_V}
 
 # MIT
 PERMIT_PACKAGE=Yes
@@ -49,9 +50,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute.so \
 ${PREFIX}/lib/libarm_compute.so.${COMPUTE_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_core.so \
-${PREFIX}/lib/libarm_compute_core.so.${SO_VERSION}
+${PREFIX}/lib/libarm_compute_core.so.${CORE_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_graph.so \
-${PREFIX}/lib/libarm_compute_graph.so.${SO_VERSION}
+${PREFIX}/lib/libarm_compute_graph.so.${GRAPH_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/*.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arm-compute-library
${INSTALL_DATA} ${WRKSRC}/examples/*.{h,cpp} \
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- devel/arm-compute-library/distinfo  13 Jul 2022 08:12:21 -  1.4
+++ devel/arm-compute-library/distinfo  13 Sep 2022 07:51:32 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-22.05.tar.gz) = 
lOLp/4fCYanJmHvJAkxEnEgBT3/nBzEb36drh/PdpcU=
-SIZE (ComputeLibrary-22.05.tar.gz) = 13119545
+SHA256 (ComputeLibrary-22.08.tar.gz) = 
rCzntWNumfF1sIQ2L4P+JNcubOsL1i7lhmdy9zVdAk0=
+SIZE (ComputeLibrary-22.08.tar.gz) = 13257068
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  13 Jul 2022 08:12:21 
-  1.5
+++ devel/arm-compute-library/patches/patch-SConscript  13 Sep 2022 07:51:32 
-
@@ -1,7 +1,7 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -623,7 +623,7 @@ else:
+@@ -632,7 +632,7 @@ else:
  elif 'sve' in env['arch']:
  lib_files += lib_files_sve
  
@@ -10,7 +10,7 @@ Index: SConscript
  
  Export('arm_compute_a')
  
-@@ -642,7 +642,7 @@ if env['os'] == 'macos':
+@@ -651,7 +651,7 @@ if env['os'] == 'macos':
  # macos static library archiver fails if given an empty list of files
  arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
  else:
@@ -19,7 +19,7 @@ Index: SConscript
  
  Export('arm_compute_core_a')
  
-@@ -655,7 +655,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+@@ -664,7 +664,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
  # Build graph libraries
  arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
  
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  13 Jul 2022 08:12:21 
-  1.5
+++ devel/arm-compute-library/patches/patch-SConstruct  13 Sep 2022 07:51:32 
-
@@ -1,7 +1,7 @@
 Index: SConstruct
 --- SConstruct.orig
 +++ SConstruct
-@@ -228,17 +228,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
+@@ -244,17 +244,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
  if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not 
in c_compiler ):
  print( "WARNING: Only clang is officially supported to build the Compute 
Lib

Re: arm-trusted-firmware: update to 2.7.0

[Kevin Lo]

On Thu, Aug 04, 2022 at 02:59:32PM +, Klemens Nanni wrote:
> 
> I gave this a try on the Pinebook Pro to see if any of the issues I have
> got fixed/improved, but it still remains nothing but a toy device.
> 
> Besides existing flaws, I have not noticed any regression.
> 
> I bumped and rebuilt u-boot's aarc64 FLAVOR and dd'ed the files as
> documented in INSTALL.aarc64 onto eMMC.
> 
> Does anyone else want to test this on their devices?
> Feedback? OK?

Working here with:

PINE H64 ver B (Allwinner H6): http://ix.io/46Io
ROCKPro64 (RK3399): http://ix.io/46Jv

ok kevlo@

UPDATE: arm-compute-library 22.05

[Kevin Lo]

Hi,

This updates arm-compute-library to 22.05. Changes are listed here [1].
ok?

[1] 
https://arm-software.github.io/ComputeLibrary/v22.05/versions_changelogs.xhtml#S2_2_changelog

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- devel/arm-compute-library/Makefile  31 Mar 2022 16:39:08 -  1.6
+++ devel/arm-compute-library/Makefile  13 Jul 2022 00:31:26 -
@@ -2,9 +2,8 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =22.02
+V =22.05
 PKGNAME =  arm-compute-library-${V}
-REVISION = 0
 
 GH_ACCOUNT =   ARM-software
 GH_PROJECT =   ComputeLibrary
@@ -17,13 +16,11 @@ HOMEPAGE =  https://github.com/ARM-softwa
 MAINTAINER =   Kevin Lo 
 
 SO_VERSION =   2.0
-ACL_LIBS = arm_compute \
-   arm_compute_core \
-   arm_compute_graph
+COMPUTE_SO_V = 3.0
 
-.for _lib in ${ACL_LIBS}
-SHARED_LIBS += ${_lib} ${SO_VERSION}
-.endfor
+SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
+SHARED_LIBS += arm_compute_core ${SO_VERSION}
+SHARED_LIBS += arm_compute_graph ${SO_VERSION}
 
 # MIT
 PERMIT_PACKAGE=Yes
@@ -49,15 +46,19 @@ do-install:
cp -R ${WRKSRC}/${dir} ${PREFIX}/include
 .endfor
cp -R ${WRKSRC}/include/* ${PREFIX}/include
-.for _lib in ${ACL_LIBS}
-   ${INSTALL_DATA} ${WRKSRC}/build/lib${_lib}.so \
-${PREFIX}/lib/lib${_lib}.so.${SO_VERSION}
-.endfor
+   ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute.so \
+${PREFIX}/lib/libarm_compute.so.${COMPUTE_SO_V}
+   ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_core.so \
+${PREFIX}/lib/libarm_compute_core.so.${SO_VERSION}
+   ${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_graph.so \
+${PREFIX}/lib/libarm_compute_graph.so.${SO_VERSION}
${INSTALL_DATA} ${WRKSRC}/build/*.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arm-compute-library
${INSTALL_DATA} ${WRKSRC}/examples/*.{h,cpp} \
${PREFIX}/share/examples/arm-compute-library
-   cp -R ${WRKSRC}/examples/gemm_tuner \
+.for dir in dynamic_fusion gemm_tuner
+   cp -R ${WRKSRC}/examples/${dir} \
${PREFIX}/share/examples/arm-compute-library
+.endfor
 
 .include 
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- devel/arm-compute-library/distinfo  29 Mar 2022 08:06:01 -  1.3
+++ devel/arm-compute-library/distinfo  13 Jul 2022 00:31:26 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-22.02.tar.gz) = 
ESRLBSWfscSvc4TQwzka6t3siqwUR3QgdYLbSEJyZUA=
-SIZE (ComputeLibrary-22.02.tar.gz) = 12990648
+SHA256 (ComputeLibrary-22.05.tar.gz) = 
lOLp/4fCYanJmHvJAkxEnEgBT3/nBzEb36drh/PdpcU=
+SIZE (ComputeLibrary-22.05.tar.gz) = 13119545
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  29 Mar 2022 08:06:01 
-  1.4
+++ devel/arm-compute-library/patches/patch-SConscript  13 Jul 2022 00:31:26 
-
@@ -1,7 +1,7 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -610,7 +610,7 @@ else:
+@@ -623,7 +623,7 @@ else:
  elif 'sve' in env['arch']:
  lib_files += lib_files_sve
  
@@ -10,7 +10,7 @@ Index: SConscript
  
  Export('arm_compute_a')
  
-@@ -629,7 +629,7 @@ if env['os'] == 'macos':
+@@ -642,7 +642,7 @@ if env['os'] == 'macos':
  # macos static library archiver fails if given an empty list of files
  arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
  else:
@@ -19,7 +19,7 @@ Index: SConscript
  
  Export('arm_compute_core_a')
  
-@@ -642,7 +642,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+@@ -655,7 +655,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
  # Build graph libraries
  arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
  
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  29 Mar 2022 08:06:01 
-  1.4
+++ devel/arm-compute-library/patches/patch-SConstruct  13 Jul 2022 00:31:26 
-
@@ -1,7 +1,7 @@
 Index: SConstruct
 

Re: update fcitx4 -> fcitx5 [IME tester wanted]

[Kevin Lo]

On Mon, May 09, 2022 at 02:50:41PM +0800, Kevin Lo wrote:
> 
> On Thu, Mar 31, 2022 at 09:32:58AM +, Yifei Zhan wrote:
> > Here is a tarball to update fcitx4 to fcitx5, containing the following 
> > components:
> > 
> > - fcitx5
> > - fcitx5-{gtk,qt,config-qt}
> > - fcitx5-{kkc,anthy,hangul,chewing,chinese-addons,table-extra} (CJK)
> > - fcitx5-unikey (Vietnamese)
> > - fcitx5-m17n (More tables...)
> > 
> > deps:
> > 
> > - libime
> > - xcb-imdkit
> > - fcitx5-lua
> > 
> > Difference from the last submission:
> > 
> > - update everything to their latest versions
> >   ... which also means removing some merged patches
> > - only set NO_TEST when there is no test and `make test` returns error
> > - a new README guide (please help test this with your DE/WM config.)
> > 
> > All of them are tested on amd64 and arm64 with kdevelop(Qt) and 
> > gedit(GTK), some engines (anthy,chinese-addons) are tested more than 
> > others. I've been using fcitx5-chinese-addons for a few months now, no 
> > issue so far.
> 
> Thanks for your work on fcitx5.  I've been testing fcitx5-chewing, it works
> great in firefox, chromium, telegram-desktop, etc.
> 
> If there is no objection, I'll import fcitx5 and drop fcitx this week, thanks.

Committed, thanks.

Re: update fcitx4 -> fcitx5 [IME tester wanted]

[Kevin Lo]

On Thu, Mar 31, 2022 at 09:32:58AM +, Yifei Zhan wrote:
> Here is a tarball to update fcitx4 to fcitx5, containing the following 
> components:
> 
> - fcitx5
> - fcitx5-{gtk,qt,config-qt}
> - fcitx5-{kkc,anthy,hangul,chewing,chinese-addons,table-extra} (CJK)
> - fcitx5-unikey (Vietnamese)
> - fcitx5-m17n (More tables...)
> 
> deps:
> 
> - libime
> - xcb-imdkit
> - fcitx5-lua
> 
> Difference from the last submission:
> 
> - update everything to their latest versions
>   ... which also means removing some merged patches
> - only set NO_TEST when there is no test and `make test` returns error
> - a new README guide (please help test this with your DE/WM config.)
> 
> All of them are tested on amd64 and arm64 with kdevelop(Qt) and 
> gedit(GTK), some engines (anthy,chinese-addons) are tested more than 
> others. I've been using fcitx5-chinese-addons for a few months now, no 
> issue so far.

Thanks for your work on fcitx5.  I've been testing fcitx5-chewing, it works
great in firefox, chromium, telegram-desktop, etc.

If there is no objection, I'll import fcitx5 and drop fcitx this week, thanks.

Re: [UPDATE] fonts/zh-iansui to 0.943

[Kevin Lo]

ping.

On Tue, May 03, 2022 at 10:27:55AM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This updates zh-iansu to 0.943, ok?
> 
> Index: fonts/zh-iansui/Makefile
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- fonts/zh-iansui/Makefile  11 Mar 2022 19:00:28 -  1.3
> +++ fonts/zh-iansui/Makefile  3 May 2022 02:23:57 -
> @@ -1,6 +1,6 @@
>  COMMENT =Chinese truetype font derived from Klee One
>  
> -V =  0.940
> +V =  0.943
>  PKGNAME =zh-iansui-${V}
>  
>  GH_ACCOUNT = ButTaiwan
> Index: fonts/zh-iansui/distinfo
> ===
> RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- fonts/zh-iansui/distinfo  1 Mar 2022 04:16:19 -   1.2
> +++ fonts/zh-iansui/distinfo  3 May 2022 02:23:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (iansui-0.940.tar.gz) = 9/gb5RPXDIBOR8bqE/Lus5lN44VVWcVT1cX/uwnR1Oc=
> -SIZE (iansui-0.940.tar.gz) = 6203724
> +SHA256 (iansui-0.943.tar.gz) = Unb7KH2p/Or1kxl52wt6aGclALAgmmyJCGiXG/n/CEQ=
> +SIZE (iansui-0.943.tar.gz) = 6206740
> 

[UPDATE] fonts/zh-iansui to 0.943

[Kevin Lo]

Hi,

This updates zh-iansu to 0.943, ok?

Index: fonts/zh-iansui/Makefile
===
RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- fonts/zh-iansui/Makefile11 Mar 2022 19:00:28 -  1.3
+++ fonts/zh-iansui/Makefile3 May 2022 02:23:57 -
@@ -1,6 +1,6 @@
 COMMENT =  Chinese truetype font derived from Klee One
 
-V =0.940
+V =0.943
 PKGNAME =  zh-iansui-${V}
 
 GH_ACCOUNT =   ButTaiwan
Index: fonts/zh-iansui/distinfo
===
RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/zh-iansui/distinfo1 Mar 2022 04:16:19 -   1.2
+++ fonts/zh-iansui/distinfo3 May 2022 02:23:57 -
@@ -1,2 +1,2 @@
-SHA256 (iansui-0.940.tar.gz) = 9/gb5RPXDIBOR8bqE/Lus5lN44VVWcVT1cX/uwnR1Oc=
-SIZE (iansui-0.940.tar.gz) = 6203724
+SHA256 (iansui-0.943.tar.gz) = Unb7KH2p/Or1kxl52wt6aGclALAgmmyJCGiXG/n/CEQ=
+SIZE (iansui-0.943.tar.gz) = 6206740

Re: UPDATE: arm-compute-library 22.02

[Kevin Lo]

On Wed, Mar 23, 2022 at 09:08:08AM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> This updates arm-compute-library to 22.02. Changes are listed here [1].
> ok?
> 
> [1] 
> https://arm-software.github.io/ComputeLibrary/v22.02/versions_changelogs.xhtml#S2_2_changelog

Ping?

UPDATE: arm-compute-library 22.02

[Kevin Lo]

Hi,

This updates arm-compute-library to 22.02. Changes are listed here [1].
ok?

[1] 
https://arm-software.github.io/ComputeLibrary/v22.02/versions_changelogs.xhtml#S2_2_changelog

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- devel/arm-compute-library/Makefile  11 Mar 2022 18:49:35 -  1.4
+++ devel/arm-compute-library/Makefile  23 Mar 2022 01:04:33 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =21.11
+V =22.02
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -15,7 +15,7 @@ HOMEPAGE =https://github.com/ARM-softwa
 
 MAINTAINER =   Kevin Lo 
 
-SO_VERSION =   1.0
+SO_VERSION =   2.0
 ACL_LIBS = arm_compute \
arm_compute_core \
arm_compute_graph
@@ -33,13 +33,15 @@ COMPILER =  base-clang ports-gcc
 
 # "build=native" here just means "not cross-compiled"
 MODSCONS_FLAGS =   Werror=0 neon=1 opencl=0 embed_kernels=0 examples=0 \
-   os=openbsd arch=arm64-v8a build=native \
-   extra_cxx_flags=-fPIC
+   os=openbsd arch=arm64-v8a build=native
 
 MODULES =  devel/scons
 
 MAKE_ENV = CC="${CC}" \
CXX="${CXX}"
+
+do-build:
+   cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} ${MODSCONS_FLAGS}
 
 do-install:
 .for dir in arm_compute support utils
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- devel/arm-compute-library/distinfo  2 Jan 2022 14:11:16 -   1.2
+++ devel/arm-compute-library/distinfo  23 Mar 2022 01:04:33 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-21.11.tar.gz) = 
gyLtLhNZmVaQgqlef7svqHeG/7HGeTWz73HgC1PyyIc=
-SIZE (ComputeLibrary-21.11.tar.gz) = 12987341
+SHA256 (ComputeLibrary-22.02.tar.gz) = 
ESRLBSWfscSvc4TQwzka6t3siqwUR3QgdYLbSEJyZUA=
+SIZE (ComputeLibrary-22.02.tar.gz) = 12990648
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  11 Mar 2022 18:49:35 
-  1.3
+++ devel/arm-compute-library/patches/patch-SConscript  23 Mar 2022 01:04:33 
-
@@ -1,40 +1,30 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -422,7 +422,8 @@ undefined_flag = '-Wl,-undefined,error' if 'macos' in 
- arm_compute_env.Append(LINKFLAGS=[undefined_flag])
- arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] )
- 
--arm_compute_env.Append(LIBS = ['dl'])
-+if env['os'] != 'openbsd':
-+arm_compute_env.Append(LIBS = ['dl'])
- 
- with (open(Dir('#').path + '/filelist.json')) as fp:
- filelist = json.load(fp)
-@@ -526,7 +527,7 @@ if (env['fat_binary']):
- sve_o = build_sve_objs(lib_files_sve)
- arm_compute_a = build_library('arm_compute-static', arm_compute_env, 
lib_files + sve_o, static=True)
- else:
--arm_compute_a = build_library('arm_compute-static', arm_compute_env, 
lib_files + lib_files_sve, static=True)
-+arm_compute_a = build_library('arm_compute', arm_compute_env, lib_files + 
lib_files_sve, static=True)
+@@ -610,7 +610,7 @@ else:
+ elif 'sve' in env['arch']:
+ lib_files += lib_files_sve
+ 
+-arm_compute_a = build_library('arm_compute-static', arm_compute_env, 
lib_files, static=True)
++arm_compute_a = build_library('arm_compute', arm_compute_env, lib_files, 
static=True)
+ 
  Export('arm_compute_a')
  
- # Build shared libraries
-@@ -539,7 +540,7 @@ if env['os'] != 'bare_metal' and not env['standalone']
- Export('arm_compute_so')
- 
- # Generate dummy core lib for backwards compatibility
--arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, [], static=True)
-+arm_compute_core_a = build_library('arm_compute_core', arm_compute_env, [], 
static=True)
+@@ -629,7 +629,7 @@ if env['os'] == 'macos':
+ # macos static library archiver fails if given an empty list of files
+ arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
+ else:
+-arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, [], static=True)
++arm_compute_core_a =

[UPDATE] fonts/zh-iansui to 0.940

[Kevin Lo]

Hi,

This updates zh-iansu to the latest release, ok?

Index: fonts/zh-iansui/Makefile
===
RCS file: /cvs/ports/fonts/zh-iansui/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- fonts/zh-iansui/Makefile20 Jan 2022 00:54:58 -  1.1.1.1
+++ fonts/zh-iansui/Makefile1 Mar 2022 02:40:54 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Chinese truetype font derived from Klee One
 
-V =0.910
+V =0.940
 PKGNAME =  zh-iansui-${V}
 
 GH_ACCOUNT =   ButTaiwan
@@ -25,7 +25,7 @@ FONTDIR = ${PREFIX}/share/fonts/iansui
 
 do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
-   ${INSTALL_DATA} ${WRKSRC}/Iansui0.91-Regular.ttf \
+   ${INSTALL_DATA} ${WRKSRC}/Iansui${V:S/.//:C/.$//}-Regular.ttf \
${FONTDIR}/Iansui-Regular.ttf
 
 .include 
Index: fonts/zh-iansui/distinfo
===
RCS file: /cvs/ports/fonts/zh-iansui/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- fonts/zh-iansui/distinfo20 Jan 2022 00:54:58 -  1.1.1.1
+++ fonts/zh-iansui/distinfo1 Mar 2022 02:40:54 -
@@ -1,2 +1,2 @@
-SHA256 (iansui-0.910.tar.gz) = RpT5tPpHfA5R1Bq+H4jQQ3H8mGcHIVdqvjxu4zVUznU=
-SIZE (iansui-0.910.tar.gz) = 5360237
+SHA256 (iansui-0.940.tar.gz) = 9/gb5RPXDIBOR8bqE/Lus5lN44VVWcVT1cX/uwnR1Oc=
+SIZE (iansui-0.940.tar.gz) = 6203724

NEW: fonts/zh-iansui

[Kevin Lo]

Hi,

Please find attached a port for the Iansu font.
>From pkg/DESCR:

Iansui is an open source Chinese font derived from Klee One (Fontworks).

ok?


zh-iansui.tar.gz
Description: application/tar-gz

Re: Add support for PINE H64 model B

[Kevin Lo]

On Fri, Jan 14, 2022 at 10:50:23AM +1100, Jonathan Gray wrote:
> 
> On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> > The PINE H64 ver. B is a minor revision of the original H64.
> > I copied the device tree from the Linux kernel.
> > 
> > dmesg: http://ix.io/3M3r
> > 
> > ok?
> 
> ok on the atf change

Thanks.

> To make u-boot less of a mess the model b device tree selection
> should be done with the existing h64 target not a new one.
> 
> A related patch series to yours
> https://lists.denx.de/pipermail/u-boot/2021-December/469475.html
> though this was not merged upstream

That series is very similar to mine...

> In case you missed it I am no longer maintainer on the u-boot port.

I didn't know :(  Sorry for the noise.

Re: Add support for PINE H64 model B

[Kevin Lo]

On Thu, Jan 13, 2022 at 09:18:15AM +, Klemens Nanni wrote:
> 
> On Thu, Jan 13, 2022 at 05:02:05PM +0800, Kevin Lo wrote:
> > The PINE H64 ver. B is a minor revision of the original H64.
> > I copied the device tree from the Linux kernel.
> > 
> > dmesg: http://ix.io/3M3r
> > 
> > ok?
> 
> With one fix.
> 
> > Index: sysutils/arm-trusted-firmware/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> > retrieving revision 1.16
> > diff -u -p -u -p -r1.16 Makefile
> > --- sysutils/arm-trusted-firmware/Makefile  18 Jun 2021 09:17:28 -  
> > 1.16
> > +++ sysutils/arm-trusted-firmware/Makefile  13 Jan 2022 08:54:30 -
> > @@ -9,6 +9,7 @@ GH_PROJECT= arm-trusted-firmware
> >  GH_TAGNAME=v2.5
> >  
> >  EPOCH= 0
> > +REVISION=  0
> >  
> >  CATEGORIES=sysutils
> >  
> > @@ -32,7 +33,8 @@ CFLAGS=
> >  PLATFORMS=\
> > rk3328 \
> > rk3399 \
> > -   sun50i_a64
> > +   sun50i_a64 \
> > +   sun50i_h6
> >  
> >  do-build:
> >  .for P in ${PLATFORMS}
> > @@ -49,5 +51,7 @@ do-install:
> > ${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
> > ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
> > ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> > +   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
> > +   ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
> >  
> >  .include 
> > Index: sysutils/arm-trusted-firmware/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -u -p -r1.4 PLIST
> > --- sysutils/arm-trusted-firmware/pkg/PLIST 27 Sep 2019 15:43:29 -  
> > 1.4
> > +++ sysutils/arm-trusted-firmware/pkg/PLIST 13 Jan 2022 08:54:30 -
> > @@ -4,3 +4,4 @@ share/arm-trusted-firmware/
> >  share/arm-trusted-firmware/rk3328-bl31.elf
> >  share/arm-trusted-firmware/rk3399-bl31.elf
> >  share/arm-trusted-firmware/sun50i_a64-bl31.bin
> > +share/arm-trusted-firmware/sun50i_h6-bl31.bin
> > Index: sysutils/u-boot/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> > retrieving revision 1.89
> > diff -u -p -u -p -r1.89 Makefile
> > --- sysutils/u-boot/Makefile17 Dec 2021 23:00:41 -  1.89
> > +++ sysutils/u-boot/Makefile13 Jan 2022 08:54:31 -
> > @@ -8,7 +8,7 @@ FLAVOR?=arm
> >  
> >  COMMENT=   U-Boot firmware
> >  VERSION=   2021.10
> > -REVISION=  2
> > +REVISION=  3
> 
> You also need to bump the build dependency to
>   sysutils/arm-trusted-firmware>=2.2p0v0
> 
> Otherwise new u-boot old atf will fail.

Fixed, thanks.

> >  DISTNAME=  u-boot-${VERSION}
> >  PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
> >  FULLPKGNAME=   ${PKGNAME}
> > @@ -44,6 +44,7 @@ MAKE_ENV+=CROSS_COMPILE="aarch64-none-e
> >  RK3328_BL31=   
> > "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
> >  RK3399_BL31=   
> > "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
> >  SUNXI_BL31=
> > "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
> > +SUNXI_H6_BL31= 
> > "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
> >  .elif "${FLAVOR}" == "arm"
> >  BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
> >  MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
> > @@ -69,6 +70,7 @@ SUNXI64=\
> > orangepi_zero_plus \
> > pine64-lts \
> > pine64_plus \
> > +   pine_h64-model-b \
> > pinebook \
> > sopine_baseboard
> >  BOARDS=\
> > @@ -203,6 +205,16 @@ do-build:
> >  .endif
> >  .endfor
> >  .for BOARD in ${SUNXI64}
> > +.if "${BOARD:M*_h64*}"
> > +   cd ${WRKSRC} && \
> > +   mkdir -p build/${BOARD} && \
> > +   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> > +   ${MAKE_FLAGS} O="build/${BOARD}" \
> > +   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> > +   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> > +   ${MAKE_FLAGS} O="build/${BOARD}" \
> > +   

Add support for PINE H64 model B

[Kevin Lo]

The PINE H64 ver. B is a minor revision of the original H64.
I copied the device tree from the Linux kernel.

dmesg: http://ix.io/3M3r

ok?

Index: sysutils/arm-trusted-firmware/Makefile
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- sysutils/arm-trusted-firmware/Makefile  18 Jun 2021 09:17:28 -  
1.16
+++ sysutils/arm-trusted-firmware/Makefile  13 Jan 2022 08:54:30 -
@@ -9,6 +9,7 @@ GH_PROJECT= arm-trusted-firmware
 GH_TAGNAME=v2.5
 
 EPOCH= 0
+REVISION=  0
 
 CATEGORIES=sysutils
 
@@ -32,7 +33,8 @@ CFLAGS=
 PLATFORMS=\
rk3328 \
rk3399 \
-   sun50i_a64
+   sun50i_a64 \
+   sun50i_h6
 
 do-build:
 .for P in ${PLATFORMS}
@@ -49,5 +51,7 @@ do-install:
${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
+   ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
+   ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
 
 .include 
Index: sysutils/arm-trusted-firmware/pkg/PLIST
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- sysutils/arm-trusted-firmware/pkg/PLIST 27 Sep 2019 15:43:29 -  
1.4
+++ sysutils/arm-trusted-firmware/pkg/PLIST 13 Jan 2022 08:54:30 -
@@ -4,3 +4,4 @@ share/arm-trusted-firmware/
 share/arm-trusted-firmware/rk3328-bl31.elf
 share/arm-trusted-firmware/rk3399-bl31.elf
 share/arm-trusted-firmware/sun50i_a64-bl31.bin
+share/arm-trusted-firmware/sun50i_h6-bl31.bin
Index: sysutils/u-boot/Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.89
diff -u -p -u -p -r1.89 Makefile
--- sysutils/u-boot/Makefile17 Dec 2021 23:00:41 -  1.89
+++ sysutils/u-boot/Makefile13 Jan 2022 08:54:31 -
@@ -8,7 +8,7 @@ FLAVOR?=arm
 
 COMMENT=   U-Boot firmware
 VERSION=   2021.10
-REVISION=  2
+REVISION=  3
 DISTNAME=  u-boot-${VERSION}
 PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=   ${PKGNAME}
@@ -44,6 +44,7 @@ MAKE_ENV+=CROSS_COMPILE="aarch64-none-e
 RK3328_BL31=   "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
 RK3399_BL31=   "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
 SUNXI_BL31="${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
+SUNXI_H6_BL31= "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
 .elif "${FLAVOR}" == "arm"
 BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro>=7.4.2019.02
 MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
@@ -69,6 +70,7 @@ SUNXI64=\
orangepi_zero_plus \
pine64-lts \
pine64_plus \
+   pine_h64-model-b \
pinebook \
sopine_baseboard
 BOARDS=\
@@ -203,6 +205,16 @@ do-build:
 .endif
 .endfor
 .for BOARD in ${SUNXI64}
+.if "${BOARD:M*_h64*}"
+   cd ${WRKSRC} && \
+   mkdir -p build/${BOARD} && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
+   ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS} O="build/${BOARD}" \
+   -f ${MAKE_FILE} ${ALL_TARGET}
+.else
cd ${WRKSRC} && \
mkdir -p build/${BOARD} && \
${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
@@ -211,6 +223,7 @@ do-build:
${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
${MAKE_FLAGS} O="build/${BOARD}" \
-f ${MAKE_FILE} ${ALL_TARGET}
+.endif
if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
  -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
cd ${WRKSRC}/build/${BOARD} && \
Index: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
===
RCS file: sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
diff -N sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ sysutils/u-boot/patches/patch-arch_arm_dts_Makefile 13 Jan 2022 08:54:31 
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: arch/arm/dts/Makefile
+--- arch/arm/dts/Makefile.orig
 arch/arm/dts/Makefile
+@@ -642,6 +642,7 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
+   sun50i-h6-orangepi-lite2.dtb \
+   sun50i-h6-orangepi-one-plus.dtb \
+   sun50i-h6-pine-h64.dtb \
++  sun50i-h6-pine-h64-model-b.dtb \
+   sun50i-h6-tanix-tx6.dtb
+ dtb-$(CONFIG_MACH_SUN50I_H616) += \
+   sun50i-h616-orangepi-zero2.dtb
Index: sysutils/u-boot/patc

Re: new: inputmethods/fcitx5-chewing

[Kevin Lo]

On Sun, Jan 09, 2022 at 01:11:52PM +, Yifei Zhan wrote:
> Hi,

Hi Yifei,

> Here attached is fcitx5-chewing, a chewing wrapper for fcitx5. I lightly 
> tested it on amd64, no problem so far, but I don't use chewing (or 
> bopomofo/zhuyin) often so it would be nice if someone can help me 
> thoroughly test it.

Works for me on amd64 as well, thanks!

Re: wip/help wanted: fcitx5{,-gtk,-qt,-config-qt}

[Kevin Lo]

On Mon, Jan 10, 2022 at 11:08:16AM +0800, Kevin Lo wrote:
> 
> On Thu, Jan 06, 2022 at 03:11:41AM +, Yifei Zhan wrote:
> > On 21/12/31 12:16PM, Omar Polo wrote:
> > > Yifei Zhan  writes:
> > > 
> > > > You can edit that file to enable and setup IME plugins you want, but 
> > > > it's more common to use fcitx5-config-qt for that. A typical workflow 
> > > > would look like this:
> > > >
> > > > 1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt 
> > > > fcitx5-$IME_Plugin
> > > >which $IME_Plugin to use depends on which language you want to type. 
> > > >(e.g. fcitx5-anthy for Japanese)
> > > 
> > > i suppose all of these fcitx5-* packages are yet to be submitted ^^"
> > 
> > They are on the way now :)
> > 
> > Some IME plugins require more work than others as they depend on newer 
> > version of IME libs we don't have yet, but I'm working on a few updates 
> > now, should not take too long. At the moment I have attached fcitx5 
> > fcitx5-gtk fcitx5-qt fcitx5-config-qt, lightly tested and working here 
> > on my amd64 box. 
> > 
> > fcitx5-anthy is also just around the corner, it can be used as a good 
> > test case.
> > 
> > By the way, fcitx support for gnome-terminal is currently broken because 
> > gnome-terminal is built with gtk4 and uses GNOME's own IME integration 
> > system, I will dig into it later, but any other terminal emulator should 
> > be usable. konsole(qt)/sakura(gtk) both are fine.
> > 
> > > 
> > > > 2. setup session environment variables in ~/.xsession, and start fcitx 
> > > > when logging in
> > > >
> > > > export XMODIFIERS=@im=fcitx
> > > > export GTK_IM_MODULE=fcitx
> > > > export QT_IM_MODULE=fcitx
> > > > /usr/local/bin/fcitx5
> > > 
> > > Oh, I should have guessed that, it's similar to fcitx4.  Maybe we can
> > > adopt the same wording as in fcitx' DESCR?
> > > (and similar for the gtk and qt module)
> > > 
> > 
> > I prefer to maintain a single README file documenting all the setup 
> > instructions, just like meta/gnome/pkg/README-main. I think doing so 
> > makes it easier to keep instructions up to date. (I plan to write that 
> > once I got more IME plugins working)
> > 
> > 
> > > Since fcitx5 is meant to be the successor for fcitx4 which is no 
> > > longer developed, it may make sense to replace fcitx4 with 5 instead 
> > > of keeping both in the port tree?  I'm not using either, so I'm 
> > > probably missing something here.
> > 
> > I agree, if Kevin is ok with that we can drop fcitx4 once fcitx5 and its 
> > plugins are tested and imported.
> 
> Hmm, fcitx5 doesn't work on x11/dwm.  Launching fcitx5 with "fcitx5 -d"
> (gives no error), Ctrl+Space shortcut to change input method doesn't do 
> anything on applications (firefox, konsole, etc). 
> I have the following installed:
> 
> fcitx5-5.0.11   flexible input method framework
> fcitx5-chewing-5.0.8 chewing wrapper for fcitx5
> fcitx5-gtk-5.0.10   GTK IM module for fcitx5
> fcitx5-m17n-5.0.7   m17n wrapper for fcitx5
> fcitx5-qt-5.0.9 Qt library and IM module for fcitx5
> xcb-imdkit-1.0.3implementation of xim protocol in xcb
> 

I found the problem.  Because I had installed fcitx and then removed it,
I need to delete fcitx config directory in $HOME/.conf.
Sorry for the noise.

Re: wip/help wanted: fcitx5{,-gtk,-qt,-config-qt}

[Kevin Lo]

On Thu, Jan 06, 2022 at 03:11:41AM +, Yifei Zhan wrote:
> On 21/12/31 12:16PM, Omar Polo wrote:
> > Yifei Zhan  writes:
> > 
> > > You can edit that file to enable and setup IME plugins you want, but 
> > > it's more common to use fcitx5-config-qt for that. A typical workflow 
> > > would look like this:
> > >
> > > 1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin
> > >which $IME_Plugin to use depends on which language you want to type. 
> > >(e.g. fcitx5-anthy for Japanese)
> > 
> > i suppose all of these fcitx5-* packages are yet to be submitted ^^"
> 
> They are on the way now :)
> 
> Some IME plugins require more work than others as they depend on newer 
> version of IME libs we don't have yet, but I'm working on a few updates 
> now, should not take too long. At the moment I have attached fcitx5 
> fcitx5-gtk fcitx5-qt fcitx5-config-qt, lightly tested and working here 
> on my amd64 box. 
> 
> fcitx5-anthy is also just around the corner, it can be used as a good 
> test case.
> 
> By the way, fcitx support for gnome-terminal is currently broken because 
> gnome-terminal is built with gtk4 and uses GNOME's own IME integration 
> system, I will dig into it later, but any other terminal emulator should 
> be usable. konsole(qt)/sakura(gtk) both are fine.
> 
> > 
> > > 2. setup session environment variables in ~/.xsession, and start fcitx 
> > > when logging in
> > >
> > > export XMODIFIERS=@im=fcitx
> > > export GTK_IM_MODULE=fcitx
> > > export QT_IM_MODULE=fcitx
> > > /usr/local/bin/fcitx5
> > 
> > Oh, I should have guessed that, it's similar to fcitx4.  Maybe we can
> > adopt the same wording as in fcitx' DESCR?
> > (and similar for the gtk and qt module)
> > 
> 
> I prefer to maintain a single README file documenting all the setup 
> instructions, just like meta/gnome/pkg/README-main. I think doing so 
> makes it easier to keep instructions up to date. (I plan to write that 
> once I got more IME plugins working)
> 
> 
> > Since fcitx5 is meant to be the successor for fcitx4 which is no 
> > longer developed, it may make sense to replace fcitx4 with 5 instead 
> > of keeping both in the port tree?  I'm not using either, so I'm 
> > probably missing something here.
> 
> I agree, if Kevin is ok with that we can drop fcitx4 once fcitx5 and its 
> plugins are tested and imported.

Hmm, fcitx5 doesn't work on x11/dwm.  Launching fcitx5 with "fcitx5 -d"
(gives no error), Ctrl+Space shortcut to change input method doesn't do 
anything on applications (firefox, konsole, etc). 
I have the following installed:

fcitx5-5.0.11   flexible input method framework
fcitx5-chewing-5.0.8 chewing wrapper for fcitx5
fcitx5-gtk-5.0.10   GTK IM module for fcitx5
fcitx5-m17n-5.0.7   m17n wrapper for fcitx5
fcitx5-qt-5.0.9 Qt library and IM module for fcitx5
xcb-imdkit-1.0.3implementation of xim protocol in xcb

UPDATE: arm-compute-library 21.11

[Kevin Lo]

Hi,

Here is an update to arm-compute-library 21.11.
OK?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- devel/arm-compute-library/Makefile  10 Nov 2021 01:07:06 -  1.2
+++ devel/arm-compute-library/Makefile  2 Jan 2022 10:17:22 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =21.08
+V =21.11
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -17,7 +17,7 @@ HOMEPAGE =https://github.com/ARM-softwa
 
 MAINTAINER =   Kevin Lo 
 
-SO_VERSION =   0.0
+SO_VERSION =   1.0
 ACL_LIBS = arm_compute \
arm_compute_core \
arm_compute_graph
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- devel/arm-compute-library/distinfo  19 Oct 2021 03:54:58 -  1.1.1.1
+++ devel/arm-compute-library/distinfo  2 Jan 2022 10:17:22 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-21.08.tar.gz) = 
HGLUG+YsFMj/GW1qqp+e/gWXuCqSM1DZIujN4hfdHYY=
-SIZE (ComputeLibrary-21.08.tar.gz) = 12921165
+SHA256 (ComputeLibrary-21.11.tar.gz) = 
gyLtLhNZmVaQgqlef7svqHeG/7HGeTWz73HgC1PyyIc=
+SIZE (ComputeLibrary-21.11.tar.gz) = 12987341
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  19 Oct 2021 03:54:58 
-  1.1.1.1
+++ devel/arm-compute-library/patches/patch-SConscript  2 Jan 2022 10:17:22 
-
@@ -3,7 +3,7 @@ $OpenBSD: patch-SConscript,v 1.1.1.1 202
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -385,7 +385,8 @@ undefined_flag = '-Wl,-undefined,error' if 'macos' in 
+@@ -422,7 +422,8 @@ undefined_flag = '-Wl,-undefined,error' if 'macos' in 
  arm_compute_env.Append(LINKFLAGS=[undefined_flag])
  arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] )
  
@@ -13,3 +13,30 @@ Index: SConscript
  
  with (open(Dir('#').path + '/filelist.json')) as fp:
  filelist = json.load(fp)
+@@ -526,7 +527,7 @@ if (env['fat_binary']):
+ sve_o = build_sve_objs(lib_files_sve)
+ arm_compute_a = build_library('arm_compute-static', arm_compute_env, 
lib_files + sve_o, static=True)
+ else:
+-arm_compute_a = build_library('arm_compute-static', arm_compute_env, 
lib_files + lib_files_sve, static=True)
++arm_compute_a = build_library('arm_compute', arm_compute_env, lib_files + 
lib_files_sve, static=True)
+ Export('arm_compute_a')
+ 
+ # Build shared libraries
+@@ -539,7 +540,7 @@ if env['os'] != 'bare_metal' and not env['standalone']
+ Export('arm_compute_so')
+ 
+ # Generate dummy core lib for backwards compatibility
+-arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, [], static=True)
++arm_compute_core_a = build_library('arm_compute_core', arm_compute_env, [], 
static=True)
+ Export('arm_compute_core_a')
+ 
+ if env['os'] != 'bare_metal' and not env['standalone']:
+@@ -551,7 +552,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+ # Build graph libraries
+ arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
+ 
+-arm_compute_graph_a = build_library('arm_compute_graph-static', 
arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a])
++arm_compute_graph_a = build_library('arm_compute_graph', 
arm_compute_graph_env, graph_files, static=True, libs = [ arm_compute_a])
+ Export('arm_compute_graph_a')
+ 
+ if env['os'] != 'bare_metal' and not env['standalone']:
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  19 Oct 2021 03:54:58 
-  1.1.1.1
+++ devel/arm-compute-library/patches/patch-SConstruct  2 Jan 2022 10:17:22 
-
@@ -3,7 +3,7 @@ $OpenBSD: patch-SConstruct,v 1.1.1.1 202
 Index: SConstruct
 --- SConstruct.orig
 +++ SConstruct
-@@ -48,7 +48,7 @@ vars.AddVariables(
+@@ -94,7 +94,7 @@ vars.AddVariables(
allowed_values=("armv7a", "armv7a-hf", &

Re: wip/help wanted: fcitx5{,-gtk}

[Kevin Lo]

On Fri, Dec 31, 2021 at 11:38:10AM +, Yifei Zhan wrote:
> On 21/12/31 11:00AM, Yifei Zhan wrote:
> Oops, forgot to attach this one
> 
> > 
> > also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3
> > based applications, it works fine and lib deps check is happy. However 
> > I'm not sure the state of GTK on OpenBSD and how this should be imported.
> > 
> > Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not 
> > ready yet? If they are to be packaged, should subpackages be used?

Thanks for the work on fcitx5.  Since you've disabled GTK+2, fcitx5-gtk can't 
be installed.  You have to remove the line "@tag gtk-query-immodules-2.0" in 
pkg/PLIST.  You also need to add RUN_DEPENDS on fcitx5.

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Sat, Dec 25, 2021 at 06:08:52PM -0700, j...@bitminer.ca wrote:
> 
> > 
> > OpenBLAS 0.3.19 was released.  Attached is a tarball that updates to
> > 0.3.19,
> > thanks.
> 
> I see you added USE_THREAD=1 USE_OPENMP=0.  I recommend also adding
> 
> NUM_THREADS=64
> 
> for the build as a build machine with fewer cores than a user
> machine would invisibly limit the usable cores.  See
> 
> https://github.com/xianyi/OpenBLAS/wiki/faq#usage-1
> 
> for the rationale.
> 
> You'll also have to test py-numpy and py-scipy for lapack, and probably
> also octave.

Thanks for your valuable feedback.  It makes sense that using the default of 
64 threads as that matches the limit for related stack arrays in OpenBLAS.
Other distros such as Debian, Arch Linux also build generic package with 
hardcoded max number of threads of 64.

Attached is a revised tarball, thanks.

> John

Kevin


openblas.tgz
Description: application/tar-gz

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Mon, Dec 20, 2021 at 05:27:51PM +0800, Kevin Lo wrote:
> On Fri, Dec 17, 2021 at 01:03:30PM +0800, Kevin Lo wrote:
> > Hi,
> > 
> > Please find attached a port of the openblas.
> > 
> > Description:
> > OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library
> > based on GotoBLAS2 1.13 BSD version.
> > 
> > It's loosely based on the one at openbsd-wip [1].
> > I tested on i386, amd64, arm, arm64, and mips64.
> > 
> > I didn't test on others platforms due to lack of hardware.  
> >
> > If somebody is interested, can you give it a try, check if it works for
> > you and give some feedback?  Thanks.
> > 
> > [1] https://github.com/jasperla/openbsd-wip/tree/master/math/openblas
> > 
> > Regards,
> > Kevin
> 
> There's a typo in pkg/PLIST, here's the revised tarball, thanks.

OpenBLAS 0.3.19 was released.  Attached is a tarball that updates to 0.3.19, 
thanks.


openblas.tgz
Description: application/tar-gz

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Tue, Dec 21, 2021 at 07:45:05AM +, Stuart Henderson wrote:
> 
> On 2021/12/21 11:31, Kevin Lo wrote:
> > My intention was not replace blas and lapack.  If porters/users would like
> > to use openblas instead of blas and lapack, feel free to use it, no?
> 
> If openblas does not replace existing libraries, then we need to be sure
> that other ports don't pick up openblas if installed when they're built.

I checked the following ports that depend on math/blas and/or math/lapack:

audio/cmu-sphinxbase
math/arpack
math/igraph
math/py-cvxopt
math/suitesparse
math/superlu

Except math/superlu requires an additional option (TPL_BLAS_LIBRARIES),
everything else looks fine.

Since math/cblas and openblas counldn't coexist, no need to worry
math/{py-numpy,py-scipy,py2-numpy} and mail/rspamd.

Thanks,
Kevin

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Sat, Dec 18, 2021 at 07:05:20AM -0700, j...@bitminer.ca wrote:
> 
> > Would it make sense to replace blas with openblas?
> > 
> 
> IMHO, no.  And to qualify my opinion, I don't use it much at all.
> 
> OpenBLAS (which includes LAPACK) is a very highly optimized set of
> codes with numerous cpu-specific optimizations for many ISAs.
> 
> Build instructions include "Simply invoking make (or gmake on BSD)
> will detect the CPU automatically. To set a specific target CPU,
> use make TARGET=xxx, e.g. make TARGET=NEHALEM."
> 
> So, what would be the baseline target for OpenBSD amd64 ports?
> Nehalem? Coppermine? Opteron?  I'm not trying to be cute, I just
> don't know.  The default for OpenBLAS appears to be Nehalem.
> 
> And the same question for other instruction-set architectures.
> 
> > On 17 December 2021 13:43:25 Rafael Sadowski 
> > wrote:
> 
> > On Fri Dec 17, 2021 at 01:03:30PM +0800, Kevin Lo wrote:
> > > Hi,
> > > 
> > > Please find attached a port of the openblas.
> > > 
> > > Description:
> > > OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms)
> > > library
> > > based on GotoBLAS2 1.13 BSD version.
> > > 
> > > It's loosely based on the one at openbsd-wip [1].
> > > I tested on i386, amd64, arm, arm64, and mips64.
> > > 
> 
> This is good to test, but since there are a number of dependent
> packages, and CPUs, it would be good to have (a) a bulk-build and (b)
> some user-experience include before/after tests for various CPUs.  Which
> is a ton of work, I know.  It's too much to ask I think.
> 
> (assumption: OpenBLAS should replace blas/cblas/lapack. But see below.)
> 
> Alternatively, supply instructions for users to build it (and
> dependencies) locally and apply a little logging/tracing to create
> before/after test data.  Few people have useful test cases though.
> Also more work, but at least only interested people can try and
> there's little risk (*)] for them.
> 
> [(*), if it doesn't work, pkg_delete/pkg_add].
> 
> (assumption: interested users aren't too familiar with porting and
> need some handholding)
> 
> I don't know how many OpenBSD scientific software users there are;
> possibly only a fraction are willing to do their own porting to test this.
> 
> Third alternative: as with Python2 vs Python3, put OpenBLAS into it's own
> namespace (/usr/local/include/OpenBLAS/ /usr/local/lib/OpenBLAS/) and let
> porters gradually adopt it.  If nobody does after a few releases, then
> it was not as popular as imagined.

My intention was not replace blas and lapack.  If porters/users would like
to use openblas instead of blas and lapack, feel free to use it, no?

> John

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Sat, Dec 18, 2021 at 09:28:22AM -0500, Daniel Dickman wrote:
> 
> I think that???s an interesting idea. numpy will prefer BLAS libraries in 
> this order if they???re all present:
> 
> MKL
> BLIS
> OpenBLAS
> ATLAS
> BLAS (NetLIB)
> So I think it???s a vote for openblas over netlib blas.
> 
> Btw if openblas is added, wouldn???t lapack also have to be replaced as well? 
> And not just blas?

Yes, lapack could be replaced as well.  The standard build of OpenBLAS will
contain all functions (including BLAS and LAPACK) in a single libopenblas.so
file that may have to be symlinked to the libblas, liblapack names for
compatibility with other programs if we want to switch implementations at will.

> > On Dec 18, 2021, at 6:59 AM, Stuart Henderson  wrote:
> > 
> > ???Would it make sense to replace blas with openblas?
> > 
> > -- 
> > Sent from a phone, apologies for poor formatting.
> > 
> >> On 17 December 2021 13:43:25 Rafael Sadowski  wrote:
> >> 
> >>> On Fri Dec 17, 2021 at 01:03:30PM +0800, Kevin Lo wrote:
> >>> Hi,
> >>> 
> >>> Please find attached a port of the openblas.
> >>> 
> >>> Description:
> >>> OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library
> >>> based on GotoBLAS2 1.13 BSD version.
> >>> 
> >>> It's loosely based on the one at openbsd-wip [1].
> >>> I tested on i386, amd64, arm, arm64, and mips64.
> >>> 
> >>> I didn't test on others platforms due to lack of hardware.
> >>> If somebody is interested, can you give it a try, check if it works for
> >>> you and give some feedback?  Thanks.
> >>> 
> >>> [1] https://github.com/jasperla/openbsd-wip/tree/master/math/openblas
> >>> 
> >>> Regards,
> >>> Kevin
> >> 
> >> I like to see openblas, I really do. But I think it will be found by
> >> many other ports when it is imported. Checkout "This port is required
> >> by" from https://www.freshports.org/math/openblas/
> >> 
> >> That means a bit more work needs to happen here, doesn't it?
> > 

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Fri, Dec 17, 2021 at 02:43:00PM +0100, Rafael Sadowski wrote:
> 
> On Fri Dec 17, 2021 at 01:03:30PM +0800, Kevin Lo wrote:
> > Hi,
> > 
> > Please find attached a port of the openblas.
> > 
> > Description:
> > OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library
> > based on GotoBLAS2 1.13 BSD version.
> > 
> > It's loosely based on the one at openbsd-wip [1].
> > I tested on i386, amd64, arm, arm64, and mips64.
> > 
> > I didn't test on others platforms due to lack of hardware.  
> >
> > If somebody is interested, can you give it a try, check if it works for
> > you and give some feedback?  Thanks.
> > 
> > [1] https://github.com/jasperla/openbsd-wip/tree/master/math/openblas
> > 
> > Regards,
> > Kevin
> 
> I like to see openblas, I really do. But I think it will be found by
> many other ports when it is imported. Checkout "This port is required
> by" from https://www.freshports.org/math/openblas/
> 
> That means a bit more work needs to happen here, doesn't it?

Thanks for the feedback.  I don't know if we want to replace
math/{blas,cblas,lapack} dependencies of ports with math/openblas.
I only tested math/{py-numpy,py-scipy}, seems to be working fine.

There's a numpy benchmark is available on the net [1].
I changed the matrix sizes to 2048 [2].

Let's find out how the different implementation compare in terms of
performance on my PC.

$ sysctl hw.model
hw.model=Intel(R) Core(TM) i5-6400 CPU @ 2.70GHz

blas & lapack:
Dotted two 2048x2048 matrices in 6.69 s.
Dotted two vectors of length 262144 in 0.33 ms.
SVD of a 1024x512 matrix in 1.13 s.
Cholesky decomposition of a 1024x1024 matrix in 0.15 s.
Eigendecomposition of a 1024x1024 matrix in 6.79 s.

openblas:
Dotted two 2048x2048 matrices in 0.18 s.
Dotted two vectors of length 262144 in 0.04 ms.
SVD of a 1024x512 matrix in 0.14 s.
Cholesky decomposition of a 1024x1024 matrix in 0.04 s.
Eigendecomposition of a 1024x1024 matrix in 1.41 s.

$ sysctl hw.{model,product}
hw.model=ARM Cortex-A72 r0p3
hw.product=Raspberry Pi 4 Model B Rev 1.1

blas & lapack:
Dotted two 2048x2048 matrices in 49.86 s.
Dotted two vectors of length 262144 in 1.94 ms.
SVD of a 1024x512 matrix in 8.78 s.
Cholesky decomposition of a 1024x1024 matrix in 1.63 s.
Eigendecomposition of a 1024x1024 matrix in 50.11 s.

openblas:
Dotted two 2048x2048 matrices in 3.21 s.
Dotted two vectors of length 262144 in 1.96 ms.
SVD of a 1024x512 matrix in 2.08 s.
Cholesky decomposition of a 1024x1024 matrix in 0.39 s.
Eigendecomposition of a 1024x1024 matrix in 12.34 s.

[1] https://gist.github.com/markus-beuckelmann/8bc25531b11158431a5b09a45abd6276
[2] 
https://gist.github.com/markus-beuckelmann/8bc25531b11158431a5b09a45abd6276#file-numpy-benchmark-py-L14

Re: NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

On Fri, Dec 17, 2021 at 01:03:30PM +0800, Kevin Lo wrote:
> Hi,
> 
> Please find attached a port of the openblas.
> 
> Description:
> OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library
> based on GotoBLAS2 1.13 BSD version.
> 
> It's loosely based on the one at openbsd-wip [1].
> I tested on i386, amd64, arm, arm64, and mips64.
> 
> I didn't test on others platforms due to lack of hardware.
>  
> If somebody is interested, can you give it a try, check if it works for
> you and give some feedback?  Thanks.
> 
> [1] https://github.com/jasperla/openbsd-wip/tree/master/math/openblas
> 
> Regards,
> Kevin

There's a typo in pkg/PLIST, here's the revised tarball, thanks.


openblas.tgz
Description: application/tar-gz

NEW: math/openblas - an optimized BLAS library based on GotoBLAS2

[Kevin Lo]

Hi,

Please find attached a port of the openblas.

Description:
OpenBLAS is an optimized BLAS (Basic Linear Algebra Subprograms) library
based on GotoBLAS2 1.13 BSD version.

It's loosely based on the one at openbsd-wip [1].
I tested on i386, amd64, arm, arm64, and mips64.

I didn't test on others platforms due to lack of hardware. 
If somebody is interested, can you give it a try, check if it works for
you and give some feedback?  Thanks.

[1] https://github.com/jasperla/openbsd-wip/tree/master/math/openblas

Regards,
Kevin


openblas.tgz
Description: application/tar-gz

Re: aarch64 bulk build report

[Kevin Lo]

On Tue, Nov 09, 2021 at 01:14:48AM -0700, phess...@openbsd.org wrote:
> 
> bulk build on arm64.ports.openbsd.org
> started on  Sat Nov 6 15:38:08 MDT 2021
> finished at Tue Nov 9 01:14:38 MST 2021
> lasted 2D10h36m
> done with kern.version=OpenBSD 7.0-current (GENERIC.MP) #1378: Sat Nov  6 
> 12:18:34 MDT 2021
> 
> built packages:10972
> Nov 6:3159
> Nov 7:1385
> Nov 8:3889
> Nov 9:2538
> 
> 
> critical path missing pkgs:  
> http://build-failures.rhaalovely.net/aarch64/2021-11-06/summary.log
> 
> build failures: 5
> http://build-failures.rhaalovely.net/aarch64/2021-11-06/devel/arm-compute-library.log

Fix fallout from scons update, thanks.

Re: NEW: devel/arm-compute-library

[Kevin Lo]

On Sat, Oct 16, 2021 at 04:40:18PM +0100, Stuart Henderson wrote:
> 
> On 2021/10/16 20:33, Kevin Lo wrote:
> > On Fri, Oct 15, 2021 at 11:35:33AM +0100, Stuart Henderson wrote:
> > > 
> > > On 2021/10/15 13:57, Kevin Lo wrote:
> > > > Hi,
> > > > 
> > > > Attached is a port of arm-compute-library 21.08.
> > > > 
> > > > Comment:
> > > > Arm compute library
> > > > 
> > > > Description:
> > > > Arm Compute Library is a software library for computer vision and 
> > > > machine
> > > > learning.  It is a collection of low-level functions optimized for Arm 
> > > > CPU
> > > > and GPU architectures targeted at image processing, computer vision, and
> > > > machine learning.
> > > > 
> > > > Tested on arm64(RockPro64).
> > > > OK?
> > > 
> > > scons.port.mk should be passing in CC/CXX anyway so the patches to
> > > default_c_compiler/default_cpp_compiler _ought_ not to be necessary
> > > (and if they are, it's indicating that something isn't working
> > > correctly with scons.port.mk)
> > 
> > Thanks for the comments.  I removed a patch about default_c_compiler /
> > default_cpp_compiler, here's the revised tarball, thanks.
> 
> OK sthen@.
> 
> I do think MAKE_ENV should not be necessary, but I think there is
> something wrong with scons.port.mk so I am ok with this as a workaround.

Thanks.  I'm not sure if there's something wrong with scons.port.mk, but it
seems to me there are ports such as emulators/fceux and games/dangerdeep 
that use MAKE_ENV.

> One thing I looked at when reviewing - often software uses "native
> build" to mean "use CPU features detected from the build machine"
> (-march=native compiler flag) so I wanted to check that it wasn't the
> case here - aarch64 builds are done on eMAG boxes, cpu "Applied Micro
> X-Gene r3p2" so I wanted to make sure it doesn't use some fancy
> feature which isn't available on other machines. So it might be
> worth a little comment e.g.
> 
> # "build=native" here just means "not cross-compiled"

Attached is a new version of arm-compute-library which doesn't set CC/CXX
in MAKE_ENV and adds a comment on the build option.


arm-compute-library.tgz
Description: application/tar-gz

Re: NEW: devel/arm-compute-library

[Kevin Lo]

On Fri, Oct 15, 2021 at 11:35:33AM +0100, Stuart Henderson wrote:
> 
> On 2021/10/15 13:57, Kevin Lo wrote:
> > Hi,
> > 
> > Attached is a port of arm-compute-library 21.08.
> > 
> > Comment:
> > Arm compute library
> > 
> > Description:
> > Arm Compute Library is a software library for computer vision and machine
> > learning.  It is a collection of low-level functions optimized for Arm CPU
> > and GPU architectures targeted at image processing, computer vision, and
> > machine learning.
> > 
> > Tested on arm64(RockPro64).
> > OK?
> 
> scons.port.mk should be passing in CC/CXX anyway so the patches to
> default_c_compiler/default_cpp_compiler _ought_ not to be necessary
> (and if they are, it's indicating that something isn't working
> correctly with scons.port.mk)

Thanks for the comments.  I removed a patch about default_c_compiler /
default_cpp_compiler, here's the revised tarball, thanks.


arm-compute-library.tgz
Description: application/tar-gz

NEW: devel/arm-compute-library

[Kevin Lo]

Hi,

Attached is a port of arm-compute-library 21.08.

Comment:
Arm compute library

Description:
Arm Compute Library is a software library for computer vision and machine
learning.  It is a collection of low-level functions optimized for Arm CPU
and GPU architectures targeted at image processing, computer vision, and
machine learning.

Tested on arm64(RockPro64).
OK?


arm-compute-library.tgz
Description: application/tar-gz

Re: add unveil path required by fcitx to chromium

[Kevin Lo]

On Thu, Sep 09, 2021 at 07:41:19AM -0600, Theo de Raadt wrote:
> 
> Stuart Henderson  wrote:
> 
> > On 2021/09/09 16:45, Kevin Lo wrote:
> > > On Thu, Sep 09, 2021 at 07:05:26AM +, Yifei Zhan wrote:
> > > > 
> > > > 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.
> > > 
> > > I'd prefer not to add IMEs to unveil.main.  It would be useful to mention 
> > > how
> > > to enable IMEs in firefox/chromium readme, thanks.
> > > 
> > 
> > Having users add to unveil.XX files on their own system is a problem.
> > If done, and unveil.XX is later updated in the port (say, to add a new
> > path required by the browser or some library it uses), when the user
> > runs pkg_add -u, the new paths *won't* be merged automatically.
> > 
> > Maybe something can be done to unify the paths for IMEs but that will
> > take time; for now I would recommend that where people are experiencing
> > a problem, we add those paths to the browser ports..
> 
> These two programs (chrome and firefox) that have their unveil and pledge
> configurations in /etc are special.  During pledge development in chrome,
> I proposed this approach to robert -- to save him build time.  This mechanism
> was proposed as a convenience to the developer.
> 
> Maybe robert should go back to hard-coding the lists inside the program.
> 
> Let me be firm.  The files are owned by root.  They are part of the
> system.  They are delivered by pkg_add.  pkg_add should continue to
> smash them when upgrades happen.
> 
> These files do NOT belong to the user.
> 
> If someone edits them, they are on your own.

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/chromium/files/unveil.main
===
RCS file: /cvs/ports/www/chromium/files/unveil.main,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 unveil.main
--- www/chromium/files/unveil.main  6 Jan 2020 16:05:06 -   1.8
+++ www/chromium/files/unveil.main  10 Sep 2021 05:21:59 -
@@ -61,6 +61,7 @@
 
 ~/.config/chromium rwc
 ~/.config/dconf r
+~/.config/fcitx r
 ~/.config/fontconfig r
 ~/.config/gtk-3.0 r
 ~/.config/mimeapps.list r
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

Re: add unveil path required by fcitx to chromium

[Kevin Lo]

On Thu, Sep 09, 2021 at 07:05:26AM +, Yifei Zhan wrote:
> 
> 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.

I'd prefer not to add IMEs to unveil.main.  It would be useful to mention how
to enable IMEs in firefox/chromium readme, thanks.

Re: add unveil path required by fcitx to chromium

[Kevin Lo]

On Thu, Sep 09, 2021 at 05:31:01AM +, Yifei Zhan wrote:
> 
> 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?

This has been discussed before:
https://marc.info/?t=15781134382&r=1&w=2

Re: UPDATE: openfst 1.8.1

[Kevin Lo]

On Sun, Sep 05, 2021 at 02:49:45PM -0600, Anthony J. Bentley wrote:
> 
> Kevin Lo writes:
> > On Mon, Aug 23, 2021 at 04:05:06PM +0800, Kevin Lo wrote:
> > > Here is an update to openfst 1.8.1.
> 
> ok bentley@
> 
> > > Index: math/openfst/patches/patch-configure
> 
> Please open a bug report upstream and let them know that libdl is a
> non-POSIX Linuxism. Hopefully this patch can go away soon.

I sent a bug report to authors, thanks.

Re: UPDATE: openfst 1.8.1

[Kevin Lo]

Friendly ping.

On Mon, Aug 23, 2021 at 04:05:06PM +0800, Kevin Lo wrote:
> 
> Here is an update to openfst 1.8.1.
> Tested on amd64.
> 
> Index: math/openfst/Makefile
> ===
> RCS file: /cvs/ports/math/openfst/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- math/openfst/Makefile 12 Jul 2019 20:47:43 -  1.14
> +++ math/openfst/Makefile 23 Aug 2021 08:00:53 -
> @@ -5,24 +5,48 @@ COMMENT =   weighted finite-state transdu
>  # requires C++ tr1 headers
>  NOT_FOR_ARCHS=   ${GCC3_ARCHS}
>  
> -DISTNAME =   openfst-1.6.9
> +DISTNAME =   openfst-1.8.1
>  
> -SHARED_LIBS +=   fst   1.0 # 0.0
> -SHARED_LIBS +=   fstscript 1.0 # 0.0
> +SHARED_LIBS +=   fst 1.1 # 24.0
> +SHARED_LIBS +=   fstscript   1.1 # 24.0
> +SHARED_LIBS +=   fstcompact  0.0 # 24.0
> +SHARED_LIBS +=   fstcompressscript   0.0 # 24.0
> +SHARED_LIBS +=   fstconst0.0 # 24.0
> +SHARED_LIBS +=   fstfar  0.0 # 24.0
> +SHARED_LIBS +=   fstfarscript0.0 # 24.0
> +SHARED_LIBS +=   fstlinearscript 0.0 # 24.0
> +SHARED_LIBS +=   fstlookahead0.0 # 24.0
> +SHARED_LIBS +=   fstpdtscript0.0 # 24.0
> +SHARED_LIBS +=   fstmpdtscript   0.0 # 24.0
> +SHARED_LIBS +=   fstngram0.0 # 24.0
> +SHARED_LIBS +=   fstspecial  0.0 # 24.0
>  
>  CATEGORIES = math devel textproc
>  
>  HOMEPAGE =   http://www.openfst.org/twiki/bin/view/FST/WebHome
>  
>  # Apache 2.0
> -PERMIT_PACKAGE = Yes
> +PERMIT_PACKAGE = Yes
>  
>  WANTLIB +=   c m ${COMPILER_LIBCXX}
>  
> -COMPILER =   base-clang ports-gcc base-gcc
> +# c++17
> +COMPILER =   base-clang ports-gcc
>  
>  MASTER_SITES =   
> http://www.openfst.org/twiki/pub/FST/FstDownload/
>  
>  CONFIGURE_STYLE =gnu
> +CONFIGURE_ARGS = --enable-bin\
> + --enable-compact-fsts   \
> + --enable-compress   \
> + --enable-const-fsts \
> + --enable-far\
> + --enable-fsts   \
> + --enable-linear-fsts\
> + --enable-lookahead-fsts \
> + --enable-mpdt   \
> + --enable-ngram-fsts \
> + --enable-pdt\
> + --enable-special
>  
>  .include 
> Index: math/openfst/distinfo
> ===
> RCS file: /cvs/ports/math/openfst/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- math/openfst/distinfo 25 Oct 2018 02:37:26 -  1.2
> +++ math/openfst/distinfo 23 Aug 2021 08:00:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (openfst-1.6.9.tar.gz) = 3llZwMfezZIAaKpPlAV2mEK5VXGdhX/V2Fj8rPCZi9o=
> -SIZE (openfst-1.6.9.tar.gz) = 1254889
> +SHA256 (openfst-1.8.1.tar.gz) = JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A=
> +SIZE (openfst-1.8.1.tar.gz) = 1333532
> Index: math/openfst/patches/patch-configure
> ===
> RCS file: math/openfst/patches/patch-configure
> diff -N math/openfst/patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ math/openfst/patches/patch-configure  23 Aug 2021 08:00:53 -
> @@ -0,0 +1,50 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -12125,7 +12125,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
> +   $as_echo_n "(cached) " >&6
> + else
> +   ac_check_lib_save_LIBS=$LIBS
> +-LIBS="-ldld  $LIBS"
> ++LIBS="$LIBS"
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h.  */
> + 
> +@@ -12168,7 +12168,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
> +   $as_echo_n "(cached) " >&6
> + else
> +   ac_check_lib_save_LIBS=$LIBS
> +-LIBS="-ldl  $LIBS"
> ++LIBS="$LIBS"
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h.  */
> + 
> +@@ -12246,7 +12246,7 @@ if ${ac_cv_lib_dld_dld_link+:} false; then :
> +   $as_echo_n "(cached) " >&6
> + else
> +   

UPDATE: openfst 1.8.1

[Kevin Lo]

Here is an update to openfst 1.8.1.
Tested on amd64.

Index: math/openfst/Makefile
===
RCS file: /cvs/ports/math/openfst/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- math/openfst/Makefile   12 Jul 2019 20:47:43 -  1.14
+++ math/openfst/Makefile   23 Aug 2021 08:00:53 -
@@ -5,24 +5,48 @@ COMMENT = weighted finite-state transdu
 # requires C++ tr1 headers
 NOT_FOR_ARCHS= ${GCC3_ARCHS}
 
-DISTNAME = openfst-1.6.9
+DISTNAME = openfst-1.8.1
 
-SHARED_LIBS += fst   1.0 # 0.0
-SHARED_LIBS += fstscript 1.0 # 0.0
+SHARED_LIBS += fst 1.1 # 24.0
+SHARED_LIBS += fstscript   1.1 # 24.0
+SHARED_LIBS += fstcompact  0.0 # 24.0
+SHARED_LIBS += fstcompressscript   0.0 # 24.0
+SHARED_LIBS += fstconst0.0 # 24.0
+SHARED_LIBS += fstfar  0.0 # 24.0
+SHARED_LIBS += fstfarscript0.0 # 24.0
+SHARED_LIBS += fstlinearscript 0.0 # 24.0
+SHARED_LIBS += fstlookahead0.0 # 24.0
+SHARED_LIBS += fstpdtscript0.0 # 24.0
+SHARED_LIBS += fstmpdtscript   0.0 # 24.0
+SHARED_LIBS += fstngram0.0 # 24.0
+SHARED_LIBS += fstspecial  0.0 # 24.0
 
 CATEGORIES =   math devel textproc
 
 HOMEPAGE = http://www.openfst.org/twiki/bin/view/FST/WebHome
 
 # Apache 2.0
-PERMIT_PACKAGE =   Yes
+PERMIT_PACKAGE =   Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
-COMPILER = base-clang ports-gcc base-gcc
+# c++17
+COMPILER = base-clang ports-gcc
 
 MASTER_SITES = http://www.openfst.org/twiki/pub/FST/FstDownload/
 
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   --enable-bin\
+   --enable-compact-fsts   \
+   --enable-compress   \
+   --enable-const-fsts \
+   --enable-far\
+   --enable-fsts   \
+   --enable-linear-fsts\
+   --enable-lookahead-fsts \
+   --enable-mpdt   \
+   --enable-ngram-fsts \
+   --enable-pdt\
+   --enable-special
 
 .include 
Index: math/openfst/distinfo
===
RCS file: /cvs/ports/math/openfst/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- math/openfst/distinfo   25 Oct 2018 02:37:26 -  1.2
+++ math/openfst/distinfo   23 Aug 2021 08:00:53 -
@@ -1,2 +1,2 @@
-SHA256 (openfst-1.6.9.tar.gz) = 3llZwMfezZIAaKpPlAV2mEK5VXGdhX/V2Fj8rPCZi9o=
-SIZE (openfst-1.6.9.tar.gz) = 1254889
+SHA256 (openfst-1.8.1.tar.gz) = JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A=
+SIZE (openfst-1.8.1.tar.gz) = 1333532
Index: math/openfst/patches/patch-configure
===
RCS file: math/openfst/patches/patch-configure
diff -N math/openfst/patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ math/openfst/patches/patch-configure23 Aug 2021 08:00:53 -
@@ -0,0 +1,50 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
 configure
+@@ -12125,7 +12125,7 @@ if ${ac_cv_lib_dld_shl_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12168,7 +12168,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12246,7 +12246,7 @@ if ${ac_cv_lib_dld_dld_link+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16915,7 +16915,7 @@ if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16946,7 +16946,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+-  DL_LIBS=-ldl
++  DL_LIBS=
+ fi
+ 
+ 
Index: math/openfst/pkg/PLIST
===
RCS file: /cvs/ports/math/openfst/pkg/PLIST,v
retrieving revision 1.3
diff -u 

Re: NEW: audio/py-speechrecognition

[Kevin Lo]

On Sat, Aug 07, 2021 at 11:42:50PM +0800, Kevin Lo wrote:
> Hi,
> 
> audio/py-speechrecognition is a Python library for performing speech 
> recognition.
> 
> cat pkg/DESCR
> Speechrecognition is a Python library for performing speech recognition,
> with support for several engines and APIs, online and offline.
> 
> OK to import?

kmos@ pointed out that it could use python3-only.  Here's the updated tarball,
thanks.


py-speechrecognition.tar.gz
Description: application/tar-gz

Re: UPDATE: graphics/opencv

[Kevin Lo]

On Fri, Aug 13, 2021 at 06:40:08AM +0200, Rafael Sadowski wrote:
> 
> Update opencv to 4.5.3.
> 
> https://github.com/opencv/opencv/wiki/ChangeLog#version453
> 
> Tests are welcome, OK?

Works for me on amd64, thanks.

ok kevlo@

Re: OpenCV no support for memory mapping / insufficient buffer memory

[Kevin Lo]

On Tue, Aug 10, 2021 at 12:32:36PM -0600, Jeff Ross wrote:
> 
> Hello!
> 
> This is a follow-up to a post I made to misc@ about OpenCV not being able to
> open a camera to capture images.?? Switching to ports@ as this seems more
> appropriate for this error.
> 
> https://marc.info/?l=openbsd-misc&m=162853582527839&w=2
> 
> Kevin Lo had also run into the problem and had submitted a patch:
> 
> https://marc.info/?l=openbsd-ports-cvs&m=162857744213080&w=2
> 
> I built the new version of OpenCV 4.5.2 today and yes, it can open the
> camera, but attempting to capture an image prints the following for each
> image: [ WARN:0] global
> /usr/ports/pobj/opencv-4.5.2/opencv-4.5.2/modules/videoio/src/cap_v4l.cpp
> (798) requestBuffers VIDEOIO(V4L2:/dev/video0): no support for memory
> mapping [ WARN:0] global
> /usr/ports/pobj/opencv-4.5.2/opencv-4.5.2/modules/videoio/src/cap_v4l.cpp
> (777) requestBuffers VIDEOIO(V4L2:/dev/video0): Insufficient buffer memory
> Trying to access the list of captured images yields this: OpenCV(4.5.2)
> /usr/ports/pobj/opencv-4.5.2/opencv-4.5.2/modules/core/src/matrix.cpp:456:
> error: (-215:Assertion failed) total() == 0 || data != NULL in function
> 'Mat' Exception caught! OpenCV(4.5.2)
> /usr/ports/pobj/opencv-4.5.2/opencv-4.5.2/modules/core/src/matrix.cpp:456:
> error: (-215:Assertion failed) total() == 0 || data != NULL in function
> 'Mat' At that point my python script exits due to the exception. OpenCV docs
> don't seem to get into buffer management other than via an internal function
> to be used only by OpenCV. Would this be a missing parameter in how OpenCV
> is built or is it something I can control from a sysctl of some kind? dmesg
> follows but this stick computer has 4G of ram and doesn't have much anything
> running on it. Thanks! 

You tested your open_test.py?  If so, I tested it on my X1E, works for me:  
  
http://ix.io/3vD3

NEW: audio/py-speechrecognition

[Kevin Lo]

Hi,

audio/py-speechrecognition is a Python library for performing speech 
recognition.

cat pkg/DESCR
Speechrecognition is a Python library for performing speech recognition,
with support for several engines and APIs, online and offline.

OK to import?

Regards,
Kevin


py-speechrecognition.tar.gz
Description: application/tar-gz

Re: [Update] audio/py-audio 0.2.8 -> 0.2.11

[Kevin Lo]

On Sat, Aug 07, 2021 at 12:31:40PM +0100, Stuart Henderson wrote:
> 
> On 2021/08/07 16:36, Kevin Lo wrote:
> > Here's an update of py-audio to 0.2.11:
> > - 0.2.9 bug fixes related to overflow error handling and IOError exception 
> >   arguments
> > - 0.2.10 bug fixes related to the Python GIL
> > - 0.2.11 bug fix related to memory management
> > 
> > Tested on amd64.
> > ok?
> 
> What is the new @conflict for?

Sorry my bad.  I tested my ports tree in my repo :(  Here's an updated diff:

Index: audio/py-audio/Makefile
===
RCS file: /cvs/ports/audio/py-audio/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- audio/py-audio/Makefile 4 Jan 2021 14:06:27 -   1.9
+++ audio/py-audio/Makefile 7 Aug 2021 13:59:16 -
@@ -2,11 +2,10 @@
 
 COMMENT =  Python bindings for PortAudio
 
-MODPY_EGG_VERSION =0.2.8
-DISTNAME = pyaudio-${MODPY_EGG_VERSION}
-PKGNAME =  ${DISTNAME:S/py/py-/}
+MODPY_EGG_VERSION =0.2.11
+DISTNAME = PyAudio-${MODPY_EGG_VERSION}
+PKGNAME =  py-audio-${MODPY_EGG_VERSION}
 CATEGORIES =   audio devel
-REVISION = 3
 
 HOMEPAGE = http://people.csail.mit.edu/hubert/pyaudio/
 
@@ -15,15 +14,14 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB =  portaudio pthread ${MODPY_WANTLIB}
 
-MASTER_SITES = ${HOMEPAGE}packages/
-
 FLAVOR ?=
 FLAVORS =  python3
 
 MODULES =  lang/python
 
-LIB_DEPENDS =  audio/portaudio-svn
+MODPY_PI = Yes
+MODPY_SETUPTOOLS=  Yes
 
-WRKDIST =  ${WRKDIR}/PyAudio-${MODPY_EGG_VERSION}
+LIB_DEPENDS =  audio/portaudio-svn
 
 .include 
Index: audio/py-audio/distinfo
===
RCS file: /cvs/ports/audio/py-audio/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- audio/py-audio/distinfo 7 Nov 2014 09:36:28 -   1.2
+++ audio/py-audio/distinfo 7 Aug 2021 13:59:16 -
@@ -1,2 +1,2 @@
-SHA256 (pyaudio-0.2.8.tar.gz) = T4U2fPeWV2FmhEhwN5V6w4WC7MU4m4lCD+YdkBtxlVE=
-SIZE (pyaudio-0.2.8.tar.gz) = 235900
+SHA256 (PyAudio-0.2.11.tar.gz) = k7/eMOC2TmOkby/XfoXEH9URgqSjQT2e36+f+qJu+3Q=
+SIZE (PyAudio-0.2.11.tar.gz) = 37428
Index: audio/py-audio/patches/patch-setup_py
===
RCS file: /cvs/ports/audio/py-audio/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-setup_py
--- audio/py-audio/patches/patch-setup_py   7 Nov 2014 09:36:28 -   
1.2
+++ audio/py-audio/patches/patch-setup_py   7 Aug 2021 13:59:16 -
@@ -1,10 +1,12 @@
-$OpenBSD: patch-setup_py,v 1.2 2014/11/07 09:36:28 sthen Exp $
 setup.py.orig  Tue Feb 18 00:40:00 2014
-+++ setup.py   Fri Nov  7 09:32:43 2014
-@@ -57,7 +57,7 @@ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -56,7 +56,7 @@ portaudio_path = os.environ.get("PORTAUDIO_PATH", "./p
+ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None)
  
  pyaudio_module_sources = ['src/_portaudiomodule.c']
- 
 -include_dirs = []
 +include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
  external_libraries = []
Index: audio/py-audio/pkg/PLIST
===
RCS file: /cvs/ports/audio/py-audio/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/py-audio/pkg/PLIST4 Jan 2021 14:06:27 -   1.3
+++ audio/py-audio/pkg/PLIST7 Aug 2021 13:59:16 -
@@ -1,5 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.3 2021/01/04 14:06:27 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pyaudio.${MODPY_PYC_MAGIC_TAG}pyc
 @so 
lib/python${MODPY_VERSION}/site-packages/_portaudio.${MODPY_PYC_MAGIC_TAG}so

[Update] audio/py-audio 0.2.8 -> 0.2.11

[Kevin Lo]

Here's an update of py-audio to 0.2.11:
- 0.2.9 bug fixes related to overflow error handling and IOError exception 
  arguments
- 0.2.10 bug fixes related to the Python GIL
- 0.2.11 bug fix related to memory management

Tested on amd64.
ok?

Index: audio/py-audio/Makefile
===
RCS file: /cvs/ports/audio/py-audio/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- audio/py-audio/Makefile 4 Jan 2021 14:06:27 -   1.9
+++ audio/py-audio/Makefile 7 Aug 2021 08:30:18 -
@@ -2,11 +2,10 @@
 
 COMMENT =  Python bindings for PortAudio
 
-MODPY_EGG_VERSION =0.2.8
-DISTNAME = pyaudio-${MODPY_EGG_VERSION}
-PKGNAME =  ${DISTNAME:S/py/py-/}
+MODPY_EGG_VERSION =0.2.11
+DISTNAME = PyAudio-${MODPY_EGG_VERSION}
+PKGNAME =  py-audio-${MODPY_EGG_VERSION}
 CATEGORIES =   audio devel
-REVISION = 3
 
 HOMEPAGE = http://people.csail.mit.edu/hubert/pyaudio/
 
@@ -15,15 +14,14 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB =  portaudio pthread ${MODPY_WANTLIB}
 
-MASTER_SITES = ${HOMEPAGE}packages/
-
 FLAVOR ?=
 FLAVORS =  python3
 
 MODULES =  lang/python
 
-LIB_DEPENDS =  audio/portaudio-svn
+MODPY_PI = Yes
+MODPY_SETUPTOOLS=  Yes
 
-WRKDIST =  ${WRKDIR}/PyAudio-${MODPY_EGG_VERSION}
+LIB_DEPENDS =  audio/portaudio-svn
 
 .include 
Index: audio/py-audio/distinfo
===
RCS file: /cvs/ports/audio/py-audio/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- audio/py-audio/distinfo 7 Nov 2014 09:36:28 -   1.2
+++ audio/py-audio/distinfo 7 Aug 2021 08:30:18 -
@@ -1,2 +1,2 @@
-SHA256 (pyaudio-0.2.8.tar.gz) = T4U2fPeWV2FmhEhwN5V6w4WC7MU4m4lCD+YdkBtxlVE=
-SIZE (pyaudio-0.2.8.tar.gz) = 235900
+SHA256 (PyAudio-0.2.11.tar.gz) = k7/eMOC2TmOkby/XfoXEH9URgqSjQT2e36+f+qJu+3Q=
+SIZE (PyAudio-0.2.11.tar.gz) = 37428
Index: audio/py-audio/patches/patch-setup_py
===
RCS file: /cvs/ports/audio/py-audio/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-setup_py
--- audio/py-audio/patches/patch-setup_py   7 Nov 2014 09:36:28 -   
1.2
+++ audio/py-audio/patches/patch-setup_py   7 Aug 2021 08:30:18 -
@@ -1,10 +1,12 @@
-$OpenBSD: patch-setup_py,v 1.2 2014/11/07 09:36:28 sthen Exp $
 setup.py.orig  Tue Feb 18 00:40:00 2014
-+++ setup.py   Fri Nov  7 09:32:43 2014
-@@ -57,7 +57,7 @@ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -56,7 +56,7 @@ portaudio_path = os.environ.get("PORTAUDIO_PATH", "./p
+ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None)
  
  pyaudio_module_sources = ['src/_portaudiomodule.c']
- 
 -include_dirs = []
 +include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
  external_libraries = []
Index: audio/py-audio/pkg/PLIST
===
RCS file: /cvs/ports/audio/py-audio/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/py-audio/pkg/PLIST4 Jan 2021 14:06:27 -   1.3
+++ audio/py-audio/pkg/PLIST7 Aug 2021 08:30:18 -
@@ -1,5 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.3 2021/01/04 14:06:27 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+@conflict py-audio-*
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pyaudio.${MODPY_PYC_MAGIC_TAG}pyc
 @so 
lib/python${MODPY_VERSION}/site-packages/_portaudio.${MODPY_PYC_MAGIC_TAG}so

sysutils/u-boot: add NanoPi R4S

[Kevin Lo]

Hi Jonathan,

The diff below build nanopi-r4s-rk3399 target.
dmesg: http://ix.io/3v1E

Index: sysutils/u-boot/Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.84
diff -u -p -u -p -r1.84 Makefile
--- sysutils/u-boot/Makefile7 Jul 2021 11:58:37 -   1.84
+++ sysutils/u-boot/Makefile5 Aug 2021 01:41:14 -
@@ -8,6 +8,7 @@ FLAVOR?=arm
 
 COMMENT=   U-Boot firmware
 VERSION=   2021.07
+REVISION=  0
 DISTNAME=  u-boot-${VERSION}
 PKGNAME=   u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=   ${PKGNAME}
@@ -76,6 +77,7 @@ BOARDS=\
mvebu_espressobin-88f3720 \
mvebu_mcbin-88f8040 \
nanopi-neo4-rk3399 \
+   nanopi-r4s-rk3399 \
pinebook-pro-rk3399 \
qemu_arm64 \
rock64-rk3328 \
Index: sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
===
RCS file: sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
diff -N sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig
--- /dev/null   1 Jan 1970 00:00:00 -
+++ sysutils/u-boot/patches/patch-configs_nanopi-r4s-rk3399_defconfig   5 Aug 
2021 01:41:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configs/nanopi-r4s-rk3399_defconfig
+--- configs/nanopi-r4s-rk3399_defconfig.orig
 configs/nanopi-r4s-rk3399_defconfig
+@@ -39,7 +39,7 @@ CONFIG_REGULATOR_PWM=y
+ CONFIG_REGULATOR_RK8XX=y
+ CONFIG_PWM_ROCKCHIP=y
+ CONFIG_RAM_RK3399_LPDDR4=y
+-CONFIG_BAUDRATE=150
++CONFIG_BAUDRATE=115200
+ CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYSRESET=y
+ CONFIG_USB=y
Index: sysutils/u-boot/pkg/PFRAG.aarch64
===
RCS file: /cvs/ports/sysutils/u-boot/pkg/PFRAG.aarch64,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PFRAG.aarch64
--- sysutils/u-boot/pkg/PFRAG.aarch64   16 Apr 2021 06:40:44 -  1.23
+++ sysutils/u-boot/pkg/PFRAG.aarch64   5 Aug 2021 01:41:14 -
@@ -33,6 +33,14 @@ share/u-boot/nanopi-neo4-rk3399/u-boot-r
 share/u-boot/nanopi-neo4-rk3399/u-boot.bin
 share/u-boot/nanopi-neo4-rk3399/u-boot.img
 share/u-boot/nanopi-neo4-rk3399/u-boot.itb
+share/u-boot/nanopi-r4s-rk3399/
+share/u-boot/nanopi-r4s-rk3399/idbloader.img
+share/u-boot/nanopi-r4s-rk3399/u-boot
+share/u-boot/nanopi-r4s-rk3399/u-boot-rockchip.bin
+share/u-boot/nanopi-r4s-rk3399/u-boot-spl.bin
+share/u-boot/nanopi-r4s-rk3399/u-boot.bin
+share/u-boot/nanopi-r4s-rk3399/u-boot.img
+share/u-boot/nanopi-r4s-rk3399/u-boot.itb
 share/u-boot/nanopi_a64/
 share/u-boot/nanopi_a64/sunxi-spl.bin
 share/u-boot/nanopi_a64/u-boot

Re: update inputmethods/fcitx-anthy: 0.2.3 -> 0.2.4

[Kevin Lo]

On Tue, Jul 27, 2021 at 01:24:01PM +0200, Jeremie Courreges-Anglas wrote:
> 
> On Tue, Jul 27 2021, Kevin Lo  wrote:
> > On Mon, Jul 26, 2021 at 04:36:52PM +, openbsd wrote:
> >> 
> >> Hi,
> >> 
> >> This is a minor version bump for fcitx-anthy includes small bug 
> >> fixes/cleanups and translation updates.
> >> 
> >> Tested on amd64 with fcitx-4.2.9.8p1, no problem found.
> >
> > Committed, thanks.
> 
> Note that this adds
> 
>   @tag gtk-update-icon-cache %D/share/icons/hicolor
> 
> without adding an RDEP on x11/gtk+3,-guic.  portcheck(1) even warns
> about this:
> 
>   russell /usr/ports/inputmethods/fcitx-anthy$ portcheck
>   missing RDEP on x11/gtk+3,-guic
> 
> This is not strictly needed since inputmethods/fcitx,-main already
> depends on x11/gtk+3,-guic.  But in theory this could change later.
> I think it's good practice to match "@tag gtk-update-icon-cache" with
> the appropriate RDEP.
> 
> ok?

My bad.  ok kevlo@

Re: update inputmethods/fcitx-anthy: 0.2.3 -> 0.2.4

[Kevin Lo]

On Mon, Jul 26, 2021 at 04:36:52PM +, openbsd wrote:
> 
> Hi,
> 
> This is a minor version bump for fcitx-anthy includes small bug 
> fixes/cleanups and translation updates.
> 
> Tested on amd64 with fcitx-4.2.9.8p1, no problem found.

Committed, thanks.

Re: remove RTLD_NODELETE removal patches from chromium/iridium/fcitx

[Kevin Lo]

On Sat, Jun 05, 2021 at 11:13:56AM +0200, Sebastien Marie wrote:
> 
> Hi,
> 
> The following patches removes RTLD_NODELETE removal patches from few
> ports (rsadowski@ raced me for few others ports, thanks !).
> 
> I built tested them on amd64.
> 
> For inputmethods/fcitx, REVISION bump might not be required, but "in doubt 
> bump".
> 
> Comments or OK ?

Brad sent me a similar diff and I haven't had time to commit it.
ok kevlo@

> -- 
> Sebastien Marie
> 
> Index: inputmethods/fcitx/Makefile
> ===
> RCS file: /cvs/ports/inputmethods/fcitx/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- inputmethods/fcitx/Makefile   27 Aug 2020 00:59:48 -  1.15
> +++ inputmethods/fcitx/Makefile   5 Jun 2021 09:09:48 -
> @@ -7,6 +7,7 @@ V =   4.2.9.8
>  DISTNAME =   fcitx-$V
>  PKGNAME-main =   ${PKGNAME}
>  PKGNAME-gtk3 =   fcitx-gtk3-$V
> +REVISION =   0
>  
>  SHARED_LIBS +=   fcitx-config0.0 # 4.1
>  SHARED_LIBS +=   fcitx-core  0.1 # 0.3
> Index: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> ===
> RCS file: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> diff -N inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h
> --- inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_utils_h  28 Nov 
> 2017 02:56:56 -  1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-src_lib_fcitx-utils_utils_h,v 1.1.1.1 2017/11/28 02:56:56 
> kevlo Exp $
> -
> -Index: src/lib/fcitx-utils/utils.h
>  src/lib/fcitx-utils/utils.h.orig
> -+++ src/lib/fcitx-utils/utils.h
> -@@ -82,6 +82,10 @@ typedef int32_t boolean;
> - #define false (0)
> - #endif
> - 
> -+#ifndef RTLD_NODELETE
> -+#define RTLD_NODELETE 0
> -+#endif
> -+
> - #define FCITX_INT_LEN ((int)(sizeof(int) * 2.5) + 2)
> - #define FCITX_LONG_LEN ((int)(sizeof(long) * 2.5) + 2)
> - #define FCITX_INT32_LEN (22)
> Index: www/chromium/Makefile
> ===
> RCS file: /cvs/ports/www/chromium/Makefile,v
> retrieving revision 1.570
> diff -u -p -r1.570 Makefile
> --- www/chromium/Makefile 27 May 2021 18:05:13 -  1.570
> +++ www/chromium/Makefile 5 Jun 2021 09:09:48 -
> @@ -15,7 +15,7 @@ DPB_PROPERTIES= parallel parallel2
>  COMMENT= Chromium browser
>  
>  V=   91.0.4472.77
> -REVISION=0
> +REVISION=1
>  
>  DISTNAME=chromium-${V}
>  
> Index: www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
> ===
> RCS file: 
> /cvs/ports/www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
> retrieving revision 1.20
> diff -u -p -r1.20 patch-content_gpu_gpu_sandbox_hook_linux_cc
> --- www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc  27 May 
> 2021 04:21:01 -  1.20
> +++ www/chromium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc  5 Jun 
> 2021 09:09:48 -
> @@ -3,12 +3,9 @@ $OpenBSD: patch-content_gpu_gpu_sandbox_
>  Index: content/gpu/gpu_sandbox_hook_linux.cc
>  --- content/gpu/gpu_sandbox_hook_linux.cc.orig
>  +++ content/gpu/gpu_sandbox_hook_linux.cc
> -@@ -99,8 +99,9 @@ static const char kLibV4lEncPluginPath[] =
> - "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
> - #endif
> +@@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] =
>   
> --constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
> -+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
> + constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
>   
>  +#if !defined(OS_BSD)
>   void AddV4L2GpuPermissions(
> Index: www/iridium/Makefile
> ===
> RCS file: /cvs/ports/www/iridium/Makefile,v
> retrieving revision 1.110
> diff -u -p -r1.110 Makefile
> --- www/iridium/Makefile  21 May 2021 19:50:37 -  1.110
> +++ www/iridium/Makefile  5 Jun 2021 09:09:50 -
> @@ -19,7 +19,7 @@ V=  2021.03.88
>  DISTNAME=iridium-browser-${V}
>  PKGNAME= iridium-${V}
>  DISTFILES=   ${DISTNAME}${EXTRACT_SUFX}
> -REVISION=0
> +REVISION=1
>  
>  CATEGORIES=  www
>  
> Index: www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc
> ===
> RCS file: 
> /cvs/ports/www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-content_gpu_gpu_sandbox_hook_linux_cc
> --- www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc   1 Apr 
> 2021 10:24:45 -   1.10
> +++ www/iridium/patches/patch-content_gpu_gpu_sandbox_hook_linux_cc   5 Jun 
> 2021 09:09:50 -
> @@ -3,12 +3,9

Re: enable -shared for riscv-elf-binutils

[Kevin Lo]

On Tue, Apr 27, 2021 at 08:05:04PM +1000, Jonathan Gray wrote:
> 
> Add a patch from FreeBSD to allow -shared, needed for U-Boot build.
> 
> update to 2.31.1 to match arm-none-eabi/binutils

Tested your diff about riscv64 u-boot, works for me, thanks.
ok kevlo@

Re: speedtest-cli - ValueError: invalid literal for int() with base 10

[Kevin Lo]

On Fri, Apr 09, 2021 at 08:57:42AM +0200, Theo Buehler wrote:
> 
> On Fri, Apr 09, 2021 at 06:45:40AM +, Mikolaj Kucharski wrote:
> > Hi,
> > 
> > This should go upsteam, but I just noticed this on multiple -current
> > machines. I see that v2.1.3 was released yesterday and at first glance
> > last commit in repo looks like could fix below issue. Sorry, didn't dive
> > deeper and I'm not sure will I be able until next weekend :/
> 
> Indeed, this seems to work for me:

Works for me, thanks.
ok kevlo@

> Index: Makefile
> ===
> RCS file: /cvs/ports/benchmarks/speedtest-cli/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile  23 Feb 2021 19:39:10 -  1.23
> +++ Makefile  9 Apr 2021 06:54:59 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT =command-line client for speedtest.net bandwidth tester
>  
> -MODPY_EGG_VERSION =  2.1.2
> +MODPY_EGG_VERSION =  2.1.3
>  DISTNAME =   speedtest-cli-${MODPY_EGG_VERSION}
>  CATEGORIES = benchmarks net
> -REVISION =   0
>  
>  HOMEPAGE =   https://github.com/sivel/speedtest-cli
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/benchmarks/speedtest-cli/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo  23 Aug 2019 15:49:58 -  1.16
> +++ distinfo  9 Apr 2021 06:55:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (speedtest-cli-2.1.2.tar.gz) = 
> zx04YiL5TDJOMSW6mg0YfkbUoT3KCMAjvbmiMJa+LlQ=
> -SIZE (speedtest-cli-2.1.2.tar.gz) = 24365
> +SHA256 (speedtest-cli-2.1.3.tar.gz) = 
> XidzIzzttfo9gSDrf5e8xJdLUiGyVNM/8W4vHUE9kPA=
> +SIZE (speedtest-cli-2.1.3.tar.gz) = 24721
> 

Re: NEW: net/pidgin-skypeweb

[Kevin Lo]

On Sun, Mar 14, 2021 at 04:00:22PM -0600, Anthony J. Bentley wrote:
> 
> Kevin Lo writes:
> > On Sun, Mar 14, 2021 at 04:39:24AM -0600, Anthony J. Bentley wrote:
> > > CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
> > > 
> > > This line should not be necessary. Removing it causes the build to fail,
> > > which I assume is because of the 'link_directories()' call's relative
> > > position within CMakeLists.txt (cmake's upstream documentation says
> > > "The command will apply only to targets created after it is called").
> >
> > Understood.  I used CMAKE_SHARED_LINKER_FLAGS because I thought it wouldn't 
> > require a patch :(
> 
> For something permanent, avoiding a patch is nice. But in this case,
> where the problem is an upstream bug, better to use a patch, since it
> will be removed once the port is updated to a release that no longer
> needs it. A makefile setting will probably be forgotten by whoever
> updates the port in the future, and kept even after the bug is fixed
> upstream.

It makes sense.  Thank you Anthony :)

Re: NEW: net/pidgin-skypeweb

[Kevin Lo]

On Sun, Mar 14, 2021 at 04:39:24AM -0600, Anthony J. Bentley wrote:
> 
> Kevin Lo writes:
> > On Mon, Mar 01, 2021 at 11:07:52AM +0800, Kevin Lo wrote:
> > > Hi,
> > > 
> > > This is a port of pidgin-skypeweb, a Skype (http) protocol plugin for 
> > > Pidgi
> > n.
> > > I have tested it on amd64.
> > > 
> > > Comments or OK ?
> 
> CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
> 
> This line should not be necessary. Removing it causes the build to fail,
> which I assume is because of the 'link_directories()' call's relative
> position within CMakeLists.txt (cmake's upstream documentation says
> "The command will apply only to targets created after it is called").

Understood.  I used CMAKE_SHARED_LINKER_FLAGS because I thought it wouldn't 
require a patch :(

> Replace CONFIGURE_ARGS with this patch that moves it next to the call to
> include_directories() (and push the patch upstream), and the port is ok
> with me.

Thank you very much for taking the time to review my port.

> 
> $OpenBSD$
> 
> Index: skypeweb/CMakeLists.txt
> --- skypeweb/CMakeLists.txt.orig
> +++ skypeweb/CMakeLists.txt
> @@ -29,6 +29,10 @@ include_directories(
>  ${CMAKE_CURRENT_SOURCE_DIR}/purple2compat
>  )
>  
> +link_directories(
> +${PURPLE_LIBRARY_DIRS}
> +)
> +
>  set(SRC_LIST
>  skypeweb_connection.c
>  skypeweb_contacts.c
> @@ -47,11 +51,6 @@ target_link_libraries(${PROJECT_NAME}
>  ${GLIB2_LIBRARIES}
>  ${JSON-GLIB_LIBRARIES}
>  )
> -
> -link_directories(
> -${PURPLE_LIBRARY_DIRS}
> -)
> -
>  
>  #install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
>  exec_program("${PKG_CONFIG_EXECUTABLE} --variable=plugindir purple 
> 2>/dev/null"

Re: NEW: net/pidgin-skypeweb

[Kevin Lo]

On Mon, Mar 01, 2021 at 11:07:52AM +0800, Kevin Lo wrote:
> Hi,
> 
> This is a port of pidgin-skypeweb, a Skype (http) protocol plugin for Pidgin.
> I have tested it on amd64.
> 
> Comments or OK ?

Ping

NEW: net/pidgin-skypeweb

[Kevin Lo]

Hi,

This is a port of pidgin-skypeweb, a Skype (http) protocol plugin for Pidgin.
I have tested it on amd64.

Comments or OK ?


pidgin-skypeweb.tgz
Description: application/tar-gz

Re: Remove misc/viz

[Kevin Lo]

On Sat, Feb 13, 2021 at 11:17:55PM +0100, Klemens Nanni wrote:
> 
> It fails with `-fno-common', there's been no update in more than twenty
> years, MASTER_SITES is already missing and we fall back to our cdn;
> finally, there's a pledged vis(1) in base.

ok kevlo@

Re: sysutils/hw-probe: only add the dmidecode dependency for i386 and amd64

[Kevin Lo]

On Fri, Nov 20, 2020 at 08:00:01AM +, David Dahlberg wrote:
> 
> On Fri, 2020-11-20 at 13:29 +0800, Kevin Lo wrote:
> 
> > hw-probe could run on non-x86 architectures.
> > Tested on arm64 [1] and octeon [2].
> [..]
> > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> > +RUN_DEPENDS +=??sysutils/dmidecode
> > +.endif
> 
> Hmm, although dmidecode does only package for i386 and amd64 on OpenBSD,
> dmidecode is also available for ia64 and arm64 in principle.
> 
> OTOH, dmidecode requires kern.allowkmem=1 in securelevel=0, which at
> least I do not usually do. So I thought shortly about completely
> removing the dependency and adding a pkg-readme.
> 
> But finally, hw-probe 'as-is' tests for the availability of dmidecode
> exactly on i386 and amd64 BSDs, which is reflected in your patch.
> 
> So for me it's OK, I'd say.

Committed, thanks.

sysutils/hw-probe: only add the dmidecode dependency for i386 and amd64

[Kevin Lo]

Hi,

hw-probe could run on non-x86 architectures.
Tested on arm64 [1] and octeon [2].

[1] https://bsd-hardware.info/index.php?probe=c030400069
[2] https://bsd-hardware.info/?probe=b8524b5002

ok?

Index: sysutils/hw-probe/Makefile
===
RCS file: /cvs/ports/sysutils/hw-probe/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- sysutils/hw-probe/Makefile  10 Sep 2020 10:00:46 -  1.2
+++ sysutils/hw-probe/Makefile  20 Nov 2020 04:29:41 -
@@ -4,7 +4,7 @@ COMMENT =   hardware probe tool
 CATEGORIES =   sysutils
 
 PKGNAME =  hw-probe-1.6beta
-REVISION = 0
+REVISION = 1
 
 GH_ACCOUNT =   linuxhw
 GH_PROJECT =   hw-probe
@@ -16,12 +16,15 @@ MAINTAINER =David Dahlberg 

Re: [new] x11/lxterminal - lightweight, vte-based and desktop-independent terminal

[Kevin Lo]

On Fri, Sep 18, 2020 at 06:21:25AM +0200, Bjorn Ketelaars wrote:
> 
> On Thu 17/09/2020 13:56, Shawn Chiou wrote:
> > Hi bket@,
> > 
> > Thanks for your review and advice.
> > 
> > All issues fixed with new attached file.
> 
> Port looks good, and runs fine on amd64. I'm OK with this if someone
> wants to import it.

Committed.  Thank you bket@ and Shawn.

Re: [New] fcitx-configtool - configure tool for fcitx

[Kevin Lo]

On Fri, Sep 04, 2020 at 10:58:19AM +0100, Stuart Henderson wrote:
> 
> On 2020/09/04 15:54, Kevin Lo wrote:
> > On Tue, Sep 01, 2020 at 07:42:52PM +0800, Shawn Chiou wrote:
> > > Hi,
> > > 
> > > Attached is port of fcitx-configtool. It is a GTK based configure tool for
> > > fcitx.
> > > 
> > > Tested on amd64, also pass with portcheck -N.
> > > 
> > > Feedback welcome.
> > 
> > It works well on amd64.  ok?
> > 
> > > Shawn Chiou
> > > -- 
> > > 
> > > 
> > > [image: --]
> > > 
> > > Shawn Chiou
> > > [image: https://]about.me/shawn.chiou
> > > <https://about.me/shawn.chiou?promo=email_sig&utm_source=email_sig&utm_medium=email_sig&utm_campaign=external_links>
> > 
> 
> RUN_DEPENDS =   devel/iso-codes \
> inputmethods/fcitx,-main
> LIB_DEPENDS =   inputmethods/fcitx,-main \
> 
> inputmethods/fcitx,-main should just be in LIB_DEPENDS, not both
> LIB+RUN_DEPENDS.
> 
> otherwise OK

Committed.  Thanks for the input and review!

Re: [New] fcitx-configtool - configure tool for fcitx

[Kevin Lo]

On Tue, Sep 01, 2020 at 07:42:52PM +0800, Shawn Chiou wrote:
> Hi,
> 
> Attached is port of fcitx-configtool. It is a GTK based configure tool for
> fcitx.
> 
> Tested on amd64, also pass with portcheck -N.
> 
> Feedback welcome.

It works well on amd64.  ok?

> Shawn Chiou
> -- 
> 
> 
> [image: --]
> 
> Shawn Chiou
> [image: https://]about.me/shawn.chiou
> 

Re: UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5

[Kevin Lo]

On Fri, Aug 14, 2020 at 03:39:04PM +0800, Kevin Lo wrote:
> 
> Hi ports,
> 
> The following updates fcitx to 4.2.9.8 and fcitx-qt5 to 1.2.5.
> There are no symbol changes, so no lib bumps.
> Tested on amd64.
>  
> Ok?

ping

> 
> diff f774fbfd3e6b7af035101ca0b84a2d18e48fa5d8 /usr/ports
> blob - 0c9bef028b69746ae5ff97994a9cb5874eaa46ed
> file + inputmethods/fcitx/Makefile
> --- inputmethods/fcitx/Makefile
> +++ inputmethods/fcitx/Makefile
> @@ -1,19 +1,16 @@
>  # $OpenBSD: Makefile,v 1.14 2020/02/29 15:20:56 naddy Exp $
>  
>  COMMENT-main =   flexible input method framework
> -COMMENT-gtk3 =   fcitx for GTK+3
> +COMMENT-gtk3 =   fcitx for GTK+3
>  
> -V =  4.2.9.6
> -DISTNAME =   fcitx-$V
> -PKGNAME-main =   fcitx-$V
> +V =  4.2.9.8
> +DISTNAME =   fcitx-$V
> +PKGNAME-main =   ${PKGNAME}
>  PKGNAME-gtk3 =   fcitx-gtk3-$V
> -REVISION-main =  2
> -REVISION-gtk3 =  1
>  
>  SHARED_LIBS +=   fcitx-config0.0 # 4.1
>  SHARED_LIBS +=   fcitx-core  0.0 # 0.3
>  SHARED_LIBS +=   fcitx-gclient   0.0 # 0.2
> -SHARED_LIBS +=   fcitx-qt0.0 # 0.1
>  SHARED_LIBS +=   fcitx-utils 0.0 # 0.1
>  
>  CATEGORIES = inputmethods chinese japanese
> @@ -29,26 +26,23 @@ MULTI_PACKAGES =  -main -gtk3
>  
>  COMPILER =   base-clang ports-gcc base-gcc
>  
> -WANTLIB-common = execinfo iconv intl kvm xkbcommon
> +WANTLIB-main +=  X11 Xext Xfixes Xinerama Xrender c cairo dbus-1 
> \
> + execinfo gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
> + gobject-2.0 gtk-x11-2.0 iconv intl json-c kvm \
> + pango-1.0 pangocairo-1.0 pthread uuid xkbcommon \
> + xkbfile xml2
>  
> -WANTLIB-main +=  ${WANTLIB-common}
> -WANTLIB-main +=  ICE X11 Xcomposite Xcursor Xdamage Xext Xfixes \
> - Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
> - execinfo fontconfig freetype gdk_pixbuf-2.0 \
> - gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
> - gobject-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
> - pangoft2-1.0 pthread uuid xkbcommon xkbfile xml2 z
> -
>  BUILD_DEPENDS =  devel/gettext,-tools \
>   devel/gobject-introspection \
>   devel/iso-codes \
>   devel/kf5/extra-cmake-modules \
>   shells/bash
> -RUN_DEPENDS-main =   devel/desktop-file-utils \
> +RUN_DEPENDS =devel/desktop-file-utils \
>   misc/shared-mime-info \
>   shells/bash \
>   x11/gtk+3,-guic
> -LIB_DEPENDS-main =   devel/gettext,-tools \
> +LIB_DEPENDS =devel/gettext,-tools \
> + devel/json-c \
>   devel/libexecinfo \
>   sysutils/e2fsprogs \
>   textproc/libxml \
> @@ -56,15 +50,11 @@ LIB_DEPENDS-main =devel/gettext,-tools \
>   x11/gtk+2 \
>   x11/xkbcommon
>  
> -WANTLIB-gtk3 +=  ${WANTLIB-common}
> -WANTLIB-gtk3 +=  atk-1.0 cairo cairo-gobject dbus-1 
> gdk_pixbuf-2.0 \
> - gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 pango-1.0 \
> - pangocairo-1.0
> +WANTLIB-gtk3 +=  fcitx-gclient fcitx-utils glib-2.0 gobject-2.0 
> gdk-3
> +WANTLIB-gtk3 +=  gtk-3 pango-1.0 xkbcommon
>  
> -RUN_DEPENDS-gtk3 =   inputmethods/fcitx,-main
> -LIB_DEPENDS-gtk3 =   devel/libexecinfo \
> - x11/gtk+3 \
> - x11/xkbcommon
> +LIB_DEPENDS-gtk3 =   ${BUILD_PKGPATH},-main \
> + x11/gtk+3
>  
>  MASTER_SITES =   https://download.fcitx-im.org/fcitx/
>  DISTFILES =  ${DISTNAME}${EXTRACT_SUFX}
> @@ -80,7 +70,8 @@ DIST_SUBDIR =   fcitx
>  
>  MODULES =devel/cmake
>  
> -CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
> +CONFIGURE_ARGS =-Wno-dev \
> + -DENABLE_GTK3_IM_MODULE=ON \
>   -DENABLE_ENCHANT=OFF \
>   -DENABLE_OPENCC=OFF \
>   -DENABLE_PRESAGE=OFF \
> @@ -89,8 +80,12 @@ CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
>   -DENABLE_QT_GUI=OFF \
>   -DSYSCONFDIR=${PREFIX}/share/examples/fcitx \
>   -DMAN_INSTALL_DIR=${PREFIX}/man/ \
> - -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
> -I${X11BASE}/include" \
> - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include 
> -I${X11BASE}/include&qu

Re: [UPDATE] www/py-webpy 0.40 -> 0.61

[Kevin Lo]

On Fri, Aug 14, 2020 at 07:41:09PM +0200, Bjorn Ketelaars wrote:
> 
> On Fri 14/08/2020 23:11, Kevin Lo wrote:
> > Hi ports@,
> > 
> > Here's an update of py-webpy to 0.61; tested on amd64.
> > Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
> > 
> > Ok?
> > 
> > diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
> > blob - 775663595f625596e030122a20f619d5b0215a11
> > file + www/Makefile
> > --- www/Makefile
> > +++ www/Makefile
> > @@ -511,7 +511,6 @@
> >   SUBDIR += py-webob
> >   SUBDIR += py-webob,python3
> >   SUBDIR += py-webpy
> > - SUBDIR += py-webpy,python3
> >   SUBDIR += py-webtest
> >   SUBDIR += py-webtest,python3
> >   SUBDIR += py-werkzeug
> > blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
> > file + www/py-webpy/Makefile
> > --- www/py-webpy/Makefile
> > +++ www/py-webpy/Makefile
> > @@ -2,10 +2,9 @@
> >  
> >  COMMENT=   web framework for python
> >  
> > -MODPY_EGG_VERSION= 0.40
> > +MODPY_EGG_VERSION= 0.61
> >  DISTNAME=  web.py-${MODPY_EGG_VERSION}
> >  PKGNAME=   py-webpy-${MODPY_EGG_VERSION}
> > -REVISION=  1
> >  
> >  CATEGORIES=www
> >  
> > @@ -21,11 +20,9 @@ MODULES= lang/python
> >  MODPY_PI=  Yes
> >  MODPY_PYTEST=  Yes
> >  MODPY_SETUPTOOLS=  Yes
> > +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
> 
> ^^^
> 
> I would prefer to use FLAVORS/FLAVOR as it seems that py-webpy is not a
> standalone python tool. Note that this also requires a different change
> to www/Makefile, @@conflict- and @pkgpath-markers in pkg/PLIST, and a
> quirk:

Thanks for your quick assistance.  You've made all necessary changes!
ok to commit your diff?  Thank you.

> diff --git devel/quirks/Makefile devel/quirks/Makefile
> index 310690b339e..ddb9f081af4 100644
> --- devel/quirks/Makefile
> +++ devel/quirks/Makefile
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.402
> +PKGNAME =quirks-3.403
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> index 0281c4ac939..e1a7e457c0a 100644
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -459,6 +459,7 @@ my $stem_extensions = {
>   'py-ecos' => 'py3-ecos',
>   'py-numexpr' => 'py3-numexpr',
>   'py-notmuch' => 'py3-notmuch',
> + 'py-webpy' => 'py3-webpy',
>  };
>  
>  my $obsolete_reason = {
> diff --git www/Makefile www/Makefile
> index 775663595f6..538199c2f9b 100644
> --- www/Makefile
> +++ www/Makefile
> @@ -510,7 +510,6 @@
>   SUBDIR += py-webhelpers
>   SUBDIR += py-webob
>   SUBDIR += py-webob,python3
> - SUBDIR += py-webpy
>   SUBDIR += py-webpy,python3
>   SUBDIR += py-webtest
>   SUBDIR += py-webtest,python3
> diff --git www/py-webpy/Makefile www/py-webpy/Makefile
> index a7ce4677e2a..fd48f19727f 100644
> --- www/py-webpy/Makefile
> +++ www/py-webpy/Makefile
> @@ -2,10 +2,9 @@
>  
>  COMMENT= web framework for python
>  
> -MODPY_EGG_VERSION=   0.40
> +MODPY_EGG_VERSION=   0.61
>  DISTNAME=web.py-${MODPY_EGG_VERSION}
>  PKGNAME= py-webpy-${MODPY_EGG_VERSION}
> -REVISION=1
>  
>  CATEGORIES=  www
>  
> @@ -22,10 +21,9 @@ MODPY_PI=  Yes
>  MODPY_PYTEST=Yes
>  MODPY_SETUPTOOLS=Yes
>  
> -RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
> - www/py-cheroot${MODPY_FLAVOR}
> +RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR}
>  
>  FLAVORS= python3
> -FLAVOR ?=
> +FLAVOR=  python3
>  
>  .include 
> diff --git www/py-webpy/distinfo www/py-webpy/distinfo
> index aef5d002c0e..a9e764d69d7 100644
> --- www/py-webpy/distinfo
> +++ www/py-webpy/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
> -SIZE (web.py-0.40.tar.gz) = 103781
> +SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
> +SIZE (web.py-0.61.tar.gz) = 623070
> diff --git www/py-webpy/patches/patch-tests_test_wsgi_py 
> www/py-webpy/patches/patch-tests_test_wsgi_py
> deleted file mode 100644
> index 996b5bce82d..000
> --- www/py-webpy/patches/patch-tests_test_wsgi_py
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
> -
> -- Fix unit tests in tests/test_wsgi.py
> -  upstream commit a345caedd

Re: [UPDATE] www/py-webpy 0.40 -> 0.61

[Kevin Lo]

Thank you for your input.  I couldn't figure out why FLAVORS/FLAVOR should
be used, but bket@ gave me a reason.  I always learn so much from porters :)

On Fri, Aug 14, 2020 at 06:38:23PM +0100, Stuart Henderson wrote:
> Please remove MODPY_VERSION, use
> 
> FLAVORS=python3
> FLAVOR=python3
> 
> in Makefile, @pkgpath www/py-webpy in pkg/PLIST, keep the ,python3 in 
> ../Makefile and add a py-webpy -> py3-webpy entry to devel/quirks (see 
> commits for recent py2->3 conversions).
> 
> -- 
>   Sent from a phone, apologies for poor formatting.
> On 14 August 2020 16:11:35 Kevin Lo  wrote:
> 
> > Hi ports@,
> >
> > Here's an update of py-webpy to 0.61; tested on amd64.
> > Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
> >
> > Ok?
> >
> > diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
> > blob - 775663595f625596e030122a20f619d5b0215a11
> > file + www/Makefile
> > --- www/Makefile
> > +++ www/Makefile
> > @@ -511,7 +511,6 @@
> >  SUBDIR += py-webob
> >  SUBDIR += py-webob,python3
> >  SUBDIR += py-webpy
> > - SUBDIR += py-webpy,python3
> >  SUBDIR += py-webtest
> >  SUBDIR += py-webtest,python3
> >  SUBDIR += py-werkzeug
> > blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
> > file + www/py-webpy/Makefile
> > --- www/py-webpy/Makefile
> > +++ www/py-webpy/Makefile
> > @@ -2,10 +2,9 @@
> >
> > COMMENT=web framework for python
> >
> > -MODPY_EGG_VERSION= 0.40
> > +MODPY_EGG_VERSION= 0.61
> > DISTNAME=   web.py-${MODPY_EGG_VERSION}
> > PKGNAME=py-webpy-${MODPY_EGG_VERSION}
> > -REVISION=  1
> >
> > CATEGORIES= www
> >
> > @@ -21,11 +20,9 @@ MODULES= lang/python
> > MODPY_PI=   Yes
> > MODPY_PYTEST=   Yes
> > MODPY_SETUPTOOLS=   Yes
> > +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
> >
> > -RUN_DEPENDS=   textproc/py-markdown${MODPY_FLAVOR} \
> > -   www/py-cheroot${MODPY_FLAVOR}
> >
> > -FLAVORS=   python3
> > -FLAVOR ?=
> > +RUN_DEPENDS=   www/py-cheroot${MODPY_FLAVOR}
> >
> > .include 
> > blob - aef5d002c0e971963a5a92f9dd563821789f1e04
> > file + www/py-webpy/distinfo
> > --- www/py-webpy/distinfo
> > +++ www/py-webpy/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
> > -SIZE (web.py-0.40.tar.gz) = 103781
> > +SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
> > +SIZE (web.py-0.61.tar.gz) = 623070
> > blob - 996b5bce82d3634d3215db8b82a614db4284b160
> > file + /dev/null
> > --- www/py-webpy/patches/patch-tests_test_wsgi_py
> > +++ www/py-webpy/patches/patch-tests_test_wsgi_py
> > @@ -1,56 +0,0 @@
> > -$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
> > -
> > -- Fix unit tests in tests/test_wsgi.py
> > -  upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4
> > -
> > -Index: tests/test_wsgi.py
> >  tests/test_wsgi.py.orig
> > -+++ tests/test_wsgi.py
> > -@@ -1,9 +1,15 @@
> > - import unittest
> > --import web
> > - import threading
> > - import time
> > -
> > -+try:  # PY 3
> > -+from urllib.parse import unquote_to_bytes as unquote
> > -+except ImportError:  # PY 2
> > -+from urllib import unquote
> > -
> > -+import web
> > -+
> > -+
> > - class WSGITest(unittest.TestCase):
> > - def test_layers_unicode(self):
> > - urls = ("/", "uni")
> > -@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
> > - thread.start()
> > - time.sleep(0.5)
> > -
> > --b = web.browser.Browser()
> > -+b = web.browser.AppBrowser(app)
> > - r = b.open("/").read()
> > - s = r.decode("utf8")
> > - self.assertEqual(s, u"\u0C05\u0C06")
> > -@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
> > - thread.start()
> > - time.sleep(0.5)
> > -
> > --b = web.browser.Browser()
> > -+b = web.browser.AppBrowser(app)
> > - r = b.open("/")
> > - self.assertEqual(r.read(), b"abcdef")
> > -
> > -@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase):
> > - thread.start()
> > - time.sleep(0.5)
> > -
> > --b = web.browser.Browser()
> > -+b = web.browser.AppBrowser(app)
> > - r = b.open("/%E2%84%A6")
> > --self.assertEqual(r.read(), b"\xE2\x84\xA6")
> > -+s = unquote(r.read())
> > -+self.assertEqual(s, b"\xE2\x84\xA6")
> > -
> > - app.stop()
> > - thread.join()
> 

[UPDATE] www/py-webpy 0.40 -> 0.61

[Kevin Lo]

Hi ports@,

Here's an update of py-webpy to 0.61; tested on amd64.
Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3

Ok?

diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports
blob - 775663595f625596e030122a20f619d5b0215a11
file + www/Makefile
--- www/Makefile
+++ www/Makefile
@@ -511,7 +511,6 @@
  SUBDIR += py-webob
  SUBDIR += py-webob,python3
  SUBDIR += py-webpy
- SUBDIR += py-webpy,python3
  SUBDIR += py-webtest
  SUBDIR += py-webtest,python3
  SUBDIR += py-werkzeug
blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30
file + www/py-webpy/Makefile
--- www/py-webpy/Makefile
+++ www/py-webpy/Makefile
@@ -2,10 +2,9 @@
 
 COMMENT=   web framework for python
 
-MODPY_EGG_VERSION= 0.40
+MODPY_EGG_VERSION= 0.61
 DISTNAME=  web.py-${MODPY_EGG_VERSION}
 PKGNAME=   py-webpy-${MODPY_EGG_VERSION}
-REVISION=  1
 
 CATEGORIES=www
 
@@ -21,11 +20,9 @@ MODULES= lang/python
 MODPY_PI=  Yes
 MODPY_PYTEST=  Yes
 MODPY_SETUPTOOLS=  Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS=   textproc/py-markdown${MODPY_FLAVOR} \
-   www/py-cheroot${MODPY_FLAVOR}
 
-FLAVORS=   python3
-FLAVOR ?=
+RUN_DEPENDS=   www/py-cheroot${MODPY_FLAVOR}
 
 .include 
blob - aef5d002c0e971963a5a92f9dd563821789f1e04
file + www/py-webpy/distinfo
--- www/py-webpy/distinfo
+++ www/py-webpy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
-SIZE (web.py-0.40.tar.gz) = 103781
+SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs=
+SIZE (web.py-0.61.tar.gz) = 623070
blob - 996b5bce82d3634d3215db8b82a614db4284b160
file + /dev/null
--- www/py-webpy/patches/patch-tests_test_wsgi_py
+++ www/py-webpy/patches/patch-tests_test_wsgi_py
@@ -1,56 +0,0 @@
-$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $
-
-- Fix unit tests in tests/test_wsgi.py
-  upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4
-
-Index: tests/test_wsgi.py
 tests/test_wsgi.py.orig
-+++ tests/test_wsgi.py
-@@ -1,9 +1,15 @@
- import unittest
--import web
- import threading
- import time
- 
-+try:  # PY 3
-+from urllib.parse import unquote_to_bytes as unquote
-+except ImportError:  # PY 2
-+from urllib import unquote
- 
-+import web
-+
-+
- class WSGITest(unittest.TestCase):
- def test_layers_unicode(self):
- urls = ("/", "uni")
-@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
- 
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/").read()
- s = r.decode("utf8")
- self.assertEqual(s, u"\u0C05\u0C06")
-@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
- 
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/")
- self.assertEqual(r.read(), b"abcdef")
- 
-@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase):
- thread.start()
- time.sleep(0.5)
- 
--b = web.browser.Browser()
-+b = web.browser.AppBrowser(app)
- r = b.open("/%E2%84%A6")
--self.assertEqual(r.read(), b"\xE2\x84\xA6")
-+s = unquote(r.read())
-+self.assertEqual(s, b"\xE2\x84\xA6")
- 
- app.stop()
- thread.join()

UPDATE: inputmethods/fcitx 4.2.9.6 => 4.2.9.8 and inputmethods/fcitx-qt5 1.2.3 => 1.2.5

[Kevin Lo]

Hi ports,

The following updates fcitx to 4.2.9.8 and fcitx-qt5 to 1.2.5.
There are no symbol changes, so no lib bumps.
Tested on amd64.
 
Ok?

diff f774fbfd3e6b7af035101ca0b84a2d18e48fa5d8 /usr/ports
blob - 0c9bef028b69746ae5ff97994a9cb5874eaa46ed
file + inputmethods/fcitx/Makefile
--- inputmethods/fcitx/Makefile
+++ inputmethods/fcitx/Makefile
@@ -1,19 +1,16 @@
 # $OpenBSD: Makefile,v 1.14 2020/02/29 15:20:56 naddy Exp $
 
 COMMENT-main = flexible input method framework
-COMMENT-gtk3 = fcitx for GTK+3
+COMMENT-gtk3 = fcitx for GTK+3
 
-V =4.2.9.6
-DISTNAME = fcitx-$V
-PKGNAME-main = fcitx-$V
+V =4.2.9.8
+DISTNAME = fcitx-$V
+PKGNAME-main = ${PKGNAME}
 PKGNAME-gtk3 = fcitx-gtk3-$V
-REVISION-main =2
-REVISION-gtk3 =1
 
 SHARED_LIBS += fcitx-config0.0 # 4.1
 SHARED_LIBS += fcitx-core  0.0 # 0.3
 SHARED_LIBS += fcitx-gclient   0.0 # 0.2
-SHARED_LIBS += fcitx-qt0.0 # 0.1
 SHARED_LIBS += fcitx-utils 0.0 # 0.1
 
 CATEGORIES =   inputmethods chinese japanese
@@ -29,26 +26,23 @@ MULTI_PACKAGES =-main -gtk3
 
 COMPILER = base-clang ports-gcc base-gcc
 
-WANTLIB-common =   execinfo iconv intl kvm xkbcommon
+WANTLIB-main +=X11 Xext Xfixes Xinerama Xrender c cairo dbus-1 
\
+   execinfo gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
+   gobject-2.0 gtk-x11-2.0 iconv intl json-c kvm \
+   pango-1.0 pangocairo-1.0 pthread uuid xkbcommon \
+   xkbfile xml2
 
-WANTLIB-main +=${WANTLIB-common}
-WANTLIB-main +=ICE X11 Xcomposite Xcursor Xdamage Xext Xfixes \
-   Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
-   execinfo fontconfig freetype gdk_pixbuf-2.0 \
-   gdk-x11-2.0 gettextpo gio-2.0 glib-2.0 \
-   gobject-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
-   pangoft2-1.0 pthread uuid xkbcommon xkbfile xml2 z
-
 BUILD_DEPENDS =devel/gettext,-tools \
devel/gobject-introspection \
devel/iso-codes \
devel/kf5/extra-cmake-modules \
shells/bash
-RUN_DEPENDS-main = devel/desktop-file-utils \
+RUN_DEPENDS =  devel/desktop-file-utils \
misc/shared-mime-info \
shells/bash \
x11/gtk+3,-guic
-LIB_DEPENDS-main = devel/gettext,-tools \
+LIB_DEPENDS =  devel/gettext,-tools \
+   devel/json-c \
devel/libexecinfo \
sysutils/e2fsprogs \
textproc/libxml \
@@ -56,15 +50,11 @@ LIB_DEPENDS-main =  devel/gettext,-tools \
x11/gtk+2 \
x11/xkbcommon
 
-WANTLIB-gtk3 +=${WANTLIB-common}
-WANTLIB-gtk3 +=atk-1.0 cairo cairo-gobject dbus-1 
gdk_pixbuf-2.0 \
-   gdk-3 gio-2.0 glib-2.0 gobject-2.0 gtk-3 pango-1.0 \
-   pangocairo-1.0
+WANTLIB-gtk3 +=fcitx-gclient fcitx-utils glib-2.0 gobject-2.0 
gdk-3
+WANTLIB-gtk3 +=gtk-3 pango-1.0 xkbcommon
 
-RUN_DEPENDS-gtk3 = inputmethods/fcitx,-main
-LIB_DEPENDS-gtk3 = devel/libexecinfo \
-   x11/gtk+3 \
-   x11/xkbcommon
+LIB_DEPENDS-gtk3 = ${BUILD_PKGPATH},-main \
+   x11/gtk+3
 
 MASTER_SITES = https://download.fcitx-im.org/fcitx/
 DISTFILES =${DISTNAME}${EXTRACT_SUFX}
@@ -80,7 +70,8 @@ DIST_SUBDIR = fcitx
 
 MODULES =  devel/cmake
 
-CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
+CONFIGURE_ARGS =-Wno-dev \
+   -DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_ENCHANT=OFF \
-DENABLE_OPENCC=OFF \
-DENABLE_PRESAGE=OFF \
@@ -89,8 +80,12 @@ CONFIGURE_ARGS =-DENABLE_GTK3_IM_MODULE=ON \
-DENABLE_QT_GUI=OFF \
-DSYSCONFDIR=${PREFIX}/share/examples/fcitx \
-DMAN_INSTALL_DIR=${PREFIX}/man/ \
-   -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
-I${X11BASE}/include" \
-   -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include 
-I${X11BASE}/include"
+   -DCMAKE_C_FLAGS="${CFLAGS} \
+   -I${LOCALBASE}/include \
+   -I${X11BASE}/include" \
+   -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+   -I${LOCALBASE}/include \
+   -I${X11BASE}/include"
 
 NO_TEST =  Yes
 
@@ -102,6 +97,6 @@ post-patch:
@cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
${WRKSRC}/src/module/pinyin-enhance/data
@cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
-   ${WRKSRC}/src/module/pinyin-enhance/data/
+   ${WRKSRC}/src/module/pinyin-enhance/

Re: Remove Qt4 support in inputmethods/fcitx

[Kevin Lo]

On Tue, Feb 25, 2020 at 07:13:10AM +0100, Rafael Sadowski wrote:
> 
> Hi ports@, Hi Kevin,
> 
> I think we can say goodbye to the qt4 support in fcitx. For Qt5 there is
> a fcitx-qt5 port. We only have a handful of Qt4 ports left and I'd like
> it to be less.
> 
> OK for the diff below with a line in devel/quirks?

Sure, ok kevlo@.
Thanks.

Re: Mark chinese/libpinyin BROKEN-sparc64

[Kevin Lo]

On Thu, Feb 13, 2020 at 09:30:17AM -0500, Kurt Mosiejczuk wrote:
> 
> Another that has never successfully built on sparc64
> 
> ok?
> 
> (cc maintainer)

ok @kevlo

> --Kurt
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/chinese/libpinyin/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  12 Jul 2019 20:43:46 -  1.3
> +++ Makefile  13 Feb 2020 14:29:59 -
> @@ -1,5 +1,7 @@
>  # $OpenBSD: Makefile,v 1.3 2019/07/12 20:43:46 sthen Exp $
>  
> +BROKEN-sparc64 = [Makefile:542: bigram.db] Bus error (core dumped)
> +
>  COMMENT =library to deal with pinyin
>  
>  V =  2.3.0

Re: www/py-webpy: regression test fixes from upstream

[Kevin Lo]

On Fri, Oct 04, 2019 at 04:49:49PM +0200, Klemens Nanni wrote:
> On Fri, Oct 04, 2019 at 10:41:55PM +0800, Kevin Lo wrote:
> > The diff below fixes errors for regression tests.  It passes all its
> > regression tests on amd64.  ok?
> Fine with me.
> 
> === 52 passed, 178 warnings in 10.72 seconds 
> ===
> 
> 
> > Index: www/py-webpy/patches/patch-tests_test_wsgi_py
> > ===
> > RCS file: www/py-webpy/patches/patch-tests_test_wsgi_py
> > diff -N www/py-webpy/patches/patch-tests_test_wsgi_py
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ www/py-webpy/patches/patch-tests_test_wsgi_py   4 Oct 2019 14:39:57 
> > -
> > @@ -0,0 +1,53 @@
> > +$OpenBSD$
> Please add a brief comment here so `make patch' output shows it and
> porters optimally have a quick reference to the source of it, e.g. link
> to git commit or so.

Done!  Thank you :)

www/py-webpy: regression test fixes from upstream

[Kevin Lo]

Hi,

The diff below fixes errors for regression tests.  It passes all its
regression tests on amd64.  ok?

Index: www/py-webpy/patches/patch-tests_test_wsgi_py
===
RCS file: www/py-webpy/patches/patch-tests_test_wsgi_py
diff -N www/py-webpy/patches/patch-tests_test_wsgi_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ www/py-webpy/patches/patch-tests_test_wsgi_py   4 Oct 2019 14:39:57 
-
@@ -0,0 +1,53 @@
+$OpenBSD$
+
+Index: tests/test_wsgi.py
+--- tests/test_wsgi.py.orig
 tests/test_wsgi.py
+@@ -1,9 +1,15 @@
+ import unittest
+-import web
+ import threading
+ import time
+ 
++try:  # PY 3
++from urllib.parse import unquote_to_bytes as unquote
++except ImportError:  # PY 2
++from urllib import unquote
+ 
++import web
++
++
+ class WSGITest(unittest.TestCase):
+ def test_layers_unicode(self):
+ urls = ("/", "uni")
+@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase):
+ thread.start()
+ time.sleep(0.5)
+ 
+-b = web.browser.Browser()
++b = web.browser.AppBrowser(app)
+ r = b.open("/").read()
+ s = r.decode("utf8")
+ self.assertEqual(s, u"\u0C05\u0C06")
+@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase):
+ thread.start()
+ time.sleep(0.5)
+ 
+-b = web.browser.Browser()
++b = web.browser.AppBrowser(app)
+ r = b.open("/")
+ self.assertEqual(r.read(), b"abcdef")
+ 
+@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase):
+ thread.start()
+ time.sleep(0.5)
+ 
+-b = web.browser.Browser()
++b = web.browser.AppBrowser(app)
+ r = b.open("/%E2%84%A6")
+-self.assertEqual(r.read(), b"\xE2\x84\xA6")
++s = unquote(r.read())
++self.assertEqual(s, b"\xE2\x84\xA6")
+ 
+ app.stop()
+ thread.join()

Re: [UPDATE] www/py-webpy to 0.40

[Kevin Lo]

On Wed, Oct 02, 2019 at 11:30:59PM -0400, Kurt Mosiejczuk wrote:
> 
> On Sat, Sep 28, 2019 at 10:29:17PM +0800, Kevin Lo wrote:
> > Greetings,
> 
> > Here's an update of py-webpy to 0.40; tested on amd64.
> 
> > Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3
> 
> > ok?
> 
> I'd like to propose a different diff. It's available on PyPI, so I'd rather
> it pulled from there rather than use GH_*. Also, there's not a reason to
> set NO_TEST. The tests do run. 4 tests fail, but 49 pass. Just needs
> MODPY_PYTEST. Lastly, it does support both flavors of Python. I can be
> argued with about supporting both flavors, but then we'd need a change to
> quirks to retire the python 2 flavor.

Thank you for the review and your comments.  Here's the revised diff.
ok?

Index: www/py-webpy/Makefile
===
RCS file: /cvs/ports/www/py-webpy/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- www/py-webpy/Makefile   12 Jul 2019 20:51:03 -  1.14
+++ www/py-webpy/Makefile   4 Oct 2019 05:30:10 -
@@ -2,26 +2,30 @@
 
 COMMENT=   web framework for python
 
-VERSION=   0.38
-DISTNAME=  web.py-${VERSION}
-PKGNAME=   py-webpy-${VERSION}
+MODPY_EGG_VERSION= 0.40
+DISTNAME=  web.py-${MODPY_EGG_VERSION}
+PKGNAME=   py-webpy-${MODPY_EGG_VERSION}
+
 CATEGORIES=    www
 
-MASTER_SITES=  ${HOMEPAGE}/static/
 HOMEPAGE=  http://webpy.org
 
+MAINTAINER=Kevin Lo 
+
 # Public Domain, except wsgiserver
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
 
-SUBST_VARS=VERSION
+MODPY_PI=  Yes
+MODPY_PYTEST=  Yes
+MODPY_PYTEST_ARGS= tests
+MODPY_SETUPTOOLS=  Yes
 
-TEST_DEPENDS= databases/py-sqlite2 \
-   ${BASE_PKGPATH}
+RUN_DEPENDS=   textproc/py-markdown${MODPY_FLAVOR} \
+   www/py-cheroot${MODPY_FLAVOR}
 
-do-test:
-   cd ${WRKSRC} && ${MODPY_BIN} ./web/test.py 
-   cd ${WRKSRC} && ${MODPY_BIN} ./web/db.py SqliteTest
+FLAVORS=   python3
+FLAVOR ?=
 
 .include 
Index: www/py-webpy/distinfo
===
RCS file: /cvs/ports/www/py-webpy/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- www/py-webpy/distinfo   3 Nov 2016 10:12:34 -   1.7
+++ www/py-webpy/distinfo   4 Oct 2019 05:30:10 -
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.38.tar.gz) = CcYbW2tuHdVYgY0H37qzstoGI2AwecfXIjZEsofwiHA=
-SIZE (web.py-0.38.tar.gz) = 91877
+SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
+SIZE (web.py-0.40.tar.gz) = 103781
Index: www/py-webpy/pkg/DESCR
===
RCS file: /cvs/ports/www/py-webpy/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- www/py-webpy/pkg/DESCR  5 Dec 2007 15:44:49 -   1.1.1.1
+++ www/py-webpy/pkg/DESCR  4 Oct 2019 05:30:10 -
@@ -1,3 +1,3 @@
 web.py is a web framework for python that is as simple as it is
 powerful. web.py is in the public domain; you can use it for whatever
-purpose with absolutely no restrictions. 
+purpose with absolutely no restrictions.
Index: www/py-webpy/pkg/PLIST
===
RCS file: /cvs/ports/www/py-webpy/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- www/py-webpy/pkg/PLIST  20 Jan 2013 09:10:04 -  1.6
+++ www/py-webpy/pkg/PLIST  4 Oct 2019 05:30:10 -
@@ -1,49 +1,47 @@
 @comment $OpenBSD: PLIST,v 1.6 2013/01/20 09:10:04 benoit Exp $
 lib/python${MODPY_VERSION}/site-packages/web/
-lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/web/__init__.py
-lib/python${MODPY_VERSION}/site-packages/web/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/web/application.py
-lib/python$

[UPDATE] www/py-webpy to 0.40

[Kevin Lo]

Greetings,

Here's an update of py-webpy to 0.40; tested on amd64.

Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3

ok?

Index: www/py-webpy/Makefile
===
RCS file: /cvs/ports/www/py-webpy/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- www/py-webpy/Makefile   12 Jul 2019 20:51:03 -  1.14
+++ www/py-webpy/Makefile   28 Sep 2019 14:22:58 -
@@ -2,26 +2,28 @@
 
 COMMENT=   web framework for python
 
-VERSION=   0.38
-DISTNAME=  web.py-${VERSION}
-PKGNAME=   py-webpy-${VERSION}
+MODPY_EGG_VERSION= 0.40
+GH_ACCOUNT=webpy
+GH_PROJECT=webpy
+GH_TAGNAME=${MODPY_EGG_VERSION}
+
+PKGNAME=   py-webpy-${MODPY_EGG_VERSION}
 CATEGORIES=www
 
-MASTER_SITES=  ${HOMEPAGE}/static/
 HOMEPAGE=  http://webpy.org
 
+MAINTAINER=Kevin Lo 
+
 # Public Domain, except wsgiserver
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
+MODPY_SETUPTOOLS=  Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
-SUBST_VARS=VERSION
-
-TEST_DEPENDS= databases/py-sqlite2 \
-   ${BASE_PKGPATH}
+RUN_DEPENDS=   textproc/py-markdown${MODPY_FLAVOR} \
+   www/py-cheroot${MODPY_FLAVOR}
 
-do-test:
-   cd ${WRKSRC} && ${MODPY_BIN} ./web/test.py 
-   cd ${WRKSRC} && ${MODPY_BIN} ./web/db.py SqliteTest
+NO_TEST=   Yes
 
 .include 
Index: www/py-webpy/distinfo
===
RCS file: /cvs/ports/www/py-webpy/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- www/py-webpy/distinfo   3 Nov 2016 10:12:34 -   1.7
+++ www/py-webpy/distinfo   28 Sep 2019 14:22:58 -
@@ -1,2 +1,2 @@
-SHA256 (web.py-0.38.tar.gz) = CcYbW2tuHdVYgY0H37qzstoGI2AwecfXIjZEsofwiHA=
-SIZE (web.py-0.38.tar.gz) = 91877
+SHA256 (webpy-0.40.tar.gz) = hR3OXgouFUzvy+cKrnS+QfN8AIWF0Y5m6iPZuWn+JTE=
+SIZE (webpy-0.40.tar.gz) = 103372
Index: www/py-webpy/pkg/DESCR
===
RCS file: /cvs/ports/www/py-webpy/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- www/py-webpy/pkg/DESCR  5 Dec 2007 15:44:49 -   1.1.1.1
+++ www/py-webpy/pkg/DESCR  28 Sep 2019 14:22:58 -
@@ -1,3 +1,3 @@
 web.py is a web framework for python that is as simple as it is
 powerful. web.py is in the public domain; you can use it for whatever
-purpose with absolutely no restrictions. 
+purpose with absolutely no restrictions.
Index: www/py-webpy/pkg/PLIST
===
RCS file: /cvs/ports/www/py-webpy/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- www/py-webpy/pkg/PLIST  20 Jan 2013 09:10:04 -  1.6
+++ www/py-webpy/pkg/PLIST  28 Sep 2019 14:22:58 -
@@ -1,49 +1,47 @@
 @comment $OpenBSD: PLIST,v 1.6 2013/01/20 09:10:04 benoit Exp $
 lib/python${MODPY_VERSION}/site-packages/web/
-lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/web/__init__.py
-lib/python${MODPY_VERSION}/site-packages/web/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}browser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}debugerror.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}form.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}httpserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}py3helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-package

NEW: inputmethods/fcitx-m17n

[Kevin Lo]

Hi,

Here is a port of fcitx-m17n - m17n wrapper for fcitx.
Tested on amd64.  Comments/OK?


fcitx-m17n.tgz
Description: application/gtar-compressed

Re: NEW: fonts/taiwan-cns11643-fonts

[Kevin Lo]

On Thu, Apr 18, 2019 at 01:59:03AM -0600, Anthony J. Bentley wrote:
> Hi,
> 
> The taiwan-cns11643-fonts package contains TrueType fonts designed by the
> Taiwanese Ministry of Education, created to be compliant with the CNS11643
> encoding standard.
> 
> TW-Kai is a regular-script-style font. It consists of three files: TW-Kai,
> containing characters from Unicode's Basic Multilingual Plane; TW-Kai-Ext-B,
> containing characters from Unicode's Supplementary Ideographic Plane; and
> TW-Kai-Plus, containing characters in the Private Use Plane.
> 
> TW-Sung is a Ming-style font. It consists of three files: TW-Sung, containing
> characters from Unicode's Basic Multilingual Plane; TW-Sung-Ext-B, containing
> characters from Unicode's Supplementary Ideographic Plane; and TW-Sung-Plus,
> containing characters in the Private Use Plane.
> 
> The license of these fonts allows them to be used/modified/redistributed
> in accordance with CC-BY-4.0.
> 
> ok?

Nice, it works for me, thanks :)  ok kevlo@

Re: Fix for misc/m17n/lib

[Kevin Lo]

On Fri, Apr 12, 2019 at 10:25:25AM +0200, Jeremie Courreges-Anglas wrote:
> 
> On Wed, Apr 10 2019, Kevin Lo  wrote:
> > On Wed, Apr 10, 2019 at 03:48:04PM +0800, Kevin Lo wrote:
> >> 
> >> Hi,
> >> 
> >> When I run the command m17n-dump, I get an error:
> >> undefined reference to `libintl_bindtextdomain'
> >> 
> >> The diff below links with intl correctly, ok?
> >
> > Here's the revised diff that fixes m17n-view as well.
> 
> There are indeed two problems, one with ld and libintl, another one with
> the detection of Xaw.  Here's an alternate diff which, compared
> to yours:
> - adds -lintl only to the build of libm17n-core, since this is the
>   library using bindtextdomain. I'd prefer this approach since it
>   doesn't result in overlinking and it can be pushed upstream as is.
> - also removes -ldl from the build of libm17n
> - adds both /usr/X11R6 and /usr/local to CPPFLAGS/LDFLAGS, for
>   consistency.  No need to respect user CPPFLAGS, only LDFLAGS.
> - removes patch-configure, it's normal for libtool+autoconf to detect
>   whether libdl.so is available/needed
> 
> Tested on amd64 with both clang/ld.lld and gcc/ld.bfd.
> Does it work for you?

I tested m17n-conv, m17n-date, m17n-dump, m17n-edit and m17n-view, all worked
nicely :)  Thanks.

Re: Fix for misc/m17n/lib

[Kevin Lo]

On Wed, Apr 10, 2019 at 03:48:04PM +0800, Kevin Lo wrote:
> 
> Hi,
> 
> When I run the command m17n-dump, I get an error:
> undefined reference to `libintl_bindtextdomain'
> 
> The diff below links with intl correctly, ok?

Here's the revised diff that fixes m17n-view as well.

Index: misc/m17n/lib/Makefile
===
RCS file: /cvs/ports/misc/m17n/lib/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- misc/m17n/lib/Makefile  28 Mar 2019 02:03:27 -  1.2
+++ misc/m17n/lib/Makefile  10 Apr 2019 09:28:54 -
@@ -3,6 +3,7 @@
 COMMENT =  multilingual text processing library
 
 DISTNAME = m17n-lib-${M17N_V}
+REVISION = 0
 
 SHARED_LIBS +=  m17n-core0.0  # 4.2
 SHARED_LIBS +=  m17n 0.0  # 4.2
@@ -11,11 +12,13 @@ SHARED_LIBS +=  m17n-gui 0.0
 
 CATEGORIES =   misc
 
-WANTLIB += ICE SM X11 Xft Xrender Xt anthy anthydic c expat fontconfig
-WANTLIB += freetype fribidi gd iconv jpeg lzma m otf png16 pthread
-WANTLIB += tiff webp xcb xml2 z
+WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xft Xmu Xpm Xrender Xt
+WANTLIB += anthy anthydic c expat fontconfig freetype fribidi
+WANTLIB += gd iconv intl jpeg lzma m otf png16 pthread tiff webp
+WANTLIB += xcb xml2 z
 
-LIB_DEPENDS =  devel/libotf \
+LIB_DEPENDS =  devel/gettext \
+   devel/libotf \
devel/fribidi \
graphics/gd \
inputmethods/anthy \
@@ -25,7 +28,8 @@ BUILD_DEPENDS =   textproc/ispell \
${RUN_DEPENDS}
 RUN_DEPENDS =  misc/m17n/db=${M17N_V}
 
-CONFIGURE_ENV =LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CONFIGURE_ENV =CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
+   LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl"
 LIBTOOL_FLAGS =--tag=disable-static
 SEPARATE_BUILD = Yes