So here's my next iteration that also handles the upgrade. I stuck with MODGO_BINDIR, since the alternatives suggested weren't fully in favor and BINDIR is used by bsd.prog.mk
OK in this form?
martijn@
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.22
diff -u -p -r1.22 go.port.mk
--- lang/go/go.port.mk 4 May 2019 21:46:16 -0000 1.22
+++ lang/go/go.port.mk 2 Sep 2019 11:07:46 -0000
@@ -27,6 +27,7 @@ MAKE_ENV += GOCACHE="${MODGO_GOCACHE}"
MODGO_CMD ?= ${SETENV} ${MAKE_ENV} go
MODGO_BUILD_CMD = ${MODGO_CMD} install ${MODGO_FLAGS}
MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS} ${MODGO_TEST_FLAGS}
+MODGO_BINDIR ?= bin
.if ! empty(MODGO_LDFLAGS)
MODGO_BUILD_CMD += -ldflags="${MODGO_LDFLAGS}"
@@ -57,8 +58,9 @@ MODGO_FLAGS += -x
INSTALL_STRIP =
.if ${MODGO_TYPE:L:Mbin}
-MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* \
- ${PREFIX}/bin;
+MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM_DIR} ${PREFIX}/${MODGO_BINDIR} && \
+ ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* \
+ ${PREFIX}/${MODGO_BINDIR};
.endif
# Go source files serve the purpose of libraries, so sources should be included
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.784
diff -u -p -r1.784 Makefile
--- devel/quirks/Makefile 27 Aug 2019 03:21:32 -0000 1.784
+++ devel/quirks/Makefile 2 Sep 2019 11:07:46 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.175
+PKGNAME = quirks-3.176
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.801
diff -u -p -r1.801 Quirks.pm
--- devel/quirks/files/Quirks.pm 27 Aug 2019 03:21:32 -0000 1.801
+++ devel/quirks/files/Quirks.pm 2 Sep 2019 11:07:46 -0000
@@ -334,6 +334,8 @@ my $stem_extensions = {
'kwebapp' => 'openradtool',
'py-xmldiff' => 'py3-xmldiff',
'bro' => 'zeek',
+ 'filter-rspamd' => 'opensmtpd-filter-rspamd',
+ 'filter-senderscore' => 'opensmtpd-filter-senderscore',
};
my $obsolete_reason = {
opensmtpd-filters.tar.gz
Description: application/gzip
