Re: math/lapack,-cblas,-blas,-docs
Rafael Sadowski [2024-05-19, 18:48:17]: > Before I go deeper into the rabbit hole I would like to ask for > feedback. Below you can see my idea. I would like to update lapack, > blas and cblas. Upstream project has decided to use cmake and build > everything in one. I like it because it makes the current situation > simple. > > My suggestion is to split this into a MULTI-PACKAGE. > > A diff speaks more than 1000 words: This approach is fine with me. With the legacy build system this port is not very maintainable. I ran into some build issues last time I tried to update it, good to see that it's fine with cmake. I'll take a closer look soon.
UPDATE: audio/mpdscribble
overdue maintenance update; works fine here on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/mpdscribble/Makefile,v
diff -u -p -u -r1.10 Makefile
--- Makefile5 Sep 2023 16:13:40 - 1.10
+++ Makefile2 May 2024 20:15:52 -
@@ -1,8 +1,8 @@
COMMENT = mpd client to scrobble track info to last.fm
-V =0.22
+V =0.25
DISTNAME = mpdscribble-$V
-REVISION = 2
+EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
@@ -13,19 +13,19 @@ MAINTAINER =Steven Mestdagh http://www.musicpd.org/download/mpdscribble/$V/
LIB_DEPENDS = net/curl \
- devel/glib2 \
- audio/libmpdclient
+ audio/libmpdclient \
+ security/libgcrypt
-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --with-http-client=curl
+MODULES = devel/meson
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${PREFIX}/bin/mpdscribble
+ ${INSTALL_PROGRAM} ${WRKBUILD}/mpdscribble ${PREFIX}/bin/mpdscribble
${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1
${PREFIX}/man/man1/mpdscribble.1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mpdscribble
${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf
${PREFIX}/share/doc/mpdscribble
Index: distinfo
===
RCS file: /cvs/ports/audio/mpdscribble/distinfo,v
diff -u -p -u -r1.3 distinfo
--- distinfo11 Nov 2013 14:01:56 - 1.3
+++ distinfo2 May 2024 20:15:52 -
@@ -1,2 +1,2 @@
-SHA256 (mpdscribble-0.22.tar.gz) = /4gtAr2DC9y8z+PDybDTL0+Y2b7Nto3DE190gEZfHjg=
-SIZE (mpdscribble-0.22.tar.gz) = 141480
+SHA256 (mpdscribble-0.25.tar.xz) = IPidlFv1F8TWi/d6d6NZ/bE4QqsSlejSHtp5vitbNc4=
+SIZE (mpdscribble-0.25.tar.xz) = 68732
Re: UPDATE: math/fftw3
> > A minor update; all tests still pass on amd64.
> > Octave, including its test suite, is still fine with this as well.
> > I didn't test other ports that use this.
> >
> > ok?
>
> this one should be better
anyone?
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/fftw3/Makefile,v
> retrieving revision 1.38
> diff -u -p -u -r1.38 Makefile
> --- Makefile 11 Mar 2022 19:36:14 - 1.38
> +++ Makefile 14 Nov 2022 10:34:19 -
> @@ -1,7 +1,7 @@
> COMMENT-main=C routines for computing the Discrete Fourier Transform
> COMMENT-common= common files for the fftw3 packages
>
> -V= 3.3.8
> +V= 3.3.10
> DISTNAME=fftw-${V}
> PKGNAME= fftw3-${V}
> FULLPKGNAME-main=fftw3-${V}
> @@ -10,11 +10,9 @@ FULLPKGPATH-main= math/fftw3,-main${FLAV
> FULLPKGNAME-common= fftw3-common-${V}
> SHARED_LIBS= fftw3 7.1 \
> fftw3f 7.1 \
> - fftw3_threads 1.1 \
> - fftw3f_threads 1.1
> + fftw3_threads 1.2 \
> + fftw3f_threads 1.2
> CATEGORIES= math
> -
> -REVISION=1
>
> HOMEPAGE=http://www.fftw.org/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/fftw3/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 distinfo
> --- distinfo 17 Apr 2019 18:49:59 - 1.11
> +++ distinfo 14 Nov 2022 10:34:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (fftw-3.3.8.tar.gz) = YRMmL26Sxb1HTyh1+hsBBUxK1QQPaw2nwDyYgh2a4wM=
> -SIZE (fftw-3.3.8.tar.gz) = 4110137
> +SHA256 (fftw-3.3.10.tar.gz) = VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=
> +SIZE (fftw-3.3.10.tar.gz) = 4144100
> Index: pkg/PFRAG.double-main
> ===
> RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 PFRAG.double-main
> --- pkg/PFRAG.double-main 11 Mar 2022 19:36:14 - 1.6
> +++ pkg/PFRAG.double-main 14 Nov 2022 10:34:19 -
> @@ -3,10 +3,10 @@
> @bin bin/fftw-wisdom
> lib/cmake/fftw3/FFTW3Config.cmake
> lib/cmake/fftw3/FFTW3ConfigVersion.cmake
> -lib/libfftw3.a
> +@static-lib lib/libfftw3.a
> lib/libfftw3.la
> @lib lib/libfftw3.so.${LIBfftw3_VERSION}
> -lib/libfftw3_threads.a
> +@static-lib lib/libfftw3_threads.a
> lib/libfftw3_threads.la
> @lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION}
> lib/pkgconfig/fftw3.pc
> Index: pkg/PFRAG.float-main
> ===
> RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 PFRAG.float-main
> --- pkg/PFRAG.float-main 11 Mar 2022 19:36:14 - 1.6
> +++ pkg/PFRAG.float-main 14 Nov 2022 10:34:19 -
> @@ -2,10 +2,10 @@
> @bin bin/fftwf-wisdom
> lib/cmake/fftw3/FFTW3fConfig.cmake
> lib/cmake/fftw3/FFTW3fConfigVersion.cmake
> -lib/libfftw3f.a
> +@static-lib lib/libfftw3f.a
> lib/libfftw3f.la
> @lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
> -lib/libfftw3f_threads.a
> +@static-lib lib/libfftw3f_threads.a
> lib/libfftw3f_threads.la
> @lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION}
> lib/pkgconfig/fftw3f.pc
Re: UPDATE: math/fftw3
Steven Mestdagh [2022-11-14, 11:33:23]:
> A minor update; all tests still pass on amd64.
> Octave, including its test suite, is still fine with this as well.
> I didn't test other ports that use this.
>
> ok?
this one should be better
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.38
diff -u -p -u -r1.38 Makefile
--- Makefile11 Mar 2022 19:36:14 - 1.38
+++ Makefile14 Nov 2022 10:34:19 -
@@ -1,7 +1,7 @@
COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common=common files for the fftw3 packages
-V= 3.3.8
+V= 3.3.10
DISTNAME= fftw-${V}
PKGNAME= fftw3-${V}
FULLPKGNAME-main= fftw3-${V}
@@ -10,11 +10,9 @@ FULLPKGPATH-main=math/fftw3,-main${FLAV
FULLPKGNAME-common=fftw3-common-${V}
SHARED_LIBS= fftw3 7.1 \
fftw3f 7.1 \
- fftw3_threads 1.1 \
- fftw3f_threads 1.1
+ fftw3_threads 1.2 \
+ fftw3f_threads 1.2
CATEGORIES=math
-
-REVISION= 1
HOMEPAGE= http://www.fftw.org/
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo17 Apr 2019 18:49:59 - 1.11
+++ distinfo14 Nov 2022 10:34:19 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.3.8.tar.gz) = YRMmL26Sxb1HTyh1+hsBBUxK1QQPaw2nwDyYgh2a4wM=
-SIZE (fftw-3.3.8.tar.gz) = 4110137
+SHA256 (fftw-3.3.10.tar.gz) = VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=
+SIZE (fftw-3.3.10.tar.gz) = 4144100
Index: pkg/PFRAG.double-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
retrieving revision 1.6
diff -u -p -u -r1.6 PFRAG.double-main
--- pkg/PFRAG.double-main 11 Mar 2022 19:36:14 - 1.6
+++ pkg/PFRAG.double-main 14 Nov 2022 10:34:19 -
@@ -3,10 +3,10 @@
@bin bin/fftw-wisdom
lib/cmake/fftw3/FFTW3Config.cmake
lib/cmake/fftw3/FFTW3ConfigVersion.cmake
-lib/libfftw3.a
+@static-lib lib/libfftw3.a
lib/libfftw3.la
@lib lib/libfftw3.so.${LIBfftw3_VERSION}
-lib/libfftw3_threads.a
+@static-lib lib/libfftw3_threads.a
lib/libfftw3_threads.la
@lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION}
lib/pkgconfig/fftw3.pc
Index: pkg/PFRAG.float-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
retrieving revision 1.6
diff -u -p -u -r1.6 PFRAG.float-main
--- pkg/PFRAG.float-main11 Mar 2022 19:36:14 - 1.6
+++ pkg/PFRAG.float-main14 Nov 2022 10:34:19 -
@@ -2,10 +2,10 @@
@bin bin/fftwf-wisdom
lib/cmake/fftw3/FFTW3fConfig.cmake
lib/cmake/fftw3/FFTW3fConfigVersion.cmake
-lib/libfftw3f.a
+@static-lib lib/libfftw3f.a
lib/libfftw3f.la
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
-lib/libfftw3f_threads.a
+@static-lib lib/libfftw3f_threads.a
lib/libfftw3f_threads.la
@lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION}
lib/pkgconfig/fftw3f.pc
UPDATE: math/fftw3
A minor update; all tests still pass on amd64.
Octave, including its test suite, is still fine with this as well.
I didn't test other ports that use this.
ok?
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.38
diff -u -p -u -r1.38 Makefile
--- Makefile11 Mar 2022 19:36:14 - 1.38
+++ Makefile13 Nov 2022 19:34:27 -
@@ -1,7 +1,7 @@
COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common=common files for the fftw3 packages
-V= 3.3.8
+V= 3.3.10
DISTNAME= fftw-${V}
PKGNAME= fftw3-${V}
FULLPKGNAME-main= fftw3-${V}
@@ -10,8 +10,8 @@ FULLPKGPATH-main= math/fftw3,-main${FLAV
FULLPKGNAME-common=fftw3-common-${V}
SHARED_LIBS= fftw3 7.1 \
fftw3f 7.1 \
- fftw3_threads 1.1 \
- fftw3f_threads 1.1
+ fftw3_threads 1.2 \
+ fftw3f_threads 1.2
CATEGORIES=math
REVISION= 1
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo17 Apr 2019 18:49:59 - 1.11
+++ distinfo13 Nov 2022 19:34:27 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.3.8.tar.gz) = YRMmL26Sxb1HTyh1+hsBBUxK1QQPaw2nwDyYgh2a4wM=
-SIZE (fftw-3.3.8.tar.gz) = 4110137
+SHA256 (fftw-3.3.10.tar.gz) = VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=
+SIZE (fftw-3.3.10.tar.gz) = 4144100
Index: pkg/PFRAG.double-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
retrieving revision 1.6
diff -u -p -u -r1.6 PFRAG.double-main
--- pkg/PFRAG.double-main 11 Mar 2022 19:36:14 - 1.6
+++ pkg/PFRAG.double-main 13 Nov 2022 19:34:27 -
@@ -3,10 +3,10 @@
@bin bin/fftw-wisdom
lib/cmake/fftw3/FFTW3Config.cmake
lib/cmake/fftw3/FFTW3ConfigVersion.cmake
-lib/libfftw3.a
+@static-lib lib/libfftw3.a
lib/libfftw3.la
@lib lib/libfftw3.so.${LIBfftw3_VERSION}
-lib/libfftw3_threads.a
+@static-lib lib/libfftw3_threads.a
lib/libfftw3_threads.la
@lib lib/libfftw3_threads.so.${LIBfftw3_threads_VERSION}
lib/pkgconfig/fftw3.pc
Index: pkg/PFRAG.float-main
===
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
retrieving revision 1.6
diff -u -p -u -r1.6 PFRAG.float-main
--- pkg/PFRAG.float-main11 Mar 2022 19:36:14 - 1.6
+++ pkg/PFRAG.float-main13 Nov 2022 19:34:27 -
@@ -2,10 +2,10 @@
@bin bin/fftwf-wisdom
lib/cmake/fftw3/FFTW3fConfig.cmake
lib/cmake/fftw3/FFTW3fConfigVersion.cmake
-lib/libfftw3f.a
+@static-lib lib/libfftw3f.a
lib/libfftw3f.la
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
-lib/libfftw3f_threads.a
+@static-lib lib/libfftw3f_threads.a
lib/libfftw3f_threads.la
@lib lib/libfftw3f_threads.so.${LIBfftw3f_threads_VERSION}
lib/pkgconfig/fftw3f.pc
UPDATE: math/p5-Math-GMP{f,z}
maintenance update; tests still pass.
ok?
Index: p5-Math-GMPf/Makefile
===
RCS file: /cvs/ports/math/p5-Math-GMPf/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- p5-Math-GMPf/Makefile 11 Mar 2022 19:36:24 - 1.5
+++ p5-Math-GMPf/Makefile 12 Nov 2022 22:52:42 -
@@ -1,7 +1,7 @@
COMMENT = perl interface to GMP floating point functions
MODULES = cpan
-DISTNAME = Math-GMPf-0.44
+DISTNAME = Math-GMPf-0.49
CATEGORIES = math
# Perl
Index: p5-Math-GMPf/distinfo
===
RCS file: /cvs/ports/math/p5-Math-GMPf/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- p5-Math-GMPf/distinfo 27 Oct 2021 17:06:33 - 1.2
+++ p5-Math-GMPf/distinfo 12 Nov 2022 22:52:42 -
@@ -1,2 +1,2 @@
-SHA256 (Math-GMPf-0.44.tar.gz) = PtoEq0QSIzE6CrVRN8y+FCbrtafGKphEJ0ov7swWzWs=
-SIZE (Math-GMPf-0.44.tar.gz) = 55068
+SHA256 (Math-GMPf-0.49.tar.gz) = l+1F5L1m9RQw6m0gwSjTycwOITUFnEtdQsfdFTHoC74=
+SIZE (Math-GMPf-0.49.tar.gz) = 62542
Index: p5-Math-GMPf/patches/patch-Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPf/patches/patch-Makefile_PL,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-Makefile_PL
--- p5-Math-GMPf/patches/patch-Makefile_PL 11 Mar 2022 19:36:24 -
1.3
+++ p5-Math-GMPf/patches/patch-Makefile_PL 12 Nov 2022 22:52:42 -
@@ -1,15 +1,15 @@
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -63,9 +63,8 @@ my %options = (
+@@ -106,9 +106,8 @@ my %options = (
AUTHOR => 'Sisyphus (sisyphus at (@) cpan dot (.) org)',
ABSTRACT => 'Perl interface to the GMP floating point functions',
DEFINE => $defines,
- LIBS => [
--'-lgmp'
+-$libopts
- ],
+ INC => "$ENV{CPPFLAGS}",
+ LIBS => ["$ENV{LDFLAGS} -lgmp"],
LICENSE => 'perl',
VERSION_FROM => 'GMPf.pm',
- PREREQ_PM => {'Exporter' => '5.58'}, # avoid test failures on pre perl-5.8.4
+ PREREQ_PM => {'Exporter' => '5.58', 'Test::More' => '0.88'},
Index: p5-Math-GMPf/patches/patch-Random_Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPf/patches/patch-Random_Makefile_PL,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-Random_Makefile_PL
--- p5-Math-GMPf/patches/patch-Random_Makefile_PL 11 Mar 2022 19:36:24
- 1.3
+++ p5-Math-GMPf/patches/patch-Random_Makefile_PL 12 Nov 2022 22:52:42
-
@@ -1,14 +1,14 @@
Index: Random/Makefile.PL
--- Random/Makefile.PL.orig
+++ Random/Makefile.PL
-@@ -10,8 +10,8 @@ my %options = %{
+@@ -11,8 +11,8 @@ my %options = %{
'../typemap'
],
- 'NAME' => 'Math::GMPf::Random',
-- 'LIBS' => $LIBS,
-- 'INC' => $INC,
-+ 'INC' => "$ENV{CPPFLAGS}",
-+ 'LIBS' => ["$ENV{LDFLAGS} -lgmp"],
+ 'NAME' => 'Math::GMPf::Random',
+- 'LIBS' => $LIBS,
+- 'INC' => $INC,
++ 'LIBS' => "$ENV{LDFLAGS} -lgmp",
++ 'INC' => "$ENV{CPPFLAGS}",
+ 'DEFINE' => $DEFS,
'VERSION_FROM' => 'Random.pm'
}
- };
Index: p5-Math-GMPz/Makefile
===
RCS file: /cvs/ports/math/p5-Math-GMPz/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- p5-Math-GMPz/Makefile 11 Mar 2022 19:36:25 - 1.5
+++ p5-Math-GMPz/Makefile 12 Nov 2022 22:52:42 -
@@ -1,7 +1,7 @@
COMMENT = perl interface to GMP integer functions
MODULES = cpan
-DISTNAME = Math-GMPz-0.51
+DISTNAME = Math-GMPz-0.55
CATEGORIES = math
# Perl
@@ -13,11 +13,12 @@ WANTLIB += c gmp>=4 perl
LIB_DEPENDS = devel/gmp
-CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
TEST_DEPENDS = math/p5-Math-BigInt-GMP \
- math/p5-Math-GMPf
+ math/p5-Math-GMPf \
+ devel/p5-Test-Warn
MAKE_ENV +=TEST_POD=Yes
Index: p5-Math-GMPz/distinfo
===
RCS file: /cvs/ports/math/p5-Math-GMPz/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- p5-Math-GMPz/distinfo 27 Oct 2021 17:07:25 - 1.2
+++ p5-Math-GMPz/distinfo 12 Nov 2022 22:52:42 -
@@ -1,2 +1,2 @@
-SHA256 (Math-GMPz-0.51.tar.gz) = TOoaA+UAvzWooMxiVFCxe0R34bzyurE331Zwv7UUY1M=
-SIZE (Math-GMPz-0.51.tar.gz) = 90329
+SHA256 (Math-GMPz-0.55.tar.gz) = zeeeumvsCcHuDtXC41HpQLBn1TAVjM0alu0QJebd23k=
+SIZE (Math-GMPz-0.55.tar.gz) = 99085
Index: p5-Math-GMPz/patches/patch-Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPz/patches/patch-Makefile_PL,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-Makefile_PL
--- p5-Math-GMPz/patches/patch-Makefi
UPDATE: math/octave
Below is a maintenance update for octave.
On amd64 it seems to be fine. The test suite gives the following result:
PASS17011
FAIL 14
REGRESSION 6
XFAIL (reported bug) 33
SKIP (missing feature)226
SKIP (run-time condition) 42
For comparison, the test suite result with the previous release 7.2.0
PASS16952
FAIL 18
REGRESSION 6
XFAIL (reported bug) 31
SKIP (missing feature)226
SKIP (run-time condition) 42
Please test/comment/ok.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.131
diff -u -p -u -r1.131 Makefile
--- Makefile24 Aug 2022 19:53:38 - 1.131
+++ Makefile9 Nov 2022 18:39:11 -
@@ -1,13 +1,13 @@
COMMENT = Scientific Programming Language
-VERSION = 7.2.0
+VERSION = 7.3.0
DISTNAME = octave-${VERSION}
EXTRACT_SUFX = .tar.xz
CATEGORIES = math
-SHARED_LIBS += octave 15.0
-SHARED_LIBS += octgui 9.0
-SHARED_LIBS += octinterp 14.0
+SHARED_LIBS += octave 16.0
+SHARED_LIBS += octgui 10.0
+SHARED_LIBS += octinterp 15.0
HOMEPAGE = https://www.gnu.org/software/octave/
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo24 Aug 2022 19:53:38 - 1.25
+++ distinfo9 Nov 2022 18:39:11 -
@@ -1,2 +1,2 @@
-SHA256 (octave-7.2.0.tar.xz) = Su94w8nUn3XWTM1VJn30CzAg5kFPaeqHV6GTliizAXE=
-SIZE (octave-7.2.0.tar.xz) = 26224708
+SHA256 (octave-7.3.0.tar.xz) = pQjuauvM+miWfJ5+Cgh5PEyo5N2s5yOqvbj3GtNNV/E=
+SIZE (octave-7.3.0.tar.xz) = 26215288
Index: patches/patch-scripts_miscellaneous_unpack_m
===
RCS file: /cvs/ports/math/octave/patches/patch-scripts_miscellaneous_unpack_m,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-scripts_miscellaneous_unpack_m
--- patches/patch-scripts_miscellaneous_unpack_m26 Apr 2022 14:47:40
- 1.4
+++ patches/patch-scripts_miscellaneous_unpack_m9 Nov 2022 18:39:11
-
@@ -25,7 +25,7 @@ Index: scripts/miscellaneous/unpack.m
@__parse_tar__, false};
commandlist.tarbz = commandlist.tarbz2;
commandlist.tbz2 = commandlist.tarbz2;
-@@ -328,7 +328,9 @@ function files = __parse_gzip__ (output)
+@@ -332,7 +332,9 @@ function files = __parse_gzip__ (output)
## Parse the output from gzip and gunzip returning the files
## compressed (or decompressed).
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -r1.29 PLIST
--- pkg/PLIST 26 Apr 2022 14:47:40 - 1.29
+++ pkg/PLIST 9 Nov 2022 18:39:12 -
@@ -1101,6 +1101,9 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1_and_2.m
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/classdef-multiple-inheritance.tst
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/amethod.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/class_bug62802.m
share/octave/${VERSION}/etc/tests/fixed/classdef/bug_60763.m
share/octave/${VERSION}/etc/tests/fixed/classdef/class_bug52614A.m
share/octave/${VERSION}/etc/tests/fixed/classdef/class_bug52614B.m
UPDATE: syslog-ng 3.38
Maintenance update, fixing also some buffer out-of-bounds issues.
https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-3.38.1
Seems fine here on amd64.
Testing/feedback welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.75
diff -u -p -u -r1.75 Makefile
--- Makefile9 May 2022 18:16:41 - 1.75
+++ Makefile19 Sep 2022 14:46:43 -
@@ -1,7 +1,7 @@
COMMENT= log management solution
-V =3.36.1
-REL = 3.36.1
+V =3.38.1
+REL = 3.38.1
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -18,14 +18,14 @@ WANTLIB += ssl z
MASTER_SITES =
https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = evtlog 5.0 \
- evtlog-3.36 5.0 \
- syslog-ng 8.0 \
- syslog-ng-3.36 8.0 \
- loggen_helper 3.0 \
- loggen_helper-3.36 3.0 \
- loggen_plugin 3.0 \
- loggen_plugin-3.36 3.0 \
+SHARED_LIBS = evtlog 6.0 \
+ evtlog-3.38 6.0 \
+ syslog-ng 9.0 \
+ syslog-ng-3.38 9.0 \
+ loggen_helper 4.0 \
+ loggen_helper-3.38 4.0 \
+ loggen_plugin 4.0 \
+ loggen_plugin-3.38 4.0 \
secret-storage 3.0
# needs a newer compiler due to libmaxminddb header
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.29
diff -u -p -u -r1.29 distinfo
--- distinfo9 May 2022 18:16:41 - 1.29
+++ distinfo19 Sep 2022 14:46:43 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.36.1.tar.gz) = kKJcl2f+dJ21DxGN38kuxxOZdj0uzVrU8R/17qBJ5gs=
-SIZE (syslog-ng-3.36.1.tar.gz) = 5968598
+SHA256 (syslog-ng-3.38.1.tar.gz) = VJH2htC4KbabLg/A1mpi9RmRqvruAFR1v6OPqzmUQfc=
+SIZE (syslog-ng-3.38.1.tar.gz) = 5405048
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.14
diff -u -p -u -r1.14 syslog-ng.conf
--- files/syslog-ng.conf9 May 2022 18:16:41 - 1.14
+++ files/syslog-ng.conf19 Sep 2022 14:46:43 -
@@ -1,7 +1,7 @@
# syslog-ng configuration file for OpenBSD.
# This should provide behavior similar to OpenBSD's syslog.conf(5).
-@version: 3.36
+@version: 3.38
@requires openbsd
@include "scl.conf"
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -u -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in 9 May 2022 18:16:41 - 1.16
+++ patches/patch-Makefile_in 19 Sep 2022 14:46:43 -
@@ -4,7 +4,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -10412,11 +10412,7 @@ modules_test_subdirs = \
+@@ -10544,11 +10544,7 @@ modules_test_subdirs = \
syslog_ng_syslog_ng_SOURCES = syslog-ng/main.c
@@ -17,7 +17,7 @@ Index: Makefile.in
syslog_ng_syslog_ng_LINK = @SYSLOGNG_LINK@
syslog_ng_syslog_ng_DEPENDENCIES = lib/libsyslog-ng.la
-@@ -29392,7 +29388,7 @@ scl-install-data-local:
+@@ -29589,7 +29585,7 @@ scl-install-data-local:
fi; \
done
$(mkinstalldirs) $(DESTDIR)/$(scldir)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -r1.29 PLIST
--- pkg/PLIST 9 May 2022 18:16:41 - 1.29
+++ pkg/PLIST 19 Sep 2022 14:46:43 -
@@ -90,6 +90,7 @@ include/syslog-ng/filter/filter-pri.h
include/syslog-ng/filter/filter-re.h
include/syslog-ng/filter/filter-tags.h
include/syslog-ng/find-crlf.h
+include/syslog-ng/generic-number.h
include/syslog-ng/gprocess.h
include/syslog-ng/gsockaddr.h
include/syslog-ng/gsocket.h
@@ -184,11 +185,13 @@ include/syslog-ng/rewrite/rewrite-expr.h
include/syslog-ng/rewrite/rewrite-groupset.h
include/syslog-ng/rewrite/rewrite-rename.h
include/syslog-ng/rewrite/rewrite-set-facility.h
+include/syslog-ng/rewrite/rewrite-set-matches.h
include/syslog-ng/rewrite/rewrite-set-pri.h
include/syslog-ng/rewrite/rewrite-set-severity.h
include/syslog-ng/rewrite/rewrite-set-tag.h
include/syslog-ng/rewrite/rewrite-set.h
include/syslog-ng/rewrite/rewrite-subst.h
+include/syslog-ng/rewrite/rewrite-unset-matches.h
include/syslog-ng/rewrite/rewrite-unset.h
include/syslog-ng/ringbuffer.h
include/syslog-ng/run-id.h
@@ -285,22 +288,22 @@ include/syslog-ng/value-pairs/transforms
include/syslog-ng/value-pairs/value-pairs.h
include/syslog-ng/versi
[UPDATE] math/octave 7.2.0
Seems to be fine on amd64. The test suite results somewhat improved.
PASS16952
FAIL 18
REGRESSION 6
XFAIL (reported bug) 31
SKIP (missing feature)226
SKIP (run-time condition) 42
With the previous release 7.1.0 I had
PASS16927
FAIL 25
REGRESSION 6
XFAIL (reported bug) 28
SKIP (missing feature)226
SKIP (run-time condition) 41
ok?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.130
diff -u -p -u -r1.130 Makefile
--- Makefile21 Jul 2022 13:04:33 - 1.130
+++ Makefile18 Aug 2022 20:18:29 -
@@ -1,14 +1,13 @@
COMMENT = Scientific Programming Language
-VERSION = 7.1.0
+VERSION = 7.2.0
DISTNAME = octave-${VERSION}
EXTRACT_SUFX = .tar.xz
CATEGORIES = math
-REVISION = 1
-SHARED_LIBS += octave 14.0
-SHARED_LIBS += octgui 8.0
-SHARED_LIBS += octinterp 13.0
+SHARED_LIBS += octave 15.0
+SHARED_LIBS += octgui 9.0
+SHARED_LIBS += octinterp 14.0
HOMEPAGE = https://www.gnu.org/software/octave/
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- distinfo26 Apr 2022 14:47:40 - 1.24
+++ distinfo18 Aug 2022 20:18:29 -
@@ -1,2 +1,2 @@
-SHA256 (octave-7.1.0.tar.xz) = P9RhXrurAsOMk+proxh1au3sONmKXHMtQJiZ6LQ1YnM=
-SIZE (octave-7.1.0.tar.xz) = 26208376
+SHA256 (octave-7.2.0.tar.xz) = Su94w8nUn3XWTM1VJn30CzAg5kFPaeqHV6GTliizAXE=
+SIZE (octave-7.2.0.tar.xz) = 26224708
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -u -r1.17 patch-configure
--- patches/patch-configure 26 Apr 2022 14:47:40 - 1.17
+++ patches/patch-configure 18 Aug 2022 20:18:29 -
@@ -3,7 +3,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -81074,7 +81074,7 @@ printf "%s\n" "$as_me: WARNING: $warn_rapidjson" >&2;}
+@@ -80591,7 +80591,7 @@ printf "%s\n" "$as_me: WARNING: $warn_rapidjson" >&2;}
fi
@@ -12,7 +12,7 @@ Index: configure
TERM_LIBS=
-@@ -81177,14 +81177,14 @@ fi
+@@ -80694,14 +80694,14 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -30,7 +30,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -81222,7 +81222,7 @@ fi
+@@ -80739,7 +80739,7 @@ fi
printf "%s\n" "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes
then :
Index: patches/patch-scripts_miscellaneous_memory_m
===
RCS file: /cvs/ports/math/octave/patches/patch-scripts_miscellaneous_memory_m,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-scripts_miscellaneous_memory_m
--- patches/patch-scripts_miscellaneous_memory_m26 Apr 2022 14:47:40
- 1.1
+++ patches/patch-scripts_miscellaneous_memory_m18 Aug 2022 20:18:29
-
@@ -4,7 +4,7 @@ Show warning/error and skip test
Index: scripts/miscellaneous/memory.m
--- scripts/miscellaneous/memory.m.orig
+++ scripts/miscellaneous/memory.m
-@@ -131,7 +131,7 @@
+@@ -151,7 +151,7 @@
function [userdata, systemdata] = memory ()
@@ -13,7 +13,7 @@ Index: scripts/miscellaneous/memory.m
if (nargout > 0)
error ("memory: function not yet implemented for this architecture");
else
-@@ -260,14 +260,14 @@ function [status, meminfo] = lmemory ()
+@@ -280,14 +280,14 @@ function [status, meminfo] = lmemory ()
endfunction
Index: patches/patch-test_mk-bc-overloads-tst_sh
===
RCS file: patches/patch-test_mk-bc-overloads-tst_sh
diff -N patches/patch-test_mk-bc-overloads-tst_sh
--- patches/patch-test_mk-bc-overloads-tst_sh 26 Apr 2022 14:47:40 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,65 +0,0 @@
-Upstream Patch https://hg.savannah.gnu.org/hgweb/octave/rev/3c3abe6dbe58
-Fixes https://savannah.gnu.org/bugs/index.php?62295
-
-Index: test/mk-bc-overloads-tst.sh
test/mk-bc-overloads-tst.sh.orig
-+++ test/mk-bc-overloads-tst.sh
-@@ -48,16 +48,16 @@ if [ $# -eq 2 ]; then
- shift
- case "$1" in
- --list-files)
-- echo $output_dir/tbcover.m
-- echo $output_dir/bc-overloads.tst
-+ echo tbcover.m
-+ echo bc-overloads.tst
- for class in $CLASSES; do
--echo $output_dir/@$class/tbcover.m
-+echo @$class/tbcover.m
- done
-
Re: [wip] synapse 1.65
Renaud Allard [2022-08-18, 10:58:24]:
>
>
> On 8/18/22 08:25, Landry Breuil wrote:
> > Le Thu, Aug 18, 2022 at 08:24:42AM +0200, Landry Breuil a écrit :
> > > Hi,
> > >
> > > so now that we have poetry-core in ports thanks to sthen@, here's a wip
> > > diff for synapse using MODPY_PEP517 = poetry-core. Note that i haven't
> > > tested it at all *yet*, and the do-test target fails:
> > >
> > > ===> Regression tests for synapse-1.65.0
> > > cd /usr/obj/ports/synapse-1.65.0/synapse-1.65.0 && /usr/bin/env -i
> > > PYTHONPATH=. /usr/local/bin/trial tests
> > > tests ...
> > > [ERROR]
> > >
> > > ===
> > > [ERROR]
> > > Traceback (most recent call last):
> > >File "/usr/local/lib/python3.9/site-packages/twisted/trial/runner.py",
> > > line 691, in loadByName
> > > return self.suiteFactory([self.findByName(name, recurse=recurse)])
> > >File "/usr/local/lib/python3.9/site-packages/twisted/trial/runner.py",
> > > line 451, in findByName
> > > obj = reflect.namedModule(searchName)
> > >File
> > > "/usr/local/lib/python3.9/site-packages/twisted/python/reflect.py", line
> > > 156, in namedModule
> > > topLevel = __import__(name)
> > >File "/usr/obj/ports/synapse-1.65.0/synapse-1.65.0/tests/__init__.py",
> > > line 18, in
> > > from synapse.util.patch_inline_callbacks import do_patch
> > >File
> > > "/usr/obj/ports/synapse-1.65.0/synapse-1.65.0/synapse/__init__.py", line
> > > 71, in
> > > import synapse.util
> > >File
> > > "/usr/obj/ports/synapse-1.65.0/synapse-1.65.0/synapse/util/__init__.py",
> > > line 195, in
> > > SYNAPSE_VERSION = get_distribution_version_string("matrix-synapse",
> > > __file__)
> > > builtins.TypeError: get_distribution_version_string() takes 1 positional
> > > argument but 2 were given
> > >
> > > so a bit more work is needed, but that's a start for getting us
> > > up-to-date for
> > > 7.2.
> >
> > now with 100% more diffs..
>
> I am able to start it without errors with your diff and 3 other diffs I
> sent:
> textproc/py-unpaddedbase64 2.1.0
> textproc/py-unpaddedbase64 1.6.2
> devel/py-matrix_common 1.2.1
>
> You will also need to put the full path for your registration files for
> mautrix_whatsapp if you use it, instead of a relative path.
>
> More testing is welcome :)
Works fine here on arm64 with your 3 other updates. I only use the matrix
native messaging (no bridges or voice/video) on a very small setup.
My chat rooms are still working as expected. Thanks!
UPDATE: syslog-ng
Maintenance update; seems to be fine on amd64.
Any tests/comments welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.74
diff -u -p -u -r1.74 Makefile
--- Makefile11 Mar 2022 19:58:04 - 1.74
+++ Makefile2 May 2022 21:15:38 -
@@ -1,7 +1,7 @@
COMMENT= log management solution
-V =3.34.1
-REL = 3.34.1
+V =3.36.1
+REL = 3.36.1
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -18,15 +18,15 @@ WANTLIB += ssl z
MASTER_SITES =
https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = evtlog 4.0 \
- evtlog-3.34 4.0 \
- syslog-ng 7.0 \
- syslog-ng-3.34 7.0 \
- loggen_helper 2.0 \
- loggen_helper-3.34 2.0 \
- loggen_plugin 2.0 \
- loggen_plugin-3.34 2.0 \
- secret-storage 2.0
+SHARED_LIBS = evtlog 5.0 \
+ evtlog-3.36 5.0 \
+ syslog-ng 8.0 \
+ syslog-ng-3.36 8.0 \
+ loggen_helper 3.0 \
+ loggen_helper-3.36 3.0 \
+ loggen_plugin 3.0 \
+ loggen_plugin-3.36 3.0 \
+ secret-storage 3.0
# needs a newer compiler due to libmaxminddb header
COMPILER = base-clang ports-gcc
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.28
diff -u -p -u -r1.28 distinfo
--- distinfo13 Nov 2021 09:55:42 - 1.28
+++ distinfo2 May 2022 21:15:38 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.34.1.tar.gz) = zs457BxoyI1JNwXgpSi4PQONo4TonUg4OTzMdfYqLUw=
-SIZE (syslog-ng-3.34.1.tar.gz) = 5903489
+SHA256 (syslog-ng-3.36.1.tar.gz) = kKJcl2f+dJ21DxGN38kuxxOZdj0uzVrU8R/17qBJ5gs=
+SIZE (syslog-ng-3.36.1.tar.gz) = 5968598
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.13
diff -u -p -u -r1.13 syslog-ng.conf
--- files/syslog-ng.conf13 Nov 2021 09:55:42 - 1.13
+++ files/syslog-ng.conf2 May 2022 21:15:38 -
@@ -1,7 +1,7 @@
# syslog-ng configuration file for OpenBSD.
# This should provide behavior similar to OpenBSD's syslog.conf(5).
-@version: 3.34
+@version: 3.36
@requires openbsd
@include "scl.conf"
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p -u -r1.15 patch-Makefile_in
--- patches/patch-Makefile_in 11 Mar 2022 19:58:04 - 1.15
+++ patches/patch-Makefile_in 2 May 2022 21:15:38 -
@@ -4,7 +4,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -10234,11 +10234,7 @@ modules_test_subdirs = \
+@@ -10412,11 +10412,7 @@ modules_test_subdirs = \
syslog_ng_syslog_ng_SOURCES = syslog-ng/main.c
@@ -17,7 +17,7 @@ Index: Makefile.in
syslog_ng_syslog_ng_LINK = @SYSLOGNG_LINK@
syslog_ng_syslog_ng_DEPENDENCIES = lib/libsyslog-ng.la
-@@ -28960,7 +28956,7 @@ scl-install-data-local:
+@@ -29392,7 +29388,7 @@ scl-install-data-local:
fi; \
done
$(mkinstalldirs) $(DESTDIR)/$(scldir)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
retrieving revision 1.28
diff -u -p -u -r1.28 PLIST
--- pkg/PLIST 11 Mar 2022 19:58:05 - 1.28
+++ pkg/PLIST 2 May 2022 21:15:39 -
@@ -56,8 +56,11 @@ include/syslog-ng/compat/string.h
include/syslog-ng/compat/time.h
include/syslog-ng/compat/un.h
include/syslog-ng/control/
+include/syslog-ng/control/control-command-thread.h
include/syslog-ng/control/control-commands.h
+include/syslog-ng/control/control-connection.h
include/syslog-ng/control/control-main.h
+include/syslog-ng/control/control-server-unix.h
include/syslog-ng/control/control-server.h
include/syslog-ng/control/control.h
include/syslog-ng/crypto.h
@@ -112,6 +115,7 @@ include/syslog-ng/logmsg/serialization.h
include/syslog-ng/logmsg/tags-serialize.h
include/syslog-ng/logmsg/tags.h
include/syslog-ng/logmsg/timestamp-serialize.h
+include/syslog-ng/logmsg/type-hinting.h
include/syslog-ng/logpipe.h
include/syslog-ng/logproto/
include/syslog-ng/logproto/logproto-buffered-server.h
@@ -142,6 +146,7 @@ include/syslog-ng/logwriter.h
include/syslog-ng/mainloop-call.h
include/syslog-ng/mainloop-control.h
include/syslog-ng/mainloop-io-worker.h
+include/syslog-ng/mainloop-threaded-worker.h
include/syslog-ng/mainloop-worker.h
include/syslog-
UPDATE: blas and lapack
-VERSION= 3.8.0
+VERSION= 3.10.1
DISTNAME= lapack-${VERSION}
-REVISION= 1
-SHARED_LIBS= lapack 7.1
+SHARED_LIBS= lapack 8.0
CATEGORIES=math
DISTFILES= ${DISTNAME}.tar.gz manpages.tgz:0
@@ -16,8 +15,9 @@ MAINTAINER= Steven Mestdagh https://www.netlib.org/lapack/ \
- https://www.netlib.no/netlib/lapack/
+GH_ACCOUNT=Reference-LAPACK
+GH_PROJECT=lapack
+GH_TAGNAME=v${VERSION}
MASTER_SITES0= https://www.netlib.org/lapack/
DIST_SUBDIR= ${DISTNAME}
@@ -33,13 +33,15 @@ MAKE_ENV= SHLIB_MAJOR=${LIBlapack_VERSIO
TIMER=EXT_ETIME \
FC="${MODFORTRAN_COMPILER} -cpp" \
CC=${MODFORTRAN_COMPILER}
+MAKE_FLAGS=-m ${FILESDIR} -m /usr/share/mk
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
USE_GROFF =Yes
-TEST_DEPENDS= devel/gmake
+TEST_DEPENDS= devel/gmake \
+ lang/python/3.9
TEST_FLAGS=PLAT= OPTS= FORTRAN=${MODFORTRAN_COMPILER} \
LOADER=${MODFORTRAN_COMPILER} \
- LAPACKLIB=SRC/liblapack.a \
+ LAPACKLIB=${WRKBUILD}/liblapack.a \
BLASLIB="${LOCALBASE}/lib/libblas.a
${LOCALBASE}/lib/libgfortran.a"
MAKE_FILE= ${FILESDIR}/Makefile
@@ -51,6 +53,7 @@ MANSRC= ${WRKDIR}/man/man3
pre-configure:
@cp ${WRKDIST}/make.inc.example ${WRKDIST}/make.inc
@cd ${WRKSRC} && for f in *.F ; do mv $$f $${f%.F}.f ; done
+ @cd ${WRKSRC} && for f in *.F90 ; do mv $$f $${f%.F90}.f90 ; done
post-build:
@cd ${MANSRC} && for m in *.f.3 ; do perl -pi \
@@ -58,27 +61,37 @@ post-build:
-e 'if ($$. == 5) {s/^(\w+)\.f \\-/\1/}' $$m ; done
@cd ${MANSRC} && \
for m in SRC_*.f.3; do mv $$m $${m#SRC_}; done && \
- for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done
+ for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done && \
+ for m in *.F.3; do mv $$m $${m%\.F\.3}.3f; done
post-install:
- @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc | \
+ @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc
${MAKE_FLAGS} | \
perl -p -e 's/\s/\n/g' | \
grep -v TIME | \
- grep -v ssytrd_sb2st.f | \
- grep -v dsytrd_sb2st.f | \
- grep -v chetrd_hb2st.f | \
- grep -v zhetrd_hb2st.f | \
grep -v dlamch.f | \
- grep -v iparam2stage.f | \
grep -v ilaver.f | \
grep -v slamch.f | \
grep -v lsame.f | \
+ grep -v la_constants.f90 | \
+ grep -v la_xisnan.f90 | \
+ grep -v clartg.f90 | \
+ grep -v zlartg.f90 | \
+ grep -v slartg.f90 | \
+ grep -v dlartg.f90 | \
+ grep -v classq.f90 | \
+ grep -v zlassq.f90 | \
+ grep -v slassq.f90 | \
+ grep -v dlassq.f90 | \
+ grep -v sroundup_lwork.f | \
+ grep -v droundup_lwork.f | \
grep -v xerbla.f | \
grep -v xerbla_array.f` ; do \
${INSTALL_MAN} `basename $${m%.f}.3f` ${PREFIX}/man/man3f ; done
do-test:
- cd ${WRKDIST}/TESTING/MATGEN && gmake ${ALL_TEST_FLAGS}
- cd ${WRKDIST}/TESTING && gmake ${ALL_TEST_FLAGS}
+ @cd ${WRKDIST}/TESTING/MATGEN && ${SETENV} ${ALL_TEST_ENV} gmake
${TEST_FLAGS}
+ @cd ${WRKDIST}/TESTING && ${SETENV} ${ALL_TEST_ENV} gmake ${TEST_FLAGS}
+ @cd ${WRKDIST} && ${SETENV} ${ALL_TEST_ENV} ./lapack_testing.py
+
.include
Index: lapack/distinfo
===
RCS file: /cvs/ports/math/lapack/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- lapack/distinfo 24 Apr 2019 15:30:31 - 1.7
+++ lapack/distinfo 27 Apr 2022 18:19:05 -
@@ -1,4 +1,4 @@
-SHA256 (lapack-3.8.0/lapack-3.8.0.tar.gz) =
3rIsxKYSC/9yYhFVqZF/SF+W74MZrAdKevvGiquIvPY=
-SHA256 (lapack-3.8.0/manpages.tgz) =
IpprpXnvbkH7rjKo7p6eWmILO1G9JEZm44bJXHucYIM=
-SIZE (lapack-3.8.0/lapack-3.8.0.tar.gz) = 7426094
-SIZE (lapack-3.8.0/manpages.tgz) = 1930616
+SHA256 (lapack-3.10.1/lapack-3.10.1.tar.gz) =
zQBc0CHxRNfV9/M8lDlC258Doo0RDWo7gNcYopX39xQ=
+SHA256 (lapack-3.10.1/manpages.tgz) =
+RpO/gisw/TcCqJ/rlmogNBCZTbSDvk0Ve0+jACQOZ8=
+SIZE (lapack-3.10.1/lapack-3.10.1.tar.gz) = 7632257
+SIZE (lapack-3.10.1/manpages.tgz) = 2446730
Index: lapack/files/Makefile
===
RCS file: /cvs/ports/math/lapack/files/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- lapack/files/Makefile 11 Mar 2022 19:36:18 - 1.10
+++ lapack/files/Makefile 27 Apr 2022 18:19:05 -
@@ -2,12 +2,
Re: UPDATE: net/argus-clients
Rafael Sadowski [2022-04-26, 20:17:45]:
> On Tue Apr 26, 2022 at 07:42:00PM +0200, Steven Mestdagh wrote:
> > minor update with some bug fixes, and zeek support.
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/argus-clients/Makefile,v
> > retrieving revision 1.21
> > diff -u -p -u -r1.21 Makefile
> > --- Makefile11 Mar 2022 19:45:44 - 1.21
> > +++ Makefile26 Apr 2022 15:31:02 -
> > @@ -1,10 +1,13 @@
> > COMMENT = utilities to read and parse Argus data
> >
> > -DISTNAME = argus-clients-3.0.8.3
> > +VERSION = 3.0.8.4
> > +DISTNAME = argus-clients-${VERSION}
> > CATEGORIES = net
> >
> > HOMEPAGE = http://qosient.com/argus/
>
> https://openargus.org/ !?
yes, adapted.
Index: Makefile
===
RCS file: /cvs/ports/net/argus-clients/Makefile,v
retrieving revision 1.21
diff -u -p -u -r1.21 Makefile
--- Makefile11 Mar 2022 19:45:44 - 1.21
+++ Makefile27 Apr 2022 15:31:54 -
@@ -1,10 +1,13 @@
COMMENT = utilities to read and parse Argus data
-DISTNAME = argus-clients-3.0.8.3
+VERSION = 3.0.8.4
+DISTNAME = argus-clients-${VERSION}
CATEGORIES = net
-HOMEPAGE = http://qosient.com/argus/
-MASTER_SITES = ${HOMEPAGE}/src/
+HOMEPAGE = https://openargus.org/
+GH_ACCOUNT = openargus
+GH_PROJECT = clients
+GH_TAGNAME = v${VERSION}
MAINTAINER = Steven Mestdagh
Index: distinfo
===
RCS file: /cvs/ports/net/argus-clients/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo24 Nov 2021 19:23:50 - 1.8
+++ distinfo27 Apr 2022 15:31:54 -
@@ -1,2 +1,2 @@
-SHA256 (argus-clients-3.0.8.3.tar.gz) =
uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=
-SIZE (argus-clients-3.0.8.3.tar.gz) = 2758432
+SHA256 (argus-clients-3.0.8.4.tar.gz) =
HnHh7ISjEa9KxsbJ56MjHhBZHiFbhNfghBc1sR2zEno=
+SIZE (argus-clients-3.0.8.4.tar.gz) = 2773840
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 11 Mar 2022 19:45:45 - 1.6
+++ pkg/PLIST 27 Apr 2022 15:31:54 -
@@ -61,6 +61,7 @@ include/argus/argus_grep.h
include/argus/argus_histo.h
include/argus/argus_int.h
include/argus/argus_isis.h
+include/argus/argus_json.h
include/argus/argus_label.h
include/argus/argus_llc.h
include/argus/argus_main.h
@@ -143,6 +144,7 @@ share/examples/argus-clients/Config/iana
share/examples/argus-clients/Config/local.addrs
share/examples/argus-clients/Config/racluster.conf
share/examples/argus-clients/Config/racolor.conf
+share/examples/argus-clients/Config/raconvert.zeek.conf
share/examples/argus-clients/Config/radium.conf
share/examples/argus-clients/Config/ragetcountrycodes.sh
share/examples/argus-clients/Config/ralabel.conf
UPDATE: net/argus-clients
minor update with some bug fixes, and zeek support.
Index: Makefile
===
RCS file: /cvs/ports/net/argus-clients/Makefile,v
retrieving revision 1.21
diff -u -p -u -r1.21 Makefile
--- Makefile11 Mar 2022 19:45:44 - 1.21
+++ Makefile26 Apr 2022 15:31:02 -
@@ -1,10 +1,13 @@
COMMENT = utilities to read and parse Argus data
-DISTNAME = argus-clients-3.0.8.3
+VERSION = 3.0.8.4
+DISTNAME = argus-clients-${VERSION}
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
-MASTER_SITES = ${HOMEPAGE}/src/
+GH_ACCOUNT = openargus
+GH_PROJECT = clients
+GH_TAGNAME = v${VERSION}
MAINTAINER = Steven Mestdagh
Index: distinfo
===
RCS file: /cvs/ports/net/argus-clients/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo24 Nov 2021 19:23:50 - 1.8
+++ distinfo26 Apr 2022 15:31:02 -
@@ -1,2 +1,2 @@
-SHA256 (argus-clients-3.0.8.3.tar.gz) =
uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=
-SIZE (argus-clients-3.0.8.3.tar.gz) = 2758432
+SHA256 (argus-clients-3.0.8.4.tar.gz) =
HnHh7ISjEa9KxsbJ56MjHhBZHiFbhNfghBc1sR2zEno=
+SIZE (argus-clients-3.0.8.4.tar.gz) = 2773840
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 11 Mar 2022 19:45:45 - 1.6
+++ pkg/PLIST 26 Apr 2022 15:31:02 -
@@ -61,6 +61,7 @@ include/argus/argus_grep.h
include/argus/argus_histo.h
include/argus/argus_int.h
include/argus/argus_isis.h
+include/argus/argus_json.h
include/argus/argus_label.h
include/argus/argus_llc.h
include/argus/argus_main.h
@@ -143,6 +144,7 @@ share/examples/argus-clients/Config/iana
share/examples/argus-clients/Config/local.addrs
share/examples/argus-clients/Config/racluster.conf
share/examples/argus-clients/Config/racolor.conf
+share/examples/argus-clients/Config/raconvert.zeek.conf
share/examples/argus-clients/Config/radium.conf
share/examples/argus-clients/Config/ragetcountrycodes.sh
share/examples/argus-clients/Config/ralabel.conf
UPDATE: net/argus-clients
maintenance update to 3.0.8.3, lightly tested on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/argus-clients/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile25 Feb 2021 21:31:28 - 1.19
+++ Makefile13 Nov 2021 14:31:37 -
@@ -2,8 +2,7 @@
COMMENT = utilities to read and parse Argus data
-DISTNAME = argus-clients-3.0.8.2
-REVISION = 3
+DISTNAME = argus-clients-3.0.8.3
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
Index: distinfo
===
RCS file: /cvs/ports/net/argus-clients/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo14 Aug 2016 21:29:44 - 1.7
+++ distinfo13 Nov 2021 14:31:37 -
@@ -1,2 +1,2 @@
-SHA256 (argus-clients-3.0.8.2.tar.gz) =
Mgc6YN3VbqhAek0bE0RI/0vNug7nOZFgwvgBoKqRO7E=
-SIZE (argus-clients-3.0.8.2.tar.gz) = 2776072
+SHA256 (argus-clients-3.0.8.3.tar.gz) =
uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=
+SIZE (argus-clients-3.0.8.3.tar.gz) = 2758432
Index: patches/patch-common_argus_util_c
===
RCS file: patches/patch-common_argus_util_c
diff -N patches/patch-common_argus_util_c
--- patches/patch-common_argus_util_c 25 Feb 2021 21:31:28 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-common_argus_util_c,v 1.6 2021/02/25 21:31:28 naddy Exp $
-
-First hunk: remove unused variable that clashes with one in raconvert
-
-Index: common/argus_util.c
common/argus_util.c.orig
-+++ common/argus_util.c
-@@ -6634,7 +6634,6 @@ ArgusGetIndicatorString (struct ArgusParserStruct *par
-
-
- char argus_strbuf[MAXSTRLEN];
--u_short ArgusThisProto;
-
- void
- ArgusPrintSourceID (struct ArgusParserStruct *parser, char *buf, struct
ArgusRecordStruct *argus, int len)
-@@ -22679,8 +22678,8 @@ ArgusLog (int priority, char *fmt, ...)
- *tptr++ = buf[i];
- }
-
-- memset(buf, 0, MAXSTRLEN);
-- strncpy(buf, tbuf, MAXSTRLEN);
-+ memset(buf, 0, sizeof(buf));
-+ strncpy(buf, tbuf, sizeof(buf));
- }
-
- syslog (priority, "%s", buf);
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/argus-clients/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configure
--- patches/patch-configure 26 Jan 2015 13:13:58 - 1.1
+++ patches/patch-configure 13 Nov 2021 14:31:37 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.1 2015/01/26 13:13:58 steven Exp $
configure.orig Wed Aug 27 00:42:06 2014
-+++ configure Fri Jan 23 22:13:51 2015
-@@ -5780,7 +5780,7 @@ if ${ac_cv_lib_ft_main+:} false; then :
+Index: configure
+--- configure.orig
configure
+@@ -5807,7 +5807,7 @@ if ${ac_cv_lib_ft_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 26 Jan 2015 13:13:58 - 1.4
+++ pkg/PLIST 13 Nov 2021 14:31:37 -
@@ -67,6 +67,7 @@ include/argus/argus_llc.h
include/argus/argus_main.h
include/argus/argus_mdp.h
include/argus/argus_metric.h
+include/argus/argus_mysql.h
include/argus/argus_namedb.h
include/argus/argus_os.h
include/argus/argus_out.h
UPDATE: math/p5-Math-GMPz
minor update, tests pass on amd64. ok?
Index: Makefile
===
RCS file: /cvs/ports/math/p5-Math-GMPz/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile3 Jul 2020 21:45:28 - 1.3
+++ Makefile12 Sep 2021 20:28:26 -
@@ -3,9 +3,8 @@
COMMENT = perl interface to GMP integer functions
MODULES = cpan
-DISTNAME = Math-GMPz-0.48
+DISTNAME = Math-GMPz-0.51
CATEGORIES = math
-REVISION = 0
# Perl
PERMIT_PACKAGE = Yes
Index: distinfo
===
RCS file: /cvs/ports/math/p5-Math-GMPz/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo18 May 2019 18:11:10 - 1.1.1.1
+++ distinfo12 Sep 2021 20:28:26 -
@@ -1,2 +1,2 @@
-SHA256 (Math-GMPz-0.48.tar.gz) = 9EWe0y+5u3k+JQT9RCxRX9RopKNNKh+Y5GykHidcc8s=
-SIZE (Math-GMPz-0.48.tar.gz) = 78036
+SHA256 (Math-GMPz-0.51.tar.gz) = TOoaA+UAvzWooMxiVFCxe0R34bzyurE331Zwv7UUY1M=
+SIZE (Math-GMPz-0.51.tar.gz) = 90329
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPz/patches/patch-Makefile_PL,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Makefile_PL
--- patches/patch-Makefile_PL 18 May 2019 18:11:10 - 1.1.1.1
+++ patches/patch-Makefile_PL 12 Sep 2021 20:28:26 -
@@ -1,17 +1,17 @@
-$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2019/05/18 18:11:10 steven Exp $
+$OpenBSD$
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -68,9 +68,8 @@ my %options = (
- AUTHOR => 'Sisyphus (sisyphus at (@) cpan dot (.) org)',
+@@ -74,9 +74,8 @@ my %options = (
ABSTRACT => 'Perl interface to the GMP integer functions',
DEFINE => $defines,
+
- LIBS => [
-'-lgmp'
- ],
+ INC => "$ENV{CPPFLAGS}",
+ LIBS => ["$ENV{LDFLAGS} -lgmp"],
+
LICENSE => 'perl',
VERSION_FROM => 'GMPz.pm',
- PREREQ_PM => {'Exporter' => '5.58'}, # avoid test failures on pre perl-5.8.4
Index: patches/patch-Random_Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPz/patches/patch-Random_Makefile_PL,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Random_Makefile_PL
--- patches/patch-Random_Makefile_PL18 May 2019 18:11:10 - 1.1.1.1
+++ patches/patch-Random_Makefile_PL12 Sep 2021 20:28:26 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-Random_Makefile_PL,v 1.1.1.1 2019/05/18 18:11:10 steven Exp $
+$OpenBSD$
Index: Random/Makefile.PL
--- Random/Makefile.PL.orig
+++ Random/Makefile.PL
-@@ -6,7 +6,8 @@ my %options = %{
+@@ -10,7 +10,8 @@ my %options = %{
'../typemap'
],
'NAME' => 'Math::GMPz::Random',
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/p5-Math-GMPz/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 18 May 2019 18:11:10 - 1.1.1.1
+++ pkg/PLIST 12 Sep 2021 20:28:26 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/05/18 18:11:10 steven Exp $
+@comment $OpenBSD: PLIST,v$
${P5ARCH}/
${P5ARCH}/Math/
${P5ARCH}/Math/GMPz/
@@ -9,9 +9,9 @@ ${P5ARCH}/Math/GMPz/V.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Math/
${P5ARCH}/auto/Math/GMPz/
-${P5ARCH}/auto/Math/GMPz/GMPz.so
+@so ${P5ARCH}/auto/Math/GMPz/GMPz.so
${P5ARCH}/auto/Math/GMPz/Random/
-${P5ARCH}/auto/Math/GMPz/Random/Random.so
+@so ${P5ARCH}/auto/Math/GMPz/Random/Random.so
${P5ARCH}/auto/Math/GMPz/V/
-${P5ARCH}/auto/Math/GMPz/V/V.so
+@so ${P5ARCH}/auto/Math/GMPz/V/V.so
@man man/man3p/Math::GMPz.3p
UPDATE: math/p5-Math-GMPf
minor update, tests pass on amd64. ok?
Index: Makefile
===
RCS file: /cvs/ports/math/p5-Math-GMPf/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile3 Jul 2020 21:45:28 - 1.3
+++ Makefile12 Sep 2021 20:28:16 -
@@ -3,9 +3,8 @@
COMMENT = perl interface to GMP floating point functions
MODULES = cpan
-DISTNAME = Math-GMPf-0.43
+DISTNAME = Math-GMPf-0.44
CATEGORIES = math
-REVISION = 0
# Perl
PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/math/p5-Math-GMPf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo18 May 2019 18:12:22 - 1.1.1.1
+++ distinfo12 Sep 2021 20:28:16 -
@@ -1,2 +1,2 @@
-SHA256 (Math-GMPf-0.43.tar.gz) = 39hKwX70kGPW4+9wC6C8K4gANCviL51PN4ZxT5DhpaY=
-SIZE (Math-GMPf-0.43.tar.gz) = 54284
+SHA256 (Math-GMPf-0.44.tar.gz) = PtoEq0QSIzE6CrVRN8y+FCbrtafGKphEJ0ov7swWzWs=
+SIZE (Math-GMPf-0.44.tar.gz) = 55068
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPf/patches/patch-Makefile_PL,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Makefile_PL
--- patches/patch-Makefile_PL 18 May 2019 18:12:22 - 1.1.1.1
+++ patches/patch-Makefile_PL 12 Sep 2021 20:28:16 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2019/05/18 18:12:22 steven Exp $
+$OpenBSD$
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -62,9 +62,8 @@ my %options = (
+@@ -63,9 +63,8 @@ my %options = (
AUTHOR => 'Sisyphus (sisyphus at (@) cpan dot (.) org)',
ABSTRACT => 'Perl interface to the GMP floating point functions',
DEFINE => $defines,
Index: patches/patch-Random_Makefile_PL
===
RCS file: /cvs/ports/math/p5-Math-GMPf/patches/patch-Random_Makefile_PL,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-Random_Makefile_PL
--- patches/patch-Random_Makefile_PL18 May 2019 18:12:22 - 1.1.1.1
+++ patches/patch-Random_Makefile_PL12 Sep 2021 20:28:16 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-Random_Makefile_PL,v 1.1.1.1 2019/05/18 18:12:22 steven Exp $
+$OpenBSD$
Index: Random/Makefile.PL
--- Random/Makefile.PL.orig
+++ Random/Makefile.PL
-@@ -5,8 +5,8 @@ my %options = %{
+@@ -10,8 +10,8 @@ my %options = %{
'../typemap'
],
'NAME' => 'Math::GMPf::Random',
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/p5-Math-GMPf/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 18 May 2019 18:12:22 - 1.1.1.1
+++ pkg/PLIST 12 Sep 2021 20:28:16 -
@@ -1,16 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/05/18 18:12:22 steven Exp $
+@comment $OpenBSD: PLIST,v$
${P5ARCH}/
${P5ARCH}/Math/
${P5ARCH}/Math/GMPf/
${P5ARCH}/Math/GMPf.pm
+${P5ARCH}/Math/GMPf.pod
${P5ARCH}/Math/GMPf/Random.pm
${P5ARCH}/Math/GMPf/V.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Math/
${P5ARCH}/auto/Math/GMPf/
-${P5ARCH}/auto/Math/GMPf/GMPf.so
+@so ${P5ARCH}/auto/Math/GMPf/GMPf.so
${P5ARCH}/auto/Math/GMPf/Random/
-${P5ARCH}/auto/Math/GMPf/Random/Random.so
+@so ${P5ARCH}/auto/Math/GMPf/Random/Random.so
${P5ARCH}/auto/Math/GMPf/V/
-${P5ARCH}/auto/Math/GMPf/V/V.so
+@so ${P5ARCH}/auto/Math/GMPf/V/V.so
@man man/man3p/Math::GMPf.3p
Re: eventlog vs. syslog-ng eventlog
Stuart Henderson [2021-04-29, 19:01:00]:
> +cc steven in case he's around;
>
> On 2021/04/29 11:29, Todd C. Miller wrote:
> > On Thu, 29 Apr 2021 08:21:24 +0100, Stuart Henderson wrote:
> >
> > > Yes retiring the separate port makes sense.
> >
> > Here's a diff that just changes sysyutils/syslog-ng to use the
> > bundled copy of libevtlog. After this is committed I will remove
> > sysyutils/eventlog.
> >
> > OK?
>
> couple of small things;
>
> > Index: sysutils/syslog-ng/Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
> > retrieving revision 1.68
> > diff -u -p -u -r1.68 Makefile
> > --- sysutils/syslog-ng/Makefile 30 Dec 2019 22:45:11 - 1.68
> > +++ sysutils/syslog-ng/Makefile 29 Apr 2021 17:20:02 -
> > @@ -6,7 +6,7 @@ V = 3.12.1
> > REL = 3.12
> > DISTNAME = syslog-ng-$V
> > CATEGORIES = sysutils
> > -REVISION = 7
> > +REVISION = 8
> >
> > MAINTAINER = Steven Mestdagh
> >
> > @@ -15,13 +15,15 @@ HOMEPAGE = https://syslog-ng.com/
> > # GPL v2
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += c crypto curl dbi evtlog glib-2.0 gmodule-2.0 gthread-2.0
> > +WANTLIB += c crypto curl dbi glib-2.0 gmodule-2.0 gthread-2.0
> > WANTLIB += iconv intl ivykis json-c m maxminddb nghttp2 pcre pthread
> > WANTLIB += ssl z
> >
> > MASTER_SITES =
> > http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
> >
> > -SHARED_LIBS = syslog-ng 5.0 \
> > +SHARED_LIBS = evtlog 1.0 \
> > + evtlog-${REL} 1.0 \
>
> even though it seems likely that the ABI is compatible, I think it may
> be beneficial to bump the library version of this compared to what
> sysutils/eventlog has. I'd probably go with a major bump to make sure
> things are clean.
>
> > Index: sysutils/syslog-ng/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
> > retrieving revision 1.24
> > diff -u -p -u -r1.24 PLIST
> > --- sysutils/syslog-ng/pkg/PLIST9 Dec 2019 14:45:16 - 1.24
> > +++ sysutils/syslog-ng/pkg/PLIST29 Apr 2021 17:22:01 -
> > @@ -225,9 +225,13 @@ include/syslog-ng/value-pairs/evttag.h
> > include/syslog-ng/value-pairs/transforms.h
> > include/syslog-ng/value-pairs/value-pairs.h
> > include/syslog-ng/versioning.h
> > +@lib lib/libevtlog-3.12.so.${LIBevtlog-3.12_VERSION}
> > +@static-lib lib/libevtlog.a
> > +lib/libevtlog.la
>
> At least the static library conflicts with sysutils/eventlog so it needs
> "@conflict eventlog-*". Also "@pkgpath sysutils/eventlog" so that pkg_add -u
> is able to update an existing installed syslog-ng otherwise it will just
> error out with a conflict.
>
> (Not related to the diff, it picks up libuuid from e2fsprogs if present
> at build time, though it seems likely that the newer version you're looking
> at doesn't do this so maybe ignore that!)
ok with the library version bump and conflict.
UPDATE: security/clusterssh
update to latest, tested without surprises. ok?
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.21
diff -u -p -u -r1.21 Makefile
--- Makefile12 Jul 2019 20:49:01 - 1.21
+++ Makefile18 Jun 2020 12:10:21 -
@@ -2,8 +2,8 @@
COMMENT= secure concurrent multi-server terminal control
-V= 4.13.2
-DISTNAME= App-ClusterSSH-v$V
+V= 4.15
+DISTNAME= App-ClusterSSH-$V
PKGNAME= clusterssh-${V:S/_/./}
CATEGORIES=security
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.13
diff -u -p -u -r1.13 distinfo
--- distinfo16 Jan 2019 20:12:19 - 1.13
+++ distinfo18 Jun 2020 12:10:21 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-v4.13.2.tar.gz) =
txpuZabZjYkDMQxM39/YWQQBKZMtWiUSgOFz4cYVs2Y=
-SIZE (App-ClusterSSH-v4.13.2.tar.gz) = 103412
+SHA256 (App-ClusterSSH-4.15.tar.gz) =
4Sdbg3ofEVMm6tXaCZ8pv+QfqCQnd6ev3rk7nqIn86o=
+SIZE (App-ClusterSSH-4.15.tar.gz) = 96091
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/clusterssh/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 1 May 2016 10:40:56 - 1.6
+++ pkg/PLIST 18 Jun 2020 12:10:21 -
@@ -17,6 +17,9 @@ ${P5SITE}/App/ClusterSSH/L10N/
${P5SITE}/App/ClusterSSH/L10N.pm
${P5SITE}/App/ClusterSSH/L10N/en.pm
${P5SITE}/App/ClusterSSH/Range.pm
+${P5SITE}/App/ClusterSSH/Window/
+${P5SITE}/App/ClusterSSH/Window.pm
+${P5SITE}/App/ClusterSSH/Window/Tk.pm
@man man/man1/ccon.1
@man man/man1/crsh.1
@man man/man1/csftp.1
@@ -32,5 +35,7 @@ ${P5SITE}/App/ClusterSSH/Range.pm
@man man/man3p/App::ClusterSSH::L10N.3p
@man man/man3p/App::ClusterSSH::L10N::en.3p
@man man/man3p/App::ClusterSSH::Range.3p
+@man man/man3p/App::ClusterSSH::Window.3p
+@man man/man3p/App::ClusterSSH::Window::Tk.3p
share/bash-completion/
share/bash-completion/clusterssh
Re: UPDATE: math/octave
Stuart Henderson [2020-04-19, 22:24:32]:
> On 2020/04/19 22:04, Stuart Henderson wrote:
> > On 2020/04/18 14:38, Steven Mestdagh wrote:
> > > update octave, and reinstate wantlib that was somehow removed earlier.
> > > tested lightly on amd64, test suite shows no regression compared to
> > > version 5.1.0 in tree.
> > >
> > > please test/comment/ok.
> >
> > Not an Octave user and I can't really comment on whether the update is
> > important/safe to have before release or not (ports-wise it looks good
> > though).. but one way or the other the WANTLIB definitely needs fixing.
> >
>
> oh, it picks up fltk if present at configure time, it either needs
> wantlib+lib_depends additions, or --without-fltk
thanks Stuart, I updated the diff to disable fltk.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.118
diff -u -p -u -r1.118 Makefile
--- Makefile5 Apr 2020 15:44:52 - 1.118
+++ Makefile20 Apr 2020 06:56:04 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 5.1.0
+VERSION = 5.2.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 4
-SHARED_LIBS += octave 12.0
-SHARED_LIBS += octgui 6.0
-SHARED_LIBS += octinterp 11.0
+SHARED_LIBS += octave 13.0
+SHARED_LIBS += octgui 7.0
+SHARED_LIBS += octinterp 12.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -56,11 +55,29 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
print/gl2ps \
x11/qt5/qttools,-main
+WANTLIB += ${MODFORTRAN_WANTLIB}
+WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
+WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5 SM X11 X11-xcb Xdamage
+WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
+WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
+WANTLIB += curses cxsparse double-conversion drm ereadline expat
+WANTLIB += execinfo fftw3 fftw3_threads fftw3f fftw3f_threads
+WANTLIB += fontconfig freetype gl2ps glapi glpk glut
+WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz icudata icuio
+WANTLIB += gmp hdf5 iconv icui18n icuuc intl lapack lcms2 ltdl lzma
+WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
+WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
+WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
+WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z zstd
+
+
SEPARATE_BUILD = Yes
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
# --disable-readline: needs GNU readline
CONFIGURE_ARGS = --disable-java \
+ --without-fltk \
octave_cv_version_2_6_0=yes
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/ereadline" \
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo6 May 2019 21:09:52 - 1.22
+++ distinfo20 Apr 2020 06:56:04 -
@@ -1,2 +1,2 @@
-SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
-SIZE (octave-5.1.0.tar.gz) = 32034788
+SHA256 (octave-5.2.0.tar.gz) = L+pis8eNbzjpRR2opNJgI4QHJZd9/+5SUNPRgPVlleE=
+SIZE (octave-5.2.0.tar.gz) = 33360285
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -r1.14 patch-configure
--- patches/patch-configure 6 May 2019 21:09:52 - 1.14
+++ patches/patch-configure 20 Apr 2020 06:56:04 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -67197,13 +67197,13 @@ fi
+@@ -67123,13 +67123,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -67242,7 +67242,7 @@ fi
+@@ -67168,7 +67168,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST 6 May 2019 21:09:52 - 1.26
+++ pkg/PLIST 20 Ap
UPDATE: math/octave
update octave, and reinstate wantlib that was somehow removed earlier.
tested lightly on amd64, test suite shows no regression compared to
version 5.1.0 in tree.
please test/comment/ok.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.118
diff -u -p -u -r1.118 Makefile
--- Makefile5 Apr 2020 15:44:52 - 1.118
+++ Makefile18 Apr 2020 12:30:20 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 5.1.0
+VERSION = 5.2.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 4
-SHARED_LIBS += octave 12.0
-SHARED_LIBS += octgui 6.0
-SHARED_LIBS += octinterp 11.0
+SHARED_LIBS += octave 13.0
+SHARED_LIBS += octgui 7.0
+SHARED_LIBS += octinterp 12.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -55,6 +54,23 @@ LIB_DEPENDS =${MODFORTRAN_LIB_DEPENDS}
net/curl \
print/gl2ps \
x11/qt5/qttools,-main
+
+WANTLIB += ${MODFORTRAN_WANTLIB}
+WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
+WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5 SM X11 X11-xcb Xdamage
+WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
+WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
+WANTLIB += curses cxsparse double-conversion drm ereadline expat
+WANTLIB += execinfo fftw3 fftw3_threads fftw3f fftw3f_threads
+WANTLIB += fontconfig freetype gl2ps glapi glpk glut
+WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz icudata icuio
+WANTLIB += gmp hdf5 iconv icui18n icuuc intl lapack lcms2 ltdl lzma
+WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
+WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
+WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
+WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z zstd
+
SEPARATE_BUILD = Yes
USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo6 May 2019 21:09:52 - 1.22
+++ distinfo18 Apr 2020 12:30:20 -
@@ -1,2 +1,2 @@
-SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
-SIZE (octave-5.1.0.tar.gz) = 32034788
+SHA256 (octave-5.2.0.tar.gz) = L+pis8eNbzjpRR2opNJgI4QHJZd9/+5SUNPRgPVlleE=
+SIZE (octave-5.2.0.tar.gz) = 33360285
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -r1.14 patch-configure
--- patches/patch-configure 6 May 2019 21:09:52 - 1.14
+++ patches/patch-configure 18 Apr 2020 12:30:20 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -67197,13 +67197,13 @@ fi
+@@ -67123,13 +67123,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -67242,7 +67242,7 @@ fi
+@@ -67168,7 +67168,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST 6 May 2019 21:09:52 - 1.26
+++ pkg/PLIST 18 Apr 2020 12:30:22 -
@@ -776,13 +776,13 @@ lib/octave/${VERSION}/convhulln.a
lib/octave/${VERSION}/dmperm.a
lib/octave/${VERSION}/fftw.a
lib/octave/${VERSION}/gzip.a
-lib/octave/${VERSION}/liboctave.a
+@static-lib lib/octave/${VERSION}/liboctave.a
lib/octave/${VERSION}/liboctave.la
@lib lib/octave/${VERSION}/liboctave.so.${LIBoctave_VERSION}
-lib/octave/${VERSION}/liboctgui.a
+@static-lib lib/octave/${VERSION}/liboctgui.a
lib/octave/${VERSION}/liboctgui.la
@lib lib/octave/${VERSION}/liboctgui.so.${LIBoctgui_VERSION}
-lib/octave/${VERSION}/liboctinterp.a
+@static-lib lib/octave/${VERSION}/liboctinterp.a
lib/octave/${VERSION}/liboctinterp.la
@lib lib/octave/${VERSION}/liboctinterp.so.${LIBoctinterp_VERSION}
lib/octave/${VERSION}/oct/
@@ -844,6 +844,9 @@ libexec/octave/site/exec/${GNU_ARCH}/
@man man/man1/octave-config.1
@man man/man1/octave.1
share/applications/org.octave.Octave.desktop
+share/icons/hicolor/1024x1024/
+share/icons/hicolor/1024x1024/apps/
+share/icons/hicolor/1024x1024/apps/octave.png
share/icons/hicolor/128x128/apps/octave.png
Re: Remove security/keepassx
Jeremie Courreges-Anglas [2020-02-22, 14:57:51]:
>
> +cc maintainer
>
> On Sat, Feb 22 2020, Rafael Sadowski wrote:
> > What do you think about the idea of deleting keepassx and set a pkgpath
> > in keepassxc?
> >
> > Here is a quote from the keepassxc FAQ:
> >
> > Q: Why KeePassXC instead of KeePassX?
> > A: KeePassX is an amazing password manager, but hasn't seen much active
> > development for quite a while. Many good pull requests were never merged
> > and the original project is missing some features which users can expect
> > from a modern password manager. Hence, we decided to fork KeePassX to
> > continue its development and provide you with everything you love about
> > KeePassX plus many new features and bugfixes.
> >
> > -- https://keepassxc.org/docs/#faq-keepassx
> >
> >
> > Everything keepassx can do, so can keepassxc and more. "File format
> > compatibility with KeePass2, KeePassX, MacPass, KeeWeb and many others
> > (KDBX 3.1 and 4.0)"
> >
> > It feels so right!
>
> https://github.com/keepassx/keepassx/ has commits for Qt5 support.
> I guess keepassx can be kept for those who care, as long as they do the
> work to migrate the port to Qt5.
I have no objection against removing or patching the port.
However I am not using this software, and have no intentions with the port.
> I use keepassxc, not keepassx, when I need a GUI password manager.
> I wouldn't miss the latter.
>
> > RS
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/keepassxc/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -u -p -r1.27 Makefile
> > --- Makefile20 Jan 2020 06:28:12 - 1.27
> > +++ Makefile22 Feb 2020 06:33:57 -
> > @@ -4,6 +4,7 @@ COMMENT = management tool for password a
> >
> > V =2.5.3
> > DISTNAME = keepassxc-${V}
> > +REVISION = 0
> >
> > CATEGORIES = security
> >
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/security/keepassxc/pkg/PLIST,v
> > retrieving revision 1.18
> > diff -u -p -u -p -r1.18 PLIST
> > --- pkg/PLIST 20 Jan 2020 06:28:12 - 1.18
> > +++ pkg/PLIST 22 Feb 2020 06:33:57 -
> > @@ -1,4 +1,5 @@
> > @comment $OpenBSD: PLIST,v 1.18 2020/01/20 06:28:12 rsadowski Exp $
> > +@pkgpath security/keepassx
> > @bin bin/keepassxc
> > @bin bin/keepassxc-cli
> > %%browser%%
> >
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[NEW] p5-Math-GMPf
perl interface to the GMP library's floating point (mpf) functions. tests pass on amd64. comments/ok? p5-Math-GMPf.tgz Description: application/tar-gz
[NEW] p5-Math-GMPz
perl interface to the GMP library's integer (mpz) functions. comments/ok? p5-Math-GMPz.tgz Description: application/tar-gz
Re: TeX Live housekeeping
Edd Barrett [2019-05-18, 14:30:12]:
> Hi,
>
> This isn't very exciting, but I wanted to get it out of the way before I
> start looking at TL 2019.
>
> * Port all Python scripts to Python 3 and invoke them via #!
> * Fix a generated CVS tag.
CVS will just regenerate it again, if you want to avoid it you probably
want to tweak the code a bit.
> * Add a missing make dep.
>
> OK?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
> retrieving revision 1.57
> diff -u -p -r1.57 Makefile
> --- Makefile 10 Feb 2019 18:14:36 - 1.57
> +++ Makefile 17 May 2019 11:21:20 -
> @@ -169,11 +169,10 @@ plist: fake
> env WRKINST=${WRKINST} TRUEPREFIX=${TRUEPREFIX} ${MODPY_BIN} \
> ${FILESDIR}/update_plist_hints.py \
> ${WRKDIR}/texlive.tlpdb | \
> - ${MODPY_BIN} ${FILESDIR}/write_plists.py
> + ${FILESDIR}/write_plists.py
>
> # regenerate adj.mk
> -adj:
> - ${MODPY_BIN} ${FILESDIR}/mk_adj.py ${WRKSRC}/texmf-dist \
> - ${WRKSRC} > adj.mk
> +adj: patch
> + ${FILESDIR}/mk_adj.py ${WRKSRC}/texmf-dist ${WRKSRC} > adj.mk
>
> .include
> Index: files/mk_adj.py
> ===
> RCS file: /cvs/ports/print/texlive/texmf/files/mk_adj.py,v
> retrieving revision 1.1
> diff -u -p -r1.1 mk_adj.py
> --- files/mk_adj.py 30 Jan 2018 20:35:52 - 1.1
> +++ files/mk_adj.py 17 May 2019 12:59:53 -
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python2.7
> +#!/usr/bin/env python3
> """
> Generate adj.mk.
>
> @@ -62,14 +62,14 @@ def process_file(dirpath, filename, subs
> stripped_path = os.path.relpath(path, strip_prefix)
>
> try:
> -fh = open(path)
> +fh = open(path, "rb")
> except IOError:
> # ignore broken symlinks
> if os.path.islink(path):
> return
> raise
>
> -line1 = fh.readline().strip()
> +line1 = fh.readline().strip().decode(errors='ignore')
> fh.close()
>
> # There are some `.in` files with placeholder shebangs, ignore.
> @@ -121,11 +121,11 @@ def main(root_dir, strip_prefix):
> except UnknownInterpreterError as e:
> unknown_interp_files.append(e.args)
>
> -print("# $OpenBSD: mk_adj.py,v 1.1 2018/01/30 20:35:52 edd Exp $")
> +print("# $OpenBSD$")
> print("#")
> print("# This file is automatically generated. Do not edit.\n")
>
> -for subst_var, paths in sorted(substs.iteritems(), key=lambda t: t[0]):
> +for subst_var, paths in sorted(substs.items(), key=lambda t: t[0]):
> joined_paths = " \\\n\t".join(sorted(paths))
> print("\n%s += \\\n\t%s" % (subst_var, joined_paths))
>
> Index: files/tlpdb.py
> ===
> RCS file: /cvs/ports/print/texlive/texmf/files/tlpdb.py,v
> retrieving revision 1.2
> diff -u -p -r1.2 tlpdb.py
> --- files/tlpdb.py20 Jan 2019 11:17:49 - 1.2
> +++ files/tlpdb.py17 May 2019 11:01:38 -
> @@ -1,3 +1,4 @@
> +#!/usr/bin/env python3
> # $OpenBSD: tlpdb.py,v 1.2 2019/01/20 11:17:49 edd Exp $
> """Lightweight TeX Live TLPDB parser."""
>
> Index: files/update_plist_hints.py
> ===
> RCS file: /cvs/ports/print/texlive/texmf/files/update_plist_hints.py,v
> retrieving revision 1.2
> diff -u -p -r1.2 update_plist_hints.py
> --- files/update_plist_hints.py 20 Jan 2019 11:17:49 - 1.2
> +++ files/update_plist_hints.py 17 May 2019 11:00:31 -
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python2.7
> +#!/usr/bin/env python3
> """
> Output update-plist(1) hints for which files go into which PLIST.
>
> Index: files/which_subset.py
> ===
> RCS file: /cvs/ports/print/texlive/texmf/files/which_subset.py,v
> retrieving revision 1.1
> diff -u -p -r1.1 which_subset.py
> --- files/which_subset.py 11 Apr 2018 13:40:32 - 1.1
> +++ files/which_subset.py 17 May 2019 11:04:15 -
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python3.6
> +#!/usr/bin/env python3
> """
> Prints the dependencies of a TeX document in terms of OpenBSD packing lists.
>
> Index: files/write_plists.py
> ===
> RCS file: /cvs/ports/print/texlive/texmf/files/write_plists.py,v
> retrieving revision 1.1
> diff -u -p -r1.1 write_plists.py
> --- files/write_plists.py 11 Sep 2018 21:32:28 - 1.1
> +++ files/write_plists.py 17 May 2019 13:00:01 -
> @@ -1,3 +1,4 @@
> +#!/usr/bin/env python3
> # $OpenBSD: write_plists.py,v 1.1 2018/09/11 21:32:28 edd Exp $
> """
> Write PLISTs based on the output of update_plist_hints.py.
> @@ -125,7 +126,7 @@ def main():
> dir_ents[plist].update(dir_entries(filename, EXISTING_DIRS))
>
Re: Enable flang in fortran module and use it to enable R on arm64
Brian Callahan [2019-05-08, 00:42:02]:
> Hi ports --
>
> Attached are two diffs. The first turns on flang support in the fortran
> module. This has been brought up before but stalled. It is now necessary for
> R to build on arm64. The second uses flang as the Fortran compiler on arm64
> when building R. This allows R to successfully build and package and
> install.
>
> OK?
>
> ~Brian
>
> Index: fortran.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/fortran.port.mk,v
> retrieving revision 1.15
> diff -u -p -r1.15 fortran.port.mk
> --- fortran.port.mk 14 Jan 2019 21:27:37 - 1.15
> +++ fortran.port.mk 8 May 2019 04:32:27 -
> @@ -17,6 +17,10 @@ MODGCC4_LANGS += fortran
> MODFORTRAN_BUILD_DEPENDS += ${MODGCC4_FORTRANDEP}
> MODFORTRAN_LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP}
> MODFORTRAN_WANTLIB += ${MODGCC4_FORTRANWANTLIB}
> +.elif ${MODFORTRAN_COMPILER:L} == "flang"
> +MODFORTRAN_BUILD_DEPENDS += lang/flang/flang
> +MODFORTRAN_LIB_DEPENDS += lang/flang/flang
> +MODFORTRAN_WANTLIB += compiler_rt flang flangmain flangrti pgmath
> .else
> -ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
> +ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran flang"
> .endif
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.109
> diff -u -p -r1.109 Makefile
> --- Makefile 29 Apr 2019 08:52:47 - 1.109
> +++ Makefile 8 May 2019 04:38:25 -
> @@ -37,7 +37,11 @@ MASTER_SITES= https://cran.r-project.org
> MODULES= fortran \
> x11/tk
>
> +.if ${MACHINE_ARCH:Maarch64}
> +MODFORTRAN_COMPILER = flang
> +.else
> MODFORTRAN_COMPILER = gfortran
> +.endif
>
> BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS} \
> archivers/gtar \
ok. have you built any other ports using flang?
Re: UPDATE: math/octave
Steven Mestdagh [2019-04-25, 07:53:23]:
> This brings octave to the latest version. Tested ok on amd64.
> Would be nice if someone could build/test on other archs.
updated diff against -current.
any feedback on this?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.109
diff -u -p -u -r1.109 Makefile
--- Makefile28 Apr 2019 21:08:27 - 1.109
+++ Makefile3 May 2019 22:17:12 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.4.1
+VERSION = 5.1.0
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math
-SHARED_LIBS += octave 11.0
-SHARED_LIBS += octgui 5.0
-SHARED_LIBS += octinterp 10.0
+SHARED_LIBS += octave 12.0
+SHARED_LIBS += octgui 6.0
+SHARED_LIBS += octinterp 11.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -21,7 +20,7 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += ${MODFORTRAN_WANTLIB}
WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
-WANTLIB += Qt5Help Qt5Sql qscintilla2_qt5
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5
WANTLIB += SM X11 X11-xcb Xdamage
WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
WANTLIB += arpack blas btf bz2 c camd ccolamd cholmod colamd crypto curl
@@ -29,7 +28,7 @@ WANTLIB += curses cxsparse drm ereadline
WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
WANTLIB += fftw3f_threads fontconfig freetype gl2ps glapi glpk glut
WANTLIB += gmp hdf5 iconv icui18n icuuc intl klu lapack lcms2 ltdl lzma
-WANTLIB += m nghttp2 ogg pcre pcre2-16 png png16 portaudio pthread qhull
+WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.21
diff -u -p -u -r1.21 distinfo
--- distinfo13 Jan 2019 22:43:59 - 1.21
+++ distinfo3 May 2019 22:17:12 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
-SIZE (octave-4.4.1.tar.gz) = 28626462
+SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
+SIZE (octave-5.1.0.tar.gz) = 32034788
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.13
diff -u -p -u -r1.13 patch-configure
--- patches/patch-configure 13 Jan 2019 22:43:59 - 1.13
+++ patches/patch-configure 3 May 2019 22:17:12 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -66327,13 +66327,13 @@ fi
+@@ -67197,13 +67197,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -66372,7 +66372,7 @@ fi
+@@ -67242,7 +67242,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -u -r1.25 PLIST
--- pkg/PLIST 13 Jan 2019 22:43:59 - 1.25
+++ pkg/PLIST 3 May 2019 22:17:13 -
@@ -135,7 +135,6 @@ include/octave-${VERSION}/octave/graphic
include/octave-${VERSION}/octave/graphics-props.cc
include/octave-${VERSION}/octave/graphics-toolkit.h
include/octave-${VERSION}/octave/graphics.h
-include/octave-${VERSION}/octave/gripes.h
include/octave-${VERSION}/octave/gsvd.h
include/octave-${VERSION}/octave/gtk-manager.h
include/octave-${VERSION}/octave/help.h
@@ -159,11 +158,9 @@ include/octave-${VERSION}/octave/libocti
include/octave-${VERSION}/octave/lo-amos-proto.h
include/octave-${VERSION}/octave/lo-arpack-proto.h
include/octave-${VERSION}/octave/lo-array-errwarn.h
-include/octave-${VERSION}/octave/lo-array-gripes.h
include/octave-${VERSION}/octave/lo-blas-proto.h
include/octave-${VERSION}/octave/lo-cutils.h
include/octave-${VERSION}/octave/lo-error.h
-include/octave-${VERSION}/octave/lo-fftpack-proto.h
include/octave-${VERSION}/octave/lo-hash.h
include/octave-${VERSION}/octave/lo-ieee.h
include/octave-${VERSION}/octave/lo-lapack-proto.h
@@ -636,6 +633,7 @@ include/octave-${VERSION
UPDATE: math/octave
This brings octave to the latest version. Tested ok on amd64.
Would be nice if someone could build/test on other archs.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.108
diff -u -p -u -r1.108 Makefile
--- Makefile8 Mar 2019 20:00:47 - 1.108
+++ Makefile25 Apr 2019 05:43:13 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.4.1
+VERSION = 5.1.0
DISTNAME = octave-${VERSION}
-REVISION = 1
CATEGORIES = math
-SHARED_LIBS += octave 11.0
-SHARED_LIBS += octgui 5.0
-SHARED_LIBS += octinterp 10.0
+SHARED_LIBS += octave 12.0
+SHARED_LIBS += octgui 6.0
+SHARED_LIBS += octinterp 11.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -21,7 +20,7 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += ${MODFORTRAN_WANTLIB}
WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
-WANTLIB += Qt5Help Qt5Sql qscintilla2_qt5
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5
WANTLIB += SM X11 X11-xcb Xdamage
WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
WANTLIB += arpack blas btf bz2 c camd ccolamd cholmod colamd crypto curl
@@ -29,7 +28,7 @@ WANTLIB += curses cxsparse drm ereadline
WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
WANTLIB += fftw3f_threads fontconfig freetype gl2ps glapi glpk glut
WANTLIB += gmp hdf5 iconv icui18n icuuc intl klu lapack lcms2 ltdl lzma
-WANTLIB += m nghttp2 ogg pcre pcre2-16 png png16 portaudio pthread qhull
+WANTLIB += m nghttp2 ogg pcre pcre2-16 png16 portaudio pthread qhull
WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.21
diff -u -p -u -r1.21 distinfo
--- distinfo13 Jan 2019 22:43:59 - 1.21
+++ distinfo25 Apr 2019 05:43:13 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
-SIZE (octave-4.4.1.tar.gz) = 28626462
+SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
+SIZE (octave-5.1.0.tar.gz) = 32034788
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.13
diff -u -p -u -r1.13 patch-configure
--- patches/patch-configure 13 Jan 2019 22:43:59 - 1.13
+++ patches/patch-configure 25 Apr 2019 05:43:13 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -66327,13 +66327,13 @@ fi
+@@ -67197,13 +67197,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -66372,7 +66372,7 @@ fi
+@@ -67242,7 +67242,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -u -r1.25 PLIST
--- pkg/PLIST 13 Jan 2019 22:43:59 - 1.25
+++ pkg/PLIST 25 Apr 2019 05:43:14 -
@@ -135,7 +135,6 @@ include/octave-${VERSION}/octave/graphic
include/octave-${VERSION}/octave/graphics-props.cc
include/octave-${VERSION}/octave/graphics-toolkit.h
include/octave-${VERSION}/octave/graphics.h
-include/octave-${VERSION}/octave/gripes.h
include/octave-${VERSION}/octave/gsvd.h
include/octave-${VERSION}/octave/gtk-manager.h
include/octave-${VERSION}/octave/help.h
@@ -159,11 +158,9 @@ include/octave-${VERSION}/octave/libocti
include/octave-${VERSION}/octave/lo-amos-proto.h
include/octave-${VERSION}/octave/lo-arpack-proto.h
include/octave-${VERSION}/octave/lo-array-errwarn.h
-include/octave-${VERSION}/octave/lo-array-gripes.h
include/octave-${VERSION}/octave/lo-blas-proto.h
include/octave-${VERSION}/octave/lo-cutils.h
include/octave-${VERSION}/octave/lo-error.h
-include/octave-${VERSION}/octave/lo-fftpack-proto.h
include/octave-${VERSION}/octave/lo-hash.h
include/octave-${VERSION}/octave/lo-ieee.h
include/octave-${VERSION}/octave/lo-lapack-proto.h
@@ -636,6 +633,7 @@ include/octave-${VERSION}/octave/pr-outp
include/octave-${VERSION}/octave/procstream.h
include/octave-${VERSION}/octave/profiler.h
include/octave-${VERSION}/octave/pt-all.h
+include/octave-${VERSION
UPDATE: math/lapack
This brings lapack to the latest version.
The included tests are fine on amd64, and octave still works with it.
Feedback and more tests welcome of course.
Index: Makefile
===
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- Makefile23 Oct 2018 20:35:47 - 1.27
+++ Makefile18 Apr 2019 07:11:57 -
@@ -2,14 +2,13 @@
COMMENT= library of Fortran linear algebra subroutines
-VERSION= 3.7.1
+VERSION= 3.8.0
DISTNAME= lapack-${VERSION}
-REVISION= 0
-SHARED_LIBS= lapack 6.0
+SHARED_LIBS= lapack 7.0
CATEGORIES=math
-DISTFILES= ${DISTNAME}.tgz manpages.tgz:0
+DISTFILES= ${DISTNAME}.tar.gz manpages.tgz:0
HOMEPAGE= http://www.netlib.org/lapack/
@@ -21,7 +20,6 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://www.netlib.org/lapack/ \
http://www.netlib.no/netlib/lapack/
MASTER_SITES0= http://www.netlib.org/lapack/
-EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${DISTNAME}
LIB_DEPENDS = math/blas
@@ -71,12 +69,14 @@ post-install:
grep -v dsytrd_sb2st.f | \
grep -v chetrd_hb2st.f | \
grep -v zhetrd_hb2st.f | \
+ grep -v dlamch.f | \
grep -v iparam2stage.f | \
+ grep -v ilaver.f | \
+ grep -v slamch.f | \
grep -v lsame.f | \
grep -v xerbla.f | \
grep -v xerbla_array.f` ; do \
${INSTALL_MAN} `basename $${m%.f}.3f` ${PREFIX}/man/man3f ; done
- @${INSTALL_MAN} ${MANSRC}/*TIME*.3f ${PREFIX}/man/man3f
do-test:
cd ${WRKDIST}/TESTING/MATGEN && gmake ${ALL_TEST_FLAGS}
Index: distinfo
===
RCS file: /cvs/ports/math/lapack/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo13 Nov 2017 06:57:36 - 1.6
+++ distinfo18 Apr 2019 07:11:57 -
@@ -1,4 +1,4 @@
-SHA256 (lapack-3.7.1/lapack-3.7.1.tgz) =
9sU/2fVpMvPds9XiTBwH5M2bOwjn+J3pyGcSXuzJocg=
-SHA256 (lapack-3.7.1/manpages.tgz) =
u1F5eMDMeWzCO/9NMLuw9LrXoo5pXbhsKf3J/tYKIsQ=
-SIZE (lapack-3.7.1/lapack-3.7.1.tgz) = 9137261
-SIZE (lapack-3.7.1/manpages.tgz) = 2673950
+SHA256 (lapack-3.8.0/lapack-3.8.0.tar.gz) =
3rIsxKYSC/9yYhFVqZF/SF+W74MZrAdKevvGiquIvPY=
+SHA256 (lapack-3.8.0/manpages.tgz) =
IpprpXnvbkH7rjKo7p6eWmILO1G9JEZm44bJXHucYIM=
+SIZE (lapack-3.8.0/lapack-3.8.0.tar.gz) = 7426094
+SIZE (lapack-3.8.0/manpages.tgz) = 1930616
Index: files/Makefile
===
RCS file: /cvs/ports/math/lapack/files/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- files/Makefile 13 Nov 2017 06:57:36 - 1.7
+++ files/Makefile 18 Apr 2019 07:11:57 -
@@ -98,6 +98,7 @@ SLASRC = \
ssytf2_rk.f ssytrf_rk.f ssytrs_3.f \
ssytri_3.f ssytri_3x.f ssycon_3.f ssysv_rk.f \
slasyf_aa.f ssysv_aa.f ssytrf_aa.f ssytrs_aa.f \
+ ssysv_aa_2stage.f ssytrf_aa_2stage.f ssytrs_aa_2stage.f \
stbcon.f \
stbrfs.f stbtrs.f stgevc.f stgex2.f stgexc.f stgsen.f \
stgsja.f stgsna.f stgsy2.f stgsyl.f stpcon.f stprfs.f stptri.f \
@@ -149,6 +150,7 @@ CLASRC = \
chetf2_rk.f chetrf_rk.f chetri_3.f chetri_3x.f \
chetrs_3.f checon_3.f chesv_rk.f \
chesv_aa.f chetrf_aa.f chetrs_aa.f clahef_aa.f \
+ chesv_aa_2stage.f chetrf_aa_2stage.f chetrs_aa_2stage.f \
chgeqz.f chpcon.f chpev.f chpevd.f \
chpevx.f chpgst.f chpgv.f chpgvd.f chpgvx.f chprfs.f chpsv.f \
chpsvx.f \
@@ -179,6 +181,7 @@ CLASRC = \
cstegr.f cstein.f csteqr.f \
csycon.f csymv.f csyr.f csyrfs.f csysv.f csysvx.f \
csytf2.f csytrf.f csytri.f csytri2.f csytri2x.f \
+ csysv_aa_2stage.f csytrf_aa_2stage.f csytrs_aa_2stage.f \
csyswapr.f csytrs.f csytrs2.f \
csyconv.f csyconvf.f csyconvf_rook.f \
csytf2_rook.f csytrf_rook.f csytrs_rook.f \
@@ -268,6 +271,7 @@ DLASRC = \
dsytf2_rk.f dsytrf_rk.f dsytrs_3.f \
dsytri_3.f dsytri_3x.f dsycon_3.f dsysv_rk.f \
dlasyf_aa.f dsysv_aa.f dsytrf_aa.f dsytrs_aa.f \
+ dsysv_aa_2stage.f dsytrf_aa_2stage.f dsytrs_aa_2stage.f \
dtbcon.f dtbrfs.f dtbtrs.f dtgevc.f dtgex2.f dtgexc.f dtgsen.f \
dtgsja.f dtgsna.f dtgsy2.f dtgsyl.f dtpcon.f dtprfs.f dtptri.f \
dtptrs.f \
@@ -318,6 +322,7 @@ ZLASRC = \
zhetf2_rk.f zhetrf_rk.f zhetri_3.f zhetri_3x.f \
zhetrs_3.f zhecon_3.f zhesv_rk.f \
zhesv_aa.f zhetrf_aa.f zhetrs_aa.f zlahef_aa.f \
+ zhesv_aa_2stage.f zhetrf_aa_2stage.f zhetrs_aa_2stage.f \
zhgeqz.f zhpcon.f zhpev.f zhpevd.f \
zhpevx.f zhpgst.f zhpgv.f zhpgvd.f zhpgvx.f zhprfs.f zhpsv.f \
zhpsvx.f \
@@ -354,6 +359,7 @@ ZLASRC = \
zsyconv.f zsyconvf.f zsyconvf_rook.f \
zsytf2_rook.f zsytrf_rook.f zsytrs_rook.f zsytrs_aa.f \
zsytri_rook.f zsycon_rook.f zsysv_rook.f \
+ zsysv_aa_2stage.f zsytrf_aa_2stage.f zsytrs_aa_2stage.f \
Re: Chrome in snapshots - crash on launch
Ryan Freeman [2019-03-17, 14:09:08]: > On Fri, Mar 15, 2019 at 07:52:50PM +, Bryan Everly wrote: > > Hi Ports@, > > > > Below is the terminal output I get when I try to launch the chromium build > > (latest & greatest package from snapshots) on the latest snapshot: > > > > $ chrome > > [40668:1870462320:0315/155107.446613:ERROR:process_metrics_openbsd.cc(126)] > > Not implemented reached in bool > > base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) > > [40668:1870462320:0315/155107.464615:ERROR:process_posix.cc(388)] Not > > implemented reached in base::Time base::Process::CreationTime() const > > Abort trap (core dumped) > > > > Any suggestions? > > > > Thanks! > > I still haven't been able to figure out what is causing this, my post here: > https://marc.info/?l=openbsd-ports&m=155181090804746&w=2 In your dmesg: chrome[55191]: pledge "", syscall 203 I see similar behavior with chrome (amd64), where pledge does not permit the mlock syscall, and the program is aborted. I use xenodm with xfce. If I run chrome as a different user than the one logged into xenodm, it works fine. I've also tried it with a clean profile, makes no difference. This started to happen +/- end of January.
Re: miniupnpd-2.1
Bjrn Ketelaars [2019-03-07, 07:09:48]:
> Diff below brings miniupnpd to the latest version (2.1). Changelog can
> be found at
> http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-2.1.tar.gz
>
> (Lightly) tested at home by a PS4-fanatic.
these patches (from upstream) avoid crashes by null pointer dereference
on receiving a request without those parameters.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/miniupnp/miniupnpd/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile11 Mar 2019 20:05:23 - 1.19
+++ Makefile18 Mar 2019 23:33:03 -
@@ -3,7 +3,7 @@
COMMENT= UPnP IGD daemon
DISTNAME= miniupnpd-2.1
-REVISION= 0
+REVISION= 1
WANTLIB += c crypto kvm ssl
Index: patches/patch-upnpsoap_c
===
RCS file: patches/patch-upnpsoap_c
diff -N patches/patch-upnpsoap_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-upnpsoap_c18 Mar 2019 23:33:03 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Index: upnpsoap.c
+--- upnpsoap.c.orig
upnpsoap.c
+@@ -590,7 +590,7 @@ AddAnyPortMapping(struct upnphttp * h, const char * ac
+ if(leaseduration == 0)
+ leaseduration = 604800;
+
+- if (!int_ip || !ext_port || !int_port)
++ if (!int_ip || !ext_port || !int_port || !protocol)
+ {
+ ClearNameValueList(&data);
+ SoapError(h, 402, "Invalid Args");
+@@ -1841,6 +1841,13 @@ GetOutboundPinholeTimeout(struct upnphttp * h, const c
+ rem_host = GetValueFromNameValueList(&data, "RemoteHost");
+ rem_port = GetValueFromNameValueList(&data, "RemotePort");
+ protocol = GetValueFromNameValueList(&data, "Protocol");
++
++ if (!int_port || !rem_port || !protocol)
++ {
++ ClearNameValueList(&data);
++ SoapError(h, 402, "Invalid Args");
++ return;
++ }
+
+ rport = (unsigned short)atoi(rem_port);
+ iport = (unsigned short)atoi(int_port);
Re: [ports-gcc] Unbreak graphics/pstoedit
Charlene Wendling [2019-03-18, 14:57:23]:
> Hi ports, Steven,
>
> > http://build-failures.rhaalovely.net/sparc64/2019-02-03/graphics/pstoedit.log
> > http://build-failures.rhaalovely.net/powerpc/last/graphics/pstoedit.log
>
> It requires -std=c++11 once again, it builds fine on macppc after it's
> provided [1]. While here i've fixed a spacing inconsistency in COMPILER.
>
> I didn't bump REVISION, since pstoedit-3.73 has never been built on
> ports-gcc archs.
>
> Any comment?
>
> Charlène.
>
> [1] http://0x0.st/z8SZ.txt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/pstoedit/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 Makefile
> --- Makefile 5 Jan 2019 10:08:33 - 1.27
> +++ Makefile 18 Mar 2019 13:36:47 -
> @@ -26,9 +26,15 @@ CONFIGURE_ARGS=--without-libplot \
> --without-magick
> WANTLIB= c ${COMPILER_LIBCXX} m
>
> -COMPILER = base-clang ports-gcc base-gcc
> +# c++11
> +COMPILER = base-clang ports-gcc base-gcc
>
> post-install:
> ${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${PREFIX}/man/man1
>
> .include
> +
> +# XXX this should be retried once moving to ports-gcc>=8
> +.if ${CHOSEN_COMPILER} == "ports-gcc"
> +CONFIGURE_ENV += CXXFLAGS="${CXXFLAGS} -std=c++11"
> +.endif
sure, but -std=c++11 is also supported by clang, we could always apply it?
UPDATE: math/octave
maintenance update, seems to work fine on amd64.
test suite shows 2 failures less than with the previous version.
comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.105
diff -u -p -u -r1.105 Makefile
--- Makefile11 Aug 2018 04:58:47 - 1.105
+++ Makefile10 Jan 2019 20:39:00 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.4.0
+VERSION = 4.4.1
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 1
-SHARED_LIBS += octave 10.0
-SHARED_LIBS += octgui 4.0
-SHARED_LIBS += octinterp 9.0
+SHARED_LIBS += octave 11.0
+SHARED_LIBS += octgui 5.0
+SHARED_LIBS += octinterp 10.0
HOMEPAGE = https://www.gnu.org/software/octave/
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.20
diff -u -p -u -r1.20 distinfo
--- distinfo24 May 2018 21:23:50 - 1.20
+++ distinfo10 Jan 2019 20:39:00 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.4.0.tar.gz) = cvhGN5/Ox+gT1Grcus0GnXLE9Nj2ADvNksNROq/NbpY=
-SIZE (octave-4.4.0.tar.gz) = 29009355
+SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
+SIZE (octave-4.4.1.tar.gz) = 28626462
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -u -r1.12 patch-configure
--- patches/patch-configure 24 May 2018 21:23:50 - 1.12
+++ patches/patch-configure 10 Jan 2019 20:39:00 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -66013,13 +66013,13 @@ fi
+@@ -66327,13 +66327,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -66058,7 +66058,7 @@ fi
+@@ -66372,7 +66372,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-scripts_pkg_private_configure_make_m
===
RCS file:
/cvs/ports/math/octave/patches/patch-scripts_pkg_private_configure_make_m,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-scripts_pkg_private_configure_make_m
--- patches/patch-scripts_pkg_private_configure_make_m 3 Nov 2017 12:28:53
- 1.2
+++ patches/patch-scripts_pkg_private_configure_make_m 10 Jan 2019 20:39:00
-
@@ -1,8 +1,8 @@
-$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.2 2017/11/03 12:28:53
steven Exp $
+$OpenBSD$
Index: scripts/pkg/private/configure_make.m
--- scripts/pkg/private/configure_make.m.orig
+++ scripts/pkg/private/configure_make.m
-@@ -87,7 +87,7 @@ function configure_make (desc, packdir, verbose)
+@@ -91,7 +91,7 @@ function configure_make (desc, packdir, verbose)
endif
if (exist (fullfile (src, "Makefile"), "file"))
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.24
diff -u -p -u -r1.24 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:57 - 1.24
+++ pkg/PLIST 10 Jan 2019 20:39:00 -
@@ -703,7 +703,6 @@ include/octave-${VERSION}/octave/sparse-
include/octave-${VERSION}/octave/sparse-xdiv.h
include/octave-${VERSION}/octave/sparse-xpow.h
include/octave-${VERSION}/octave/str-vec.h
-include/octave-${VERSION}/octave/sun-utils.h
include/octave-${VERSION}/octave/svd.h
include/octave-${VERSION}/octave/symrec.h
include/octave-${VERSION}/octave/symscope.h
@@ -944,9 +943,6 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/bug-44940/bug-44940.tst
share/octave/${VERSION}/etc/tests/fixed/bug-44940/class_bug44940.m
share/octave/${VERSION}/etc/tests/fixed/bug-46330.tst
-share/octave/${VERSION}/etc/tests/fixed/bug-46497/
-share/octave/${VERSION}/etc/tests/fixed/bug-46497/bug-46497.tst
-share/octave/${VERSION}/etc/tests/fixed/bug-46497/class_bug46497.m
share/octave/${VERSION}/etc/tests/fixed/bug-46660/
share/octave/${VERSION}/etc/tests/fixed/bug-46660/bug-46660.tst
share/octave/${VERSION}/etc/tests/fixed/bug-46660/class_bug46660.m
@@ -1457,6 +1453,7 @@ share/octave/${VERSION}/m/deprecated/oct
share/octave/${VERSION}/m/deprecated/onenormest.m
share/octave/${VERSION}/m/deprecated/paren.m
share/octave/${VERSION}/m/deprecated/semicolon.m
+share/octave/${VERSION}/m/deprecated/setstr.m
share/octave/${VERSION}/m/deprecated/sleep.m
share/octave/${VERSION}/m/deprecated/tmpnam.m
share/octave/${VERS
UPDATE: security/clusterssh
This updates clusterssh to a more recent release.
Tests pass, and works fine for me.
Comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile19 Mar 2017 11:41:41 - 1.19
+++ Makefile9 Jan 2019 19:56:25 -
@@ -2,8 +2,8 @@
COMMENT= secure concurrent multi-server terminal control
-V= 4.09
-DISTNAME= App-ClusterSSH-$V
+V= 4.13.2
+DISTNAME= App-ClusterSSH-v$V
PKGNAME= clusterssh-${V:S/_/./}
CATEGORIES=security
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- distinfo19 Mar 2017 11:41:41 - 1.12
+++ distinfo9 Jan 2019 19:56:25 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.09.tar.gz) =
Mrn9n7rwprZqrnm99uuqn1P+Q4YBqahQxvA1aEzV2jk=
-SIZE (App-ClusterSSH-4.09.tar.gz) = 90145
+SHA256 (App-ClusterSSH-v4.13.2.tar.gz) =
txpuZabZjYkDMQxM39/YWQQBKZMtWiUSgOFz4cYVs2Y=
+SIZE (App-ClusterSSH-v4.13.2.tar.gz) = 103412
Re: NEW: math/mlpack (and dependency math/armadillo)
Jeremie Courreges-Anglas [2018-10-22, 08:46:46]:
> On Sun, Oct 21 2018, Steven Mestdagh wrote:
> > Jeremie Courreges-Anglas [2018-10-21, 17:25:19]:
>
> [...]
>
> >> Regarding libgfortran,
> >>
> >> > - the library definitely requires linking with the gfortran library
> >> > because some of lapack blas want symbols in there
> >>
> >> Yeah I see. IIUC blas, apack and arpack don't register the dep on
> >> libgfortran because of a build system quirk (linking is done with with
> >> cc instead of gfortran). A simple diff like below would register the
> >> dep on libgfortran, and remove the need for patch-CMakeLists_txt.
> >>
> >> cc'ing steven@ (maintainer)
> >>
> >> Thoughts, ok?
> >>
> >>
> >> Index: blas/Makefile
> >> ===
> >> RCS file: /cvs/ports/math/blas/Makefile,v
> >> retrieving revision 1.27
> >> diff -u -p -r1.27 Makefile
> >> --- blas/Makefile 13 Nov 2017 06:56:38 - 1.27
> >> +++ blas/Makefile 21 Oct 2018 14:31:16 -
> >> @@ -4,6 +4,7 @@ COMMENT= Basic Linear Algebra Subprogram
> >>
> >> VERSION= 3.7.1
> >> DISTNAME= blas-${VERSION}
> >> +REVISION= 0
> >>
> >> SHARED_LIBS= blas2.1
> >>
> >> Index: blas/files/Makefile
> >> ===
> >> RCS file: /cvs/ports/math/blas/files/Makefile,v
> >> retrieving revision 1.3
> >> diff -u -p -r1.3 Makefile
> >> --- blas/files/Makefile13 Nov 2017 06:56:38 - 1.3
> >> +++ blas/files/Makefile21 Oct 2018 14:31:16 -
> >> @@ -25,6 +25,7 @@ SRCS = caxpy.f ccopy.f cdotc.f cdotu.
> >>zhpmv.f zhpr.f zhpr2.f zrotg.f zscal.f zswap.f zsymm.f \
> >>zsyr2k.f zsyrk.f ztbmv.f ztbsv.f ztpmv.f ztpsv.f ztrmm.f \
> >>ztrmv.f ztrsm.f ztrsv.f xerbla_array.f
> >> +LDADD = -lgfortran
> >>
> >> printsrc:
> >>@echo ${SRCS}
> >
> > How about just linking with gfortran by passing CC to make?
> > (blas diff below, but similar for the other ports)
> > I didn't check if dependent ports are happy with that in terms of
> > WANTLIB etc.
>
> Looks like a better approach, and seems to work for blas at least.
> make port-lib-depends-check says:
>
> blas-3.7.1p0(math/blas):
> Missing: m.10 (/usr/local/lib/libblas.so.2.1) (system lib)
> WANTLIB += m
>
> so blas itself would need a WANTLIB update. ENOTIME to cook another
> diff right now, feel free to beat me to it.
ok for the following?
Index: math/blas/Makefile
===
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- math/blas/Makefile 13 Nov 2017 06:56:38 - 1.27
+++ math/blas/Makefile 23 Oct 2018 14:55:53 -
@@ -4,6 +4,7 @@ COMMENT=Basic Linear Algebra Subprogram
VERSION= 3.7.1
DISTNAME= blas-${VERSION}
+REVISION= 0
SHARED_LIBS= blas2.1
@@ -26,11 +27,13 @@ WRKDIST=${WRKDIR}/${DISTNAME:U}
MODULES= fortran
MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
+WANTLIB= m
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBblas_VERSION:R} \
SHLIB_MINOR=${LIBblas_VERSION:E} \
- FC="${MODFORTRAN_COMPILER} -cpp"
+ FC="${MODFORTRAN_COMPILER} -cpp" \
+ CC=${MODFORTRAN_COMPILER}
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
USE_GROFF= Yes
Index: math/lapack/Makefile
===
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile
--- math/lapack/Makefile13 Nov 2017 06:57:36 - 1.26
+++ math/lapack/Makefile23 Oct 2018 14:55:53 -
@@ -4,6 +4,7 @@ COMMENT=library of Fortran linear algeb
VERSION= 3.7.1
DISTNAME= lapack-${VERSION}
+REVISION= 0
SHARED_LIBS= lapack 6.0
@@ -24,7 +25,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${DISTNAME}
LIB_DEPENDS = math/blas
-WANTLIB = blas>=1
+WANTLIB = blas>=1 m
MODULES= fortran
MODFORTRAN_COMPILER = gfortran
@@ -33,7 +34,8 @@ BUILD_DEPENDS=${MODFORTRAN_BUILD_DEPEND
MAKE_ENV= SHLIB_MAJOR=${LIBlapack_VERSION:R} \
SHLIB_MINOR=${LIBlapack_VERSION:E} \
TIMER=EXT_ETIME \
- FC="${MODFORTRAN_COMPILER} -cpp"
+ FC="$
Re: NEW: math/mlpack (and dependency math/armadillo)
Jeremie Courreges-Anglas [2018-10-21, 17:25:19]:
> On Sun, Oct 21 2018, Marc Espie wrote:
> > Here's a revised version of the armadillo port, adding arpack and hdf5
> > as a dependency.
> >
> > And the missed COMPILER line, oops.
> >
> > Notes:
> > - I definitely prefer to be explicit for CONFIGURE_STYLE
>
> grep says that most ports rely on the cmake module setting up
> CONFIGURE_STYLE. Just sayin'...
>
> > - with arpack added, no need for explicit depends on blas/lapack,
> > as arpack needs them anyway.
>
> Not sure what's the point of trimming the list of deps, especially as
> armadillo explicitely references code from blas, lapack and arpack.
> I don't think it makes maintenance any easier, rather the opposite.
> That said...
>
> I like this updated version, ok jca@
>
> Regarding libgfortran,
>
> > - the library definitely requires linking with the gfortran library
> > because some of lapack blas want symbols in there
>
> Yeah I see. IIUC blas, apack and arpack don't register the dep on
> libgfortran because of a build system quirk (linking is done with with
> cc instead of gfortran). A simple diff like below would register the
> dep on libgfortran, and remove the need for patch-CMakeLists_txt.
>
> cc'ing steven@ (maintainer)
>
> Thoughts, ok?
>
>
> Index: blas/Makefile
> ===
> RCS file: /cvs/ports/math/blas/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- blas/Makefile 13 Nov 2017 06:56:38 - 1.27
> +++ blas/Makefile 21 Oct 2018 14:31:16 -
> @@ -4,6 +4,7 @@ COMMENT= Basic Linear Algebra Subprogram
>
> VERSION= 3.7.1
> DISTNAME=blas-${VERSION}
> +REVISION=0
>
> SHARED_LIBS= blas2.1
>
> Index: blas/files/Makefile
> ===
> RCS file: /cvs/ports/math/blas/files/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- blas/files/Makefile 13 Nov 2017 06:56:38 - 1.3
> +++ blas/files/Makefile 21 Oct 2018 14:31:16 -
> @@ -25,6 +25,7 @@ SRCS = caxpy.f ccopy.f cdotc.f cdotu.
> zhpmv.f zhpr.f zhpr2.f zrotg.f zscal.f zswap.f zsymm.f \
> zsyr2k.f zsyrk.f ztbmv.f ztbsv.f ztpmv.f ztpsv.f ztrmm.f \
> ztrmv.f ztrsm.f ztrsv.f xerbla_array.f
> +LDADD = -lgfortran
>
> printsrc:
> @echo ${SRCS}
How about just linking with gfortran by passing CC to make?
(blas diff below, but similar for the other ports)
I didn't check if dependent ports are happy with that in terms of
WANTLIB etc.
Index: Makefile
===
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- Makefile13 Nov 2017 06:56:38 - 1.27
+++ Makefile21 Oct 2018 21:40:59 -
@@ -4,6 +4,7 @@ COMMENT=Basic Linear Algebra Subprogram
VERSION= 3.7.1
DISTNAME= blas-${VERSION}
+REVISION= 0
SHARED_LIBS= blas2.1
@@ -30,7 +31,8 @@ BUILD_DEPENDS=${MODFORTRAN_BUILD_DEPEND
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBblas_VERSION:R} \
SHLIB_MINOR=${LIBblas_VERSION:E} \
- FC="${MODFORTRAN_COMPILER} -cpp"
+ FC="${MODFORTRAN_COMPILER} -cpp" \
+ CC=${MODFORTRAN_COMPILER}
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
USE_GROFF= Yes
UPDATE: math/octave
this update seems to be working fine on amd64 so far.
please test / comment / ok.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.102
diff -u -p -u -r1.102 Makefile
--- Makefile25 Apr 2018 21:27:06 - 1.102
+++ Makefile15 May 2018 06:45:11 -
@@ -2,13 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.2.2
+VERSION = 4.4.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-SHARED_LIBS += octave 9.0
-SHARED_LIBS += octgui 3.0
-SHARED_LIBS += octinterp 8.0
+SHARED_LIBS += octave 10.0
+SHARED_LIBS += octgui 4.0
+SHARED_LIBS += octinterp 9.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -18,14 +18,14 @@ MAINTAINER =Steven Mestdagh conftest.$ac_ext
/* end confdefs.h. */
-@@ -44822,7 +44822,7 @@ fi
+@@ -66058,7 +66058,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -r1.22 PLIST
--- pkg/PLIST 25 Apr 2018 21:27:06 - 1.22
+++ pkg/PLIST 15 May 2018 06:45:12 -
@@ -68,12 +68,12 @@ include/octave-${VERSION}/octave/base-te
include/octave-${VERSION}/octave/boolMatrix.h
include/octave-${VERSION}/octave/boolNDArray.h
include/octave-${VERSION}/octave/boolSparse.h
+include/octave-${VERSION}/octave/bp-table.h
include/octave-${VERSION}/octave/bsxfun-decl.h
include/octave-${VERSION}/octave/bsxfun-defs.cc
include/octave-${VERSION}/octave/bsxfun.h
include/octave-${VERSION}/octave/build-env.h
include/octave-${VERSION}/octave/builtin-defun-decls.h
-include/octave-${VERSION}/octave/builtins.h
include/octave-${VERSION}/octave/byte-swap.h
include/octave-${VERSION}/octave/c-file-ptr-stream.h
include/octave-${VERSION}/octave/call-stack.h
@@ -86,7 +86,6 @@ include/octave-${VERSION}/octave/chol.h
include/octave-${VERSION}/octave/cmd-edit.h
include/octave-${VERSION}/octave/cmd-hist.h
include/octave-${VERSION}/octave/comment-list.h
-include/octave-${VERSION}/octave/config.h
include/octave-${VERSION}/octave/dColVector.h
include/octave-${VERSION}/octave/dDiagMatrix.h
include/octave-${VERSION}/octave/dMatrix.h
@@ -95,7 +94,6 @@ include/octave-${VERSION}/octave/dRowVec
include/octave-${VERSION}/octave/dSparse.h
include/octave-${VERSION}/octave/data-conv.h
include/octave-${VERSION}/octave/data.h
-include/octave-${VERSION}/octave/debug.h
include/octave-${VERSION}/octave/defaults.h
include/octave-${VERSION}/octave/defun-dld.h
include/octave-${VERSION}/octave/defun-int.h
@@ -106,6 +104,7 @@ include/octave-${VERSION}/octave/dirfns.
include/octave-${VERSION}/octave/display.h
include/octave-${VERSION}/octave/dynamic-ld.h
include/octave-${VERSION}/octave/eigs-base.h
+include/octave-${VERSION}/octave/environment.h
include/octave-${VERSION}/octave/error.h
include/octave-${VERSION}/octave/errwarn.h
include/octave-${VERSION}/octave/event-queue.h
@@ -121,6 +120,8 @@ include/octave-${VERSION}/octave/fEIG.h
include/octave-${VERSION}/octave/fMatrix.h
include/octave-${VERSION}/octave/fNDArray.h
include/octave-${VERSION}/octave/fRowVector.h
+include/octave-${VERSION}/octave/fcn-info.h
+include/octave-${VERSION}/octave/file-info.h
include/octave-${VERSION}/octave/file-io.h
include/octave-${VERSION}/octave/file-ops.h
include/octave-${VERSION}/octave/file-stat.h
@@ -130,9 +131,13 @@ include/octave-${VERSION}/octave/gepbala
include/octave-${VERSION}/octave/gl-render.h
include/octave-${VERSION}/octave/gl2ps-print.h
include/octave-${VERSION}/octave/glob-match.h
+include/octave-${VERSION}/octave/graphics-handle.h
include/octave-${VERSION}/octave/graphics-props.cc
+include/octave-${VERSION}/octave/graphics-toolkit.h
include/octave-${VERSION}/octave/graphics.h
include/octave-${VERSION}/octave/gripes.h
+include/octave-${VERSION}/octave/gsvd.h
+include/octave-${VERSION}/octave/gtk-manager.h
include/octave-${VERSION}/octave/help.h
include/octave-${VERSION}/octave/hess.h
include/octave-${VERSION}/octave/hook-fcn.h
@@ -162,15 +167,14 @@ include/octave-${VERSION}/octave/lo-fftp
include/octave-${VERSION}/octave/lo-hash.h
include/octave-${VERSION}/octave/lo-ieee.h
include/octave-${VERSION}/octave/lo-lapack-proto.h
-include/octave-${VERSION}/octave/lo-macros.h
include/octave-${VERSION}/octave/lo-mappers.h
-include/octave-${VERSION}/octave/lo-math.h
include/octave-${VERSION}/octave/lo-qrupdate-proto.h
include/octave-${VERSION}/octave/lo-ranlib-proto.h
include/octave-${VERSION}/octave/lo-regexp.h
include/octave-${VERSION}/octave/lo-slatec-
UPDATE: math/octave
please test/comment/ok this update for octave.
it seems to work fine on amd64.
note that I've just committed a change to qrupdate that prevents octave
from linking in the g2c library and crashing on some computations.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.101
diff -u -p -u -r1.101 Makefile
--- Makefile28 Feb 2018 19:23:56 - 1.101
+++ Makefile31 Mar 2018 06:44:49 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.2.1
+VERSION = 4.2.2
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math
-SHARED_LIBS += octave 8.0
-SHARED_LIBS += octgui 2.0
-SHARED_LIBS += octinterp 7.0
+SHARED_LIBS += octave 9.0
+SHARED_LIBS += octgui 3.0
+SHARED_LIBS += octinterp 8.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama X
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
-WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
+WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo3 Nov 2017 12:28:53 - 1.18
+++ distinfo31 Mar 2018 06:44:49 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
-SIZE (octave-4.2.1.tar.gz) = 25409651
+SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
+SIZE (octave-4.2.2.tar.gz) = 25624087
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-configure
--- patches/patch-configure 3 Nov 2017 12:28:53 - 1.10
+++ patches/patch-configure 31 Mar 2018 06:44:49 -
@@ -5,16 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
- ;;
- 5)
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
- ;;
- *)
- as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
-@@ -44617,13 +44617,13 @@ fi
+@@ -44777,13 +44777,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -31,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -44662,7 +44662,7 @@ fi
+@@ -44822,7 +44822,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-liboctave_system_file-stat_cc
===
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- patches/patch-liboctave_system_file-stat_cc 3 Nov 2017 12:28:53 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53 steven
Exp $
-
-Index: liboctave/system/file-stat.cc
liboctave/system/file-stat.cc.orig
-+++ liboctave/system/file-stat.cc
-@@ -174,7 +174,7 @@ namespace octave
- update_internal ();
- }
-
--inline file_stat::~file_stat () { }
-+file_stat::~file_stat () { }
-
- void
- file_stat::update_internal (bool force)
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- pkg/PLIST 3 Nov 2017 12:28:53 - 1.21
+++ pkg/PLIST 31 Mar 2018 06:44:50 -
@@ -940,6 +940,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t1.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t2.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t3.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/struct_wrapper.m
share/octave/${VERSION}/etc/tests/fixed/classes/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/
UPDATE: security/zaproxy
this updates zaproxy to the 2.7.0 version. seems to be fine on amd64.
comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/security/zaproxy/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile29 Oct 2017 06:03:08 - 1.4
+++ Makefile4 Feb 2018 21:25:20 -
@@ -2,7 +2,7 @@
COMMENT = web application security tool
-VERSION = 2.6.0
+VERSION = 2.7.0
DISTNAME = ZAP_${VERSION}_Linux
PKGNAME = zaproxy-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/security/zaproxy/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo29 Oct 2017 06:03:08 - 1.3
+++ distinfo4 Feb 2018 21:25:20 -
@@ -1,2 +1,2 @@
-SHA256 (ZAP_2.6.0_Linux.tar.gz) = QorDBv5Yfy7l8SjS1RKdnNlH/s/hQlc2OkwKAVErMUQ=
-SIZE (ZAP_2.6.0_Linux.tar.gz) = 174350914
+SHA256 (ZAP_2.7.0_Linux.tar.gz) = t0HDwhBoh/HQQJblO+Nf7XErt6heGYYVIyg7t23vtZ0=
+SIZE (ZAP_2.7.0_Linux.tar.gz) = 130903023
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 29 Oct 2017 06:03:08 - 1.3
+++ pkg/PLIST 4 Feb 2018 21:25:20 -
@@ -22,6 +22,7 @@ share/zaproxy/lang/Messages_es_ES.proper
share/zaproxy/lang/Messages_fa_IR.properties
share/zaproxy/lang/Messages_fil_PH.properties
share/zaproxy/lang/Messages_fr_FR.properties
+share/zaproxy/lang/Messages_he_IL.properties
share/zaproxy/lang/Messages_hi_IN.properties
share/zaproxy/lang/Messages_hr_HR.properties
share/zaproxy/lang/Messages_hu_HU.properties
@@ -60,6 +61,7 @@ share/zaproxy/lang/vulnerabilities_es_ES
share/zaproxy/lang/vulnerabilities_fa_IR.xml
share/zaproxy/lang/vulnerabilities_fil_PH.xml
share/zaproxy/lang/vulnerabilities_fr_FR.xml
+share/zaproxy/lang/vulnerabilities_he_IL.xml
share/zaproxy/lang/vulnerabilities_hi_IN.xml
share/zaproxy/lang/vulnerabilities_hr_HR.xml
share/zaproxy/lang/vulnerabilities_hu_HU.xml
@@ -126,6 +128,7 @@ share/zaproxy/lib/xom-1.2.10.jar
share/zaproxy/license/
share/zaproxy/license/ApacheLicense-2.0.txt
share/zaproxy/license/COPYING
+share/zaproxy/license/OFL.txt
share/zaproxy/license/RSyntaxTextArea.License.txt
share/zaproxy/license/TheClarifiedArtisticLicense.htm
share/zaproxy/license/TheClarifiedArtisticLicense.rtf
@@ -135,32 +138,32 @@ share/zaproxy/license/hypersonic_lic.txt
share/zaproxy/license/lgpl-3.0.txt
share/zaproxy/plugin/
share/zaproxy/plugin/Readme.txt
-share/zaproxy/plugin/alertFilters-beta-4.zap
-share/zaproxy/plugin/ascanrules-release-26.zap
-share/zaproxy/plugin/bruteforce-beta-6.zap
-share/zaproxy/plugin/coreLang-release-11.zap
-share/zaproxy/plugin/diff-beta-7.zap
+share/zaproxy/plugin/alertFilters-beta-6.zap
+share/zaproxy/plugin/ascanrules-release-28.zap
+share/zaproxy/plugin/bruteforce-beta-7.zap
+share/zaproxy/plugin/coreLang-release-12.zap
+share/zaproxy/plugin/diff-beta-8.zap
share/zaproxy/plugin/directorylistv1-release-3.zap
-share/zaproxy/plugin/fuzz-beta-8.zap
-share/zaproxy/plugin/gettingStarted-release-6.zap
-share/zaproxy/plugin/help-release-7.zap
-share/zaproxy/plugin/invoke-beta-6.zap
-share/zaproxy/plugin/jxbrowser-alpha-2.zap
-share/zaproxy/plugin/jxbrowserlinux32-alpha-1.zap
-share/zaproxy/plugin/jxbrowserlinux64-alpha-1.zap
-share/zaproxy/plugin/onlineMenu-release-5.zap
-share/zaproxy/plugin/pscanrules-release-19.zap
-share/zaproxy/plugin/quickstart-release-19.zap
-share/zaproxy/plugin/replacer-beta-2.zap
+share/zaproxy/plugin/fuzz-beta-10.zap
+share/zaproxy/plugin/gettingStarted-release-8.zap
+share/zaproxy/plugin/help-release-8.zap
+share/zaproxy/plugin/importurls-beta-5.zap
+share/zaproxy/plugin/invoke-beta-8.zap
+share/zaproxy/plugin/jxbrowser-alpha-7.zap
+share/zaproxy/plugin/jxbrowserlinux64-alpha-5.zap
+share/zaproxy/plugin/onlineMenu-release-6.zap
+share/zaproxy/plugin/pscanrules-release-21.zap
+share/zaproxy/plugin/quickstart-release-22.zap
+share/zaproxy/plugin/replacer-beta-4.zap
share/zaproxy/plugin/reveal-release-2.zap
-share/zaproxy/plugin/saverawmessage-release-3.zap
-share/zaproxy/plugin/scripts-beta-18.zap
-share/zaproxy/plugin/selenium-release-10.zap
-share/zaproxy/plugin/spiderAjax-release-17.zap
+share/zaproxy/plugin/saverawmessage-release-4.zap
+share/zaproxy/plugin/scripts-beta-22.zap
+share/zaproxy/plugin/selenium-release-13.zap
+share/zaproxy/plugin/spiderAjax-release-20.zap
share/zaproxy/plugin/tips-beta-6.zap
-share/zaproxy/plugin/webdriverlinux-beta-2.zap
-share/zaproxy/plugin/websocket-release-12.zap
-share/zaproxy/plugin/zest-beta-23.zap
+share/zaproxy/plugin/webdriverlinux-beta-4.zap
+share/zaproxy/plugin/websocket-release-14.zap
+share/zaproxy/plugin/zest-beta-26.zap
share/zaproxy/scripts/
share/zaproxy/scripts/templates/
share/zaproxy/scripts/templates/active/
@@ -185,
Re: syslog-ng running but not writing logs
chrisb [2017-11-29, 08:41:25]:
> Hello forum members,
>
> Having spent a couple of weeks on this problem I thought someone might be
> able to help getting syslog-ng 3.9.1 to write log files on OpenBSD 6.2. This
> really is a pain in the back-side.
>
> The O/S was a fresh install, then syslog-ng and lastly BIND. No other
> packages except syslog-ng and BIND dependencies have been installed.
>
> The .conf file was copied over from an older OpenBSD system, also running an
> older WORKING syslog-ng (3.1.1). The required changes to the .conf were made
> so that syslog-ng 3.9.1 with supervisor starts and remains running. By
> killing the syslog-ng process I was able to test that the supervisor process
> restarts syslog-ng. The rc.d script starts, stops and restarts syslog-ng as
> expected. /usr/local/sbin/syslog-ng -s returns no errors, indicating that
> the config file is at least sane.
>
> In /var/log the only thing it writes are syslog-ng start/stop messages. In
> an effort to localise the problem, a stub syslog-ng.conf was created with
> the following contents:
>
>
> @version: 3.9.1
> source s_local {
> unix-dgram("/dev/log");
> };
> #
> destination catchall { file(/var/log/catchall); };
> log { source(s_local); destination(catchall); };
>
>
> The permissions and ownership on /var, /var/log, /var/run, and /etc are
> correct according to the OBSD /etc/mtree/special file. Syslog-ng starts,
> retaining root permissions (default) and creates /dev/log if it does not
> exist. The syslog_ng_flags I use are:
>
>
> "-R /var/run/syslog-ng.persist -c /var/run/syslog-ng.ctl -p
> /var/run/syslog-ng.pid"
>
>
> Have tried running without any flags to see if that would help, but did not
> help.
> The output of syslog-ng -V is:
>
>
> syslog-ng 3.9.1
> Installer-Version: 3.9.1
> Revision:
> Module-Directory: /usr/local/lib/syslog-ng
> Module-Path: /usr/local/lib/syslog-ng
> Available-Modules:
> affile,afprog,afsocket,afsql,afuser,basicfuncs,cef,confgen,cryptofuncs,csvparser,curl,date,dbparser,disk-buffer,geoip-plugin,graphite,kvformat,linux-kmsg-format,pseudofile,system-source,add-contextual-data,json-plugin,syslogformat
> Enable-Debug: off
> Enable-GProf: off
> Enable-Memtrace: off
> Enable-IPv6: on
> Enable-Spoof-Source: off
> Enable-TCP-Wrapper: off
> Enable-Linux-Caps: off
>
>
> On my hunt I found a message on NARKIVE where a user was having the same
> problem with syslog-ng 3.6 on OpenBSD 5.9, there was no solution. There was
> a reply saying: "With the changes in 5.6 using sendsyslog(2), only syslogd
> picks up local syslog.". Setting up a few OBSD VMs later than 5.5 from
> scratch and installing syslog-ng, I still get the same problem/symptoms.
Indeed syslog-ng does not capture local syslog messages since sendsyslog(2)
was introduced.
I suggest you read this thread
https://marc.info/?t=14217571423
Re: gcc fix libgfortran.la
Steven Mestdagh [2017-11-10, 20:56:51]:
> Marc Espie [2017-11-09, 00:40:28]:
> > Can you have a look at a not so quick fix ? I mean such a bogus thing
> > is generated from somewhere in the port.
> >
>
> comparing to what the more recent gnu libtool port is doing, i suggest the
> fix below. this has the same effect of stripping the single quotes around
> libdir's value for use in dependency_libs.
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> retrieving revision 1.51
> diff -u -p -u -r1.51 Makefile
> --- Makefile 21 Aug 2017 19:25:52 - 1.51
> +++ Makefile 10 Nov 2017 19:13:26 -
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
> DPB_PROPERTIES = parallel
>
> V = 4.9.4
> -REVISION = 6
> +REVISION = 7
> FULL_VERSION = $V
> FULL_PKGVERSION = $V
>
> Index: patches/patch-ltmain_sh
> ===
> RCS file: patches/patch-ltmain_sh
> diff -N patches/patch-ltmain_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-ltmain_sh 10 Nov 2017 19:13:26 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: ltmain.sh
> +--- ltmain.sh.orig
> ltmain.sh
> +@@ -8268,7 +8268,7 @@ EOF
> + *.la)
> + func_basename "$deplib"
> + name="$func_basename_result"
> +-libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
> ++eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
> + test -z "$libdir" && \
> + func_fatal_error "\`$deplib' is not a valid libtool archive"
> + newdependency_libs="$newdependency_libs $libdir/$name"
I'm going to commit this if no one objects.
I have various updates pending that need libgfortran.la to be correct.
Re: [NEW] sysutils/xbattmon
Klemens Nanni [2017-11-11, 17:02:53]: > Hey, > > xbattmon is a simple battery monitor for X pretty similiar to > sysutils/xbattbar but actively maintained. > > It draws a colorized bar on the edge of your screen, that blinks on > critical battery level. > > Upstream ships our strtonum.c for all platforms but I patched it to use > our libc's one. > > Feedback? Anyone willing to commit this? The patch for config.bsd.mk is not needed, you can just use MAKE_FLAGS. I've adapted this port accordingly, see attached. Works fine here too. Anyone else want to ok it? xbattmon.tgz Description: application/tar-gz
Re: Explicitly disable OpenMP, categories archivers-converters
Brian Callahan [2017-11-12, 11:26:01]: > Hi ports -- > > In preparation for importing devel/openmp, I have (at sthen@'s suggestion) > been doing a careful review of the ports tree to figure out which ports will > try to pull in OpenMP if it exists on the system. > > I'm nowhere near done, but I have looked at everything in the categories > archivers through converters, and only two ports as far as I can tell will > try to pull in OpenMP (according to configure output and build logs). > > I'm choosing to explicitly disable OpenMP for all these ports, as that makes > the most sense to me and will produce the least surprises. Once devel/openmp > is imported and people want to enable openmp on other ports, that to me is a > separate discussion for later. > > Feedback/OK? That approach makes sense to me.
remove textproc/gnuvd?
The software gnuvd looks unmaintained since 5 years. It's a CLI tool to query an online dictionary, and no longer works. Ok to remove it?
Re: gcc fix libgfortran.la
Marc Espie [2017-11-09, 00:40:28]:
> On Wed, Nov 08, 2017 at 07:38:37PM +0100, Steven Mestdagh wrote:
> > hi,
> >
> > As I mentioned previously, there is a quoting issue in libgfortran.la:
> > dependency_libs=' '/usr/local/lib'/libquadmath.la -lm'
> > should be:
> > dependency_libs='/usr/local/lib/libquadmath.la -lm'
> >
> > We would need this to be correct to link with libgfortran via libtool.
> > This diff is a quick fix for libgfortran.la. OK?
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> > retrieving revision 1.51
> > diff -u -p -u -r1.51 Makefile
> > --- Makefile21 Aug 2017 19:25:52 - 1.51
> > +++ Makefile8 Nov 2017 18:36:06 -
> > @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
> > DPB_PROPERTIES = parallel
> >
> > V = 4.9.4
> > -REVISION = 6
> > +REVISION = 7
> > FULL_VERSION = $V
> > FULL_PKGVERSION = $V
> >
> > @@ -247,6 +247,7 @@ post-install:
> > chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
> > .endif
> > .if ${BUILD_PACKAGES:M-f95}
> > + perl -pi -e "if (/^dependency_libs/) {
> > s,'${TRUEPREFIX}/lib',${TRUEPREFIX}/lib,; }" ${PREFIX}/lib/libgfortran.la
> > ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
> > ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran
> > ${PREFIX}/bin/${CONFIG}-gfortran
> > .endif
>
> Can you have a look at a not so quick fix ? I mean such a bogus thing
> is generated from somewhere in the port.
>
comparing to what the more recent gnu libtool port is doing, i suggest the
fix below. this has the same effect of stripping the single quotes around
libdir's value for use in dependency_libs.
ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.51
diff -u -p -u -r1.51 Makefile
--- Makefile21 Aug 2017 19:25:52 - 1.51
+++ Makefile10 Nov 2017 19:13:26 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
DPB_PROPERTIES = parallel
V = 4.9.4
-REVISION = 6
+REVISION = 7
FULL_VERSION = $V
FULL_PKGVERSION = $V
Index: patches/patch-ltmain_sh
===
RCS file: patches/patch-ltmain_sh
diff -N patches/patch-ltmain_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-ltmain_sh 10 Nov 2017 19:13:26 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: ltmain.sh
+--- ltmain.sh.orig
ltmain.sh
+@@ -8268,7 +8268,7 @@ EOF
+ *.la)
+ func_basename "$deplib"
+ name="$func_basename_result"
+- libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ newdependency_libs="$newdependency_libs $libdir/$name"
gcc fix libgfortran.la
hi,
As I mentioned previously, there is a quoting issue in libgfortran.la:
dependency_libs=' '/usr/local/lib'/libquadmath.la -lm'
should be:
dependency_libs='/usr/local/lib/libquadmath.la -lm'
We would need this to be correct to link with libgfortran via libtool.
This diff is a quick fix for libgfortran.la. OK?
Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.51
diff -u -p -u -r1.51 Makefile
--- Makefile21 Aug 2017 19:25:52 - 1.51
+++ Makefile8 Nov 2017 18:36:06 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
DPB_PROPERTIES = parallel
V = 4.9.4
-REVISION = 6
+REVISION = 7
FULL_VERSION = $V
FULL_PKGVERSION = $V
@@ -247,6 +247,7 @@ post-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
.endif
.if ${BUILD_PACKAGES:M-f95}
+ perl -pi -e "if (/^dependency_libs/) {
s,'${TRUEPREFIX}/lib',${TRUEPREFIX}/lib,; }" ${PREFIX}/lib/libgfortran.la
ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran
${PREFIX}/bin/${CONFIG}-gfortran
.endif
Re: [UPDATE] math/lapack
Steven Mestdagh [2017-11-06, 07:47:09]:
> Paul Irofti [2017-11-06, 01:27:51]:
> > > Index: math/octave/Makefile
> > > ===
> > > RCS file: /cvs/ports/math/octave/Makefile,v
> > > retrieving revision 1.98
> > > diff -u -p -u -r1.98 Makefile
> > > --- math/octave/Makefile 3 Nov 2017 12:28:53 - 1.98
> > > +++ math/octave/Makefile 4 Nov 2017 21:54:46 -
> > > @@ -4,6 +4,7 @@ COMMENT = high-level language for numeri
> > >
> > > VERSION =4.2.1
> > > DISTNAME = octave-${VERSION}
> > > +REVISION = 0
> > > CATEGORIES = math
> > >
> > > SHARED_LIBS += octave 8.0
> > > @@ -44,6 +45,8 @@ BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPEN
> > > textproc/gsed \
> > > math/gnuplot
> > >
> > > +MODFORTRAN_COMPILER =gfortran
> > > +
> > > # configure checks for desktop-file-install(1)
> > > BUILD_DEPENDS +=devel/desktop-file-utils
> > >
> > > @@ -78,8 +81,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
> > > -I${LOCALBASE}/include/ereadline" \
> > > LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> > > LRELEASE="${MODQT_LRELEASE}" \
> > > - F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> > > -
> > > + CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> > >
> > > # needed to build on amd64
> > > GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
> >
> > Perhaps I did something wrong, but I get this error when compiling
> > octave with the above. That libquadmath path looks weird.
> >
> > /usr/bin/libtool --tag=CXX --mode=link c++ -fPIC -pthread -Wall -W
> > -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align
> > -Wcast-qual -O2 -pipe -std=gnu++11 -version-info 4:0:0 -no-undefined
> > -bindir /usr/local/bin -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib
> > -L/usr/X11R6/lib -o liboctave/liboctave.la -rpath
> > /usr/local/lib/octave/4.2.1
> > liboctave/liboctave_liboctave_la-liboctave-build-info.lo
> > liboctave/array/libarray.la liboctave/cruft/ranlib/libranlib.la
> > liboctave/cruft/libcruft.la liboctave/numeric/libnumeric.la
> > liboctave/operators/liboperators.la liboctave/system/libsystem.la
> > liboctave/util/libutil.la liboctave/wrappers/libwrappers.la
> > libgnu/libgnu.la -lcurl -lcholmod -lumfpack -lamd -lcamd -lcolamd -lccolamd
> > -lcxsparse -lsuitesparseconfig -larpack -lqrupdate -lfftw3_threads -lfftw3
> > -lfftw3f_threads -lfftw3f -llapack -lblas -lereadline -lncurses
> > -L/usr/local/lib -Wl,-R/usr/local/lib -lpcre-L/usr/local/lib
> > -L/usr/X11R6/lib -L/usr/ports/pobj/octave-4.2.1/bin
> > -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.2/4.9.4
> > -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.2/4.9.4/../../.. -lgfortran
> > -lm -lquadmath -lutil -lm -lutil -lm
> > Cannot read '/usr/local/lib'/libquadmath.la: No such file or directory
>
> yes, I forgot to mention, there is a quoting issue in
> /usr/local/lib/libgfortran.la
>
> either the gcc port or libtool needs a fix, haven't looked into that yet.
so, gcc is using its own bundled libtool.
in libgfortran.la, there is
dependency_libs=' '/usr/local/lib'/libquadmath.la -lm'
which should be:
dependency_libs='/usr/local/lib/libquadmath.la -lm'
i have no idea where that's coming from. a quick fix would be to just do
a substitution on the file before installing it. any thoughts?
Re: Remove net/pidgin-tlen?
Frederic Cambus [2017-11-06, 18:47:12]: > Hi ports@, > > The Tlen.pl server has been shut down on 10 May 2016 [1], so there is > no use case for this plugin anymore. > > [1] https://en.wikipedia.org/wiki/Tlen.pl > > Comments? OK to remove? ok with me.
Re: [UPDATE] libxml
Jeremie Courreges-Anglas [2017-11-04, 22:22:47]:
> On Fri, Nov 03 2017, Steven Mestdagh wrote:
> > could someone put this in a bulk build?
>
> The update looks good to me, the installed headers don't change much.
>
> One (small) problem though: the "compute_minrun" function isn't exported
> any more, thus you should bump the lib major version. It would probably
> be safe to cheat and omit the bump, since compute_minrun shouldn't have
> been exported in the first place, but I don't think it's worth it here.
indeed, it's safer.
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.171
diff -u -p -u -r1.171 Makefile
--- Makefile14 Sep 2017 14:56:41 - 1.171
+++ Makefile6 Nov 2017 08:25:59 -
@@ -3,11 +3,11 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.5
+VERSION= 2.9.7
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py-libxml-${VERSION}
-SHARED_LIBS += xml2 15.2 # 11.4
+SHARED_LIBS += xml2 16.0 # 11.4
CATEGORIES=textproc
MASTER_SITES= http://gd.tuwien.ac.at/pub/libxml/ \
ftp://xmlsoft.org/libxml/
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.53
diff -u -p -u -r1.53 distinfo
--- distinfo14 Sep 2017 14:56:41 - 1.53
+++ distinfo6 Nov 2017 08:25:59 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.5.tar.gz) = QDHB7O6c57pPMT6R72KEFkiFzbaZN6Ej9qg7tqctzTg=
-SIZE (libxml2-2.9.5.tar.gz) = 5466888
+SHA256 (libxml2-2.9.7.tar.gz) = 9jxefTA2LtKLOL+hrGMT+agCMHILf7bIBXXuqz/1kAw=
+SIZE (libxml2-2.9.7.tar.gz) = 5467389
Index: patches/patch-timsort_h
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-timsort_h,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-timsort_h
--- patches/patch-timsort_h 25 Sep 2013 12:32:24 - 1.4
+++ patches/patch-timsort_h 6 Nov 2017 08:25:59 -
@@ -1,12 +1,13 @@
-$OpenBSD: patch-timsort_h,v 1.4 2013/09/25 12:32:24 jasper Exp $
timsort.h.orig Tue Sep 24 10:50:59 2013
-+++ timsort.h Tue Sep 24 10:51:40 2013
-@@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
- int compute_minrun(uint64_t);
+$OpenBSD: patch-timsort_h,v 1.3 2013/08/19 16:00:10 miod Exp $
+Index: timsort.h
+--- timsort.h.orig
timsort.h
+@@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t;
+ static int compute_minrun(const uint64_t);
#ifndef CLZ
--#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__
> 3))
-+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=
4))
+-#ifdef __GNUC__
++#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__
>= 4))
#define CLZ __builtin_clzll
#else
Index: patches/patch-xmllint_c
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-xmllint_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-xmllint_c
--- patches/patch-xmllint_c 5 Jul 2007 16:05:09 - 1.4
+++ patches/patch-xmllint_c 6 Nov 2017 08:25:59 -
@@ -1,7 +1,8 @@
-$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $
xmllint.c.orig Tue Apr 17 14:28:16 2007
-+++ xmllint.c Mon Jul 2 12:50:32 2007
-@@ -103,7 +103,7 @@
+$OpenBSD: patch-xmllint_c,v 1.3 2006/03/20 13:36:54 steven Exp $
+Index: xmllint.c
+--- xmllint.c.orig
xmllint.c
+@@ -87,7 +87,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
Re: [UPDATE] math/lapack
Paul Irofti [2017-11-06, 01:27:51]:
> > Index: math/octave/Makefile
> > ===
> > RCS file: /cvs/ports/math/octave/Makefile,v
> > retrieving revision 1.98
> > diff -u -p -u -r1.98 Makefile
> > --- math/octave/Makefile3 Nov 2017 12:28:53 - 1.98
> > +++ math/octave/Makefile4 Nov 2017 21:54:46 -
> > @@ -4,6 +4,7 @@ COMMENT = high-level language for numeri
> >
> > VERSION = 4.2.1
> > DISTNAME = octave-${VERSION}
> > +REVISION = 0
> > CATEGORIES = math
> >
> > SHARED_LIBS += octave 8.0
> > @@ -44,6 +45,8 @@ BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPEN
> > textproc/gsed \
> > math/gnuplot
> >
> > +MODFORTRAN_COMPILER = gfortran
> > +
> > # configure checks for desktop-file-install(1)
> > BUILD_DEPENDS +=devel/desktop-file-utils
> >
> > @@ -78,8 +81,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
> > -I${LOCALBASE}/include/ereadline" \
> > LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> > LRELEASE="${MODQT_LRELEASE}" \
> > - F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> > -
> > + CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> >
> > # needed to build on amd64
> > GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
>
> Perhaps I did something wrong, but I get this error when compiling
> octave with the above. That libquadmath path looks weird.
>
> /usr/bin/libtool --tag=CXX --mode=link c++ -fPIC -pthread -Wall -W
> -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align
> -Wcast-qual -O2 -pipe -std=gnu++11 -version-info 4:0:0 -no-undefined
> -bindir /usr/local/bin -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib
> -L/usr/X11R6/lib -o liboctave/liboctave.la -rpath /usr/local/lib/octave/4.2.1
> liboctave/liboctave_liboctave_la-liboctave-build-info.lo
> liboctave/array/libarray.la liboctave/cruft/ranlib/libranlib.la
> liboctave/cruft/libcruft.la liboctave/numeric/libnumeric.la
> liboctave/operators/liboperators.la liboctave/system/libsystem.la
> liboctave/util/libutil.la liboctave/wrappers/libwrappers.la libgnu/libgnu.la
> -lcurl -lcholmod -lumfpack -lamd -lcamd -lcolamd -lccolamd -lcxsparse
> -lsuitesparseconfig -larpack -lqrupdate -lfftw3_threads -lfftw3
> -lfftw3f_threads -lfftw3f -llapack -lblas -lereadline -lncurses
> -L/usr/local/lib -Wl,-R/usr/local/lib -lpcre-L/usr/local/lib
> -L/usr/X11R6/lib -L/usr/ports/pobj/octave-4.2.1/bin
> -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.2/4.9.4
> -L/usr/local/lib/gcc/x86_64-unknown-openbsd6.2/4.9.4/../../.. -lgfortran -lm
> -lquadmath -lutil -lm -lutil -lm
> Cannot read '/usr/local/lib'/libquadmath.la: No such file or directory
yes, I forgot to mention, there is a quoting issue in
/usr/local/lib/libgfortran.la
either the gcc port or libtool needs a fix, haven't looked into that yet.
Re: [UPDATE] math/cblas
Paul Irofti [2017-11-05, 20:20:23]: > On Sat, Nov 04, 2017 at 05:15:08PM +0100, Steven Mestdagh wrote: > > update after blas update, a rerolled distfile, and also use gfortran. > > I can't get this to build. Using dpb with blas, cblas and lapack > patches. Am I missing something? I moved those 2 man pages from lapack to blas. So there is a conflict but only between new blas and old lapack (and vice versa). Not sure if pkg_add can handle this, like upgrade both at the same time? Anyway if you remove the packages first then it should work. > > > >>> Building on localhost under math/cblas >BDEPENDS = > [math/blas;lang/gcc/4.9;lang/gcc/4.9,-f95;lang/gcc/4.9,-libs] >DIST = [math/cblas:cblas-1.0/cblas.tgz] >FULLPKGNAME = cblas-1.0p4 >RDEPENDS = [lang/gcc/4.9,-libs;math/blas] > (Junk lock failure for localhost at 1509905768) > Received IO > (Junk lock obtained for localhost at 1509905775) > Woken up math/cblas > >>> Running depends in math/cblas at 1509905775 > /usr/sbin/pkg_add -aI -Dunsigned -Drepair blas-3.7.1 > was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair blas-3.7.1 g95-4.9.4p6 > gcc-4.9.4p6 gcc-libs-4.9.4p6 > /usr/sbin/pkg_add -aI -Dunsigned -Drepair blas-3.7.1 > Collision in blas-1.0p8->3.7.1: the following files already exist > /usr/local/man/cat3f/lsame.0 (lapack-3.1.1p5 and blas-3.7.1) > /usr/local/man/cat3f/xerbla.0 (lapack-3.1.1p5 and blas-3.7.1) > Couldn't find updates for blas-1.0p8 > >>> Running show-prepare-results in math/cblas at 1509905784 > ===> math/cblas > ===> cblas-1.0p4 depends on: g95->=4.9.4p0,<4.10 -> g95-4.9.4p6 > ===> cblas-1.0p4 depends on: gcc->=4.9,<4.10 -> gcc-4.9.4p6 > ===> cblas-1.0p4 depends on: g95->=4.9,<4.10 -> g95-4.9.4p6 > ===> cblas-1.0p4 depends on: blas-* -> blas-1.0p8 > ===> cblas-1.0p4 depends on: gcc-libs->=4.9,<4.10 -> gcc-libs-4.9.4p6 > ===> Verifying specs: blas>=2.1 gfortran>=3 quadmath > Missing library for blas>=2.1 > Fatal error > *** Error 1 in /usr/ports/math/cblas > (/usr/ports/infrastructure/mk/bsd.port.mk:2182 > '/usr/ports/pobj/cblas-1.0/.buildwantlibs') > *** Error 1 in /usr/ports/math/cblas > (/usr/ports/infrastructure/mk/bsd.port.mk:2425 'prepare') > ===> Exiting math/cblas with an error > *** Error 1 in /home/bulibuta/wrk/obsd/src/ports > (/usr/ports/infrastructure/mk/bsd.port.subdir.mk:147 'show-prepare-results') > (Junk lock released for localhost at 1509905785) > Error: job failed with 256 on localhost
Re: [UPDATE] math/lapack
Steven Mestdagh [2017-11-04, 18:55:19]:
> long overdue update, and switch to gfortran. ok?
> working on ports that depend on it.
this should take care of dependent ports, and switches them to gfortran.
Index: math/arpack/Makefile
===
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- math/arpack/Makefile16 Mar 2015 18:07:49 - 1.15
+++ math/arpack/Makefile4 Nov 2017 21:54:46 -
@@ -4,7 +4,7 @@ COMMENT=solve large scale eigenvalue pr
DISTNAME= arpack96
PKGNAME= arpack-96
-REVISION= 4
+REVISION= 5
SHARED_LIBS= arpack 1.0
CATEGORIES=math
@@ -18,7 +18,7 @@ DISTFILES=${DISTNAME}.tar.gz patch.tar.
DIST_SUBDIR= arpack
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS = math/lapack \
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIST}/SRC
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBarpack_VERSION:R} \
SHLIB_MINOR=${LIBarpack_VERSION:E} \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
post-extract:
Index: math/arpack/patches/patch-SRC_second_f
===
RCS file: math/arpack/patches/patch-SRC_second_f
diff -N math/arpack/patches/patch-SRC_second_f
--- /dev/null 1 Jan 1970 00:00:00 -
+++ math/arpack/patches/patch-SRC_second_f 4 Nov 2017 21:54:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: SRC/second.f
+--- SRC/second.f.orig
SRC/second.f
+@@ -21,7 +21,7 @@
+ * ..
+ * .. External Functions ..
+ REAL ETIME
+- EXTERNAL ETIME
++* EXTERNAL ETIME
+ * ..
+ * .. Executable Statements ..
+ *
Index: math/octave/Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.98
diff -u -p -u -r1.98 Makefile
--- math/octave/Makefile3 Nov 2017 12:28:53 - 1.98
+++ math/octave/Makefile4 Nov 2017 21:54:46 -
@@ -4,6 +4,7 @@ COMMENT = high-level language for numeri
VERSION = 4.2.1
DISTNAME = octave-${VERSION}
+REVISION = 0
CATEGORIES = math
SHARED_LIBS += octave 8.0
@@ -44,6 +45,8 @@ BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPEN
textproc/gsed \
math/gnuplot
+MODFORTRAN_COMPILER = gfortran
+
# configure checks for desktop-file-install(1)
BUILD_DEPENDS +=devel/desktop-file-utils
@@ -78,8 +81,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
-I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LRELEASE="${MODQT_LRELEASE}" \
- F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
-
+ CXXFLAGS="${CXXFLAGS} -std=gnu++11"
# needed to build on amd64
GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
Index: math/py-numpy/Makefile
===
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.46
diff -u -p -u -r1.46 Makefile
--- math/py-numpy/Makefile 3 Jan 2017 19:23:48 - 1.46
+++ math/py-numpy/Makefile 4 Nov 2017 21:54:46 -
@@ -7,7 +7,7 @@ COMMENT=fast array and numeric program
MODPY_EGG_VERSION= 1.9.2
DISTNAME= numpy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 0
+REVISION= 1
CATEGORIES=math devel
@@ -33,7 +33,7 @@ MODPY_SETUP= setupegg.py
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS=math/lapack \
Index: math/suitesparse/Makefile
===
RCS file: /cvs/ports/math/suitesparse/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- math/suitesparse/Makefile 27 Feb 2017 23:08:14 - 1.5
+++ math/suitesparse/Makefile 4 Nov 2017 21:54:46 -
@@ -6,6 +6,7 @@ COMMENT=suite of sparse matrix algorit
DISTNAME= SuiteSparse-4.4.6
PKGNAME= ${DISTNAME:L}
+REVISION= 0
CATEGORIES=math
@@ -28,6 +29,7 @@ WANTLIB += ${MODFORTRAN_WANTLIB} blas la
MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/
MODULES= fortran
+MODFORTRAN_COMPILER= gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
@@ -89,7 +91,7 @@ po
[UPDATE] math/lapack
long overdue update, and switch to gfortran. ok?
working on ports that depend on it.
Index: Makefile
===
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile
--- Makefile26 Aug 2016 14:31:46 - 1.25
+++ Makefile4 Nov 2017 17:20:15 -
@@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.25 2016/08/26 14:31:46 jca Exp $
-COMMENT= library of Fortran 77 linear algebra subroutines
+COMMENT= library of Fortran linear algebra subroutines
-DISTNAME= lapack-3.1.1
-REVISION= 5
+VERSION= 3.7.1
+DISTNAME= lapack-${VERSION}
-SHARED_LIBS= lapack 5.0
+SHARED_LIBS= lapack 6.0
CATEGORIES=math
+DISTFILES= ${DISTNAME}.tgz manpages.tgz:0
HOMEPAGE= http://www.netlib.org/lapack/
@@ -16,42 +17,65 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://www.netlib.org/lapack/ \
http://www.netlib.no/netlib/lapack/
+MASTER_SITES0= http://www.netlib.org/lapack/
EXTRACT_SUFX= .tgz
+DIST_SUBDIR= ${DISTNAME}
LIB_DEPENDS = math/blas
WANTLIB = blas>=1
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
MAKE_ENV= SHLIB_MAJOR=${LIBlapack_VERSION:R} \
SHLIB_MINOR=${LIBlapack_VERSION:E} \
TIMER=EXT_ETIME \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
USE_GROFF =Yes
-TEST_FLAGS=PLAT= OPTS= FORTRAN=${FC} LOADER=${FC} \
+
+TEST_DEPENDS= devel/gmake
+TEST_FLAGS=PLAT= OPTS= FORTRAN=${MODFORTRAN_COMPILER} \
+ LOADER=${MODFORTRAN_COMPILER} \
LAPACKLIB=SRC/liblapack.a \
- BLASLIB=${LOCALBASE}/lib/libblas.a
+ BLASLIB="${LOCALBASE}/lib/libblas.a
${LOCALBASE}/lib/libgfortran.a"
MAKE_FILE= ${FILESDIR}/Makefile
WRKSRC=${WRKDIST}/SRC
+MANSRC=${WRKDIR}/man/man3
+
# avoid 'unknown manpage type' errors and move manpages to section 3
pre-configure:
- cd ${WRKDIST}/manpages/man/manl && \
- perl -pi -e 's/(\.TH\s+\w+)\s+1(.*)/\1 3f\2/' *.l && \
- for m in *.l ; do if ! egrep -q '^\.TH' $$m ; then \
-perl -pi -e "s/(.SH NAME)/.TH \U$${m%\.l} 3f\n\1/" $$m ; fi ; \
- mv $$m $${m%\.l}.3f ; done
- cp ${WRKDIST}/make.inc.example ${WRKDIST}/make.inc
+ @cp ${WRKDIST}/make.inc.example ${WRKDIST}/make.inc
+ @cd ${WRKSRC} && for f in *.F ; do mv $$f $${f%.F}.f ; done
+
+post-build:
+ @cd ${MANSRC} && for m in *.f.3 ; do perl -pi \
+ -e 'if ($$. == 1) {s/(\.TH\s+)"([^"]+)\.f"\s+3\s+("[^"]+")/\1
\2 3f \3 "LAPACK Version ${VERSION}" "LAPACK Version ${VERSION}"/}' \
+ -e 'if ($$. == 5) {s/^(\w+)\.f \\-/\1/}' $$m ; done
+ @cd ${MANSRC} && \
+ for m in SRC_*.f.3; do mv $$m $${m#SRC_}; done && \
+ for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done
post-install:
- ${INSTALL_MAN} ${WRKDIST}/manpages/man/manl/*.3f ${PREFIX}/man/man3f/
+ @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc | \
+ perl -p -e 's/\s/\n/g' | \
+ grep -v TIME | \
+ grep -v ssytrd_sb2st.f | \
+ grep -v dsytrd_sb2st.f | \
+ grep -v chetrd_hb2st.f | \
+ grep -v zhetrd_hb2st.f | \
+ grep -v iparam2stage.f | \
+ grep -v lsame.f | \
+ grep -v xerbla.f | \
+ grep -v xerbla_array.f` ; do \
+ ${INSTALL_MAN} `basename $${m%.f}.3f` ${PREFIX}/man/man3f ; done
+ @${INSTALL_MAN} ${MANSRC}/*TIME*.3f ${PREFIX}/man/man3f
do-test:
- cd ${WRKDIST}/TESTING/MATGEN && ${MAKE} ${ALL_TEST_FLAGS}
- cd ${WRKDIST}/TESTING && ${MAKE} ${ALL_TEST_FLAGS}
+ cd ${WRKDIST}/TESTING/MATGEN && gmake ${ALL_TEST_FLAGS}
+ cd ${WRKDIST}/TESTING && gmake ${ALL_TEST_FLAGS}
.include
Index: distinfo
===
RCS file: /cvs/ports/math/lapack/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo18 Jan 2015 03:14:27 - 1.5
+++ distinfo4 Nov 2017 17:20:15 -
@@ -1,2 +1,4 @@
-SHA256 (lapack-3.1.1.tgz) = 5MM1swtDlPliDWCBgxn/Eq8q6mOCdRXp9+YriN/3oCo=
-SIZE (lapack-3.1.1.tgz) = 10407595
+SHA256 (lapack-3.7.1/lapack-3.7.1.tgz) =
9sU/2fVpMvPds9XiTBwH5M2bOwjn+J3pyGcSXuzJocg=
+SHA256 (lapack-3.7.1/manpages.tgz) =
u1F5eMDMeWzCO/9NMLuw9LrXoo5pXbhsKf3J/tYKIsQ=
+SIZE (lapack-3.7.1/lapack-3.7.1.tgz) = 9137261
+SIZE (lapack-3.7.1/manpages.tgz) = 2673950
Index: files/Makefile
===
RCS file: /cvs/ports/math/lapack/files/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- files/Makefile 1 Sep 2016 10:53:27 -0
[UPDATE] math/cblas
update after blas update, a rerolled distfile, and also use gfortran.
Index: Makefile
===
RCS file: /cvs/ports/math/cblas/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile16 Mar 2015 18:07:49 - 1.16
+++ Makefile4 Nov 2017 16:10:18 -
@@ -5,7 +5,7 @@ COMMENT=C interface to the BLAS library
VERSION= 1.0
DISTNAME= cblas
PKGNAME= ${DISTNAME}-${VERSION}
-REVISION= 3
+REVISION= 4
SHARED_LIBS= cblas 1.0
CATEGORIES=math
@@ -24,24 +24,27 @@ WRKDIST=${WRKDIR}/CBLAS
WRKSRC=${WRKDIST}/src
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS = math/blas
-WANTLIB = blas>=1.0
+WANTLIB = blas>=2.1
-CFLAGS+= -DADD_
+CFLAGS+= -DADD_ -I${WRKDIST}/include
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBcblas_VERSION:R} \
SHLIB_MINOR=${LIBcblas_VERSION:E} \
- FC=${FC}
-FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
-
-TEST_FLAGS=LOADER=${FC} CFLAGS="${CFLAGS}" INC="-I${WRKSRC}" \
- LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas"
+ FC="${MODFORTRAN_COMPILER} -cpp"
+FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib \
+ DEBUGLIBS=no
+
+TEST_FLAGS=LOADER=${MODFORTRAN_COMPILER} \
+ CFLAGS="${CFLAGS}" \
+ INC="-I${WRKSRC}" \
+ LIB="-L${WRKSRC} -lcblas -L${LOCALBASE}/lib -lblas -lgfortran"
post-install:
- ${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include
+ ${INSTALL_DATA} ${WRKDIST}/include/*.h ${PREFIX}/include
do-test:
@cd ${WRKDIST}/testing && \
Index: distinfo
===
RCS file: /cvs/ports/math/cblas/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo18 Jan 2015 03:14:26 - 1.3
+++ distinfo4 Nov 2017 16:10:18 -
@@ -1,2 +1,2 @@
-SHA256 (cblas-1.0/cblas.tgz) = m0nXF3/aYrYUG/LKKeR16G8LEtj3LguUQFjQK0Od1So=
-SIZE (cblas-1.0/cblas.tgz) = 197694
+SHA256 (cblas-1.0/cblas.tgz) = D2NU/Wf6vZCbr1fO0u+E6WLbWPrhJuT0GyHdT+xgoqM=
+SIZE (cblas-1.0/cblas.tgz) = 197468
Index: patches/patch-testing_Makefile
===
RCS file: /cvs/ports/math/cblas/patches/patch-testing_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-testing_Makefile
--- patches/patch-testing_Makefile 2 Oct 2006 21:58:25 - 1.1.1.1
+++ patches/patch-testing_Makefile 4 Nov 2017 16:10:18 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-testing_Makefile,v 1.1.1.1 2006/10/02 21:58:25 steven Exp $
testing/Makefile.orig Sun Oct 1 15:52:32 2006
-+++ testing/Makefile Sun Oct 1 15:52:39 2006
+Index: testing/Makefile
+--- testing/Makefile.orig
testing/Makefile
@@ -3,7 +3,7 @@
#
dlvl = ../.
-include $(dlvl)/Makefile.in
+#include $(dlvl)/Makefile.in
- INC = -I$(CBDIR)/src
# Archive files necessary to compile
+ LIB = $(CBLIB) $(BLLIB)
[UPDATE] math/blas
update to 3.7.1, switch to gfortran.
an update to math/lapack will follow soon.
Index: Makefile
===
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile
--- Makefile17 Jun 2017 15:25:37 - 1.26
+++ Makefile4 Nov 2017 16:03:57 -
@@ -2,47 +2,51 @@
COMMENT= Basic Linear Algebra Subprograms
-VERSION= 1.0
-DISTNAME= blas
-PKGNAME= ${DISTNAME}-${VERSION}
-REVISION= 8
-SHARED_LIBS= blas2.0
+VERSION= 3.7.1
+DISTNAME= blas-${VERSION}
+
+SHARED_LIBS= blas2.1
CATEGORIES=math
-DISTFILES= blas.tgz manpages.tgz:0
+DISTFILES= ${DISTNAME}.tgz manpages.tgz:0
HOMEPAGE= http://www.netlib.org/blas/
# freely available
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= https://spacehopper.org/mirrors/blas-20110419/ \
- ftp://ftp.netlib.org/blas/ \
+MASTER_SITES= http://www.netlib.org/blas/ \
+ https://spacehopper.org/mirrors/blas-20110419/ \
ftp://netlib.bell-labs.com/netlib/blas/ \
http://www.netlib.no/netlib/blas/
MASTER_SITES0= ${MASTER_SITES:S/blas/lapack/}
EXTRACT_SUFX= .tgz
-DIST_SUBDIR= ${DISTNAME}-${VERSION}
-WRKDIST= ${WRKDIR}/BLAS
+DIST_SUBDIR= ${DISTNAME}
+WRKDIST= ${WRKDIR}/${DISTNAME:U}
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBblas_VERSION:R} \
SHLIB_MINOR=${LIBblas_VERSION:E} \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS=LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
+USE_GROFF= Yes
-MANSRC=${WRKDIR}/manpages/blas/man/manl
+MANSRC=${WRKDIR}/man/man3
post-build:
- rm ${MANSRC}/{lsame,xerbla}.l
- @perl -pi -e 's/(\.TH\s+\w+)\s+l(.*)/\1 3f\2/' ${MANSRC}/*.l
- @cd ${MANSRC} && for m in *.l; do mv $$m $${m%\.l}.3f; done
+ @cd ${MANSRC} && for m in *.f.3 ; do perl -pi \
+ -e 'if ($$. == 1) {s/(\.TH\s+)"([^"]+)\.f"\s+3\s+("[^"]+")/\1
\2 3f \3 "BLAS Version ${VERSION}" "BLAS Version ${VERSION}"/}' \
+ -e 'if ($$. == 5) {s/^(\w+)\.f \\-/\1/}' $$m ; done
+ @cd ${MANSRC} && \
+ for m in BLAS_SRC*.f.3; do mv $$m $${m#BLAS_SRC_}; done && \
+ for m in *.f.3; do mv $$m $${m%\.f\.3}.3f; done
post-install:
- ${INSTALL_MAN} ${MANSRC}/*.3f ${PREFIX}/man/man3f
+ @cd ${MANSRC} && for m in `${MAKE} -f ${MAKE_FILE} printsrc` ; do \
+ ${INSTALL_MAN} $${m%.f}.3f ${PREFIX}/man/man3f ; done
.include
Index: distinfo
===
RCS file: /cvs/ports/math/blas/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo18 Jan 2015 03:14:26 - 1.7
+++ distinfo4 Nov 2017 16:03:57 -
@@ -1,4 +1,4 @@
-SHA256 (blas-1.0/blas.tgz) = 6offbcRIKe4KFzMibRMMVQsXoLxRyNv81mL7FVILI7U=
-SHA256 (blas-1.0/manpages.tgz) = YwVbokz8D974vOU5eMc/IW+1BaohRDkTgvhdMkX9CFo=
-SIZE (blas-1.0/blas.tgz) = 99927
-SIZE (blas-1.0/manpages.tgz) = 1066170
+SHA256 (blas-3.7.1/blas-3.7.1.tgz) =
xaZUNR8LBGpQK/BLFnQLmrScfYUS1tV606ZBhMjldcM=
+SHA256 (blas-3.7.1/manpages.tgz) = u1F5eMDMeWzCO/9NMLuw9LrXoo5pXbhsKf3J/tYKIsQ=
+SIZE (blas-3.7.1/blas-3.7.1.tgz) = 117283
+SIZE (blas-3.7.1/manpages.tgz) = 2673950
Index: files/Makefile
===
RCS file: /cvs/ports/math/blas/files/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- files/Makefile 19 Aug 2010 21:23:29 - 1.2
+++ files/Makefile 4 Nov 2017 16:03:57 -
@@ -24,6 +24,9 @@ SRCS =caxpy.f ccopy.f cdotc.f cdotu.
zhbmv.f zhemm.f zhemv.f zher.f zher2.f zher2k.f zherk.f \
zhpmv.f zhpr.f zhpr2.f zrotg.f zscal.f zswap.f zsymm.f \
zsyr2k.f zsyrk.f ztbmv.f ztbsv.f ztpmv.f ztpsv.f ztrmm.f \
- ztrmv.f ztrsm.f ztrsv.f
+ ztrmv.f ztrsm.f ztrsv.f xerbla_array.f
+
+printsrc:
+ @echo ${SRCS}
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/blas/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:49 - 1.7
+++ pkg/PLIST 4 Nov 2017 16:03:57 -
@@ -78,6 +78,7 @@ lib/libblas_p.a
@man man/man3f/idamax.3f
@man man/man3f/isamax.3f
@man man/man3f/izamax.3f
+@man man/man3f/lsame.3f
@man man/man3f/sasum.3f
@man man/man3f/saxpy.3f
@man man/man3f/scabs1.3f
@@ -115,6 +116,7 @@ lib/libblas_p.a
@man man/man3f/strmv.3f
@man man/man3f/strsm.3f
@man man/man3f/strsv.3f
+@man man/man3f/xerbla.3f
@man man/man3f/xerbla_array.3f
@man man/man3f/zaxpy.3f
@man man/man3f/zcopy.3f
[UPDATE] libxslt
minor update, ok ?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxslt/Makefile,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile
--- Makefile14 Sep 2017 14:57:13 - 1.88
+++ Makefile4 Nov 2017 10:48:38 -
@@ -3,11 +3,10 @@
COMMENT-main= XSLT C Library for GNOME
COMMENT-python=Python bindings for libxslt
-VERSION= 1.1.30
+VERSION= 1.1.32
DISTNAME= libxslt-${VERSION}
PKGNAME-main= libxslt-${VERSION}
PKGNAME-python=py-libxslt-${VERSION}
-REVISION=0
SHARED_LIBS += xslt 4.0 # 2.28
SHARED_LIBS += exslt9.8 # 8.17
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxslt/distinfo,v
retrieving revision 1.33
diff -u -p -u -r1.33 distinfo
--- distinfo14 Sep 2017 14:57:13 - 1.33
+++ distinfo4 Nov 2017 10:48:38 -
@@ -1,2 +1,2 @@
-SHA256 (libxslt-1.1.30.tar.gz) = umUjYRbegybYM3iyvZKYefoYUZW8UwudGrpyEHkQtrM=
-SIZE (libxslt-1.1.30.tar.gz) = 3444029
+SHA256 (libxslt-1.1.32.tar.gz) = Um7NCrr0p3iQQWIsOVDA5/LEyINUcVFf137saEo1VGA=
+SIZE (libxslt-1.1.32.tar.gz) = 3440715
Re: [UPDATE] math/fftw3
Paul Irofti [2017-11-03, 16:49:33]: > On Fri, Nov 03, 2017 at 03:27:03PM +0100, Steven Mestdagh wrote: > > minor update. comments/ok? > > What happened to the portable binary bit? Otherwise OK. they removed this config arg as it is now default.
[UPDATE] libxml
could someone put this in a bulk build?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.171
diff -u -p -u -r1.171 Makefile
--- Makefile14 Sep 2017 14:56:41 - 1.171
+++ Makefile3 Nov 2017 15:00:19 -
@@ -3,7 +3,7 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.5
+VERSION= 2.9.7
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py-libxml-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.53
diff -u -p -u -r1.53 distinfo
--- distinfo14 Sep 2017 14:56:41 - 1.53
+++ distinfo3 Nov 2017 15:00:19 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.5.tar.gz) = QDHB7O6c57pPMT6R72KEFkiFzbaZN6Ej9qg7tqctzTg=
-SIZE (libxml2-2.9.5.tar.gz) = 5466888
+SHA256 (libxml2-2.9.7.tar.gz) = 9jxefTA2LtKLOL+hrGMT+agCMHILf7bIBXXuqz/1kAw=
+SIZE (libxml2-2.9.7.tar.gz) = 5467389
Index: patches/patch-timsort_h
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-timsort_h,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-timsort_h
--- patches/patch-timsort_h 25 Sep 2013 12:32:24 - 1.4
+++ patches/patch-timsort_h 3 Nov 2017 15:00:19 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-timsort_h,v 1.4 2013/09/25 12:32:24 jasper Exp $
timsort.h.orig Tue Sep 24 10:50:59 2013
-+++ timsort.h Tue Sep 24 10:51:40 2013
-@@ -48,7 +48,7 @@ typedef unsigned __int64 uint64_t;
- int compute_minrun(uint64_t);
+Index: timsort.h
+--- timsort.h.orig
timsort.h
+@@ -74,7 +74,7 @@ typedef unsigned __int64 uint64_t;
+ static int compute_minrun(const uint64_t);
#ifndef CLZ
--#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__
> 3))
-+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=
4))
+-#ifdef __GNUC__
++#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__
>= 4))
#define CLZ __builtin_clzll
#else
Index: patches/patch-xmllint_c
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-xmllint_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-xmllint_c
--- patches/patch-xmllint_c 5 Jul 2007 16:05:09 - 1.4
+++ patches/patch-xmllint_c 3 Nov 2017 15:00:19 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $
xmllint.c.orig Tue Apr 17 14:28:16 2007
-+++ xmllint.c Mon Jul 2 12:50:32 2007
-@@ -103,7 +103,7 @@
+Index: xmllint.c
+--- xmllint.c.orig
xmllint.c
+@@ -87,7 +87,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
[UPDATE] math/fftw3
minor update. comments/ok?
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.32
diff -u -p -u -r1.32 Makefile
--- Makefile23 Mar 2016 21:14:58 - 1.32
+++ Makefile3 Nov 2017 14:26:09 -
@@ -3,18 +3,17 @@
COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common=common files for the fftw3 packages
-V= 3.3.4
+V= 3.3.7
DISTNAME= fftw-${V}
PKGNAME= fftw3-${V}
-REVISION= 0
FULLPKGNAME-main= fftw3-${V}
# XXX set it to its default value so that bsd.port.mk won't whine
FULLPKGPATH-main= math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-common=fftw3-common-${V}
-SHARED_LIBS= fftw3 7.0 \
- fftw3f 7.0 \
- fftw3_threads 1.0 \
- fftw3f_threads 1.0
+SHARED_LIBS= fftw3 7.1 \
+ fftw3f 7.1 \
+ fftw3_threads 1.1 \
+ fftw3f_threads 1.1
CATEGORIES=math
HOMEPAGE= http://www.fftw.org/
@@ -35,8 +34,7 @@ FLAVOR?= double
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--enable-portable-binary \
- --enable-threads
+CONFIGURE_ARGS=--enable-threads
.if ${FLAVOR} == "float"
CONFIGURE_ARGS+=--enable-float
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo14 Aug 2015 19:51:26 - 1.9
+++ distinfo3 Nov 2017 14:26:09 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.3.4.tar.gz) = jwzekJKbwFWHwzaNLxXNBTCmC4qZEqjil5py2+WvCYI=
-SIZE (fftw-3.3.4.tar.gz) = 3940427
+SHA256 (fftw-3.3.7.tar.gz) = O2Cbf+ulIw6PbdjSRd2++sMkxaauQYaUdnDZrCzSVXM=
+SIZE (fftw-3.3.7.tar.gz) = 4105807
UPDATE: sysutils/syslog-ng
seems to be fine on amd64. comments welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.57
diff -u -p -u -r1.57 Makefile
--- Makefile13 Jun 2017 00:22:33 - 1.57
+++ Makefile2 Nov 2017 18:40:53 -
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2017/06/13 00:22:33 schwarze Exp $
-COMMENT= syslogd replacement
+COMMENT= log management solution
-V =3.9.1
-REL = 3.9
+V =3.12.1
+REL = 3.12
DISTNAME = syslog-ng-$V
-REVISION = 0
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh
@@ -17,8 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
MASTER_SITES =
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = syslog-ng 4.0 \
- syslog-ng-${REL}4.0
+SHARED_LIBS = syslog-ng 5.0 \
+ syslog-ng-${REL}5.0
MODULES = devel/gettext
@@ -36,6 +35,7 @@ LIB_DEPENDS = devel/glib2 \
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-tcp-wrapper \
+ --with-module-dir=${PREFIX}/lib/syslog-ng \
--with-pidfile-dir=/var/run \
--enable-json \
--with-mongoc=no \
@@ -54,7 +54,10 @@ CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/
OPENSSL_LIBS="-lssl -lcrypto"
# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
CONFIGURE_ENV += JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
- JSON_C_LIBS="`pkg-config json-c --libs`"
+ JSON_C_LIBS="`pkg-config json-c --libs`" \
+ EVTLOG_LIBS="-L${LOCALBASE}/lib -levtlog" \
+ EVTLOG_CFLAGS="-I${LOCALBASE}/include/eventlog"
+
USE_GMAKE =Yes
SYSCONFDIR = ${BASESYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo8 Jun 2017 18:19:37 - 1.25
+++ distinfo2 Nov 2017 18:40:53 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
-SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
+SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
+SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.10
diff -u -p -u -r1.10 syslog-ng.conf
--- files/syslog-ng.conf8 Jun 2017 18:19:37 - 1.10
+++ files/syslog-ng.conf2 Nov 2017 18:40:53 -
@@ -1,8 +1,7 @@
# syslog-ng configuration file for OpenBSD.
-# This should provide the same behavior as OpenBSD's syslog.conf(5).
-# 2010-07-18 ste...@openbsd.org
+# This should provide behavior similar to OpenBSD's syslog.conf(5).
-@version: 3.9
+@version: 3.12
options {
use_dns(no);
@@ -12,15 +11,9 @@ options {
source s_local {
unix-dgram ("/dev/log");
- unix-dgram ("/var/empty/dev/log");
internal();
};
-#source s_local_all {
-# unix-dgram ("/dev/log");
-# unix-dgram ("/var/empty/dev/log");
-# unix-dgram ("/var/www/dev/log");
-# internal();
-#};
+
#source s_net {
# udp(port(514));
#};
@@ -108,7 +101,6 @@ log { source(s_local); filter(f_daemonin
log { source(s_local); filter(f_ftpinfo); destination(d_xferlog); };
log { source(s_local); filter(f_lprdebug); destination(d_lpderrs); };
log { source(s_local); filter(f_mailinfo); destination(d_maillog); };
-#log { source(s_local); filter(f_uucpinfo);destination(d_uucplog); };
# Uncomment this line to send "important" messages to the system
# console: be aware that this could create lots of output.
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 8 Jun 2017 18:19:37 - 1.10
+++ patches/patch-Makefile_in 2 Nov 2017 18:40:53 -
@@ -1,8 +1,52 @@
$OpenBSD: patch-Makefile_in,v 1.10 2017/06/08 18:19:37 steven Exp $
-temporary hack until libtool is fixed.
Makefile.in.orig Wed Dec 21 16:00:32 2016
-+++ Makefile.inSun Feb 5 23:53:33 2017
-@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo: \
+- temporary hack until libtool is fixed.
+- work around different getent API, adapted from
+https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd
+- a
Re: UPDATE: math/plplot
Steven Mestdagh [2017-11-02, 15:41:25]:
> a long overdue update. comments / ok?
better without the gettext module, as pointed out by naddy.
Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.58
+++ Makefile2 Nov 2017 16:24:53 -
@@ -2,22 +2,20 @@
COMMENT-main = advanced 2D and 3D scientific plotting library
COMMENT-c++ = C++ interface to plplot
-COMMENT-f77 = Fortran 77 interface to plplot
+COMMENT-fortran = Fortran 77 interface to plplot
-VERSION = 5.8.0
+VERSION = 5.13.0
DISTNAME = plplot-${VERSION}
-SHARED_LIBS = csirocsa3.0 \
- plplotcxxd 12.0\
- plplotd 13.0\
- plplotf77cd 11.0\
- plplotf77d 11.0
+SHARED_LIBS = csirocsa4.0 \
+ csironn 0.0 \
+ plplot 15.0\
+ plplotcxx 13.0\
+ plplotfortran 0.0 \
+ qsastime0.0
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
-PKGNAME-f77 = plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran = plplot-fortran-${VERSION}
CATEGORIES = math graphics
@@ -30,10 +28,9 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
-MODULES = devel/gettext \
- fortran
+MODULES = fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +39,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
MODULES += devel/cmake
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
USE_NINJA =No
-CONFIGURE_ARGS = -D ENABLE_java=OFF \
- -D ENABLE_f77=ON \
- -D ENABLE_f95=OFF \
- -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS = -D ENABLE_ada=OFF \
+ -D ENABLE_cxx=ON \
+ -D ENABLE_d=OFF \
+ -D ENABLE_fortran=ON \
+ -D ENABLE_java=OFF \
+ -D ENABLE_lua=OFF \
+ -D ENABLE_ocaml=OFF \
+ -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
- -D PLD_gcw=OFF \
+ -D ENABLE_qt=OFF \
+ -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+ -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
- -D ENABLE_wxwidgets=OFF \
- -D ENABLE_gnome2=OFF \
- -D ENABLE_octave=OFF \
- -D PLD_wxwidgets=OFF
+ -D ENABLE_itk=OFF \
+ -D ENABLE_wxwidgets=OFF
DOCSRC = ${WRKSRC}/doc/docbook/src
-MULTI_PACKAGES = -main -c++ -f77
+MULTI_PACKAGES = -main -c++ -fortran
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull intl ltdl
WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ = ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ = plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
myLIB_DEPENDS =devel/glib2 \
+ devel/gettext \
devel/pango \
graphics/cairo \
- graphics/gd \
- ${MODGETTEXT_LIB_DEPENDS}
+ math/qhull \
+ devel/libtool,-ltdl
LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ = math/plplot,-main \
- ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 = math/plplot,-main \
- ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ = math/plplot,-main
+LIB_DEPENDS-fortran = math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
RUN_DEPENDS-main = ${myRUN_DEPENDS}
RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 - 1.5
+++ distinfo2 Nov 2017 16:24:53
UPDATE: devel/libivykis
update to a version used by newer syslog-ng
Index: Makefile
===
RCS file: /cvs/ports/devel/libivykis/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile25 Jul 2015 08:18:20 - 1.7
+++ Makefile2 Nov 2017 14:52:26 -
@@ -2,11 +2,11 @@
COMMENT = asynchronous I/O readiness notification library
-V =0.36.3
+V =0.42
DISTNAME = ivykis-$V
PKGNAME = lib${DISTNAME}
-SHARED_LIBS = ivykis 1.0
+SHARED_LIBS = ivykis 2.0
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/libivykis/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo25 Jul 2015 08:18:20 - 1.4
+++ distinfo2 Nov 2017 14:52:26 -
@@ -1,2 +1,2 @@
-SHA256 (ivykis-0.36.3.tar.gz) = qnDlSHz20cmWH0h9ULGNFqkh3fRPvc0iZemFvrrEIj0=
-SIZE (ivykis-0.36.3.tar.gz) = 401979
+SHA256 (ivykis-0.42.tar.gz) = 9jxNuUW+aa/U0S/zAsJtY5mpG8ivqjS+VkQbtIYgqbI=
+SIZE (ivykis-0.42.tar.gz) = 649882
UPDATE: math/plplot
a long overdue update. comments / ok?
Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.58
diff -u -p -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:26 - 1.58
+++ Makefile2 Nov 2017 14:39:24 -
@@ -2,22 +2,20 @@
COMMENT-main = advanced 2D and 3D scientific plotting library
COMMENT-c++ = C++ interface to plplot
-COMMENT-f77 = Fortran 77 interface to plplot
+COMMENT-fortran = Fortran 77 interface to plplot
-VERSION = 5.8.0
+VERSION = 5.13.0
DISTNAME = plplot-${VERSION}
-SHARED_LIBS = csirocsa3.0 \
- plplotcxxd 12.0\
- plplotd 13.0\
- plplotf77cd 11.0\
- plplotf77d 11.0
+SHARED_LIBS = csirocsa4.0 \
+ csironn 0.0 \
+ plplot 15.0\
+ plplotcxx 13.0\
+ plplotfortran 0.0 \
+ qsastime0.0
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
-PKGNAME-f77 = plplot-f77-${VERSION}
-REVISION-main =10
-REVISION-c++ = 11
-REVISION-f77 = 13
+PKGNAME-fortran = plplot-fortran-${VERSION}
CATEGORIES = math graphics
@@ -33,7 +31,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORGE
MODULES = devel/gettext \
fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS =print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@@ -42,51 +40,54 @@ myRUN_DEPENDS = print/ghostscript/gnu-fo
MODULES += devel/cmake
-# Until such time as the cmake ninja generator supports fortran
+# Until the cmake ninja generator supports fortran
USE_NINJA =No
-CONFIGURE_ARGS = -D ENABLE_java=OFF \
- -D ENABLE_f77=ON \
- -D ENABLE_f95=OFF \
- -D ENABLE_itcl=OFF \
+CONFIGURE_ARGS = -D ENABLE_ada=OFF \
+ -D ENABLE_cxx=ON \
+ -D ENABLE_d=OFF \
+ -D ENABLE_fortran=ON \
+ -D ENABLE_java=OFF \
+ -D ENABLE_lua=OFF \
+ -D ENABLE_ocaml=OFF \
+ -D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
- -D PLD_gcw=OFF \
+ -D ENABLE_qt=OFF \
+ -D ENABLE_pyqt4=OFF \
-D ENABLE_tcl=OFF \
+ -D ENABLE_itcl=OFF \
-D ENABLE_tk=OFF \
- -D ENABLE_wxwidgets=OFF \
- -D ENABLE_gnome2=OFF \
- -D ENABLE_octave=OFF \
- -D PLD_wxwidgets=OFF
+ -D ENABLE_itk=OFF \
+ -D ENABLE_wxwidgets=OFF
DOCSRC = ${WRKSRC}/doc/docbook/src
-MULTI_PACKAGES = -main -c++ -f77
+MULTI_PACKAGES = -main -c++ -fortran
-myWANTLIB += ICE SM X11 Xext cairo fontconfig freetype gd glib-2.0
-myWANTLIB += gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-myWANTLIB += png z ${MODGETTEXT_WANTLIB}
+myWANTLIB += ICE SM X11 Xext cairo glib-2.0
+myWANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
+myWANTLIB += qhull ${MODGETTEXT_WANTLIB} ltdl
WANTLIB-main = ${myWANTLIB} c pthread
-WANTLIB-c++ = ${myWANTLIB} csirocsa plplotd ${COMPILER_LIBCXX}
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-c++ = plplot m ${COMPILER_LIBCXX}
+WANTLIB-fortran = plplot m ${MODFORTRAN_WANTLIB}
myLIB_DEPENDS =devel/glib2 \
devel/pango \
graphics/cairo \
- graphics/gd \
+ math/qhull \
+ devel/libtool,-ltdl \
${MODGETTEXT_LIB_DEPENDS}
LIB_DEPENDS-main = ${myLIB_DEPENDS}
-LIB_DEPENDS-c++ = math/plplot,-main \
- ${myLIB_DEPENDS}
-LIB_DEPENDS-f77 = math/plplot,-main \
- ${myLIB_DEPENDS} \
+LIB_DEPENDS-c++ = math/plplot,-main
+LIB_DEPENDS-fortran = math/plplot,-main \
${MODFORTRAN_LIB_DEPENDS}
RUN_DEPENDS-main = ${myRUN_DEPENDS}
RUN_DEPENDS-c++ =
-RUN_DEPENDS-f77 =
+RUN_DEPENDS-fortran =
pre-configure:
@sed -i 's/3plplot/3/g' ${DOCSRC}/*.3plplot
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo17 Mar 2014 23:21:43 - 1.5
+++ distinfo2 Nov 2017 14:39:24 -
@@ -1,2 +1,2 @@
-SHA256 (plplot-5.8.0.tar.gz) = WVvMAhtBW6GRl5WGVD+VKF8D9bVO139FKXaomtKFCHc=
-SIZE (plplot-5.8.0.tar.gz) = 7582217
+SHA256 (plplot-5.13.0.tar.gz) = 7Da77osD2dHJj4/Yj33DQVVg5Vm1PrGqmR
UPDATE: math/octave
comments welcome.
can someone try to build this on something else than amd64?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.97
diff -u -p -u -r1.97 Makefile
--- Makefile30 Oct 2017 13:55:10 - 1.97
+++ Makefile2 Nov 2017 09:30:57 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.0.2
+VERSION = 4.2.1
DISTNAME = octave-${VERSION}
-REVISION = 6
CATEGORIES = math
-SHARED_LIBS += octave 7.0 # 3.0
-SHARED_LIBS += octgui 1.0 # 1.0
-SHARED_LIBS += octinterp 6.0 # 3.0
+SHARED_LIBS += octave 8.0
+SHARED_LIBS += octgui 2.0
+SHARED_LIBS += octinterp 7.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -19,22 +18,26 @@ MAINTAINER =Steven Mestdagh &6; }
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
+ ;;
+ *)
+ as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
+@@ -44617,13 +44617,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -21,7 +31,7 @@ Use GNU readline as our base readline la
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -39804,7 +39804,7 @@ fi
+@@ -44662,7 +44662,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-doc_interpreter_Makefile_in
===
RCS file: patches/patch-doc_interpreter_Makefile_in
diff -N patches/patch-doc_interpreter_Makefile_in
--- patches/patch-doc_interpreter_Makefile_in 22 Apr 2016 17:21:39 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-doc_interpreter_Makefile_in,v 1.8 2016/04/22 17:21:39 steven
Exp $
-avoid rebuilding info file
doc/interpreter/Makefile.in.orig Thu Apr 21 11:13:33 2016
-+++ doc/interpreter/Makefile.inThu Apr 21 11:13:47 2016
-@@ -2494,7 +2494,7 @@ install-html-am: $(HTMLS)
- done; }
- install-info: install-info-am
-
--install-info-am: $(INFO_DEPS)
-+install-info-am:
- @$(NORMAL_INSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
Index: patches/patch-doc_liboctave_Makefile_in
===
RCS file: patches/patch-doc_liboctave_Makefile_in
diff -N patches/patch-doc_liboctave_Makefile_in
--- patches/patch-doc_liboctave_Makefile_in 22 Apr 2016 17:21:39 -
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-doc_liboctave_Makefile_in,v 1.8 2016/04/22 17:21:39 steven Exp
$
-avoid rebuilding info file
doc/liboctave/Makefile.in.orig Thu Apr 21 12:39:41 2016
-+++ doc/liboctave/Makefile.in Thu Apr 21 12:39:59 2016
-@@ -2238,7 +2238,7 @@ install-html-am: $(HTMLS)
- done; }
- install-info: install-info-am
-
--install-info-am: $(INFO_DEPS)
-+install-info-am:
- @$(NORMAL_INSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
Index: patches/patch-liboctave_system_file-stat_cc
===
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-liboctave_system_file-stat_cc 2 Nov 2017 09:30:57 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: liboctave/system/file-stat.cc
+--- liboctave/system/file-stat.cc.orig
liboctave/system/file-stat.cc
+@@ -174,7 +174,7 @@ namespace octave
+ update_internal ();
+ }
+
+-inline file_stat::~file_stat () { }
++file_stat::~file_stat () { }
+
+ void
+ file_stat::update_internal (bool force)
Index: patches/patch-scripts_pkg_private_configure_make_m
===
RCS file:
/cvs/ports/math/octave/patches/patch-scripts_pkg_private_configure_make_m,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-scripts_pkg_private_configure_make_m
--- patches/patch-scripts_pkg_private_configure_make_m 24 Jul 2015 14:54:01
- 1.1
+++ patches/patch-scripts_pkg_private_configure_make_m 2 Nov 2017 09:30:57
-
@@ -1,7 +1,8 @@
-$OpenBSD: patch-scripts_pkg_priva
Re: security/gpgme (needs help)
Rafael Sadowski [2017-11-01, 17:53:43]: > Hi porters, > > I need help with the gpgme update. Special thing here, I need the Qt > bindings because kde-applications/gpgmepp is dead and all dependent > programs work with gpgme-qt now. > > But I always trap into the following link issue: > > libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0 > -I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow > -Wstrict-prototypes .libs/conversion.o .libs/b64dec.o .libs/get-env.o > .libs/parsetlv.o .libs/mbox-util.o .libs/data.o .libs/data-fd.o > .libs/data-stream.o .libs/data-mem.o .libs/data-user.o .libs/data-compat.o > .libs/data-identify.o .libs/signers.o .libs/sig-notation.o .libs/wait.o > .libs/wait-global.o .libs/wait-private.o .libs/wait-user.o .libs/op-support.o > .libs/encrypt.o .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o > .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o > .libs/keylist.o .libs/keysign.o .libs/trust-item.o .libs/trustlist.o > .libs/tofupolicy.o .libs/import.o .libs/export.o .libs/genkey.o > .libs/delete.o .libs/edit.o .libs/getauditlog.o .libs/opassuan.o > .libs/passwd.o .libs/spawn.o .libs/assuan-support.o .libs/engine.o > .libs/engine-gpg.o .libs/status-table.o .libs/engine-gpgsm.o > .libs/engine-assuan.o .libs/engine-gpgconf.o .libs/engine-uiserver.o > .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o .libs/engine-spawn.o > .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o > .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o > .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv > libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o > parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o > data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o > wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o > decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o > keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o > delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o > engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o > engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o > engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o > debug.o gpgme.o version.o error.o ath.o > libtool: link: ranlib .libs/libgpgme.a > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD > -MP -MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c > mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po > cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I/usr/local/include -O2 > -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP > -MF .deps/argparse.Tpo -c -o argparse.o argparse.c > mv -f .deps/argparse.Tpo .deps/argparse.Po > c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error > libgpgme.la: file not recognized: File format not recognized > c++: error: linker command failed with exit code 1 (use -v to see invocation) libgpgme.la is a libtool library file, which indeed isn't recognized by the linker. maybe it is an error caused by our libtool. can you try building this with USE_LIBTOOL=gnu ?
Re: [UPDATE] security/zaproxy
Remi Pointel [2017-04-17, 07:05:51]:
> Hi,
>
> this is the diff to update zaproxy to latest release.
>
> Ok?
any reason why this update is not yet in the tree?
maybe the following rather large files could be skipped?
+share/zaproxy/plugin/jxbrowser-alpha-2.zap
+share/zaproxy/plugin/jxbrowserlinux32-alpha-1.zap
+share/zaproxy/plugin/jxbrowserlinux64-alpha-1.zap
>
> Cheers,
>
> Remi.
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/zaproxy/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile 19 Jun 2016 14:29:03 - 1.2
> +++ Makefile 17 Apr 2017 05:04:47 -
> @@ -2,7 +2,7 @@
>
> COMMENT =web application security tool
>
> -VERSION =2.5.0
> +VERSION =2.6.0
> DISTNAME = ZAP_${VERSION}_Linux
> PKGNAME =zaproxy-${VERSION}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/zaproxy/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo 19 Jun 2016 14:29:03 - 1.2
> +++ distinfo 17 Apr 2017 05:04:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (ZAP_2.5.0_Linux.tar.gz) =
> xO49UV9RcpD09CDlDmBWu+/OSTlfuVX/yk6ba/WqcHI=
> -SIZE (ZAP_2.5.0_Linux.tar.gz) = 79520691
> +SHA256 (ZAP_2.6.0_Linux.tar.gz) =
> QorDBv5Yfy7l8SjS1RKdnNlH/s/hQlc2OkwKAVErMUQ=
> +SIZE (ZAP_2.6.0_Linux.tar.gz) = 174350914
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 19 Jun 2016 14:29:03 - 1.2
> +++ pkg/PLIST 17 Apr 2017 05:04:47 -
> @@ -9,8 +9,6 @@ share/zaproxy/db/mysql.properties
> share/zaproxy/db/mysql.schema
> share/zaproxy/db/zapdb.properties
> share/zaproxy/db/zapdb.script
> -share/zaproxy/filter/
> -share/zaproxy/filter/dummy.txt
> share/zaproxy/lang/
> share/zaproxy/lang/Messages.properties
> share/zaproxy/lang/Messages_ar_SA.properties
> @@ -48,6 +46,7 @@ share/zaproxy/lang/Messages_sr_SP.proper
> share/zaproxy/lang/Messages_tr_TR.properties
> share/zaproxy/lang/Messages_uk_UA.properties
> share/zaproxy/lang/Messages_ur_PK.properties
> +share/zaproxy/lang/Messages_vi_VN.properties
> share/zaproxy/lang/Messages_zh_CN.properties
> share/zaproxy/lang/vulnerabilities.xml
> share/zaproxy/lang/vulnerabilities_ar_SA.xml
> @@ -85,12 +84,10 @@ share/zaproxy/lang/vulnerabilities_sr_SP
> share/zaproxy/lang/vulnerabilities_tr_TR.xml
> share/zaproxy/lang/vulnerabilities_uk_UA.xml
> share/zaproxy/lang/vulnerabilities_ur_PK.xml
> +share/zaproxy/lang/vulnerabilities_vi_VN.xml
> share/zaproxy/lang/vulnerabilities_zh_CN.xml
> share/zaproxy/lib/
> share/zaproxy/lib/BrowserLauncher2-1_3.jar
> -share/zaproxy/lib/JBroFuzz.jar
> -share/zaproxy/lib/JBroFuzzEncoder.jar
> -share/zaproxy/lib/ant.jar
> share/zaproxy/lib/bcmail-jdk15on-152.jar
> share/zaproxy/lib/bcpkix-jdk15on-152.jar
> share/zaproxy/lib/bcprov-jdk15on-152.jar
> @@ -100,6 +97,7 @@ share/zaproxy/lib/commons-collections-3.
> share/zaproxy/lib/commons-configuration-1.9.jar
> share/zaproxy/lib/commons-csv-1.1.jar
> share/zaproxy/lib/commons-httpclient-3.1.jar
> +share/zaproxy/lib/commons-io-2.4.jar
> share/zaproxy/lib/commons-jxpath-1.3.jar
> share/zaproxy/lib/commons-lang-2.6.jar
> share/zaproxy/lib/commons-logging-1.2.jar
> @@ -110,7 +108,9 @@ share/zaproxy/lib/harlib-jackson-1.1.2.j
> share/zaproxy/lib/hsqldb.jar
> share/zaproxy/lib/httpclient-4.5.jar
> share/zaproxy/lib/httpcore-4.4.1.jar
> +share/zaproxy/lib/ice4j-1.0.jar
> share/zaproxy/lib/java-semver-0.8.0.jar
> +share/zaproxy/lib/jcommon-1.0.23.jar
> share/zaproxy/lib/jdom.jar
> share/zaproxy/lib/jericho-html-3.1.jar
> share/zaproxy/lib/jfreechart-1.0.13.jar
> @@ -133,31 +133,34 @@ share/zaproxy/license/gpl-2.0.txt
> share/zaproxy/license/hsqldb_lic.txt
> share/zaproxy/license/hypersonic_lic.txt
> share/zaproxy/license/lgpl-3.0.txt
> -share/zaproxy/log/
> -share/zaproxy/log/dummy.txt
> share/zaproxy/plugin/
> share/zaproxy/plugin/Readme.txt
> -share/zaproxy/plugin/alertFilters-beta-3.zap
> -share/zaproxy/plugin/ascanrules-release-23.zap
> -share/zaproxy/plugin/bruteforce-beta-5.zap
> -share/zaproxy/plugin/coreLang-release-10.zap
> -share/zaproxy/plugin/diff-beta-6.zap
> +share/zaproxy/plugin/alertFilters-beta-4.zap
> +share/zaproxy/plugin/ascanrules-release-26.zap
> +share/zaproxy/plugin/bruteforce-beta-6.zap
> +share/zaproxy/plugin/coreLang-release-11.zap
> +share/zaproxy/plugin/diff-beta-7.zap
> share/zaproxy/plugin/directorylistv1-release-3.zap
> -share/zaproxy/plugin/fuzz-beta-5.zap
> -share/zaproxy/plugin/gettingStarted-release-5.zap
> -share/zaproxy/plugin/help-release-6.zap
> -share/zaproxy/plugin/invoke-beta-3.zap
> -share/zaproxy/plugin/onlineMenu-release-4.zap
> -share/zaproxy/plugin/pscanrules-release-16.zap
> -share/zaproxy/plug
UPDATE: sysutils/syslog-ng
major update, and enabled geoip and curl modules.
note it requires the libdbi update that i posted a few days ago.
basic test ok on amd64. comments and more tests welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.55
diff -u -p -u -r1.55 Makefile
--- Makefile1 May 2016 11:19:09 - 1.55
+++ Makefile28 May 2017 08:56:32 -
@@ -2,8 +2,8 @@
COMMENT= syslogd replacement
-V =3.7.2
-REL = 3.7
+V =3.9.1
+REL = 3.9
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -16,39 +16,41 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES =
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = syslog-ng 3.0 \
- syslog-ng-${REL}3.0
+SHARED_LIBS = syslog-ng 4.0 \
+ syslog-ng-${REL}4.0
MODULES = devel/gettext
WANTLIB = c m pcre crypto ssl evtlog dbi ivykis pthread \
- glib-2.0 gmodule-2.0 gthread-2.0 json-c
+ glib-2.0 gmodule-2.0 gthread-2.0 json-c \
+ curl nghttp2 z GeoIP
LIB_DEPENDS = devel/glib2 \
devel/json-c \
devel/libivykis \
sysutils/eventlog \
- databases/libdbi
+ databases/libdbi>=0.9.0 \
+ net/curl \
+ net/GeoIP
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-tcp-wrapper \
--with-pidfile-dir=/var/run \
--enable-json \
- --with-libmongo-client=no \
+ --with-mongoc=no \
--with-librabbitmq-client=no \
--disable-python \
--disable-mongodb \
--disable-amqp \
--disable-stomp \
- --disable-geoip \
+ --enable-geoip \
--without-libnet \
--with-ivykis=system \
+ --with-libcurl=${LOCALBASE} \
--enable-sql \
--enable-manpages
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
- OPENSSL_LIBS="-lssl -lcrypto" \
- LIBDBI_CFLAGS="-I/usr/include/openssl" \
- LIBDBI_LIBS="-ldbi"
+ OPENSSL_LIBS="-lssl -lcrypto"
# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
CONFIGURE_ENV += JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
JSON_C_LIBS="`pkg-config json-c --libs`"
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- distinfo1 May 2016 11:19:09 - 1.24
+++ distinfo28 May 2017 08:56:32 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU=
-SIZE (syslog-ng-3.7.2.tar.gz) = 3558377
+SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
+SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.9
diff -u -p -u -r1.9 syslog-ng.conf
--- files/syslog-ng.conf1 May 2016 11:19:09 - 1.9
+++ files/syslog-ng.conf28 May 2017 08:56:32 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.7
+@version: 3.9
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 1 May 2016 11:19:09 - 1.9
+++ patches/patch-Makefile_in 28 May 2017 08:56:32 -
@@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.9 2016/05/01 11:19:09 steven Exp $
temporary hack until libtool is fixed.
Makefile.in.orig Tue Oct 27 09:09:48 2015
-+++ Makefile.inSat Nov 21 01:24:57 2015
-@@ -5196,7 +5196,7 @@ lib/compat/lib_libsyslog_ng_la-strtok_r.lo: \
- lib/compat/$(DEPDIR)/$(am__dirstamp)
-
+--- Makefile.in.orig Wed Dec 21 16:00:32 2016
Makefile.inSun Feb 5 23:53:33 2017
+@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo: \
+ lib/str-repr/$(am__dirstamp) \
+ lib/str-repr/$(DEPDIR)/$(am__dirstamp)
lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS)
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES)
lib/$(am__dirstamp)
- $(AM_V_CCLD)$(lib_lib
UPDATE: databases/libdbi
this updates libdbi and related drivers to 0.9.0, it's a dependency of more
recent syslog-ng versions.
seems to work on amd64. didn't yet try the dependent ports gnucash, gammu,
icinga, monitoring-plugins. if anyone who uses those could give this a try,
or build on a different arch, it would be cool.
comments / ok ?
Index: libdbi/Makefile
===
RCS file: /cvs/ports/databases/libdbi/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- libdbi/Makefile 29 Oct 2015 18:25:31 - 1.5
+++ libdbi/Makefile 24 May 2017 14:25:43 -
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2015/10/29 18:25:31 ajacoutot Exp $
COMMENT = database-independent abstraction layer
-DISTNAME = libdbi-0.8.4
+DISTNAME = libdbi-0.9.0
CATEGORIES = databases
-SHARED_LIBS += dbi 0.0 # .0.5
-REVISION = 0
+SHARED_LIBS += dbi 1.0
HOMEPAGE = http://libdbi.sourceforge.net/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libdbi/}
Index: libdbi/distinfo
===
RCS file: /cvs/ports/databases/libdbi/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- libdbi/distinfo 28 Mar 2014 07:38:08 - 1.2
+++ libdbi/distinfo 24 May 2017 14:25:43 -
@@ -1,2 +1,2 @@
-SHA256 (libdbi-0.8.4.tar.gz) = 7zjbYW8HUsywm4ui6sRxciNpuN7VCxU8JeI4ysLI3pk=
-SIZE (libdbi-0.8.4.tar.gz) = 1045247
+SHA256 (libdbi-0.9.0.tar.gz) = 2vts3KUkxijfgytt0L+Pq86xAySO2yF2LALTBo/KRQM=
+SIZE (libdbi-0.9.0.tar.gz) = 1194284
Index: libdbi/patches/patch-Makefile_in
===
RCS file: /cvs/ports/databases/libdbi/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-Makefile_in
--- libdbi/patches/patch-Makefile_in28 Mar 2014 07:38:09 - 1.2
+++ libdbi/patches/patch-Makefile_in24 May 2017 14:25:43 -
@@ -1,12 +1,13 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2014/03/28 07:38:09 ajacoutot Exp $
Makefile.in.orig Wed Sep 1 01:22:52 2010
-+++ Makefile.inFri Mar 28 08:35:53 2014
-@@ -195,7 +195,7 @@ top_builddir = @top_builddir@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -291,7 +291,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign dist-zip
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src include @docs_subdirs@
+SUBDIRS = src include
- EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx
TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh
drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README
drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c
drivers/example/dbd_example.h drivers/example/dbd_example.sgml
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx
TODO NEWS UPGRADING libdbi.spec.in config.h.in Makefile.w32 autogen.sh
drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README
drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c
drivers/example/dbd_example.h drivers/example/dbd_example.sgml
+
+ # we use exec here to install the .pc file with the library, not with
Index: libdbi/patches/patch-configure
===
RCS file: /cvs/ports/databases/libdbi/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- libdbi/patches/patch-configure 28 Mar 2014 07:38:09 - 1.2
+++ libdbi/patches/patch-configure 24 May 2017 14:25:43 -
@@ -1,17 +1,16 @@
-$OpenBSD: patch-configure,v 1.2 2014/03/28 07:38:09 ajacoutot Exp $
configure.orig Wed Sep 1 01:22:52 2010
-+++ configure Fri Mar 28 08:35:19 2014
-@@ -11210,9 +11210,10 @@ else
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char
-mv8 -std=gnu99"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8
-std=gnu99" ;;
- *)
--DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
--CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
--PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char
-std=gnu99" ;;
-+DEBUG="${DEBUG} -Wall -D__NO_MATH_INLINES -fsigned-char"
-+CFLAGS="${CFLAGS} -D__NO_MATH_INLINES -fsigned-char"
-+PROFILE="${PROFILE} -pg -D__NO_MATH_INLINES -fsigned-char"
-+ ;;
- esac
+$OpenBSD$
+
+Index: configure
+--- configure.orig
configure
+@@ -12139,8 +12139,8 @@ if test -z "$GCC" ; then
+DEBUG="-g $CFLAGS"
+PROFILE="-g -p $CFLAGS"
+ else
+- DEBUG="-g -Wall -std=gnu99 $CFLAGS"
+- PROFILE="-g -p -std=
Re: possible chromium regression on -current (caused by llvm)
Robert Nagy [2017-03-03, 16:01:25]: > The issue is caused by the llvm update most probably, > reverting back to llvm-3.9.1p0 fixes the issue, so it's either the > update or a commit after that. > > http://nerd.hu/chromium-56.0.2924.87p0.tgz for amd64 using llvm-3.9.1p0 this fixes the issue for me as well.
NEW: x11/p5-X11-Protocol-Other
Some extensions to X11::Protocol, required by a newer version of clusterssh. Ok to import? p5-X11-Protocol-Other.tgz Description: application/tar-gz
UPDATE: math/octave 4.0.1
maintenance update, lightly tested on amd64.
please test on other archs if possible.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.83
diff -u -p -u -r1.83 Makefile
--- Makefile11 Mar 2016 20:28:27 - 1.83
+++ Makefile9 Apr 2016 16:29:02 -
@@ -5,8 +5,7 @@ NOT_FOR_ARCHS = sparc
COMMENT = high-level language for numerical computations
-VERSION = 4.0.0
-REVISION = 3
+VERSION = 4.0.1
DISTNAME = octave-${VERSION}
CATEGORIES = math
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.15
diff -u -p -u -r1.15 distinfo
--- distinfo24 Jul 2015 14:54:01 - 1.15
+++ distinfo9 Apr 2016 16:29:02 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.0.0.tar.gz) = TH7glX9d2Hfj/rnf4HrV85sxH5Nzky8NKiidyXzKMoA=
-SIZE (octave-4.0.0.tar.gz) = 22206819
+SHA256 (octave-4.0.1.tar.gz) = DWDrji+50uy2GHL1+VKpg0P1CT/aVnLHxb1KoaYHysc=
+SIZE (octave-4.0.1.tar.gz) = 22148725
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-configure
--- patches/patch-configure 5 Nov 2015 12:49:26 - 1.7
+++ patches/patch-configure 9 Apr 2016 16:29:02 -
@@ -1,10 +1,10 @@
-$OpenBSD: patch-configure,v 1.7 2015/11/05 12:49:26 pirofti Exp $
+$OpenBSD$
Use GNU readline as our base readline lacks rl_prefer_env_winsize.
configure.orig Sun Nov 1 01:33:48 2015
-+++ configure Sun Nov 1 01:36:34 2015
-@@ -39751,13 +39751,13 @@ fi
+--- configure.orig Mon Mar 21 20:36:44 2016
configure Sun Apr 3 11:51:58 2016
+@@ -39741,13 +39741,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -21,7 +21,7 @@ Use GNU readline as our base readline la
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -39796,7 +39796,7 @@ fi
+@@ -39786,7 +39786,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -u -r1.19 PLIST
--- pkg/PLIST 24 Jul 2015 14:54:01 - 1.19
+++ pkg/PLIST 9 Apr 2016 16:29:03 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.19 2015/07/24 14:54:01 feinerer Exp $
+@comment $OpenBSD: PLIST,v 1.18 2015/03/16 18:07:50 naddy Exp $
bin/mkoctfile
@bin bin/mkoctfile-${VERSION}
bin/octave
@@ -875,37 +875,15 @@ libexec/octave/site/exec/${GNU_ARCH}/
share/appdata/
share/appdata/www.octave.org-octave.appdata.xml
share/applications/www.octave.org-octave.desktop
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/octave.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/octave.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/octave.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/octave.png
-share/icons/hicolor/256x256/
-share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/octave.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/octave.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/octave.png
-share/icons/hicolor/512x512/
-share/icons/hicolor/512x512/apps/
share/icons/hicolor/512x512/apps/octave.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/octave.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/octave.svg
share/octave/
share/octave/${VERSION}/
@@ -1036,6 +1014,10 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classes/@Pork/private/
share/octave/${VERSION}/etc/tests/fixed/classes/@Pork/private/myStash.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Pork/set.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@SizeTester/
+share/octave/${VERSION}/etc/tests/fixed/classes/@SizeTester/SizeTester.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@SizeTester/numel.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@SizeTester/size.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Sneetch/
share/octave/${VERSION}/etc/tests/fixed/classes/@Sneetch/Sneetch.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Sneetch/display.m
@@ -1170,6 +1152,7 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/te
Re: syslog-ng 3.7
Predrag Punosevac [2016-03-27, 00:21:26]:
> Dear Mr. Mestdagh,
>
> What is the reason syslog-ng is not updated to 3.7.1? Is branch 3.7
> still considered unstable for use on OpenBSD or there are some other
> problems in updating the existing 3.6.4 port.
>
please try the following diff.
Index: syslog-ng/Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.54
diff -u -p -u -r1.54 Makefile
--- syslog-ng/Makefile 18 Mar 2016 21:38:25 - 1.54
+++ syslog-ng/Makefile 3 Apr 2016 18:55:01 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.54 2016/03/18 21:38:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.53 2015/07/21 20:29:34 steven Exp $
COMMENT= syslogd replacement
-V =3.6.4
-REL = 3.6
+V =3.7.2
+REL = 3.7
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -14,11 +14,12 @@ HOMEPAGE = http://www.balabit.com/networ
# GPL v2
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
-DISTFILES =syslog-ng_$V.tar.gz
+#MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
+MASTER_SITES =
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
+#DISTFILES = syslog-ng_$V.tar.gz
-SHARED_LIBS = syslog-ng 2.0 \
- syslog-ng-${REL}2.0
+SHARED_LIBS = syslog-ng 3.0 \
+ syslog-ng-${REL}3.0
MODULES = devel/gettext
@@ -37,6 +38,7 @@ CONFIGURE_ARGS += --disable-tcp-wrapper
--enable-json \
--with-libmongo-client=no \
--with-librabbitmq-client=no \
+ --disable-python \
--disable-mongodb \
--disable-amqp \
--disable-stomp \
Index: syslog-ng/distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.23
diff -u -p -u -r1.23 distinfo
--- syslog-ng/distinfo 21 Jul 2015 20:29:34 - 1.23
+++ syslog-ng/distinfo 3 Apr 2016 18:55:01 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
-SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
+SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU=
+SIZE (syslog-ng-3.7.2.tar.gz) = 3558377
Index: syslog-ng/patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.8
diff -u -p -u -r1.8 patch-Makefile_in
--- syslog-ng/patches/patch-Makefile_in 21 Jul 2015 20:29:34 - 1.8
+++ syslog-ng/patches/patch-Makefile_in 3 Apr 2016 18:55:01 -
@@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.8 2015/07/21 20:29:34 steven Exp $
temporary hack until libtool is fixed.
Makefile.in.orig Mon Jun 8 15:44:57 2015
-+++ Makefile.inSat Jun 20 10:10:42 2015
-@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo: \
- lib/transport/$(am__dirstamp) \
- lib/transport/$(DEPDIR)/$(am__dirstamp)
+--- Makefile.in.orig Tue Oct 27 09:09:48 2015
Makefile.inSat Nov 21 01:24:57 2015
+@@ -5196,7 +5196,7 @@ lib/compat/lib_libsyslog_ng_la-strtok_r.lo: \
+ lib/compat/$(DEPDIR)/$(am__dirstamp)
+
lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS)
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES)
lib/$(am__dirstamp)
- $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir)
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
Index: syslog-ng/patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-configure
--- syslog-ng/patches/patch-configure 21 Jul 2015 20:29:34 - 1.3
+++ syslog-ng/patches/patch-configure 3 Apr 2016 18:55:01 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.3 2015/07/21 20:29:34 steven Exp $
-do not pick up libuuid
configure.orig Fri Jun 19 13:24:21 2015
-+++ configure Thu Jul 16 22:22:03 2015
-@@ -16400,6 +16400,7 @@ fi
+$OpenBSD$
+--- configure.orig Sun Apr 3 20:18:45 2016
configure Sun Apr 3 20:19:27 2016
+@@ -16790,7 +16790,7 @@ fi
else
pkg_failed=untried
fi
+-
+pkg_failed=yes
-
+ if test $pkg_failed = yes; then
Index: syslog-ng/patches/patch-lib_compat_getutent_h
===
RCS file: syslog-ng/patches/patch-lib_compat_getutent_h
d
Re: UPDATE: security/clusterssh
Steven Mestdagh [2015-11-29, 10:55:25]:
> maintenance update, also includes new csftp command.
> please test / ok
updated diff after feedback from Antoine.
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- Makefile25 Jul 2015 08:00:05 - 1.14
+++ Makefile29 Nov 2015 10:31:46 -
@@ -2,8 +2,9 @@
COMMENT= secure concurrent multi-server terminal control
-DISTNAME= App-ClusterSSH-4.03_06
-PKGNAME= clusterssh-4.03.06
+V= 4.05
+DISTNAME= App-ClusterSSH-$V
+PKGNAME= clusterssh-${V:S/_/./}
CATEGORIES=security
@@ -34,5 +35,9 @@ TEST_DEPENDS=devel/p5-Test-Trap \
devel/p5-File-Slurp
MAKE_ENV= TEST_POD=Yes
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion
+ mv ${PREFIX}/bin/clusterssh_bash_completion.dist
${PREFIX}/share/bash-completion/clusterssh
.include
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo25 Jul 2015 08:00:05 - 1.8
+++ distinfo29 Nov 2015 10:31:46 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.03_06.tar.gz) =
88XIlmnet6V5vmWg26Hhl7bYufHVs+SLigZGGT0L9vA=
-SIZE (App-ClusterSSH-4.03_06.tar.gz) = 81476
+SHA256 (App-ClusterSSH-4.05.tar.gz) =
ovonIvHPaQHapFdrLC7AnjxEqZEZEtSDMqa2beLdq9Y=
+SIZE (App-ClusterSSH-4.05.tar.gz) = 84954
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/clusterssh/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 25 Jul 2015 08:00:05 - 1.4
+++ pkg/PLIST 29 Nov 2015 10:31:46 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2015/07/25 08:00:05 steven Exp $
bin/ccon
bin/crsh
+bin/csftp
bin/cssh
bin/ctel
${P5SITE}/App/
@@ -17,6 +18,7 @@ ${P5SITE}/App/ClusterSSH/L10N.pm
${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man1/ccon.1
@man man/man1/crsh.1
+@man man/man1/csftp.1
@man man/man1/cssh.1
@man man/man1/ctel.1
@man man/man3p/App::ClusterSSH.3p
@@ -28,3 +30,5 @@ ${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man3p/App::ClusterSSH::Host.3p
@man man/man3p/App::ClusterSSH::L10N.3p
@man man/man3p/App::ClusterSSH::L10N::en.3p
+share/bash-completion/
+share/bash-completion/clusterssh
UPDATE: security/clusterssh
maintenance update, also includes new csftp command.
please test / ok
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- Makefile25 Jul 2015 08:00:05 - 1.14
+++ Makefile29 Nov 2015 09:44:05 -
@@ -2,8 +2,8 @@
COMMENT= secure concurrent multi-server terminal control
-DISTNAME= App-ClusterSSH-4.03_06
-PKGNAME= clusterssh-4.03.06
+DISTNAME= App-ClusterSSH-4.05
+PKGNAME= clusterssh-4.05
CATEGORIES=security
@@ -34,5 +34,9 @@ TEST_DEPENDS=devel/p5-Test-Trap \
devel/p5-File-Slurp
MAKE_ENV= TEST_POD=Yes
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/clusterssh
+ mv ${PREFIX}/bin/*.dist ${PREFIX}/share/examples/clusterssh
.include
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo25 Jul 2015 08:00:05 - 1.8
+++ distinfo29 Nov 2015 09:44:05 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.03_06.tar.gz) =
88XIlmnet6V5vmWg26Hhl7bYufHVs+SLigZGGT0L9vA=
-SIZE (App-ClusterSSH-4.03_06.tar.gz) = 81476
+SHA256 (App-ClusterSSH-4.05.tar.gz) =
ovonIvHPaQHapFdrLC7AnjxEqZEZEtSDMqa2beLdq9Y=
+SIZE (App-ClusterSSH-4.05.tar.gz) = 84954
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/clusterssh/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 25 Jul 2015 08:00:05 - 1.4
+++ pkg/PLIST 29 Nov 2015 09:44:05 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2015/07/25 08:00:05 steven Exp $
bin/ccon
bin/crsh
+bin/csftp
bin/cssh
bin/ctel
${P5SITE}/App/
@@ -17,6 +18,7 @@ ${P5SITE}/App/ClusterSSH/L10N.pm
${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man1/ccon.1
@man man/man1/crsh.1
+@man man/man1/csftp.1
@man man/man1/cssh.1
@man man/man1/ctel.1
@man man/man3p/App::ClusterSSH.3p
@@ -28,3 +30,5 @@ ${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man3p/App::ClusterSSH::Host.3p
@man man/man3p/App::ClusterSSH::L10N.3p
@man man/man3p/App::ClusterSSH::L10N::en.3p
+share/examples/clusterssh/
+share/examples/clusterssh/clusterssh_bash_completion.dist
remove sysutils/ns4 ?
looks like ns4 disappeared and is no longer maintained upstream. is there any interest to keep the ns4 port? if no one objects, I propose to remove it.
UPDATE: math/fftw3
this brings fftw3 up to date. its test suite works for me on amd64.
not yet tested with other ports.
feedback & more testing welcome.
Index: Makefile
===
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile
--- Makefile18 Jun 2015 07:13:04 - 1.29
+++ Makefile26 Jul 2015 20:37:35 -
@@ -3,19 +3,17 @@
COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common=common files for the fftw3 packages
-V= 3.2.2
+V= 3.3.4
DISTNAME= fftw-${V}
PKGNAME= fftw3-${V}
FULLPKGNAME-main= fftw3-${V}
# XXX set it to its default value so that bsd.port.mk won't whine
FULLPKGPATH-main= math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-common=fftw3-common-${V}
-REVISION-main= 3
-REVISION-common=1
-SHARED_LIBS= fftw3 6.0 \
- fftw3f 6.0 \
- fftw3_threads 0.0 \
- fftw3f_threads 0.0
+SHARED_LIBS= fftw3 7.0 \
+ fftw3f 7.0 \
+ fftw3_threads 1.0 \
+ fftw3f_threads 1.0
CATEGORIES=math
HOMEPAGE= http://www.fftw.org/
Index: distinfo
===
RCS file: /cvs/ports/math/fftw3/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo18 Jan 2015 03:14:27 - 1.8
+++ distinfo26 Jul 2015 20:37:35 -
@@ -1,2 +1,2 @@
-SHA256 (fftw-3.2.2.tar.gz) = aqeuZe5J65kATxWJn5u3f1R1kSLxo1AEHoHglhV9do8=
-SIZE (fftw-3.2.2.tar.gz) = 3495117
+SHA256 (fftw-3.3.4.tar.gz) = jwzekJKbwFWHwzaNLxXNBTCmC4qZEqjil5py2+WvCYI=
+SIZE (fftw-3.3.4.tar.gz) = 3940427
Index: pkg/PLIST-common
===
RCS file: /cvs/ports/math/fftw3/pkg/PLIST-common,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST-common
--- pkg/PLIST-common1 Dec 2006 14:24:55 - 1.2
+++ pkg/PLIST-common26 Jul 2015 20:37:35 -
@@ -3,7 +3,10 @@
@pkgpath math/fftw3,-common,float
bin/fftw-wisdom-to-conf
include/fftw3.f
+include/fftw3.f03
include/fftw3.h
+include/fftw3l.f03
+include/fftw3q.f03
@info info/fftw3.info
@man man/man1/fftw-wisdom-to-conf.1
share/doc/fftw3/
Re: [NEW] security/skipfish
Bryan C. Everly [2015-07-25, 12:52:21]:
> $COMMENT: active web application security reconnaissance tool
>
> pkg/DESCR:
>
> Skipfish is an active web application security reconnaissance tool. It
> prepares an interactive sitemap for the targeted site by carrying out
> a recursive crawl and dictionary-based probes. The resulting map is
> then annotated with the output from a number of active (but hopefully
> non-disruptive) security checks. The final report generated by the
> tool is meant to serve as a foundation for professional web
> application security assessments.
>
> Key features:
>
> High speed: pure C code, highly optimized HTTP handling, minimal CPU
> footprint - easily achieving 2000 requests per second with responsive
> targets.
>
> Ease of use: heuristics to support a variety of quirky web frameworks
> and mixed-technology sites, with automatic learning capabilities,
> on-the-fly wordlist creation, and form autocompletion.
>
> Cutting-edge security logic: high quality, low false positive,
> differential security checks, capable of spotting a range of subtle
> flaws, including blind injection vectors.
>
>
>
> I'd appreciate any feedback on this one. I'm working on porting
> several penetration testing tools to OpenBSD so this will be the first
> of many. I figure if you have feedback for me on this one, I can
> incorporate it into the others and not waste people's time.
>
> Thanks to @jggimi for his help in how I approach the mailing list.
>
> Thanks to Sebastian for the initial feedback on the port.
>
>
>
> Questions? Comments?
your makefile is missing some WANTLIB or LIB_DEPENDS.
src/types.h uses random(3), maybe replace that with arc4random(3).
you have some patches which hardcode /usr/local/ - it's better to patch for
e.g. !!LOCALBASE!! and then replace that with ${LOCALBASE} in pre-configure.
there are some examples of that in the tree.
Re: Remove math/qtoctave
Ingo Feinerer [2015-07-24, 19:39:52]: > Since math/octave now ships with is own GUI and > https://qtoctave.wordpress.com/ seems to be gone should we remove > math/qtoctave? ok with me.
Re: UPDATE: security/clusterssh
Stuart Henderson [2015-07-24, 12:53:21]:
> > > > Maybe, https://github.com/duncs/clusterssh ?
> > >
> > > I think the homepage is fine.
>
> > But looks like clusterssh switch to github and why not using GH_*?
> > sourceforge smells like dead and unreliability.
>
> So sourceforge had an outage. That happens to github sometimes too.
>
> However, this would be a better homepage:
> https://github.com/duncs/clusterssh/wiki
yes it seems a bit more verbose than the sf page.
ok?
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile21 Jan 2015 06:23:34 - 1.13
+++ Makefile24 Jul 2015 16:08:20 -
@@ -2,20 +2,22 @@
COMMENT= secure concurrent multi-server terminal control
-DISTNAME= App-ClusterSSH-4.02_03
-PKGNAME= clusterssh-4.02.03
-REVISION = 0
+DISTNAME= App-ClusterSSH-4.03_06
+PKGNAME= clusterssh-4.03.06
CATEGORIES=security
-HOMEPAGE= http://clusterssh.sourceforge.net/
+HOMEPAGE= https://github.com/duncs/clusterssh/wiki
+
+MAINTAINER=Steven Mestdagh
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clusterssh/}
+MASTER_SITES=
${MASTER_SITE_SOURCEFORGE:=clusterssh/}2.%20ClusterSSH%20Series%204/
MODULES= cpan
+CONFIGURE_STYLE = modbuild
RUN_DEPENDS= x11/p5-Tk \
x11/p5-X11-Protocol \
devel/p5-Try-Tiny \
@@ -28,7 +30,8 @@ TEST_DEPENDS=devel/p5-Test-Trap \
devel/p5-Test-Pod \
devel/p5-Test-Pod-Coverage \
devel/p5-Test-DistManifest \
- devel/p5-Test-Differences
+ devel/p5-Test-Differences \
+ devel/p5-File-Slurp
MAKE_ENV= TEST_POD=Yes
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo16 Mar 2014 08:54:34 - 1.7
+++ distinfo24 Jul 2015 16:08:20 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.02_03.tar.gz) =
lF+YtIdwGeT45KGrN9vkRospFJmXIvpuZomQitguEjM=
-SIZE (App-ClusterSSH-4.02_03.tar.gz) = 78159
+SHA256 (App-ClusterSSH-4.03_06.tar.gz) =
88XIlmnet6V5vmWg26Hhl7bYufHVs+SLigZGGT0L9vA=
+SIZE (App-ClusterSSH-4.03_06.tar.gz) = 81476
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/clusterssh/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 26 Jan 2012 15:37:48 - 1.3
+++ pkg/PLIST 24 Jul 2015 16:08:20 -
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/26 15:37:48 okan Exp $
bin/ccon
bin/crsh
-bin/cscp
bin/cssh
bin/ctel
${P5SITE}/App/
@@ -10,6 +9,7 @@ ${P5SITE}/App/ClusterSSH.pm
${P5SITE}/App/ClusterSSH/Base.pm
${P5SITE}/App/ClusterSSH/Cluster.pm
${P5SITE}/App/ClusterSSH/Config.pm
+${P5SITE}/App/ClusterSSH/Getopt.pm
${P5SITE}/App/ClusterSSH/Helper.pm
${P5SITE}/App/ClusterSSH/Host.pm
${P5SITE}/App/ClusterSSH/L10N/
@@ -23,6 +23,7 @@ ${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man3p/App::ClusterSSH::Base.3p
@man man/man3p/App::ClusterSSH::Cluster.3p
@man man/man3p/App::ClusterSSH::Config.3p
+@man man/man3p/App::ClusterSSH::Getopt.3p
@man man/man3p/App::ClusterSSH::Helper.3p
@man man/man3p/App::ClusterSSH::Host.3p
@man man/man3p/App::ClusterSSH::L10N.3p
Re: UPDATE: security/clusterssh
Rafael Sadowski [2015-07-20, 01:00:05]: > On Mon Jul 20, 2015 at 12:50:05AM +0200, Steven Mestdagh wrote: > > taking maintainer while here. ok? > > > > Index: Makefile > > === > > RCS file: /cvs/ports/security/clusterssh/Makefile,v > > retrieving revision 1.13 > > diff -u -p -u -r1.13 Makefile > > --- Makefile21 Jan 2015 06:23:34 - 1.13 > > +++ Makefile19 Jul 2015 22:47:41 - > > @@ -2,20 +2,22 @@ > > > > COMMENT= secure concurrent multi-server terminal control > > > > -DISTNAME= App-ClusterSSH-4.02_03 > > -PKGNAME= clusterssh-4.02.03 > > -REVISION = 0 > > +DISTNAME= App-ClusterSSH-4.03_06 > > +PKGNAME= clusterssh-4.03.06 > > > > CATEGORIES=security > > > > HOMEPAGE= http://clusterssh.sourceforge.net/ > > > > Maybe, https://github.com/duncs/clusterssh ? I think the homepage is fine. > > > bin/ccon > > bin/crsh > > -bin/cscp > > bin/cssh > > bin/ctel > > hmm, no more cscp? Nothing in the "Changes" file. The build does not install this anymore. Do you need it? We can ask upstream if needed.
UPDATE: security/clusterssh
taking maintainer while here. ok?
Index: Makefile
===
RCS file: /cvs/ports/security/clusterssh/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile21 Jan 2015 06:23:34 - 1.13
+++ Makefile19 Jul 2015 22:47:41 -
@@ -2,20 +2,22 @@
COMMENT= secure concurrent multi-server terminal control
-DISTNAME= App-ClusterSSH-4.02_03
-PKGNAME= clusterssh-4.02.03
-REVISION = 0
+DISTNAME= App-ClusterSSH-4.03_06
+PKGNAME= clusterssh-4.03.06
CATEGORIES=security
HOMEPAGE= http://clusterssh.sourceforge.net/
+MAINTAINER=Steven Mestdagh
+
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clusterssh/}
+MASTER_SITES=
${MASTER_SITE_SOURCEFORGE:=clusterssh/}2.%20ClusterSSH%20Series%204/
MODULES= cpan
+CONFIGURE_STYLE = modbuild
RUN_DEPENDS= x11/p5-Tk \
x11/p5-X11-Protocol \
devel/p5-Try-Tiny \
@@ -28,7 +30,8 @@ TEST_DEPENDS=devel/p5-Test-Trap \
devel/p5-Test-Pod \
devel/p5-Test-Pod-Coverage \
devel/p5-Test-DistManifest \
- devel/p5-Test-Differences
+ devel/p5-Test-Differences \
+ devel/p5-File-Slurp
MAKE_ENV= TEST_POD=Yes
Index: distinfo
===
RCS file: /cvs/ports/security/clusterssh/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo16 Mar 2014 08:54:34 - 1.7
+++ distinfo19 Jul 2015 22:47:41 -
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.02_03.tar.gz) =
lF+YtIdwGeT45KGrN9vkRospFJmXIvpuZomQitguEjM=
-SIZE (App-ClusterSSH-4.02_03.tar.gz) = 78159
+SHA256 (App-ClusterSSH-4.03_06.tar.gz) =
88XIlmnet6V5vmWg26Hhl7bYufHVs+SLigZGGT0L9vA=
+SIZE (App-ClusterSSH-4.03_06.tar.gz) = 81476
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/clusterssh/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 26 Jan 2012 15:37:48 - 1.3
+++ pkg/PLIST 19 Jul 2015 22:47:41 -
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2012/01/26 15:37:48 okan Exp $
bin/ccon
bin/crsh
-bin/cscp
bin/cssh
bin/ctel
${P5SITE}/App/
@@ -10,6 +9,7 @@ ${P5SITE}/App/ClusterSSH.pm
${P5SITE}/App/ClusterSSH/Base.pm
${P5SITE}/App/ClusterSSH/Cluster.pm
${P5SITE}/App/ClusterSSH/Config.pm
+${P5SITE}/App/ClusterSSH/Getopt.pm
${P5SITE}/App/ClusterSSH/Helper.pm
${P5SITE}/App/ClusterSSH/Host.pm
${P5SITE}/App/ClusterSSH/L10N/
@@ -23,6 +23,7 @@ ${P5SITE}/App/ClusterSSH/L10N/en.pm
@man man/man3p/App::ClusterSSH::Base.3p
@man man/man3p/App::ClusterSSH::Cluster.3p
@man man/man3p/App::ClusterSSH::Config.3p
+@man man/man3p/App::ClusterSSH::Getopt.3p
@man man/man3p/App::ClusterSSH::Helper.3p
@man man/man3p/App::ClusterSSH::Host.3p
@man man/man3p/App::ClusterSSH::L10N.3p
UPDATE: net/yersinia
here's an update to the latest version. seems to work on amd64, though i had
to disable mpls in the filter to fix a pcap compile error.
the interfaces.c patch is shuffled compared to the previous.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/yersinia/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- Makefile1 Jun 2013 14:18:40 - 1.8
+++ Makefile19 Jul 2015 19:08:48 -
@@ -2,9 +2,8 @@
COMMENT = framework for analysis of layer 2 network protocols
-DISTNAME = yersinia-0.7.1
+DISTNAME = yersinia-0.7.3
CATEGORIES = net security
-REVISION = 3
HOMEPAGE = http://www.yersinia.net/
@@ -25,6 +24,7 @@ CONFIGURE_ARGS = --disable-gtk \
CONFIGURE_ENV =LDFLAGS="-L${LOCALBASE}/lib" \
LIBNET_CONFIG=${LOCALBASE}/bin/libnet-config-1.1 \
CPPFLAGS="${CPPFLAGS} -DLBL_ALIGN"
+WRKDIST = ${WRKDIR}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yersinia
Index: distinfo
===
RCS file: /cvs/ports/net/yersinia/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:55 - 1.2
+++ distinfo19 Jul 2015 19:08:48 -
@@ -1,2 +1,2 @@
-SHA256 (yersinia-0.7.1.tar.gz) = nEc8SbuptSccocxvtdZDFL/2dXcvWXg3NB9Y3JM1Ghc=
-SIZE (yersinia-0.7.1.tar.gz) = 318396
+SHA256 (yersinia-0.7.3.tar.gz) = BCq8RmxbRwuXB54ASbQCmoy7ddWDz7+3VvynbkYNQLQ=
+SIZE (yersinia-0.7.3.tar.gz) = 378124
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/yersinia/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- patches/patch-configure 1 Jun 2013 14:18:40 - 1.2
+++ patches/patch-configure 19 Jul 2015 19:08:48 -
@@ -1,16 +1,16 @@
-$OpenBSD: patch-configure,v 1.2 2013/06/01 14:18:40 ajacoutot Exp $
configure.orig Fri Jan 26 20:22:30 2007
-+++ configure Tue Sep 23 14:13:54 2008
-@@ -3470,7 +3470,7 @@ fi
+$OpenBSD: patch-configure,v 1.1.1.1 2010/10/25 23:12:02 steven Exp $
+--- configure.orig Mon Sep 9 14:33:01 2013
configure Sun Jul 19 16:52:17 2015
+@@ -3809,7 +3809,7 @@ fi
if test -n "$GCC"; then
- CFLAGS="-O3 -Wall -g"
+ CFLAGS="$CFLAGS -Wall -g"
else
- { echo "$as_me:$LINENO: WARNING: Ouch!! Only gcc is supported..." >&5
- echo "$as_me: WARNING: Ouch!! Only gcc is supported..." >&2;}
-@@ -4687,7 +4687,7 @@ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ouch!! Only gcc is
supported..." >&5
+ $as_echo "$as_me: WARNING: Ouch!! Only gcc is supported..." >&2;}
+@@ -4747,7 +4747,7 @@ else
LIBNET_INCLUDE="-I$libnet_dir"
LIBNET_LINK="-L`dirname $libnet_dir`/lib"
Index: patches/patch-src_interfaces_c
===
RCS file: /cvs/ports/net/yersinia/patches/patch-src_interfaces_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-src_interfaces_c
--- patches/patch-src_interfaces_c 25 Oct 2010 23:12:02 - 1.1.1.1
+++ patches/patch-src_interfaces_c 19 Jul 2015 19:08:48 -
@@ -1,38 +1,29 @@
-$OpenBSD: patch-src_interfaces_c,v 1.1.1.1 2010/10/25 23:12:02 steven Exp $
src/interfaces.c.orig Sun Jul 16 14:37:31 2006
-+++ src/interfaces.c Mon Oct 25 23:26:02 2010
-@@ -142,6 +142,7 @@ interfaces_init(THREAD *pcap_th)
- while (index)
+$OpenBSD$
+--- src/interfaces.c.orig Mon Sep 9 14:33:01 2013
src/interfaces.c Sun Jul 19 19:27:50 2015
+@@ -221,13 +221,12 @@ interfaces_init_data_libnet( struct interface_data *in
+ if ( ( libnet_hnd = libnet_init( LIBNET_LINK, interface->ifname,
errbuflibnet ) ) )
{
- if ( (strncmp(index->name,"any",strlen(index->name))) &&
-+ (strstr(index->name,"pflog") == NULL) &&
- (index->flags != PCAP_IF_LOOPBACK) )
+ etheraddr = libnet_get_hwaddr( libnet_hnd );
++libnet_destroy( libnet_hnd );
+
+ if ( etheraddr && memcmp( (void *)etheraddr, "\x0\x0\x0\x0\x0\x0", 6
) )
{
-if ((iface_data = (struct interface_data *) calloc(1,
sizeof(struct interface_data))) == NULL) {
-@@ -321,6 +322,7 @@ interfaces_init_data(struct interface_data *interface)
+ memcpy( (void *)interface->etheraddr, (void *)etheraddr,
ETHER_ADDR_LEN );
+ }
+-
+-libnet_destroy( libnet_hnd );
+ write_log( 0," %s MAC = %02x%02x.%02x%02x.%02x%02x\n",
interface->ifname,
+etheraddr->ether_addr_octet[0],
etheraddr->ether_addr_octet[1],
+@@ -286,7 +285,9 @@ interfaces_init( THREAD *pcap_th )
- etheraddr = libnet_get_hwaddr(libnet_handler);
-+libnet_destroy(libnet_handler);
-
- if (etheraddr && memcmp((void *)etheraddr,"\x0\x0\x0\x0\x0\x0",6) )
+ while( index )
{
-@@
Re: UPDATE: sysutils/syslog-ng
Stuart Henderson [2015-07-17, 00:09:46]:
> On 2015/07/16 22:49, Steven Mestdagh wrote:
> > Update to 3.6.4.
> >
> > I was getting certificate errors on fetch, hence the modified FETCH_CMD.
> >
> > The certificate seems fine however in firefox/chromium. Looks like we do not
> > yet have the NetLock CA in our cert.pem and it needs to be added?
>
> FETCH_CMD can't be set in a port Makefile, we either need to mirror the
> distfile or add the cert to cert.pem.
we'll go with the latter option, i will add the cert soon.
here's the updated diff.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.52
diff -u -p -u -r1.52 Makefile
--- Makefile18 Jul 2015 21:39:05 - 1.52
+++ Makefile19 Jul 2015 15:13:26 -
@@ -4,10 +4,10 @@ COMMENT= syslogd replacement
SHARED_ONLY = Yes
-V =3.5.6
+V =3.6.4
+REL = 3.6
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
-REVISION = 1
MAINTAINER = Steven Mestdagh
@@ -19,8 +19,8 @@ PERMIT_PACKAGE_CDROM =Yes
MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
DISTFILES =syslog-ng_$V.tar.gz
-SHARED_LIBS = syslog-ng 1.0 \
- syslog-ng-${V} 1.0
+SHARED_LIBS = syslog-ng 2.0 \
+ syslog-ng-${REL}2.0
MODULES = devel/gettext
@@ -45,7 +45,8 @@ CONFIGURE_ARGS += --disable-tcp-wrapper
--disable-geoip \
--without-libnet \
--with-ivykis=system \
- --enable-sql
+ --enable-sql \
+ --enable-manpages
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
LIBDBI_CFLAGS="-I/usr/include/openssl" \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo31 Dec 2014 11:33:56 - 1.22
+++ distinfo19 Jul 2015 15:13:26 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY=
-SIZE (syslog-ng_3.5.6.tar.gz) = 3001992
+SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
+SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.7
diff -u -p -u -r1.7 syslog-ng.conf
--- files/syslog-ng.conf18 Jul 2015 21:39:05 - 1.7
+++ files/syslog-ng.conf19 Jul 2015 15:13:26 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.5
+@version: 3.6
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 31 Dec 2014 11:33:56 - 1.7
+++ patches/patch-Makefile_in 19 Jul 2015 15:13:26 -
@@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.7 2014/12/31 11:33:56 steven Exp $
temporary hack until libtool is fixed.
Makefile.in.orig Tue Oct 28 07:22:29 2014
-+++ Makefile.inTue Oct 28 07:23:34 2014
-@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \
- lib/$(DEPDIR)/$(am__dirstamp)
-
+--- Makefile.in.orig Mon Jun 8 15:44:57 2015
Makefile.inSat Jun 20 10:10:42 2015
+@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo: \
+ lib/transport/$(am__dirstamp) \
+ lib/transport/$(DEPDIR)/$(am__dirstamp)
lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS)
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES)
lib/$(am__dirstamp)
- $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir)
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- patches/patch-configure 31 Dec 2014 11:33:56 - 1.2
+++ patches/patch-configure 19 Jul 2015 15:13:26 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.2 2014/12/31 11:33:56 st
Re: UPDATE: sysutils/syslog-ng
Rafael Sadowski [2015-07-16, 22:59:54]: > On Thu Jul 16, 2015 at 10:49:38PM +0200, Steven Mestdagh wrote: > > Update to 3.6.4. > > --with-ivykis=system \ > > - --enable-sql > > + --enable-sql \ > > + --enable-manpages > > why? No manpages in PLIST the manpages are there. without the option, they are not installed.
UPDATE: sysutils/syslog-ng
Update to 3.6.4.
I was getting certificate errors on fetch, hence the modified FETCH_CMD.
The certificate seems fine however in firefox/chromium. Looks like we do not
yet have the NetLock CA in our cert.pem and it needs to be added?
Light testing on amd64. Other tests/comments/ok welcome.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.50
diff -u -p -u -r1.50 Makefile
--- Makefile31 Dec 2014 11:33:56 - 1.50
+++ Makefile16 Jul 2015 20:35:35 -
@@ -4,7 +4,8 @@ COMMENT=syslogd replacement
SHARED_ONLY = Yes
-V =3.5.6
+V =3.6.4
+REL = 3.6
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -17,9 +18,10 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
DISTFILES =syslog-ng_$V.tar.gz
+FETCH_CMD ?= /usr/bin/ftp -V ${_PROGRESS} -k ${FTP_KEEPALIVE} -C -S dont
-SHARED_LIBS = syslog-ng 1.0 \
- syslog-ng-${V} 1.0
+SHARED_LIBS = syslog-ng 2.0 \
+ syslog-ng-${REL}2.0
MODULES = devel/gettext
@@ -44,7 +46,8 @@ CONFIGURE_ARGS += --disable-tcp-wrapper
--disable-geoip \
--without-libnet \
--with-ivykis=system \
- --enable-sql
+ --enable-sql \
+ --enable-manpages
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
LIBDBI_CFLAGS="-I/usr/include/openssl" \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo31 Dec 2014 11:33:56 - 1.22
+++ distinfo16 Jul 2015 20:35:35 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY=
-SIZE (syslog-ng_3.5.6.tar.gz) = 3001992
+SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
+SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.5
diff -u -p -u -r1.5 syslog-ng.conf
--- files/syslog-ng.conf31 Dec 2014 11:33:56 - 1.5
+++ files/syslog-ng.conf16 Jul 2015 20:35:35 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.5
+@version: 3.6
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 31 Dec 2014 11:33:56 - 1.7
+++ patches/patch-Makefile_in 16 Jul 2015 20:35:35 -
@@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.7 2014/12/31 11:33:56 steven Exp $
temporary hack until libtool is fixed.
Makefile.in.orig Tue Oct 28 07:22:29 2014
-+++ Makefile.inTue Oct 28 07:23:34 2014
-@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \
- lib/$(DEPDIR)/$(am__dirstamp)
-
+--- Makefile.in.orig Mon Jun 8 15:44:57 2015
Makefile.inSat Jun 20 10:10:42 2015
+@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo: \
+ lib/transport/$(am__dirstamp) \
+ lib/transport/$(DEPDIR)/$(am__dirstamp)
lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS)
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES)
lib/$(am__dirstamp)
- $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir)
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- patches/patch-configure 31 Dec 2014 11:33:56 - 1.2
+++ patches/patch-configure 16 Jul 2015 20:35:35 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.2 2014/12/31 11:33:56 steven Exp $
do not pick up libuuid
configure.orig Tue Oct 28 07:38:54 2014
-+++ configure Tue Oct 28 07:40:00 2014
-@@ -15854,6 +15854,7 @@ fi
+--- configure.orig Fri Jun 19 13:24:21 2015
configure Thu Jul 16 22:22:03 2015
+@@ -16400,6 +16400,7 @@ fi
else
pkg_failed=untried
fi
Index: patches/patch-
UPDATE: net/argus
maintenance update. lightly tested on amd64.
other tests/comments welcome.
Index: Makefile
===
RCS file: /cvs/ports/net/argus/Makefile,v
retrieving revision 1.18
diff -u -p -u -r1.18 Makefile
--- Makefile26 Jan 2015 13:12:17 - 1.18
+++ Makefile16 Jul 2015 19:46:34 -
@@ -2,7 +2,7 @@
COMMENT = Audit Record Generation and Utilization System
-DISTNAME = argus-3.0.8
+DISTNAME = argus-3.0.8.1
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
Index: distinfo
===
RCS file: /cvs/ports/net/argus/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo26 Jan 2015 13:12:17 - 1.5
+++ distinfo16 Jul 2015 19:46:34 -
@@ -1,2 +1,2 @@
-SHA256 (argus-3.0.8.tar.gz) = M12InSiHY0h601RcCblE19aqJThjDR/XLuo3BKV79uM=
-SIZE (argus-3.0.8.tar.gz) = 1193140
+SHA256 (argus-3.0.8.1.tar.gz) = H7khEEyL2EP7n1ocMrV7IL/ozYoQOz8dm7aGuebEkKQ=
+SIZE (argus-3.0.8.1.tar.gz) = 523375
Index: patches/patch-argus_argus_c
===
RCS file: /cvs/ports/net/argus/patches/patch-argus_argus_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-argus_argus_c
--- patches/patch-argus_argus_c 26 Jan 2015 13:12:17 - 1.4
+++ patches/patch-argus_argus_c 16 Jul 2015 19:46:34 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-argus_argus_c,v 1.4 2015/01/26 13:12:17 steven Exp $
argus/argus.c.orig Tue Jul 15 03:48:28 2014
-+++ argus/argus.c Mon Sep 29 23:42:01 2014
-@@ -296,6 +296,7 @@ main (int argc, char *argv[])
+--- argus/argus.c.orig Tue Apr 14 16:32:33 2015
argus/argus.c Thu Jul 16 21:37:14 2015
+@@ -297,6 +297,7 @@ main (int argc, char *argv[])
uflag = 0;
pflag = 6;
@@ -9,7 +9,7 @@ $OpenBSD: patch-argus_argus_c,v 1.4 2015
if (strchr (argv[0], '/')) {
#if defined(HAVE_STRLCPY)
-@@ -304,10 +305,9 @@ main (int argc, char *argv[])
+@@ -305,10 +306,9 @@ main (int argc, char *argv[])
bzero(path, MAXPATHNAMELEN);
strncpy(path, argv[0], MAXPATHNAMELEN - 1);
#endif
@@ -21,7 +21,7 @@ $OpenBSD: patch-argus_argus_c,v 1.4 2015
#ifdef HAVE_SYSLOG
#ifndef LOG_PERROR
-@@ -372,7 +372,7 @@ main (int argc, char *argv[])
+@@ -373,7 +373,7 @@ main (int argc, char *argv[])
setArgusMarReportInterval (ArgusOutputTask,ARGUS_MARSTATUSTIMER);
if (!doconf) {
@@ -30,7 +30,7 @@ $OpenBSD: patch-argus_argus_c,v 1.4 2015
if (stat (path, &statbuf) == 0) {
ArgusParseResourceFile (ArgusModel, path);
}
-@@ -610,7 +610,7 @@ main (int argc, char *argv[])
+@@ -611,7 +611,7 @@ main (int argc, char *argv[])
if ((status = pthread_attr_init(ArgusAttr)) != 0)
ArgusLog (LOG_ERR, "pthreads init error");
UPDATE: net/argus 3.0.8
g_argus_conf 8 Jul 2012 19:20:58 - 1.3 +++ argus/patches/patch-support_Config_argus_conf 23 Jan 2015 21:47:08 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-support_Config_argus_conf,v 1.3 2012/07/08 19:20:58 steven Exp $ support/Config/argus.conf.orig Mon Feb 13 18:14:57 2012 -+++ support/Config/argus.conf Wed Jun 27 23:32:21 2012 -@@ -73,6 +73,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +$OpenBSD: patch-support_Config_argus_conf,v 1.1 2010/11/11 19:33:27 steven Exp $ +--- support/Config/argus.conf.orig Fri Jul 25 18:57:28 2014 support/Config/argus.conf Mon Sep 29 23:43:46 2014 +@@ -78,6 +78,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # #ARGUS_DAEMON=no @@ -9,22 +9,22 @@ $OpenBSD: patch-support_Config_argus_con # Argus Monitor Data is uniquely identifiable based on the source -@@ -211,12 +212,12 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -216,12 +217,13 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # an HTTP service or DNS service, you'll want to turn # promiscuous mode off. # --# The default value is go into prmiscuous mode. -+# The default value is go into promiscuous mode. +-# The default value is goes into prmiscuous mode. ++# The default value is goes into promiscuous mode. # # Commandline equivalent -p # --#ARGUS_GO_PROMISCUOUS=yes + #ARGUS_GO_PROMISCUOUS=yes +ARGUS_GO_PROMISCUOUS=no # Argus supports chroot(2) in order to control the file system that -@@ -258,7 +259,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -248,7 +250,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -u # @@ -33,7 +33,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can be directed to change its group id using the setgid() system -@@ -271,7 +272,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -261,7 +263,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -g # @@ -42,7 +42,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can write its output to one or a number of files. -@@ -290,7 +291,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -280,7 +282,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -w # @@ -51,7 +51,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can push its output to one or a number of remote hosts. -@@ -337,6 +338,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -327,6 +329,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # #ARGUS_SET_PID=yes Index: argus-clients/Makefile === RCS file: /cvs/ports/net/argus-clients/Makefile,v retrieving revision 1.11 diff -u -p -u -r1.11 Makefile --- argus-clients/Makefile 11 Mar 2013 11:35:45 - 1.11 +++ argus-clients/Makefile 23 Jan 2015 21:47:08 - @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2013/03/11 11:35:45 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2012/07/08 19:24:18 steven Exp $ COMMENT = utilities to read and parse Argus data -DISTNAME = argus-clients-3.0.6.2 +DISTNAME = argus-clients-3.0.8 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ @@ -13,14 +13,15 @@ MAINTAINER =Steven Mestdagh 0) && !defined(sun) && !defined(CYGWIN) int thread_policy; struct sched_param thread_param; - #if defined(HAVE_SCHED_GET_PRIORITY_MIN) -@@ -140,7 +140,7 @@ main (int argc, char **argv) + #if HAVE_SCHED_GET_PRIORITY_MIN +@@ -138,7 +138,7 @@ main (int argc, char **argv) if ((status = pthread_attr_init(&attr)) != 0) ArgusLog (LOG_ERR, "pthreads init error"); Index: argus-clients/patches/patch-common_argus_util_c === RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_util_c,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-common_argus_util_c --- argus-clients/patches/patch-common_argus_util_c 8 Jul 2012 19:24:18 - 1.3 +++ argus-clients/patches/patch-common_argus_util_c 23 Jan 2015 21:47:08 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_util_c,v 1.3 2012/07/08 19:24:18 steven Exp $ common/argus_util.c.orig Tue Apr 17 18:22:02 2012 -+++ common/argus_util.cWed Jun 27 22:51:25 2012 -@@ -20457,8 +20457,8 @@ ArgusLog (int priority, char *fmt, ...) +$OpenBSD$ +--- common/argus_util.c.orig Tue Aug 19 23:13:08 2014 common/argus_util.cMon Sep 29 23:50:59 2014 +@@ -22553,8 +22553,8 @@ ArgusLog (int priority, char *fmt, ...) *tptr++ = buf[i]; } Index: argus-clients/patches/patch-configure === RCS file: argus-clients/patches/patch-configure diff -N argus-clients/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 - +++ argus-clients/patches/patch-configure 23 Jan 2015 21:47:08 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- c
UPDATE: syslog-ng
below is an update to syslog-ng. tested on amd64.
tests / comments / ok ?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.48
diff -u -p -u -r1.48 Makefile
--- Makefile29 Oct 2014 09:14:50 - 1.48
+++ Makefile29 Oct 2014 22:43:54 -
@@ -4,9 +4,8 @@ COMMENT=syslogd replacement
SHARED_ONLY = Yes
-V =3.4.7
+V =3.5.6
DISTNAME = syslog-ng-$V
-REVISION = 4
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh
@@ -19,8 +18,8 @@ PERMIT_PACKAGE_CDROM =Yes
MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
DISTFILES =syslog-ng_$V.tar.gz
-SHARED_LIBS = syslog-ng 0.0 \
- syslog-ng-${V} 0.0
+SHARED_LIBS = syslog-ng 1.0 \
+ syslog-ng-${V} 1.0
MODULES = devel/gettext
@@ -41,6 +40,7 @@ CONFIGURE_ARGS += --disable-tcp-wrapper
--with-librabbitmq-client=no \
--disable-mongodb \
--disable-amqp \
+ --disable-stomp \
--disable-geoip \
--without-libnet \
--with-ivykis=system \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.21
diff -u -p -u -r1.21 distinfo
--- distinfo12 Jan 2014 20:41:11 - 1.21
+++ distinfo29 Oct 2014 22:43:54 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.4.7.tar.gz) = exEU/wvZ0sUqjOQH8PWRAupBI/9++z+EJTlh4N5qwbA=
-SIZE (syslog-ng_3.4.7.tar.gz) = 3203894
+SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY=
+SIZE (syslog-ng_3.5.6.tar.gz) = 3001992
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.4
diff -u -p -u -r1.4 syslog-ng.conf
--- files/syslog-ng.conf30 Nov 2013 10:02:12 - 1.4
+++ files/syslog-ng.conf29 Oct 2014 22:43:54 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.4
+@version: 3.5
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 29 Oct 2014 22:43:54 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+temporary hack until libtool is fixed.
+--- Makefile.in.orig Tue Oct 28 07:22:29 2014
Makefile.inTue Oct 28 07:23:34 2014
+@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \
+ lib/$(DEPDIR)/$(am__dirstamp)
+
+ lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS)
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES)
lib/$(am__dirstamp)
+- $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir)
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
+ modules/afamqp/$(am__dirstamp):
+ @$(MKDIR_P) modules/afamqp
+ @: > modules/afamqp/$(am__dirstamp)
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configure
--- patches/patch-configure 4 Dec 2013 07:13:31 - 1.1
+++ patches/patch-configure 29 Oct 2014 22:43:54 -
@@ -1,8 +1,8 @@
-$OpenBSD: patch-configure,v 1.1 2013/12/04 07:13:31 steven Exp $
+$OpenBSD$
do not pick up libuuid
configure.orig Wed Nov 27 16:40:28 2013
-+++ configure Wed Dec 4 07:53:40 2013
-@@ -15379,6 +15379,7 @@ fi
+--- configure.orig Tue Oct 28 07:38:54 2014
configure Tue Oct 28 07:40:00 2014
+@@ -15854,6 +15854,7 @@ fi
else
pkg_failed=untried
fi
Index: patches/patch-lib_Makefile_in
===
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 30 Nov 2013 10:02:12 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.3 2013/11/30 10:02:12 steven Exp $
-temporary hack until libtool is fixed.
lib/Makefile.in.orig Mon Nov 4 09:18:07 2013
-+++ lib/Makefile.inWed Nov 13 22:51:23 2013
-@@ -229,7 +229,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
- libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la
Re: UPDATE: sysutils/syslog-ng
> > this moves syslog-ng to the 3.4 branch.
> > i've tried it only on amd64 so far.
> >
> > please test/comment/ok.
>
> received no feedback yet. new diff integrating David Hill's patches below.
updated the diff to 3.4.5 - anybody else using this?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 - 1.37
+++ Makefile13 Nov 2013 21:57:34 -
@@ -4,7 +4,7 @@
SHARED_ONLY = Yes
-V =3.3.11
+V =3.4.5
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -23,12 +23,11 @@
MODULES = devel/gettext
-WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
- gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
- json-glib-1.0
+WANTLIB = c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+ glib-2.0 gmodule-2.0 gthread-2.0 json-c
LIB_DEPENDS = devel/glib2 \
- devel/json-glib \
+ devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,11 @@
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
- --with-json=json-glib \
+ --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+ --disable-amqp \
+ --without-libnet \
--with-ivykis=system \
--enable-sql
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 - 1.19
+++ distinfo13 Nov 2013 21:57:34 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.5.tar.gz) = uKadgTHvwjeNkUn/VOmfkeocR8aeD0YpOV2RDH/3G/s=
+SIZE (syslog-ng_3.4.5.tar.gz) = 3202771
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 - 1.3
+++ files/syslog-ng.conf13 Nov 2013 21:57:34 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.3
+@version: 3.4
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Nov 2012 07:04:36 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
Makefile.in.orig Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov 9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
- syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 18 Jan 2013 19:09:08 - 1.2
+++ patches/patch-lib_Makefile_in 13 Nov 2013 21:57:34 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
$OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
lib/Makefile.in.orig Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
- rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig Mon Nov 4 09:18:07 2013
lib/Makefile.inWed Nov 13 22:51:23 2013
+@@ -229,7 +229,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(
audio/mpdscribble
are there any objections to re-add mpdscribble? it works here on amd64.
there's an option to daemonize as its own user, may be useful if started
from a rc script which we could also add.
any comments/tests/ok welcome.
Index: audio/mpdscribble/Makefile
===
RCS file: audio/mpdscribble/Makefile
diff -N audio/mpdscribble/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/mpdscribble/Makefile 10 Nov 2013 20:19:44 -
@@ -0,0 +1,36 @@
+# $OpenBSD$
+
+COMMENT = mpd client to scrobble track info to last.fm
+
+V =0.22
+DISTNAME = mpdscribble-$V
+
+CATEGORIES = audio
+
+HOMEPAGE = http://mpd.wikia.com/wiki/Client:Mpdscribble
+
+MAINTAINER = Steven Mestdagh
+
+# GPLv2
+PERMIT_PACKAGE_CDROM = Yes
+
+MASTER_SITES = http://www.musicpd.org/download/mpdscribble/$V/
+
+MODULES = devel/gettext
+
+WANTLIB = c mpdclient glib-2.0 curl
+
+LIB_DEPENDS = net/curl \
+ devel/glib2 \
+ audio/libmpdclient
+
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --with-http-client=curl
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${PREFIX}/bin/mpdscribble
+ ${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1
${PREFIX}/man/man1/mpdscribble.1
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mpdscribble
+ ${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf
${PREFIX}/share/doc/mpdscribble
+
+.include
Index: audio/mpdscribble/distinfo
===
RCS file: audio/mpdscribble/distinfo
diff -N audio/mpdscribble/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/mpdscribble/distinfo 10 Nov 2013 20:15:36 -
@@ -0,0 +1,2 @@
+SHA256 (mpdscribble-0.22.tar.gz) = /4gtAr2DC9y8z+PDybDTL0+Y2b7Nto3DE190gEZfHjg=
+SIZE (mpdscribble-0.22.tar.gz) = 141480
Index: audio/mpdscribble/pkg/DESCR
===
RCS file: audio/mpdscribble/pkg/DESCR
diff -N audio/mpdscribble/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/mpdscribble/pkg/DESCR 10 Nov 2013 20:15:54 -
@@ -0,0 +1,2 @@
+mpdscribble is a Music Player Daemon (MPD) client which submits
+information about tracks being played to a scrobbler (e.g. last.fm).
Index: audio/mpdscribble/pkg/PLIST
===
RCS file: audio/mpdscribble/pkg/PLIST
diff -N audio/mpdscribble/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ audio/mpdscribble/pkg/PLIST 10 Nov 2013 20:15:54 -
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@bin bin/mpdscribble
+@man man/man1/mpdscribble.1
+share/doc/mpdscribble/
+share/doc/mpdscribble/mpdscribble.conf
+@sample ${SYSCONFDIR}/mpdscribble.conf
Re: UPDATE: sysutils/syslog-ng
Steven Mestdagh [2013-10-05, 10:07:35]:
> this moves syslog-ng to the 3.4 branch.
> i've tried it only on amd64 so far.
>
> please test/comment/ok.
received no feedback yet. new diff integrating David Hill's patches below.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 - 1.37
+++ Makefile9 Oct 2013 21:43:38 -
@@ -4,7 +4,7 @@
SHARED_ONLY = Yes
-V =3.3.11
+V =3.4.3
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -23,12 +23,11 @@
MODULES = devel/gettext
-WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
- gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
- json-glib-1.0
+WANTLIB = c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+ glib-2.0 gmodule-2.0 gthread-2.0 json-c
LIB_DEPENDS = devel/glib2 \
- devel/json-glib \
+ devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,11 @@
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
- --with-json=json-glib \
+ --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+ --disable-amqp \
+ --without-libnet \
--with-ivykis=system \
--enable-sql
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 - 1.19
+++ distinfo9 Oct 2013 21:43:38 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.3.tar.gz) = igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
+SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 - 1.3
+++ files/syslog-ng.conf9 Oct 2013 21:43:38 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.3
+@version: 3.4
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Nov 2012 07:04:36 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
Makefile.in.orig Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov 9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
- syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 18 Jan 2013 19:09:08 - 1.2
+++ patches/patch-lib_Makefile_in 9 Oct 2013 21:43:38 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
$OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
lib/Makefile.in.orig Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
- rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig Tue Aug 13 11:29:11 2013
lib/Makefile.inMon Sep 23 22:25:03 2013
+@@ -200,7 +200,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(LIBTOOLFLAGS) --mo
Re: [patch] sysutils/syslog-ng
David Hill [2013-09-24, 11:37:59]:
> Hello -
>
> This patch replaces rand() calls with arc4random(), which happens to fix
> a regress test. I also added --without-libnet to stop an ugly
> libnet-config not found on ./configure. Maybe we want to add it?
makes sense, i'll add your patches with the update i sent a few days ago.
>
> Tested on amd64 and i386 with my libivykis update.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 19 Jun 2013 20:26:05 - 1.37
> +++ Makefile 24 Sep 2013 15:35:32 -
> @@ -7,6 +7,7 @@ SHARED_ONLY = Yes
> V = 3.3.11
> DISTNAME = syslog-ng-$V
> CATEGORIES = sysutils
> +REVISION = 0
>
> MAINTAINER = Steven Mestdagh
>
> @@ -40,7 +41,8 @@ CONFIGURE_ARGS += --enable-tcp-wrapper \
> --with-libmongo-client=no \
> --disable-mongodb \
> --with-ivykis=system \
> - --enable-sql
> + --enable-sql \
> + --without-libnet
> CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
> OPENSSL_LIBS="-lssl -lcrypto" \
> LIBDBI_CFLAGS="-I/usr/include/openssl" \
> Index: patches/patch-lib_gsockaddr_c
> ===
> RCS file: patches/patch-lib_gsockaddr_c
> diff -N patches/patch-lib_gsockaddr_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_gsockaddr_c 24 Sep 2013 15:35:32 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- lib/gsockaddr.c.orig Fri Jun 14 07:54:20 2013
> lib/gsockaddr.c Tue Sep 24 01:24:06 2013
> +@@ -355,7 +355,7 @@ g_sockaddr_inet_range_new(gchar *ip, guint16 min_port,
> + addr->sa_funcs = &inet_range_sockaddr_funcs;
> + if (max_port > min_port)
> + {
> +- addr->last_port = (rand() % (max_port - min_port)) + min_port;
> ++ addr->last_port = arc4random_uniform(max_port - min_port) + min_port;
> + }
> + addr->min_port = min_port;
> + addr->max_port = max_port;
> Index: patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
> ===
> RCS file: patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
> diff -N patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c 24 Sep
> 2013 15:35:32 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +--- modules/afmongodb/libmongo-client/src/mongo-utils.c.orig Fri Jun 14
> 08:00:37 2013
> modules/afmongodb/libmongo-client/src/mongo-utils.c Tue Sep 24
> 01:44:07 2013
> +@@ -38,8 +38,7 @@ mongo_util_oid_init (gint32 mid)
> +
> + if (mid == 0)
> + {
> +- srand (time (NULL));
> +- machine_id = rand ();
> ++ machine_id = arc4random();
> + }
> + else
> + machine_id = mid;
> Index: patches/patch-modules_dbparser_patternize_c
> ===
> RCS file: patches/patch-modules_dbparser_patternize_c
> diff -N patches/patch-modules_dbparser_patternize_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-modules_dbparser_patternize_c 24 Sep 2013 15:35:32
> -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- modules/dbparser/patternize.c.orig Fri Jun 14 07:54:20 2013
> modules/dbparser/patternize.cTue Sep 24 01:25:30 2013
> +@@ -168,9 +168,8 @@ ptz_find_frequent_words(GPtrArray *logs, guint support
> + msg_progress("Finding frequent words",
> +evt_tag_str("phase", "caching"),
> +NULL);
> +- srand(time(NULL));
> + cachesize = (guint) ((logs->len * PTZ_WORDLIST_CACHE));
> +- cacheseed = rand();
> ++ cacheseed = arc4random();
> + wordlist_cache = g_new0(int, cachesize);
> + }
> + else
>
Re: [update] devel/libivykis
David Hill [2013-09-24, 11:33:42]:
> update devel/libivykis to 0.39. Tested with syslog-ng.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libivykis/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 2 Jun 2013 19:57:28 - 1.5
> +++ Makefile 24 Sep 2013 15:32:07 -
> @@ -2,7 +2,7 @@
>
> COMMENT =asynchronous I/O readiness notification library
>
> -V = 0.36.2
> +V = 0.39
> DISTNAME = ivykis-$V
> PKGNAME =lib${DISTNAME}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libivykis/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 2 Jun 2013 19:57:28 - 1.3
> +++ distinfo 24 Sep 2013 15:32:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (ivykis-0.36.2.tar.gz) = 3yoSeIfgUsXiR/CLOP19Hj+ldPvSZgMCvI6TRXVgLJQ=
> -SIZE (ivykis-0.36.2.tar.gz) = 401977
> +SHA256 (ivykis-0.39.tar.gz) = /0eoFQOfpYZJpps4Wb9aZQEz93A69U2zGIlSBpfUp4U=
> +SIZE (ivykis-0.39.tar.gz) = 408983
the reason i haven't updated it is because upstream announced 0.36 as a
stable branch. however i don't care so much what version we run, as long as
syslog-ng continues to work.
UPDATE: sysutils/syslog-ng
this moves syslog-ng to the 3.4 branch.
i've tried it only on amd64 so far.
please test/comment/ok.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 - 1.37
+++ Makefile5 Oct 2013 07:36:38 -
@@ -4,7 +4,7 @@
SHARED_ONLY = Yes
-V =3.3.11
+V =3.4.3
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -23,12 +23,11 @@
MODULES = devel/gettext
-WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
- gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
- json-glib-1.0
+WANTLIB = c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+ glib-2.0 gmodule-2.0 gthread-2.0 json-c
LIB_DEPENDS = devel/glib2 \
- devel/json-glib \
+ devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,10 @@
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
- --with-json=json-glib \
+ --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+ --disable-amqp \
--with-ivykis=system \
--enable-sql
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 - 1.19
+++ distinfo5 Oct 2013 07:36:38 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.3.tar.gz) = igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
+SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 - 1.3
+++ files/syslog-ng.conf5 Oct 2013 07:36:38 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.3
+@version: 3.4
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Nov 2012 07:04:36 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
Makefile.in.orig Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov 9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
- syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 18 Jan 2013 19:09:08 - 1.2
+++ patches/patch-lib_Makefile_in 5 Oct 2013 07:36:38 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
$OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
lib/Makefile.in.orig Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
- rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig Tue Aug 13 11:29:11 2013
lib/Makefile.inMon Sep 23 22:25:03 2013
+@@ -200,7 +200,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS)
-version-info 0:0:0 \
- $(libsyslog_ng_la_LDFLAGS) $(LDFLAGS) -o $@
+ libsyslog_ng_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
Re: UPDATE: sysutils/syslog-ng 3.3.7
Stuart Henderson [2012-11-21, 21:10:15]:
> On 2012/11/18 17:02, Steven Mestdagh wrote:
> > here is a long overdue update for syslog-ng.
> > i would appreciate if you can help to test it.
> >
> > comments/feedback welcome.
> > (i know the new shared lib and symlink hack are not yet optimal portswise,
> > but
> > i'd like to move forward with this update.)
>
> Not totally ideal, but I think that makes sense for now..
>
> > --- patches/patch-doc_man_syslog-ng_conf_5 28 May 2012 16:31:31 -
> > 1.1
> > doc/man/syslog-ng.conf.5.orig Sat May 26 11:23:41 2012
> > -+++ doc/man/syslog-ng.conf.5 Sat May 26 11:23:45 2012
> > -@@ -1,3 +1,4 @@
> > +--- doc/man/syslog-ng.conf.5.orig Sun Aug 19 18:27:24 2012
> > doc/man/syslog-ng.conf.5 Sun Oct 14 18:12:26 2012
> > +@@ -1,4 +1,5 @@
> > + '\" t
> > +'\" t
>
> This patch can be completely removed, upstream added the '\" t now.
>
> > +lib/syslog-ng/
> > +lib/syslog-ng/libaffile.la
> > +lib/syslog-ng/libaffile.so
> > +lib/syslog-ng/libafprog.la
> > +lib/syslog-ng/libafprog.so
> > +@comment lib/syslog-ng/libafsocket-notls.la
> > +lib/syslog-ng/libafsocket-notls.so
> > +lib/syslog-ng/libafsocket-tls.la
>
> One of these .la files in the modules directory is @commented but
> the others aren't, is this intentional?
mistake that slipped in when getting a previous version to work.
new diff below.
ok?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile19 Sep 2012 12:25:40 - 1.30
+++ Makefile26 Nov 2012 20:19:33 -
@@ -2,9 +2,10 @@
COMMENT= syslogd replacement
-V =3.1.4
+SHARED_ONLY = Yes
+
+V =3.3.7
DISTNAME = syslog-ng-$V
-REVISION = 9
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh
@@ -20,45 +21,53 @@
MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
DISTFILES =syslog-ng_$V.tar.gz
+SHARED_LIBS = syslog-ng 0.0 \
+ syslog-ng-${V} 0.0
+
MODULES = devel/gettext
-WANTLIB = c pcre wrap crypto ssl z glib-2.0 evtlog dbi gthread-2.0 pthread
+WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
+ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+ json-glib-1.0
LIB_DEPENDS = devel/glib2 \
+ devel/json-glib \
+ devel/libivykis \
sysutils/eventlog \
databases/libdbi
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
+ --with-libmongo-client=no \
+ --disable-mongodb \
+ --with-ivykis=system \
--enable-sql
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
LIBDBI_CFLAGS="-I/usr/include/openssl" \
LIBDBI_LIBS="-ldbi"
+USE_GMAKE =Yes
+USE_LIBTOOL = Yes
USE_GROFF =Yes
CFLAGS += -I${LOCALBASE}/include
+
+SUBST_VARS += V
DOC = ${PREFIX}/share/doc/syslog-ng/
EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
-#post-extract:
-# tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
-
-post-configure:
- cd ${WRKSRC}/src && mv Makefile Makefile.was && \
- sed '/^syslog_ng_ctl_LDADD = /s/-lwrap //' Makefile.was >
Makefile
-
pre-install:
cd ${WRKSRC}/doc/man && perl -pi -e
's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158]
post-install:
-# ${INSTALL_DATA_DIR} ${DOC}
-# ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
${INSTALL_DATA_DIR} ${EXAMPLES}
${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \
${EXAMPLES}/syslog-ng.conf.sample
+ rm -rf ${PREFIX}/share/{include,tools,xsd}
+# XXX hack for libtool dropping -rpath
+ ln -s syslog-ng/libsyslog-ng-crypto.so
${PREFIX}/lib/libsyslog-ng-crypto.so
.include
CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo1 May 2011 13:48:32 - 1.15
+++ distinfo26 Nov 2012 20:19:33 -
@@ -1,5 +1,2 @@
-MD5 (syslog-ng_3.1.4.tar.gz) = SOZkbRLTDGVfQ5G5cNYfVg==
-RMD160 (syslog-ng_3.1.4.tar.gz) = ZFIEBM98ij+D7
UPDATE: sysutils/syslog-ng 3.3.7
here is a long overdue update for syslog-ng.
i would appreciate if you can help to test it.
comments/feedback welcome.
(i know the new shared lib and symlink hack are not yet optimal portswise, but
i'd like to move forward with this update.)
Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile19 Sep 2012 12:25:40 - 1.30
+++ Makefile18 Nov 2012 15:42:18 -
@@ -2,9 +2,10 @@
COMMENT= syslogd replacement
-V =3.1.4
+SHARED_ONLY = Yes
+
+V =3.3.7
DISTNAME = syslog-ng-$V
-REVISION = 9
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh
@@ -20,45 +21,53 @@
MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
DISTFILES =syslog-ng_$V.tar.gz
+SHARED_LIBS = syslog-ng 0.0 \
+ syslog-ng-${V} 0.0
+
MODULES = devel/gettext
-WANTLIB = c pcre wrap crypto ssl z glib-2.0 evtlog dbi gthread-2.0 pthread
+WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
+ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+ json-glib-1.0
LIB_DEPENDS = devel/glib2 \
+ devel/json-glib \
+ devel/libivykis \
sysutils/eventlog \
databases/libdbi
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
+ --with-libmongo-client=no \
+ --disable-mongodb \
+ --with-ivykis=system \
--enable-sql
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
LIBDBI_CFLAGS="-I/usr/include/openssl" \
LIBDBI_LIBS="-ldbi"
+USE_GMAKE =Yes
+USE_LIBTOOL = Yes
USE_GROFF =Yes
CFLAGS += -I${LOCALBASE}/include
+
+SUBST_VARS += V
DOC = ${PREFIX}/share/doc/syslog-ng/
EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
-#post-extract:
-# tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
-
-post-configure:
- cd ${WRKSRC}/src && mv Makefile Makefile.was && \
- sed '/^syslog_ng_ctl_LDADD = /s/-lwrap //' Makefile.was >
Makefile
-
pre-install:
cd ${WRKSRC}/doc/man && perl -pi -e
's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158]
post-install:
-# ${INSTALL_DATA_DIR} ${DOC}
-# ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
${INSTALL_DATA_DIR} ${EXAMPLES}
${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \
${EXAMPLES}/syslog-ng.conf.sample
+ rm -rf ${PREFIX}/share/{include,tools,xsd}
+# XXX hack for libtool dropping -rpath
+ ln -s syslog-ng/libsyslog-ng-crypto.so
${PREFIX}/lib/libsyslog-ng-crypto.so
.include
CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo1 May 2011 13:48:32 - 1.15
+++ distinfo18 Nov 2012 15:42:18 -
@@ -1,5 +1,2 @@
-MD5 (syslog-ng_3.1.4.tar.gz) = SOZkbRLTDGVfQ5G5cNYfVg==
-RMD160 (syslog-ng_3.1.4.tar.gz) = ZFIEBM98ij+D7+QdcOkbuft6g/4=
-SHA1 (syslog-ng_3.1.4.tar.gz) = vBqmP96VINfWfF8fU0CAUUPPmDk=
-SHA256 (syslog-ng_3.1.4.tar.gz) = n0jIRSO5F1TysdOsdg4njM4xx/5eAC1inwC3jq46jNo=
-SIZE (syslog-ng_3.1.4.tar.gz) = 724071
+SHA256 (syslog-ng_3.3.7.tar.gz) = EpyR50Z1GgqedDvW4VXFwfykwusoN1FxwgsxKCK1EXs=
+SIZE (syslog-ng_3.3.7.tar.gz) = 2613938
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.2
diff -u -r1.2 syslog-ng.conf
--- files/syslog-ng.conf29 May 2012 05:19:19 - 1.2
+++ files/syslog-ng.conf18 Nov 2012 15:42:18 -
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 ste...@openbsd.org
-@version: 3.0
+@version: 3.3
options {
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 24 Sep 2010 17:54:16 - 1.4
+++ patches/patch-Makefile_in 18 Nov 2012 15:42:18 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2010/09/24 17:54:16 steven Exp $
Makefile.in.orig Mon Aug 2 17:26:31 2010
-+++ Makefile.inWed Aug 4
Re: fftw3 threaded libs
Kirill Bychkov [2012-10-13, 17:10:24]:
> Hi. This patch enables threaded libs in math/fftw3. The are required by
> upcoming luminance-hdr port.
> Regression tests were completed with no errors on amd64. Also tested with
> scorched3d game - no fallout.
> OK to commit?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/fftw3/Makefile,v
> retrieving revision 1.22
> diff -u -r1.22 Makefile
> --- Makefile 29 Mar 2012 13:38:40 - 1.22
> +++ Makefile 16 Jul 2012 06:07:14 -
> @@ -10,10 +10,12 @@
> # XXX set it to its default value so that bsd.port.mk won't whine
> FULLPKGPATH-main=math/fftw3,-main${FLAVOR_EXT:S/-/,/g}
> FULLPKGNAME-common= fftw3-common-${V}
> -REVISION-main= 0
> +REVISION-main= 1
> REVISION-common=0
> SHARED_LIBS= fftw3 5.0 \
> - fftw3f 5.0
> + fftw3f 5.0 \
> + fftw3_threads 0.0 \
> + fftw3f_threads 0.0
> CATEGORIES= math
>
> HOMEPAGE=http://www.fftw.org/
> @@ -40,7 +42,8 @@
> USE_GROFF = Yes
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> - --enable-portable-binary
> + --enable-portable-binary \
> + --enable-threads
this adds -pthread everywhere and records libpthread as NEEDED in the main
library as well.
maybe bump all the libraries to be safe?
tests have no errors on i386.
NEW: devel/libivykis
this is a library used by more recent versions of syslog-ng. i'd like to get it in our tree, so the syslog-ng port can use it instead of building its own copy. the tests pass on amd64. please test/comment/ok. DESCR: libivykis is a library for asynchronous I/O readiness notification. It is a thin, portable wrapper around OS-provided mechanisms such as kqueue(2) and poll(2). libivykis was mainly designed for building high-performance network applications, but can be used in any event-driven application that uses poll(2)able file descriptors as its event sources. While some programming models dictate using blocking I/O and starting a thread per event source, programs written to the ivykis API are generally single-threaded (or use only a small number of threads), and never block on I/O. All input and output is done in a nonblocking fashion, with I/O readiness notifications delivered via callback functions. libivykis.tgz Description: application/tar-gz
Re: UPDATE: net/argus & argus-clients
Steven Mestdagh [2012-06-28, 00:17:21]:
> Here's an update to 3.0.6. Please test/comment.
and here's a diff that should work better.
Index: argus/Makefile
===
RCS file: /cvs/ports/net/argus/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- argus/Makefile 17 May 2012 07:44:40 - 1.14
+++ argus/Makefile 28 Jun 2012 05:48:13 -
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2012/05/17 07:44:40 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/11/16 00:10:31 sthen Exp $
COMMENT = Audit Record Generation and Utilization System
-DISTNAME = argus-3.0.2
-REVISION = 6
+DISTNAME = argus-3.0.6
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
@@ -17,7 +16,7 @@
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c m pcap
+WANTLIB = c m pcap z
USE_GROFF =Yes
NO_REGRESS = Yes
@@ -26,7 +25,7 @@
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config
BUILD_DEPENDS =devel/bison
-MAKE_FLAGS = CCOPT=
+MAKE_FLAGS = CCOPT="${CFLAGS}"
INSTALL_TARGET = install
post-install:
Index: argus/distinfo
===
RCS file: /cvs/ports/net/argus/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- argus/distinfo 15 Apr 2010 19:15:19 - 1.2
+++ argus/distinfo 28 Jun 2012 05:48:13 -
@@ -1,5 +1,5 @@
-MD5 (argus-3.0.2.tar.gz) = fcbr4DvIQKd33ZNEfSaaMQ==
-RMD160 (argus-3.0.2.tar.gz) = 0zM4hrN6ZdBYaZvGOHcfMJF7cpU=
-SHA1 (argus-3.0.2.tar.gz) = Z04JxlSIyn1Xz9/LM/bP2N8BUtU=
-SHA256 (argus-3.0.2.tar.gz) = uXRTc5Ra5NQilzglmAWHfwm1Mf7qYpY3J2EmVpleHVA=
-SIZE (argus-3.0.2.tar.gz) = 392854
+MD5 (argus-3.0.6.tar.gz) = 29+PDEgH+jPcArNwiYf7EA==
+RMD160 (argus-3.0.6.tar.gz) = fD3Pgg8WQJo5PlaLaEMLLZNd0sA=
+SHA1 (argus-3.0.6.tar.gz) = b47q/FCvzP9TttFJ/8tR4w9/Nbo=
+SHA256 (argus-3.0.6.tar.gz) = 13WnW5VIGHSWIXsB3Q7zRVpNbVYvsHpX5RlEUjXCjQs=
+SIZE (argus-3.0.6.tar.gz) = 829744
Index: argus/patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/argus/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- argus/patches/patch-Makefile_in 15 Apr 2010 19:15:19 - 1.2
+++ argus/patches/patch-Makefile_in 28 Jun 2012 05:48:13 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/04/15 19:15:19 steven Exp $
Makefile.in.orig Wed Oct 7 19:13:20 2009
-+++ Makefile.inSat Apr 10 12:32:04 2010
+$OpenBSD$
+--- Makefile.in.orig Wed Jan 4 01:00:23 2012
Makefile.inWed Jun 27 22:25:19 2012
@@ -34,7 +34,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
@@ -19,9 +19,9 @@
- [ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \
- (mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755
$(DESTDIR)$(exec_prefix)/argus/archive)
- @-for d in $(INSTDIRS); \
+ @-for d in $(DIRS); \
do \
-@@ -100,7 +96,6 @@ install-doc: force
+@@ -102,7 +98,6 @@ install-doc: force
$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
@@ -29,7 +29,7 @@
uninstall:
rm -f $(DESTDIR)@mandir@/man5/argus.5
-@@ -117,7 +112,7 @@ uninstall:
+@@ -119,7 +114,7 @@ uninstall:
installdirs:
${srcdir}/config/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)\
Index: argus/patches/patch-argus_Makefile_in
===
RCS file: /cvs/ports/net/argus/patches/patch-argus_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-argus_Makefile_in
--- argus/patches/patch-argus_Makefile_in 10 Sep 2011 11:55:26 -
1.1
+++ argus/patches/patch-argus_Makefile_in 28 Jun 2012 05:48:13 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-argus_Makefile_in,v 1.1 2011/09/10 11:55:26 naddy Exp $
argus/Makefile.in.orig Thu Sep 8 17:36:27 2011
-+++ argus/Makefile.in Thu Sep 8 17:38:25 2011
+$OpenBSD$
+--- argus/Makefile.in.orig Wed Jan 4 01:15:19 2012
argus/Makefile.in Wed Jun 27 22:27:06 2012
@@ -19,6 +19,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -9,12 +9,12 @@
# Pathname of directory to install the system binaries
SBINDIR = @sbindir@
-@@ -45,7 +46,7 @@ WRAPLIBS = @WRAPLIBS@
+@@ -46,7 +47,7 @@ SASLLIBS = @LIB_SASL@
CC = @CC@
CCOPT = @V_CCOPT@
INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include
--DEFS = @DEFS@ -DARGUS_SYSLOG=1
-+DEFS = @DEFS@ -DARGUS_SYSLOG=1 -DSYSCONFDIR=\"$(sysconfdir)\"
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\"
#DEFS = -DARGUSPERFMETRICS=1 @DEFS@
Index: argus/patches/patch-argus_argus_c
=
UPDATE: net/argus & argus-clients
Here's an update to 3.0.6. Please test/comment.
Index: Makefile
===
RCS file: /cvs/ports/net/argus/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile17 May 2012 07:44:40 - 1.14
+++ Makefile27 Jun 2012 21:34:35 -
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2012/05/17 07:44:40 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/11/16 00:10:31 sthen Exp $
COMMENT = Audit Record Generation and Utilization System
-DISTNAME = argus-3.0.2
-REVISION = 6
+DISTNAME = argus-3.0.6
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
@@ -17,7 +16,7 @@
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c m pcap
+WANTLIB = c m pcap z
USE_GROFF =Yes
NO_REGRESS = Yes
Index: distinfo
===
RCS file: /cvs/ports/net/argus/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo15 Apr 2010 19:15:19 - 1.2
+++ distinfo27 Jun 2012 21:34:35 -
@@ -1,5 +1,5 @@
-MD5 (argus-3.0.2.tar.gz) = fcbr4DvIQKd33ZNEfSaaMQ==
-RMD160 (argus-3.0.2.tar.gz) = 0zM4hrN6ZdBYaZvGOHcfMJF7cpU=
-SHA1 (argus-3.0.2.tar.gz) = Z04JxlSIyn1Xz9/LM/bP2N8BUtU=
-SHA256 (argus-3.0.2.tar.gz) = uXRTc5Ra5NQilzglmAWHfwm1Mf7qYpY3J2EmVpleHVA=
-SIZE (argus-3.0.2.tar.gz) = 392854
+MD5 (argus-3.0.6.tar.gz) = 29+PDEgH+jPcArNwiYf7EA==
+RMD160 (argus-3.0.6.tar.gz) = fD3Pgg8WQJo5PlaLaEMLLZNd0sA=
+SHA1 (argus-3.0.6.tar.gz) = b47q/FCvzP9TttFJ/8tR4w9/Nbo=
+SHA256 (argus-3.0.6.tar.gz) = 13WnW5VIGHSWIXsB3Q7zRVpNbVYvsHpX5RlEUjXCjQs=
+SIZE (argus-3.0.6.tar.gz) = 829744
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/argus/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 15 Apr 2010 19:15:19 - 1.2
+++ patches/patch-Makefile_in 27 Jun 2012 21:34:35 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/04/15 19:15:19 steven Exp $
Makefile.in.orig Wed Oct 7 19:13:20 2009
-+++ Makefile.inSat Apr 10 12:32:04 2010
+$OpenBSD$
+--- Makefile.in.orig Wed Jan 4 01:00:23 2012
Makefile.inWed Jun 27 22:25:19 2012
@@ -34,7 +34,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
@@ -19,9 +19,9 @@
- [ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \
- (mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755
$(DESTDIR)$(exec_prefix)/argus/archive)
- @-for d in $(INSTDIRS); \
+ @-for d in $(DIRS); \
do \
-@@ -100,7 +96,6 @@ install-doc: force
+@@ -102,7 +98,6 @@ install-doc: force
$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir)
$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir)
$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
@@ -29,7 +29,7 @@
uninstall:
rm -f $(DESTDIR)@mandir@/man5/argus.5
-@@ -117,7 +112,7 @@ uninstall:
+@@ -119,7 +114,7 @@ uninstall:
installdirs:
${srcdir}/config/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)\
Index: patches/patch-argus_Makefile_in
===
RCS file: /cvs/ports/net/argus/patches/patch-argus_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-argus_Makefile_in
--- patches/patch-argus_Makefile_in 10 Sep 2011 11:55:26 - 1.1
+++ patches/patch-argus_Makefile_in 27 Jun 2012 21:34:35 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-argus_Makefile_in,v 1.1 2011/09/10 11:55:26 naddy Exp $
argus/Makefile.in.orig Thu Sep 8 17:36:27 2011
-+++ argus/Makefile.in Thu Sep 8 17:38:25 2011
+$OpenBSD$
+--- argus/Makefile.in.orig Wed Jan 4 01:15:19 2012
argus/Makefile.in Wed Jun 27 22:27:06 2012
@@ -19,6 +19,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -9,12 +9,12 @@
# Pathname of directory to install the system binaries
SBINDIR = @sbindir@
-@@ -45,7 +46,7 @@ WRAPLIBS = @WRAPLIBS@
+@@ -46,7 +47,7 @@ SASLLIBS = @LIB_SASL@
CC = @CC@
CCOPT = @V_CCOPT@
INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include
--DEFS = @DEFS@ -DARGUS_SYSLOG=1
-+DEFS = @DEFS@ -DARGUS_SYSLOG=1 -DSYSCONFDIR=\"$(sysconfdir)\"
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\"
#DEFS = -DARGUSPERFMETRICS=1 @DEFS@
Index: patches/patch-argus_argus_c
===
RCS file: /cvs/ports/net/argus/patches/patch-argus_argus_c,v
retrieving revision 1.2
diff -u -r1.2 patch-argus_argus_c
--- patches/patch-argus_argus_c 17 May 2012 05:01:35 - 1.2
+++ patches/patch-argus_argus_c 27 Jun 2012 21:34:35 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-argus_argus_c,v 1.2 2012/05/17 05:01:35 ajacoutot Exp $
argus/argus.c.orig Tue Nov 10 10:43:21 2009
-+++ argus/argus.c Tue May 15 22:43:51 2012
-@@ -
