From owner-svn-ports-all@freebsd.org Sun Aug 23 09:08:09 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 89F633B71E9; Sun, 23 Aug 2020 09:08:09 +0000 (UTC) (envelope-from mandree@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 4BZ8YP38VTz4Rgl; Sun, 23 Aug 2020 09:08:09 +0000 (UTC) (envelope-from mandree@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 50A7224F80; Sun, 23 Aug 2020 09:08:09 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07N989XT082278; Sun, 23 Aug 2020 09:08:09 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07N989Bt082277; Sun, 23 Aug 2020 09:08:09 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202008230908.07N989Bt082277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 23 Aug 2020 09:08:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545810 - head/audio/squash X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/audio/squash X-SVN-Commit-Revision: 545810 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: Sun, 23 Aug 2020 09:08:09 -0000 Author: mandree Date: Sun Aug 23 09:08:08 2020 New Revision: 545810 URL: https://svnweb.freebsd.org/changeset/ports/545810 Log: audio/squash: add -fcommon and LICENSE audio/squash is old code from 2004, add -fcommon to the compiler flags because that was the default when the code was developed. FreeBSD 13 is apparently going to flip the switch to -fno-common, which causes linker failure. While here, add LICENSE and bump PORTREVISION. PR: 248845 Modified: head/audio/squash/Makefile Modified: head/audio/squash/Makefile ============================================================================== --- head/audio/squash/Makefile Sun Aug 23 08:55:23 2020 (r545809) +++ head/audio/squash/Makefile Sun Aug 23 09:08:08 2020 (r545810) @@ -3,24 +3,27 @@ PORTNAME= squash PORTVERSION= 1.0 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= audio MASTER_SITES= SAVANNAH MAINTAINER= mandree@FreeBSD.org COMMENT= Learning console-based MP3/OGG player -LIB_DEPENDS+= libFLAC.so:audio/flac \ +LICENSE= GPLv2+ + +LIB_DEPENDS+= libao.so:audio/libao \ libfftw.so:math/fftw \ + libFLAC.so:audio/flac \ libid3.so:audio/id3lib \ libmad.so:audio/libmad \ - libvorbis.so:audio/libvorbis \ - libao.so:audio/libao + libvorbis.so:audio/libvorbis RUN_DEPENDS= id3v2:audio/id3v2 USES= compiler:c11 gmake ncurses tar:bzip2 USE_RUBY= yes MAKE_ARGS= CC="${CC}" +CFLAGS+= -fcommon OPTIONS_DEFINE= DOCS @@ -31,7 +34,9 @@ PORTDOCS= * post-patch: @${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS}|; \ s|-Iinclude|-Iinclude -I${LOCALBASE}/include|; \ - s|-ldl|-L${LOCALBASE}/lib|" ${WRKSRC}/Makefile + s|-ldl|-L${LOCALBASE}/lib|; \ + s}^LDFLAGS.*:=\(.*\)}LDFLAGS :=\1 ${LDFLAGS}}" \ + ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s,/usr/bin/ruby,${RUBY}," \ ${WRKSRC}/extra/*.rb @${REINPLACE_CMD} -e "s,/etc/squash.conf,${PREFIX}/etc/squash.conf," \