From owner-svn-ports-all@FreeBSD.ORG Sun Feb 9 11:29:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E0CE2B5; Sun, 9 Feb 2014 11:29:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 373D61C61; Sun, 9 Feb 2014 11:29:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19BTd1C081740; Sun, 9 Feb 2014 11:29:39 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19BTcB0081732; Sun, 9 Feb 2014 11:29:38 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201402091129.s19BTcB0081732@svn.freebsd.org> From: Thomas Zander Date: Sun, 9 Feb 2014 11:29:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r343466 - in branches/2014Q1/audio/Maaate: . files X-SVN-Group: ports-branches 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.17 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, 09 Feb 2014 11:29:39 -0000 Author: riggs Date: Sun Feb 9 11:29:38 2014 New Revision: 343466 URL: http://svnweb.freebsd.org/changeset/ports/343466 QAT: https://qat.redports.org/buildarchive/r343466/ Log: MFH: r343375 - Build fix for clang based systems - Add LICENSE - Add OPTION for portdocs - Correct outdated project URL in pkg-descr - Bump PORTREVISION - Support staging (== merge conflict resolution) PR: ports/184963 Submitted by: Marcin Cieslak (maintainer) Approved by: portmgr (antoine), thierry (mentor) Modified: branches/2014Q1/audio/Maaate/Makefile branches/2014Q1/audio/Maaate/files/patch-configure branches/2014Q1/audio/Maaate/pkg-descr branches/2014Q1/audio/Maaate/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/Maaate/Makefile ============================================================================== --- branches/2014Q1/audio/Maaate/Makefile Sun Feb 9 11:17:43 2014 (r343465) +++ branches/2014Q1/audio/Maaate/Makefile Sun Feb 9 11:29:38 2014 (r343466) @@ -3,28 +3,35 @@ PORTNAME= Maaate PORTVERSION= 0.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= saper@saper.info COMMENT= MPEG audio analysis toolkit -NO_STAGE= yes +LICENSE= GPLv2 + USES= gmake USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes +PORTDOCS= API.html ChangeLog THANKS applications.html + +OPTIONS_DEFINE= DOCS + +.include + post-patch: @${REINPLACE_CMD} -e 's|-ldl||g ; \ s|(CCLD|(CXXLD|g' ${WRKSRC}/demos/Makefile.in post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in API.html ChangeLog THANKS applications.html - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: branches/2014Q1/audio/Maaate/files/patch-configure ============================================================================== --- branches/2014Q1/audio/Maaate/files/patch-configure Sun Feb 9 11:17:43 2014 (r343465) +++ branches/2014Q1/audio/Maaate/files/patch-configure Sun Feb 9 11:29:38 2014 (r343466) @@ -1,5 +1,5 @@ ---- configure.orig Thu Sep 5 09:54:07 2002 -+++ configure Mon Sep 30 22:55:21 2002 +--- configure.orig 2002-10-09 03:30:34.000000000 +0200 ++++ configure 2013-12-18 12:38:19.000000000 +0100 @@ -5691,6 +5691,7 @@ # This can be used to rebuild libtool when needed @@ -8,3 +8,11 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -5699,7 +5700,6 @@ + + + +-LDFLAGS="$LDFLAGS -lstdc++" + + echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 + echo "configure:5706: checking for cos in -lm" >&5 Modified: branches/2014Q1/audio/Maaate/pkg-descr ============================================================================== --- branches/2014Q1/audio/Maaate/pkg-descr Sun Feb 9 11:17:43 2014 (r343465) +++ branches/2014Q1/audio/Maaate/pkg-descr Sun Feb 9 11:29:38 2014 (r343466) @@ -9,4 +9,4 @@ parsing of the MPEG audio stream, the se content analysis on the extracted field, and the third tier includes any applications that are based on the extracted content. -WWW: http://www.cmis.csiro.au/maaate/ +WWW: http://maaate.sourceforge.net/ Modified: branches/2014Q1/audio/Maaate/pkg-plist ============================================================================== --- branches/2014Q1/audio/Maaate/pkg-plist Sun Feb 9 11:17:43 2014 (r343465) +++ branches/2014Q1/audio/Maaate/pkg-plist Sun Feb 9 11:29:38 2014 (r343466) @@ -40,10 +40,5 @@ lib/libMaaateP.a lib/libMaaateP.la lib/libMaaateP.so lib/libMaaateP.so.1 -%%PORTDOCS%%%%DOCSDIR%%/API.html -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/applications.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/Maaate @dirrm include/Maaate