Re: UPDATE: www/rt 4.4.4
On Sun, Mar 24, 2019 at 02:37:36PM -0700, Andrew Hewus Fresh wrote:
> Also, I didn't like that running tests didn't work, so I messed with
> that a bit and there's a new patch here that enables tests to mostly
> run.
I got tests running under all three of mysql, postgresql, and sqlite,
but they all fail in pretty similar ways. I didn't spend any time
trying to solve the failures though, but this at least allows the
testing in an automated fashion.
There are a bunch of failures with:
Can't locate object method "new" via package "RT::Test::Web" at
/usr/ports/pobj/rt-4.4.4/rt-4.4.4/lib/RT/Test/Web.pm line 69.
Which means I'm setting *something* up wrong, but the suggestion I found
for that error was setting RTHOME and I couldn't make that have any
effect so that's probably the next thing to solve.
(also turns out it was bluhm@'s suggestion with FIX_EXTRACT_PERMISSIONS
so we don't actually need that)
Index: Makefile
===
RCS file: /cvs/ports/www/rt/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile28 Sep 2018 09:03:49 - 1.42
+++ Makefile26 Mar 2019 02:57:14 -
@@ -2,7 +2,7 @@
COMMENT= industrial-grade ticketing system
-DISTNAME= rt-4.4.3
+DISTNAME= rt-4.4.4
CATEGORIES=www
MAINTAINER=Robert Nagy
@@ -72,7 +72,6 @@ RUN_DEPENDS= converters/p5-Convert-ASN1
textproc/p5-Regexp-Common \
textproc/p5-String-ShellQuote \
textproc/p5-Text-Quoted \
- textproc/p5-Text-Quoted \
textproc/p5-Text-Template \
textproc/p5-Text-WikiFormat \
textproc/p5-Text-Wrapper \
@@ -127,22 +126,73 @@ BUILD_DEPENDS+= security/gnupg \
FLAVORS= pgsql sqlite
FLAVOR?=
+DATABASE= rt4test
+RT_TEST_CONFIG += BinPath q{$${WRKSRC}/bin}
+RT_TEST_CONFIG += SbinPathq{$${WRKSRC}/sbin}
+RT_TEST_CONFIG += StaticPath q{$${WRKSRC}/share/static}
+RT_TEST_CONFIG += EtcPath q{$${WRKDIR}/etc}
+RT_TEST_CONFIG += VarPath q{$${WRKDIR}$${VARBASE}/www}
+RT_TEST_CONFIG += MasonDataDirq{$${WRKDIR}$${VARBASE}/mason_data}
+RT_TEST_CONFIG += MasonSessionDir \
+ q{$${WRKDIR}$${VARBASE}/session_data}
+RT_TEST_CONFIG += DatabaseNameq{$${DATABASE}}
+RT_TEST_CONFIG += DatabaseUserq{$${USER}}
+
.if ${FLAVOR:Mpgsql}
RUN_DEPENDS+= databases/p5-DBD-Pg
CONFIGURE_ARGS+= --with-db-type=Pg
+MODULES+= databases/postgresql
+RT_TEST_CONFIG += DatabaseType q{Pg}
+RT_TEST_CONFIG += DatabaseHost q{${WRKDIR}}
+MODPOSTGRESQL_TEST_DBNAME =${DATABASE}
+MODPOSTGRESQL_TEST_CMD = \
+ ${LOCALBASE}/bin/createuser -s u${DATABASE} || \
+ (${LOCALBASE}/bin/pg_ctl stop -D ${_MODPOSTGRESQL_TEST_PGDATA} \
+ -m i && exit 1); \
+ perl -I${WRKSRC}/lib -I${WRKDIR}/etc ${WRKSRC}/sbin/rt-setup-database \
+ --action init --skip-create \
+ --datadir=${WRKDIR}/etc --dba-password=ignored; \
+${MAKE_PROGRAM} ${ALL_TEST_FLAGS} -f ${MAKE_FILE} ${TEST_TARGET}
.elif ${FLAVOR:Msqlite}
RUN_DEPENDS+= databases/p5-DBD-SQLite
+RT_TEST_CONFIG += DatabaseType q{SQLite}
CONFIGURE_ARGS+= --with-db-type=SQLite
.else
RUN_DEPENDS+= databases/p5-DBD-mysql
+MODULES+= databases/mariadb
+RT_TEST_CONFIG += DatabaseType q{mysql}
+RT_TEST_CONFIG += %DatabaseExtraDSN \
+ mysql_socket=>q{$${MODMARIADB_TEST_SOCKET}}
+MODMARIADB_TEST_DBNAME = ${DATABASE}
+MODMARIADB_TEST_CMD = \
+ perl -I${WRKSRC}/lib -I${WRKDIR}/etc ${WRKSRC}/sbin/rt-setup-database \
+ --action init --skip-create \
+ --datadir=${WRKDIR}/etc --dba-password=ignored; \
+ ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} -f ${MAKE_FILE} ${TEST_TARGET}
.endif
-# needs an initialized database and /etc/rt3/RT_Config.pm to be present
-TEST_IS_INTERACTIVE= Yes
-TEST_TARGET= test
-TEST_DEPENDS= devel/p5-Log-Dispatch-Perl
-# fill these in with appropriate values
-TEST_ENV= RT_DBA_USER=rt_user RT_DBA_PASSWORD=1234
+TEST_TARGET= test
+TEST_DEPENDS= ${RUN_DEPENDS} \
+ devel/p5-List-MoreUtils \
+ devel/p5-Log-Dispatch-Perl \
+ devel/p5-Test-MockTime \
+ devel/p5-Test-NoWarnings \
+ devel/p5-Universal-require
+TEST_ENV= RT_DBA_USER=u${DATABASE} RT_DBA_PASSWORD=1 \
+ PERL5LIB=${WRKDIR}/etc:${WRKSRC}/lib
+
+pre-test:
+ ${INSTALL_DATA_DIR} ${WRKDIR}/etc
+ ${INSTALL_DATA_DIR} ${WRKDIR}${VARBASE}
+ ${INSTALL_DATA_DIR} ${WRKDIR}${VARBASE}/www
+
Re: [update] py-attrs-18.2.0
On Tue, 26 Mar 2019 01:20:00 +, Stuart Henderson wrote: > > > Here is a diff to bump devel/py-attrs version. This is required > > > for yle-dl update. > > You were lucky and got away with it with that one, but plists for > python ports should be updated with FLAVOR=python3. What do you mean?
Re: [update] py-attrs-18.2.0
On 2019/03/25 20:57, Daniel Jakots wrote:
> On Sun, 30 Dec 2018 09:06:13 +0200, timo.my...@bittivirhe.fi (Timo
> Myyrä) wrote:
>
> > Hi,
> >
> > Here is a diff to bump devel/py-attrs version. This is required for
> > yle-dl update.
You were lucky and got away with it with that one, but plists for python
ports should be updated with FLAVOR=python3.
> Thanks committed!
> > Timo
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/py-attrs/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 Makefile
> > --- Makefile28 Apr 2018 10:41:38 - 1.2
> > +++ Makefile30 Dec 2018 07:05:21 -
> > @@ -2,7 +2,7 @@
> >
> > COMMENT = classes without boilerplate
> >
> > -MODPY_EGG_VERSION =17.4.0
> > +MODPY_EGG_VERSION =18.2.0
> >
> > DISTNAME = attrs-${MODPY_EGG_VERSION}
> > PKGNAME = py-${DISTNAME}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/devel/py-attrs/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 distinfo
> > --- distinfo28 Apr 2018 10:41:38 - 1.2
> > +++ distinfo30 Dec 2018 07:05:21 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (attrs-17.4.0.tar.gz) =
> > HHlgzP1qAFzZ97qITmMWteQwo/Gmw3xfh9i0P4O1Tsk= -SIZE
> > (attrs-17.4.0.tar.gz) = 97071 +SHA256 (attrs-18.2.0.tar.gz) =
> > EMv24n286MMIB8rwVsjrUJF+Dqr+hjR2cbVyVABsPmk= +SIZE
> > (attrs-18.2.0.tar.gz) = 116817 Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 PLIST
> > --- pkg/PLIST 28 Apr 2018 10:41:38 - 1.2
> > +++ pkg/PLIST 30 Dec 2018 07:05:21 -
> > @@ -3,22 +3,28 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/attr/__init__.py
> >
> > ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}/
> >
> > lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/attr/__init__.pyi
> > lib/python${MODPY_VERSION}/site-packages/attr/_compat.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/attr/_config.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/attr/_make.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/attr/converters.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/attr/converters.pyi
> > lib/python${MODPY_VERSION}/site-packages/attr/exceptions.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/attr/exceptions.pyi
> > lib/python${MODPY_VERSION}/site-packages/attr/filters.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/attr/filters.pyi
> > +lib/python${MODPY_VERSION}/site-packages/attr/py.typed
> > lib/python${MODPY_VERSION}/site-packages/attr/validators.py
> > +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/attr/validators.pyi
> >
> > lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> >
> > lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> >
> >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2019/03/25 19:02:47 Modified files: textproc/py-black: Makefile distinfo textproc/py-black/patches: patch-setup_py Log message: Update to py3-black-19.3beta0
Re: [update] py-attrs-18.2.0
On Sun, 30 Dec 2018 09:06:13 +0200, timo.my...@bittivirhe.fi (Timo
Myyrä) wrote:
> Hi,
>
> Here is a diff to bump devel/py-attrs version. This is required for
> yle-dl update.
Thanks committed!
> Timo
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-attrs/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile28 Apr 2018 10:41:38 - 1.2
> +++ Makefile30 Dec 2018 07:05:21 -
> @@ -2,7 +2,7 @@
>
> COMMENT = classes without boilerplate
>
> -MODPY_EGG_VERSION =17.4.0
> +MODPY_EGG_VERSION =18.2.0
>
> DISTNAME = attrs-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-attrs/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo28 Apr 2018 10:41:38 - 1.2
> +++ distinfo30 Dec 2018 07:05:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (attrs-17.4.0.tar.gz) =
> HHlgzP1qAFzZ97qITmMWteQwo/Gmw3xfh9i0P4O1Tsk= -SIZE
> (attrs-17.4.0.tar.gz) = 97071 +SHA256 (attrs-18.2.0.tar.gz) =
> EMv24n286MMIB8rwVsjrUJF+Dqr+hjR2cbVyVABsPmk= +SIZE
> (attrs-18.2.0.tar.gz) = 116817 Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 28 Apr 2018 10:41:38 - 1.2
> +++ pkg/PLIST 30 Dec 2018 07:05:21 -
> @@ -3,22 +3,28 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/attr/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/attr/__init__.pyi
> lib/python${MODPY_VERSION}/site-packages/attr/_compat.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/attr/_config.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/attr/_make.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/attr/converters.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/attr/converters.pyi
> lib/python${MODPY_VERSION}/site-packages/attr/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/attr/exceptions.pyi
> lib/python${MODPY_VERSION}/site-packages/attr/filters.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/attr/filters.pyi
> +lib/python${MODPY_VERSION}/site-packages/attr/py.typed
> lib/python${MODPY_VERSION}/site-packages/attr/validators.py
> +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/attr/validators.pyi
>
> lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
> lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2019/03/25 18:57:17 Modified files: devel/py-attrs : Makefile distinfo devel/py-attrs/pkg: PLIST Log message: Update to py-attrs-18.2.0 >From Timo Myyra
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/03/25 16:41:13 Added files: www/chromium/patches: patch-third_party_swiftshader_src_Reactor_BUILD_gn patch-third_party_swiftshader_third_party_llvm-7_0_BUILD_gn patch-third_party_swiftshader_third_party_llvm-7_0_configs_linux_include_llvm_Config_config_h Log message: unbreak build on arm64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2019/03/25 14:17:47 Modified files: lang/gcc/8 : Makefile distinfo lang/gcc/8/patches: patch-gcc_ada_adaint_c patch-gcc_c_c-decl_c patch-gcc_config_alpha_alpha_c patch-gcc_config_gcc patch-gcc_config_i386_i386_c patch-gcc_config_i386_i386_h patch-gcc_config_rs6000_rs6000_c patch-gcc_config_sparc_sparc_c patch-gcc_defaults_h patch-gcc_opts_c patch-libstdc++-v3_configure Removed files: lang/gcc/8/patches: patch-gcc_tree-vect-stmts_c Log message: Update to GCC 8.3.0, and regenerate bootstrap on amd64, hppa and powerpc. Also tested on armv7, arm64 and sparc64. Earlier diff from Brad.
Re: [new] mail/opendmarc
On 2019/03/25 16:20, Renaud Allard wrote:
>
>
> On 3/25/19 3:31 PM, Stuart Henderson wrote:
> > On 2019/03/25 15:22, Renaud Allard wrote:
> > > Hello,
> > >
> > > Here is a port for mail/opendmarc, this will allow the use of the library
> > > in
> > > other mail programs.
> > >
> > > Best Regards
> > >
> >
> > Comments from a quick read through
> >
> > - one entry per line in LIB_DEPENDS please
> >
> > - "LIB_DEPENDS mail/libspf2 not needed for mail/opendmarc ?"
> >-> see DIAGNOSTICS in bsd.port.mk(5)
> >
> > - there's an empty share/examples/opendmarc/ in PLIST (which isn't
> >created by the port build, so packaging fails)
> >
> > - some config samples are in share/doc/opendmarc/
> >
> > - DESCR could do with more information about what's included in the
> >package and less about the sponsors
> >
> > - missing user/group and rc script for the daemon
> >
>
> I have attached a better one which also needs:
> --- infrastructure/db/user.list 7 Mar 2019 20:59:29 - 1.339
> +++ infrastructure/db/user.list 25 Mar 2019 15:04:52 -
> @@ -341,3 +341,4 @@ id usergroup port options
> 830 _pdns_recursor _pdns_recursor net/powerdns_recursor
> 831 _dicod _dicod net/dico
> 832 _litecoind _litecoind net/litecoin
> +833 _opendmarc _opendmarc mail/opendmarc
Getting there; couple of small things
- don't hardcode _opendmarc in the rc script, use ${daemon_user}
- missing $OpenBSD$ line in rc script
I haven't tried building it yet.
Re: [change] mail/exim add spf commands
On 2019/03/25 10:41, Renaud Allard wrote:
> Hello,
>
> This patch adds spf commands to exim.
>
> Best Regards
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/exim/Makefile,v
> retrieving revision 1.121
> diff -u -p -r1.121 Makefile
> --- Makefile 12 Feb 2019 11:48:33 - 1.121
> +++ Makefile 25 Mar 2019 09:30:38 -
> @@ -27,7 +27,8 @@ MASTER_SITES = https://ftp.exim.org/pub
> ftp://ftp.exim.org/pub/exim/exim4/ \
> http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/
>
> -LIB_DEPENDS-main = converters/libiconv devel/pcre
> +LIB_DEPENDS-main = converters/libiconv devel/pcre mail/libspf2
like opendmarc: one dep per line, and you have libspf2 without an
accompanying WANTLIB. if you didn't get a 'NOT NEEDED' error then it's
because of ...
> +RUN_DEPENDS-main = mail/libspf2
... you shouldn't have the same thing in RUN_DEPENDS and LIB_DEPENDS
> +@@ -985,9 +985,9 @@ ZCAT_COMMAND=/usr/bin/zcat
> + # installed on your system (www.libspf2.org). Depending on where it is
> installed
> + # you may have to edit the CFLAGS and LDFLAGS lines.
> +
> +-# SUPPORT_SPF=yes
> +-# CFLAGS += -I/usr/local/include
> +-# LDFLAGS += -lspf2
> ++SUPPORT_SPF=yes
> ++CFLAGS += -I/usr/local/include
> ++LDFLAGS += -lspf2
Try it without CFLAGS here. If it fails then pass it in via the ports Makefile
somehow (as -I${LOCALBASE}/include, don't hardcode /usr/local).
> + # ENABLE_DISABLE_FSYNC=yes
> +
> + # End of EDITME for Exim 4.
> ++EXIM_MONITOR=eximon.bin
> ++ BIN_DIRECTORY=/usr/local/bin
> ++ CONFIGURE_FILE=/etc/exim/configure
> ++ LOOKUP_INCLUDE=
> ++ LOOKUP_LIBS=
> ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
> ++ CFLAGS=-O2 -pipe
> ++ INCLUDE=-I/usr/local/include
> ++EXIM_MONITOR=eximon.bin
> ++ BIN_DIRECTORY=/usr/local/bin
> ++ CONFIGURE_FILE=/etc/exim/configure
> ++ LOOKUP_INCLUDE=
> ++ LOOKUP_LIBS=
> ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
> ++ CFLAGS=-O2 -pipe
> ++ INCLUDE=-I/usr/local/include
> ++EXIM_MONITOR=eximon.bin
> ++ BIN_DIRECTORY=/usr/local/bin
> ++ CONFIGURE_FILE=/etc/exim/configure
> ++ LOOKUP_INCLUDE=
> ++ LOOKUP_LIBS=
> ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
> ++ CFLAGS=-O2 -pipe
> ++ INCLUDE=-I/usr/local/include
This chunk shouldn't be in the patch.
Also needs a REVISION bump.
ruby-pg 1.1.3 -> 1.1.4
Update to the latest version of pg. Changelog: * Fix PG::BinaryDecoder::Timestamp on 32 bit systems. * Add new error-codes of PostgreSQL-11. Tested on amd64. Will be committing in a couple days unless I hear objections. Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/databases/ruby-pg/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- Makefile29 Oct 2018 14:44:44 - 1.38 +++ Makefile24 Mar 2019 23:23:09 - @@ -2,7 +2,7 @@ COMMENT = PostgreSQL database interface for ruby -DISTNAME = pg-1.1.3 +DISTNAME = pg-1.1.4 CATEGORIES = databases MAINTAINER = Jeremy Evans Index: distinfo === RCS file: /cvs/ports/databases/ruby-pg/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo29 Oct 2018 14:44:44 - 1.23 +++ distinfo24 Mar 2019 23:23:13 - @@ -1,2 +1,2 @@ -SHA256 (pg-1.1.3.gem) = CwvnzBxpdY6EBrdG7alHMT/a9LJSEOe71tK1q/Pg0t4= -SIZE (pg-1.1.3.gem) = 233472 +SHA256 (pg-1.1.4.gem) = XooJOJ7lEWZDjApxMJd3PKOY7IM8gXrwW+3t7Fn3tjo= +SIZE (pg-1.1.4.gem) = 233984
ruby-sqlite 1.3.13 -> 1.4.0
Update to the latest version of ruby-sqlite3. The Changelog is listed
as:
* Enhancements
* Better aggregator support
* Bugfixes
* Various
There is also at least the introduction of support for extended result
codes, and potentially more improvements.
Patches are no longer needed as we dropped rubinius support a long time
ago.
Tested on amd64.
Will be committing in a couple days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile13 Jun 2018 22:26:52 - 1.41
+++ Makefile8 Mar 2019 21:51:24 -
@@ -2,8 +2,7 @@
COMMENT= access a SQLite3 database from ruby
-DISTNAME= sqlite3-1.3.13
-REVISION= 1
+DISTNAME= sqlite3-1.4.0
CATEGORIES=databases
MAINTAINER = Jeremy Evans
@@ -25,7 +24,7 @@ TEST_DEPENDS= devel/ruby-mocha,${MODRUBY
${FULLPKGNAME}:${BUILD_PKGPATH}
do-test:
- cd ${WRKSRC}/test && ${RUBY} -I . -rubygems -e \
+ cd ${WRKSRC}/test && ${RUBY} -I . -e \
"require 'sqlite3'; Dir['test_*.rb'].each{|f| load(f)}"
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-sqlite3/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo4 Nov 2017 15:45:57 - 1.16
+++ distinfo8 Mar 2019 21:47:31 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-1.3.13.gem) = sTiiLg27tpvghUBnHav2AlmUN+OJpUBUuxd/btH9LgY=
-SIZE (sqlite3-1.3.13.gem) = 64512
+SHA256 (sqlite3-1.4.0.gem) = 3Y0pkcesrfecAKseF14QXHOJvJTzzEyKrhc9LTq+r14=
+SIZE (sqlite3-1.4.0.gem) = 70144
Index: patches/patch-ext_sqlite3_database_h
===
RCS file: patches/patch-ext_sqlite3_database_h
diff -N patches/patch-ext_sqlite3_database_h
--- patches/patch-ext_sqlite3_database_h29 Jun 2012 16:40:31 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-ext_sqlite3_database_h,v 1.1 2012/06/29 16:40:31 jeremy Exp $
-
-Define a dummy RB_GC_GUARD so it works on rubinius 1.2.4.
-
ext/sqlite3/database.h.origTue Jun 26 11:21:00 2012
-+++ ext/sqlite3/database.h Tue Jun 26 11:21:44 2012
-@@ -12,4 +12,8 @@ typedef sqlite3Ruby * sqlite3RubyPtr;
-
- void init_sqlite3_database();
-
-+#ifndef RB_GC_GUARD
-+#define RB_GC_GUARD(x) x
-+#endif
-+
- #endif
Index: patches/patch-test_test_integration_pending_rb
===
RCS file: patches/patch-test_test_integration_pending_rb
diff -N patches/patch-test_test_integration_pending_rb
--- patches/patch-test_test_integration_pending_rb 29 Jun 2012 16:40:31
- 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-test_test_integration_pending_rb,v 1.2 2012/06/29 16:40:31
jeremy Exp $
-
-Fix hang when running the test suite using rubinius. skip would be
-better but rubinius uses ruby 1.8 stdlib and doesn't support it.
-
test/test_integration_pending.rb.orig Wed Dec 31 16:00:00 1969
-+++ test/test_integration_pending.rb Tue Jun 26 10:44:55 2012
-@@ -21,6 +21,7 @@ class TC_Integration_Pending < SQLite3::TestCase
-
- def test_busy_handler_outwait
- skip("not working in 1.9") if RUBY_VERSION >= '1.9'
-+return if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-
- busy = Mutex.new
- busy.lock
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-sqlite3/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 4 Nov 2016 21:30:37 - 1.13
+++ pkg/PLIST 8 Mar 2019 21:48:56 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.13 2016/11/04 21:30:37 jeremy Exp $
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/.gemtest
+${GEM_LIB}/gems/${DISTNAME}/.travis.yml
${GEM_LIB}/gems/${DISTNAME}/API_CHANGES.rdoc
${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.rdoc
${GEM_LIB}/gems/${DISTNAME}/ChangeLog.cvs
@@ -9,6 +11,7 @@ ${GEM_LIB}/gems/${DISTNAME}/LICENSE
${GEM_LIB}/gems/${DISTNAME}/Manifest.txt
${GEM_LIB}/gems/${DISTNAME}/README.rdoc
${GEM_LIB}/gems/${DISTNAME}/Rakefile
+${GEM_LIB}/gems/${DISTNAME}/appveyor.yml
${GEM_LIB}/gems/${DISTNAME}/faq/
${GEM_LIB}/gems/${DISTNAME}/faq/faq.rb
${GEM_LIB}/gems/${DISTNAME}/faq/faq.yml
@@ -25,21 +28,24 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/
${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/translator.rb
${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/value.rb
${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/version.rb
+${GEM_LIB}/gems/${DISTNAME}/rakelib/
+${GEM_LIB}/gems/${DISTNAME}/rakelib/faq.rake
+${GEM_LIB}/gems/${DISTNAME}/rakelib/gem.rake
+${GEM_LIB}/gems/${DISTNAME}/rakelib/native.rake
+${GEM_LIB}/gems/${DISTNAME}/rakelib/vendor_sqlite3.rake
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/03/25 13:46:39 Modified files: mail/mozilla-thunderbird: Makefile distinfo mail/thunderbird-i18n: Makefile.inc distinfo Log message: Update to thunderbird 60.6.1. See https://www.thunderbird.net/en-US/thunderbird/60.6.1/releasenotes/ Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2019-11/ (not up yet but will be the same as mfsa2019-10)
Re: Fix KDE bulk issues
On Mon, Mar 25 2019, Rafael Sadowski wrote:
> Recently we had direct or indirect bulk issues with libkipi, libkdcraw,
> libksane. These ports have on consumers expect digikam-kde4.
>
> However, digikam-kde4 gives us the opportunity to build-in this ports.
> With the diff below we can avoid most KDE bulk conflicts but I need help
> with -dcraw and -libkipi. The automatic update does not work, for
> example:
>
> 1) Install digikam-kde4 from packages:
> $ pkg_add digikam-kde4
> digikam-kde4-4.13.0p6:libkexiv2-4.14.3p1: ok
> digikam-kde4-4.13.0p6:libkgeomap-15.08.3p4: ok
> digikam-kde4-4.13.0p6:libkdcraw-4.14.3p2: ok
> digikam-kde4-4.13.0p6:libkipi-4.14.3p2: ok
> digikam-kde4-4.13.0p6:libkface-15.08.3p3: ok
> digikam-kde4-4.13.0p6: ok
>
>
> 2.) Update digikam-kde4 and libk*
> $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
> digikam-kde4-4.13.0p8:libksane-4.14.3p4: ok
> digikam-kde4-4.13.0p8:libkface-15.08.3p3->15.08.3p4: ok
> digikam-kde4-4.13.0p8:libkgeomap-15.08.3p4->15.08.3p5: ok
> digikam-kde4-4.13.0p6->4.13.0p8: ok
> Running tags: ok
>
> We can see libkipi and libkdcraw will not update automatic?
Use pkg_add -uv. This would have shown @pkgpaths not matching. Also
you need a @conflict with the previous -icons subpackages.
> I don't
> quite understand why. pkgpath is set, REVISION bumped.
Diff on top of yours. Your also had broken "$OpenBSD:" rcsid markers.
HTH,
diff -pruN -x CVS ../digikam-kde4-rs/pkg/PLIST-dcraw ./pkg/PLIST-dcraw
--- ../digikam-kde4-rs/pkg/PLIST-dcraw Mon Mar 25 19:52:22 2019
+++ ./pkg/PLIST-dcraw Mon Mar 25 19:52:53 2019
@@ -1,5 +1,8 @@
-@comment $OpenBSD:
+@comment $OpenBSD$
@pkgpath x11/kde4/libkdcraw
+@pkgpath x11/kde4/libkdcraw,-main
+@pkgpath x11/kde4/libkdcraw,-icons
+@conflict kde4-libkdcraw-icons-<=4.14.3p3
@lib lib/libkdcraw.so.${LIBkdcraw_VERSION}
share/apps/libkdcraw/
share/apps/libkdcraw/profiles/
diff -pruN -x CVS ../digikam-kde4-rs/pkg/PLIST-libkipi ./pkg/PLIST-libkipi
--- ../digikam-kde4-rs/pkg/PLIST-libkipiMon Mar 25 19:52:22 2019
+++ ./pkg/PLIST-libkipi Mon Mar 25 19:52:39 2019
@@ -1,5 +1,8 @@
-@comment $OpenBSD:
+@comment $OpenBSD$
@pkgpath x11/kde4/libkipi
+@pkgpath x11/kde4/libkipi,-main
+@pkgpath x11/kde4/libkipi,-icons
+@conflict kde4-libkipi-icons-<=4.14.3p3
@bin bin/kxmlkipicmd
@lib lib/libkipi.so.${LIBkipi_VERSION}
share/apps/kipi/
diff -pruN -x CVS ../digikam-kde4-rs/pkg/PLIST-sane ./pkg/PLIST-sane
--- ../digikam-kde4-rs/pkg/PLIST-sane Mon Mar 25 19:52:22 2019
+++ ./pkg/PLIST-saneMon Mar 25 19:52:45 2019
@@ -1,4 +1,4 @@
-@comment $OpenBSD:
+@comment $OpenBSD$
@pkgpath x11/kde4/libksane
@lib lib/libksane.so.${LIBksane_VERSION}
share/icons/hicolor/16x16/actions/black-white.png
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/25 11:25:13 Modified files: astro/stellarium: Makefile distinfo astro/stellarium/pkg: PLIST Log message: Update to stellarium-0.19.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2019/03/25 10:10:04 Modified files: net/dnsdist: Makefile distinfo net/dnsdist/patches: patch-configure_ac Removed files: net/dnsdist/patches: patch-build-aux_gen-version Log message: Update to 1.3.3; take maintainership; ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2019/03/25 09:49:22 Modified files: misc/shared-mime-info: Makefile misc/shared-mime-info/patches: patch-update-mime-database_c Log message: unveil mime_path's parent directory with the 'r' permission to allow stat(1) on it and then also unveil paths configured in XDG_DATA_DIRS the same way so that the check_in_path_xdg_data() function can do its job after everything is done, call unveil(NULL, NULL) to disallow further calls to unveil ok ajacoutot@
Re: [new] mail/opendmarc
On 3/25/19 3:31 PM, Stuart Henderson wrote: On 2019/03/25 15:22, Renaud Allard wrote: Hello, Here is a port for mail/opendmarc, this will allow the use of the library in other mail programs. Best Regards Comments from a quick read through - one entry per line in LIB_DEPENDS please - "LIB_DEPENDS mail/libspf2 not needed for mail/opendmarc ?" -> see DIAGNOSTICS in bsd.port.mk(5) - there's an empty share/examples/opendmarc/ in PLIST (which isn't created by the port build, so packaging fails) - some config samples are in share/doc/opendmarc/ - DESCR could do with more information about what's included in the package and less about the sponsors - missing user/group and rc script for the daemon I have attached a better one which also needs: --- infrastructure/db/user.list 7 Mar 2019 20:59:29 - 1.339 +++ infrastructure/db/user.list 25 Mar 2019 15:04:52 - @@ -341,3 +341,4 @@ id usergroup port options 830 _pdns_recursor _pdns_recursor net/powerdns_recursor 831 _dicod _dicod net/dico 832 _litecoind _litecoind net/litecoin +833 _opendmarc _opendmarc mail/opendmarc opendmarc.tar.gz Description: application/gzip smime.p7s Description: S/MIME Cryptographic Signature
Re: [new] mail/opendmarc
On 2019/03/25 15:22, Renaud Allard wrote: > Hello, > > Here is a port for mail/opendmarc, this will allow the use of the library in > other mail programs. > > Best Regards > Comments from a quick read through - one entry per line in LIB_DEPENDS please - "LIB_DEPENDS mail/libspf2 not needed for mail/opendmarc ?" -> see DIAGNOSTICS in bsd.port.mk(5) - there's an empty share/examples/opendmarc/ in PLIST (which isn't created by the port build, so packaging fails) - some config samples are in share/doc/opendmarc/ - DESCR could do with more information about what's included in the package and less about the sponsors - missing user/group and rc script for the daemon
[new] mail/opendmarc
Hello, Here is a port for mail/opendmarc, this will allow the use of the library in other mail programs. Best Regards opendmarc.tar.gz Description: application/gzip smime.p7s Description: S/MIME Cryptographic Signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/25 08:41:55 Modified files: net/dhcpcd : Makefile Added files: net/dhcpcd/patches: patch-src_if-options_c patch-src_script_c Log message: oh, last pkg-readme change needs a fix from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/03/25 08:34:08 Modified files: net/dhcpcd : Makefile net/dhcpcd/pkg : README Log message: use 'script ""' instead of 'script /usr/bin/true' in sample config
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2019/03/25 08:29:53
Modified files:
astro/py-astral: Makefile
databases/py-sqlparse: Makefile
devel/flake8 : Makefile
devel/py-apipkg: Makefile
devel/py-asn1-modules: Makefile
devel/py-asn1 : Makefile
devel/py-attrs : Makefile
devel/py-automat: Makefile
devel/py-babel : Makefile
devel/py-backports-functools-lru-cache: Makefile
devel/py-backports-shutil-get-terminal-size: Makefile
devel/py-cairocffi: Makefile
devel/py-click-log: Makefile
devel/py-click : Makefile
devel/py-construct: Makefile
devel/py-country: Makefile
devel/py-dateutil: Makefile
devel/py-entrypoints: Makefile
devel/py-execnet: Makefile
devel/py-html5lib: Makefile
devel/py-incremental: Makefile
devel/py-jedi : Makefile
devel/py-jsonschema: Makefile
devel/py-jupyter_client: Makefile
devel/py-jupyter_core: Makefile
devel/py-lazy-object-proxy: Makefile
devel/py-more-itertools: Makefile
devel/py-nbconvert: Makefile
devel/py-nbformat: Makefile
devel/py-parso : Makefile
devel/py-path.py: Makefile
devel/py-pexpect: Makefile
devel/py-pluggy: Makefile
devel/py-prompt_toolkit: Makefile
devel/py-py: Makefile
devel/py-setuptools_scm: Makefile
devel/py-six : Makefile
devel/py-test-benchmark: Makefile
devel/py-test-localserver: Makefile
devel/py-test-mock: Makefile
devel/py-test-xdist: Makefile
devel/py-traitlets: Makefile
devel/py-virtualenv: Makefile
devel/py-wcwidth: Makefile
devel/py-wheel : Makefile
devel/py-wrapt : Makefile
devel/py-wurlitzer: Makefile
geo/py-fiona : Makefile
math/py-mpmath : Makefile
math/py-pandas : Makefile
net/poezio : Makefile
net/py-msgpack : Makefile
productivity/khal: Makefile
productivity/vdirsyncer: Makefile
security/py-rsa: Makefile
security/py-service_identity: Makefile
sysutils/borgbackup: Makefile
textproc/py-MarkupSafe: Makefile
textproc/py-jellyfish: Makefile
textproc/py-m2r: Makefile
textproc/py-xlrd: Makefile
www/py-betamax : Makefile
www/py-bleach : Makefile
www/py-flask : Makefile
www/py-hyperlink: Makefile
www/py-jinja2 : Makefile
www/py-requests-oauthlib: Makefile
www/py-requests-toolbelt: Makefile
www/py-requests: Makefile
x11/py-qtpy: Makefile
Log message:
Convert devel/py-test consumers to new MODPY_PYTEST
lang/python/python.port.mk revision 1.102 and 1.103 added
MODPY_TEST_LOCALE and MODPY_PYTEST respectively, nicely wrapping up the
usual pytest dance.
This removes hand-rolled do-tests from all 70 ports by setting
MODPY_PYTEST=Yes and MODPY_TEST_LOCALE as well as HOME=${WRKDIR} to TESTENV
as needed.
>From Kurt Mosiejczuk , thanks!
OK sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2019/03/25 08:03:49 Modified files: www/webkitgtk4 : Makefile Added files: www/webkitgtk4/patches: patch-Source_WTF_wtf_CheckedArithmetic_h patch-Source_WebCore_contentextensions_DFACombiner_cpp patch-Source_WebCore_contentextensions_NFAToDFA_cpp Log message: webkitgtk4: unbreak on powerpc - Fix some parts of the code that doesn't consider that char may be unsigned by default (powerpc, arm). - powerpc: use address relaxing and long calls. Also avoid building code that generates the __mulodi4 symbol with ports-clang on this arch. It fixes several linking errors. (Thanks to bcallah@ for his many hints!) OK jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/25 07:28:34 Modified files: devel/dtc : Makefile Added files: devel/dtc/patches: patch-libfdt_version_lds Log message: Add missing functions to version script so they're exported in the shared library. from upstream via Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2019/03/25 07:05:39 Modified files: lang/mono : Makefile Added files: lang/mono/patches: patch-mcs_class_System_System_Net_NetworkInformation_NetworkInterface_cs patch-mcs_class_System_System_Platform_cs Log message: fix mono's DNS lookup by using MacOsNetworkInterfaceAPI like FreeBSD does, fixes GitHub issue #8168, ok robert@ (maintainer)
Re: devel/simulavr cannot build (arv-gcc conflicts with riscv-elf-gcc)
On Sun, Mar 24 2019, Antoine Jacoutot wrote: > Hi. > > There's a conflict between avr-gcc and riscv-elf-gcc which prevents simulavr > from building (if riscv-elf-gcc is installed on the machine). > I'm not familiar with these ports so not sure which solution is prefered to > solve this. naddy@ committed a fix for the conflict in devel/riscv-elf/gcc but the conflict marker wasn't removed from devel/avr/gcc/pkg/PLIST --8<-- @comment $OpenBSD: PLIST,v 1.8 2018/09/07 20:11:08 jasper Exp $ @conflict riscv-elf-gcc-* @bin bin/avr-c++ @bin bin/avr-cpp @bin bin/avr-g++ [...] -->8-- I've just removed the conflict marker, said packages can be installed at the same time: russell /usr/ports/devel/avr/gcc$ pkg_info | grep gcc avr-gcc-5.4.0p2 Atmel AVR 8-bit RISC microcontrollers' XGCC gcc-4.9.4p18GNU compiler collection: core C compiler gcc-libs-4.9.4p18 GNU compiler collection: support libs riscv-elf-gcc-8.1.0p1 gcc for riscv-elf cross-development -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/03/25 06:58:45 Modified files: devel/avr/gcc : Makefile devel/avr/gcc/pkg: PLIST Log message: Remove leftover conflict marker (with riscv-elf-gcc) Spotted by ajacoutot@
Re: NEW: audio/portmidi (unbreak audacity)
On Mon, Mar 25 2019, Stuart Henderson wrote: > On 2019/03/25 13:08, Jeremie Courreges-Anglas wrote: >> - any reason to force -std=c++11 in CXXFLAGS? The build works fine for >> me with base-clang (which defaults to gnu++14). > > ports-gcc defaults to old c++ until we switch over to gcc 8. Yep but I'd like to know if it is actually needed. I have started a partial bulk on sparc64 to find out. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: NEW: audio/portmidi (unbreak audacity)
On 2019/03/25 13:08, Jeremie Courreges-Anglas wrote: > - any reason to force -std=c++11 in CXXFLAGS? The build works fine for > me with base-clang (which defaults to gnu++14). ports-gcc defaults to old c++ until we switch over to gcc 8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 06:17:44 Modified files: net/onionshare : Makefile distinfo net/onionshare/pkg: PLIST-gui PLIST-main Log message: Update to onionshare-2.0. Release notes: https://github.com/micahflee/onionshare/releases/tag/v2.0 ok bcallah@
Re: NEW: audio/portmidi (unbreak audacity)
On Fri, Mar 22 2019, Jeremie Courreges-Anglas wrote:
> Back to this,
>
> On Tue, Mar 12 2019, Raphael Graf wrote:
>> On Sun, Mar 10, 2019 at 08:06:59PM +0100, Jeremie Courreges-Anglas wrote:
>>> On Sun, Mar 10 2019, Raphael Graf wrote:
>>> > 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). :)
>>>
>>> Please comments below,
>>>
>>> > 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.
>>>
>>> I'm not sure I understand the rationale for all the changes contained in
>>> the audacity diff, but it definitely looks like an improvement! Sadly
>>> it doesn't apply any more, now that audacity has been updated to 2.3.1
>>> by Antoine.
>>
>> Attached is an new diff for audacity 2.3.1.
>> It works for me on amd64/i386, I couldn't test on other archs yet.
>> I didn't manage to make it work without the do-gen step, mainly because
>> some of the libs (e.g. FileDialog) where wrongly built as shared libs
>> instead of static libs.
>> Any help on improving the patches is welcome.
>
> ack. I may have some tweaks but the changes look sane overall.
> audacity seemed to run fine in my (limited) tests.
So, about your diff:
- audio/jack seems to be picked up even though it isn't actually used;
only ${WRKSRC}/lib-src/portaudio-v19 seems to actually make use of it
but we use audio/portaudio-svn instead. We could force-disable it.[1]
- was there a reason to disable LV2 support? I thought LV2 would be
nice to have, that's the reason why I added patches.
- is there a reason to set SEPARATE_BUILD=No? If so I think a comment
is due. [2]
- the CPPFLAGS change doesn't make sense to me
- any reason to force -std=c++11 in CXXFLAGS? The build works fine for
me with base-clang (which defaults to gnu++14).
Here's an updated diff with additional tweaks:
- reenable LV2 support, uses waf -> python.port.mk
- update HOMEPAGE (now with https)
- misc cleanup, eg NO_TEST comment appears irrelevant, simplify
CONFIGURE_ENV
- use ${SETENV} in do-gen to avoid polluting the environment
ok jca@ if you agree with my tweaks. [1] and [2] can be dealt with later
I think.
Index: Makefile
===
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile10 Mar 2019 11:45:50 - 1.58
+++ Makefile25 Mar 2019 12:02:31 -
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.58 2019/03/10 11:45:50 ajacoutot Exp $
-BROKEN=missing portmidi support
-
COMMENT= free audio editor
V= 2.3.1
@@ -11,40 +9,60 @@ CATEGORIES= audio
MASTER_SITES= https://github.com/audacity/audacity/archive/
-HOMEPAGE= http://audacity.sourceforge.net/
+HOMEPAGE= https://www.audacityteam.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-# XXX WANTLIB
+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
-BUILD_DEPENDS= archivers/zip \
+MODULES= lang/python
+MODPY_RUNDEP= No
+
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ archivers/zip \
devel/gettext-tools \
+ devel/libtool \
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
-# XXX libtool/ld(1) fail to find libvamp-hostsdk.so
-#LIB_DEPENDS+= audio/vamp-plugin-sdk>=2.2.1p0
+ audio/portmidi \
+ audio/soundtouch
RUN_DEPENDS=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2019/03/25 05:16:36 Modified files: x11/textsuggest: Makefile x11/textsuggest/pkg: PLIST Added files: x11/textsuggest/files: textsuggest-server.desktop Log message: Add a .desktop file for textsuggest-server. Makes it easy to set it up as a startup-application in Gnome. ok jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2019/03/25 05:16:07 ports/x11/textsuggest/files Update of /cvs/ports/x11/textsuggest/files In directory cvs.openbsd.org:/cvs.d/hack/stsp/textsuggest/files Log Message: Directory /cvs/ports/x11/textsuggest/files added to the repository
Re: x11/textsuggest: add a .desktop file
On Mon, Mar 25 2019, Stefan Sperling wrote:
> On Mon, Mar 25, 2019 at 11:18:46AM +0100, Stefan Sperling wrote:
>> With this, textsuggest-server can be more easily added as a
>> 'Startup Application' in gnome-tweaks.
>
> jca@ spotted wrong REVISION and hard-coded '/usr/local' in previous diff.
LGTM, ok jca@
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/textsuggest/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 17 Mar 2019 11:34:32 - 1.3
> +++ Makefile 25 Mar 2019 10:39:06 -
> @@ -3,6 +3,7 @@
> COMMENT =auto-complete and text expansion in X11
>
> V = 4.2.0
> +REVISION = 0
> DISTNAME = TextSuggest-v${V}
> PKGNAME =textsuggest-${V}
> CATEGORIES = x11
> @@ -64,5 +65,11 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/textsuggest/dictionaries
> ln -s /usr/share/dict/words \
> ${PREFIX}/share/textsuggest/dictionaries/English.txt
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
> + ${INSTALL_DATA} ${WRKBUILD}/img/TextSuggest.svg \
> + ${PREFIX}/share/icons/hicolor/scalable/apps
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> + ${INSTALL_DATA} ${FILESDIR}/textsuggest-server.desktop \
> + ${PREFIX}/share/applications
>
> .include
> Index: files/textsuggest-server.desktop
> ===
> RCS file: files/textsuggest-server.desktop
> diff -N files/textsuggest-server.desktop
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ files/textsuggest-server.desktop 25 Mar 2019 10:45:49 -
> @@ -0,0 +1,12 @@
> +[Desktop Entry]
> +Version=1.0
> +Encoding=UTF-8
> +Name=TextSuggest Server
> +Comment=auto-complete and text expansion
> +GenericName=TextSuggest Server
> +Exec=textsuggest-server
> +Terminal=false
> +X-MultipleArgs=false
> +Type=Application
> +Icon=TextSuggest
> +Categories=Application;System
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/textsuggest/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 14 Mar 2019 14:47:07 - 1.1.1.1
> +++ pkg/PLIST 25 Mar 2019 10:15:21 -
> @@ -4,6 +4,10 @@
> libexec/textsuggest/
> @bin libexec/textsuggest/command
> @bin libexec/textsuggest/math_expression
> +share/applications/textsuggest-server.desktop
> +share/icons/hicolor/scalable/apps/TextSuggest.svg
> share/textsuggest/
> share/textsuggest/dictionaries/
> share/textsuggest/dictionaries/English.txt
> +@tag gtk-update-icon-cache %D/share/icons/hicolor
> +@tag update-desktop-database
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: x11/textsuggest: add a .desktop file
On Mon, Mar 25, 2019 at 11:18:46AM +0100, Stefan Sperling wrote:
> With this, textsuggest-server can be more easily added as a
> 'Startup Application' in gnome-tweaks.
jca@ spotted wrong REVISION and hard-coded '/usr/local' in previous diff.
Index: Makefile
===
RCS file: /cvs/ports/x11/textsuggest/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile17 Mar 2019 11:34:32 - 1.3
+++ Makefile25 Mar 2019 10:39:06 -
@@ -3,6 +3,7 @@
COMMENT = auto-complete and text expansion in X11
V =4.2.0
+REVISION = 0
DISTNAME = TextSuggest-v${V}
PKGNAME = textsuggest-${V}
CATEGORIES = x11
@@ -64,5 +65,11 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/textsuggest/dictionaries
ln -s /usr/share/dict/words \
${PREFIX}/share/textsuggest/dictionaries/English.txt
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA} ${WRKBUILD}/img/TextSuggest.svg \
+ ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${FILESDIR}/textsuggest-server.desktop \
+ ${PREFIX}/share/applications
.include
Index: files/textsuggest-server.desktop
===
RCS file: files/textsuggest-server.desktop
diff -N files/textsuggest-server.desktop
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/textsuggest-server.desktop25 Mar 2019 10:45:49 -
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=TextSuggest Server
+Comment=auto-complete and text expansion
+GenericName=TextSuggest Server
+Exec=textsuggest-server
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=TextSuggest
+Categories=Application;System
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/textsuggest/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Mar 2019 14:47:07 - 1.1.1.1
+++ pkg/PLIST 25 Mar 2019 10:15:21 -
@@ -4,6 +4,10 @@
libexec/textsuggest/
@bin libexec/textsuggest/command
@bin libexec/textsuggest/math_expression
+share/applications/textsuggest-server.desktop
+share/icons/hicolor/scalable/apps/TextSuggest.svg
share/textsuggest/
share/textsuggest/dictionaries/
share/textsuggest/dictionaries/English.txt
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database
[change] mail/exim add spf commands
Hello,
This patch adds spf commands to exim.
Best Regards
Index: Makefile
===
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile 12 Feb 2019 11:48:33 - 1.121
+++ Makefile 25 Mar 2019 09:30:38 -
@@ -27,7 +27,8 @@ MASTER_SITES = https://ftp.exim.org/pub
ftp://ftp.exim.org/pub/exim/exim4/ \
http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/
-LIB_DEPENDS-main = converters/libiconv devel/pcre
+LIB_DEPENDS-main = converters/libiconv devel/pcre mail/libspf2
+RUN_DEPENDS-main = mail/libspf2
RUN_DEPENDS-eximon = ${PKGPATH},-main
LIB_DEPENDS-eximon = devel/pcre
Index: patches/patch-Local_Makefile
===
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Local_Makefile
--- patches/patch-Local_Makefile 19 Apr 2018 20:52:43 - 1.1
+++ patches/patch-Local_Makefile 25 Mar 2019 09:30:38 -
@@ -91,7 +91,7 @@ Index: Local/Makefile
# If you have content scanning you may wish to only include some of the scanner
# interfaces. Uncomment any of these lines to remove that code.
-@@ -635,16 +635,16 @@ FIXED_NEVER_USERS=root
+@@ -640,16 +640,16 @@ FIXED_NEVER_USERS=root
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -112,7 +112,7 @@ Index: Local/Makefile
# AUTH_TLS=yes
# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
-@@ -689,7 +689,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -694,7 +694,7 @@ HEADERS_CHARSET="ISO-8859-1"
# the Sieve filter support. For those OS where iconv() is known to be installed
# as standard, the file in OS/Makefile- contains
#
@@ -121,7 +121,7 @@ Index: Local/Makefile
#
# If you are not using one of those systems, but have installed iconv(), you
# need to uncomment that line above. In some cases, you may find that iconv()
-@@ -758,11 +758,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -763,11 +763,11 @@ HEADERS_CHARSET="ISO-8859-1"
# leave these settings commented out.
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -135,7 +135,7 @@ Index: Local/Makefile
# Uncomment the first and either the second or the third of these if you
# are using GnuTLS. If you have pkg-config, then the second, else the third.
-@@ -847,7 +847,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -852,7 +852,7 @@ HEADERS_CHARSET="ISO-8859-1"
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like this:
@@ -144,7 +144,7 @@ Index: Local/Makefile
# which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create
-@@ -919,7 +919,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
# Perl costs quite a lot of resources. Only do this if you really need it.
@@ -153,7 +153,20 @@ Index: Local/Makefile
#--
-@@ -1047,7 +1047,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -985,9 +985,9 @@ ZCAT_COMMAND=/usr/bin/zcat
+ # installed on your system (www.libspf2.org). Depending on where it is installed
+ # you may have to edit the CFLAGS and LDFLAGS lines.
+
+-# SUPPORT_SPF=yes
+-# CFLAGS += -I/usr/local/include
+-# LDFLAGS += -lspf2
++SUPPORT_SPF=yes
++CFLAGS += -I/usr/local/include
++LDFLAGS += -lspf2
+
+
+ #--
+@@ -1052,7 +1052,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time.
@@ -162,7 +175,7 @@ Index: Local/Makefile
#--
-@@ -1095,7 +1095,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -1100,7 +1100,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@@ -171,7 +184,7 @@ Index: Local/Makefile
#--
-@@ -1360,7 +1360,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1365,7 +1365,7 @@ EXIM_TMPDIR="/tmp"
# (process id) to a file so that it can easily be identified. The path of the
# file can be specified here. Some installations may want something like this:
@@ -180,3 +193,31 @@ Index: Local/Makefile
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
# using the name "exim-daemon.pid".
+@@ -1437,3 +1437,27 @@ EXIM_TMPDIR="/tmp"
+ # ENABLE_DISABLE_FSYNC=yes
+
+ # End of EDITME for Exim 4.
x11/textsuggest: add a .desktop file
With this, textsuggest-server can be more easily added as a
'Startup Application' in gnome-tweaks.
Index: Makefile
===
RCS file: /cvs/ports/x11/textsuggest/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile17 Mar 2019 11:34:32 - 1.3
+++ Makefile25 Mar 2019 10:15:21 -
@@ -3,6 +3,7 @@
COMMENT = auto-complete and text expansion in X11
V =4.2.0
+REVISION = 1
DISTNAME = TextSuggest-v${V}
PKGNAME = textsuggest-${V}
CATEGORIES = x11
@@ -64,5 +65,11 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/textsuggest/dictionaries
ln -s /usr/share/dict/words \
${PREFIX}/share/textsuggest/dictionaries/English.txt
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA} ${WRKBUILD}/img/TextSuggest.svg \
+ ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${FILESDIR}/textsuggest-server.desktop \
+ ${PREFIX}/share/applications
.include
Index: files/textsuggest-server.desktop
===
RCS file: files/textsuggest-server.desktop
diff -N files/textsuggest-server.desktop
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/textsuggest-server.desktop25 Mar 2019 10:15:31 -
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=TextSuggest Server
+Comment=auto-complete and text expansion
+GenericName=TextSuggest Server
+Exec=textsuggest-server
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=/usr/local/share/icons/hicolor/scalable/apps/TextSuggest.svg
+Categories=Application;System
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/textsuggest/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Mar 2019 14:47:07 - 1.1.1.1
+++ pkg/PLIST 25 Mar 2019 10:15:21 -
@@ -4,6 +4,10 @@
libexec/textsuggest/
@bin libexec/textsuggest/command
@bin libexec/textsuggest/math_expression
+share/applications/textsuggest-server.desktop
+share/icons/hicolor/scalable/apps/TextSuggest.svg
share/textsuggest/
share/textsuggest/dictionaries/
share/textsuggest/dictionaries/English.txt
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database
Re: update www/apache-httpd
On 3/25/19 9:27 AM, Solene Rapenne wrote:
> This updates to latest version released 22 january.
>
> Changelog: https://www.apache.org/dist/httpd/CHANGES_2.4.38
>
> apache works fine but I did not test it extensively.
>
works fine, tested with mod_perl and php.
ok giovanni@
Cheers
Giovanni
> Index: Makefile
> ===
> RCS file: /data/cvs/ports/www/apache-httpd/Makefile,v
> retrieving revision 1.92
> diff -u -p -r1.92 Makefile
> --- Makefile 1 Nov 2018 18:05:01 - 1.92
> +++ Makefile 25 Mar 2019 08:06:52 -
> @@ -4,7 +4,7 @@ COMMENT-main= apache HTTP server
> COMMENT-common= /var/www files for Apache HTTPd
> REVISION-main= 0
>
> -V= 2.4.37
> +V= 2.4.38
> DISTNAME=httpd-${V}
> PKGNAME= apache-httpd-${V}
>
> Index: distinfo
> ===
> RCS file: /data/cvs/ports/www/apache-httpd/distinfo,v
> retrieving revision 1.30
> diff -u -p -r1.30 distinfo
> --- distinfo 24 Oct 2018 13:23:59 - 1.30
> +++ distinfo 25 Mar 2019 08:07:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (httpd-2.4.37.tar.gz) = qpeoNKMtUZdL6NigE7Vh4o0yc4fLHaLDwnYqzQFGqr0=
> -SIZE (httpd-2.4.37.tar.gz) = 9177278
> +SHA256 (httpd-2.4.38.tar.gz) = ONC3OqMTwoBlv1j69kzsEr98fVGWFGEH3yrQdUGqJqY=
> +SIZE (httpd-2.4.38.tar.gz) = 9187294
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 03:34:11 Modified files: devel : Makefile Log message: +cudd
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 03:33:33 Log message: Import cudd-3.0.0. CUDD (Colorado University Decision Diagram) is a package written in C for the manipulation of decision diagrams. It supports binary decision diagrams (BDDs), algebraic decision diagrams (ADDs), and Zero-Suppressed BDDs (ZDDs). From Alessandro De Laurenzis; thanks! ok sthen@ Status: Vendor Tag: bentley Release Tags: bentley_20190325 N ports/devel/cudd/Makefile N ports/devel/cudd/distinfo N ports/devel/cudd/patches/patch-Makefile_in N ports/devel/cudd/pkg/DESCR N ports/devel/cudd/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2019/03/25 03:18:54 Modified files: devel/glib2: Makefile devel/glib2/patches: patch-gio_gdbusprivate_c Log message: Update my glib2 use-after-free patch to a version which passes upstream's regression tests. ok ajacoutot@
Re: macppc: Unbreak www/webkitgtk4 2.24
On Thu, Mar 21 2019, Charlene Wendling wrote: > Hi ports, > > This update causes various issues on powerpc (ports-clang is used > for this one): > > 1) "There's nowhere that max_align_t is defined" > >bcallah@ found this during an attempt to build webkigtk4 on macppc >with gcc-8.2 as ports-gcc [0]. I still use gcc-4.9 on my side, >same thing. I'll let him address this issue as he's working on it. > >Temporarily i made a quick fix in webkitgtk4's code itself. This has been fixed in g++-4.9.4p18. > 2) Unsigned char by default > >There are a few occurences of narrowing to signed char that >breaks the build on macppc. > >I fixed them as clang++ told me where they were. > > 3) __mulodi4 generated by ports-clang on powerpc > >This is a follow-up of my diff against v2.22. Code changed, and so >is the patch. > > Testing: > > - nothing is broken on amd64 (the build log is here, > ¡28 Mbytes! [1]), i used surf without issues. > - on macppc, it indeed builds, the runtime is still meh. > According to various tests i did, the network code may be to > blame [2]. > I can display a prefetched OpenBSD homepage, even run basic > javascript. As soon as i really want to browse online, i've the > classical "Internal webkit error". > > > Given that no webkitgtk4 means no Gnome, i felt like sharing early, > as iirc arm* will be hit by 2). Looks likely indeed. > Opinions, comments, testing [...] welcome :) The unsigned char fixes and the relocation overflow flags look fine. For 3) I'm wondering which other architectures might be affected, at least sparc64 isn't. Maybe 32 bits architectures only, like hppa? We may have to refine the #ifdef test later. ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: devel/glib2: fix use-after-free
On Fri, Mar 22, 2019 at 08:22:05PM +0100, Stefan Sperling wrote:
> For some time now I have noticed that logging into gnome from gdm
> sometimes failed on my systems, even with my user account in the
> 'staff' group to avoid the known problems with default resource limits.
> Gnome failed to start, and often gdm would not restart properly when
> this happened, leaving me with just a console screen.
>
> Today I found a core file from gnome-session-binary and with this
> I could track the above problem down to a use-after-free in glib2.
This patch has been added to the ports tree, and then submitted
upstream where problems were caught by regression tests:
https://gitlab.gnome.org/GNOME/glib/merge_requests/741/
This updates our port to a new version of my patch which passes
upstream's regression tests.
Index: Makefile
===
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.297
diff -u -p -r1.297 Makefile
--- Makefile23 Mar 2019 08:51:15 - 1.297
+++ Makefile25 Mar 2019 08:43:08 -
@@ -9,7 +9,7 @@ COMMENT=general-purpose utility librar
GNOME_PROJECT= glib
GNOME_VERSION= 2.58.3
PKGNAME= ${DISTNAME:S/glib/glib2/}
-REVISION= 6
+REVISION= 7
CATEGORIES=devel
Index: patches/patch-gio_gdbusprivate_c
===
RCS file: /cvs/ports/devel/glib2/patches/patch-gio_gdbusprivate_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gio_gdbusprivate_c
--- patches/patch-gio_gdbusprivate_c23 Mar 2019 08:51:15 - 1.1
+++ patches/patch-gio_gdbusprivate_c25 Mar 2019 08:43:28 -
@@ -1,5 +1,6 @@
$OpenBSD: patch-gio_gdbusprivate_c,v 1.1 2019/03/23 08:51:15 stsp Exp $
Fix use-after-free triggered by gnome-session-binary when Gnome restarts.
+https://gitlab.gnome.org/GNOME/glib/merge_requests/741/
ostream_flush_cb() was calling flush_data_list_complete() with a single
element list with an item that had already been freed:
@@ -20,7 +21,45 @@ https://developer.gnome.org/glib/stable/
Index: gio/gdbusprivate.c
--- gio/gdbusprivate.c.orig
+++ gio/gdbusprivate.c
-@@ -1788,10 +1788,17 @@ _g_dbus_worker_flush_sync (GDBusWorker*worker,
+@@ -1190,13 +1190,6 @@ ostream_flush_cb (GObject *source_object,
+ }
+ }
+
+- g_assert (data->flushers != NULL);
+- flush_data_list_complete (data->flushers, error);
+- g_list_free (data->flushers);
+-
+- if (error != NULL)
+-g_error_free (error);
+-
+ /* Make sure we tell folks that we don't have additional
+ flushes pending */
+ g_mutex_lock (>worker->write_lock);
+@@ -1205,6 +1198,12 @@ ostream_flush_cb (GObject *source_object,
+ data->worker->output_pending = PENDING_NONE;
+ g_mutex_unlock (>worker->write_lock);
+
++ g_assert (data->flushers != NULL);
++ flush_data_list_complete (data->flushers, error);
++ g_list_free (data->flushers);
++ if (error != NULL)
++g_error_free (error);
++
+ /* OK, cool, finally kick off the next write */
+ continue_writing (data->worker);
+
+@@ -1373,6 +1372,10 @@ iostream_close_cb (GObject *source_object,
+ g_assert (worker->output_pending == PENDING_CLOSE);
+ worker->output_pending = PENDING_NONE;
+
++ /* Ensure threads waiting for pending flushes to finish will be unblocked.
*/
++ worker->write_num_messages_flushed =
++worker->write_num_messages_written +
g_list_length(pending_flush_attempts);
++
+ g_mutex_unlock (>write_lock);
+
+ while (pending_close_attempts != NULL)
+@@ -1788,10 +1791,17 @@ _g_dbus_worker_flush_sync (GDBusWorker*worker,
if (data != NULL)
{
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2019/03/25 02:40:17 Modified files: x11/gnome/shell: Makefile Added files: x11/gnome/shell/patches: patch-src_main_c Log message: Disable a broken signal handler in gnome-shell which leads to core dumps. ok ajacoutot@
update www/apache-httpd
This updates to latest version released 22 january.
Changelog: https://www.apache.org/dist/httpd/CHANGES_2.4.38
apache works fine but I did not test it extensively.
Index: Makefile
===
RCS file: /data/cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile1 Nov 2018 18:05:01 - 1.92
+++ Makefile25 Mar 2019 08:06:52 -
@@ -4,7 +4,7 @@ COMMENT-main= apache HTTP server
COMMENT-common=/var/www files for Apache HTTPd
REVISION-main= 0
-V= 2.4.37
+V= 2.4.38
DISTNAME= httpd-${V}
PKGNAME= apache-httpd-${V}
Index: distinfo
===
RCS file: /data/cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo24 Oct 2018 13:23:59 - 1.30
+++ distinfo25 Mar 2019 08:07:08 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.37.tar.gz) = qpeoNKMtUZdL6NigE7Vh4o0yc4fLHaLDwnYqzQFGqr0=
-SIZE (httpd-2.4.37.tar.gz) = 9177278
+SHA256 (httpd-2.4.38.tar.gz) = ONC3OqMTwoBlv1j69kzsEr98fVGWFGEH3yrQdUGqJqY=
+SIZE (httpd-2.4.38.tar.gz) = 9187294
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/25 02:10:00 Modified files: devel/dtc : Makefile distinfo devel/dtc/patches: patch-Makefile Log message: Update to dtc-1.5.0. from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/03/25 02:10:49 Modified files: graphics/GraphicsMagick: Makefile distinfo graphics/GraphicsMagick/patches: patch-configure Log message: Update to GraphicsMagick-1.3.31. from Brad (maintainer)
gnome-shell: disable a broken signal handler
I have found a core file from gnome-shell in my home directory,
where gnome-shell got aborted by librthread because gnome-shell
was trying to lock the malloc mutex recursively.
What's happening here is that gnome-shell wants to print a gjs stack
trace when certain signals are caught, and sets up a signal handler
which uses stdio and malloc. This isn't safe. A correct approach would
be to print a stack dump from within the application's main loop after
a signal was caught. However, this main loop lives in mutter code, not
iin gnome-shell code. So the correct fix is a lot more involved than
the diff below and would likely require API changes in mutter to allow
gnome-shell to hook its handler at a suitable place.
For now, just disable this signal handler, which will always crash
on OpenBSD rather than producing stack trace information, to prevent
gnome-shell from littering home directories with useless core dumps.
ok?
Index: Makefile
===
RCS file: /cvs/ports/x11/gnome/shell/Makefile,v
retrieving revision 1.168
diff -u -p -r1.168 Makefile
--- Makefile6 Mar 2019 08:29:36 - 1.168
+++ Makefile25 Mar 2019 07:28:18 -
@@ -6,7 +6,7 @@ COMMENT=next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.30.2
-REVISION= 0
+REVISION= 1
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
Index: patches/patch-src_main_c
===
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_c25 Mar 2019 07:28:46 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+Disable broken signal handler which locks the malloc mutex recursively.
+
+#0 thrkill () at -:3
+#1 0x0dc8de8ca89e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
+#2 0x0dc8de93cbba in _rthread_mutex_timedlock (mutexp=Variable "mutexp"
is
+not available.
+)
+at /usr/src/lib/libc/thread/rthread_mutex.c:117
+#3 0x0dc8de8adf12 in malloc (size=128)
+at /usr/src/lib/libc/stdlib/malloc.c:1253
+#4 0x0dc8de947746 in _libc_vasprintf (str=0xdc9b1be0b08,
+fmt=0xdc935649217 "== Stack trace for context %p ==\n", ap=0xdc9b1be0ce0)
+at /usr/src/lib/libc/stdio/vasprintf.c:39
+#5 0x0dc975b5cbbd in g_vasprintf (string=0xdc9b1be0b08,
+format=0xdc935649217 "== Stack trace for context %p ==\n",
+args=0xdc9b1be0ce0) at ../glib-2.58.3/glib/gprintf.c:330
+#6 0x0dc975b13661 in g_strdup_vprintf (
+format=0xdc935649217 "== Stack trace for context %p ==\n",
+args=0xdc9b1be0ce0) at ../glib-2.58.3/glib/gstrfuncs.c:514
+#7 0x0dc975aef17f in g_printerr (
+format=0xdc935649217 "== Stack trace for context %p ==\n")
+at ../glib-2.58.3/glib/gmessages.c:3247
+#8 0x0dc935781742 in gjs_context_print_stack_stderr ()
+ from /usr/local/lib/libgjs.so.5.0
+#9 0x0dc9357817c5 in gjs_dumpstack () from /usr/local/lib/libgjs.so.5.0
+#10 0x0dc6bd8b62f0 in dump_gjs_stack_on_signal_handler (signo=6)
+
+Index: src/main.c
+--- src/main.c.orig
src/main.c
+@@ -348,6 +348,7 @@ dump_gjs_stack_on_signal_handler (int signo)
+ static void
+ dump_gjs_stack_on_signal (int signo)
+ {
++#if 0 /* this handler is disabled because it triggers malloc mutex recursion
*/
+ struct sigaction sa = { 0 };
+
+ sa.sa_flags = SA_RESETHAND | SA_NODEFER;
+@@ -356,6 +357,7 @@ dump_gjs_stack_on_signal (int signo)
+
+ sigaction (signo, , NULL);
+ _tracked_signals[signo] = TRUE;
++#endif
+ }
+
+ static gboolean
Re: lang/mono: fix DNS Name Resolution Failure
ok!
On 24/03/19 17:26 -0700, Thomas Frohwein wrote:
> Hi,
>
> Me and David Bern noticed for a while that mono runs into DNS Name Resolution
> Failure in draft for a port of OpenRA. I recently encountered it again when
> working with SMAPI, a modding plugin for the MonoGame Stardew Valley. It turns
> out that OpenBSD just gets ignored when checking for IPv4 and IPv6 capability.
>
> Adding OpenBSD in the same way as FreeBSD, so that MacOsNetworkInterfaceAPI is
> used for to set things up fixes the issue. I have tested this with both SMAPI
> and the OpenRA draft where the error is now gone and on OpenRA I can now
> download the assets from the menu as intended. SMAPI only uses this to check
> for updates of existing mods and there were none, but the
> NameResolutionFailure
> message is now gone.
>
> This fixes issue #8168 on GitHub [1] and has been submitted to upstream in
> pull
> request #13633 [2].
>
> ok?
>
> [1] https://github.com/mono/mono/issues/8168
> [2] https://github.com/mono/mono/pull/13633
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/mono/Makefile,v
> retrieving revision 1.123
> diff -u -p -r1.123 Makefile
> --- Makefile 11 Jan 2019 18:49:37 - 1.123
> +++ Makefile 25 Mar 2019 00:17:55 -
> @@ -5,7 +5,7 @@ USE_WXNEEDED= Yes
> COMMENT= cross platform, open source .NET developement framework
>
> V= 5.14.0.177
> -REVISION=0
> +REVISION=1
>
> DISTNAME=mono-${V}
>
> Index:
> patches/patch-mcs_class_System_System_Net_NetworkInformation_NetworkInterface_cs
> ===
> RCS file:
> patches/patch-mcs_class_System_System_Net_NetworkInformation_NetworkInterface_cs
> diff -N
> patches/patch-mcs_class_System_System_Net_NetworkInformation_NetworkInterface_cs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++
> patches/patch-mcs_class_System_System_Net_NetworkInformation_NetworkInterface_cs
> 25 Mar 2019 00:17:55 -
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Initialize network interface for OpenBSD like for FreeBSD to address issue
> +https://github.com/mono/mono/issues/8168
> +Pull Request: https://github.com/mono/mono/pull/13633
> +
> +Index: mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
> +--- mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs.orig
> mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
> +@@ -526,7 +526,7 @@ namespace System.Net.NetworkInformation {
> + bool runningOnUnix = (Environment.OSVersion.Platform ==
> PlatformID.Unix);
> +
> + if (runningOnUnix) {
> +-if (Platform.IsMacOS || Platform.IsFreeBSD)
> ++if (Platform.IsMacOS || Platform.IsFreeBSD ||
> Platform.IsOpenBSD)
> + return new MacOsNetworkInterfaceAPI ();
> +
> + return new LinuxNetworkInterfaceAPI ();
> Index: patches/patch-mcs_class_System_System_Platform_cs
> ===
> RCS file: patches/patch-mcs_class_System_System_Platform_cs
> diff -N patches/patch-mcs_class_System_System_Platform_cs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-mcs_class_System_System_Platform_cs 25 Mar 2019 00:17:55
> -
> @@ -0,0 +1,42 @@
> +$OpenBSD$
> +
> +add bool for Platform.IsOpenBSD, to address
> +https://github.com/mono/mono/issues/8168
> +Upstreamed in PR: https://github.com/mono/mono/pull/13633
> +
> +Index: mcs/class/System/System/Platform.cs
> +--- mcs/class/System/System/Platform.cs.orig
> mcs/class/System/System/Platform.cs
> +@@ -48,6 +48,7 @@ namespace System {
> +
> + #else
> + static bool isFreeBSD;
> ++static bool isOpenBSD;
> +
> + [DllImport ("libc")]
> + static extern int uname (IntPtr buf);
> +@@ -68,6 +69,9 @@ namespace System {
> + case "FreeBSD":
> + isFreeBSD = true;
> + break;
> ++case "OpenBSD":
> ++isOpenBSD = true;
> ++break;
> + }
> + }
> + Marshal.FreeHGlobal (buf);
> +@@ -88,6 +92,14 @@ namespace System {
> + if (!checkedOS)
> + CheckOS();
> + return isFreeBSD;
> ++}
> ++}
> ++
> ++public static bool IsOpenBSD {
> ++get {
> ++if (!checkedOS)
> ++CheckOS();
> ++return isOpenBSD;
> + }
> + }
> + }
>
Fix KDE bulk issues
Recently we had direct or indirect bulk issues with libkipi, libkdcraw,
libksane. These ports have on consumers expect digikam-kde4.
However, digikam-kde4 gives us the opportunity to build-in this ports.
With the diff below we can avoid most KDE bulk conflicts but I need help
with -dcraw and -libkipi. The automatic update does not work, for
example:
1) Install digikam-kde4 from packages:
$ pkg_add digikam-kde4
digikam-kde4-4.13.0p6:libkexiv2-4.14.3p1: ok
digikam-kde4-4.13.0p6:libkgeomap-15.08.3p4: ok
digikam-kde4-4.13.0p6:libkdcraw-4.14.3p2: ok
digikam-kde4-4.13.0p6:libkipi-4.14.3p2: ok
digikam-kde4-4.13.0p6:libkface-15.08.3p3: ok
digikam-kde4-4.13.0p6: ok
2.) Update digikam-kde4 and libk*
$ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
digikam-kde4-4.13.0p8:libksane-4.14.3p4: ok
digikam-kde4-4.13.0p8:libkface-15.08.3p3->15.08.3p4: ok
digikam-kde4-4.13.0p8:libkgeomap-15.08.3p4->15.08.3p5: ok
digikam-kde4-4.13.0p6->4.13.0p8: ok
Running tags: ok
We can see libkipi and libkdcraw will not update automatic? I don't
quite understand why. pkgpath is set, REVISION bumped.
I'm looking forward to helpful replies and hope that this solution will
be accepted.
RS
Index: Makefile
===
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile24 Mar 2019 13:45:20 - 1.32
+++ Makefile25 Mar 2019 06:11:33 -
@@ -2,7 +2,10 @@
COMMENT-face = face detection library for KDE4
COMMENT-geomap = library for mapping photos on maps for KDE4
+COMMENT-libkipi = KDE4 image plugins infrastructure
COMMENT-kipi = KDE4 image plugins collection
+COMMENT-dcraw =KDE4 RAW picture decoding C++ library
+COMMENT-sane = KDE4 SANE (scanner) wrapper library
COMMENT-main = KDE4 photo management utility
COMMENT-mediawiki =KIPI4 interface for MediaWiki
@@ -13,19 +16,28 @@ DISTNAME = digikam-${VERSION}
PKGSPEC-main = digikam-kde4->=1
PKGSPEC-kipi = kipi-plugins->=1
+PKGSPEC-libkipi = libkipi-${MODKDE4_SPEC}
+PKGSPEC-dcraw =libkdcraw-${MODKDE4_SPEC}
PKGNAME = digikam-kde4-${VERSION}
PKGNAME-face = libkface-15.08.3
PKGNAME-geomap = libkgeomap-15.08.3
+PKGNAME-libkipi = libkipi-${MODKDE4_VERSION}
+PKGNAME-dcraw =libkdcraw-${MODKDE4_VERSION}
+PKGNAME-sane = libksane-${MODKDE4_VERSION}
PKGNAME-kipi = kipi-plugins-${VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-mediawiki =libmediawiki-1.0.0
-REVISION-main =7
-REVISION-kipi =8
+REVISION-main =8
+REVISION-kipi =9
+REVISION-libkface =3
+REVISION-dcraw = 3
+REVISION-libkipi = 3
+REVISION-sane =4
REVISION-mediawiki = 8
-REVISION-face= 4
-REVISION-geomap= 5
+REVISION-face =4
+REVISION-geomap = 5
# LGPL, GPL and many others
PERMIT_PACKAGE_CDROM = Yes
@@ -36,8 +48,11 @@ SHARED_LIBS += digikamdatabase 0.1
SHARED_LIBS += mediawiki 0.1
SHARED_LIBS += kface 0.1 # 3.0
SHARED_LIBS += kgeomap 0.1 # 2.1
+SHARED_LIBS += kdcraw51.0 # 23.0
+SHARED_LIBS += kipi 51.0 # 11.1
+SHARED_LIBS += ksane 51.0 # 0.2
-MULTI_PACKAGES = -main -face -geomap -kipi -mediawiki
+MULTI_PACKAGES = -main -face -sane -dcraw -libkipi -geomap -kipi
-mediawiki
MASTER_SITES = ${MASTER_SITE_KDE:=Attic/digikam/}
EXTRACT_SUFX = .tar.bz2
@@ -56,10 +71,9 @@ WANTLIB-kipi += ${MODPHONON_WANTLIB}
WANTLIB-kipi += c GL GLU ICE SM X11 Xext Xrandr expat z
WANTLIB-kipi += lib/qt4/QtNetwork lib/qt4/QtOpenGL lib/qt4/QtXmlPatterns
WANTLIB-kipi += lib/qt4/QtTest lib/qt4/QtXml
-WANTLIB-kipi += ${KDE4LIB}/kcalcore ${KDE4LIB}/kdcraw ${KDE4LIB}/kexiv2
+WANTLIB-kipi += ${KDE4LIB}/kcalcore ${KDE4LIB}/kexiv2
WANTLIB-kipi += ${KDE4LIB}/kfile ${KDE4LIB}/khtml
-WANTLIB-kipi += ${KDE4LIB}/kio ${KDE4LIB}/kipi ${KDE4LIB}/kjs ${KDE4LIB}/kparts
-WANTLIB-kipi += ${KDE4LIB}/ksane
+WANTLIB-kipi += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kparts
WANTLIB-kipi += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
WANTLIB-kipi += ${KDE4LIB}/threadweaver
WANTLIB-kipi += lib/opencv2/opencv_core lib/opencv2/opencv_highgui
@@ -75,10 +89,10 @@ WANTLIB-main += c ICE SM X11 Xext z
WANTLIB-main += lib/qt4/QtNetwork lib/qt4/QtSql
WANTLIB-main += lib/qt4/QtTest lib/qt4/QtXml
WANTLIB-main += ${KDE4LIB}/kabc ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils
-WANTLIB-main += ${KDE4LIB}/kdcraw ${KDE4LIB}/kemoticons
+WANTLIB-main += ${KDE4LIB}/kemoticons
WANTLIB-main += ${KDE4LIB}/kexiv2 ${KDE4LIB}/kfile
WANTLIB-main += ${KDE4LIB}/khtml ${KDE4LIB}/kidletime ${KDE4LIB}/kio
-WANTLIB-main += ${KDE4LIB}/kipi ${KDE4LIB}/kjs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 00:13:44 Modified files: textproc/apertium-dicts: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: textproc/apertium-dicts/sv-da: Makefile distinfo textproc/apertium-dicts/sv-da/patches: patch-Makefile_in textproc/apertium-dicts/sv-da/pkg: DESCR PLIST Log message: apertium-sv-da -> apertium-swe-dan
vulkan ports
To support the Vulkan graphics API there are multiple ports needed. These are Apache 2.0 licensed with a cmake build system and build time deps on python in some cases so it would be painful to add to xenocara. glslang-7.11.3113 reference front-end for GLSL and ESSL spirv-headers-1.3.7 SPIRV-Headers spirv-tools-2019.2 API and commands for processing SPIR-V vulkan-headers-1.1.101.0 Vulkan header files vulkan-loader-1.1.101.0 Vulkan ICD loader vulkan-tools-1.1.101.0 Vulkan Utilities and Tools vulkan-validation-layers-1.1.101.0 Vulkan Validation Layers These are all in graphics/* for now but most of these could also go in devel/. While these will build, to use the result requires a drm with support for render nodes. The in tree drm lacks this, a pending update supports them. In terms of drivers/ICDs implemented by Mesa some patches are required to provide non-linux codepaths and recent hardware is required. The Mesa Vulkan drivers are not currently built or installed. For ATI/AMD hardware only amdgpu is supported not radeondrm(4). For Intel hardware ivy bridge and up is supported by Mesa, but the Intel Vulkan code in Mesa 18.3 requires userptr in drm which we don't implement. As of Mesa 19.0 userptr is no longer required. With a linux 4.19 based inteldrm(4), patched Mesa 19.0, and the attached ports vkcube/vulkaninfo from vulkan-tools run as does vkQuake (https://github.com/Novum/vkQuake). vulkan-ports.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 00:06:34 Modified files: textproc/apertium-dicts/arg-cat: Makefile textproc/apertium-dicts/cat-srd: Makefile Log message: Bump after apertium-cat update.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 00:04:00 Modified files: textproc/apertium-dicts/fra-cat: Makefile distinfo Log message: Update to apertium-fra-cat-1.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2019/03/25 00:01:01 Modified files: textproc/apertium-dicts/cat: Makefile distinfo Log message: Update to apertium-cat-2.7.0.
