CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/01/26 00:44:10 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register eigen and eigen2 removal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org 2020/01/26 00:41:10
Modified files:
math : Makefile
Removed files:
math/eigen : Makefile distinfo
math/eigen/pkg : DESCR PLIST
math/eigen2: Makefile distinfo
math/eigen2/patches: patch-Eigen_src_Array_BooleanRedux_h
patch-test_runtest_sh
math/eigen2/pkg: DESCR PLIST
Log message:
Remove math/{eigen,eigen2}
No more customer available.
OK zhuk@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/01/26 00:39:56 Modified files: x11/kde4/plasma-addons: Makefile x11/kde4/plasma-addons/pkg: PLIST Log message: Remove plasma-wallpaper-mandelbrot to disable Eigen2 This is required to delete math/eigen2. OK zhuk@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/01/26 00:31:53 Modified files: sysutils/pciutils: Makefile distinfo sysutils/pciutils/patches: patch-lib_names-net_c sysutils/pciutils/pkg: PLIST Log message: update to pciutils 3.6.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/01/26 00:30:15 Modified files: math/eigen3: Makefile Log message: Remove Qt4 dependency. It was only necessary for the test suite but was installed as run dependency. No need to drag this heavyweight port along. Diff from and OK jca@
Re: enable column metadata in databases/sqlite3
On Sun Jan 12, 2020 at 08:44:26AM +0100, Rafael Sadowski wrote:
> For the upcoming Qt5 update I need sqlite3_column_table_name16:
>
> qhelpgenerator:/usr/local/lib/qt5/plugins/sqldrivers/libqsqlite.so:
> undefined symbol 'sqlite3_column_table_name16'
> ld.so: qhelpgenerator: lazy binding failed!
> Killed
>
> Turns out we're missing those symbols but installing the manpages
> (SQLITE3_COLUMN_DATABASE_NAME(3)):
>
> objdump -tT /usr/local/lib/libsqlite3.so.37.8 | grep sqlite3_column_table
>
> The following diff enables column metadata:
>
> objdump -tT /usr/local/lib/libsqlite3.so.37.9 | grep sqlite3_column_table
> 000426b0 g F .text 0110 sqlite3_column_table_name
> 000427c0 g F .text 0110 sqlite3_column_table_name16
> 000427c0 gDF .text 0110 sqlite3_column_table_name16
> 000426b0 gDF .text 0110 sqlite3_column_table_name
>
> OK or is there any showstopper here?
>
> Rafael Sadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/sqlite3/Makefile,v
> retrieving revision 1.105
> diff -u -p -u -p -r1.105 Makefile
> --- Makefile 9 Nov 2019 10:09:04 - 1.105
> +++ Makefile 12 Jan 2020 07:34:44 -
> @@ -4,9 +4,10 @@ COMMENT= embedded SQL implementation
>
> DISTNAME = sqlite-autoconf-3300100
> PKGNAME= sqlite3-3.30.1
> +REVISION=0
>
> # XXX needs bumps every time :-
> -SHARED_LIBS += sqlite3 37.8 # 8.6
> +SHARED_LIBS += sqlite3 37.9 # 8.6
> # sqlite suggests that users might like to assert() that library and header
> # versions match, so bumps are needed even if function signatures don't
> change.
> # ... at the current time the only one noticed is a < check (in subversion)
> @@ -34,7 +35,8 @@ CONFIGURE_ARGS += --enable-fts5
> # for mozilla
> CFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY \
> -DSQLITE_ENABLE_FTS3 \
> - -DSQLITE_ENABLE_DBSTAT_VTAB
> + -DSQLITE_ENABLE_DBSTAT_VTAB \
> + -DSQLITE_ENABLE_COLUMN_METADATA=1
>
> # update p5-DBD-SQLite's Makefile.PL if enabling
> -DSQLITE_ENABLE_COLUMN_METADATA
> BUILD_DEPENDS = converters/sqlite2mdoc
>
New diff includes p5-DBD-SQLite. I have no idea how to test this!?
This must be enabled in any case, if we want to update Qt.
OK? How do we do that? Bulk?
RS
Index: p5-DBD-SQLite/Makefile
===
RCS file: /cvs/ports/databases/p5-DBD-SQLite/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- p5-DBD-SQLite/Makefile 12 Jul 2019 20:43:55 - 1.42
+++ p5-DBD-SQLite/Makefile 26 Jan 2020 07:14:03 -
@@ -6,7 +6,7 @@ MODULES=cpan
DISTNAME= DBD-SQLite-1.50
CATEGORIES=databases
EPOCH= 0
-REVISION= 1
+REVISION= 2
MAINTAINER=Robert Nagy
Index: p5-DBD-SQLite/patches/patch-Makefile_PL
===
RCS file: /cvs/ports/databases/p5-DBD-SQLite/patches/patch-Makefile_PL,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_PL
--- p5-DBD-SQLite/patches/patch-Makefile_PL 24 Apr 2017 16:25:05 -
1.11
+++ p5-DBD-SQLite/patches/patch-Makefile_PL 26 Jan 2020 07:14:03 -
@@ -2,13 +2,9 @@ $OpenBSD: patch-Makefile_PL,v 1.11 2017/
- Upstream forces use of bundled sqlite but we use the one from ports.
-- Ports sqlite is built without -DSQLITE_ENABLE_COLUMN_METADATA;
-DBD::SQLite uses this as a conditional in its own code as well in the built
-copy of sqlite, so it needs to follow what's done in the sqlite build.
-
-
Makefile.PL.orig Thu Nov 5 05:26:07 2015
-+++ Makefile.PLMon Apr 24 17:20:34 2017
+Index: Makefile.PL
+--- Makefile.PL.orig
Makefile.PL
@@ -129,7 +129,7 @@ SCOPE: {
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
@@ -18,11 +14,3 @@ copy of sqlite, so it needs to follow wh
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
-@@ -223,7 +223,6 @@ my @CC_DEFINE = (
- '-DSQLITE_ENABLE_FTS4', # for sqlite >= 3.7.4
- '-DSQLITE_ENABLE_FTS3_PARENTHESIS', # for sqlite >= 3.6.10
- '-DSQLITE_ENABLE_RTREE',# for sqlite >= 3.6.10
-- '-DSQLITE_ENABLE_COLUMN_METADATA',
- '-DSQLITE_ENABLE_STAT3',# for sqlite >= 3.7.9
- '-DSQLITE_ENABLE_STAT4',# for sqlite >= 3.8.3.1
- '-DSQLITE_ENABLE_JSON1',# for sqlite >= 3.9.0
Index: sqlite3/Makefile
===
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 21:03:04 Modified files: emulators/qemu/patches: patch-configure Log message: Improvements to the sndio probing. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/01/25 16:53:44 Modified files: games/nblood : Makefile distinfo games/nblood/patches: patch-source_blood_src_blood_cpp patch-source_exhumed_src_exhumed_cpp patch-source_rr_src_game_cpp Log message: update nblood to a more recent snapshot and take maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/01/25 15:57:56 Modified files: archivers : Makefile archivers/quazip: Makefile distinfo archivers/quazip/pkg: PLIST games/chessx : Makefile geo/merkaartor : Makefile graphics/krita : Makefile graphics/nomacs: Makefile Log message: Update to quazip-0.8.1 Remove the qt5 FLAVOR; qt5 is the only supported/used version these days. Disable the tests; they've not been updated for qt5 and aren't accessible from the standard cmake build system. Update all dependent ports to cope with the FLAVOR removal. Requested by rsadowski@; improvements by sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/01/25 15:53:42 Modified files: games/nblood : Makefile Log message: nblood: requires atomics on powerpc and hppa OK jsg@
Re: pcsc-lite: disable colors by default
On Sat, Jan 25, 2020 at 12:39:50AM +0100, Klemens Nanni wrote: > V= 1.8.25 > +REVISION=1 Will go with 0 of course, this is left-over from testing my diff :)
pcsc-lite: disable colors by default
`pcscd --debug' prints dark blue lines on my terminal with dark
background, rendering them unreadable. The daemon has `-T' to enforce
colored output, but no switch to disable colors on TTYs.
Diff below simply removes the detection code, leaving only `-T' in place;
both tested.
Feedback? OK?
If that seems worth it, I can contact upstream in order to fix these
color semantics.
Index: Makefile
===
RCS file: /cvs/ports/security/pcsc-lite/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile17 Nov 2019 13:13:15 - 1.47
+++ Makefile24 Jan 2020 23:35:51 -
@@ -3,6 +3,7 @@
COMMENT= resource manager for PC/SC
V= 1.8.25
+REVISION= 1
DISTNAME= pcsc-lite-${V}
CATEGORIES=security
Index: patches/patch-src_debug_c
===
RCS file: patches/patch-src_debug_c
diff -N patches/patch-src_debug_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_debug_c 24 Jan 2020 23:34:37 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Disable colors by default.
+
+Index: src/debug.c
+--- src/debug.c.orig
src/debug.c
+@@ -75,30 +75,6 @@ static void log_init(void)
+ #endif
+ if (e)
+ LogLevel = atoi(e);
+-
+- /* log to stderr and stderr is a tty? */
+- if (isatty(fileno(stderr)))
+- {
+- char *term;
+-
+- term = getenv("TERM");
+- if (term)
+- {
+- const char *terms[] = { "linux", "xterm",
"xterm-color", "Eterm", "rxvt", "rxvt-unicode" };
+- unsigned int i;
+-
+- /* for each known color terminal */
+- for (i = 0; i < COUNT_OF(terms); i++)
+- {
+- /* we found a supported term? */
+- if (0 == strcmp(terms[i], term))
+- {
+- LogDoColor = 1;
+- break;
+- }
+- }
+- }
+- }
+ } /* log_init */
+
+ void log_msg(const int priority, const char *fmt, ...)
Index: patches/patch-src_debuglog_c
===
RCS file: patches/patch-src_debuglog_c
diff -N patches/patch-src_debuglog_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_debuglog_c24 Jan 2020 23:34:48 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+
+Disable colors by default.
+
+Index: src/debuglog.c
+--- src/debuglog.c.orig
src/debuglog.c
+@@ -255,30 +255,8 @@ void DebugLogSetLogType(const int dbgtype)
+ LogMsgType = DEBUGLOG_STDOUT_DEBUG;
+ }
+
+- /* log to stdout and stdout is a tty? */
+- if ((DEBUGLOG_STDOUT_DEBUG == LogMsgType && isatty(fileno(stdout)))
+- || (DEBUGLOG_STDOUT_COLOR_DEBUG == LogMsgType))
+- {
+- char *term;
+-
+- term = getenv("TERM");
+- if (term)
+- {
+- const char *terms[] = { "linux", "xterm",
"xterm-color", "Eterm", "rxvt", "rxvt-unicode", "xterm-256color" };
+- unsigned int i;
+-
+- /* for each known color terminal */
+- for (i = 0; i < COUNT_OF(terms); i++)
+- {
+- /* we found a supported term? */
+- if (0 == strcmp(terms[i], term))
+- {
+- LogDoColor = 1;
+- break;
+- }
+- }
+- }
+- }
++ if (DEBUGLOG_STDOUT_COLOR_DEBUG == LogMsgType)
++ LogDoColor = 1;
+ }
+
+ void DebugLogSetLevel(const int level)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/01/25 15:27:00 Modified files: sysutils/reposync: Makefile distinfo Log message: use BatchMode=yes on reposync ssh commands
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020-01-25 5:20 PM, Stuart Henderson wrote: On 2020/01/25 17:01, Brian Callahan wrote: On 2020-01-25 4:54 PM, Stuart Henderson wrote: On 2020/01/25 16:16, Brian Callahan wrote: The simple way is to keep the quazip-qt5 naming. The more complex way is to add to $stem_extensions in quirks and add an @conflict quazip-qt5-* marker to the plist. I took the simple way, if that works for others. Seems to have the upside of not needing to massage the dependent ports if we don't want. I was thinking more like this as it's less surprising, it does need the dependent ports updating but there are only 4 and it's easy. I tried that before sending the other diff and it didn't work for me. Maybe the problem is on my end with something. If that works then yes by all means that is better. Works here with pkg_add -D unsigned -u and PKG_PATH pointed at a dir containing the new package. "make update" doesn't do enough to cope with this type of change. That would be my mistake :) ok for me. ~Brian
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020/01/25 17:01, Brian Callahan wrote: > > > On 2020-01-25 4:54 PM, Stuart Henderson wrote: > > On 2020/01/25 16:16, Brian Callahan wrote: > > > > The simple way is to keep the quazip-qt5 naming. > > > > > > > > The more complex way is to add to $stem_extensions in quirks and add an > > > > @conflict quazip-qt5-* marker to the plist. > > > > > > > I took the simple way, if that works for others. Seems to have the upside > > > of > > > not needing to massage the dependent ports if we don't want. > > > > I was thinking more like this as it's less surprising, it does need the > > dependent ports updating but there are only 4 and it's easy. > > I tried that before sending the other diff and it didn't work for me. Maybe > the problem is on my end with something. If that works then yes by all means > that is better. Works here with pkg_add -D unsigned -u and PKG_PATH pointed at a dir containing the new package. "make update" doesn't do enough to cope with this type of change.
Re: CVS: cvs.openbsd.org: ports
On 2020/01/25 14:24, Solene Rapenne wrote: > CVSROOT: /cvs > Module name: ports > Changes by: sol...@cvs.openbsd.org 2020/01/25 14:24:51 > > Modified files: > net/unifi : Makefile.inc > > Log message: > A message was displayed to suggest building with FETCH_PACKAGES=Yes but > it reports an error as the new correct syntax is FETCH_PACKAGES= > > issue reported on irc by pi94 > Thanks. They could also email the maintainer rather than report on irc :)
Re: [macppc/hppa] Unbreak games/nblood
On Sat, Jan 25, 2020 at 03:54:13PM +0100, Charlene Wendling wrote:
> Hi!
>
> NBlood requires atomics on powerpc, as seen in the current powerpc bulk:
>
> > enet.cpp:(.text+0x2e20): undefined reference to `__atomic_load_8'
> > enet.cpp:(.text+0x2e98): undefined reference to
> > `__atomic_compare_exchange_8'
>
> It builds fine on macppc [0] once the usual atomic block is added.
>
> OK?
ok jsg@
>
> Charlène.
>
>
> [0] https://bin.charlenew.xyz/nblood.log
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/nblood/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 Makefile
> --- Makefile 1 Jan 2020 02:28:07 - 1.1.1.1
> +++ Makefile 25 Jan 2020 14:49:44 -
> @@ -44,6 +44,12 @@ MAKE_FILE =GNUmakefile
> USE_GMAKE = Yes
> NO_TEST =Yes
>
> +# Fix "undefined reference to `__atomic_load_8'"
> +.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
> +WANTLIB += atomic
> +MAKE_FLAGS +=LDFLAGS="${LDFLAGS} -latomic"
> +.endif
> +
> .include
>
> .if !${PROPERTIES:Mlld}
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/01/25 15:03:23 Modified files: net/unifi : Makefile.inc net/unifi/lts : Makefile net/unifi/stable: Makefile net/unifi/testing: Makefile Log message: - switch unifi MODJAVA_VER back to 1.8, it sort-of works with 11 but not supported upstream and there have been some problems. - update comment about snappy-java to better explain the situation ;)
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020-01-25 4:54 PM, Stuart Henderson wrote:
On 2020/01/25 16:16, Brian Callahan wrote:
The simple way is to keep the quazip-qt5 naming.
The more complex way is to add to $stem_extensions in quirks and add an
@conflict quazip-qt5-* marker to the plist.
I took the simple way, if that works for others. Seems to have the upside of
not needing to massage the dependent ports if we don't want.
I was thinking more like this as it's less surprising, it does need the
dependent ports updating but there are only 4 and it's easy.
I tried that before sending the other diff and it didn't work for me.
Maybe the problem is on my end with something. If that works then yes by
all means that is better.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/archivers/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile21 Dec 2019 14:17:59 - 1.98
+++ Makefile25 Jan 2020 21:52:25 -
@@ -57,7 +57,6 @@
SUBDIR += py-rarfile
SUBDIR += py-rarfile,python3
SUBDIR += quazip
- SUBDIR += quazip,qt5
SUBDIR += ripole
SUBDIR += ruby-minitar
SUBDIR += rzip
Index: quazip/Makefile
===
RCS file: /cvs/ports/archivers/quazip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- quazip/Makefile 12 Jul 2019 20:43:29 - 1.18
+++ quazip/Makefile 25 Jan 2020 21:52:25 -
@@ -1,55 +1,41 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
-DISTNAME = quazip-0.7.3
-REVISION = 4
CATEGORIES = archivers
-# keep those in sync
-SHARED_LIBS = quazip 2.0 # 1.0
-SHARED_LIBS += quazip5 2.0 # 1.0
+GH_ACCOUNT = stachenov
+GH_PROJECT = quazip
+V =0.8.1
+GH_TAGNAME = v$V
+PKGNAME = quazip-qt5-$V
-HOMEPAGE = http://quazip.sourceforge.net/
+SHARED_LIBS += quazip5 3.0 # 1.0
+
+HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan
# LGPLv2.1 with static linking exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quazip/}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/cmake devel/qmake
-# qmake.port.mk is used for tests only
-MODQMAKE_PROJECTS =qztest/qztest.pro
+MODULES = devel/cmake \
+ x11/qt5
-FLAVORS = qt5
-FLAVOR ?=
+NO_TEST = Yes
+
+# Add back devel/qmake to MODULES if fixing tests
+# qmake.port.mk is used for tests only
+#MODQMAKE_PROJECTS = qztest/qztest.pro
-.if ${FLAVOR:Mqt5}
-FULLPKGNAME = ${PKGNAME:C/-/-qt5-/}
-MODULES += x11/qt5
-WANTLIB += Qt5Core
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=No
-CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} -std=c++11"
-CMAKENAME =QuaZip5
-.else
-MODULES += x11/qt4
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=Yes
-CMAKENAME =QuaZip
-.endif
-
-LIBNAME = ${CMAKENAME:L}
-SUBST_VARS = CMAKENAME LIBNAME
-
-do-test:
- mkdir -p ${WRKBUILD}/qztest
- ln -sf ../lib${LIBNAME}.so.${LIBquazip_VERSION}
${WRKBUILD}/quazip/libquazip.so.${LIBquazip_VERSION}
- ${MODQMAKE_configure}
- ${MODQMAKE_build}
- cd ${WRKBUILD}/qztest; \
- env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
+#do-test:
+# mkdir -p ${WRKBUILD}/qztest
+# ln -sf ../libquazip5.so.${LIBquazip5_VERSION}
${WRKBUILD}/quazip/libquazip5.so.${LIBquazip5_VERSION}
+# ${MODQMAKE_configure}
+# ${MODQMAKE_build}
+# cd ${WRKBUILD}/qztest; \
+# env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
.include
Index: quazip/distinfo
===
RCS file: /cvs/ports/archivers/quazip/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- quazip/distinfo 30 Jun 2017 22:11:09 - 1.6
+++ quazip/distinfo 25 Jan 2020 21:52:25 -
@@ -1,2 +1,2 @@
-SHA256 (quazip-0.7.3.tar.gz) = KtTzVHRugmDUYDbN4UlsIj7Hl2UEHqKOuSDO0BXiabU=
-SIZE (quazip-0.7.3.tar.gz) = 439536
+SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
+SIZE (quazip-0.8.1.tar.gz) = 150584
Index: quazip/pkg/PLIST
===
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- quazip/pkg/PLIST26 Dec 2016 12:38:07 - 1.3
+++ quazip/pkg/PLIST25 Jan 2020 21:52:25 -
@@ -1,21 +1,22 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 12:38:07 zhuk Exp $
-include/${LIBNAME}/
-include/${LIBNAME}/JlCompress.h
-include/${LIBNAME}/crypt.h
-include/${LIBNAME}/ioapi.h
-include/${LIBNAME}/quaadler32.h
-include/${LIBNAME}/quachecksum32.h
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020/01/25 16:16, Brian Callahan wrote:
> > >
> > The simple way is to keep the quazip-qt5 naming.
> >
> > The more complex way is to add to $stem_extensions in quirks and add an
> > @conflict quazip-qt5-* marker to the plist.
> >
>
> I took the simple way, if that works for others. Seems to have the upside of
> not needing to massage the dependent ports if we don't want.
I was thinking more like this as it's less surprising, it does need the
dependent ports updating but there are only 4 and it's easy.
Index: Makefile
===
RCS file: /cvs/ports/archivers/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile21 Dec 2019 14:17:59 - 1.98
+++ Makefile25 Jan 2020 21:52:25 -
@@ -57,7 +57,6 @@
SUBDIR += py-rarfile
SUBDIR += py-rarfile,python3
SUBDIR += quazip
- SUBDIR += quazip,qt5
SUBDIR += ripole
SUBDIR += ruby-minitar
SUBDIR += rzip
Index: quazip/Makefile
===
RCS file: /cvs/ports/archivers/quazip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- quazip/Makefile 12 Jul 2019 20:43:29 - 1.18
+++ quazip/Makefile 25 Jan 2020 21:52:25 -
@@ -1,55 +1,41 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
-DISTNAME = quazip-0.7.3
-REVISION = 4
CATEGORIES = archivers
-# keep those in sync
-SHARED_LIBS = quazip 2.0 # 1.0
-SHARED_LIBS += quazip5 2.0 # 1.0
+GH_ACCOUNT = stachenov
+GH_PROJECT = quazip
+V =0.8.1
+GH_TAGNAME = v$V
+PKGNAME = quazip-qt5-$V
-HOMEPAGE = http://quazip.sourceforge.net/
+SHARED_LIBS += quazip5 3.0 # 1.0
+
+HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan
# LGPLv2.1 with static linking exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quazip/}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/cmake devel/qmake
-# qmake.port.mk is used for tests only
-MODQMAKE_PROJECTS =qztest/qztest.pro
+MODULES = devel/cmake \
+ x11/qt5
-FLAVORS = qt5
-FLAVOR ?=
+NO_TEST = Yes
+
+# Add back devel/qmake to MODULES if fixing tests
+# qmake.port.mk is used for tests only
+#MODQMAKE_PROJECTS = qztest/qztest.pro
-.if ${FLAVOR:Mqt5}
-FULLPKGNAME = ${PKGNAME:C/-/-qt5-/}
-MODULES += x11/qt5
-WANTLIB += Qt5Core
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=No
-CONFIGURE_ENV =CXXFLAGS="${CXXFLAGS} -std=c++11"
-CMAKENAME =QuaZip5
-.else
-MODULES += x11/qt4
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=Yes
-CMAKENAME =QuaZip
-.endif
-
-LIBNAME = ${CMAKENAME:L}
-SUBST_VARS = CMAKENAME LIBNAME
-
-do-test:
- mkdir -p ${WRKBUILD}/qztest
- ln -sf ../lib${LIBNAME}.so.${LIBquazip_VERSION}
${WRKBUILD}/quazip/libquazip.so.${LIBquazip_VERSION}
- ${MODQMAKE_configure}
- ${MODQMAKE_build}
- cd ${WRKBUILD}/qztest; \
- env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
+#do-test:
+# mkdir -p ${WRKBUILD}/qztest
+# ln -sf ../libquazip5.so.${LIBquazip5_VERSION}
${WRKBUILD}/quazip/libquazip5.so.${LIBquazip5_VERSION}
+# ${MODQMAKE_configure}
+# ${MODQMAKE_build}
+# cd ${WRKBUILD}/qztest; \
+# env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
.include
Index: quazip/distinfo
===
RCS file: /cvs/ports/archivers/quazip/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- quazip/distinfo 30 Jun 2017 22:11:09 - 1.6
+++ quazip/distinfo 25 Jan 2020 21:52:25 -
@@ -1,2 +1,2 @@
-SHA256 (quazip-0.7.3.tar.gz) = KtTzVHRugmDUYDbN4UlsIj7Hl2UEHqKOuSDO0BXiabU=
-SIZE (quazip-0.7.3.tar.gz) = 439536
+SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
+SIZE (quazip-0.8.1.tar.gz) = 150584
Index: quazip/pkg/PLIST
===
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- quazip/pkg/PLIST26 Dec 2016 12:38:07 - 1.3
+++ quazip/pkg/PLIST25 Jan 2020 21:52:25 -
@@ -1,21 +1,22 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 12:38:07 zhuk Exp $
-include/${LIBNAME}/
-include/${LIBNAME}/JlCompress.h
-include/${LIBNAME}/crypt.h
-include/${LIBNAME}/ioapi.h
-include/${LIBNAME}/quaadler32.h
-include/${LIBNAME}/quachecksum32.h
-include/${LIBNAME}/quacrc32.h
-include/${LIBNAME}/quagzipfile.h
-include/${LIBNAME}/quaziodevice.h
-include/${LIBNAME}/quazip.h
-include/${LIBNAME}/quazip_global.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/01/25 14:35:11 Modified files: net/unifi : Makefile.inc Log message: Only display a tip about using FETCH_PACKAGES only if it's set to the default value No, so it works if it's not set or set to -Dsnap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/01/25 14:24:51 Modified files: net/unifi : Makefile.inc Log message: A message was displayed to suggest building with FETCH_PACKAGES=Yes but it reports an error as the new correct syntax is FETCH_PACKAGES= issue reported on irc by pi94
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020-01-25 3:51 PM, Stuart Henderson wrote:
On 2020/01/25 15:46, Brian Callahan wrote:
On 2020-01-25 3:25 PM, Brian Callahan wrote:
Hi ports --
rsadowski@ informed me that quazip upstream has moved, and that there
was a new version available, and that all our consumers only use the qt5
FLAVOR, and asked if I could update the quazip port.
This diff removes the qt4 pieces, leaving just a qt5 port (FLAVOR
removed).
Major bump to the shared lib, since there are symbol removals.
The tests do not seem to have been updated to work with qt5 and are not
reachable by cmake, as evidenced by the do-test target. I left the
tendrils in the port Makefile but commented out in case someone wants to
update the tests. I don't know enough Qt to make sense of what is going
wrong.
All dependent ports build OK. All have been updated to deal with the new
quazip reality.
OK?
~Brian
Just discovered this won't properly update quazip-qt5-0.7.3 to quazip-0.8.1;
hints welcome.
~Brian
The simple way is to keep the quazip-qt5 naming.
The more complex way is to add to $stem_extensions in quirks and add an
@conflict quazip-qt5-* marker to the plist.
I took the simple way, if that works for others. Seems to have the
upside of not needing to massage the dependent ports if we don't want.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/archivers/quazip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 12 Jul 2019 20:43:29 - 1.18
+++ Makefile 25 Jan 2020 21:15:15 -
@@ -1,55 +1,43 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
-DISTNAME = quazip-0.7.3
-REVISION = 4
CATEGORIES = archivers
-# keep those in sync
-SHARED_LIBS = quazip 2.0 # 1.0
-SHARED_LIBS += quazip5 2.0 # 1.0
+GH_ACCOUNT = stachenov
+GH_PROJECT = quazip
+GH_TAGNAME = v0.8.1
-HOMEPAGE = http://quazip.sourceforge.net/
+SHARED_LIBS += quazip5 3.0 # 1.0
+
+HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan
# LGPLv2.1 with static linking exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quazip/}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/cmake devel/qmake
-# qmake.port.mk is used for tests only
-MODQMAKE_PROJECTS = qztest/qztest.pro
+MODULES = devel/cmake \
+ x11/qt5
FLAVORS = qt5
-FLAVOR ?=
-
-.if ${FLAVOR:Mqt5}
+FLAVOR ?= qt5
FULLPKGNAME = ${PKGNAME:C/-/-qt5-/}
-MODULES += x11/qt5
-WANTLIB += Qt5Core
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=No
-CONFIGURE_ENV = CXXFLAGS="${CXXFLAGS} -std=c++11"
-CMAKENAME = QuaZip5
-.else
-MODULES += x11/qt4
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=Yes
-CMAKENAME = QuaZip
-.endif
-
-LIBNAME = ${CMAKENAME:L}
-SUBST_VARS = CMAKENAME LIBNAME
-
-do-test:
- mkdir -p ${WRKBUILD}/qztest
- ln -sf ../lib${LIBNAME}.so.${LIBquazip_VERSION} ${WRKBUILD}/quazip/libquazip.so.${LIBquazip_VERSION}
- ${MODQMAKE_configure}
- ${MODQMAKE_build}
- cd ${WRKBUILD}/qztest; \
- env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
+
+NO_TEST = Yes
+
+# Add back devel/qmake to MODULES if fixing tests
+# qmake.port.mk is used for tests only
+#MODQMAKE_PROJECTS = qztest/qztest.pro
+
+#do-test:
+# mkdir -p ${WRKBUILD}/qztest
+# ln -sf ../libquazip5.so.${LIBquazip5_VERSION} ${WRKBUILD}/quazip/libquazip5.so.${LIBquazip5_VERSION}
+# ${MODQMAKE_configure}
+# ${MODQMAKE_build}
+# cd ${WRKBUILD}/qztest; \
+# env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
.include
Index: distinfo
===
RCS file: /cvs/ports/archivers/quazip/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 30 Jun 2017 22:11:09 - 1.6
+++ distinfo 25 Jan 2020 21:15:15 -
@@ -1,2 +1,2 @@
-SHA256 (quazip-0.7.3.tar.gz) = KtTzVHRugmDUYDbN4UlsIj7Hl2UEHqKOuSDO0BXiabU=
-SIZE (quazip-0.7.3.tar.gz) = 439536
+SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
+SIZE (quazip-0.8.1.tar.gz) = 150584
Index: pkg/PLIST
===
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Dec 2016 12:38:07 - 1.3
+++ pkg/PLIST 25 Jan 2020 21:15:15 -
@@ -1,21 +1,21 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 12:38:07 zhuk Exp $
-include/${LIBNAME}/
-include/${LIBNAME}/JlCompress.h
-include/${LIBNAME}/crypt.h
-include/${LIBNAME}/ioapi.h
-include/${LIBNAME}/quaadler32.h
-include/${LIBNAME}/quachecksum32.h
-include/${LIBNAME}/quacrc32.h
-include/${LIBNAME}/quagzipfile.h
-include/${LIBNAME}/quaziodevice.h
-include/${LIBNAME}/quazip.h
-include/${LIBNAME}/quazip_global.h
-include/${LIBNAME}/quazipdir.h
-include/${LIBNAME}/quazipfile.h
-include/${LIBNAME}/quazipfileinfo.h
-include/${LIBNAME}/quazipnewinfo.h
-include/${LIBNAME}/unzip.h
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020/01/25 15:46, Brian Callahan wrote: > > > On 2020-01-25 3:25 PM, Brian Callahan wrote: > > Hi ports -- > > > > rsadowski@ informed me that quazip upstream has moved, and that there > > was a new version available, and that all our consumers only use the qt5 > > FLAVOR, and asked if I could update the quazip port. > > > > This diff removes the qt4 pieces, leaving just a qt5 port (FLAVOR > > removed). > > > > Major bump to the shared lib, since there are symbol removals. > > > > The tests do not seem to have been updated to work with qt5 and are not > > reachable by cmake, as evidenced by the do-test target. I left the > > tendrils in the port Makefile but commented out in case someone wants to > > update the tests. I don't know enough Qt to make sense of what is going > > wrong. > > > > All dependent ports build OK. All have been updated to deal with the new > > quazip reality. > > > > OK? > > > > ~Brian > > > > Just discovered this won't properly update quazip-qt5-0.7.3 to quazip-0.8.1; > hints welcome. > > ~Brian > The simple way is to keep the quazip-qt5 naming. The more complex way is to add to $stem_extensions in quirks and add an @conflict quazip-qt5-* marker to the plist.
Re: Update quazip 0.7.3 => 0.8.1 and update dependent ports
On 2020-01-25 3:25 PM, Brian Callahan wrote: Hi ports -- rsadowski@ informed me that quazip upstream has moved, and that there was a new version available, and that all our consumers only use the qt5 FLAVOR, and asked if I could update the quazip port. This diff removes the qt4 pieces, leaving just a qt5 port (FLAVOR removed). Major bump to the shared lib, since there are symbol removals. The tests do not seem to have been updated to work with qt5 and are not reachable by cmake, as evidenced by the do-test target. I left the tendrils in the port Makefile but commented out in case someone wants to update the tests. I don't know enough Qt to make sense of what is going wrong. All dependent ports build OK. All have been updated to deal with the new quazip reality. OK? ~Brian Just discovered this won't properly update quazip-qt5-0.7.3 to quazip-0.8.1; hints welcome. ~Brian
Re: [Update] x11/wmutils v1.4 to v1.5
Stefan Hagen wrote:
> attached is a diff for x11/wmutils to update the core part to v1.5.
>
> Changes
> - new tool "slw" to select windows interactively (select window, get
>window ID back)
*bump* after one week and patch inlined for easier review.
Thanks,
Stefan
Index: x11/wmutils/Makefile.inc
===
RCS file: /cvs/ports/x11/wmutils/Makefile.inc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile.inc
--- x11/wmutils/Makefile.inc12 Jul 2019 20:51:24 - 1.2
+++ x11/wmutils/Makefile.inc19 Jan 2020 17:49:40 -
@@ -11,7 +11,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += c xcb xcb-util
-MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-util" \
+MAKE_FLAGS = LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-util -lxcb-cursor" \
CFLAGS="${CFLAGS} -I${X11BASE}/include"
NO_TEST ?= Yes
Index: x11/wmutils/core/Makefile
===
RCS file: /cvs/ports/x11/wmutils/core/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- x11/wmutils/core/Makefile 8 Jan 2018 19:24:31 - 1.1.1.1
+++ x11/wmutils/core/Makefile 19 Jan 2020 17:49:40 -
@@ -4,19 +4,19 @@ COMMENT = window manipulation tools
DISTNAME = wmutils-core-${GH_TAGNAME:C/^v//}
GH_PROJECT = core
-GH_TAGNAME = v1.4
+GH_TAGNAME = v1.5
post-patch:
sed -i -e 's/wtf/wintf/g' -e 's/lsw/lswin/g' ${WRKSRC}/man/*
do-install:
${INSTALL_PROGRAM} \
-
${WRKBUILD}/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wtp} \
+
${WRKBUILD}/{chwb,chwso,ignw,killw,mapw,slw,pfw,wattr,wmp,wmv,wrs,wtp} \
${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/lsw ${PREFIX}/bin/lswin
${INSTALL_PROGRAM} ${WRKBUILD}/wtf ${PREFIX}/bin/wintf
${INSTALL_MAN} \
-
${WRKSRC}/man/{chwb,chwso,ignw,killw,mapw,pfw,wattr,wmp,wmv,wrs,wmutils}.1 \
+
${WRKSRC}/man/{chwb,chwso,ignw,killw,mapw,slw,pfw,wattr,wmp,wmv,wrs,wmutils}.1 \
${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/lsw.1 ${PREFIX}/man/man1/lswin.1
${INSTALL_MAN} ${WRKSRC}/man/wtf.1 ${PREFIX}/man/man1/wintf.1
Index: x11/wmutils/core/distinfo
===
RCS file: /cvs/ports/x11/wmutils/core/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- x11/wmutils/core/distinfo 8 Jan 2018 19:24:31 - 1.1.1.1
+++ x11/wmutils/core/distinfo 19 Jan 2020 17:49:40 -
@@ -1,2 +1,2 @@
-SHA256 (wmutils-core-1.4.tar.gz) = ROFldrf24fEmwssklEmrfhD9ZSia/3dP+vJ9LBWnsro=
-SIZE (wmutils-core-1.4.tar.gz) = 10333
+SHA256 (wmutils-core-1.5.tar.gz) = cq8i6lK8NDv5CmYDrj4WntPBX2RjX6QlB8xmKrBKY3I=
+SIZE (wmutils-core-1.5.tar.gz) = 10893
Index: x11/wmutils/core/patches/patch-Makefile
===
RCS file: /cvs/ports/x11/wmutils/core/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- x11/wmutils/core/patches/patch-Makefile 8 Jan 2018 19:24:31 -
1.1.1.1
+++ x11/wmutils/core/patches/patch-Makefile 19 Jan 2020 17:49:40 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -30,12 +30,10 @@ binutils: $(BIN)
+@@ -31,12 +31,10 @@ binutils: $(BIN)
$(OBJ): $(HDR) util.o
.o:
Index: x11/wmutils/core/pkg/PLIST
===
RCS file: /cvs/ports/x11/wmutils/core/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- x11/wmutils/core/pkg/PLIST 8 Jan 2018 19:24:31 - 1.1.1.1
+++ x11/wmutils/core/pkg/PLIST 19 Jan 2020 17:49:40 -
@@ -6,6 +6,7 @@
@bin bin/lswin
@bin bin/mapw
@bin bin/pfw
+@bin bin/slw
@bin bin/wattr
@bin bin/wintf
@bin bin/wmp
@@ -19,6 +20,7 @@
@man man/man1/lswin.1
@man man/man1/mapw.1
@man man/man1/pfw.1
+@man man/man1/slw.1
@man man/man1/wattr.1
@man man/man1/wintf.1
@man man/man1/wmp.1
Update quazip 0.7.3 => 0.8.1 and update dependent ports
Hi ports --
rsadowski@ informed me that quazip upstream has moved, and that there
was a new version available, and that all our consumers only use the qt5
FLAVOR, and asked if I could update the quazip port.
This diff removes the qt4 pieces, leaving just a qt5 port (FLAVOR removed).
Major bump to the shared lib, since there are symbol removals.
The tests do not seem to have been updated to work with qt5 and are not
reachable by cmake, as evidenced by the do-test target. I left the
tendrils in the port Makefile but commented out in case someone wants to
update the tests. I don't know enough Qt to make sense of what is going
wrong.
All dependent ports build OK. All have been updated to deal with the new
quazip reality.
OK?
~Brian
Index: archivers/quazip/Makefile
===
RCS file: /cvs/ports/archivers/quazip/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- archivers/quazip/Makefile 12 Jul 2019 20:43:29 - 1.18
+++ archivers/quazip/Makefile 25 Jan 2020 20:19:18 -
@@ -1,55 +1,39 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:43:29 sthen Exp $
COMMENT = Qt/C++ wrapper for ZIP/UNZIP package
-DISTNAME = quazip-0.7.3
-REVISION = 4
CATEGORIES = archivers
-# keep those in sync
-SHARED_LIBS = quazip 2.0 # 1.0
-SHARED_LIBS += quazip5 2.0 # 1.0
+GH_ACCOUNT = stachenov
+GH_PROJECT = quazip
+GH_TAGNAME = v0.8.1
-HOMEPAGE = http://quazip.sourceforge.net/
+SHARED_LIBS += quazip5 3.0 # 1.0
+
+HOMEPAGE = https://stachenov.github.io/quazip/
MAINTAINER = Brian Callahan
# LGPLv2.1 with static linking exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quazip/}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m z
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/cmake devel/qmake
-# qmake.port.mk is used for tests only
-MODQMAKE_PROJECTS = qztest/qztest.pro
+MODULES = devel/cmake \
+ x11/qt5
-FLAVORS = qt5
-FLAVOR ?=
+NO_TEST = Yes
+
+# Add back devel/qmake to MODULES if fixing tests
+# qmake.port.mk is used for tests only
+#MODQMAKE_PROJECTS = qztest/qztest.pro
-.if ${FLAVOR:Mqt5}
-FULLPKGNAME = ${PKGNAME:C/-/-qt5-/}
-MODULES += x11/qt5
-WANTLIB += Qt5Core
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=No
-CONFIGURE_ENV = CXXFLAGS="${CXXFLAGS} -std=c++11"
-CMAKENAME = QuaZip5
-.else
-MODULES += x11/qt4
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=Yes
-CMAKENAME = QuaZip
-.endif
-
-LIBNAME = ${CMAKENAME:L}
-SUBST_VARS = CMAKENAME LIBNAME
-
-do-test:
- mkdir -p ${WRKBUILD}/qztest
- ln -sf ../lib${LIBNAME}.so.${LIBquazip_VERSION} ${WRKBUILD}/quazip/libquazip.so.${LIBquazip_VERSION}
- ${MODQMAKE_configure}
- ${MODQMAKE_build}
- cd ${WRKBUILD}/qztest; \
- env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
+#do-test:
+# mkdir -p ${WRKBUILD}/qztest
+# ln -sf ../libquazip5.so.${LIBquazip5_VERSION} ${WRKBUILD}/quazip/libquazip5.so.${LIBquazip5_VERSION}
+# ${MODQMAKE_configure}
+# ${MODQMAKE_build}
+# cd ${WRKBUILD}/qztest; \
+# env LD_LIBRARY_PATH=${WRKBUILD}/quazip ./qztest
.include
Index: archivers/quazip/distinfo
===
RCS file: /cvs/ports/archivers/quazip/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- archivers/quazip/distinfo 30 Jun 2017 22:11:09 - 1.6
+++ archivers/quazip/distinfo 25 Jan 2020 20:19:18 -
@@ -1,2 +1,2 @@
-SHA256 (quazip-0.7.3.tar.gz) = KtTzVHRugmDUYDbN4UlsIj7Hl2UEHqKOuSDO0BXiabU=
-SIZE (quazip-0.7.3.tar.gz) = 439536
+SHA256 (quazip-0.8.1.tar.gz) = T9pNQkjggBW1CQ0Dae+eaL3ER1qhJJT3wPbXnkMnDRQ=
+SIZE (quazip-0.8.1.tar.gz) = 150584
Index: archivers/quazip/pkg/PLIST
===
RCS file: /cvs/ports/archivers/quazip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- archivers/quazip/pkg/PLIST 26 Dec 2016 12:38:07 - 1.3
+++ archivers/quazip/pkg/PLIST 25 Jan 2020 20:19:18 -
@@ -1,21 +1,23 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 12:38:07 zhuk Exp $
-include/${LIBNAME}/
-include/${LIBNAME}/JlCompress.h
-include/${LIBNAME}/crypt.h
-include/${LIBNAME}/ioapi.h
-include/${LIBNAME}/quaadler32.h
-include/${LIBNAME}/quachecksum32.h
-include/${LIBNAME}/quacrc32.h
-include/${LIBNAME}/quagzipfile.h
-include/${LIBNAME}/quaziodevice.h
-include/${LIBNAME}/quazip.h
-include/${LIBNAME}/quazip_global.h
-include/${LIBNAME}/quazipdir.h
-include/${LIBNAME}/quazipfile.h
-include/${LIBNAME}/quazipfileinfo.h
-include/${LIBNAME}/quazipnewinfo.h
-include/${LIBNAME}/unzip.h
-include/${LIBNAME}/zip.h
-lib/lib${LIBNAME}.a
-@lib lib/lib${LIBNAME}.so.${LIBquazip_VERSION}
-share/cmake/Modules/Find${CMAKENAME}.cmake
+include/quazip5/
+include/quazip5/JlCompress.h
+include/quazip5/ioapi.h
+include/quazip5/minizip_crypt.h
+include/quazip5/quaadler32.h
+include/quazip5/quachecksum32.h
+include/quazip5/quacrc32.h
+include/quazip5/quagzipfile.h
+include/quazip5/quaziodevice.h
+include/quazip5/quazip.h
Re: [update] net/telegram-purple version 1.3.1 to 1.4.2
Giovanni Bechis wrote:
> On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote:
>> The BROKEN condition still applies. The code parse_tlo_file has not
>> changed.
>>
> afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@
Correct, it hits the same assertion on sparc64.
http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/telegram-purple.log
Updated patch below.
Ciao,
Stefan
Index: net/telegram-purple/Makefile
===
RCS file: /cvs/ports/net/telegram-purple/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- net/telegram-purple/Makefile12 Jul 2019 20:48:50 - 1.6
+++ net/telegram-purple/Makefile25 Jan 2020 20:22:45 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:50 sthen Exp $
BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file
"generate.c", line 2831, function "parse_tlo_file"
+BROKEN-sparc64 = assertion "get_int () == TLS_SCHEMA_V2" failed: file
"generate.c", line 2831, function "parse_tlo_file"
-V =1.3.1
-REVISION = 2
+V =1.4.2
COMMENT = Telegram support for Pidgin
DISTNAME = telegram-purple_$V.orig
PKGNAME = telegram-purple-$V
Index: net/telegram-purple/distinfo
===
RCS file: /cvs/ports/net/telegram-purple/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- net/telegram-purple/distinfo24 Jun 2017 00:20:17 - 1.1.1.1
+++ net/telegram-purple/distinfo25 Jan 2020 20:22:45 -
@@ -1,2 +1,2 @@
-SHA256 (telegram-purple_1.3.1.orig.tar.gz) =
hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
-SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
+SHA256 (telegram-purple_1.4.2.orig.tar.gz) =
vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
+SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
Index: net/telegram-purple/patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- net/telegram-purple/patches/patch-Makefile_in 24 Jun 2017 00:20:17
- 1.1.1.1
+++ net/telegram-purple/patches/patch-Makefile_in 25 Jan 2020 20:22:45
-
@@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
- localedir=@localedir@
- gettext_package=@GETTEXT_PACKAGE@
+@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l
+ CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
+ CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
+ CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
+-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN}
${CFLAGS_EXTRA}
++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC
--CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
-DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations
-Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC
-D_FORTIFY_SOURCE=2
--LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
-+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
-DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
-+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
- DIR_PERM=0755
- FILE_PERM=0644
+-LDFLAGS_EXTRA=-rdynamic -ggdb
++LDFLAGS_EXTRA=-rdynamic
+ LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
-@@ -81,7 +81,7 @@ tgl/Makefile.in:
+ DIR_PERM=0755
+@@ -116,7 +116,7 @@ tgl/Makefile.in:
@echo "tgl/Makefile.in not found. Maybe you need to 'git submodule
update --init --recursive' ?" && exit 1
tgl/Makefile: tgl/Makefile.in Makefile
Index: net/telegram-purple/patches/patch-tgl_Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in
--- net/telegram-purple/patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17
- 1.1.1.1
+++ net/telegram-purple/patches/patch-tgl_Makefile_in 25 Jan 2020 20:22:45
-
@@ -7,7 +7,7 @@ Index: tgl/Makefile.in
LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
DEFS=@DEFS@
--COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
+-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
[UPDATE] lang/fpc
- Add qt5 library search path at fpc.cfg - Bump REVISION This update add a line into fpc.cfg file. I'm working on add support for lazarus-qt5 based apps It needs this entry to link with x11/qt5pas library (not committed yet). Greetings fpc.diff Description: Binary data
Re: UPDATE audio/audacious
On Sat 25/01/2020 16:21, Charlene Wendling wrote:
> On Wed, 22 Jan 2020 16:19:21 +0100
> Björn Ketelaars wrote:
>
> > Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10
> > are explained at [0]. 3.10.1 fixes some additional bugs. Note that
> > this update relies on a newer version of audacious-plugins, which has
> > been send to ports@.
> >
> > Changes to the port:
> > - Switch HOMEPAGE and MASTER_SITES to https
> > - Sync WANTLIB
> > - Bump major of libaudcore as symbols have been removed
> >
> > Lightly tested on amd64.
> >
> > Comments/OK?
>
> It builds and works fine on powerpc. audacious-plugins has "extra"
> WANTLIBs (c.96 dbus-1.11 dbus-glib-1.5), but actually makes use of
> DBus so they seem legit.
>
> Once it's cleared up by someone who knows better than me, OK cwen@ for
> audacious and audacious-plugins ^^
My bad, I should have removed those extra WANTLIBs.
Only thing that seems to be dbus related is the plugin mpris2, which is
a standard dbus interface aiming to provide a API for controlling
audacious. This plugin depends on gdbus-codegen(1), provided by glib,
which generates some dbus code.
I grepped through the output of ldd(1) of all plugins. There is no
dependency on dbus or dbus-glib.
Enclosed is an updated diff, which additionally removes the extra
WANTLIBs.
OK?
diff --git Makefile Makefile
index 1501a02b0b0..3d31fa025d1 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
COMMENT = input and output plugins for Audacious
-V =3.9
+V =3.10.1
DISTNAME = audacious-plugins-$V
-REVISION = 3
CATEGORIES = audio multimedia
@@ -15,15 +14,15 @@ PERMIT_PACKAGE =Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
-WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
-WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m mms modplug mp3lame
-WANTLIB += mpg123 neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
-WANTLIB += wavpack xml2 z
-
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+WANTLIB += audtag avcodec avformat avutil cairo cddb cdio cdio_cdda
+WANTLIB += cue curl faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB += harfbuzz iconv intl m mms modplug mp3lame mpg123 neon
+WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 samplerate
+WANTLIB += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack
+WANTLIB += xml2 z
+
+MASTER_SITES = https://distfiles.audacious-media-player.org/
EXTRACT_SUFX = .tar.bz2
diff --git distinfo distinfo
index f261a81d563..b4a3f1061c9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.9.tar.bz2) =
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
-SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
+SHA256 (audacious-plugins-3.10.1.tar.bz2) =
7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI=
+SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index 0b32ca27e8b..59f544b9292 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
$OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp $
buildsys.mk.in.origThu Oct 16 20:01:19 2014
-+++ buildsys.mk.in Sat Nov 1 19:44:28 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo}
-.SILENT:
+#.SILENT:
.SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
${SUBDIRS_AFTER}
diff --git patches/patch-configure patches/patch-configure
index 051879f438f..f66a9125a79 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using
AC_CHECK_LIB.
Index: configure
--- configure.orig
+++ configure
-@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
+@@ -9702,8 +9702,6 @@ $as_echo "yes" >&6; }
fi
@@ -16,7 +16,7 @@ Index: configure
if test
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/01/25 12:31:34 Modified files: lang/mawk : Makefile distinfo Log message: Update to mawk-1.3.4-20200120
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/01/25 11:31:11 Modified files: audio/mscore : Makefile distinfo audio/mscore/patches: patch-CMakeLists_txt patch-mscore_CMakeLists_txt Added files: audio/mscore/patches: patch-main_CMakeLists_txt Log message: Update to musescore-3.4.1 Changelogs: https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3x/release-notes-musescore-34x-2 https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3x/release-notes-musescore-34x-3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 10:40:29 Modified files: emulators/qemu : Makefile distinfo emulators/qemu/patches: patch-audio_Makefile_objs patch-audio_audio_c patch-audio_audio_template_h patch-audio_sndioaudio_c patch-configure patch-qapi_audio_json patch-util_cacheinfo_c emulators/qemu/pkg: PLIST Added files: emulators/qemu/patches: patch-qemu-doc_texi Log message: Update to qemu-4.2.0. sndio backend updated for QEMU API changes by ratchov@. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2020/01/25 09:55:32 Modified files: textproc : Makefile Log message: + scdoc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2020/01/25 09:44:51 Log message: import scdoc-1.10.0 to convert scdoc text files to man(7) pages; based on work of Raymond E. Pasco and abieber@ using feedback from and sthen@; OK sthen@ Status: Vendor Tag: schwarze Release Tags: schwarze_20200125 N ports/textproc/scdoc/Makefile N ports/textproc/scdoc/distinfo N ports/textproc/scdoc/pkg/DESCR N ports/textproc/scdoc/pkg/PLIST N ports/textproc/scdoc/patches/patch-test_preamble N ports/textproc/scdoc/patches/patch-Makefile No conflicts created by this import
Re: broken port devel/blame
- Original Message - | From: "Brian Callahan" | To: "Thomas Dickey" , "ports" | Sent: Saturday, January 25, 2020 10:52:25 AM | Subject: Re: broken port devel/blame | On 2020-01-25 10:25 AM, Thomas Dickey wrote: |> following up on |> |> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927740 |> |> I see that this port |> |> http://openports.se/devel/blame |> |> is broken. I use the program, so I put up a new homepage here: |> |> https://invisible-island.net/rcs-blame/ |> ftp://ftp.invisible-island.net/rcs-blame |> https://invisible-mirror.net/archives/rcs-blame/ |> | | Updated port diff attached; improve license marker too while here. thanks (although the source indicates it could be GPL2+, I won't be making changes to the license). -- Thomas E. Dickey http://invisible-island.net ftp://ftp.invisible-island.net
new: devel/git-crypt
Hi ports@, Here's a new port for git-crypt, which is a tool for transparently encrypt files on git repositories (so one can have sensitive information on remote repositories). You can find more info here: https://www.agwa.name/projects/git-crypt/ I decided not to include gnupg as a dependency. The software can use pgp keys (for asymetric) or openssl (for symetric) encryption. The build clearly depends on openssl (it seems to work fine with libressl as far as I can see), but for pgp it calls the gpg binary, so it does not depend on it for building. Please correct me if this is wrong. Another thing is that the man page generation leaves the resulting man page file on WRKSRC/git-crypt.1 but it should leave it on WRKSRC/man/man1/git-crypt.1 and I do not know why (when doing things manually outside of the ports infrastructure it works as expected), that's why I added the pre-fake hack. If anyone knows a better way to deal with this, please tell me. Cheers, -- Paco Esteban. 5818130B8A6DBC03 git-crypt.tar.gz Description: Binary data
sparc64 bulk build report
Bulk build on sparc64-0.ports.openbsd.org Started : Thu Jan 23 21:13:41 MST 2020 Finished: Sat Jan 25 09:13:31 MST 2020 Duration: 1 Days 12 hours 0 minutes Built using OpenBSD 6.6-current (GENERIC.MP) #194: Thu Jan 23 06:34:42 MST 2020 Built 9119 packages Number of packages built each day: Jan 23: 3926 Jan 24: 4259 Jan 25: 934 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2020-01-23/summary.log Build failures: 41 http://build-failures.rhaalovely.net/sparc64/2020-01-23/audio/libmusicbrainz.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/benchmarks/fio.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/cad/magic.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/cad/netgen.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/cad/qucs.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/chinese/libpinyin.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/comms/xastir.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/devel/ddd.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/devel/keystone/main.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/devel/lutok.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/emulators/BasiliskII.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/emulators/fs-uae.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/games/pokerth.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/games/xevil.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/graphics/asymptote.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/graphics/clutter/cogl.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/graphics/colord-gtk.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/lang/apl.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/lang/janet.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/lang/squeak/vm.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/mail/kopano/core.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/math/py-scikit-learn.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/multimedia/gstreamer1/plugins-base.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/multimedia/mpv.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/mutella.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/telegram-purple.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/print/hplip,-common.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/security/ophcrack.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/sysutils/collectd,-main.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/telephony/iaxclient.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/telephony/pjsua,-main.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/www/newsboat.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/www/ruby-passenger,ruby27.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/kde4/libs.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/kde4/smokeqt.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/libdbus-c++.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/libhandy.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/ogre.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/polybar.log http://build-failures.rhaalovely.net/sparc64/2020-01-23/x11/qt5/qtbase.log Recurrent failures: failures/benchmarks/fio.log failures/cad/magic.log failures/cad/netgen.log failures/chinese/libpinyin.log failures/comms/xastir.log failures/devel/ddd.log failures/devel/py-unicorn,python3.log failures/emulators/BasiliskII.log failures/emulators/fs-uae.log failures/games/pokerth.log failures/games/xevil.log failures/graphics/asymptote.log failures/graphics/colord-gtk.log failures/lang/apl.log failures/lang/janet.log failures/lang/squeak/vm.log failures/mail/kopano/core.log failures/math/py-scikit-learn.log failures/net/mutella.log failures/net/telegram-purple.log failures/print/hplip,-common.log failures/security/ophcrack.log failures/summary.log failures/sysutils/collectd,-main.log failures/telephony/iaxclient.log failures/telephony/pjsua,-main.log failures/www/newsboat.log failures/x11/kde4/smokeqt.log failures/x11/libdbus-c++.log failures/x11/libhandy.log failures/x11/ogre.log New failures: +failures/audio/libmusicbrainz.log +failures/devel/keystone/main.log +failures/devel/lutok.log +failures/graphics/clutter/cogl.log +failures/multimedia/gstreamer1/plugins-base.log +failures/multimedia/mpv.log +failures/www/ruby-passenger,ruby27.log +failures/x11/kde4/libs.log +failures/x11/polybar.log +failures/x11/qt5/qtbase.log Resolved failures: -failures/devel/rebar,erlang21.log -failures/geo/spatialite/gis.log
Re: update to libvips 8.9.0
On Wed, Jan 22, 2020 at 09:11:24AM +0100, Stephane Guedon wrote: > > No worries :) > > > > It seems you did not update PLIST. > > Also it would be better to indent "\" in Makefile. > > > > Thank you > > I thought I did the plist thing already. Sorry :) Almost here. Remove remaining PLIST.orig and then you are good :)
Re: broken port devel/blame
On 2020-01-25 10:25 AM, Thomas Dickey wrote:
following up on
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927740
I see that this port
http://openports.se/devel/blame
is broken. I use the program, so I put up a new homepage here:
https://invisible-island.net/rcs-blame/
ftp://ftp.invisible-island.net/rcs-blame
https://invisible-mirror.net/archives/rcs-blame/
Updated port diff attached; improve license marker too while here.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/blame/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:44:04 - 1.7
+++ Makefile 25 Jan 2020 15:50:59 -
@@ -3,15 +3,16 @@
COMMENT= RCS equivalent of CVS's annotate command
DISTNAME= blame-1.3.1
+REVISION= 0
CATEGORIES= devel
-HOMEPAGE= http://blame.sourceforge.net/
+HOMEPAGE= https://invisible-island.net/rcs-blame/
-# GPL
+# GPLv2+
PERMIT_PACKAGE= Yes
WANTLIB= c
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blame/}
+MASTER_SITES= https://invisible-mirror.net/archives/rcs-blame/
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"
Re: broken port devel/blame
following up on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927740 I see that this port http://openports.se/devel/blame is broken. I use the program, so I put up a new homepage here: https://invisible-island.net/rcs-blame/ ftp://ftp.invisible-island.net/rcs-blame https://invisible-mirror.net/archives/rcs-blame/ -- Thomas E. Dickey https://invisible-island.net ftp://ftp.invisible-island.net signature.asc Description: PGP signature
Re: UPDATE audio/audacious
On Wed, 22 Jan 2020 16:19:21 +0100
Björn Ketelaars wrote:
> Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10
> are explained at [0]. 3.10.1 fixes some additional bugs. Note that
> this update relies on a newer version of audacious-plugins, which has
> been send to ports@.
>
> Changes to the port:
> - Switch HOMEPAGE and MASTER_SITES to https
> - Sync WANTLIB
> - Bump major of libaudcore as symbols have been removed
>
> Lightly tested on amd64.
>
> Comments/OK?
It builds and works fine on powerpc. audacious-plugins has "extra"
WANTLIBs (c.96 dbus-1.11 dbus-glib-1.5), but actually makes use of
DBus so they seem legit.
Once it's cleared up by someone who knows better than me, OK cwen@ for
audacious and audacious-plugins ^^
> [0] https://audacious-media-player.org/news/43-audacious-3-10-released
>
>
> diff --git Makefile Makefile
> index cc130f2b4fb..42b1adf225a 100644
> --- Makefile
> +++ Makefile
> @@ -5,16 +5,15 @@ BROKEN-alpha = tinylock.c:58: internal
> compiler error: in extract_insn, at recog
> COMMENT =graphical audio player which supports lots
> of formats
> -DISTNAME = audacious-3.9
> -REVISION = 2
> +DISTNAME = audacious-3.10.1
>
> -SHARED_LIBS += audcore 4.0 #
> 5.0 +SHARED_LIBS += audcore 5.0
> # 5.1 SHARED_LIBS += audgui 4.0
> # # 5.0
> SHARED_LIBS += audtag 3.0 # 3.0
>
> CATEGORIES = audio multimedia
>
> -HOMEPAGE = http://audacious-media-player.org/
> +HOMEPAGE = https://audacious-media-player.org/
>
> # BSD
> PERMIT_PACKAGE = Yes
> @@ -22,10 +21,10 @@ PERMIT_PACKAGE = Yes
> WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
> WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo
> fontconfig WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
> glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m
> pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 z
> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz iconv
> +WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 z
>
> -MASTER_SITES =
> http://distfiles.audacious-media-player.org/ +MASTER_SITES
> = https://distfiles.audacious-media-player.org/
> EXTRACT_SUFX = .tar.bz2
>
> diff --git distinfo distinfo
> index 7dfae153553..65a2003c36a 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (audacious-3.9.tar.bz2) =
> LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4= -SIZE
> (audacious-3.9.tar.bz2) = 599488 +SHA256 (audacious-3.10.1.tar.bz2) =
> g2boQLs8lEjCzwz5oIABVbC9fMISooukSZDD0iica5M= +SIZE
> (audacious-3.10.1.tar.bz2) = 564481 diff --git
> patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in index
> a94f8f206f4..2a349cb9230 100644
> --- patches/patch-buildsys_mk_in
> +++ patches/patch-buildsys_mk_in
> @@ -1,12 +1,13 @@
> $OpenBSD: patch-buildsys_mk_in,v 1.7 2014/11/03 04:28:11 bcallah Exp
> $
> buildsys.mk.in.orig Thu Oct 16 20:00:28 2014
> -+++ buildsys.mk.in Sat Nov 1 19:11:40 2014
> -@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
> +Index: buildsys.mk.in
> +--- buildsys.mk.in.orig
> buildsys.mk.in
> +@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
>
> MO_FILES = ${LOCALES:.po=.mo}
>
> -.SILENT:
> +#.SILENT:
> .SUFFIXES:
> - .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o
> .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
> - .PHONY: all subdirs pre-depend depend install install-extra
> uninstall uninstall-extra clean distclean locales ${SUBDIRS}
> + .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o
> .java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S
> .S.dep .xpm
> + .PHONY: all subdirs subdirs-after pre-depend depend install
> install-includes install-extra uninstall uninstall-extra clean
> distclean locales ${SUBDIRS} ${SUBDIRS_AFTER} diff --git
> patches/patch-src_libaudcore_Makefile
> patches/patch-src_libaudcore_Makefile index d0c0dbb7e45..ebe69ad1409
> 100644
> --- patches/patch-src_libaudcore_Makefile
> +++ patches/patch-src_libaudcore_Makefile
> @@ -6,5 +6,5 @@ Index: src/libaudcore/Makefile
> -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
> +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
> LIB_MAJOR = 5
> - LIB_MINOR = 0
> + LIB_MINOR = 1
>
> diff --git pkg/PLIST pkg/PLIST
> index cba79e04c41..e1ea6e88af0 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -46,20 +46,9 @@ share/applications/audacious.desktop
> share/audacious/
> share/audacious/AUTHORS
> share/audacious/COPYING
> -share/audacious/images/
> -share/audacious/images/about-logo.png
> -share/audacious/images/about-logo.svg
> -share/audacious/images/album.png
> -share/audacious/images/appearance.png
> -share/audacious/images/audio.png
> -share/audacious/images/connectivity.png
>
[macppc/hppa] Unbreak games/nblood
Hi!
NBlood requires atomics on powerpc, as seen in the current powerpc bulk:
> enet.cpp:(.text+0x2e20): undefined reference to `__atomic_load_8'
> enet.cpp:(.text+0x2e98): undefined reference to `__atomic_compare_exchange_8'
It builds fine on macppc [0] once the usual atomic block is added.
OK?
Charlène.
[0] https://bin.charlenew.xyz/nblood.log
Index: Makefile
===
RCS file: /cvs/ports/games/nblood/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile1 Jan 2020 02:28:07 - 1.1.1.1
+++ Makefile25 Jan 2020 14:49:44 -
@@ -44,6 +44,12 @@ MAKE_FILE = GNUmakefile
USE_GMAKE =Yes
NO_TEST = Yes
+# Fix "undefined reference to `__atomic_load_8'"
+.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
+WANTLIB += atomic
+MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic"
+.endif
+
.include
.if !${PROPERTIES:Mlld}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/01/25 07:43:41 Modified files: devel/physfs : Makefile Added files: devel/physfs/patches: patch-src_physfs_internal_h Log message: physfs: use to detect endianness instead of an incorrect list of architectures. This fixes at least zipfiles loading on powerpc. OK thfr@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/01/25 07:29:49 Modified files: graphics/asymptote: Makefile Log message: asymptote: add missing build depend after texlive update This fixes the build on gcc archs. jca@ proposed to either update or remove the port, as the build is broken on clang archs, but after 14 days there is no reply. OK jca@
UPDATE: audio/clementine
Update audio/clementine to 1.4.0rc1. Tested with some default streaming
services and local MP3s.
You need audio/liblastfm>=1.1.0 and net/libmygpo-qt>=1.1.0 from the
ports@ list to test the update.
OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile13 Aug 2019 14:50:12 - 1.40
+++ Makefile25 Jan 2020 07:19:19 -
@@ -1,87 +1,67 @@
# $OpenBSD: Makefile,v 1.40 2019/08/13 14:50:12 sthen Exp $
-COMMENT = Qt4-based featureful music player
+COMMENT = music player
GH_ACCOUNT = clementine-player
GH_PROJECT = Clementine
-GH_TAGNAME = 1.2.3
+GH_TAGNAME = 1.4.0rc1
CATEGORIES = audio x11
-REVISION = 16
HOMEPAGE = https://clementine-player.org/
# GPLv2/LGPLv2/GFDL
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU Qt5Concurrent Qt5Core
+WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5OpenGL Qt5Sql Qt5Widgets
+WANTLIB += Qt5X11Extras Qt5Xml X11 c cdio chromaprint execinfo
+WANTLIB += fftw3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gpod
+WANTLIB += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
+WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 iconv intl lastfm5
+WANTLIB += m mtp mygpo-qt5 protobuf pulse sqlite3 z
-WANTLIB = c m pthread z
-WANTLIB += GL GLU GLEW ICE SM X11 Xext
-WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
-WANTLIB += lib/qt4/QtOpenGL lib/qt4/QtSql lib/qt4/QtWebKit
-WANTLIB += lib/qt4/QtXml lib/qt4/QtXmlPatterns
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
-WANTLIB += gsttag-0.10 iconv intl
-WANTLIB += cdio chromaprint gpod execinfo fftw3 lastfm mtp mygpo-qt
-WANTLIB += protobuf qca qjson tag>=5.0 usb-1.0 xml2 ${COMPILER_LIBCXX}
# those are dlopen'ed
WANTLIB += plist
-MODULES = devel/cmake x11/qt4
-COMPILER = base-clang ports-gcc
-# clementine is originally meant to be build with c++0x, but
-# protobuf>=3.6 wants c++11
-CXXFLAGS +=-std=c++11
+MODULES = devel/cmake \
+ x11/qt5
BUILD_DEPENDS =devel/boost \
- devel/cmake>=2.8.10.2p3 \
devel/gettext,-tools \
devel/sparsehash
RUN_DEPENDS = devel/desktop-file-utils \
- multimedia/gstreamer-0.10/plugins-good \
- multimedia/gstreamer-0.10/plugins-ffmpeg \
+ multimedia/gstreamer1/plugins-good \
+ multimedia/gstreamer1/plugins-libav \
x11/gtk+3,-guic
LIB_DEPENDS = audio/chromaprint \
audio/libcdio \
audio/libgpod \
- audio/liblastfm \
- audio/taglib>=1.4 \
+ audio/liblastfm>=1.1.0 \
+ audio/pulseaudio \
devel/libexecinfo \
devel/libmtp \
devel/libplist \
- devel/libusb1 \
devel/protobuf \
- devel/qjson \
graphics/glew \
math/fftw3 \
- multimedia/gstreamer-0.10/core \
- multimedia/gstreamer-0.10/plugins-base \
- net/libmygpo-qt \
- security/qca
+ multimedia/gstreamer1/core \
+ multimedia/gstreamer1/plugins-base \
+ net/libmygpo-qt>=1.1.0 \
+ x11/qt5/qtx11extras
TEST_DEPENDS = ${MODPY_BUILD_DEPENDS}
# Unported stuff
-CONFIGURE_ARGS = -DENABLE_SOUNDMENU:Bool=Off \
- -DENABLE_SPOTIFY_BLOB:Bool=Off
-
-# It's advised by Google to use bundled GTest and GMock
-CONFIGURE_ARGS += -DFORCE_BUNDLED_GMOCK=Yes
-
-# Use system SQLite
-# XXX Currently not possible, because devel/sqlite3 is built without
-# -DSQLITE_ENABLE_FTS3_TOKENIZER.
-#CONFIGURE_ARGS += -DSTATIC_SQLITE:Bool=No \
-# -DI_HATE_MY_USERS:Bool=Yes \
-# -DMY_USERS_WILL_SUFFER_BECAUSE_OF_ME:Bool=Yes
+CONFIGURE_ARGS = -DENABLE_SPOTIFY_BLOB=OFF
# stupidity
-CONFIGURE_ARGS += -DBUILD_WERROR:Bool=No
+CONFIGURE_ARGS += -DBUILD_WERROR=ON
# XXX Builds tend to sometimes omit projectM presets when this option
# is missing. To be investigated.
-CONFIGURE_ARGS += -DBUNDLE_PROJECTM_PRESETS:Bool=Yes
+CONFIGURE_ARGS += -DBUNDLE_PROJECTM_PRESETS=ON
post-extract:
cp ${FILESDIR}/config.h.in ${WRKSRC}/ext/libclementine-common/
Index: distinfo
===
RCS file:
UPDATE: audio/liblastfm
Update 2/3 for audio/clementine.
I need this port update to update Clementine. Simple switch from qt4 to
qt5. Tested with upcoming Clementine-1.4.0rc1.
OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/liblastfm/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile17 Jul 2019 14:49:20 - 1.12
+++ Makefile25 Jan 2020 06:28:13 -
@@ -1,35 +1,32 @@
# $OpenBSD: Makefile,v 1.12 2019/07/17 14:49:20 danj Exp $
COMMENT = Qt-based C++ library for the Last.fm webservices
-V =1.0.9
+V =1.1.0
DISTNAME = $V
PKGNAME = liblastfm-$V
CATEGORIES = audio devel net
-REVISION = 3
HOMEPAGE = https://github.com/lastfm/liblastfm
-SHARED_LIBS = lastfm 1.0
-SHARED_LIBS += lastfm_fingerprint 1.0
+
+SHARED_LIBS = lastfm5 0.0
+SHARED_LIBS += lastfm_fingerprint5 0.0
# GPLv3
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Network Qt5Sql
+WANTLIB += Qt5Xml c fftw3f m samplerate
# archives are stable but naming scheme sucks, thus DIST_SUBDIR
-MASTER_SITES = ${HOMEPAGE}/archive/
+MASTER_SITES = https://github.com/lastfm/liblastfm/archive/
DIST_SUBDIR = liblastfm
WRKDIST = ${WRKDIR}/${PKGNAME}
-WANTLIB = lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtXml
-WANTLIB += fftw3f c m pthread samplerate ${COMPILER_LIBCXX}
-
-COMPILER = base-clang ports-gcc base-gcc
+MODULES = devel/cmake \
+ x11/qt5
LIB_DEPENDS = audio/libsamplerate \
math/fftw3,float
-
-MODULES = devel/cmake x11/qt4
-
-CONFIGURE_ARGS = -DBUILD_WITH_QT4=On
# network access
TEST_IS_INTERACTIVE = Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/liblastfm/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo6 Oct 2014 22:05:04 - 1.2
+++ distinfo25 Jan 2020 06:28:13 -
@@ -1,2 +1,2 @@
-SHA256 (liblastfm/1.0.9.tar.gz) = Una1/gCTJHnOb+NwujIT86uELXCn1V5L6tbiZzhCX3s=
-SIZE (liblastfm/1.0.9.tar.gz) = 119320
+SHA256 (liblastfm/1.1.0.tar.gz) = 9h8NqjhOCBqPK9L3ohSLq/8iaW5bcuzayGlAoQEAscg=
+SIZE (liblastfm/1.1.0.tar.gz) = 119392
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/liblastfm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 6 Oct 2014 22:05:04 - 1.2
+++ pkg/PLIST 25 Jan 2020 06:28:13 -
@@ -1,34 +1,34 @@
@comment $OpenBSD: PLIST,v 1.2 2014/10/06 22:05:04 zhuk Exp $
-include/lastfm/
-include/lastfm/AbstractType.h
-include/lastfm/Album.h
-include/lastfm/Artist.h
-include/lastfm/Audioscrobbler.h
-include/lastfm/Auth.h
-include/lastfm/Chart.h
-include/lastfm/Fingerprint.h
-include/lastfm/FingerprintId.h
-include/lastfm/FingerprintableSource.h
-include/lastfm/InternetConnectionMonitor.h
-include/lastfm/Library.h
-include/lastfm/Mbid.h
-include/lastfm/NetworkAccessManager.h
-include/lastfm/NetworkConnectionMonitor.h
-include/lastfm/Playlist.h
-include/lastfm/RadioStation.h
-include/lastfm/RadioTuner.h
-include/lastfm/ScrobbleCache.h
-include/lastfm/ScrobblePoint.h
-include/lastfm/Tag.h
-include/lastfm/Tasteometer.h
-include/lastfm/Track.h
-include/lastfm/Url.h
-include/lastfm/UrlBuilder.h
-include/lastfm/User.h
-include/lastfm/XmlQuery.h
-include/lastfm/Xspf.h
-include/lastfm/global.h
-include/lastfm/misc.h
-include/lastfm/ws.h
-@lib lib/liblastfm.so.${LIBlastfm_VERSION}
-@lib lib/liblastfm_fingerprint.so.${LIBlastfm_fingerprint_VERSION}
+include/lastfm5/
+include/lastfm5/AbstractType.h
+include/lastfm5/Album.h
+include/lastfm5/Artist.h
+include/lastfm5/Audioscrobbler.h
+include/lastfm5/Auth.h
+include/lastfm5/Chart.h
+include/lastfm5/Fingerprint.h
+include/lastfm5/FingerprintId.h
+include/lastfm5/FingerprintableSource.h
+include/lastfm5/InternetConnectionMonitor.h
+include/lastfm5/Library.h
+include/lastfm5/Mbid.h
+include/lastfm5/NetworkAccessManager.h
+include/lastfm5/NetworkConnectionMonitor.h
+include/lastfm5/Playlist.h
+include/lastfm5/RadioStation.h
+include/lastfm5/RadioTuner.h
+include/lastfm5/ScrobbleCache.h
+include/lastfm5/ScrobblePoint.h
+include/lastfm5/Tag.h
+include/lastfm5/Tasteometer.h
+include/lastfm5/Track.h
+include/lastfm5/Url.h
+include/lastfm5/UrlBuilder.h
+include/lastfm5/User.h
+include/lastfm5/XmlQuery.h
+include/lastfm5/Xspf.h
+include/lastfm5/global.h
+include/lastfm5/misc.h
+include/lastfm5/ws.h
+@lib lib/liblastfm5.so.${LIBlastfm5_VERSION}
+@lib lib/liblastfm_fingerprint5.so.${LIBlastfm_fingerprint5_VERSION}
UPDATE: net/libmygpo-qt
Update 1/3 for audio/clementine.
I need this port update to update Clementine. Simple switch from qt4 to
qt5. Tested with upcoming Clementine-1.4.0rc1.
OK?
Index: Makefile
===
RCS file: /cvs/ports/net/libmygpo-qt/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:48:30 - 1.9
+++ Makefile25 Jan 2020 06:29:29 -
@@ -1,28 +1,26 @@
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:48:30 sthen Exp $
-COMMENT = Qt/C++ library wrapper for the GPodder
-DISTNAME = libmygpo-qt.1.0.7
-PKGNAME = ${DISTNAME:S/./-/}
-REVISION = 4
+COMMENT = Qt/C++ library wrapper for the GPodder
-SHARED_LIBS = mygpo-qt0.0
+V =1.1.0
+PKGNAME = libmygpo-qt-$V
+DISTNAME = libmygpo-qt.$V
-CATEGORIES = audio devel net
-HOMEPAGE = http://wiki.gpodder.org/wiki/Libmygpo-qt
+CATEGORIES = audio devel net
-# LGPLv2.1+
-PERMIT_PACKAGE = Yes
+SHARED_LIBS = mygpo-qt5 0.0
-WANTLIB = lib/qt4/QtNetwork m qjson ${COMPILER_LIBCXX}
+# LGPLv2.1+
+PERMIT_PACKAGE = Yes
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network m
-MASTER_SITES = http://stefan.derkits.at/files/libmygpo-qt/
+MODULES = devel/cmake \
+ x11/qt5
-MODULES = devel/cmake x11/qt4
-LIB_DEPENDS = devel/qjson
+MASTER_SITES = https://stefan.derkits.at/files/libmygpo-qt/
# picks up doxygen during configure but does not really use it
-CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
+CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mygpo-qt
Index: distinfo
===
RCS file: /cvs/ports/net/libmygpo-qt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo9 Dec 2013 21:26:32 - 1.1.1.1
+++ distinfo25 Jan 2020 06:29:29 -
@@ -1,2 +1,2 @@
-SHA256 (libmygpo-qt.1.0.7.tar.gz) =
+q3njhuu6rf4WN7IBTCtY8UPaD/lEZSKsaReaFgozHQ=
-SIZE (libmygpo-qt.1.0.7.tar.gz) = 66050
+SHA256 (libmygpo-qt.1.1.0.tar.gz) =
gnZam6p7a7OjJ3dZzsnDd57uaR25GAr/41pngTNG4c0=
+SIZE (libmygpo-qt.1.1.0.tar.gz) = 68750
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/libmygpo-qt/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 22 May 2015 11:31:17 - 1.3
+++ pkg/PLIST 25 Jan 2020 06:29:29 -
@@ -1,30 +1,30 @@
@comment $OpenBSD: PLIST,v 1.3 2015/05/22 11:31:17 ajacoutot Exp $
-include/mygpo-qt/
-include/mygpo-qt/AddRemoveResult.h
-include/mygpo-qt/ApiRequest.h
-include/mygpo-qt/Config.h
-include/mygpo-qt/Device.h
-include/mygpo-qt/DeviceList.h
-include/mygpo-qt/DeviceSyncResult.h
-include/mygpo-qt/DeviceUpdates.h
-include/mygpo-qt/Episode.h
-include/mygpo-qt/EpisodeAction.h
-include/mygpo-qt/EpisodeActionList.h
-include/mygpo-qt/EpisodeList.h
-include/mygpo-qt/Podcast.h
-include/mygpo-qt/PodcastList.h
-include/mygpo-qt/Settings.h
-include/mygpo-qt/Tag.h
-include/mygpo-qt/TagList.h
-include/mygpo-qt/mygpo_export.h
+include/mygpo-qt5/
+include/mygpo-qt5/AddRemoveResult.h
+include/mygpo-qt5/ApiRequest.h
+include/mygpo-qt5/Config.h
+include/mygpo-qt5/Device.h
+include/mygpo-qt5/DeviceList.h
+include/mygpo-qt5/DeviceSyncResult.h
+include/mygpo-qt5/DeviceUpdates.h
+include/mygpo-qt5/Episode.h
+include/mygpo-qt5/EpisodeAction.h
+include/mygpo-qt5/EpisodeActionList.h
+include/mygpo-qt5/EpisodeList.h
+include/mygpo-qt5/Podcast.h
+include/mygpo-qt5/PodcastList.h
+include/mygpo-qt5/Settings.h
+include/mygpo-qt5/Tag.h
+include/mygpo-qt5/TagList.h
+include/mygpo-qt5/mygpo_export.h
lib/cmake/
-lib/cmake/mygpo-qt/
-lib/cmake/mygpo-qt/Mygpo-qtConfig.cmake
-lib/cmake/mygpo-qt/Mygpo-qtConfigVersion.cmake
-lib/cmake/mygpo-qt/Mygpo-qtTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/mygpo-qt/Mygpo-qtTargets.cmake
-@lib lib/libmygpo-qt.so.${LIBmygpo-qt_VERSION}
-lib/pkgconfig/libmygpo-qt.pc
+lib/cmake/mygpo-qt5/
+lib/cmake/mygpo-qt5/Mygpo-qt5Config.cmake
+lib/cmake/mygpo-qt5/Mygpo-qt5ConfigVersion.cmake
+lib/cmake/mygpo-qt5/Mygpo-qt5Targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/mygpo-qt5/Mygpo-qt5Targets.cmake
+@lib lib/libmygpo-qt5.so.${LIBmygpo-qt5_VERSION}
+lib/pkgconfig/libmygpo-qt5.pc
share/examples/mygpo-qt/
share/examples/mygpo-qt/Makefile
share/examples/mygpo-qt/src/
Re: [NEW] textproc/scdoc
On 2020/01/24 00:19, Ingo Schwarze wrote:
> Hi,
>
> Stuart Henderson wrote on Thu, Jan 23, 2020 at 11:26:12AM +:
> > On 2020/01/22 23:34, Raymond E. Pasco wrote:
>
> >> Having looked at it a bit more, I see other statically linked ports with
> >> empty WANTLIB (e.g. shells/tcsh), but that doesn't necessarily mean it's
> >> correct. Since I don't know, here's another tgz identical to the last
> >> but with WANTLIB=c (which, if you remove -static, is what it would
> >> require).
>
> > Please don't statically link it. The few ports doing this are special cases.
>
> OK, here we go, with the following changes to what Raymond sent:
>
> * Delete -static from LDFLAGS in the Makefile.
>I found no way to feed that in via the environment,
>so i patched the Makefile.
>
> * Polish the COMMENT. Saying just "generator" is not helpful
>because it doesn't say from which source format, and this is
>particularly relevant here because it uses an extremely unusual
>format that nothing else uses, so the claim "generator" is overly
>broad. Also make it clear that generating man pages actually
>means generating old 1979-style man(7) code.
>
> * Polish DESCR in the same vein. POSIX is irrelevant here;
>were are writing a decsription for OpenBSD.
>
>
> Obviously, this is only yet another low-quality man(7) generator
> (emitting pointless low-level roff(7) code, lots of bogus .P,
> incorrectly encoded dashes, using low-level font escapes rather
> than proper man(7) macros, failing to properly generate .MT
> and .UR, ... - and that's just from inspecting the thirty line
> file scdoc.1 itself) so using it certainly isn't encouraged.
>
> But given that some people use it anyway for documentating their
> software, i agree that a port is needed, even if only as a dependency
> for other, potentially more useful ports.
>
> OK?
> Ingo
Add this, and it's OK sthen:
MAKE_FLAGS =CC="${CC}"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/01/25 05:22:22 Modified files: security/acme-client: Makefile Added files: security/acme-client/patches: patch-http_c Log message: backport "tls_close: EOF without close notify" suppression to ports acme-client
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/01/25 05:21:41 ports/security/acme-client/patches Update of /cvs/ports/security/acme-client/patches In directory cvs.openbsd.org:/tmp/cvs-serv63879/patches Log Message: Directory /cvs/ports/security/acme-client/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/01/25 05:01:09 Modified files: graphics/ipe/patches: patch-src_config_mak patch-src_ipe6upgrade_Makefile patch-src_ipeextract_Makefile patch-src_ipetoipe_Makefile Log message: regen patches to standard format, no content changes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 04:57:02 Modified files: net/bro: Makefile Log message: Fix bogus bro symlink; reported by espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 04:49:08 Modified files: print/cups-filters: Makefile distinfo Log message: Update to cups-filters-1.26.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 04:29:06 Modified files: textproc/gspell: Makefile distinfo textproc/gspell/pkg: PLIST Log message: Update to gspell-1.8.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 04:28:06 Modified files: x11/gnome/amtk : Makefile distinfo x11/gnome/amtk/pkg: PLIST Log message: Update to amtk-5.0.2.
Re: [update] net/telegram-purple version 1.3.1 to 1.4.2
On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote:
> Hello,
>
> this is an update for net/telegram-purple.
>
> Port changes:
> - Updated patches
> - Reintroduced -fPIC as it won't build without it
>
> Changelog:
> - mostly bugfixes and translation updates
> https://raw.githubusercontent.com/majn/telegram-purple/master/CHANGELOG.md
>
> The BROKEN condition still applies. The code parse_tlo_file has not
> changed.
>
afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@
Cheers
Giovanni
> "make test" passes and I'm using it with pidgin.
>
> Best Regards,
> Stefan
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/telegram-purple/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile 12 Jul 2019 20:48:50 - 1.6
> +++ Makefile 25 Jan 2020 08:17:44 -
> @@ -2,8 +2,7 @@
>
> BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file
> "generate.c", line 2831, function "parse_tlo_file"
>
> -V = 1.3.1
> -REVISION = 2
> +V = 1.4.2
> COMMENT =Telegram support for Pidgin
> DISTNAME = telegram-purple_$V.orig
> PKGNAME =telegram-purple-$V
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/telegram-purple/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 24 Jun 2017 00:20:17 - 1.1.1.1
> +++ distinfo 25 Jan 2020 08:17:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (telegram-purple_1.3.1.orig.tar.gz) =
> hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
> -SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
> +SHA256 (telegram-purple_1.4.2.orig.tar.gz) =
> vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
> +SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
> --- patches/patch-Makefile_in 24 Jun 2017 00:20:17 - 1.1.1.1
> +++ patches/patch-Makefile_in 25 Jan 2020 08:17:44 -
> @@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
> Index: Makefile.in
> --- Makefile.in.orig
> +++ Makefile.in
> -@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
> - localedir=@localedir@
> - gettext_package=@GETTEXT_PACKAGE@
> +@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l
> + CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
> + CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
> + CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
> +-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN}
> ${CFLAGS_EXTRA}
> ++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC
>
> --CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
> -DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations
> -Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC
> -D_FORTIFY_SOURCE=2
> --LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
> -+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
> -DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
> -+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
> - DIR_PERM=0755
> - FILE_PERM=0644
> +-LDFLAGS_EXTRA=-rdynamic -ggdb
> ++LDFLAGS_EXTRA=-rdynamic
> + LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
>
> -@@ -81,7 +81,7 @@ tgl/Makefile.in:
> + DIR_PERM=0755
> +@@ -116,7 +116,7 @@ tgl/Makefile.in:
> @echo "tgl/Makefile.in not found. Maybe you need to 'git submodule
> update --init --recursive' ?" && exit 1
>
> tgl/Makefile: tgl/Makefile.in Makefile
> Index: patches/patch-tgl_Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in
> --- patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17 - 1.1.1.1
> +++ patches/patch-tgl_Makefile_in 25 Jan 2020 08:17:44 -
> @@ -7,7 +7,7 @@ Index: tgl/Makefile.in
> LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
> CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
> DEFS=@DEFS@
> --COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra
> -Werror -Wno-deprecated-declarations -fno-strict-aliasing
> -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
> +-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra
> -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer
> -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
> +COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing
>
Re: Issues with manuals+amd(8) for a handful of ports
On Sat, Jan 25, 2020 at 10:16:47AM +0100, Kusalananda Kähäri wrote: > On Sat, Jan 25, 2020 at 03:07:00AM +0100, Ingo Schwarze wrote: > > Hi Andreas, > > Good morning Ingo, > > See below. > > > > > Andreas Kusalananda wrote on Wed, Jan 22, 2020 at 08:58:26PM +0100: > > > > > I mount my /usr/local directory from a remote server over NFS > > > using amd(8). This means that I have the directories directly [cut] > Since running makewhatis on /usr/local/man (and actually also without > a directory argument at all) corrects the database, I expect that the > /etc/weekly script will actually correct the issue on my other machines, > rather than corrupt the database with bogus entries. Forgot to say that running # sh /etc/weekly fixes the issue on a machine where the manual database has these boges entries. I've moved the weekly job to another day, so I'll wait and see if the automatic run of this fixes the issue on other machines (but I would expect it to fix it). -- Andreas (Kusalananda) Kähäri SciLifeLab, NBIS, ICM Uppsala University, Sweden .
Re: Issues with manuals+amd(8) for a handful of ports
On Sat, Jan 25, 2020 at 03:07:00AM +0100, Ingo Schwarze wrote:
> Hi Andreas,
Good morning Ingo,
See below.
>
> Andreas Kusalananda wrote on Wed, Jan 22, 2020 at 08:58:26PM +0100:
>
> > I mount my /usr/local directory from a remote server over NFS
> > using amd(8). This means that I have the directories directly
> > beneath /usr/local appear on demand as symbolic links into
> > /tmp_mnt/eeyore/vol/local/pooh where the /usr/local for the local
> > machine "pooh" is mounted over NFS from "eeyore" (and mounted/unmounted
> > on demand).
> >
> > This works very well, but there is a handful of ports that misbehave
> > with regards to manuals. Of the 70 or so pre-built packages that I've
> > installed on my amd64-current system, the only ones misbehaving are
> >
> > databases/pkglocatedb (pkglocatedb-1.5)
> > devel/git,-main (git-2.25.0)
> > sysutils/p5-File-Rename-1.10(p5-File-Rename-1.10)
> >
> > When I do "man pkglocate", for example, I get
> >
> > man: /tmp_mnt/eeyore/vol/local/pooh/man//usr/local/man/man1/pkg_locate.1:
> > SYSERR: open: No such file or directory
> >
> > ... and likewise for any other utility etc. from those ports. Commands
> > like "git clone --help" gives similar diagnostics.
> >
> > The manuals are actually visible where they are supposed to be:
> >
> > $ ls -l /usr/local/man/man1/{git{,-clone},pkg_locate}.1
> > -rw-r--r-- 1 root bin 20005 Jan 20 22:20 /usr/local/man/man1/git-clone.1
> > -rw-r--r-- 1 root bin 50901 Jan 13 19:49 /usr/local/man/man1/git.1
> > -rw-r--r-- 1 root bin 2845 Jan 19 08:14 /usr/local/man/man1/pkg_locate.1
> >
> > ... so it looks as if man(1) is, for whatever reason, looking in the
> > wrong location for the file.
>
> The man(1) manual page says:
>
> The mandoc.db(5) database is used for looking up manual page entries.
> In cases where the database is absent, outdated, or corrupt, man falls
> back to looking for files called name.section.
>
> However, when the database is present and in the correct format but
> references non-existent files like
> /tmp_mnt/eeyore/vol/local/pooh/man/usr/local/man/man1/pkg_locate.1
> there is no fallback. The reason is that by the time it turns out
> the file name found in the database is bogus, man(1) has progressed
> beyond the stage where it can repeat the search using a different
> method. Fallback to file system search only happens when no match
> is found, not when the database contains a match but the path in
> the database happens to be wrong.
>
> > Manuals for other utilities, like rsync, pv, pwgen, openvpn, etc., do
> > work as they should.
>
> This sounds as if pkg_add(1) sometimes worked well but sometimes got
> confused when running makewhatis(8) and consequently your database
> is now corrupt in a weird way that i have never seen before.
>
> Please show the output of
>
>$ man -w pkglocate rsync
$ man -w pkglocate rsync
/tmp_mnt/eeyore/vol/local/pooh/man//usr/local/man/man1/pkg_locate.1
/tmp_mnt/eeyore/vol/local/pooh/man/man1/pkg_locate.1
/tmp_mnt/eeyore/vol/local/pooh/man/man1/rsync.1
>
> The expected, correct result is
>
>$ man -w pkglocate rsync
> /usr/local/man/man1/pkg_locate.1
> /usr/local/man/man1/rsync.1
>
> I expect you may see
>
> /tmp_mnt/eeyore/vol/local/pooh/man//usr/local/man/man1/pkg_locate.1
> /usr/local/man/man1/rsync.1
Yes, but with the *correct* entry for pkg_locate.1 also present after
the first bogus one.
>
> I suspect if you run
>
># makewhatis /tmp_mnt/eeyore/vol/local/pooh/man
Yes, this corrects the database:
$ man -w pkglocate rsync
/tmp_mnt/eeyore/vol/local/pooh/man/man1/pkg_locate.1
/tmp_mnt/eeyore/vol/local/pooh/man/man1/rsync.1
The command
# makewhatis /usr/local/man
also corrects the database. As does running makewhatis with no
arguments.
>
> the problem may go away, but after that, you may no longer be able
> to reproduce the problem. Also, the problem might re-emerge when
> you install more packages because pkg_add(1) will run makewhatis(8)
> on /usr/local/man, not on /tmp_mnt/... - and so will weekly(8).
Since running makewhatis on /usr/local/man (and actually also without
a directory argument at all) corrects the database, I expect that the
/etc/weekly script will actually correct the issue on my other machines,
rather than corrupt the database with bogus entries.
The issue seems to arise from the pkg_* tools.
Here I've made sure that rsync is not installed and that the manual
database is correct:
$ man -w rsync
man: No entry for rsync in the manual.
$ doas pkg_add -D snap rsync
doas (k...@pooh.prefix.duckdns.org) password:
quirks-3.216 signed on 2020-01-24T11:25:24Z
Ambiguous: choose package for rsync
a 0:
1: rsync-3.1.3
2: rsync-3.1.3-iconv
Your choice: 1
rsync-3.1.3: ok
The following new rcscripts were installed: /etc/rc.d/rsyncd
See rcctl(8) for details.
$ man -w rsync
/tmp_mnt/eeyore/vol/local/pooh/man//usr/local/man/man1/rsync.1
$
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 01:39:17 Modified files: sysutils/consul-template: Makefile distinfo sysutils/terragrunt: Makefile distinfo Log message: Use "go mod" instead of dep.
[update] net/telegram-purple version 1.3.1 to 1.4.2
Hello,
this is an update for net/telegram-purple.
Port changes:
- Updated patches
- Reintroduced -fPIC as it won't build without it
Changelog:
- mostly bugfixes and translation updates
https://raw.githubusercontent.com/majn/telegram-purple/master/CHANGELOG.md
The BROKEN condition still applies. The code parse_tlo_file has not
changed.
"make test" passes and I'm using it with pidgin.
Best Regards,
Stefan
Index: Makefile
===
RCS file: /cvs/ports/net/telegram-purple/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:48:50 - 1.6
+++ Makefile25 Jan 2020 08:17:44 -
@@ -2,8 +2,7 @@
BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file
"generate.c", line 2831, function "parse_tlo_file"
-V =1.3.1
-REVISION = 2
+V =1.4.2
COMMENT = Telegram support for Pidgin
DISTNAME = telegram-purple_$V.orig
PKGNAME = telegram-purple-$V
Index: distinfo
===
RCS file: /cvs/ports/net/telegram-purple/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo24 Jun 2017 00:20:17 - 1.1.1.1
+++ distinfo25 Jan 2020 08:17:44 -
@@ -1,2 +1,2 @@
-SHA256 (telegram-purple_1.3.1.orig.tar.gz) =
hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
-SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
+SHA256 (telegram-purple_1.4.2.orig.tar.gz) =
vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
+SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 24 Jun 2017 00:20:17 - 1.1.1.1
+++ patches/patch-Makefile_in 25 Jan 2020 08:17:44 -
@@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
- localedir=@localedir@
- gettext_package=@GETTEXT_PACKAGE@
+@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l
+ CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
+ CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
+ CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
+-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN}
${CFLAGS_EXTRA}
++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC
--CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
-DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations
-Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC
-D_FORTIFY_SOURCE=2
--LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
-+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS
-DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
-+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
- DIR_PERM=0755
- FILE_PERM=0644
+-LDFLAGS_EXTRA=-rdynamic -ggdb
++LDFLAGS_EXTRA=-rdynamic
+ LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
-@@ -81,7 +81,7 @@ tgl/Makefile.in:
+ DIR_PERM=0755
+@@ -116,7 +116,7 @@ tgl/Makefile.in:
@echo "tgl/Makefile.in not found. Maybe you need to 'git submodule
update --init --recursive' ?" && exit 1
tgl/Makefile: tgl/Makefile.in Makefile
Index: patches/patch-tgl_Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in
--- patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17 - 1.1.1.1
+++ patches/patch-tgl_Makefile_in 25 Jan 2020 08:17:44 -
@@ -7,7 +7,7 @@ Index: tgl/Makefile.in
LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
DEFS=@DEFS@
--COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
+-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing
-fno-omit-frame-pointer -fPIC
EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
Index: patches/patch-tgl_configure
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_configure,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tgl_configure
--- patches/patch-tgl_configure 4 Sep
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/01/25 01:26:09 Modified files: sysutils/envconsul: Makefile distinfo Log message: Update to envconsul-0.9.2.
