svn commit: r408404 - in head/audio/streamripper: . files

[John Marino]

Author: marino
Date: Sun Feb  7 13:16:27 2016
New Revision: 408404
URL: https://svnweb.freebsd.org/changeset/ports/408404

Log:
  audio/streamripper: USES+= ncurses, respect LDFLAGS
  
  Also:
    * bring in dports patch to support DF
    * Modify build to avoid potential name clash with menu.h
      (the same file name exists on ncurses, common issue)

Added:
  head/audio/streamripper/files/
  head/audio/streamripper/files/patch-cdk-5.0-20060507_configure   (contents, props changed)
Modified:
  head/audio/streamripper/Makefile

Modified: head/audio/streamripper/Makefile
==============================================================================
--- head/audio/streamripper/Makefile	Sun Feb  7 13:11:06 2016	(r408403)
+++ head/audio/streamripper/Makefile	Sun Feb  7 13:16:27 2016	(r408404)
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio
 OPTIONS_DEFINE=	FAAD VORBIS
 OPTIONS_DEFAULT=FAAD VORBIS
 
-USES=		iconv pkgconfig
+USES=		iconv ncurses pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-libmad \
@@ -47,12 +47,17 @@ VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTS
 post-extract:
 	${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC}
 
-post-patch:
+xpost-patch:
 	@${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure
+#	avoid potential name conflict with ncurses
+	@${LN} -sv ${WRKSRC}/cdk-5.0-20060507/include/menu.h \
+		${WRKSRC}/cdk-5.0-20060507/include/cdkmenu.h
+	@${REINPLACE_CMD} -e "s|<menu.h>|<cdkmenu.h>|g" \
+		${WRKSRC}/cdk-5.0-20060507/include/cdk.h
 
 pre-configure:
 	(cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} CC="${CC}" \
-		CFLAGS="${CFLAGS}" ${SH} ./configure)
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${SH} ./configure)
 
 pre-build:
 	(cd ${WRKSRC}/cdk-${CDK_VERSION} && ${SETENV} ${MAKE_ENV} \

Added: head/audio/streamripper/files/patch-cdk-5.0-20060507_configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/streamripper/files/patch-cdk-5.0-20060507_configure	Sun Feb  7 13:16:27 2016	(r408404)
@@ -0,0 +1,11 @@
+--- cdk-5.0-20060507/configure.orig	2005-12-28 22:41:24 UTC
++++ cdk-5.0-20060507/configure
+@@ -1993,7 +1993,7 @@ case $host_os in #(vi
+ aix[45]*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+ 	;;
+-freebsd*) #(vi
++freebsd*|dragonfly*) #(vi
+ 	# 5.x headers associate
+ 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
+ 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L