From owner-svn-ports-all@freebsd.org Wed Apr 19 08:20:00 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 710ACD42563; Wed, 19 Apr 2017 08:20:00 +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 mx1.freebsd.org (Postfix) with ESMTPS id 319918EF; Wed, 19 Apr 2017 08:20:00 +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 v3J8Jx0M074208; Wed, 19 Apr 2017 08:19:59 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3J8Jwpt074204; Wed, 19 Apr 2017 08:19:58 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201704190819.v3J8Jwpt074204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Wed, 19 Apr 2017 08:19:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438827 - in head/audio/adplay: . files X-SVN-Group: ports-head 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.23 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: Wed, 19 Apr 2017 08:20:00 -0000 Author: ehaupt Date: Wed Apr 19 08:19:58 2017 New Revision: 438827 URL: https://svnweb.freebsd.org/changeset/ports/438827 Log: - Move from SF to GitHub - Update WWW - Define LICENSE_FILE - Add ALSA option - Use autoreconf and - remove a lot of old cruft that's not needed anymore with the use of autoreconf - Bump PORTREVISION just to be safe (autoreconf) Added: head/audio/adplay/files/ head/audio/adplay/files/patch-acinclude.m4 (contents, props changed) Modified: head/audio/adplay/Makefile head/audio/adplay/distinfo head/audio/adplay/pkg-descr Modified: head/audio/adplay/Makefile ============================================================================== --- head/audio/adplay/Makefile Wed Apr 19 07:18:02 2017 (r438826) +++ head/audio/adplay/Makefile Wed Apr 19 08:19:58 2017 (r438827) @@ -3,48 +3,50 @@ PORTNAME= adplay PORTVERSION= 1.7 -PORTREVISION= 7 +DISTVERSIONPREFIX= v +PORTREVISION= 8 CATEGORIES= audio -MASTER_SITES= SF/adplug/AdPlay_UNIX/${PORTVERSION}:main \ - SF/adplug/Database/2006-07-06:db -DISTFILES= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}:main \ - adplugdb-${DBVERSION}${EXTRACT_SUFX}:db MAINTAINER= ehaupt@FreeBSD.org COMMENT= AdLib player using adplug library LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libadplug.so:audio/libadplug \ libbinio.so:devel/libbinio +USES= autoreconf libtool pkgconfig GNU_CONFIGURE= yes -USES= libtool +USE_GITHUB= yes -DBFILE= adplug.db -DBVERSION= 2006-07-07 +GH_ACCOUNT= adplug +GH_PROJECT= ${PORTNAME}-unix +GH_TUPLE= adplug:database:7ac0819:database/database-${DBVERSION} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio -LIBS+= -L${LOCALBASE}/lib -lbinio +DBFILE= adplug.db +DBVERSION= v1.0 CONFIGURE_ARGS+= --sharedstatedir=${DATADIR} -PLIST_FILES= bin/adplay %%DATADIR%%/adplug.db 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_CFLAGS+= `pkg-config --cflags alsa` -OPTIONS_DEFINE= SDL SDL_CONFIGURE_OFF= --disable-output-sdl -SDL_USE= SDL=sdl,mixer +SDL_USE= SDL=sdl,mixer + +PLIST_FILES= bin/adplay %%DATADIR%%/adplug.db man/man1/adplay.1.gz post-patch: - @${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|^\(adplug_data_dir.*\)/.*|\1|' \ - ${WRKSRC}/src/Makefile.in @${RM} ${WRKSRC}/src/getopt.h -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/adplay ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/adplay.1 ${STAGEDIR}${MANPREFIX}/man/man1 +post-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${DBVERSION}/${DBFILE} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/database-${DBVERSION}/${DBFILE} \ + ${STAGEDIR}${DATADIR} .include Modified: head/audio/adplay/distinfo ============================================================================== --- head/audio/adplay/distinfo Wed Apr 19 07:18:02 2017 (r438826) +++ head/audio/adplay/distinfo Wed Apr 19 08:19:58 2017 (r438827) @@ -1,4 +1,5 @@ -SHA256 (adplay-1.7.tar.gz) = 524c02456acee0b1a934a02cd4bfc5c6461813aa7bcf88a68422d8132232c7ad -SIZE (adplay-1.7.tar.gz) = 360854 -SHA256 (adplugdb-2006-07-07.tar.gz) = 3e931150d0e290a7243fe4247376cc910b10cb88932b452fc73c8becedcce8b8 -SIZE (adplugdb-2006-07-07.tar.gz) = 4245 +TIMESTAMP = 1492585695 +SHA256 (adplug-adplay-unix-v1.7_GH0.tar.gz) = 2c3dd462f3c33f3b03a3cfd06b0efd3c90e0ec60bd03f28e7b9b05dde0b76956 +SIZE (adplug-adplay-unix-v1.7_GH0.tar.gz) = 43387 +SHA256 (adplug-database-7ac0819_GH0.tar.gz) = 35e1a166edd841deb5cfd5661af84c520fb8ebf8972158de17bec05ea2676848 +SIZE (adplug-database-7ac0819_GH0.tar.gz) = 4467 Added: head/audio/adplay/files/patch-acinclude.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/adplay/files/patch-acinclude.m4 Wed Apr 19 08:19:58 2017 (r438827) @@ -0,0 +1,20 @@ +--- acinclude.m4.orig 2010-01-01 08:21:00 UTC ++++ acinclude.m4 +@@ -422,7 +422,7 @@ if test "$alsa_prefix" != "" ; then + fi + + dnl add the alsa library +-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" ++ALSA_LIBS="$ALSA_LIBS -lasound -lm -lpthread" + LIBS="$ALSA_LIBS $LIBS" + AC_MSG_RESULT($ALSA_LIBS) + +@@ -541,7 +541,7 @@ AC_ARG_ENABLE(aotest, [ --disable-aotes + + # see where dl* and friends live + AC_CHECK_FUNCS(dlopen, [AO_DL_LIBS=""], [ +- AC_CHECK_LIB(dl, dlopen, [AO_DL_LIBS="-ldl"], [ ++ AC_CHECK_LIB(dl, dlopen, [ + AC_MSG_WARN([could not find dlopen() needed by libao sound drivers + your system may not be supported.]) + ]) Modified: head/audio/adplay/pkg-descr ============================================================================== --- head/audio/adplay/pkg-descr Wed Apr 19 07:18:02 2017 (r438826) +++ head/audio/adplay/pkg-descr Wed Apr 19 08:19:58 2017 (r438827) @@ -1,4 +1,4 @@ Adplay is a command line AdLib player using the adplug library. It supports many AdLib formats such as HSP and HSC. -WWW: http://adplug.sourceforge.net/ +WWW: http://adplug.github.io/