Re: UPDATE: Boost 1.73

2021-03-19 Thread Brad Smith
On Sun, Feb 07, 2021 at 09:55:34PM -0500, Brad Smith wrote:
> Here is an update to Boost 1.73.
> 
> I have provided patches to fix building leatherman, gnuradio, pokerth, and 
> rstudio.
> 
> That leaves monotone, mongodb, and returntotheroots that need fixing.
> 
> Looking for any assistance with the remaining 3.
 
Here is an updated diff for Boost.

I am just waiting for Brian to roll a newer snapshot release of returntotheroots
which should resolve the build issues there and we should be good to go.


Index: boost/Makefile
===
RCS file: /home/cvs/ports/devel/boost/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- boost/Makefile  1 Feb 2021 12:00:51 -   1.107
+++ boost/Makefile  5 Feb 2021 22:19:26 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS-md = aarch64 amd64 arm i3
 COMMENT-main=  free peer-reviewed portable C++ source libraries
 COMMENT-md=machine-dependent libraries for boost
 
-VERSION=   1.72.0
+VERSION=   1.73.0
 DISTNAME=  boost_${VERSION:S/./_/g}
 PKGNAME-main=  boost-${VERSION}
 PKGNAME-md=boost-md-${VERSION}
@@ -14,10 +14,11 @@ MASTER_SITES=   https://dl.bintray.com/boo
 EXTRACT_SUFX=  .tar.bz2
 FIX_EXTRACT_PERMISSIONS =  Yes
 
-SO_VERSION=13.0
+SO_VERSION=14.0
 BOOST_LIBS=boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
+   boost_contract boost_contract-mt \
boost_date_time-mt boost_date_time \
boost_filesystem-mt boost_filesystem \
boost_graph-mt boost_graph \
@@ -31,6 +32,7 @@ BOOST_LIBS=   boost_atomic-mt \
boost_math_tr1-mt boost_math_tr1 \
boost_math_tr1f-mt boost_math_tr1f \
boost_math_tr1l-mt boost_math_tr1l \
+   boost_nowide-mt boost_nowide \
boost_prg_exec_monitor-mt boost_prg_exec_monitor \
boost_program_options-mt boost_program_options \
boost_numpy38-mt boost_numpy38 \
@@ -44,8 +46,7 @@ BOOST_LIBS=   boost_atomic-mt \
boost_unit_test_framework-mt boost_unit_test_framework \
boost_wserialization-mt boost_wserialization \
boost_wave-mt boost_wave \
-   boost_type_erasure-mt boost_type_erasure \
-   boost_contract boost_contract-mt
+   boost_type_erasure-mt boost_type_erasure
 
 # MD
 BOOST_LIBS+=   boost_context-mt \
Index: boost/distinfo
===
RCS file: /home/cvs/ports/devel/boost/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- boost/distinfo  1 Feb 2021 12:00:51 -   1.13
+++ boost/distinfo  5 Feb 2021 21:05:49 -
@@ -1,2 +1,2 @@
-SHA256 (boost_1_72_0.tar.bz2) = WcmydLxFHPkam6HdLH/cr11gsbOqg/LJ+hQ0F8xmByI=
-SIZE (boost_1_72_0.tar.bz2) = 106907358
+SHA256 (boost_1_73_0.tar.bz2) = TrO41EK0Jtw1NGI1yHM7WuNbpDFpDjjGqCY9zp/LtAI=
+SIZE (boost_1_73_0.tar.bz2) = 109247910
Index: boost/patches/patch-Jamroot
===
RCS file: /home/cvs/ports/devel/boost/patches/patch-Jamroot,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Jamroot
--- boost/patches/patch-Jamroot 1 Feb 2021 12:00:51 -   1.9
+++ boost/patches/patch-Jamroot 5 Feb 2021 21:12:04 -
@@ -5,7 +5,7 @@ Index: Jamroot
 +++ Jamroot
 @@ -146,8 +146,9 @@ import tools/boost\_install/boost-install ;
  path-constant BOOST_ROOT : . ;
- constant BOOST_VERSION : 1.72.0 ;
+ constant BOOST_VERSION : 1.73.0 ;
  constant BOOST_JAMROOT_MODULE : $(__name__) ;
 +constant SO_VERSION : ${SO_VERSION} ;
  
Index: boost/patches/patch-boost_asio_detail_config_hpp
===
RCS file: 
/home/cvs/ports/devel/boost/patches/patch-boost_asio_detail_config_hpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-boost_asio_detail_config_hpp
--- boost/patches/patch-boost_asio_detail_config_hpp1 Feb 2021 12:00:51 
-   1.4
+++ boost/patches/patch-boost_asio_detail_config_hpp5 Feb 2021 21:12:01 
-
@@ -5,7 +5,7 @@ Use _POSIX_VERSION to detect support for
 Index: boost/asio/detail/config.hpp
 --- boost/asio/detail/config.hpp.orig
 +++ boost/asio/detail/config.hpp
-@@ -1475,4 +1475,15 @@
+@@ -1480,4 +1480,15 @@
  # endif // defined(__clang__)
  #endif // !defined(BOOST_ASIO_HAS_CO_AWAIT)
  
Index: boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
===
RCS file: boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
diff -N boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ boost/patches/patch-boost_beast__experimental_http_impl_icy_stream_hpp  
5 Feb 2021 23:19:48 -
@@ -0,0 +1,23 @@
+$OpenBSD

Re: [patch] exim 4.94 add dmarc

2021-03-19 Thread Renaud Allard



On 19/03/2021 16:55, Stuart Henderson wrote:

On 2021/03/19 09:31, Renaud Allard wrote:

Hello,

Here is a quick patch to add dmarc functionality to exim.


committed with a tweak,


Thanks



   
   # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory

   # using the name "exim-daemon.pid".
+@@ -1494,3 +1494,12 @@ EXIM_TMPDIR="/tmp"
+ # CFLAGS += -DMEASURE_TIMING
+
+ # End of EDITME for Exim 4.
++EXIM_MONITOR=eximon.bin
++ LOOKUP_MYSQL=yes
++ BIN_DIRECTORY=/usr/local/bin
++ CONFIGURE_FILE=/etc/exim/configure
++ LOOKUP_INCLUDE=-I/usr/local/include/mysql
++ LOOKUP_LIBS=-L/usr/local/lib/mysql -lmysqlclient
++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
++ CFLAGS+=-O2 -pipe -g
++ INCLUDE=-I/usr/local/include


this part shouldn't be in the patch, I removed it and adjusted the
port Makefile so that it prefixes it with a comment warning of the
issue.



Ah, yes, sorry, I forgot removing it this time



smime.p7s
Description: S/MIME Cryptographic Signature


aarch64 bulk build report

2021-03-19 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Wed Mar 17 01:35:39 MDT 2021
finished at Fri Mar 19 13:46:14 MDT 2021
lasted 2D12h10m
done with kern.version=OpenBSD 6.9-beta (GENERIC.MP) #1078: Tue Mar 16 14:20:05 
MDT 2021

built packages:11034
Mar 17:3872
Mar 18:2065
Mar 19:5096


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2021-03-17/summary.log

build failures: 19
http://build-failures.rhaalovely.net/aarch64/2021-03-17/audio/audacious/plugins,qt5.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/audio/clementine.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/comms/gnuradio.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/comms/hylafax.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/converters/wv2.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/editors/calligra.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/editors/micro.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/editors/xwpe.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/emulators/vice.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/games/lwjgl3.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/games/shockolate.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/lang/zig.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/net/termshark.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/shells/nsh,static.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/sysutils/nomad.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/sysutils/telegraf.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/sysutils/terragrunt.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/www/seamonkey,-lightning.log
http://build-failures.rhaalovely.net/aarch64/2021-03-17/x11/lightly.log

recurrent failures
 failures/audio/audacious/plugins,qt5.log
 failures/comms/gnuradio.log
 failures/converters/wv2.log
 failures/editors/calligra.log
 failures/editors/micro.log
 failures/editors/xwpe.log
 failures/emulators/vice.log
 failures/games/lwjgl3.log
 failures/games/shockolate.log
 failures/lang/zig.log
 failures/sysutils/nomad.log
 failures/sysutils/telegraf.log
 failures/sysutils/terragrunt.log
 failures/www/seamonkey,-lightning.log
new failures
+++ ls-failures Fri Mar 19 13:46:24 2021
+failures/audio/clementine.log
+failures/comms/hylafax.log
+failures/net/termshark.log
+failures/shells/nsh,static.log
+failures/x11/lightly.log
resolved failures
--- ../old/aarch64/last//ls-failuresThu Mar 11 23:42:06 2021
-failures/games/libgdx.log
-failures/lang/ghc.log
-failures/multimedia/lives.log
-failures/security/age.log
-failures/x11/lxqt/libfm-qt.log



Re: [patch] exim 4.94 add dmarc

2021-03-19 Thread Stuart Henderson
On 2021/03/19 09:31, Renaud Allard wrote:
> Hello,
> 
> Here is a quick patch to add dmarc functionality to exim.

committed with a tweak,

>   
>   # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
>   # using the name "exim-daemon.pid".
> +@@ -1494,3 +1494,12 @@ EXIM_TMPDIR="/tmp"
> + # CFLAGS += -DMEASURE_TIMING
> + 
> + # End of EDITME for Exim 4.
> ++EXIM_MONITOR=eximon.bin
> ++ LOOKUP_MYSQL=yes
> ++ BIN_DIRECTORY=/usr/local/bin
> ++ CONFIGURE_FILE=/etc/exim/configure
> ++ LOOKUP_INCLUDE=-I/usr/local/include/mysql
> ++ LOOKUP_LIBS=-L/usr/local/lib/mysql -lmysqlclient
> ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
> ++ CFLAGS+=-O2 -pipe -g  
> ++ INCLUDE=-I/usr/local/include

this part shouldn't be in the patch, I removed it and adjusted the
port Makefile so that it prefixes it with a comment warning of the
issue.



Re: [UPDATE] textproc/lowdown to 0.8.3

2021-03-19 Thread Bryan Vyhmeister
On Thu, Mar 18, 2021 at 11:50:04AM +0100, Frederic Cambus wrote:
> Hi ports@,
> 
> Here is a diff to update lowdown to 0.8.3.
> 
> Those versions bring several bugfixes and split lowdown(1) into
> lowdown-diff(1) for easier reading.
> 
> Comments? OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/lowdown/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile  13 Feb 2021 19:37:15 -  1.24
> +++ Makefile  18 Mar 2021 09:49:57 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.24 2021/02/13 19:37:15 fcambus Exp $
>  
>  COMMENT =simple markdown translator
> -DISTNAME =   lowdown-0.8.1
> +DISTNAME =   lowdown-0.8.3
>  CATEGORIES = textproc
>  
>  HOMEPAGE =   https://kristaps.bsd.lv/lowdown/
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/lowdown/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- distinfo  13 Feb 2021 19:37:15 -  1.21
> +++ distinfo  18 Mar 2021 09:49:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (lowdown-0.8.1.tar.gz) = 5ptxsGvCblOLpDtVE0uTGnWAubyEZrX5JAi7zYNU85Q=
> -SIZE (lowdown-0.8.1.tar.gz) = 196068
> +SHA256 (lowdown-0.8.3.tar.gz) = jKuGzHEMAv28Yae9cW/YlqRL2t4uFtyIr9x2rguw7yo=
> +SIZE (lowdown-0.8.3.tar.gz) = 201286
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- pkg/PLIST 13 Feb 2021 19:37:15 -  1.11
> +++ pkg/PLIST 18 Mar 2021 09:49:57 -
> @@ -4,6 +4,7 @@
>  include/lowdown.h
>  @static-lib lib/liblowdown.a
>  lib/pkgconfig/lowdown.pc
> +@man man/man1/lowdown-diff.1
>  @man man/man1/lowdown.1
>  @man man/man3/lowdown.3
>  @man man/man3/lowdown_buf.3

OK maintainer. Thanks for working on this.

Bryan



Re: Move audacious to qt5

2021-03-19 Thread Stuart Henderson
On 2021/03/19 14:12, Bjorn Ketelaars wrote:
> I would like to fix this issue as it is likely that a release is coming
> up soon. There are two solutions:
> 1. Temporarily disable the qt5 flavor and work on a solution after
>release
> 2. Move away from gtk in favor of qt5
> 
> It seems that upstream of audacious is slowly moving towards qt5, which
> means that option 2 makes the most sense. As such, i would like to
> propose to move audacious to Qt5. FWIW the winamp classic interface
> still works.

I don't use audacious so won't comment on which of the two I prefer,
but if you're going this way then the ports parts are good and your
diff is OK with me.



Move audacious to qt5

2021-03-19 Thread Bjorn Ketelaars
Recently a qt5-flavor has been added to audacious, which ran in a
dpb-related issue:

audacious/plugins,  depends on audacious/player,
audacious/plugins,qt5   depends on audacious/player,qt5

audacious/player, and audacious/player,qt5 conflict, which means that
whichever flavor is built first prevents the other flavor from building,
unless this happens on different machines or dpb "junks" no longer
needed installed packages in between.

A similar situation used to exist with kde3/kde4 for which a fix has
been introduced (DPB_PROPERTIES=tag:{kde3,kde4}). Unfortunately only one
set of tags can exist meaning that using this mechanism for audacious is
kind of a hack.

I would like to fix this issue as it is likely that a release is coming
up soon. There are two solutions:
1. Temporarily disable the qt5 flavor and work on a solution after
   release
2. Move away from gtk in favor of qt5

It seems that upstream of audacious is slowly moving towards qt5, which
means that option 2 makes the most sense. As such, i would like to
propose to move audacious to Qt5. FWIW the winamp classic interface
still works.

Diff below has been run tested and 'pkg_add -u' seems to update a
previously installed qt5-flavor without any issue.

Opinions/comments/OKs?


diff --git audio/audacious/Makefile audio/audacious/Makefile
index 683fa32c7b8..e2415936d9c 100644
--- audio/audacious/Makefile
+++ audio/audacious/Makefile
@@ -2,8 +2,6 @@
 
  SUBDIR =
  SUBDIR += player
- SUBDIR += player,qt5
  SUBDIR += plugins
- SUBDIR += plugins,qt5
 
 .include 
diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
index a1116baf1e1..ecb3d0f0505 100644
--- audio/audacious/Makefile.inc
+++ audio/audacious/Makefile.inc
@@ -18,20 +18,9 @@ FIX_EXTRACT_PERMISSIONS =Yes
 
 BUILD_DEPENDS +=   devel/gettext,-tools
 
-# Although at fist glance it may appear that we could MULTI_PACKAGE audacious,
-# actually we can't. Some core libraries will link qt5 if we build with both
-# toolkits. So we use FLAVORS instead.
-# https://redmine.audacious-media-player.org/issues/1071
-
-.if ${FLAVOR:Mqt5}
 MODULES += x11/qt5
 CONFIGURE_ARGS +=  --disable-gtk \
--enable-qt
-.else
-LIB_DEPENDS += x11/gtk+2
-CONFIGURE_ARGS +=  --disable-qt \
-   --enable-gtk
-.endif
 
 USE_GMAKE =Yes
 
diff --git audio/audacious/player/Makefile audio/audacious/player/Makefile
index afcc54a3887..5beed0b42a7 100644
--- audio/audacious/player/Makefile
+++ audio/audacious/player/Makefile
@@ -4,39 +4,21 @@ COMMENT = graphical audio player which supports 
lots of formats
 
 DISTNAME = audacious-${VERSION}
 PKGNAME =  audacious-player-${VERSION}
-REVISION = 0
-
-FLAVORS =  qt5
-FLAVOR ?=
+REVISION = 1
 
 SHARED_LIBS += audcore 5.2 # 5.3
-SHARED_LIBS += audgui  4.1 # 5.1
 SHARED_LIBS += audtag  3.0 # 3.0
 SHARED_LIBS += audqt   0.0 # 2.3
 
 # BSD
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl m
-
-.if ${FLAVOR:Mqt5}
-WANTLIB += Qt5Core Qt5Gui Qt5Widgets
-.else
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 z
-.endif
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl m
 
 RUN_DEPENDS =  devel/desktop-file-utils
 
-.if !${FLAVOR:Mqt5}
-RUN_DEPENDS += x11/gtk+3,-guic
-.endif
-
 MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
-   LIBaudgui_VERSION=${LIBaudgui_VERSION} \
LIBaudtag_VERSION=${LIBaudtag_VERSION} \
LIBaudqt_VERSION=${LIBaudqt_VERSION}
 
diff --git audio/audacious/player/pkg/PFRAG.no-qt5 
audio/audacious/player/pkg/PFRAG.no-qt5
deleted file mode 100644
index 6d6232c77e9..000
--- audio/audacious/player/pkg/PFRAG.no-qt5
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.no-qt5,v 1.1 2021/02/19 20:44:45 edd Exp $
-include/libaudgui/
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
-@lib lib/libaudgui.so.${LIBaudgui_VERSION}
diff --git audio/audacious/player/pkg/PFRAG.qt5 
audio/audacious/player/pkg/PFRAG.qt5
deleted file mode 100644
index 8e360e559ed..000
--- audio/audacious/player/pkg/PFRAG.qt5
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $OpenBSD: PFRAG.qt5,v 1.1 2021/02/19 20:44:45 edd Exp $
-include/libaudqt/
-include/libaudqt/colorbutton.h
-include/libaudqt/dock.h
-include/libaudqt/export.h
-include/libaudqt/iface.h
-include/libaudqt/info-widget.h
-include/libaudqt/libaudqt.h
-include/libaudqt/

[patch] exim 4.94 add dmarc

2021-03-19 Thread Renaud Allard

Hello,

Here is a quick patch to add dmarc functionality to exim.

Best Regards
Index: Makefile
===
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.131
diff -u -p -r1.131 Makefile
--- Makefile	2 Jun 2020 12:44:19 -	1.131
+++ Makefile	19 Mar 2021 08:29:48 -
@@ -9,6 +9,8 @@ PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
 FULLPKGPATH-eximon =	${PKGPATH},-eximon
 
+REVISION =		0
+
 CATEGORIES =		mail
 
 HOMEPAGE =		https://www.exim.org/
@@ -19,7 +21,8 @@ MAINTAINER =		Renaud Allard https://ftp.exim.org/pub/exim/exim4/ \
@@ -31,7 +34,8 @@ MASTER_SITES =		https://ftp.exim.org/pub
 
 LIB_DEPENDS-main =	converters/libiconv \
 			devel/pcre \
-			mail/libspf2
+			mail/libspf2 \
+			mail/opendmarc
 RUN_DEPENDS-eximon =	${PKGPATH},-main
 LIB_DEPENDS-eximon =	devel/pcre
 
Index: patches/patch-Local_Makefile
===
RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Local_Makefile
--- patches/patch-Local_Makefile	2 Jun 2020 12:44:19 -	1.4
+++ patches/patch-Local_Makefile	19 Mar 2021 08:29:48 -
@@ -97,6 +97,18 @@ Index: Local/Makefile
  
  # If you have content scanning you may wish to only include some of the scanner
  # interfaces.  Uncomment any of these lines to remove that code.
+@@ -595,9 +595,9 @@ DISABLE_MAL_MKS=yes
+ 
+ # Uncomment the following line to add DMARC checking capability, implemented
+ # using libopendmarc libraries. You must have SPF and DKIM support enabled also.
+-# SUPPORT_DMARC=yes
++SUPPORT_DMARC=yes
+ # CFLAGS += -I/usr/local/include
+-# LDFLAGS += -lopendmarc
++LDFLAGS += -lopendmarc
+ # Uncomment the following if you need to change the default. You can
+ # override it at runtime (main config option dmarc_tld_file)
+ # DMARC_TLD_FILE=/etc/exim/opendmarc.tlds
 @@ -758,18 +758,18 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
@@ -187,3 +199,16 @@ Index: Local/Makefile
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
+@@ -1494,3 +1494,12 @@ EXIM_TMPDIR="/tmp"
+ # CFLAGS += -DMEASURE_TIMING
+ 
+ # End of EDITME for Exim 4.
++EXIM_MONITOR=eximon.bin
++ LOOKUP_MYSQL=yes
++ BIN_DIRECTORY=/usr/local/bin
++ CONFIGURE_FILE=/etc/exim/configure
++ LOOKUP_INCLUDE=-I/usr/local/include/mysql
++ LOOKUP_LIBS=-L/usr/local/lib/mysql -lmysqlclient
++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv
++ CFLAGS+=-O2 -pipe -g  
++ INCLUDE=-I/usr/local/include


smime.p7s
Description: S/MIME Cryptographic Signature


portgen go: Check for go binary

2021-03-19 Thread Martin Vahlensieck
Hi

I was trying out portgen go, but I didn't have Go installed.  As I
gather from the source code the program uses Go to determine
dependencies.  If you try to run portgen go without go installed it
produces a number of errors like so:

Can't exec "go": No such file or directory at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 114.
Can't exec "go": No such file or directory at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 114.
Use of uninitialized value in concatenation (.) or string at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 192.
Use of uninitialized value in concatenation (.) or string at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 192.
Use of uninitialized value in concatenation (.) or string at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 192.
Use of uninitialized value in concatenation (.) or string at 
/usr/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm line 192.
*** Parse error in /usr/ports/mystuff/go/newport: Wrong number of items in 
for loop (/usr/ports/lang/go/go.port.mk:76)
1 items for 2 variables: couldn'tfind
*** Parse error: Need an operator in 'find' 
(/usr/ports/lang/go/go.port.mk:76)
*** Parse error: Need an operator in 'endfor' 
(/usr/ports/lang/go/go.port.mk:79)
*** Parse error: Wrong number of items in for loop 
(/usr/ports/lang/go/go.port.mk:80)
1 items for 2 variables: couldn't  distfindfor  
 
*** Parse error: Missing dependency operator 
(/usr/ports/lang/go/go.port.mk:80)
*** Parse error: Need an operator in 'endfor' 
(/usr/ports/lang/go/go.port.mk:82)


This diff implements a very crude search for the go binary, and errors
out if it doesn't find it, so now it looks like this:

Could not find go executable in PATH at ./portgen line 61.

Best,

Martin

Index: portgen
===
RCS file: /cvs/ports/infrastructure/bin/portgen,v
retrieving revision 1.4
diff -u -p -r1.4 portgen
--- portgen 2 Jul 2020 21:07:51 -   1.4
+++ portgen 19 Mar 2021 09:04:08 -
@@ -50,6 +50,18 @@ sub portgen_class
if ($@) {
die $@;
}
+   if ($type eq "go") {
+   my $found = 0;
+   for my $path (split ":", $ENV{PATH}) {
+   if (-x "$path/go") {
+   $found = 1;
+   last;
+   }
+   }
+   unless ($found) {
+   die "Could not find go executable in PATH";
+   }
+   }
return $class;
}else {
die "unknown module type $type (not in [$types])\n";