From owner-svn-ports-all@freebsd.org Sat May 23 14:40:55 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DB2622CCC66; Sat, 23 May 2020 14:40:54 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49TmHn4Hm2z46Cw; Sat, 23 May 2020 14:40:53 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7385211173; Sat, 23 May 2020 14:40:52 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04NEeqLt023267; Sat, 23 May 2020 14:40:52 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04NEepvQ023265; Sat, 23 May 2020 14:40:51 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <202005231440.04NEepvQ023265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Sat, 23 May 2020 14:40:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536301 - in head/audio/adplay: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/audio/adplay: . files X-SVN-Commit-Revision: 536301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2020 14:40:55 -0000 Author: ehaupt Date: Sat May 23 14:40:51 2020 New Revision: 536301 URL: https://svnweb.freebsd.org/changeset/ports/536301 Log: - Provide a patch to build with libadplug 2.3.2 [1] - While here make portlint, portfmt, portclippy happy Obtained from: pkgsrc [1] Added: head/audio/adplay/files/patch-configure.ac (contents, props changed) Modified: head/audio/adplay/Makefile Modified: head/audio/adplay/Makefile ============================================================================== --- head/audio/adplay/Makefile Sat May 23 14:40:46 2020 (r536300) +++ head/audio/adplay/Makefile Sat May 23 14:40:51 2020 (r536301) @@ -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 Added: head/audio/adplay/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/adplay/files/patch-configure.ac Sat May 23 14:40:51 2020 (r536301) @@ -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 ], [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