misc/subsurface port improvements, maintainer timeout

- explicitly list the gnu MODULE, this is normally included implicitly
when setting CONFIGURE_STYLE to something using autoconf. it has to be
done a bit differently than normal for a port that also uses cmake, but
it's better to use as much infrastructure as possible (this brings
in the standard ports autoconf cache file config.site, avoids the
confusing manual setting of MODGNU_* variables which should never be
set in a port, etc)

- due to mix of cmake+autoconf we can't use CONFIGURE_ARGS from the gnu
MODULE above so at least set "--disable-silent-rules" so we can see the
compiler commands

- the above lets us see that CC/CFLAGS are not honoured in the autoconf
part of the build, add ${CONFIGURE_ENV} so that these are picked up
so that it uses the correct system compiler rather than gcc 4.2.1 for
the libdivecomputer part of the build

- update to newer AUTOCONF_VERSION/AUTOMAKE_VERSION, mainly to increase
the chance that someone building will already have the right versions
installed

- requiring wxallowed is no reason to disable tests, but they don't
build at present anyway, so give a better comment

- use the new standard do-gen target for autoconf, tidy libdivecomputer
build dir creation, break out configure args onto separate lines as
normal in ports, use MAKE_PROGRAM rather than hardcoded gmake

- the change of compiler means the produced package is different so
bump REVISION

misc/subsurface/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/07/18 11:28:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2019/08/05 20:48:17 sthen Exp $
 
 # Qt5Webkit
 USE_WXNEEDED =	Yes
@@ -6,6 +6,7 @@ USE_WXNEEDED =	Yes
 COMMENT =	divelog program for recreational, tech, and free-divers
 
 VER =		4.8.5
+REVISION =	0
 PKGNAME =	subsurface-${VER}
 DISTNAME =	Subsurface-${VER}
 
@@ -28,16 +29,13 @@ EXTRACT_SUFX =	.tgz
 DISTFILES =	Subsurface-${VER}${EXTRACT_SUFX} \
 		libdivecomputer-subsurface-branch-${VER}${EXTRACT_SUFX}
 
-MODULES +=	devel/cmake \
+# cmake for subsurface, autoconf for libdivecomputer-subsurface
+MODULES +=	gnu \
+		devel/cmake \
 		x11/qt5
 
-AUTOCONF_VERSION =	2.67
-AUTOMAKE_VERSION =	1.11
-
-MODGNU_AUTOCONF_DEPENDS = devel/metaauto \
-	devel/autoconf/${AUTOCONF_VERSION}
-MODGNU_AUTOMAKE_DEPENDS = devel/metaauto \
-	devel/automake/${AUTOMAKE_VERSION}
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.16
 
 BUILD_DEPENDS =	${MODGNU_AUTOCONF_DEPENDS} \
 		${MODGNU_AUTOMAKE_DEPENDS} \
@@ -57,27 +55,36 @@ LIB_DEPENDS =	archivers/libzip \
 USE_GMAKE =	Yes
 
 CONFIGURE_ARGS +=	-DNO_DOCS:Bool=ON \
-			-DBTSUPPORT:Bool=OFF \
-			-DMAKE_TESTS:Bool=OFF
+			-DBTSUPPORT:Bool=OFF
 
-# XXX # Tests depend upon wxallowed.
-NO_TEST =	Yes
+# many "undefined reference to `dc_*" when tests are enabled
+CONFIGURE_ARGS +=	-DMAKE_TESTS:Bool=OFF
+NO_TEST =		Yes
 
 post-extract:
 	rmdir ${WRKSRC}/libdivecomputer
 	mv ${WRKDIR}/libdivecomputer-subsurface-branch-${VER} \
 		${WRKSRC}/libdivecomputer
 
+do-gen:
+	${AUTOCONF_ENV} autoreconf -f -i ${WRKSRC}/libdivecomputer
+
 pre-configure:
-	cd ${WRKSRC}/libdivecomputer && mkdir build && \
-	cd build && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-	AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -f -i .. && \
-	../configure --without-libusb --without-hidapi --without-bluez \
-		--disable-shared --disable-examples --disable-doc \
+	mkdir -p ${WRKSRC}/libdivecomputer/build
+	cd ${WRKSRC}/libdivecomputer/build && ${XXCONFIGURE_ENV} ../configure \
+		--without-libusb \
+		--without-hidapi \
+		--without-bluez \
+		--disable-shared \
+		--disable-examples \
+		--disable-doc \
+		--disable-silent-rules \
 		--prefix=${WRKSRC}/libdivecomputer/built
 
 pre-build:
-	cd ${WRKSRC}/libdivecomputer/build && gmake && gmake install
+	cd ${WRKSRC}/libdivecomputer/build && \
+		${MAKE_PROGRAM} && \
+		${MAKE_PROGRAM} install
 
 post-build:
 	mkdir -p ${WRKBUILD}/Documentation