CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/03/10 23:02:53 Modified files: sysutils/firmware: Makefile Log message: +amdgpu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/10 22:11:57 Modified files: emulators/dolphin: Makefile games/0ad/base : Makefile games/megaglest/base: Makefile games/openclonk: Makefile games/returntotheroots: Makefile graphics/drawpile: Makefile net/bitcoin: Makefile net/litecoin : Makefile net/mldonkey : Makefile net/transmission: Makefile Log message: Bump REVISION due to pkgpath change in net/miniupnp/miniupnpc.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/10 22:06:37 Modified files: net/miniupnp/miniupnpd: Makefile distinfo net/miniupnp/miniupnpd/patches: patch-Makefile patch-minissdp_c patch-miniupnpd_8 patch-miniupnpd_conf patch-portinuse_c patch-testasyncsendto_c patch-upnpevents_c patch-upnpredirect_c net/miniupnp/miniupnpd/pkg: PLIST Added files: net/miniupnp/miniupnpd/patches: patch-genconfig_sh Log message: Update to miniupnpd-2.1. Thanks to @sthen for the help, especially for noticing a lost cast in a patch. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/10 22:07:15 Modified files: net/miniupnp/miniupnpc: Makefile distinfo net/miniupnp/miniupnpc/patches: patch-Makefile patch-miniupnpcmodule_c Added files: net/miniupnp/miniupnpc/pkg: DESCR PLIST README Removed files: net/miniupnp/miniupnpc/patches: patch-igd_desc_parse_c patch-setup_py net/miniupnp/miniupnpc/pkg: DESCR-main DESCR-python PLIST-main PLIST-python README-main Log message: Update to miniupnpc-2.1. Simplified port by removing python related multipackage. No objections received. Bumped major of SHARED_LIBS as symbols have been removed. Hints and tips from sthen@, thanks! OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/03/10 22:04:53 Modified files: net/miniupnp/minissdpd: Makefile distinfo net/miniupnp/minissdpd/pkg: PLIST Log message: Update to minissdpd-1.5. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/10 21:49:17 Modified files: editors: Makefile Log message: +wordgrinder
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/10 21:48:46 Log message: Import wordgrinder-0.7.2. WordGrinder is a simple, Unicode-aware word processor that runs on the console. It's designed to get the hell out of your way and let you write; it does very little, but what it does it does well. It supports basic paragraph styles, basic character styles, basic screen markup, a menu interface that means you don't have to remember complex key sequences, HTML import and export, and some other useful features. WordGrinder does not require X. It runs in a terminal. (But there's a version which uses X if you want it.) ok kn@ Status: Vendor Tag: bentley Release Tags: bentley_20190310 N ports/editors/wordgrinder/Makefile N ports/editors/wordgrinder/distinfo N ports/editors/wordgrinder/pkg/PLIST N ports/editors/wordgrinder/pkg/DESCR N ports/editors/wordgrinder/patches/patch-build_lua N ports/editors/wordgrinder/patches/patch-src_c_arch_unix_x11_x11_h No conflicts created by this import
Re: UPDATE: www/stagit 0.8->0.9.1
On Sun, Mar 10, 2019 at 01:55:47PM +0100, Klemens Nanni wrote:
> On Fri, Mar 01, 2019 at 11:17:48AM +0100, Hiltjo Posthuma wrote:
> > - Respect system LDFLAGS.
> > - Use the main releases location (2f30 is a mirror).
> > - Remove now unneeded config.mk patch: stagit now checks #ifdef __OpenBSD__
> > for pledge(2).
> Thanks, I'll commit soon. Two things, though:
>
> > MAKE_FLAGS=CC='${CC}' \
> > - CFLAGS='${CFLAGS}' \
> > - COMPATOBJ='' \
> > - GITINC=${LOCALBASE}/include \
> > - GITLIB=${LOCALBASE}/lib
> > + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
> > + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgit2" \
> > + COMPATOBJ=''
> I'd go with all single quotes here for consistency (with CC='${CC}').
>
> > --- a/www/stagit/pkg/PLIST
> > +++ b/www/stagit/pkg/PLIST
> > @@ -3,10 +3,10 @@
> > @bin bin/stagit-index
> > @man man/man1/stagit-index.1
> > @man man/man1/stagit.1
> > -share/stagit/
> > -share/stagit/README
> > -share/stagit/example_create.sh
> > -share/stagit/example_post-receive.sh
> > -share/stagit/favicon.png
> > -share/stagit/logo.png
> > -share/stagit/style.css
> > +share/doc/stagit/
> > +share/doc/stagit/README
> This is documentation,
>
> > +share/doc/stagit/example_create.sh
> > +share/doc/stagit/example_post-receive.sh
> these are examples,
>
> > +share/doc/stagit/favicon.png
> > +share/doc/stagit/logo.png
> > +share/doc/stagit/style.css
> those as well, but I'd count them as static files, too.
>
> Not sure how much I'm nitpicking here, but what about using the
> appropiate directories as per our porters guide?
>
> read-only architecture-independent: /usr/local/share/
> misc documentation: /usr/local/share/doc/
> examples files: /usr/local/share/examples/
Thanks for the feedback. I changed the quotes and added a post-install target
to move
the example files in the proper directory.
At the moment the port does not install the LICENSE file. I wonder if this is
neccesary?
Updated patch below:
diff --git www/stagit/Makefile www/stagit/Makefile
index 55f23797597..395fab45b95 100644
--- www/stagit/Makefile
+++ www/stagit/Makefile
@@ -2,11 +2,11 @@
COMMENT = static git page generator
-DISTNAME = stagit-0.8
+DISTNAME = stagit-0.9.1
CATEGORIES = www
-HOMEPAGE = https://git.2f30.org/stagit/
+HOMEPAGE = https://codemadness.org/
# MIT/X Consortium License
PERMIT_PACKAGE_CDROM = Yes
@@ -16,14 +16,24 @@ WANTLIB = c git2
LIB_DEPENDS = devel/libgit2/libgit2>=0.22
-MASTER_SITES = https://dl.2f30.org/releases/
+MASTER_SITES = https://codemadness.org/releases/stagit/
MAKE_FLAGS=CC='${CC}' \
- CFLAGS='${CFLAGS}' \
- COMPATOBJ='' \
- GITINC=${LOCALBASE}/include \
- GITLIB=${LOCALBASE}/lib
+ CFLAGS='${CFLAGS} -I${LOCALBASE}/include' \
+ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -lgit2' \
+ COMPATOBJ=''
NO_TEST = Yes
+post-install:
+ # put examples in the proper directory.
+ mkdir -p ${PREFIX}/share/examples/stagit
+ mv \
+ ${PREFIX}/share/doc/stagit/example_create.sh \
+ ${PREFIX}/share/doc/stagit/example_post-receive.sh \
+ ${PREFIX}/share/doc/stagit/favicon.png \
+ ${PREFIX}/share/doc/stagit/logo.png \
+ ${PREFIX}/share/doc/stagit/style.css \
+ ${PREFIX}/share/examples/stagit
+
.include
diff --git www/stagit/distinfo www/stagit/distinfo
index 83181d38808..00a44d5cc0b 100644
--- www/stagit/distinfo
+++ www/stagit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
-SIZE (stagit-0.8.tar.gz) = 17378
+SHA256 (stagit-0.9.1.tar.gz) = hRDMfq5rusctjMYQkuYi0fpxkvGevJrH/lkZIwC/55A=
+SIZE (stagit-0.9.1.tar.gz) = 18426
diff --git www/stagit/patches/patch-config_mk www/stagit/patches/patch-config_mk
deleted file mode 100644
index 34fae97ad5a..000
--- www/stagit/patches/patch-config_mk
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: config.mk
config.mk.orig
-+++ config.mk
-@@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS}
- CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
-
- # OpenBSD 5.9+: use pledge(2)
--#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE -DUSE_PLEDGE
${INCS}
-+CPPFLAGS += -DUSE_PLEDGE
diff --git www/stagit/pkg/PLIST www/stagit/pkg/PLIST
index a92f071a033..3e3dbfdc94e 100644
--- www/stagit/pkg/PLIST
+++ www/stagit/pkg/PLIST
@@ -1,12 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.2 2017/08/13 18:51:53 juanfra Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/stagit
@bin bin/stagit-index
@man man/man1/stagit-index.1
ocaml fallout (i386): devel/frama-c
Ocamlopt src/plugins/value/gui_files/register_gui.cmx Packing /usr/obj/ports/frama-c-18.0/frama-c-18.0-Argon/lib/plugins/gui/Eva.cmx ldPacking /usr/obj/ports/frama-c-18.0/frama-c-18.0-Argon/lib/plugins/gui/Eva.cmxs : error: undefined symbol: ml_as_z_pred >>> referenced by integer.ml:66 (src/libraries/stdlib/integer.ml:66) >>> >>> src/kernel_internals/typing/infer_annotations.o:(camlInfer_annotations__make_range_1982) ld: error: undefined symbol: ml_as_z_pred >>> referenced by integer.ml:66 (src/libraries/stdlib/integer.ml:66) >>> >>> src/kernel_services/analysis/logic_interp.o:(camlLogic_interp__aux_2613) ld: error: undefined symbol: ml_as_z_pred >>> referenced by integer.ml:66 (src/libraries/stdlib/integer.ml:66) >>> >>> src/kernel_internals/typing/asm_contracts.o:(camlAsm_contracts__access_elts_5367) ld: error: undefined symbol: ml_as_z_neg >>> referenced by integer.ml:67 (src/libraries/stdlib/integer.ml:67) >>> >>> src/kernel_internals/typing/translate_lightweight.o:(camlTranslate_lightweight__aux_1108) (etc.etc.) Full log below: >>> Building on i386 under devel/frama-c BDEPENDS = [math/graphviz;math/ocaml-zarith;x11/gnome/libgnomecanvas;x11/gtksourceview;lang/ocaml;devel/ocaml-graph;devel/autoconf/2.69;sysutils/findlib;x11/lablgtk2;devel/metaauto;devel/gmake] DIST = [devel/frama-c:frama-c-18.0-Argon.tar.gz] FULLPKGNAME = frama-c-18.0 RDEPENDS = [math/graphviz;x11/lablgtk2;x11/gnome/libgnomecanvas;math/ocaml-zarith;x11/gtksourceview;lang/ocaml] (Junk lock obtained for i386 at 1552208207) >>> Running depends in devel/frama-c at 1552208207 last junk was in textproc/apertium-dicts/tur /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 findlib-1.8.0 gmake-4.2.1p0 graphviz-2.36.0p12 gtksourceview-2.10.5p5 lablgtk2-2.18.6 libgnomecanvas-2.30.3p7 metaauto-1.0p3 ocaml-4.07.1 ocaml-graph-1.8.8 ocaml-zarith-1.7p0 was: /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 findlib-1.8.0 gmake-4.2.1p0 graphviz-2.36.0p12 gtksourceview-2.10.5p5 lablgtk2-2.18.6 libgnomecanvas-2.30.3p7 metaauto-1.0p3 ocaml-4.07.1 ocaml-graph-1.8.8 ocaml-zarith-1.7p0 /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p2 findlib-1.8.0 gmake-4.2.1p0 graphviz-2.36.0p12 gtksourceview-2.10.5p5 lablgtk2-2.18.6 libgnomecanvas-2.30.3p7 metaauto-1.0p3 ocaml-4.07.1 ocaml-graph-1.8.8 ocaml-zarith-1.7p0 New and changed readme(s): /usr/local/share/doc/pkg-readmes/gtk+2 /usr/local/share/doc/pkg-readmes/tcl-8.5 --- +tcl-8.5.19p4 --- You may wish to add /usr/local/lib/tcl/tcl8.5/man to /etc/man.conf --- +tk-8.5.19p1 --- You may wish to add /usr/local/lib/tcl/tk8.5/man to /etc/man.conf >>> Running show-prepare-results in devel/frama-c at 1552208243 ===> devel/frama-c ===> frama-c-18.0 depends on: lablgtk2-* -> lablgtk2-2.18.6 ===> frama-c-18.0 depends on: ocaml-graph-* -> ocaml-graph-1.8.8 ===> frama-c-18.0 depends on: graphviz-* -> graphviz-2.36.0p12 ===> frama-c-18.0 depends on: ocaml-zarith-* -> ocaml-zarith-1.7p0 ===> frama-c-18.0 depends on: findlib-* -> findlib-1.8.0 ===> frama-c-18.0 depends on: ocaml-=4.07.1 -> ocaml-4.07.1 ===> frama-c-18.0 depends on: metaauto-* -> metaauto-1.0p3 ===> frama-c-18.0 depends on: autoconf-2.69 -> autoconf-2.69p2 ===> frama-c-18.0 depends on: gmake-* -> gmake-4.2.1p0 ===> frama-c-18.0 depends on: libgnomecanvas-* -> libgnomecanvas-2.30.3p7 ===> frama-c-18.0 depends on: gtksourceview-* -> gtksourceview-2.10.5p5 ===> Verifying specs: X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 c cairo fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnomecanvas-2 gobject-2.0 gtk-x11-2.0 gtksourceview-2.0 intl m gmp pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z ===> found X11.16.1 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 Xext.13.0 Xfixes.6.0 Xi.12.1 Xinerama.6.0 Xrandr.7.1 Xrender.6.0 art_lgpl_2.5.20 atk-1.0.21809.2 c.95.0 cairo.13.0 fontconfig.12.0 freetype.29.0 gdk-x11-2.0.2400.0 gdk_pixbuf-2.0.3200.1 gio-2.0.4200.8 glib-2.0.4201.1 gnomecanvas-2.2002.0 gobject-2.0.4200.8 gtk-x11-2.0.2400.0 gtksourceview-2.0.5.0 intl.6.0 m.10.1 gmp.10.0 pango-1.0.3800.2 pangocairo-1.0.3800.1 pangoft2-1.0.3800.1 pthread.26.1 z.5.0 autoconf-2.69p2 findlib-1.8.0 gmake-4.2.1p0 graphviz-2.36.0p12 gtksourceview-2.10.5p5 lablgtk2-2.18.6 libgnomecanvas-2.30.3p7 metaauto-1.0p3 ocaml-4.07.1 ocaml-graph-1.8.8 ocaml-zarith-1.7p0 (Junk lock released for i386 at 1552208245) distfiles size=5358960 >>> Running patch in devel/frama-c at 1552208245 ===> devel/frama-c ===> Checking files for frama-c-18.0 `/mnt/distfiles/frama-c-18.0-Argon.tar.gz' is up to date. ===> Extracting for frama-c-18.0 ===> Patching for frama-c-18.0 ===> Applying OpenBSD patch patch-Makefile Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $ |
ocaml fallout (i386): lang/obc
ocamlc -g -c -o error.cmo error.ml File "error.ml", line 223, characters 10-21: Warning 3: deprecated: Stdlib.String.copy File "error.ml", line 224, characters 30-59: Warning 3: deprecated: Stdlib.String.set Use Bytes.set instead. File "error.ml", line 224, characters 30-31: Error: This expression has type string but an expression was expected of type bytes gmake[1]: *** [Makefile:88: error.cmo] Error 2 Full log below: >>> Building on i386-2 under lang/obc BDEPENDS = [devel/ocaml-ocamlbuild;x11/lablgtk2;devel/gmake;lang/tcl/8.5;x11/gtksourceview;lang/ocaml] DIST = [lang/obc:obc-2.9.7.tar.gz] FULLPKGNAME = obc-2.9.7 RDEPENDS = [lang/ocaml;x11/lablgtk2;x11/gtksourceview] (Junk lock obtained for i386-2 at 1552196950) >>> Running depends in lang/obc at 1552196950 last junk was in www/dillo /usr/sbin/pkg_add -aI -Drepair gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 was: /usr/sbin/pkg_add -aI -Drepair gmake-4.2.1p0 gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 /usr/sbin/pkg_add -aI -Drepair gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 New and changed readme(s): /usr/local/share/doc/pkg-readmes/tcl-8.5 --- +tcl-8.5.19p4 --- You may wish to add /usr/local/lib/tcl/tcl8.5/man to /etc/man.conf >>> Running show-prepare-results in lang/obc at 1552196989 ===> lang/obc ===> obc-2.9.7 depends on: lablgtk2->=2.14.2p1 -> lablgtk2-2.18.6 ===> obc-2.9.7 depends on: ocaml-=4.07.1 -> ocaml-4.07.1 ===> obc-2.9.7 depends on: tcl->=8.5,<8.6 -> tcl-8.5.19p4 ===> obc-2.9.7 depends on: ocamlbuild-* -> ocamlbuild-0.12.0 ===> obc-2.9.7 depends on: gmake-* -> gmake-4.2.1p0 ===> obc-2.9.7 depends on: gtksourceview-* -> gtksourceview-2.10.5p5 ===> Verifying specs: X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo curses fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 gtksourceview-2.0 intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z ===> found X11.16.1 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 Xext.13.0 Xfixes.6.0 Xi.12.1 Xinerama.6.0 Xrandr.7.1 Xrender.6.0 atk-1.0.21809.2 c.95.0 cairo.13.0 curses.14.0 fontconfig.12.0 freetype.29.0 gdk-x11-2.0.2400.0 gdk_pixbuf-2.0.3200.1 gio-2.0.4200.8 glib-2.0.4201.1 gobject-2.0.4200.8 gtk-x11-2.0.2400.0 gtksourceview-2.0.5.0 intl.6.0 m.10.1 pango-1.0.3800.2 pangocairo-1.0.3800.1 pangoft2-1.0.3800.1 pthread.26.1 z.5.0 gmake-4.2.1p0 gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 (Junk lock released for i386-2 at 1552196990) distfiles size=795687 >>> Running build in lang/obc at 1552196990 ===> lang/obc ===> Checking files for obc-2.9.7 `/mnt/distfiles/obc-2.9.7.tar.gz' is up to date. ===> Extracting for obc-2.9.7 ===> Patching for obc-2.9.7 ===> Applying OpenBSD patch patch-Makefile_in Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-Makefile_in,v 1.3 2016/08/30 11:02:41 jasper Exp $ |--- Makefile.in.orig Tue Jan 12 19:26:21 2016 |+++ Makefile.inThu Aug 25 11:08:03 2016 -- Patching file Makefile.in using Plan A... Hunk #1 succeeded at 92. done ===> Applying OpenBSD patch patch-configure Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-configure,v 1.3 2016/08/30 11:02:41 jasper Exp $ |--- configure.orig Tue Jan 12 19:26:22 2016 |+++ configure Thu Aug 25 11:08:03 2016 -- Patching file configure using Plan A... Hunk #1 succeeded at 3694. done ===> Applying OpenBSD patch patch-debugger_Makefile_in Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-debugger_Makefile_in,v 1.2 2016/08/30 11:02:41 jasper Exp $ |--- debugger/Makefile.in.orig Tue Jan 12 19:26:21 2016 |+++ debugger/Makefile.in Thu Aug 25 11:08:03 2016 -- Patching file debugger/Makefile.in using Plan A... Hunk #1 succeeded at 52. Hunk #2 succeeded at 75. done ===> Applying OpenBSD patch patch-debugger_debmain_ml Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-debugger_debmain_ml,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $ | |- Removed in new lablgtk2 version. |- Looks like it was MacOS-specific anyway. | |--- debugger/debmain.ml.orig Thu Jan 13 02:26:02 2011 |+++ debugger/debmain.mlThu Jan 13 02:56:51 2011 -- Patching file debugger/debmain.ml using Plan A... Hunk #1 succeeded at 271. done ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Generating configure for obc-2.9.7 ===> Configuring for
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 08:50:51 Modified files: devel/meson: Makefile meson.port.mk devel/meson/patches: patch-mesonbuild_compilers_compilers_py Log message: Please codestyle.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 08:32:54 Modified files: devel/meson: Makefile Added files: devel/meson/patches: patch-run_unittests_py Log message: Start working on unit tests.
[PATCH] audio/cmus ffmpeg deprecation fixes (MAINTAINER)
Hi,
The following diff uses a patch from upstream to avoid some deprecation
warnings when building audio/cmus with our current version of FFmpeg.
Update my email address, while here.
(I'm not upgrading to the latest 2.8.0 for the moment. It's been
released just after the project has been declared not maintained, and
there are some regressions.)
Also available here if the diff gets mangled:
https://www.dwatteau.fr/tmp/cmus_ffmpeg_fixes-20190310.diff
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/audio/cmus/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile5 Dec 2018 20:19:00 - 1.19
+++ Makefile10 Mar 2019 12:53:48 -
@@ -7,7 +7,7 @@ V= 2.7.1
DISTNAME= cmus-${V}
PKGNAME-main= ${PKGNAME}
PKGNAME-ffmpeg=cmus-ffmpeg-${V}
-REVISION= 5
+REVISION= 6
GH_ACCOUNT=cmus
GH_PROJECT=cmus
@@ -16,7 +16,7 @@ GH_TAGNAME= v${V}
CATEGORIES=audio
HOMEPAGE= https://cmus.github.io/
-MAINTAINER=Donovan Watteau
+MAINTAINER=Donovan Watteau
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
Index: patches/patch-ffmpeg_c
===
RCS file: /cvs/ports/audio/cmus/patches/patch-ffmpeg_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ffmpeg_c
--- patches/patch-ffmpeg_c 6 Jun 2018 12:14:44 - 1.1
+++ patches/patch-ffmpeg_c 10 Mar 2019 12:53:48 -
@@ -8,6 +8,7 @@ among other things:
98ab2a6: Replace deprecated FFmpeg API
ef65f69: remove dead code for ancient ffmpeg versions
b595b8c: Fix ffmpeg plugin build
+9877eb0: Fixes ffmpeg deprecations
Index: ffmpeg.c
--- ffmpeg.c.orig
@@ -91,7 +92,7 @@ Index: ffmpeg.c
free(input);
}
-@@ -157,30 +128,9 @@ static void ffmpeg_init(void)
+@@ -157,26 +128,7 @@ static void ffmpeg_init(void)
av_log_set_level(AV_LOG_QUIET);
@@ -115,14 +116,18 @@ Index: ffmpeg.c
-
- register_protocol(_protocol);
-#else
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100)
/* We could register decoders explicitly to save memory, but we have to
* be careful about compatibility. */
av_register_all();
--#endif
- }
-
- static int ffmpeg_open(struct input_plugin_data *ip_data)
-@@ -197,22 +147,14 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+@@ -193,26 +145,21 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+ AVCodec *codec;
+ AVCodecContext *cc = NULL;
+ AVFormatContext *ic = NULL;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++ AVCodecParameters *cp = NULL;
++#endif
+ SwrContext *swr = NULL;
ffmpeg_init();
@@ -145,9 +150,39 @@ Index: ffmpeg.c
if (err < 0) {
d_print("unable to find stream info: %d\n", err);
err = -IP_ERROR_FILE_FORMAT;
-@@ -235,20 +177,16 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+@@ -220,11 +167,21 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+ }
+
+ for (i = 0; i < ic->nb_streams; i++) {
++
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++ cp = ic->streams[i]->codecpar;
++ if (cp->codec_type == AVMEDIA_TYPE_AUDIO) {
++ stream_index = i;
++ break;
++ }
++#else
++
+ cc = ic->streams[i]->codec;
+ if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ stream_index = i;
+ break;
+ }
++#endif
+ }
+ if (stream_index == -1) {
+@@ -233,22 +190,24 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+ break;
+ }
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++ codec = avcodec_find_decoder(cp->codec_id);
++ cc = avcodec_alloc_context3(codec);
++ avcodec_parameters_to_context(cc, cp);
++#else
codec = avcodec_find_decoder(cc->codec_id);
++#endif
if (!codec) {
- d_print("codec not found: %d, %s\n", cc->codec_id,
cc->codec_name);
+ d_print("codec not found: %d, %s\n", cc->codec_id,
avcodec_get_name(cc->codec_id));
@@ -170,19 +205,22 @@ Index: ffmpeg.c
err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
break;
}
-@@ -258,11 +196,7 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
+@@ -258,11 +217,10 @@ static int ffmpeg_open(struct input_plugin_data *ip_da
if (err < 0)
Re: UPDATE: www/stagit 0.8->0.9.1
On Fri, Mar 01, 2019 at 11:17:48AM +0100, Hiltjo Posthuma wrote:
> - Respect system LDFLAGS.
> - Use the main releases location (2f30 is a mirror).
> - Remove now unneeded config.mk patch: stagit now checks #ifdef __OpenBSD__
> for pledge(2).
Thanks, I'll commit soon. Two things, though:
> MAKE_FLAGS= CC='${CC}' \
> - CFLAGS='${CFLAGS}' \
> - COMPATOBJ='' \
> - GITINC=${LOCALBASE}/include \
> - GITLIB=${LOCALBASE}/lib
> + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
> + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgit2" \
> + COMPATOBJ=''
I'd go with all single quotes here for consistency (with CC='${CC}').
> --- a/www/stagit/pkg/PLIST
> +++ b/www/stagit/pkg/PLIST
> @@ -3,10 +3,10 @@
> @bin bin/stagit-index
> @man man/man1/stagit-index.1
> @man man/man1/stagit.1
> -share/stagit/
> -share/stagit/README
> -share/stagit/example_create.sh
> -share/stagit/example_post-receive.sh
> -share/stagit/favicon.png
> -share/stagit/logo.png
> -share/stagit/style.css
> +share/doc/stagit/
> +share/doc/stagit/README
This is documentation,
> +share/doc/stagit/example_create.sh
> +share/doc/stagit/example_post-receive.sh
these are examples,
> +share/doc/stagit/favicon.png
> +share/doc/stagit/logo.png
> +share/doc/stagit/style.css
those as well, but I'd count them as static files, too.
Not sure how much I'm nitpicking here, but what about using the
appropiate directories as per our porters guide?
read-only architecture-independent: /usr/local/share/
misc documentation: /usr/local/share/doc/
examples files: /usr/local/share/examples/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2019/03/10 06:40:35 Modified files: security/pdf-parser: Makefile distinfo Log message: update pdf-parser to 0.7.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 06:38:57 Modified files: devel/meson: Makefile meson.port.mk Added files: devel/meson/patches: patch-mesonbuild_compilers_compilers_py Log message: Set b_lundef to false by default.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 06:17:39 Modified files: textproc/link-grammar: Makefile distinfo textproc/link-grammar/patches: patch-bindings_perl_Makefile_in patch-bindings_python_Makefile_in patch-link-grammar_utilities_h textproc/link-grammar/pkg: PLIST-main PLIST-python Added files: textproc/link-grammar/patches: patch-link-grammar_utilities_c Log message: Update to link-grammar-5.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/03/10 06:17:07 Modified files: multimedia/mlt : Makefile Log message: mlt: requires -std=c++11 when built with ports-gcc-4.9 Tested successfully on macppc. OK rsadowski@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 05:54:35 Modified files: audio : Makefile audio/pavucontrol: Makefile distinfo audio/pavucontrol/pkg: PLIST Log message: Update to pavucontrol-4.0. - gtk+2 support has been dropped
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 05:45:50 Modified files: audio/audacity : Makefile distinfo audio/audacity/patches: patch-configure patch-lib-src_libnyquist_nyquist_xlisp_xlisp_h patch-src_AudioIO_cpp patch-src_MemoryX_h Log message: Update to audacity-2.3.1. Still BROKEN but at least we can start working on the newest release. Remove WANTLIB while here, they prevent from even extracting; we'll add them back once the port builds.
NEW: audio/portmidi (unbreak audacity)
The attached portmidi.tar.gz contains a port of the newest release from 2010.
I've added very rudimentary and incomplete support for sndio, it's just enough
for playing a midi track via audacity. The sndio stuff is in files/pm_sndio/.
It is extremely simple compared to the alsa version (pm_linux). :)
Audacity can then use the shared portmidi library instead of the bundled
version. The attached audacity.diff does that.
It seems to work ok, I've tested midi playback in audacity using fluidsynth.
Any thoughts or comments?
portmidi.tar.gz
Description: application/tar-gz
Index: Makefile
===
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 Makefile
--- Makefile6 Mar 2019 20:42:12 - 1.57
+++ Makefile10 Mar 2019 11:23:44 -
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.57 2019/03/06 20:42:12 ajacoutot Exp $
-BROKEN=missing portmidi support
-
COMMENT= free audio editor
V= 2.2.2
@@ -16,42 +14,52 @@ HOMEPAGE= http://audacity.sourceforge.ne
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC FLAC++ SoundTouch X11 Xcomposite
-WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += atk-1.0 c cairo expat fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += id3tag intl m mad ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += portaudio samplerate sndfile tag vamp-hostsdk vorbis
-# XXX wxwidgets WANTLIB
-WANTLIB += vorbisenc vorbisfile z
+WANTLIB += ${COMPILER_LIBCXX} FLAC FLAC++ ICE SDL2 SM SoundTouch
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xxf86vm atk-1.0 atk-bridge-2.0 c cairo
+WANTLIB += cairo-gobject epoxy expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv id3tag intl
+WANTLIB += jpeg m mad mspack notify ogg pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png16 portaudio portmidi
+WANTLIB += samplerate sndfile sndio soxr tiff usbhid vorbis vorbisenc
+WANTLIB += vorbisfile wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
+WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
+WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm
+WANTLIB += z db jack
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
BUILD_DEPENDS= archivers/zip \
devel/gettext-tools \
shells/bash
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
+ audio/jack \
audio/libsoxr \
audio/flac \
audio/libvorbis \
audio/libid3tag \
audio/libmad \
audio/portaudio-svn>=1406p1 \
- audio/soundtouch \
- audio/taglib
+ audio/portmidi \
+ audio/soundtouch
# XXX libtool/ld(1) fail to find libvamp-hostsdk.so
#LIB_DEPENDS+= audio/vamp-plugin-sdk>=2.2.1p0
RUN_DEPENDS= devel/desktop-file-utils \
- misc/shared-mime-info
+ misc/shared-mime-info \
+ x11/gtk+3,-guic
+
+SEPARATE_BUILD= No
USE_GMAKE= Yes
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" OBJCXX="${CXX}" \
- CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
${CPPFLAGS} \
CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
${CFLAGS}" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${LDFLAGS}"
-# Silence noisy warnings
-CONFIGURE_ENV+=CXXFLAGS="-Wno-inconsistent-missing-override
${CXXFLAGS}"
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib
${LDFLAGS}" \
+ CXXFLAGS="-std=c++11 ${CXXFLAGS}"
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \
${WRKSRC}/lib-src/lib-widget-extra \
@@ -71,12 +79,14 @@ CONFIGURE_ARGS= --enable-unicode \
--with-libmad=system \
--with-libflac=system \
--with-libid3tag=system \
+ --with-midi=yes \
--with-portaudio=system \
+ --with-portmidi=system \
--with-soundtouch=system \
--without-libtwolame \
--without-ffmpeg \
--without-redland \
- --without-slv2 \
+ --without-lv2 \
--without-liblrdf \
--with-portmixer=no
# XXX libtool/ld(1) fail to find libvamp-hostsdk.so
@@
Re: UPDATE: www/stagit 0.8->0.9.1
On Fri, Mar 01, 2019 at 11:17:48AM +0100, Hiltjo Posthuma wrote:
> Hi,
>
> This updates stagit from 0.8 to 0.9.1.
>
> Port changes:
>
> - Respect system LDFLAGS.
> - Use the main releases location (2f30 is a mirror).
> - Remove now unneeded config.mk patch: stagit now checks #ifdef __OpenBSD__
> for pledge(2).
>
>
> stagit project changes:
>
> - Fix compile for API change in new libgit2 0.28+ (libgit changed
> giterr_last()
> to git_error_last()).
> - Change order of commits in log from most recent to old to applied order.
> - Improve indication of changes, prefix with letters similar to CVS.
> - Improve heuristic of file rename changes.
> - Detect more filenames for README and LICENSE files: .md and COPYING.
> - Improve stylesheet (CSS).
> - Minor documentation improvements.
>
>
> Patch below:
>
>
> diff --git a/www/stagit/Makefile b/www/stagit/Makefile
> index 55f23797597..dc73aad1198 100644
> --- a/www/stagit/Makefile
> +++ b/www/stagit/Makefile
> @@ -2,11 +2,11 @@
>
> COMMENT =static git page generator
>
> -DISTNAME = stagit-0.8
> +DISTNAME = stagit-0.9.1
>
> CATEGORIES = www
>
> -HOMEPAGE = https://git.2f30.org/stagit/
> +HOMEPAGE = https://codemadness.org/
>
> # MIT/X Consortium License
> PERMIT_PACKAGE_CDROM = Yes
> @@ -16,13 +16,12 @@ WANTLIB = c git2
>
> LIB_DEPENDS =devel/libgit2/libgit2>=0.22
>
> -MASTER_SITES = https://dl.2f30.org/releases/
> +MASTER_SITES = https://codemadness.org/releases/stagit/
>
> MAKE_FLAGS= CC='${CC}' \
> - CFLAGS='${CFLAGS}' \
> - COMPATOBJ='' \
> - GITINC=${LOCALBASE}/include \
> - GITLIB=${LOCALBASE}/lib
> + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
> + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgit2" \
> + COMPATOBJ=''
>
> NO_TEST =Yes
>
> diff --git a/www/stagit/distinfo b/www/stagit/distinfo
> index 83181d38808..00a44d5cc0b 100644
> --- a/www/stagit/distinfo
> +++ b/www/stagit/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
> -SIZE (stagit-0.8.tar.gz) = 17378
> +SHA256 (stagit-0.9.1.tar.gz) = hRDMfq5rusctjMYQkuYi0fpxkvGevJrH/lkZIwC/55A=
> +SIZE (stagit-0.9.1.tar.gz) = 18426
> diff --git a/www/stagit/patches/patch-config_mk
> b/www/stagit/patches/patch-config_mk
> deleted file mode 100644
> index 34fae97ad5a..000
> --- a/www/stagit/patches/patch-config_mk
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: config.mk
> config.mk.orig
> -+++ config.mk
> -@@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS}
> - CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
> -
> - # OpenBSD 5.9+: use pledge(2)
> --#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE
> -DUSE_PLEDGE ${INCS}
> -+CPPFLAGS += -DUSE_PLEDGE
> diff --git a/www/stagit/pkg/PLIST b/www/stagit/pkg/PLIST
> index a92f071a033..6ecd7bc1368 100644
> --- a/www/stagit/pkg/PLIST
> +++ b/www/stagit/pkg/PLIST
> @@ -3,10 +3,10 @@
> @bin bin/stagit-index
> @man man/man1/stagit-index.1
> @man man/man1/stagit.1
> -share/stagit/
> -share/stagit/README
> -share/stagit/example_create.sh
> -share/stagit/example_post-receive.sh
> -share/stagit/favicon.png
> -share/stagit/logo.png
> -share/stagit/style.css
> +share/doc/stagit/
> +share/doc/stagit/README
> +share/doc/stagit/example_create.sh
> +share/doc/stagit/example_post-receive.sh
> +share/doc/stagit/favicon.png
> +share/doc/stagit/logo.png
> +share/doc/stagit/style.css
>
Bump, any thoughts on this port update?
--
Kind regards,
Hiltjo
[UPDATE] games/teeworlds 0.6.4 -> 0.7.2
Hi,
The following diff updates games/teeworlds from 0.6.4 to 0.7.2.
This requires my new devel/bam port, sent here:
https://marc.info/?l=openbsd-ports=155008600618612=2
Some changes:
* this now uses SDL2
* move bam to an independent port, to ease maintenance
* this can now run on strict-alignment archs (at least teeworlds_srv)
* don't bother removing the extra DejaVuSans.ttf font from
upstream, because they made this harder
* don't bother patching some scripts which aren't used during
the build
* make the gfx_texture_quality setting a noop at the moment,
to work around some libGLU crashes.
(I'm also updating my email address in MAINTAINER, while here)
The way to deal with gcc/clang in bam is really perfectible, but
teeworlds is its sole consumer and I've verified that it builds
on amd64, macppc and loongson.
As for the libGLU crashes, they're random and I have no idea if
the bug is in this port, X or SDL2 (I find SDL2 a bit less
reliable than SDL1, especially on macppc). gdb output here, if
someone understands which part is to blame:
https://www.dwatteau.fr/tmp/gdb_teeworlds_072_crash.txt
If you don't have an XDG desktop, you might need to
mkdir ~/.local/share to avoid a crash on startup. This will
be fixed in the next release.
The following diff is also available here, in case it gets
corrupted:
https://www.dwatteau.fr/tmp/teeworlds_072_update.diff
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/games/teeworlds/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile24 Oct 2018 14:28:04 - 1.24
+++ Makefile10 Mar 2019 09:54:36 -
@@ -1,77 +1,55 @@
# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:04 sthen Exp $
-# Crashes on strict-alignment archs, see: src/base/system.c:164
-ONLY_FOR_ARCHS=amd64 i386 powerpc
-
COMMENT= platform game featuring buggers equipped with weapons
-V= 0.6.4
+V= 0.7.2
DISTNAME= teeworlds-${V}-src
PKGNAME= teeworlds-${V}
+EXTRACT_SUFX= .tar.xz
CATEGORIES=games
-REVISION= 1
-
-HOMEPAGE= http://www.teeworlds.com/
-MAINTAINER=Donovan Watteau
+HOMEPAGE= https://www.teeworlds.com/
-BAM_VERSION= 0.4.0
-BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}
+MAINTAINER=Donovan Watteau
-MASTER_SITES= https://downloads.teeworlds.com/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
+MASTER_SITES= https://github.com/teeworlds/teeworlds/releases/download/${V}/
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= GL GLU SDL X11 c freetype m pthread ${COMPILER_LIBCXX} wavpack z
+WANTLIB= GL GLU SDL2 X11 c freetype m pthread ${COMPILER_LIBCXX} wavpack
z
+
+COMPILER= base-clang ports-gcc base-gcc
-COMPILER = base-clang ports-gcc base-gcc
+BUILD_DEPENDS= devel/bam
LIB_DEPENDS= audio/wavpack \
- devel/sdl
+ devel/sdl2
MODULES= lang/python
MODPY_RUNDEP= No
-SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
+SUBST_VARS=CC
NO_TEST= Yes
# Give it a chance on ppc
CXXFLAGS+= -fsigned-char
-post-extract:
- @mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}
-
pre-configure:
- @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
+ ${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
${WRKSRC}/src/game/client/gameclient.cpp \
- ${WRKSRC}/scripts/build.py \
- ${WRKSRC}/scripts/compiler.py \
- ${WRKSRC}/scripts/font_installer.sh \
- ${WRKSRC}/scripts/make_src.py \
- ${WRKSRC}/bam.lua \
- ${WRKSRC}/configure.lua \
- ${BAM_WRKSRC}/make_unix.sh \
- ${BAM_WRKSRC}/src/driver_gcc.lua \
- ${BAM_WRKSRC}/src/base.lua
+ ${WRKSRC}/{bam,configure}.lua
# Make sure internal wavpack and zlib can't be picked up
rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
- # Don't provide an extra copy of DejaVu
- rm -rf ${WRKSRC}/data/fonts
-
-# build bam executable - teeworlds own build system
-pre-build:
- cd ${BAM_WRKSRC} && /bin/sh -v make_unix.sh
do-build:
- cd ${WRKSRC} && CC=${CC} ${BAM_WRKSRC}/bam -a -v release
wavpack=${LOCALBASE}
+ cd ${WRKSRC} && env CXXFLAGS="${CXXFLAGS}" bam -a -v -j ${MAKE_JOBS} \
+ conf=release builddir=build wavpack=${LOCALBASE}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/build/teeworlds{,_srv} ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
- cd ${WRKSRC}; tar cf - data | tar xf - -C ${PREFIX}/share/teeworlds
+ cd ${WRKSRC}/build && tar cf - data | tar xf - -C
${PREFIX}/share/teeworlds
.include
Index: distinfo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2019/03/10 04:52:57 Modified files: graphics/krita : Makefile distinfo Log message: Update krita to 4.1.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 04:40:37 Modified files: games/openclonk: Makefile Log message: Sync WANTLIB.
Re: UPDATE: Nextcloud-15.0.5
On 05.03.19 08:32, Gonzalo L. Rodriguez wrote:
> The fart cloud needs you.
>
> On Fri, 01 Mar 2019 at 09:34:44 +0100, Gonzalo L. Rodriguez wrote:
> > Hello,
> >
> > Update for Nextcloud to 15.0.5:
> >
> > https://nextcloud.com/changelog/
> >
> > OK? Comments?
> >
> > Cheers.-
> >
> > --
> > Sending from my toaster.
>
Hi Gonzalo,
I've done a fresh install of Nextcloud, everything works. While I worked
through the points of the port's readme I found that the example config
for httpd(8) contains duplicate entries. The following diff sorts the
list alphabetically and removes the duplicates.
Cheers,
Bruno
Index: pkg/README
===
RCS file: /cvs/ports/www/nextcloud/pkg/README,v
retrieving revision 1.10
diff -u -p -r1.10 README
--- pkg/README 9 Dec 2018 14:06:26 - 1.10
+++ pkg/README 10 Mar 2019 10:33:45 -
@@ -28,7 +28,7 @@ The HTTP server must be able to resolve
The configuration of an SQLite database path is set relatively to the chroot in
Nextcloud which will break background jobs run by cron(8) (see below).
A symlink can be created to workaround this issue:
-# ln -f ${TINSTDIR) /nextcloud
+# ln -f ${INSTDIR) /nextcloud
OpenBSD HTTP daemon
---
@@ -49,26 +49,22 @@ server "domain.tld" {
}
# First deny access to the specified files
- location "/db_structure.xml"{ block }
location "/.ht*"{ block }
+ location "/.user*" { block }
+ location "/3rdparty*" { block }
location "/README" { block }
- location "/data*" { block }
- location "/config*" { block }
+ location "/autotest*" { block }
location "/build*" { block }
- location "/tests*" { block }
location "/config*" { block }
- location "/lib*"{ block }
- location "/3rdparty*" { block }
- location "/templates*" { block }
+ location "/console*"{ block }
location "/data*" { block }
- location "/.ht*"{ block }
- location "/.user*" { block }
- location "/autotest*" { block }
- location "/occ*"{ block }
- location "/issue*" { block }
- location "/indie*" { block }
location "/db_*"{ block }
- location "/console*"{ block }
+ location "/indie*" { block }
+ location "/issue*" { block }
+ location "/lib*"{ block }
+ location "/occ*"{ block }
+ location "/templates*" { block }
+ location "/tests*" { block }
location "/*.php*" {
root "/nextcloud"
Re: [UPDATE]: security/sshguard -> 2.3.1
On Sat, Jan 26, 2019 at 03:43:17PM +0100, Andreas Kusalananda Khri wrote: > Hi, Hello, > You will find a patch for security/sshguard attached, bringing sshguard > up to the newly released 2.3.1 (2019-01-01). > > As with the previous updates I've posted, this is a patch against > sshguard 1.5 which we have in the ports tree, and it also adds me as the > maintainer. > > The difference between 2.3.1 and the previous 2.3.0 release is minor, > but I updated the patch because there was a commit fixing the handling > of OpenSSH's "Did not receive identification string" message. > > The differences between 2.3.1 and the 1.5 release are too numerous to > list here, but see [1]. > > [1] > https://bitbucket.org/sshguard/sshguard/src/master/CHANGELOG.rst?fileviewer=file-view-default Thanks for the update. sshguard is running fine now after reboots. Running on amd64 with latest snapshot. Regards Markus
Re: UPDATE: x11/icwem 1.3.8 => 1.5.2
On Sat, Mar 09, 2019 at 06:54:11PM -0500, Brian Callahan wrote: > Hi ports -- Hi Brian, > Attached is a fairly large diff to update icewm to its newest version. > Upstream has changed; it's on GitHub now. > > Lots of patch shuffling. Lots of patches have gone away. > > Been running it on amd64 and macppc without any issues. at first the icons at the upper right corner weren't shown. Only three boxes without icons. The old theme "nice" was removed. Using the default theme they now look normal. Running on amd64 with latest snapshot. Works for me. Regards Markus
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/10 03:00:29 Modified files: devel/dconf/patches: patch-shm_dconf-shm_c devel/glib2/patches: patch-glib_gfileutils_c patch-glib_gutils_c x11/gtk+3/patches: patch-gtk_gtkplacessidebar_c patch-gtk_gtksettings_c Log message: Tweak comment.
