- Provide a patch to build with libadplug 2.3.2 [1]

- While here make portlint, portfmt, portclippy happy

Obtained from:	pkgsrc [1]

audio/adplay/Makefile

@@ -3,8 +3,8 @@
 
 PORTNAME=	adplay
 PORTVERSION=	1.8
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -17,30 +17,32 @@ LIB_DEPENDS=	libadplug.so:audio/libadplug \
 		libbinio.so:devel/libbinio
 
 USES=		autoreconf libtool pkgconfig
-GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	adplug
 GH_PROJECT=	${PORTNAME}-unix
 GH_TUPLE=	adplug:database:${DBVERSION}:database/database-${DBVERSION}
 
-DBFILE=		adplug.db
-DBVERSION=	v1.0
-
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sharedstatedir=${DATADIR}
 
+PLIST_FILES=	${DATADIR}/adplug.db \
+		bin/adplay \
+		man/man1/adplay.1.gz
+
 OPTIONS_DEFINE=	ALSA SDL
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_WITH=	alsa-prefix=${LOCALBASE}/lib
 ALSA_CONFIGURE_OFF=	--disable-output-alsa
+ALSA_CONFIGURE_WITH=	alsa-prefix=${LOCALBASE}/lib
 ALSA_CFLAGS+=		`pkg-config --cflags alsa`
 
-SDL_CONFIGURE_OFF=	--disable-output-sdl
 SDL_USES=		sdl
-SDL_USE=		SDL=sdl,mixer
+SDL_USE=		SDL=mixer,sdl
+SDL_CONFIGURE_OFF=	--disable-output-sdl
 
-PLIST_FILES=	bin/adplay %%DATADIR%%/adplug.db man/man1/adplay.1.gz
+DBFILE=		adplug.db
+DBVERSION=	v1.0
 
 post-patch:
 	@${RM} ${WRKSRC}/src/getopt.h

audio/adplay/files/patch-configure.ac

@@ -0,0 +1,10 @@
+--- configure.ac.orig	2017-11-19 00:42:12 UTC
++++ configure.ac
+@@ -73,7 +73,6 @@ AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]))
+ # Check if AdPlug supports the new surround/harmonic synth
+ AC_MSG_CHECKING([whether AdPlug supports the surround/harmonic synth])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <adplug/surroundopl.h>], [CSurroundopl *dummy;])],
+-   AC_DEFINE(HAVE_ADPLUG_SURROUND,, [Defined if AdPlug supports the surround/harmonic synth])
+ AC_MSG_RESULT([yes]), AC_MSG_RESULT([no - AdPlug >= 2.2 required]))
+ 
+ # Check if AdPlug supports NukedOPL