From owner-svn-ports-head@FreeBSD.ORG Mon Mar 17 22:03:00 2014 Return-Path: Delivered-To: svn-ports-head@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 EBCCCD3C; Mon, 17 Mar 2014 22:03:00 +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 BF4A4F06; Mon, 17 Mar 2014 22:03:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2HM30CX078562; Mon, 17 Mar 2014 22:03:00 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2HM303P078561; Mon, 17 Mar 2014 22:03:00 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403172203.s2HM303P078561@svn.freebsd.org> From: Pawel Pekala Date: Mon, 17 Mar 2014 22:03:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348506 - head/audio/spiralloops X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Mar 2014 22:03:01 -0000 Author: pawel Date: Mon Mar 17 22:03:00 2014 New Revision: 348506 URL: http://svnweb.freebsd.org/changeset/ports/348506 QAT: https://qat.redports.org/buildarchive/r348506/ Log: - Use PLIST_FILES insted of dynamically generated plist - Define DOCS option, use PORTDOCS for it, don't install COPYING file - PTHREAD_CFLAGS is long gone, don't use it - Add LICENSE, desktop entry file - Support staging Modified: head/audio/spiralloops/Makefile Modified: head/audio/spiralloops/Makefile ============================================================================== --- head/audio/spiralloops/Makefile Mon Mar 17 21:47:39 2014 (r348505) +++ head/audio/spiralloops/Makefile Mon Mar 17 22:03:00 2014 (r348506) @@ -3,7 +3,7 @@ PORTNAME= spiralloops PORTVERSION= 2.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/ DISTNAME= SpiralLoops-${PORTVERSION} @@ -11,17 +11,21 @@ DISTNAME= SpiralLoops-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Loop-based sampler +LICENSE= GPLv2 + LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk -NO_STAGE= yes -DOCDIR= share/doc/${PORTNAME} -DOC_FILES= CHANGES COPYING README GNU_CONFIGURE= yes -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" -PLIST= ${WRKDIR}/pkg-plist +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" WRKSRC= ${WRKDIR}/${DISTNAME} +PLIST_FILES= bin/SpiralLoops +PORTDOCS= CHANGES README + +DESKTOP_ENTRIES="SpiralLoops" "" "" "SpiralLoops" "" false + +OPTIONS_DEFINE= DOCS + .include post-patch: @@ -29,7 +33,7 @@ post-patch: ${SED} -E "s:-ldl::g; \ s:^CFLAGS:XCFLAGS:g; \ s:^CXXFLAGS:XCXXFLAGS:g; \ - s:-O3:${PTHREAD_CFLAGS}:g; \ + s:-O3::g; \ s:CFLAGS =:CFLAGS +=:g; \ s:CXXFLAGS=:CXXFLAGS+=:g; \ s:-lm:${PTHREAD_LIBS} -lm:g; \ @@ -41,21 +45,9 @@ post-patch: ${REINPLACE_CMD} -e '/^#include $$|.H>|; /^#include "FL/s|.h"$$|.H"|; \ s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|iostream.h|iostream|; s|fstream.h|fstream|' -pre-install: - ${ECHO_CMD} bin/SpiralLoops > ${PLIST} -.if ${PORT_OPTIONS:MDOCS} -.for i in ${DOC_FILES} - ${ECHO_CMD} ${DOCDIR}/`${BASENAME} ${i}` >> ${PLIST} -.endfor - ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} -.endif - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for i in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include