From c5a3654546d5d6a655412fb670669d6549dc215b Mon Sep 17 00:00:00 2001 From: Sean Bruno Date: Fri, 25 Apr 2014 00:41:41 +0000 Subject: [PATCH] Apply patch from tijl@ to resolve a lot of issues with the port: - HAS_CONFIGURE -> GNU_CONFIGURE - USES=libtool. - DOCS option. - Remove GCC requirement. (In audio/idjc it is replaced with USES=compiler:nestedfct) Submitted by: tilj@ --- audio/shout-idjc/Makefile | 22 ++++++++-------------- audio/shout-idjc/pkg-plist | 13 ++++++------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/audio/shout-idjc/Makefile b/audio/shout-idjc/Makefile index a5c956fc9a2b..32f3de90dafa 100644 --- a/audio/shout-idjc/Makefile +++ b/audio/shout-idjc/Makefile @@ -3,7 +3,7 @@ PORTNAME= libshout-idjc PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio python MASTER_SITES= SF/idjc/libshout-idjc/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -18,21 +18,15 @@ LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libogg.so:${PORTSDIR}/audio/libogg \ libspeex.so:${PORTSDIR}/audio/speex -HAS_CONFIGURE= yes -USES= pkgconfig pathfix +GNU_CONFIGURE= yes +USES= libtool pathfix pkgconfig USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE= no +OPTIONS_DEFINE= DOCS -.include +MAKE_JOBS_UNSAFE= yes -.if ${OSVERSION} < 900000 -BROKEN= audio/shout-idjc IPv6 problem on compile in sock.c -.endif +post-patch: + @${REINPLACE_CMD} '/_XOPEN_SOURCE/d' ${WRKSRC}/configure -# 10 and higer seem to be fine -.if ${OSVERSION} < 1000000 -USE_GCC= 4.6+ -.endif - -.include +.include diff --git a/audio/shout-idjc/pkg-plist b/audio/shout-idjc/pkg-plist index 971803d56e31..8d205482af5a 100644 --- a/audio/shout-idjc/pkg-plist +++ b/audio/shout-idjc/pkg-plist @@ -1,12 +1,11 @@ include/shoutidjc/shout.h lib/libshout-idjc.a -lib/libshout-idjc.la lib/libshout-idjc.so -lib/libshout-idjc.so.5 +lib/libshout-idjc.so.3 +lib/libshout-idjc.so.3.2.0 libdata/pkgconfig/shout-idjc.pc -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -@dirrmtry %%DOCSDIR%% -@dirrmtry libdata/pkgconfig +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry include/shoutidjc