CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2022/08/28 13:51:38 Modified files: net/haproxy: Makefile distinfo Log message: Update to haproxy-2.6.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/08/28 13:37:21 Modified files: misc/vttest: Makefile distinfo Log message: misc/vttest: update to 20220827
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 13:00:50 Modified files: math/py-cvxopt : Makefile Log message: unbreak, I didn't set MODPY_PEP517 correctly, reported by aja@ naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/08/28 12:26:20 Modified files: lang/rust : Makefile Log message: Bump REVISION after adding support for powerpc64 and riscv64 since adding support for those archs changes the package on all archs. Even if probably nobody cross-compiles for those archs except semarie@. (Slightly reluctant) ok semarie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/08/28 12:22:18 Modified files: lang/rust/patches: patch-vendor_cc-1_0_69_src_lib_rs Log message: Fix the riscv64 patch for the cc crate ok semarie@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/08/28 08:20:03 Modified files: sysutils/nomad : Makefile distinfo Log message: Update to nomad-1.3.4.
update plan9/u9fs
Hello,
please find attached a diff to update u9fs to the latest commit. Some
linux distributions are using that bitbucket repository as upstream
(at least void and nix -- void has a typo in the version as it uses
the same commit I'm fetching.) The MASTER_SITE plan9.bell-labs.com
doesn't seem to be available anymore.
There was some (small) development on it over the
While here i've also tweaked a bit COMMENT, dropped some unused
patches, avoided the patch for the makefile by setting ALL_TARGET and
the CFLAGS, and installing the manpage.
The manpage talks like the user is on a plan9 system and that's
reflected even in the section number (4, which is for file servers
there IIRC, where for us is device divers.) For this reason i decided
to change the section to 8 and adjust it in the manpage, but otherwise
leaving it unchanged.
Tested locally by running it over inetd(8) and connecting with a
client, it works fine.
OK?
P.S.: should it be installed in sbin rather than bin?
Index: Makefile
===
RCS file: /home/cvs/ports/plan9/u9fs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:49:09 - 1.5
+++ Makefile28 Aug 2022 08:38:40 -
@@ -1,28 +1,31 @@
-COMMENT= serve 9P from Unix
+COMMENT= 9P server for Unix
-DISTNAME= u9fs-20110118
-REVISION= 0
+DISTNAME= u9fs-20210125
CATEGORIES=plan9
-MASTER_SITES= http://plan9.bell-labs.com/sources/contrib/sl/u9fs/ \
- http://openbsd.stanleylieber.com/u9fs/
-EXTRACT_SUFX= -src.tgz
+MASTER_SITES= https://bitbucket.org/plan9-from-bell-labs/u9fs/get/
+
+COMMIT=d65923fd17e8
+DISTFILES= ${DISTNAME}{${COMMIT}}${EXTRACT_SUFX}
MAINTAINER=Stanley Lieber
# MIT
PERMIT_PACKAGE=Yes
-WANTLIB= c
+WANTLIB= c
-WRKDIST= ${WRKDIR}
+WRKDIST= ${WRKDIR}/plan9-from-bell-labs-u9fs-${COMMIT}
MAKE_FILE= makefile
-MAKE_FLAGS=CC=${CC}
+CFLAGS += -D_BSD_SOURCE -I.
+MAKE_FLAGS=CFLAGS='${CFLAGS}'
+ALL_TARGET=u9fs
NO_TEST= Yes
do-install:
${INSTALL_PROGRAM} ${WRKDIST}/u9fs ${PREFIX}/bin/u9fs
+ ${INSTALL_MAN} ${WRKDIST}/u9fs.man ${PREFIX}/man/man8/u9fs.8
.include
Index: distinfo
===
RCS file: /home/cvs/ports/plan9/u9fs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:56 - 1.2
+++ distinfo28 Aug 2022 08:22:21 -
@@ -1,2 +1,2 @@
-SHA256 (u9fs-20110118-src.tgz) = NnNgEnSprGLNvz9E2QkGWg+35luqtrc1ScBMkvlDbvs=
-SIZE (u9fs-20110118-src.tgz) = 33674
+SHA256 (u9fs-20210125.tar.gz) = IBYZwcKbrRye0byIav57SWXP0HgbIpbJ3ofbELpxYV0=
+SIZE (u9fs-20210125.tar.gz) = 38319
Index: patches/patch-makefile
===
RCS file: patches/patch-makefile
diff -N patches/patch-makefile
--- patches/patch-makefile 11 Mar 2022 19:49:09 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
makefile.orig Sat Mar 29 21:21:38 2003
-+++ makefile Tue Mar 15 14:41:10 2011
-@@ -15,7 +15,7 @@
- # If you need copy sun-inttypes.h to inttypes.h.
- #
- #CC=cc
--CFLAGS=-g -I.
-+CFLAGS+=-g -I.
- LD=cc
- LDFLAGS=
- LDTAIL=
-@@ -57,7 +57,9 @@ u9fs: $(OFILES)
- clean:
- rm -f *.o u9fs
-
--install: u9fs
-- cp u9fs ../../bin
-+#install: u9fs
-+# cp u9fs ../../bin
-+
-+all: u9fs
-
- .PHONY: clean install
Index: patches/patch-oldfcall_c
===
RCS file: patches/patch-oldfcall_c
diff -N patches/patch-oldfcall_c
--- patches/patch-oldfcall_c11 Mar 2022 19:49:09 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,7 +0,0 @@
oldfcall.c.origSat Mar 2 19:05:52 2002
-+++ oldfcall.c Tue Mar 15 14:43:08 2011
-@@ -1,3 +1,4 @@
-+#include
- #include
- #include
- #include
Index: patches/patch-safecpy_c
===
RCS file: patches/patch-safecpy_c
diff -N patches/patch-safecpy_c
--- patches/patch-safecpy_c 11 Mar 2022 19:49:09 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
safecpy.c.orig Tue Mar 15 14:41:45 2011
-+++ safecpy.c Tue Mar 15 14:41:53 2011
-@@ -1,4 +1,5 @@
- #include
-+#include
-
- void
- safecpy(char *to, char *from, int tolen)
Index: patches/patch-u9fs_man
===
RCS file: patches/patch-u9fs_man
diff -N patches/patch-u9fs_man
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-u9fs_man 28 Aug 2022 08:37:17 -
@@ -0,0 +1,11 @@
+change the section; 8 is more appropriate for an inetd(8) application.
+
+Index: u9fs.man
+--- u9fs.man.orig
u9fs.man
+@@ -1,4 +1,4 @@
+-.TH U9FS 4
++.TH U9FS 8
+ .SH NAME
+ u9fs \- serve 9P from Unix
+ .SH SYNOPSIS
Index: pkg/PLIST
Re: drop print/libXp ?
On Sat, Aug 27, 2022 at 08:37:05AM +0200, Matthieu Herrb wrote: > Hi, > > I'd like to propose to remove print/libXp, the client library for the > long deprecated Xprint X server. > By itself this library is useless, unless one has a working Xprint > server running somewhere. > > It used to be a dependency for OpenMotif, but as far as I can tell > it's not the case anymore, and I couldn't find any port that lists it > as LIB_DEPEND. > > and also X.Org is considring dropping it for good : > https://lists.x.org/archives/xorg-devel/2022-August/058876.html OK kn to remove
mumble: update to 1.4.274, murmur tests wanted
Here's the latest update; clients works fine for me, but I don't use
it that much these days.
Anyone running the server part? Would be great to hear test reports
before commit.
RNNoise is now disabled. This makes net/tdesktop the last consumer of
audio/rnnoise.
Possibly OpenBSD relevant changes:
Client
Changed: Disable RNNoise by default (#5689)
Fixed: Context and identity not getting cleared (#5658)
Fixed: Don't display unsupported ACL (#5781)
Fixed: Improve appstream metadata (#5499)
Fixed: Minimal view not always working (#5786)
Fixed: PFS information being incorrect (#5656)
Fixed: Percent encoded links not clickable (#5657)
Fixed: Prefer selected tree item for context menu creation (#5778)
Fixed: Register simultaneous mouse button presses separately (#5784)
Fixed: Show friendlier text when displaying notifications (#5782)
Fixed: properly verify certificates when SRV records are used (#5783)
Fixed: resolve list tags, etc. polluting log (#5621)
Fixed: Remove duplicate entry for "What's this?" in UserModel (#5795)
Fixed: User and channel status icons take display scaling into account (#5779)
Server
Fixed: Add missing line breaks to --help output (#5456)
Fixed: Improve rememberchannelduration compare logic (#5652)
Fixed: Update suppress state on ACL change (#5780)
Full changelog:
https://github.com/mumble-voip/mumble/releases/tag/v1.4.274
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/mumble/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile3 Apr 2022 09:48:41 - 1.66
+++ Makefile28 Aug 2022 12:32:54 -
@@ -1,11 +1,9 @@
COMMENT-main = low-latency voice chat client
COMMENT-server = low-latency voice chat server
-VERSION = 1.4.230
+VERSION = 1.4.274
DISTNAME = mumble-${VERSION}
PKGNAME-server = murmur-${VERSION}
-REVISION-main =2
-REVISION-server = 2
CATEGORIES = audio net
@@ -14,12 +12,11 @@ HOMEPAGE = https://www.mumble.info/
MASTER_SITES =
https://github.com/mumble-voip/mumble/releases/download/v${VERSION}/
MASTER_SITES0 =https://github.com/mumble-voip/mumble/commit/
-# all merged into master but not released yet
+# all merged into master but not released/merged into 1.4.x branch yet
PATCHFILES = mumble-kvm_getprocs-ALL_arg-{}42ad5ed.patch:0 \
mumble-kvm_getprocs-pass-elemsize-{}ccbacbf.patch:0 \
mumble-struct_procinfo-member_prefix-{}a707213.patch:0 \
mumble-audiowizard-fix_Werror-{}0c769d8.patch:0 \
- mumble-use-system-rnnoise-{}d45318d.patch:0 \
mumble-enable-xinput2-{}904bae1.patch:0
# pending "BUILD(cmake): Build/install celt as module"
@@ -36,7 +33,7 @@ MAINTAINER = Klemens Nanni =1.0.25p0 \
audio/opus \
audio/portaudio-svn \
- audio/rnnoise \
audio/speex \
devel/protobuf \
net/poco \
@@ -76,7 +72,6 @@ CONFIGURE_ARGS += -Wno-dev
# ${WRKSRC}/docs/dev/build-instructions/cmake_options.md
CONFIGURE_ARGS += -Dbundled-opus=OFF \
- -Dbundled-rnnoise=OFF \
-Dbundled-speex=OFF \
-Dice=OFF \
-Djackaudio=OFF \
Index: distinfo
===
RCS file: /cvs/ports/audio/mumble/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo18 Mar 2022 15:37:56 - 1.23
+++ distinfo28 Aug 2022 12:30:51 -
@@ -1,16 +1,14 @@
-SHA256 (mumble-1.4.230.tar.gz) = tn2CtObMWDS5ZcW8JTOeRWU0u9W53abIyVz5y4DkNLA=
+SHA256 (mumble-1.4.274.tar.gz) = fsh93MzYkp5ABi6m6Gjyh1CdRDbGC7x1YGy/W2swO4s=
SHA256 (mumble-audiowizard-fix_Werror-0c769d8.patch) =
yE8VQPGskc74dwXR1OnTj+bHsmEsKM0LxqDb6QsxHpA=
SHA256 (mumble-celt-module-43176a1.patch) =
jKgGZF1Ern5qiFYQCQxtJ0BAvbw9eq+UFgPsDVj/9oQ=
SHA256 (mumble-enable-xinput2-904bae1.patch) =
qp+3uz216Y+izrWg1Hh4L+AKLnK9hTv8h0MFVXXUeWE=
SHA256 (mumble-kvm_getprocs-ALL_arg-42ad5ed.patch) =
cC7hausQhddaotgMf1HJaU9G4MG/O+o9xkTv06NPBrY=
SHA256 (mumble-kvm_getprocs-pass-elemsize-ccbacbf.patch) =
dXlMiBCNEQ4oS+sxjjr8W7odlm0UuZVGwiHsLytNS84=
SHA256 (mumble-struct_procinfo-member_prefix-a707213.patch) =
9+fCD2/g+OqQVNfHhQ6r3qRL8cVLpd0bxK37baAwXlA=
-SHA256 (mumble-use-system-rnnoise-d45318d.patch) =
NctW70tU5VLFqTJeTcsWPU9YwmTsrbYHN+S7ZpHW06Q=
-SIZE (mumble-1.4.230.tar.gz) = 9441667
+SIZE (mumble-1.4.274.tar.gz) = 9446657
SIZE (mumble-audiowizard-fix_Werror-0c769d8.patch) = 1938
SIZE (mumble-celt-module-43176a1.patch) = 5162
SIZE (mumble-enable-xinput2-904bae1.patch) = 2023
SIZE (mumble-kvm_getprocs-ALL_arg-42ad5ed.patch) =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 06:49:50 Modified files: sysutils/google-cloud-sdk: Makefile sysutils/google-cloud-sdk/pkg: PLIST Log message: replace MODPY_VERSION with 3.9 in PLIST, and set UPDATE_PLIST_ARGS to avoid update-plist subst'ing it back. ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 05:43:45 Modified files: devel/automake/1.16: Makefile distinfo devel/automake/1.16/patches: patch-Makefile_in patch-bin_automake_in patch-doc_automake_texi Log message: update to automake-1.16.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 05:07:35 Modified files: textproc/libxml: Makefile Added files: textproc/libxml/patches: patch-Makefile_am patch-python_Makefile_am patch-python_tests_Makefile_am patch-xstc_Makefile_am Removed files: textproc/libxml/patches: patch-Makefile_in patch-python_Makefile_in patch-python_tests_Makefile_in patch-xstc_Makefile_in Log message: libxml: use autoreconf instead of autoconf; the bundled aclocal.m4 includes a broken python version check which fails with 2-digit minor i.e. 3.10 ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 04:26:39 Modified files: devel/reposurgeon: Makefile Added files: devel/reposurgeon/patches: patch-vendor_github_com_pkg_term_termios_termios_bsd_go patch-vendor_github_com_pkg_term_termios_termios_go Log message: reposurgeon: respect MAKE_JOBS, pass in -v to "go build", hack away at some parts of github.com/pkg/term/termios unused by reposurgeon which fail to build on i386
Re: UPDATE: security/gpgme
On 2022/08/28 10:50, Rafael Sadowski wrote:
> Update gpgme to 1.18.0, OK?
I have this in my tree but haven't got round to testing dependent ports yet
> diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
> index c7934381aa8..aeea514a306 100644
> --- a/security/gpgme/Makefile
> +++ b/security/gpgme/Makefile
> @@ -1,14 +1,14 @@
> COMMENT-main = GnuPG Made Easy
> COMMENT-qt = Qt bindings for GPGme
>
> -VERSION =1.17.1
> +VERSION =1.18.0
> DISTNAME = gpgme-${VERSION}
> PKGNAME-main = gpgme-${VERSION}
> PKGNAME-qt = gpgme-qt-${VERSION}
>
> CATEGORIES = security devel
>
> -SHARED_LIBS += gpgme23.0 # 37.0
> +SHARED_LIBS += gpgme23.1 # 37.0
> SHARED_LIBS += gpgmepp 2.0 # 20.0
> SHARED_LIBS += qgpgme 1.0 # 14.0
Should be
SHARED_LIBS += gpgme24.0 # 38.0
SHARED_LIBS += gpgmepp 3.0 # 21.0
SHARED_LIBS += qgpgme 2.0 # 16.0
With that, OK as long as it doesn't break deps
$ sqlite3 /usr/local/share/sqlports "select distinct fullpkgpath from wantlib
where value like '%gpgme%'"
mail/claws-mail
mail/claws-mail,
mail/claws-mail,-main
mail/claws-mail,ldap
mail/claws-mail,ldap,-main
mail/gmime30
mail/mu
mail/mutt,gpgme
mail/mutt,gpgme,sasl
mail/neomutt,gpgme
mail/neomutt,gpgme,notmuch
mail/neomutt,gpgme,notmuch,sasl
mail/neomutt,gpgme,sasl
mail/sylpheed
mail/trojita
misc/reprepro
net/dino
net/mcabber
net/pidgin-sipe
net/profanity
productivity/kmymoney
productivity/mcds
security/fwknop
security/gpa
security/gpgme,,-qt
security/gpgme,-qt
security/pinentry-dmenu
security/ruby-gpgme,ruby27
security/ruby-gpgme,ruby30
security/ruby-gpgme,ruby31
x11/gnome/libcryptui
x11/gnome/seahorse
x11/gnome/seahorse-nautilus
x11/gnome/seahorse-sharing
x11/kde-applications/akonadi-import-wizard
x11/kde-applications/akonadiconsole
x11/kde-applications/akregator
x11/kde-applications/grantlee-editor
x11/kde-applications/kdepim-addons
x11/kde-applications/kget
x11/kde-applications/kleopatra
x11/kde-applications/kmail
x11/kde-applications/kmail-account-wizard
x11/kde-applications/libkleo
x11/kde-applications/mailcommon
x11/kde-applications/mbox-importer
x11/kde-applications/messagelib
x11/kde-applications/pim-data-exporter
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/08/28 03:38:30
Modified files:
lang/go: Makefile
Log message:
lang/go: rework do-install target
Instead of "find ... \;", use pax and "find ... {} +". This reduces
"make fake" from several minutes to a few seconds.
ok jsing
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/08/28 03:28:56 Removed files: math/plplot/patches: patch-cmake_modules_csiro_cmake.orig Log message: Remove.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/08/28 03:28:00 Modified files: net/bro: Makefile distinfo Log message: Update to zeek-5.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/08/28 03:08:51 Modified files: sysutils/beats/packetbeat: Makefile Log message: packetbeat: clean cache at end of pre-build to fix build with Go 1.19 maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/08/28 03:06:56 Modified files: net/syncthing : Makefile distinfo Log message: Update syncthing to 1.21.0rc1 to cope with quic-go fallout from edd (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 03:02:45 Modified files: security/yubico: Makefile.inc Log message: yubico changed /releases/ to /Releases/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2022/08/28 02:58:10 Modified files: lang/go: Makefile distinfo lang/go/patches: patch-src_cmd_internal_objabi_reloctype_go patch-src_cmd_internal_objabi_reloctype_string_go patch-src_cmd_link_internal_ld_elf_go patch-src_cmd_link_internal_ld_lib_go patch-src_cmd_link_internal_ld_main_go patch-src_cmd_link_internal_mips64_asm_go patch-src_cmd_link_internal_mips64_obj_go patch-src_runtime_defs_openbsd_mips64_go patch-src_runtime_os_openbsd_syscall1_go patch-src_runtime_os_openbsd_syscall2_go patch-src_runtime_os_openbsd_syscall_go patch-src_runtime_proc_go patch-src_runtime_sys_openbsd2_go patch-src_runtime_sys_openbsd_mips64_s patch-src_syscall_mkall_sh patch-src_syscall_syscall_openbsd1_go patch-src_syscall_zsyscall_openbsd_mips64_go lang/go/pkg: PLIST Removed files: lang/go/patches: patch-src_cmd_link_internal_arm64_obj_go patch-src_cmd_link_internal_riscv64_obj_go Log message: Update lang/go to Go 1.19. ok tb@
UPDATE: security/gpgme
Update gpgme to 1.18.0, OK?
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index c7934381aa8..aeea514a306 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,14 +1,14 @@
COMMENT-main = GnuPG Made Easy
COMMENT-qt = Qt bindings for GPGme
-VERSION = 1.17.1
+VERSION = 1.18.0
DISTNAME = gpgme-${VERSION}
PKGNAME-main = gpgme-${VERSION}
PKGNAME-qt = gpgme-qt-${VERSION}
CATEGORIES = security devel
-SHARED_LIBS += gpgme23.0 # 37.0
+SHARED_LIBS += gpgme23.1 # 37.0
SHARED_LIBS += gpgmepp 2.0 # 20.0
SHARED_LIBS += qgpgme 1.0 # 14.0
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 7c8cbabc736..403ffe889b2 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpgme-1.17.1.tar.bz2) = cR6r9d1mG5sEvp7cms4qe8Ax9r2dN6do0C0O/e8Qj18=
-SIZE (gpgme-1.17.1.tar.bz2) = 1747692
+SHA256 (gpgme-1.18.0.tar.bz2) = Nh1OrkfOkl26DqVpr0DntSxkXEri5l5WIb8bbN2LDp4=
+SIZE (gpgme-1.18.0.tar.bz2) = 1762323
diff --git a/security/gpgme/patches/patch-configure
b/security/gpgme/patches/patch-configure
index 5013d429118..554f26029c7 100644
--- a/security/gpgme/patches/patch-configure
+++ b/security/gpgme/patches/patch-configure
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -25152,7 +25152,6 @@ $as_echo "$_gcc_wopt" >&6; }
+@@ -25296,7 +25296,6 @@ $as_echo "$_gcc_wopt" >&6; }
CFLAGS="$CFLAGS -Wno-missing-field-initializers"
CFLAGS="$CFLAGS -Wno-sign-compare"
CFLAGS="$CFLAGS -Wno-format-zero-length"
diff --git a/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
b/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
index 5af8992374a..dfe1904a6cb 100644
--- a/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
+++ b/security/gpgme/patches/patch-lang_cpp_tests_Makefile_in
@@ -3,7 +3,7 @@
Index: lang/cpp/tests/Makefile.in
--- lang/cpp/tests/Makefile.in.orig
+++ lang/cpp/tests/Makefile.in
-@@ -426,7 +426,7 @@ top_srcdir = @top_srcdir@
+@@ -428,7 +428,7 @@ top_srcdir = @top_srcdir@
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la \
../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
diff --git a/security/gpgme/patches/patch-lang_qt_Makefile_in
b/security/gpgme/patches/patch-lang_qt_Makefile_in
index ebe550ad087..e37fa31f1b6 100644
--- a/security/gpgme/patches/patch-lang_qt_Makefile_in
+++ b/security/gpgme/patches/patch-lang_qt_Makefile_in
@@ -4,7 +4,7 @@ don't allow doxygen to run even if installed, something with
the files
Index: lang/qt/Makefile.in
--- lang/qt/Makefile.in.orig
+++ lang/qt/Makefile.in
-@@ -410,7 +410,7 @@ top_builddir = @top_builddir@
+@@ -412,7 +412,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@RUN_GPG_TESTS_FALSE@tests =
@RUN_GPG_TESTS_TRUE@tests = tests
diff --git a/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
b/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
index 78c98ac427d..b15e6d65aaa 100644
--- a/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
+++ b/security/gpgme/patches/patch-lang_qt_tests_Makefile_in
@@ -1,7 +1,7 @@
Index: lang/qt/tests/Makefile.in
--- lang/qt/tests/Makefile.in.orig
+++ lang/qt/tests/Makefile.in
-@@ -601,7 +601,7 @@ moc_files = \
+@@ -628,7 +628,7 @@ moc_files = \
AM_LDFLAGS = -no-install
LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
diff --git a/security/gpgme/pkg/PLIST-qt b/security/gpgme/pkg/PLIST-qt
index 25dcdf800a1..dbcb07ef0bc 100644
--- a/security/gpgme/pkg/PLIST-qt
+++ b/security/gpgme/pkg/PLIST-qt
@@ -31,6 +31,8 @@ include/QGpgME/QGpgMENewCryptoConfig
include/QGpgME/QuickJob
include/QGpgME/ReceiveKeysJob
include/QGpgME/RefreshKeysJob
+include/QGpgME/RevokeKeyJob
+include/QGpgME/SetPrimaryUserIDJob
include/QGpgME/SignEncryptJob
include/QGpgME/SignJob
include/QGpgME/SignKeyJob
@@ -61,6 +63,7 @@ include/gpgme++/gpggencardkeyinteractor.h
include/gpgme++/gpgmefw.h
include/gpgme++/gpgmepp_export.h
include/gpgme++/gpgmepp_version.h
+include/gpgme++/gpgrevokekeyeditinteractor.h
include/gpgme++/gpgsetexpirytimeeditinteractor.h
include/gpgme++/gpgsetownertrusteditinteractor.h
include/gpgme++/gpgsignkeyeditinteractor.h
@@ -119,6 +122,8 @@ include/qgpgme/qgpgmenewcryptoconfig.h
include/qgpgme/quickjob.h
include/qgpgme/receivekeysjob.h
include/qgpgme/refreshkeysjob.h
+include/qgpgme/revokekeyjob.h
+include/qgpgme/setprimaryuseridjob.h
include/qgpgme/signencryptjob.h
include/qgpgme/signjob.h
include/qgpgme/signkeyjob.h
@@ -129,7 +134,6 @@ include/qgpgme/verifyopaquejob.h
include/qgpgme/wkdlookupjob.h
include/qgpgme/wkdlookupresult.h
include/qgpgme/wkspublishjob.h
-lib/cmake/
lib/cmake/Gpgmepp/
lib/cmake/Gpgmepp/GpgmeppConfig.cmake
lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/08/28 02:26:12 Modified files: devel/py-mock : Makefile Log message: remove py2 parts in py-mock (the port already changed to py3-only but some parts were missed), ok kmos@
