Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Aug 2020 09:08:09 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545810 - head/audio/squash
Message-ID:  <202008230908.07N989Bt082277@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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," \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008230908.07N989Bt082277>