fix ucblogo comment and license
The comment looks a bit odd.
And I think the license is GPL not BSD?
ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/ucblogo/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile12 Jul 2019 20:47:24 - 1.19
+++ Makefile18 Oct 2020 04:29:08 -
@@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.19 2019/07/12 20:47:24 sthen Exp $
-COMMENT= Berkeley's implementation of the logo programming language#'
+COMMENT= Berkeley's implementation of the logo programming language
DISTNAME= ucblogo-6.0
DISTFILES= ${DISTNAME}{ucblogo}${EXTRACT_SUFX}
+REVISION= 0
CATEGORIES=lang
HOMEPAGE= https://people.eecs.berkeley.edu/~bh/logo.html
MASTER_SITES= https://people.eecs.berkeley.edu/~bh/downloads/
-# BSD
+# GPLv2+
PERMIT_PACKAGE=Yes
WANTLIB += ICE SM X11 c curses m
Re: [New] sysutils/autorandr
Klemens Nanni writes: >> Checkpatch is clean. > Do you mean portcheck(1)? Yes, sorry. >> Any feedback greatly appreciated. > Please submit new ports as tarball of the ports directory. Noted. The rest I will work on and resubmit. Thanks for the review. - ajf
Re: [New] sysutils/autorandr
On Sat, Oct 17, 2020 at 09:36:34PM -0400, Ashton Fagg wrote:
> This is a new port for autorandr. This is a simple-ish Python script
> that wraps xrandr and lets you automate xrandr actions as you unplug
> monitors etc.
>
> Tested on my machine (amd64) running current. Port patches, builds and
> installs successfully. Installed executable runs, `man autorandr` also
> works.
>
> Checkpatch is clean.
Do you mean portcheck(1)?
> Any feedback greatly appreciated.
Please submit new ports as tarball of the ports directory.
> --- /dev/null
> +++ b/sysutils/autorandr/Makefile
> @@ -0,0 +1,29 @@
> +# $OpenBSD: Makefile,v 1.13 2019/11/10 16:25:41 kmos Exp $
> +
> +COMMENT= automates xrandr calls based on connect devices
> +
> +MODPY_EGG_VERSION= 1.10.1
You can merge that right into GH_TAGNAME.
> +DISTNAME=autorandr-${MODPY_EGG_VERSION}
GH_* sets DISTNAME and PKGNAME automatically so only set them manually
when required (not here).
> +CATEGORIES= sysutils
"x11" could do as second category.
> +
> +GH_ACCOUNT=phillipberndt
> +GH_PROJECT=autorandr
> +GH_TAGNAME=${MODPY_EGG_VERSION}
> +
> +# GPLv3
> +PERMIT_PACKAGE= Yes
> +
> +MAINTAINER=Ashton Fagg
> +
> +MODULES= lang/python
> +MODPY_SETUPTOOLS = Yes
New ports should be using Python 3, i.e.
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
> --- /dev/null
> +++ b/sysutils/autorandr/patches/patch-autorandr_py
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +
> +Index: autorandr.py
> +--- autorandr.py.orig
> autorandr.py
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/bin/env python2
Use MODPY_ADJ_FILES, see port-modules(5).
> --- /dev/null
> +++ b/sysutils/autorandr/pkg/DESCR
> @@ -0,0 +1 @@
> +Automates xrandr actions.
This is not a description, even COMMENT contains more information.
Please be more elaborate so that `pkg_info autorandr' will tell users
what to expect from this package before they install it.
[New] sysutils/autorandr
This is a new port for autorandr. This is a simple-ish Python script
that wraps xrandr and lets you automate xrandr actions as you unplug
monitors etc.
Tested on my machine (amd64) running current. Port patches, builds and
installs successfully. Installed executable runs, `man autorandr` also
works.
Checkpatch is clean.
Any feedback greatly appreciated.
- ajf
diff --git a/sysutils/autorandr/Makefile b/sysutils/autorandr/Makefile
new file mode 100644
index 000..6b94a3e6cb8
--- /dev/null
+++ b/sysutils/autorandr/Makefile
@@ -0,0 +1,29 @@
+# $OpenBSD: Makefile,v 1.13 2019/11/10 16:25:41 kmos Exp $
+
+COMMENT= automates xrandr calls based on connect devices
+
+MODPY_EGG_VERSION= 1.10.1
+DISTNAME= autorandr-${MODPY_EGG_VERSION}
+CATEGORIES=sysutils
+
+GH_ACCOUNT=phillipberndt
+GH_PROJECT=autorandr
+GH_TAGNAME=${MODPY_EGG_VERSION}
+
+# GPLv3
+PERMIT_PACKAGE=Yes
+
+MAINTAINER=Ashton Fagg
+
+MODULES= lang/python
+MODPY_SETUPTOOLS = Yes
+
+# No tests provided by upstream.
+NO_TEST= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/autorandr.py ${PREFIX}/bin/autorandr
+ ${INSTALL_MAN} ${WRKSRC}/autorandr.1 ${PREFIX}/man/man1/autorandr.1
+
+
+.include
diff --git a/sysutils/autorandr/distinfo b/sysutils/autorandr/distinfo
new file mode 100644
index 000..b1bbff68d4b
--- /dev/null
+++ b/sysutils/autorandr/distinfo
@@ -0,0 +1,2 @@
+SHA256 (autorandr-1.10.1.tar.gz) = Iw+589W/VEolR8Advdo5gSlEzdVGWmebuWF2nH3bVSw=
+SIZE (autorandr-1.10.1.tar.gz) = 48043
diff --git a/sysutils/autorandr/patches/patch-autorandr_py
b/sysutils/autorandr/patches/patch-autorandr_py
new file mode 100644
index 000..0823effa05c
--- /dev/null
+++ b/sysutils/autorandr/patches/patch-autorandr_py
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: autorandr.py
+--- autorandr.py.orig
autorandr.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # encoding: utf-8
+ #
+ # autorandr.py
diff --git a/sysutils/autorandr/pkg/DESCR b/sysutils/autorandr/pkg/DESCR
new file mode 100644
index 000..770c46b8094
--- /dev/null
+++ b/sysutils/autorandr/pkg/DESCR
@@ -0,0 +1 @@
+Automates xrandr actions.
diff --git a/sysutils/autorandr/pkg/PLIST b/sysutils/autorandr/pkg/PLIST
new file mode 100644
index 000..2e887db21a3
--- /dev/null
+++ b/sysutils/autorandr/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v$
+bin/autorandr
+@man man/man1/autorandr.1
[maintainer update] archivers/pecl-lzf
hello,
minor update from 1.6.7 to 1.6.8 which includes a fix for filter
protoypes for 7.2+
built / packaged / passes tests on amd64, I don't actively use this
anymore though so I have no real world tests.
thanks,
.jh
Index: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- pecl-lzf/Makefile 11 Dec 2019 16:08:29 - 1.23
+++ pecl-lzf/Makefile 17 Oct 2020 23:35:22 -
@@ -2,9 +2,8 @@
COMMENT = PHP support for LZF de/compression
-DISTNAME = LZF-1.6.7
+DISTNAME = LZF-1.6.8
CATEGORIES = archivers
-REVISION = 0
MAINTAINER = Johan Huldtgren
# PHP
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- pecl-lzf/distinfo 4 Mar 2019 10:37:19 - 1.6
+++ pecl-lzf/distinfo 17 Oct 2020 23:35:22 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.7.tgz) = SBeNokQBl2+KxRiQUiKvZMAz9J8qUNgw5V3hP6gOj+A=
-SIZE (LZF-1.6.7.tgz) = 17999
+SHA256 (LZF-1.6.8.tgz) = jhwu0hFDmnj277gBFqH7C/JK7C9lnpBmm48D7YFC9Yk=
+SIZE (LZF-1.6.8.tgz) = 18071
Index: pecl-lzf/pkg/PLIST
===
RCS file: /cvs/ports/archivers/pecl-lzf/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pecl-lzf/pkg/PLIST 11 Dec 2019 16:08:29 - 1.6
+++ pecl-lzf/pkg/PLIST 17 Oct 2020 23:35:22 -
@@ -5,6 +5,6 @@ ${MODPECL_DEFAULTV}@pkgpath archivers/pe
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php70
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
-lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
+@so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/10/17 17:27:03 Modified files: devel/py-setuptools: Makefile Log message: Make tests work reliably. Add missing TEST_DEPENDS. Remove test_virtualenv.py before tests since it requires unported modules
Re: gnupg: avoid printf %n in build process
On Sat, Oct 17, 2020 at 03:50:24PM -0700, Greg Steuck wrote: > > warning: type specifier missing, defaults to 'int' [-Wimplicit-int] > > Thanks Bryan! I was about to post the same updated diff. `int` is the correct type :) I've now tested this, diffing the generated file before and after. LGTM. What do others think? Is this worth putting in? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
[New] sysutils/direnv
Hello folks,
I have created a port of direnv (https://direnv.net). It is a utility
(written in Go) that hooks onto your shell, and lets you define
project specific environments.
Portcheck is clean. The package builds successfully, I was able to
pkg_add it to my machine and test it (amd64 with zsh).
There is a small example on the github page, I was able to confirm
that it is working. `man direnv` and related pages also work.
Any suggestions appreciated. Thanks.
diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile
new file mode 100644
index 000..345705be866
--- /dev/null
+++ b/sysutils/direnv/Makefile
@@ -0,0 +1,48 @@
+# $OpenBSD: Makefile.template,v 1.88 2020/05/15 01:32:48 abieber Exp $
+
+COMMENT = tool for managing environment based on current directory
+
+GH_ACCOUNT = direnv
+GH_PROJECT = direnv
+VERSION = 2.23.0
+GH_TAGNAME = v${VERSION}
+
+MAINTAINER= Ashton Fagg
+CATEGORIES = sysutils devel
+HOMEPAGE = https://direnv.net
+
+# MIT
+PERMIT_PACKAGE = Yes
+
+WANTLIB = c pthread
+
+USE_GMAKE =Yes
+
+MODULES= lang/go
+
+pre-build: remove-github-actions
+
+do-build:
+ cd ${WRKSRC}; ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
+
+# This removes some unneeded stuff. These are just
+# Github CI hooks.
+remove-github-actions:
+ rm -rf ${WRKSRC}/script
+
+do-install:
+ $(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
+ $(INSTALL_MAN) \
+ $(WRKSRC)/man/direnv.1 $(PREFIX)/man/man1/direnv.1
+ $(INSTALL_MAN) \
+ $(WRKSRC)/man/direnv-stdlib.1 $(PREFIX)/man/man1/direnv-stdlib.1
+ $(INSTALL_MAN) \
+ $(WRKSRC)/man/direnv-fetchurl.1
$(PREFIX)/man/man1/direnv-fetchurl.1
+ $(INSTALL_MAN) \
+ $(WRKSRC)/man/direnv.toml.1 $(PREFIX)/man/man1/direnv.toml.1
+
+do-test:
+ cd ${WRKSRC};
+ ${MODGO_CMD} test github.com/direnv/direnv/...
+
+.include
diff --git a/sysutils/direnv/distinfo b/sysutils/direnv/distinfo
new file mode 100644
index 000..e068918c6f2
--- /dev/null
+++ b/sysutils/direnv/distinfo
@@ -0,0 +1,2 @@
+SHA256 (direnv-2.23.0.tar.gz) = 0ovJWWgKMJ0NVPdU7f5iLN3hSkuAb90y0oXUejIgmLk=
+SIZE (direnv-2.23.0.tar.gz) = 1349546
diff --git a/sysutils/direnv/pkg/DESCR b/sysutils/direnv/pkg/DESCR
new file mode 100644
index 000..3c433d4d887
--- /dev/null
+++ b/sysutils/direnv/pkg/DESCR
@@ -0,0 +1,12 @@
+direnv is an extension for POSIX shells that adds the ability to modify
+the environment based on the current working directory.
+
+Before each prompt, direnv checks for the existence of .envrc in the current
+and parent directories. If the file exists, and is authorized, it is loaded
into
+a bash sub-shell and all exported variables are then captured by direnv and
made
+available to the current shell.
+
+This allows for project specific environment variables to be defined without
+cluttering .profile.
+
+Supports common shells such as bash, zsh, fish, tcsh, elvish.
diff --git a/sysutils/direnv/pkg/PLIST b/sysutils/direnv/pkg/PLIST
new file mode 100644
index 000..b5e197b94d6
--- /dev/null
+++ b/sysutils/direnv/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v$
+@bin bin/direnv
+@man man/man1/direnv-fetchurl.1
+@man man/man1/direnv-stdlib.1
+@man man/man1/direnv.1
+@man man/man1/direnv.toml.1
Re: gnupg: avoid printf %n in build process
Bryan Steele writes:
> No comments about the diff, but shouldn't there be some type here?
>
> clang complains.
>
> warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
Thanks Bryan!
This is so embarrassing. I blame gcc 4.2.1 which silently let this
lunacy through. I developed the patch outside of ports and ./configure
used /usr/bin/gcc by default. Compiling the port surfaces the problem as
you reported... along with 10 other warnings drowning the important
piece.
Thanks
Greg
>From 50687a42962b7eeca3568b2203ec688a75d28dff Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Tue, 13 Oct 2020 20:59:24 -0700
Subject: [PATCH] Replace printf %n with a simple local computation.
---
security/gnupg/Makefile | 2 +-
security/gnupg/patches/patch-doc_mkdefsinc_c | 28
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 security/gnupg/patches/patch-doc_mkdefsinc_c
diff --git security/gnupg/Makefile security/gnupg/Makefile
index 8a954cf5368..7a46e7eade1 100644
--- security/gnupg/Makefile
+++ security/gnupg/Makefile
@@ -3,7 +3,7 @@
COMMENT = GNU privacy guard - a free PGP replacement
DISTNAME = gnupg-2.2.23
-REVISION = 1
+REVISION = 2
CATEGORIES = security
MASTER_SITES = ${MASTER_SITE_GNUPG:=gnupg/}
diff --git security/gnupg/patches/patch-doc_mkdefsinc_c security/gnupg/patches/patch-doc_mkdefsinc_c
new file mode 100644
index 000..cd0b57e17dc
--- /dev/null
+++ security/gnupg/patches/patch-doc_mkdefsinc_c
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Avoid %n in snprintf.
+
+Index: doc/mkdefsinc.c
+--- doc/mkdefsinc.c.orig
doc/mkdefsinc.c
+@@ -268,6 +268,7 @@ main (int argc, char **argv)
+ else
+ {
+ const char *month = "?";
++ const int day_of_month = atoi (opt_date+8);
+
+ switch (atoi (opt_date+5))
+ {
+@@ -286,10 +287,10 @@ main (int argc, char **argv)
+ }
+ n = strlen (opt_date) + strlen (month) + 2 + 1;
+ p = xmalloc (n);
+- snprintf (p, n, "%d %n%s %d",
+-atoi (opt_date+8), , month, atoi (opt_date));
++ snprintf (p, n, "%d %s %d", day_of_month, month, atoi (opt_date));
+ xfree (opt_date);
+ opt_date = p;
++ monthoff = 1 + ((day_of_month > 9) ? 2 : 1); /* good enough log base 10 */
+ }
+
+
--
2.28.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/10/17 16:25:31 Modified files: multimedia : Makefile Log message: Follow up on "Move from MODPY_DEFAULT_VERSION_3 to python3 FLAVOR" from ajacoutot
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 15:40:32 Modified files: audio/xmms2: Makefile audio/xmms2/pkg: PLIST Log message: drop pyrex BDEP from xmms2 xmms2 seems to have moved on from pyrex to cython quite some time ago. Apparently no need to replace the BDEP on pyrex with a BDEP on cython since do-configure already uses "--no-cython" which nigel@ added back in 2014. Tested on amd64 by myself and by kmos@. ok kmos@
Re: pyrex isn't needed by audio/xmms2
On Sat, Oct 17, 2020 at 03:39:45PM -0400, Daniel Dickman wrote:
> pyrex was added as a BDEP for xmms2 in Makefile r1.3. My guess is that an
> earlier version of xmms2 may have needed it.
> This BDEP seems to have been cargo-culted forward over the years. Looking
> in INSTALL I see that cython is mentioned rather than pyrex. Presumably
> that means xmms2 had switched from pyrex -> cython by the time the ports
> tree got version 0.8 of xmms2 back in 2012.
> I confirmed xmms2 builds fine without pyrex.
> Looking in the Makefile I see do-configure: has the "--no-cython" option
> so don't seem to need to replace the pyrex BDEP with a cython BDEP.
> ok?
Works fine for me on amd64.
ok kmos
--Kurt
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/xmms2/Makefile,v
> retrieving revision 1.53
> diff -u -p -u -r1.53 Makefile
> --- Makefile 24 Feb 2020 09:32:38 - 1.53
> +++ Makefile 17 Oct 2020 19:22:42 -
> @@ -5,7 +5,7 @@ COMMENT = audio player daemon with libr
> V = 0.8
> DISTNAME = xmms2-${V}DrO_o
> PKGNAME =xmms2-${V}
> -REVISION = 13
> +REVISION = 14
>
> SHARED_LIBS += xmmsclient++2.0 # 4.0.0
> SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
> @@ -36,8 +36,7 @@ MODULES = lang/python \
>
> NO_TEST =Yes
>
> -BUILD_DEPENDS = devel/pyrex \
> - devel/boost
> +BUILD_DEPENDS = devel/boost
>
> LIB_DEPENDS =devel/glib2 \
> databases/sqlite3 \
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/xmms2/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 PLIST
> --- pkg/PLIST 18 Jul 2018 19:36:37 - 1.7
> +++ pkg/PLIST 17 Oct 2020 19:22:42 -
> @@ -97,43 +97,43 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/xmmsclient/propdict.py
> lib/python${MODPY_VERSION}/site-packages/xmmsclient/qt3.py
> lib/python${MODPY_VERSION}/site-packages/xmmsclient/sync.py
> -lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsapi.so
> -lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsvalue.so
> +@so lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsapi.so
> +@so lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsvalue.so
> lib/xmms2/
> -lib/xmms2/libxmms_ao.so
> -lib/xmms2/libxmms_apefile.so
> -lib/xmms2/libxmms_asf.so
> -lib/xmms2/libxmms_asx.so
> -lib/xmms2/libxmms_avcodec.so
> -lib/xmms2/libxmms_cue.so
> -lib/xmms2/libxmms_curl.so
> -lib/xmms2/libxmms_daap.so
> -lib/xmms2/libxmms_diskwrite.so
> -lib/xmms2/libxmms_equalizer.so
> -lib/xmms2/libxmms_file.so
> -lib/xmms2/libxmms_flac.so
> -lib/xmms2/libxmms_flv.so
> -lib/xmms2/libxmms_gvfs.so
> -lib/xmms2/libxmms_html.so
> -lib/xmms2/libxmms_icymetaint.so
> -lib/xmms2/libxmms_id3v2.so
> -lib/xmms2/libxmms_jack.so
> -lib/xmms2/libxmms_karaoke.so
> -lib/xmms2/libxmms_m3u.so
> -lib/xmms2/libxmms_mp4.so
> -lib/xmms2/libxmms_mpg123.so
> -lib/xmms2/libxmms_normalize.so
> -lib/xmms2/libxmms_null.so
> -lib/xmms2/libxmms_nulstripper.so
> -lib/xmms2/libxmms_pls.so
> -lib/xmms2/libxmms_replaygain.so
> -lib/xmms2/libxmms_rss.so
> -lib/xmms2/libxmms_sndfile.so
> -lib/xmms2/libxmms_tta.so
> -lib/xmms2/libxmms_vorbis.so
> -lib/xmms2/libxmms_wave.so
> -lib/xmms2/libxmms_xml.so
> -lib/xmms2/libxmms_xspf.so
> +@so lib/xmms2/libxmms_ao.so
> +@so lib/xmms2/libxmms_apefile.so
> +@so lib/xmms2/libxmms_asf.so
> +@so lib/xmms2/libxmms_asx.so
> +@so lib/xmms2/libxmms_avcodec.so
> +@so lib/xmms2/libxmms_cue.so
> +@so lib/xmms2/libxmms_curl.so
> +@so lib/xmms2/libxmms_daap.so
> +@so lib/xmms2/libxmms_diskwrite.so
> +@so lib/xmms2/libxmms_equalizer.so
> +@so lib/xmms2/libxmms_file.so
> +@so lib/xmms2/libxmms_flac.so
> +@so lib/xmms2/libxmms_flv.so
> +@so lib/xmms2/libxmms_gvfs.so
> +@so lib/xmms2/libxmms_html.so
> +@so lib/xmms2/libxmms_icymetaint.so
> +@so lib/xmms2/libxmms_id3v2.so
> +@so lib/xmms2/libxmms_jack.so
> +@so lib/xmms2/libxmms_karaoke.so
> +@so lib/xmms2/libxmms_m3u.so
> +@so lib/xmms2/libxmms_mp4.so
> +@so lib/xmms2/libxmms_mpg123.so
> +@so lib/xmms2/libxmms_normalize.so
> +@so lib/xmms2/libxmms_null.so
> +@so lib/xmms2/libxmms_nulstripper.so
> +@so lib/xmms2/libxmms_pls.so
> +@so lib/xmms2/libxmms_replaygain.so
> +@so lib/xmms2/libxmms_rss.so
> +@so lib/xmms2/libxmms_sndfile.so
> +@so lib/xmms2/libxmms_tta.so
> +@so lib/xmms2/libxmms_vorbis.so
> +@so lib/xmms2/libxmms_wave.so
> +@so lib/xmms2/libxmms_xml.so
> +@so lib/xmms2/libxmms_xspf.so
> ${P5ARCH}/
> ${P5ARCH}/Audio/
> ${P5ARCH}/Audio/XMMSClient/
> @@ -148,7 +148,7 @@ ${P5ARCH}/Audio/XMMSClient/Sync.pm
> ${P5ARCH}/auto/
> ${P5ARCH}/auto/Audio/
> ${P5ARCH}/auto/Audio/XMMSClient/
> -${P5ARCH}/auto/Audio/XMMSClient/XMMSClient.so
> +@so ${P5ARCH}/auto/Audio/XMMSClient/XMMSClient.so
pyrex isn't needed by audio/xmms2
pyrex was added as a BDEP for xmms2 in Makefile r1.3. My guess is that an
earlier version of xmms2 may have needed it.
This BDEP seems to have been cargo-culted forward over the years. Looking
in INSTALL I see that cython is mentioned rather than pyrex. Presumably
that means xmms2 had switched from pyrex -> cython by the time the ports
tree got version 0.8 of xmms2 back in 2012.
I confirmed xmms2 builds fine without pyrex.
Looking in the Makefile I see do-configure: has the "--no-cython" option
so don't seem to need to replace the pyrex BDEP with a cython BDEP.
ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile
--- Makefile24 Feb 2020 09:32:38 - 1.53
+++ Makefile17 Oct 2020 19:22:42 -
@@ -5,7 +5,7 @@ COMMENT = audio player daemon with libr
V =0.8
DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
-REVISION = 13
+REVISION = 14
SHARED_LIBS += xmmsclient++2.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
@@ -36,8 +36,7 @@ MODULES = lang/python \
NO_TEST = Yes
-BUILD_DEPENDS =devel/pyrex \
- devel/boost
+BUILD_DEPENDS =devel/boost
LIB_DEPENDS = devel/glib2 \
databases/sqlite3 \
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/xmms2/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST 18 Jul 2018 19:36:37 - 1.7
+++ pkg/PLIST 17 Oct 2020 19:22:42 -
@@ -97,43 +97,43 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/xmmsclient/propdict.py
lib/python${MODPY_VERSION}/site-packages/xmmsclient/qt3.py
lib/python${MODPY_VERSION}/site-packages/xmmsclient/sync.py
-lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsapi.so
-lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsvalue.so
+@so lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsapi.so
+@so lib/python${MODPY_VERSION}/site-packages/xmmsclient/xmmsvalue.so
lib/xmms2/
-lib/xmms2/libxmms_ao.so
-lib/xmms2/libxmms_apefile.so
-lib/xmms2/libxmms_asf.so
-lib/xmms2/libxmms_asx.so
-lib/xmms2/libxmms_avcodec.so
-lib/xmms2/libxmms_cue.so
-lib/xmms2/libxmms_curl.so
-lib/xmms2/libxmms_daap.so
-lib/xmms2/libxmms_diskwrite.so
-lib/xmms2/libxmms_equalizer.so
-lib/xmms2/libxmms_file.so
-lib/xmms2/libxmms_flac.so
-lib/xmms2/libxmms_flv.so
-lib/xmms2/libxmms_gvfs.so
-lib/xmms2/libxmms_html.so
-lib/xmms2/libxmms_icymetaint.so
-lib/xmms2/libxmms_id3v2.so
-lib/xmms2/libxmms_jack.so
-lib/xmms2/libxmms_karaoke.so
-lib/xmms2/libxmms_m3u.so
-lib/xmms2/libxmms_mp4.so
-lib/xmms2/libxmms_mpg123.so
-lib/xmms2/libxmms_normalize.so
-lib/xmms2/libxmms_null.so
-lib/xmms2/libxmms_nulstripper.so
-lib/xmms2/libxmms_pls.so
-lib/xmms2/libxmms_replaygain.so
-lib/xmms2/libxmms_rss.so
-lib/xmms2/libxmms_sndfile.so
-lib/xmms2/libxmms_tta.so
-lib/xmms2/libxmms_vorbis.so
-lib/xmms2/libxmms_wave.so
-lib/xmms2/libxmms_xml.so
-lib/xmms2/libxmms_xspf.so
+@so lib/xmms2/libxmms_ao.so
+@so lib/xmms2/libxmms_apefile.so
+@so lib/xmms2/libxmms_asf.so
+@so lib/xmms2/libxmms_asx.so
+@so lib/xmms2/libxmms_avcodec.so
+@so lib/xmms2/libxmms_cue.so
+@so lib/xmms2/libxmms_curl.so
+@so lib/xmms2/libxmms_daap.so
+@so lib/xmms2/libxmms_diskwrite.so
+@so lib/xmms2/libxmms_equalizer.so
+@so lib/xmms2/libxmms_file.so
+@so lib/xmms2/libxmms_flac.so
+@so lib/xmms2/libxmms_flv.so
+@so lib/xmms2/libxmms_gvfs.so
+@so lib/xmms2/libxmms_html.so
+@so lib/xmms2/libxmms_icymetaint.so
+@so lib/xmms2/libxmms_id3v2.so
+@so lib/xmms2/libxmms_jack.so
+@so lib/xmms2/libxmms_karaoke.so
+@so lib/xmms2/libxmms_m3u.so
+@so lib/xmms2/libxmms_mp4.so
+@so lib/xmms2/libxmms_mpg123.so
+@so lib/xmms2/libxmms_normalize.so
+@so lib/xmms2/libxmms_null.so
+@so lib/xmms2/libxmms_nulstripper.so
+@so lib/xmms2/libxmms_pls.so
+@so lib/xmms2/libxmms_replaygain.so
+@so lib/xmms2/libxmms_rss.so
+@so lib/xmms2/libxmms_sndfile.so
+@so lib/xmms2/libxmms_tta.so
+@so lib/xmms2/libxmms_vorbis.so
+@so lib/xmms2/libxmms_wave.so
+@so lib/xmms2/libxmms_xml.so
+@so lib/xmms2/libxmms_xspf.so
${P5ARCH}/
${P5ARCH}/Audio/
${P5ARCH}/Audio/XMMSClient/
@@ -148,7 +148,7 @@ ${P5ARCH}/Audio/XMMSClient/Sync.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Audio/
${P5ARCH}/auto/Audio/XMMSClient/
-${P5ARCH}/auto/Audio/XMMSClient/XMMSClient.so
+@so ${P5ARCH}/auto/Audio/XMMSClient/XMMSClient.so
@man man/man1/xmms2-et.1
@man man/man1/xmms2-launcher.1
@man man/man1/xmms2-mdns-avahi.1
Re: remove math/py-Numeric
On Sat, Oct 17, 2020 at 02:52:40PM -0400, Daniel Dickman wrote: > numpy superceded numeric a long time ago so I'm proposing to remove > py-Numeric. > There are no more consumers of py-Numeric in the latest tree. > ok? ok kmos --Kurt
remove math/py-Numeric
numpy superceded numeric a long time ago so I'm proposing to remove
py-Numeric.
There are no more consumers of py-Numeric in the latest tree.
ok?
Index: math/Makefile
===
RCS file: /cvs/ports/math/Makefile,v
retrieving revision 1.195
diff -u -p -u -r1.195 Makefile
--- math/Makefile 12 Oct 2020 22:04:32 - 1.195
+++ math/Makefile 17 Oct 2020 18:41:53 -
@@ -117,7 +117,6 @@
SUBDIR += plplot
SUBDIR += prover9
SUBDIR += pspp
- SUBDIR += py-Numeric
SUBDIR += py-PyWavelets,python3
SUBDIR += py-affine
SUBDIR += py-affine,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1067
diff -u -p -u -r1.1067 Makefile
--- devel/quirks/Makefile 17 Oct 2020 12:59:19 - 1.1067
+++ devel/quirks/Makefile 17 Oct 2020 18:41:53 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.459
+PKGNAME = quirks-3.460
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1085
diff -u -p -u -r1.1085 Quirks.pm
--- devel/quirks/files/Quirks.pm17 Oct 2020 12:59:19 - 1.1085
+++ devel/quirks/files/Quirks.pm17 Oct 2020 18:41:53 -
@@ -1884,6 +1884,7 @@ my $obsolete_reason = {
'ndesk-dbus' => 5,
'ndesk-dbus-glib' => 5,
'mono-xsp' => 5,
+ 'py-Numeric' => 3,
};
# reasons for obsolete packages
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 12:20:35 Modified files: games/mysticmine: Makefile distinfo games/mysticmine/pkg: PLIST Added files: games/mysticmine/patches: patch-monorail_monorail_py patch-setup_py Log message: use cython instead of pyrex in mysticmine pyrex is used for a single .pyx file. Since development on this game seems to have stopped we could pre-generate a static copy of ai.c so we can drop the pyrex dependency. However, it turns out that the pyrex code is similar enough to modern cython, that we can just swap pyrex for cython. This seems to work... While here: - remove pyrex as an RDEP, not sure why that was ever needed - fix the locale-related crasher so the game doesn't just bail at startup - update to what looks like the final github commit (from July 2016) - s/koonsolo/dewitters/ as requested by kmos@ - regenerate PLIST Tested by myself on amd64 ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 12:05:50 ports/games/mysticmine/patches Update of /cvs/ports/games/mysticmine/patches In directory cvs.openbsd.org:/tmp/cvs-serv9049/patches Log Message: Directory /cvs/ports/games/mysticmine/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 11:13:19 Modified files: devel/pyrex: Makefile devel/pyrex/patches: patch-Demos_Makefile devel/pyrex/pkg: PLIST Added files: devel/pyrex/patches: patch-Demos_Setup_py Log message: remove py-Numeric as a TDEP py-Numeric doesn't seem to be needed for pyrex itself, only for a single example script that's used in the regress tests. Remove that example so we can drop the py-Numeric dependency. ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 11:06:17 Modified files: devel/pygame : Makefile devel/pygame/pkg: PLIST Log message: drop py-Numeric as a BDEP and a few other tweaks - WHATSNEW says that support for py-Numeric was removed in 2016 - re-enable pypi as a download source - regenerate PLIST while here ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/10/17 10:58:42 Modified files: games/angrydd : Makefile Log message: fix angrydd crashing when numpy is missing at runtime Way back in the mists of time, steven@ noticed that angrydd crashes without py-Numeric. This is because angrydd uses surfarray from pygame, and older versions of pygame needed py-Numeric at runtime for the surfarray module. These days, pygame transitioned from py-Numeric to py-numpy so fix the RDEP for angrydd. Confirmed by me that angrydd does indeed crash if py-numpy is missing. ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/10/17 10:48:43 Modified files: sysutils/firmware/urtwn: Makefile Log message: Use EXTRACT_FILES No PLIST change, WRKSRC shrinks from 283M to 1.1M
Re: print/py-relatorio switch to py3-only
On Sat, Oct 17, 2020 at 05:50:07PM +0200, Sebastien Marie wrote:
> On Sat, Oct 17, 2020 at 05:24:58PM +0200, Antoine Jacoutot wrote:
> > On Sat, Oct 17, 2020 at 04:28:31PM +0200, Sebastien Marie wrote:
> > > Hi,
> > >
> > > The following diff should switch print/py-relatorio to py3-only. No
> > > ports uses the py2 version.
> > >
> > > It was requested by aja@ to help removing depends on graphics/pycha.
> >
> > Thanks, comments below.
> >
> > > @@ -21,17 +21,12 @@ MODULES= lang/python
> > >
> > > MODPY_SETUPTOOLS=Yes
> > >
> > > -FLAVOR?=
> > > +FLAVOR?= python3
> >
> > Don't put '?' here.
> >
> > > FLAVORS= python3
> > >
> > > RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> > > textproc/py-lxml${MODPY_FLAVOR} \
> > > devel/py-magic${MODPY_FLAVOR}
> > > -
> > > -.if !${FLAVOR:Mpython3}
> > > -RUN_DEPENDS+=graphics/pycha \
> > > - textproc/py-yaml
> > > -.endif
> > >
> > > TEST_DEPENDS=devel/py-nose${MODPY_FLAVOR}
> >
> > You are missing @pkgpath and @conflict markers in the PLIST... and bump.
> >
>
> it seems I didn't do enough py2->py3 migration.
>
> here new diff.
OK aja
>
> Thanks.
> --
> Sebastien Marie
>
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1067
> diff -u -p -r1.1067 Makefile
> --- devel/quirks/Makefile 17 Oct 2020 12:59:19 - 1.1067
> +++ devel/quirks/Makefile 17 Oct 2020 15:48:49 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.459
> +PKGNAME =quirks-3.460
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1085
> diff -u -p -r1.1085 Quirks.pm
> --- devel/quirks/files/Quirks.pm 17 Oct 2020 12:59:19 - 1.1085
> +++ devel/quirks/files/Quirks.pm 17 Oct 2020 15:48:50 -
> @@ -494,6 +494,7 @@ my $stem_extensions = {
> 'py-kiwisolver' => 'py3-kiwisolver',
> 'py-scipy' => 'py3-scipy',
> 'spidermonkey68' => 'spidermonkey78',
> + 'py-relatorio' => 'py3-relatorio',
> };
>
> my $obsolete_reason = {
> Index: print/Makefile
> ===
> RCS file: /cvs/ports/print/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- print/Makefile2 Sep 2020 10:35:05 - 1.134
> +++ print/Makefile17 Oct 2020 15:48:50 -
> @@ -59,7 +59,6 @@
> SUBDIR += ptouch-driver
> SUBDIR += py-cups,python3
> SUBDIR += py-poppler
> -SUBDIR += py-relatorio
> SUBDIR += py-relatorio,python3
> SUBDIR += py-reportlab
> SUBDIR += py-reportlab,python3
> Index: print/py-relatorio/Makefile
> ===
> RCS file: /cvs/ports/print/py-relatorio/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- print/py-relatorio/Makefile 7 Aug 2020 17:32:46 - 1.16
> +++ print/py-relatorio/Makefile 17 Oct 2020 15:48:50 -
> @@ -5,6 +5,7 @@ COMMENT= templating library able to out
> MODPY_EGG_VERSION= 0.9.2
> DISTNAME=relatorio-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> +REVISION=0
>
> CATEGORIES= print textproc
>
> @@ -21,17 +22,12 @@ MODULES= lang/python
>
> MODPY_SETUPTOOLS=Yes
>
> -FLAVOR?=
> +FLAVOR= python3
> FLAVORS= python3
>
> RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> textproc/py-lxml${MODPY_FLAVOR} \
> devel/py-magic${MODPY_FLAVOR}
> -
> -.if !${FLAVOR:Mpython3}
> -RUN_DEPENDS+=graphics/pycha \
> - textproc/py-yaml
> -.endif
>
> TEST_DEPENDS=devel/py-nose${MODPY_FLAVOR}
>
> Index: print/py-relatorio/pkg/PLIST
> ===
> RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- print/py-relatorio/pkg/PLIST 12 Dec 2017 01:45:10 - 1.4
> +++ print/py-relatorio/pkg/PLIST 17 Oct 2020 15:48:50 -
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.4 2017/12/12 01:45:10 danj Exp $
> +@conflict py-relatorio-*
> +@pkgpath print/py-relatorio
> lib/python${MODPY_VERSION}/site-packages/relatorio/
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
--
Antoine
Re: print/py-relatorio switch to py3-only
On Sat, Oct 17, 2020 at 05:50:07PM +0200, Sebastien Marie wrote: > it seems I didn't do enough py2->py3 migration. > > here new diff. OK kn with py-relatorio unhooked from print/Makefile as well.
Re: print/py-relatorio switch to py3-only
On Sat, Oct 17, 2020 at 05:24:58PM +0200, Antoine Jacoutot wrote:
> On Sat, Oct 17, 2020 at 04:28:31PM +0200, Sebastien Marie wrote:
> > Hi,
> >
> > The following diff should switch print/py-relatorio to py3-only. No
> > ports uses the py2 version.
> >
> > It was requested by aja@ to help removing depends on graphics/pycha.
>
> Thanks, comments below.
>
> > @@ -21,17 +21,12 @@ MODULES=lang/python
> >
> > MODPY_SETUPTOOLS= Yes
> >
> > -FLAVOR?=
> > +FLAVOR?= python3
>
> Don't put '?' here.
>
> > FLAVORS= python3
> >
> > RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> > textproc/py-lxml${MODPY_FLAVOR} \
> > devel/py-magic${MODPY_FLAVOR}
> > -
> > -.if !${FLAVOR:Mpython3}
> > -RUN_DEPENDS+= graphics/pycha \
> > - textproc/py-yaml
> > -.endif
> >
> > TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
>
> You are missing @pkgpath and @conflict markers in the PLIST... and bump.
>
it seems I didn't do enough py2->py3 migration.
here new diff.
Thanks.
--
Sebastien Marie
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1067
diff -u -p -r1.1067 Makefile
--- devel/quirks/Makefile 17 Oct 2020 12:59:19 - 1.1067
+++ devel/quirks/Makefile 17 Oct 2020 15:48:49 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.459
+PKGNAME = quirks-3.460
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1085
diff -u -p -r1.1085 Quirks.pm
--- devel/quirks/files/Quirks.pm17 Oct 2020 12:59:19 - 1.1085
+++ devel/quirks/files/Quirks.pm17 Oct 2020 15:48:50 -
@@ -494,6 +494,7 @@ my $stem_extensions = {
'py-kiwisolver' => 'py3-kiwisolver',
'py-scipy' => 'py3-scipy',
'spidermonkey68' => 'spidermonkey78',
+ 'py-relatorio' => 'py3-relatorio',
};
my $obsolete_reason = {
Index: print/Makefile
===
RCS file: /cvs/ports/print/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- print/Makefile 2 Sep 2020 10:35:05 - 1.134
+++ print/Makefile 17 Oct 2020 15:48:50 -
@@ -59,7 +59,6 @@
SUBDIR += ptouch-driver
SUBDIR += py-cups,python3
SUBDIR += py-poppler
-SUBDIR += py-relatorio
SUBDIR += py-relatorio,python3
SUBDIR += py-reportlab
SUBDIR += py-reportlab,python3
Index: print/py-relatorio/Makefile
===
RCS file: /cvs/ports/print/py-relatorio/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- print/py-relatorio/Makefile 7 Aug 2020 17:32:46 - 1.16
+++ print/py-relatorio/Makefile 17 Oct 2020 15:48:50 -
@@ -5,6 +5,7 @@ COMMENT=templating library able to out
MODPY_EGG_VERSION= 0.9.2
DISTNAME= relatorio-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
+REVISION= 0
CATEGORIES=print textproc
@@ -21,17 +22,12 @@ MODULES=lang/python
MODPY_SETUPTOOLS= Yes
-FLAVOR?=
+FLAVOR=python3
FLAVORS= python3
RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
textproc/py-lxml${MODPY_FLAVOR} \
devel/py-magic${MODPY_FLAVOR}
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS+= graphics/pycha \
- textproc/py-yaml
-.endif
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
Index: print/py-relatorio/pkg/PLIST
===
RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- print/py-relatorio/pkg/PLIST12 Dec 2017 01:45:10 - 1.4
+++ print/py-relatorio/pkg/PLIST17 Oct 2020 15:48:50 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2017/12/12 01:45:10 danj Exp $
+@conflict py-relatorio-*
+@pkgpath print/py-relatorio
lib/python${MODPY_VERSION}/site-packages/relatorio/
lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Re: remove py-Numeric as RDEP from games/angrydd
On Sat, Oct 17, 2020 at 04:02:04AM -0400, Daniel Dickman wrote:
> In 2006, Numeric was added as a dependency to angrydd, but unfortunately
> no details on why it was added.
> =
> revision 1.2
> date: 2006/11/11 19:09:11; author: ajacoutot; state: Exp; lines: +4 -2;
> - add math/py-Numeric to RUN_DEPENDS
> noticed by steven@
> =
> I'm assuming it was because surfarray from pygame (at that time) depended
> on py-Numeric and the game would crash if py-Numeric was not installed.
> These days, pygame got rid of the py-Numeric dependency and uses numpy
> instead.
> Indeed, I've verified that the game will crash if numpy is not available
> at runtime.
> Diff below fixes the port and brings us closer to being able to get rid
> of py-Numeric itself.
> ok?
ok kmos
--Kurt
> (p.s. HOMEPAGE is long dead, but i left it in as documentation if anyone
> wants to look at a cached version of the old site on archive.org or
> similar).
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/angrydd/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -r1.16 Makefile
> --- Makefile 12 Jul 2019 20:46:14 - 1.16
> +++ Makefile 17 Oct 2020 07:54:44 -
> @@ -3,7 +3,7 @@
> COMMENT= falling blocks puzzle game
>
> DISTNAME=angrydd-1.0.1
> -REVISION = 7
> +REVISION = 8
> CATEGORIES= games
>
> HOMEPAGE=http://www.sacredchao.net/~piman/angrydd/
> @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
> MASTER_SITES=${HOMEPAGE}
>
> RUN_DEPENDS= devel/pygame>=1.7 \
> - math/py-Numeric
> + math/py-numpy
>
> MODULES= lang/python
> NO_BUILD=Yes
>
Re: remove pyrex as BDEP from games/mysticmine
On Sat, Oct 17, 2020 at 03:09:27AM -0400, Daniel Dickman wrote:
> MysticMine is one of the few remaining ports that still depends on pyrex.
> However, I'm not sure if anyone has actually fired up this game in some
> time. When I try it, it just errors out:
> NameError: name 'languages' is not defined
> (Maybe some of the locale changes in base may have broken this game at
> some point?)
> So the diff below does a few things:
> 1) use cython instead of pyrex as a BDEP. Luckily this seems to work given
> the close history between pyrex and cython. (Another choice, since the
> game is unlikely to get updates, would have been to pre-generate the ai.c
> file and include it in the port).
> 2) pyrex was removed as a RDEP and not replaced by cython. It wasn't
> obvious to me why it was needed as an RDEP in the first place.
> 3) to test the game, fix the locale-related issue with the simplest diff I
> could think of.
> 4) may as well update to the latest github commit from July 2016 which
> says support for game controllers was added.
> Was able to play a few round on my amd64 box with the below.
> ok?
Only thing I'd like see changed from this is point GH_ACCOUNT at dewitters,
since koonsolo is gone and it just redirects to the dewitters account.
With that change, ok kmos
--Kurt
> diff -Nur mysticmine/Makefile mysticmine.new/Makefile
> --- mysticmine/Makefile Fri Jul 12 16:46:21 2019
> +++ mysticmine.new/Makefile Sat Oct 17 02:14:24 2020
> @@ -7,8 +7,8 @@
>
> GH_ACCOUNT = koonsolo
> GH_PROJECT = MysticMine
> -GH_COMMIT = f8354135984e83071d17396d846d7fa91fef1631
> -REVISION = 0
> +GH_COMMIT = 2fc0a5eaa0ab299c3a23ce17ae1c56a98055a44c
> +REVISION = 1
>
> CATEGORIES = games
>
> @@ -18,9 +18,8 @@
> WANTLIB =pthread ${MODPY_WANTLIB}
>
> MODULES =lang/python
> -BUILD_DEPENDS = devel/pyrex
> -RUN_DEPENDS =devel/pygame \
> - devel/pyrex
> +BUILD_DEPNDS = lang/cython
> +RUN_DEPENDS =devel/pygame
>
> NO_TEST =Yes
>
> diff -Nur mysticmine/distinfo mysticmine.new/distinfo
> --- mysticmine/distinfo Sat May 6 11:10:17 2017
> +++ mysticmine.new/distinfo Sat Oct 17 01:41:34 2020
> @@ -1,2 +1,2 @@
> -SHA256 (mysticmine-1.2.0-f8354135.tar.gz) =
> J/uEyoJZpgwFr629QwnVBEiR+37aXmVD6oUEmEFXMVo=
> -SIZE (mysticmine-1.2.0-f8354135.tar.gz) = 19285995
> +SHA256 (mysticmine-1.2.0-2fc0a5ea.tar.gz) =
> tlpvuSWWvzcgW8f+Z8vfE8aEOMJplDw0RTxpnS40wg8=
> +SIZE (mysticmine-1.2.0-2fc0a5ea.tar.gz) = 19286277
> diff -Nur mysticmine/patches/patch-monorail_monorail_py
> mysticmine.new/patches/patch-monorail_monorail_py
> --- mysticmine/patches/patch-monorail_monorail_py Wed Dec 31 19:00:00 1969
> +++ mysticmine.new/patches/patch-monorail_monorail_py Sat Oct 17 02:19:44 2020
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Fix for https://github.com/dewitters/MysticMine/issues/16
> +
> +Index: monorail/monorail.py
> +--- monorail/monorail.py.orig
> monorail/monorail.py
> +@@ -41,6 +41,8 @@ DEFAULT_LANGUAGES += ['en_US']
> + lc, encoding = locale.getdefaultlocale()
> + if lc:
> + languages = [lc]
> ++else:
> ++languages = []
> +
> + languages += DEFAULT_LANGUAGES
> + mo_location = LOCALE_DIR
> diff -Nur mysticmine/patches/patch-setup_py
> mysticmine.new/patches/patch-setup_py
> --- mysticmine/patches/patch-setup_py Wed Dec 31 19:00:00 1969
> +++ mysticmine.new/patches/patch-setup_py Sat Oct 17 02:09:10 2020
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: setup.py
> +--- setup.py.orig
> setup.py
> +@@ -1,6 +1,6 @@
> + from distutils.core import Extension, setup
> + from distutils.command.install import INSTALL_SCHEMES
> +-from Pyrex.Distutils import build_ext
> ++from Cython.Distutils import build_ext
> + import os
> +
> + #
> http://stackoverflow.com/questions/1612733/including-non-python-files-with-setup-py
> +@@ -52,6 +52,5 @@ setup( name='MysticMine',
> + requires=[
> + "pygame",
> + "numpy",
> +-"pyrex",
> + ],
> + )
> diff -Nur mysticmine/pkg/PLIST mysticmine.new/pkg/PLIST
> --- mysticmine/pkg/PLIST Thu Jun 2 07:33:07 2016
> +++ mysticmine.new/pkg/PLIST Sat Oct 17 01:42:14 2020
> @@ -4,7 +4,7 @@
> lib/python${MODPY_VERSION}/site-packages/monorail/
> lib/python${MODPY_VERSION}/site-packages/monorail/__init__.py
> lib/python${MODPY_VERSION}/site-packages/monorail/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
> +@so lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
> lib/python${MODPY_VERSION}/site-packages/monorail/control.py
> lib/python${MODPY_VERSION}/site-packages/monorail/control.pyc
> lib/python${MODPY_VERSION}/site-packages/monorail/controlview.py
>
Re: remove Numeric as TDEP from pyrex
On Sat, Oct 17, 2020 at 02:50:04AM -0400, Daniel Dickman wrote:
> pyrex itself does not seem to need Numeric. Only a single example script
> (which is used for testin) seems to need Numeric.
> Just remove that example script to clean up the need for Numeric
> ok?
ok kmos
--Kurt
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/pyrex/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -r1.19 Makefile
> --- Makefile 26 Jan 2020 11:14:31 - 1.19
> +++ Makefile 17 Oct 2020 06:47:38 -
> @@ -5,7 +5,7 @@ COMMENT= Python-alike language for writi
> MODPY_EGG_VERSION= 0.9.9
> DISTNAME=Pyrex-${MODPY_EGG_VERSION}
> PKGNAME= ${DISTNAME:L}
> -REVISION = 1
> +REVISION = 2
> CATEGORIES= devel
>
> HOMEPAGE=http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
> @@ -17,8 +17,6 @@ MASTER_SITES= https://distfiles.sigtrap.
> ${HOMEPAGE}
>
> MODULES= lang/python
> -
> -TEST_DEPENDS=math/py-Numeric
>
> pre-build:
> @perl -pi -e "s,/usr/bin/env python,${MODPY_BIN}," \
> Index: patches/patch-Demos_Makefile
> ===
> RCS file: /cvs/ports/devel/pyrex/patches/patch-Demos_Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -r1.1.1.1 patch-Demos_Makefile
> --- patches/patch-Demos_Makefile 16 Nov 2006 01:09:38 - 1.1.1.1
> +++ patches/patch-Demos_Makefile 17 Oct 2020 06:47:38 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-Demos_Makefile,v 1.1.1.1 2006/11/16 01:09:38 alek Exp $
> Demos/Makefile.orig Sun Nov 12 22:04:13 2006
> -+++ Demos/Makefile Sun Nov 12 22:04:14 2006
> -@@ -1,10 +1,10 @@
> +Index: Demos/Makefile
> +--- Demos/Makefile.orig
> Demos/Makefile
> +@@ -1,10 +1,9 @@
> all:
> -python Setup.py build_ext --inplace
> +${PYTHON} Setup.py build_ext --inplace
> @@ -11,7 +12,6 @@ $OpenBSD: patch-Demos_Makefile,v 1.1.1.1
> -python run_numeric_demo.py
> -python run_spam.py
> +${PYTHON} run_primes.py 20
> -+${PYTHON} run_numeric_demo.py
> +${PYTHON} run_spam.py
> cd callback; $(MAKE) test
>
> Index: patches/patch-Demos_Setup_py
> ===
> RCS file: patches/patch-Demos_Setup_py
> diff -N patches/patch-Demos_Setup_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Demos_Setup_py 17 Oct 2020 06:47:38 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: Demos/Setup.py
> +--- Demos/Setup.py.orig
> Demos/Setup.py
> +@@ -8,7 +8,6 @@ setup(
> + ext_modules=[
> + Extension("primes", ["primes.pyx"]),
> + Extension("spam", ["spam.pyx"]),
> +-Extension("numeric_demo", ["numeric_demo.pyx"]),
> + ],
> + cmdclass = {'build_ext': build_ext}
> + )
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/pyrex/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 PLIST
> --- pkg/PLIST 5 Sep 2010 17:18:22 - 1.4
> +++ pkg/PLIST 17 Oct 2020 06:47:38 -
> @@ -145,10 +145,10 @@ share/examples/pyrex/embed/Makefile.unix
> share/examples/pyrex/embed/README
> share/examples/pyrex/embed/embedded.pyx
> share/examples/pyrex/embed/main.c
> -share/examples/pyrex/numeric_demo.pyx
> +@comment share/examples/pyrex/numeric_demo.pyx
> share/examples/pyrex/primes.pyx
> share/examples/pyrex/pyprimes.py
> -share/examples/pyrex/run_numeric_demo.py
> +@comment share/examples/pyrex/run_numeric_demo.py
> share/examples/pyrex/run_primes.py
> share/examples/pyrex/run_spam.py
> share/examples/pyrex/spam.pyx
>
Re: py-game doesn't need py-Nuemeric anymore
On Sat, Oct 17, 2020 at 01:36:46AM -0400, Daniel Dickman wrote:
> As noted in WHATSNEW, pygame removed support for py-Numeric back in 2016.
> Diff below removes py-Numeric from the BUILD_DEPENDS.
> While here:
> - re-enable pypi as a download source
> - regenerate PLIST
> ok?
ok kmos
--Kurt
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/pygame/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -r1.37 Makefile
> --- Makefile 3 Jul 2020 21:12:53 - 1.37
> +++ Makefile 17 Oct 2020 05:27:08 -
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.9.3
> DISTNAME=pygame-${MODPY_EGG_VERSION}
> PKGNAME =py-game-${MODPY_EGG_VERSION}
> CATEGORIES= devel games
> -REVISION = 2
> +REVISION = 3
>
> HOMEPAGE=https://www.pygame.org/
>
> @@ -17,15 +17,12 @@ WANTLIB += SDL SDL_image SDL_mixer SDL_t
> WANTLIB += freetype z ${MODPY_WANTLIB}
>
> MODULES= lang/python
> -#MODPY_PI = Yes
> -# 1.9.3 was pulled out of the main pypi
> -MASTER_SITES =
> https://files.pythonhosted.org/packages/61/06/3c25051549c252cc6fde01c8aeae90b96831370884504fe428a623316def/
> +MODPY_PI = Yes
> +
> MODPY_SETUPTOOLS = Yes
> SUBST_VARS +=MODPY_LIB_SUFFIX
> FLAVORS =python3
> FLAVOR ?=
> -
> -BUILD_DEPENDS+= math/py-Numeric
>
> LIB_DEPENDS= devel/sdl-ttf \
> devel/sdl-image \
> Index: patches/patch-config_unix_py
> ===
> RCS file: /cvs/ports/devel/pygame/patches/patch-config_unix_py,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 patch-config_unix_py
> --- patches/patch-config_unix_py 1 Apr 2018 09:27:43 - 1.6
> +++ patches/patch-config_unix_py 17 Oct 2020 05:27:08 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-config_unix_py,v 1.6 201
> Index: config_unix.py
> --- config_unix.py.orig
> +++ config_unix.py
> -@@ -206,15 +206,6 @@ def main():
> +@@ -231,15 +231,6 @@ def main():
> for d in DEPS:
> d.configure(incdirs, libdirs)
>
> Index: patches/patch-src_camera_h
> ===
> RCS file: /cvs/ports/devel/pygame/patches/patch-src_camera_h,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-src_camera_h
> --- patches/patch-src_camera_h1 Apr 2018 09:27:43 - 1.2
> +++ patches/patch-src_camera_h17 Oct 2020 05:27:08 -
> @@ -16,7 +16,7 @@ Index: src/camera.h
> #elif defined(__APPLE__)
> #include
> /* We support OSX 10.6 and below. */
> -@@ -163,7 +166,11 @@ char** v4l2_list_cameras (int* num_devices);
> +@@ -165,7 +168,11 @@ char** v4l2_list_cameras (int* num_devices);
> int v4l2_get_control (int fd, int id, int *value);
> int v4l2_set_control (int fd, int id, int value);
> PyObject* v4l2_read_raw (PyCameraObject* self);
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/pygame/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 PLIST
> --- pkg/PLIST 1 Apr 2018 09:27:43 - 1.8
> +++ pkg/PLIST 17 Oct 2020 05:27:08 -
> @@ -48,23 +48,23 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}surfarray.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}sysfont.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/pygame/_camera.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/_camera.so
> lib/python${MODPY_VERSION}/site-packages/pygame/_camera_opencv_highgui.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_camera_vidcapture.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_dummybackend.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/_freetype.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/_freetype.so
> lib/python${MODPY_VERSION}/site-packages/pygame/_numpysndarray.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_numpysurfarray.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/base.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/bufferproxy.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/base.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/bufferproxy.so
> lib/python${MODPY_VERSION}/site-packages/pygame/camera.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/cdrom.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/color.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/cdrom.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/color.so
> lib/python${MODPY_VERSION}/site-packages/pygame/colordict.py
> lib/python${MODPY_VERSION}/site-packages/pygame/compat.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/constants.so
> +@so
Re: print/py-relatorio switch to py3-only
On Sat, Oct 17, 2020 at 04:28:31PM +0200, Sebastien Marie wrote:
> Hi,
>
> The following diff should switch print/py-relatorio to py3-only. No
> ports uses the py2 version.
>
> It was requested by aja@ to help removing depends on graphics/pycha.
Thanks, comments below.
> Thanks.
> --
> Sebastien Marie
>
> diff 8d5f3f997177f10fa711cf85536d953bd24f3762
> /home/semarie/repos/openbsd/ports
> blob - 3317db9e0b3a19d44f86dcb738f756c8027bebcb
> file + print/Makefile
> --- print/Makefile
> +++ print/Makefile
> @@ -59,7 +59,6 @@
> SUBDIR += ptouch-driver
> SUBDIR += py-cups,python3
> SUBDIR += py-poppler
> -SUBDIR += py-relatorio
> SUBDIR += py-relatorio,python3
> SUBDIR += py-reportlab
> SUBDIR += py-reportlab,python3
> blob - e17f9905bd4f9c166836216d7084080eb8d994c6
> file + print/py-relatorio/Makefile
> --- print/py-relatorio/Makefile
> +++ print/py-relatorio/Makefile
> @@ -21,17 +21,12 @@ MODULES= lang/python
>
> MODPY_SETUPTOOLS=Yes
>
> -FLAVOR?=
> +FLAVOR?= python3
Don't put '?' here.
> FLAVORS= python3
>
> RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> textproc/py-lxml${MODPY_FLAVOR} \
> devel/py-magic${MODPY_FLAVOR}
> -
> -.if !${FLAVOR:Mpython3}
> -RUN_DEPENDS+=graphics/pycha \
> - textproc/py-yaml
> -.endif
>
> TEST_DEPENDS=devel/py-nose${MODPY_FLAVOR}
You are missing @pkgpath and @conflict markers in the PLIST... and bump.
>
> diff 8d5f3f997177f10fa711cf85536d953bd24f3762
> /home/semarie/repos/openbsd/ports
> blob - 6dc6ff2051af247661a116ccca209666e8f19cee
> file + devel/quirks/Makefile
> --- devel/quirks/Makefile
> +++ devel/quirks/Makefile
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.458
> +PKGNAME =quirks-3.459
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> blob - c9de330f1f47d40a51a39d05f8e034b31cd904b2
> file + devel/quirks/files/Quirks.pm
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -493,6 +493,7 @@ my $stem_extensions = {
> 'py-zmq' => 'py3-zmq',
> 'py-kiwisolver' => 'py3-kiwisolver',
> 'py-scipy' => 'py3-scipy',
> + 'py-relatorio' => 'py3-relatorio',
> };
>
> my $obsolete_reason = {
>
--
Antoine
Re: gnupg: avoid printf %n in build process
On Fri, Oct 16, 2020 at 09:54:25PM -0700, Greg Steuck wrote:
> I tried to get this upstreamed in https://dev.gnupg.org/T5104 to no
> avail. If people find it useful to not see %n related complaints during
> the build, the patch below would do it. If desirable, OK?
>
> Thanks
> Greg
> >From 8afc030e5e22cdcde94437a8b2056ab4c6f16061 Mon Sep 17 00:00:00 2001
> From: Greg Steuck
> Date: Wed, 14 Oct 2020 23:49:01 -0700
> Subject: [PATCH GnuPG] Avoid printf-%n in mkdefs.c
>
> Replace with an easy computation.
> ---
> doc/mkdefsinc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/doc/mkdefsinc.c b/doc/mkdefsinc.c
> index b8fbed6e9..c8ff90fda 100644
> --- a/doc/mkdefsinc.c
> +++ b/doc/mkdefsinc.c
> @@ -268,6 +268,7 @@ main (int argc, char **argv)
>else
> {
>const char *month = "?";
> + const day_of_month = atoi (opt_date+8);
^
No comments about the diff, but shouldn't there be some type here?
clang complains.
warning: type specifier missing, defaults to 'int' [-Wimplicit-int]
> ...
-Bryan.
www/otter-browser: use QtWebEngine
Hi,
With devel/spidermonkey78 being the default one [0] and requiring rust,
Qt5 won't be built anymore on !rust archs.
I explicitly asked Rafael to not move Otter to QtWebEngine back when it
was introduced, but it makes not much sense now.
The below diff moves Otter to QtWebEngine and has been tested
successfully on amd64.
Comments/feedback are welcome,
Charlène.
[0] https://marc.info/?l=openbsd-ports-cvs=160293957508901=2
Index: Makefile
===
RCS file: /cvs/ports/www/otter-browser/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile9 Oct 2020 19:11:34 - 1.33
+++ Makefile17 Oct 2020 13:41:04 -
@@ -3,7 +3,7 @@
COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5
DISTNAME = otter-browser-1.0.01
-REVISION = 1
+REVISION = 2
CATEGORIES = www
@@ -17,10 +17,11 @@ EXTRACT_SUFX = .tar.bz2
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
-WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5Svg Qt5WebKit
-WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns c hunspell-1.7
-WANTLIB += m
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5Positioning
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5Svg Qt5WebChannel
+WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets Qt5XmlPatterns
+WANTLIB += c hunspell-1.7 m
MODULES = devel/cmake x11/qt5
@@ -30,12 +31,11 @@ LIB_DEPENDS = textproc/hunspell \
x11/qt5/qtdeclarative \
x11/qt5/qtmultimedia \
x11/qt5/qtsvg \
- x11/qt5/qtwebkit>=5.212.0 \
+ x11/qt5/qtwebengine \
x11/qt5/qtxmlpatterns
-# Otter is the only browser really working on macppc.
-CONFIGURE_ARGS += -DENABLE_QTWEBENGINE=OFF \
- -DENABLE_QTWEBKIT=ON
+CONFIGURE_ARGS += -DENABLE_QTWEBENGINE=ON \
+ -DENABLE_QTWEBKIT=OFF
NO_TEST = Yes
print/py-relatorio switch to py3-only
Hi,
The following diff should switch print/py-relatorio to py3-only. No
ports uses the py2 version.
It was requested by aja@ to help removing depends on graphics/pycha.
Thanks.
--
Sebastien Marie
diff 8d5f3f997177f10fa711cf85536d953bd24f3762 /home/semarie/repos/openbsd/ports
blob - 3317db9e0b3a19d44f86dcb738f756c8027bebcb
file + print/Makefile
--- print/Makefile
+++ print/Makefile
@@ -59,7 +59,6 @@
SUBDIR += ptouch-driver
SUBDIR += py-cups,python3
SUBDIR += py-poppler
-SUBDIR += py-relatorio
SUBDIR += py-relatorio,python3
SUBDIR += py-reportlab
SUBDIR += py-reportlab,python3
blob - e17f9905bd4f9c166836216d7084080eb8d994c6
file + print/py-relatorio/Makefile
--- print/py-relatorio/Makefile
+++ print/py-relatorio/Makefile
@@ -21,17 +21,12 @@ MODULES=lang/python
MODPY_SETUPTOOLS= Yes
-FLAVOR?=
+FLAVOR?= python3
FLAVORS= python3
RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
textproc/py-lxml${MODPY_FLAVOR} \
devel/py-magic${MODPY_FLAVOR}
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS+= graphics/pycha \
- textproc/py-yaml
-.endif
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
diff 8d5f3f997177f10fa711cf85536d953bd24f3762 /home/semarie/repos/openbsd/ports
blob - 6dc6ff2051af247661a116ccca209666e8f19cee
file + devel/quirks/Makefile
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.458
+PKGNAME = quirks-3.459
PKG_ARCH = *
MAINTAINER = Marc Espie
blob - c9de330f1f47d40a51a39d05f8e034b31cd904b2
file + devel/quirks/files/Quirks.pm
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -493,6 +493,7 @@ my $stem_extensions = {
'py-zmq' => 'py3-zmq',
'py-kiwisolver' => 'py3-kiwisolver',
'py-scipy' => 'py3-scipy',
+ 'py-relatorio' => 'py3-relatorio',
};
my $obsolete_reason = {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/17 06:59:20 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: devel/spidermonkey68: Makefile distinfo devel/spidermonkey68/patches: patch-config_gcc_hidden_h patch-js_moz_configure patch-js_src_Makefile_in patch-js_src_build_moz_build patch-js_src_jit_ExecutableAllocator_h patch-js_src_jit_ProcessExecutableMemory_cpp patch-js_src_jit_ProcessExecutableMemory_h patch-js_src_old-configure_in patch-js_src_wasm_WasmSignalHandlers_cpp patch-moz_configure patch-python_mozbuild_mozbuild_backend_recursivemake_py devel/spidermonkey68/pkg: DESCR PLIST Log message: remove spidermonkey68; both consumers have been switched to the new spidermonkey78
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/17 06:58:11 Modified files: devel : Makefile Log message: out with the old68, in with the new78
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/10/17 06:57:23 Modified files: x11/gnome/gjs : Makefile distinfo x11/gnome/gjs/patches: patch-meson_build patch-modules_console_cpp x11/gnome/gjs/pkg: PLIST Log message: update to gjs-1.66.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 06:49:54 Modified files: multimedia/py-caption: Makefile multimedia/py-caption/pkg: PLIST Log message: Move from MODPY_DEFAULT_VERSION_3 to python3 FLAVOR.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:42:39 Modified files: sysutils/polkit: Makefile distinfo Log message: Update to polkit-0.118.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:41:30 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.18.159.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:41:01 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.18.18.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/10/17 02:41:02 Modified files: lang/mono : Makefile distinfo lang/mono/pkg : PLIST Log message: update to 6.12.0.90
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:41:12 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.15.18.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:33:24 Modified files: x11/yaru : Makefile distinfo x11/yaru/pkg : PLIST Log message: Update to yaru-20.10.6.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:25:12 Modified files: graphics/libgphoto2: Makefile distinfo graphics/libgphoto2/pkg: PLIST Removed files: graphics/libgphoto2/patches: patch-configure_ac patch-libgphoto2_port_configure_ac Log message: Update to libgphoto-2.5.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:25:30 Modified files: graphics/gphoto2: Makefile distinfo graphics/gphoto2/patches: patch-gphoto2_actions_c Log message: Update to gphoto-2.5.26.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:23:15 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.25.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 02:08:44 Modified files: textproc/enchant2: Makefile distinfo Log message: Update to enchant2-2.2.12.
remove py-Numeric as RDEP from games/angrydd
In 2006, Numeric was added as a dependency to angrydd, but unfortunately
no details on why it was added.
=
revision 1.2
date: 2006/11/11 19:09:11; author: ajacoutot; state: Exp; lines: +4 -2;
- add math/py-Numeric to RUN_DEPENDS
noticed by steven@
=
I'm assuming it was because surfarray from pygame (at that time) depended
on py-Numeric and the game would crash if py-Numeric was not installed.
These days, pygame got rid of the py-Numeric dependency and uses numpy
instead.
Indeed, I've verified that the game will crash if numpy is not available
at runtime.
Diff below fixes the port and brings us closer to being able to get rid
of py-Numeric itself.
ok?
(p.s. HOMEPAGE is long dead, but i left it in as documentation if anyone
wants to look at a cached version of the old site on archive.org or
similar).
Index: Makefile
===
RCS file: /cvs/ports/games/angrydd/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile12 Jul 2019 20:46:14 - 1.16
+++ Makefile17 Oct 2020 07:54:44 -
@@ -3,7 +3,7 @@
COMMENT= falling blocks puzzle game
DISTNAME= angrydd-1.0.1
-REVISION = 7
+REVISION = 8
CATEGORIES=games
HOMEPAGE= http://www.sacredchao.net/~piman/angrydd/
@@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${HOMEPAGE}
RUN_DEPENDS= devel/pygame>=1.7 \
- math/py-Numeric
+ math/py-numpy
MODULES= lang/python
NO_BUILD= Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 01:59:23 Modified files: print/cups-filters: Makefile distinfo Log message: Update to cups-filters-1.28.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 01:58:49 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-314.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/10/17 01:51:19 Modified files: misc/osinfo/osinfo-db: Makefile distinfo Log message: Update to osinfo-db-20201015.
remove pyrex as BDEP from games/mysticmine
MysticMine is one of the few remaining ports that still depends on pyrex.
However, I'm not sure if anyone has actually fired up this game in some
time. When I try it, it just errors out:
NameError: name 'languages' is not defined
(Maybe some of the locale changes in base may have broken this game at
some point?)
So the diff below does a few things:
1) use cython instead of pyrex as a BDEP. Luckily this seems to work given
the close history between pyrex and cython. (Another choice, since the
game is unlikely to get updates, would have been to pre-generate the ai.c
file and include it in the port).
2) pyrex was removed as a RDEP and not replaced by cython. It wasn't
obvious to me why it was needed as an RDEP in the first place.
3) to test the game, fix the locale-related issue with the simplest diff I
could think of.
4) may as well update to the latest github commit from July 2016 which
says support for game controllers was added.
Was able to play a few round on my amd64 box with the below.
ok?
diff -Nur mysticmine/Makefile mysticmine.new/Makefile
--- mysticmine/Makefile Fri Jul 12 16:46:21 2019
+++ mysticmine.new/Makefile Sat Oct 17 02:14:24 2020
@@ -7,8 +7,8 @@
GH_ACCOUNT = koonsolo
GH_PROJECT = MysticMine
-GH_COMMIT =f8354135984e83071d17396d846d7fa91fef1631
-REVISION = 0
+GH_COMMIT =2fc0a5eaa0ab299c3a23ce17ae1c56a98055a44c
+REVISION = 1
CATEGORIES = games
@@ -18,9 +18,8 @@
WANTLIB = pthread ${MODPY_WANTLIB}
MODULES = lang/python
-BUILD_DEPENDS =devel/pyrex
-RUN_DEPENDS = devel/pygame \
- devel/pyrex
+BUILD_DEPNDS = lang/cython
+RUN_DEPENDS = devel/pygame
NO_TEST = Yes
diff -Nur mysticmine/distinfo mysticmine.new/distinfo
--- mysticmine/distinfo Sat May 6 11:10:17 2017
+++ mysticmine.new/distinfo Sat Oct 17 01:41:34 2020
@@ -1,2 +1,2 @@
-SHA256 (mysticmine-1.2.0-f8354135.tar.gz) =
J/uEyoJZpgwFr629QwnVBEiR+37aXmVD6oUEmEFXMVo=
-SIZE (mysticmine-1.2.0-f8354135.tar.gz) = 19285995
+SHA256 (mysticmine-1.2.0-2fc0a5ea.tar.gz) =
tlpvuSWWvzcgW8f+Z8vfE8aEOMJplDw0RTxpnS40wg8=
+SIZE (mysticmine-1.2.0-2fc0a5ea.tar.gz) = 19286277
diff -Nur mysticmine/patches/patch-monorail_monorail_py
mysticmine.new/patches/patch-monorail_monorail_py
--- mysticmine/patches/patch-monorail_monorail_py Wed Dec 31 19:00:00 1969
+++ mysticmine.new/patches/patch-monorail_monorail_py Sat Oct 17 02:19:44 2020
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for https://github.com/dewitters/MysticMine/issues/16
+
+Index: monorail/monorail.py
+--- monorail/monorail.py.orig
monorail/monorail.py
+@@ -41,6 +41,8 @@ DEFAULT_LANGUAGES += ['en_US']
+ lc, encoding = locale.getdefaultlocale()
+ if lc:
+ languages = [lc]
++else:
++languages = []
+
+ languages += DEFAULT_LANGUAGES
+ mo_location = LOCALE_DIR
diff -Nur mysticmine/patches/patch-setup_py
mysticmine.new/patches/patch-setup_py
--- mysticmine/patches/patch-setup_py Wed Dec 31 19:00:00 1969
+++ mysticmine.new/patches/patch-setup_py Sat Oct 17 02:09:10 2020
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
setup.py
+@@ -1,6 +1,6 @@
+ from distutils.core import Extension, setup
+ from distutils.command.install import INSTALL_SCHEMES
+-from Pyrex.Distutils import build_ext
++from Cython.Distutils import build_ext
+ import os
+
+ #
http://stackoverflow.com/questions/1612733/including-non-python-files-with-setup-py
+@@ -52,6 +52,5 @@ setup( name='MysticMine',
+ requires=[
+ "pygame",
+ "numpy",
+-"pyrex",
+ ],
+ )
diff -Nur mysticmine/pkg/PLIST mysticmine.new/pkg/PLIST
--- mysticmine/pkg/PLISTThu Jun 2 07:33:07 2016
+++ mysticmine.new/pkg/PLISTSat Oct 17 01:42:14 2020
@@ -4,7 +4,7 @@
lib/python${MODPY_VERSION}/site-packages/monorail/
lib/python${MODPY_VERSION}/site-packages/monorail/__init__.py
lib/python${MODPY_VERSION}/site-packages/monorail/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
+@so lib/python${MODPY_VERSION}/site-packages/monorail/ai.so
lib/python${MODPY_VERSION}/site-packages/monorail/control.py
lib/python${MODPY_VERSION}/site-packages/monorail/control.pyc
lib/python${MODPY_VERSION}/site-packages/monorail/controlview.py
remove Numeric as TDEP from pyrex
pyrex itself does not seem to need Numeric. Only a single example script
(which is used for testin) seems to need Numeric.
Just remove that example script to clean up the need for Numeric
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/pyrex/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile26 Jan 2020 11:14:31 - 1.19
+++ Makefile17 Oct 2020 06:47:38 -
@@ -5,7 +5,7 @@ COMMENT=Python-alike language for writi
MODPY_EGG_VERSION= 0.9.9
DISTNAME= Pyrex-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
-REVISION = 1
+REVISION = 2
CATEGORIES=devel
HOMEPAGE= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
@@ -17,8 +17,6 @@ MASTER_SITES= https://distfiles.sigtrap.
${HOMEPAGE}
MODULES= lang/python
-
-TEST_DEPENDS=math/py-Numeric
pre-build:
@perl -pi -e "s,/usr/bin/env python,${MODPY_BIN}," \
Index: patches/patch-Demos_Makefile
===
RCS file: /cvs/ports/devel/pyrex/patches/patch-Demos_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Demos_Makefile
--- patches/patch-Demos_Makefile16 Nov 2006 01:09:38 - 1.1.1.1
+++ patches/patch-Demos_Makefile17 Oct 2020 06:47:38 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Demos_Makefile,v 1.1.1.1 2006/11/16 01:09:38 alek Exp $
Demos/Makefile.origSun Nov 12 22:04:13 2006
-+++ Demos/Makefile Sun Nov 12 22:04:14 2006
-@@ -1,10 +1,10 @@
+Index: Demos/Makefile
+--- Demos/Makefile.orig
Demos/Makefile
+@@ -1,10 +1,9 @@
all:
- python Setup.py build_ext --inplace
+ ${PYTHON} Setup.py build_ext --inplace
@@ -11,7 +12,6 @@ $OpenBSD: patch-Demos_Makefile,v 1.1.1.1
- python run_numeric_demo.py
- python run_spam.py
+ ${PYTHON} run_primes.py 20
-+ ${PYTHON} run_numeric_demo.py
+ ${PYTHON} run_spam.py
cd callback; $(MAKE) test
Index: patches/patch-Demos_Setup_py
===
RCS file: patches/patch-Demos_Setup_py
diff -N patches/patch-Demos_Setup_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Demos_Setup_py17 Oct 2020 06:47:38 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: Demos/Setup.py
+--- Demos/Setup.py.orig
Demos/Setup.py
+@@ -8,7 +8,6 @@ setup(
+ ext_modules=[
+ Extension("primes", ["primes.pyx"]),
+ Extension("spam", ["spam.pyx"]),
+-Extension("numeric_demo", ["numeric_demo.pyx"]),
+ ],
+ cmdclass = {'build_ext': build_ext}
+ )
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pyrex/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 5 Sep 2010 17:18:22 - 1.4
+++ pkg/PLIST 17 Oct 2020 06:47:38 -
@@ -145,10 +145,10 @@ share/examples/pyrex/embed/Makefile.unix
share/examples/pyrex/embed/README
share/examples/pyrex/embed/embedded.pyx
share/examples/pyrex/embed/main.c
-share/examples/pyrex/numeric_demo.pyx
+@comment share/examples/pyrex/numeric_demo.pyx
share/examples/pyrex/primes.pyx
share/examples/pyrex/pyprimes.py
-share/examples/pyrex/run_numeric_demo.py
+@comment share/examples/pyrex/run_numeric_demo.py
share/examples/pyrex/run_primes.py
share/examples/pyrex/run_spam.py
share/examples/pyrex/spam.pyx
update-plist and dups (Re: update-plist not picking the longest replacement)
Greg Steuck writes:
> I am running with my cabal.port.mk[1] patches which include this
> SUBST_VARS += DISTNAME MODCABAL_STEM MODCABAL_VERSION PKGNAME
>
> I try to regenerate x11/xmonad/pkg/PLIST[2] with `make update-plist` and
> the result comes out with ${MODCABAL_STEM}-${MODCABAL_VERSION} contrary
> to my expectation of it using ${DISTNAME}.
>
> The relevant variables seem to suggest my expectation is in line with
> update-plist(1):
>
>> Most SUBST_VARS variables will be back-substituted into the regenerated
>> packing-lists, starting from the longest variable values.
I removed make from the picture. I have a terrible script which I re-run
after make fake is done and try to see what kind of PLIST gets built de
novo.
Looks like update-plist when faced with multiple variables set to the
same value silently ignores them (to avoid breaking ties?). So, if I
have
-DDISTNAME=xmonad-0.15\
-DPKGNAME=xmonad-0.15\
they won't get substituted. If I remove either one of them, the other
one is used.
Thanks
Greg
#!/bin/ksh
set -x
PKGPATH=x11/xmonad; export PKGPATH
PORTSDIR=/usr/ports FAKE_TREE_OWNER=_pbuild PORTS_TREE_OWNER=$(id -un) \
doas /usr/bin/perl /usr/ports/infrastructure/bin/update-plist \
-D FAKE_COOKIE=/usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_done \
-D PKGLOCATE_COOKIE=/usr/ports/pobj/xmonad-0.15/fake-amd64/.pkglocate_cookie \
-w .orig -w .bak.orig -w .beforesubst \
-i ARCH -i BASE_PKGPATH -i FULLPKGNAME -i PKGSTEM -i FULLPKGPATH -i
LOCALSTATEDIR -i MACHINE_ARCH \
-s BASE_PKGPATH -s LOCALBASE -s LOCALSTATEDIR -s PREFIX -s RCDIR -s
SYSCONFDIR -s X11BASE \
-X /usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_done -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/.install_started -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/.pkglocate_cookie -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/.saved_libs -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/etc/\{firmware,rc.d\} -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/bin -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/include/X11 -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/info -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/lib/pkgconfig -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/lib/X11/app-defaults -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/libdata/perl5/site_perl -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/libexec -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/\{cat1,cat2,cat3,cat3f,cat3p,cat4,cat5,cat6,cat7,cat8,cat9,catl,catn\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/\{man1,man2,man3,man3f,man3p,man4,man5,man6,man7,man8,man9,manl,mann\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/ja_JP.EUC/\{cat1,cat2,cat3,cat3f,cat3p,cat4,cat5,cat6,cat7,cat8,cat9,catl,catn\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/ja_JP.EUC/\{man1,man2,man3,man3f,man3p,man4,man5,man6,man7,man8,man9,manl,mann\}
-X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/sbin -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/\{dict,examples,misc,pkgconfig,skel\}
-X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/doc/pkg-readmes -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{C,da_DK.ISO_8859-1,de_AT.ISO_8859-1,de_CH.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{de_DE.ISO_8859-1,el_GR.ISO_8859-7,en_AU.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{en_CA.ISO_8859-1,en_GB.ISO_8859-1,en_US.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{es_ES.ISO_8859-1,et_EE.ISO-8859-1,fi_FI.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{fr_BE.ISO_8859-1,fr_CA.ISO_8859-1,fr_CH.ISO_8859-1\}
-X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/fr_FR.ISO_8859-1
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{hr_HR.ISO_8859-2,is_IS.ISO_8859-1,it_CH.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{it_IT.ISO_8859-1,ja_JP.EUC,ko_KR.EUC,lt_LN.ASCII\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{lt_LN.ISO_8859-1,lt_LN.ISO_8859-2,nl_BE.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{no_NO.ISO_8859-1,pl_PL.ISO_8859-2,pt_PT.ISO_8859-1\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{ru_RU.CP866,ru_RU.ISO_8859-5,ru_RU.KOI8-R\}
-X
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{sv_SE.ISO_8859-1,uk_UA.KOI8-U\}
-X /usr/ports/pobj/xmonad-0.15/fake-amd64/var/\{db,games,log,spool,www\} -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg/Makefile -X
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg/Makefile.new \
-L /usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_log \
-P /home/greg/ports/x11/xmonad/pkg \
-- \
`SUBPACKAGE=- make run-depends-args lib-depends-args` \
-u /usr/ports/infrastructure/db/user.list\
