From owner-freebsd-ports@FreeBSD.ORG Sat Apr 26 17:32:57 2014 Return-Path: Delivered-To: ports@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 698CF9C5; Sat, 26 Apr 2014 17:32:57 +0000 (UTC) Received: from fire.magemana.nl (magemana.nl [IPv6:2a01:7c8:aaae:25e::1]) by mx1.freebsd.org (Postfix) with ESMTP id EE2DC118E; Sat, 26 Apr 2014 17:32:56 +0000 (UTC) Received: by fire.magemana.nl (Postfix, from userid 1003) id 5CABF4AB4D5; Sat, 26 Apr 2014 19:32:56 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org Subject: [UPDATE]: www/flot to 0.8.3 From: Melvyn Sopacua X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20140426173256.5CABF4AB4D5@fire.magemana.nl> Date: Sat, 26 Apr 2014 19:32:56 +0200 (CEST) Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 17:32:57 -0000 >Submitter-Id: current-users >Originator: Melvyn Sopacua >Organization: >Confidential: no >Synopsis: [UPDATE]: www/flot to 0.8.3 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 9.2-RELEASE-p3 amd64 >Environment: System: FreeBSD fire.magemana.nl 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #1 r263178: Mon Mar 17 21:30:16 CET 2014 melvyn@fire.magemana.nl:/usr/obj/usr/src/sys/TRANSIP amd64 >Description: Update to 0.8.3: - Take maintainership - Stage support - Option to not install provided jquery - Don't install webserver writeable. There's no need for it. Build archive: https://redports.org/buildarchive/20140426140001-6278/ >How-To-Repeat: >Fix: --- update.diff begins here --- diff -r 3c00183fe6de www/flot/Makefile --- a/www/flot/Makefile Fri Apr 25 15:39:46 2014 +0000 +++ b/www/flot/Makefile Sat Apr 26 19:24:54 2014 +0200 @@ -1,49 +1,58 @@ # $FreeBSD$ PORTNAME= flot -PORTVERSION= 0.7 +PORTVERSION= 0.8.3 CATEGORIES= www devel -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://www.flotcharts.org/downloads/ \ + ${MASTER_SITE_LOCAL} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= melvyn@magemana.nl COMMENT= JavaScript plotting library for jQuery LICENSE= MIT -WRKSRC= ${WRKDIR}/${PORTNAME} - -USERS= www -GROUPS= www +WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= YES +EXTRACT_SUFX= .zip -PORTDOCS= API.txt \ - FAQ.txt \ - NEWS.txt \ - PLUGINS.txt \ - README.txt +PORTDOCS= API.md \ + FAQ.md \ + NEWS.md \ + PLUGINS.md \ + README.md PORTEXAMPLES= * -NO_STAGE= yes -do-install: - @${INSTALL} -d -g ${USERS} -o ${GROUPS} ${WWWDIR} - ${INSTALL_DATA} -o www -g www ${WRKSRC}/*.js ${WWWDIR} - -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES NOJQUERY +# JQuery is provided by a number of CDNs +NOJQUERY_DESC= Do not include provided JQuery 1.8.3 .include +.if ${PORT_OPTIONS:MNOJQUERY} +PLIST_SUB+= NOJQUERY="@comment " +.else +PLIST_SUB+= NOJQUERY="" +.endif + +do-install: +.if ${PORT_OPTIONS:MNOJQUERY} + @${RM} ${WRKSRC}/jquery.js ${WRKSRC}/jquery.min.js +.endif + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR} + post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endif .include diff -r 3c00183fe6de www/flot/distinfo --- a/www/flot/distinfo Fri Apr 25 15:39:46 2014 +0000 +++ b/www/flot/distinfo Sat Apr 26 19:24:54 2014 +0200 @@ -1,2 +1,2 @@ -SHA256 (flot-0.7.tar.gz) = bc24f661d6de1d38496b93147604174dd82b6c54359824cb1c9c4acd5eb55730 -SIZE (flot-0.7.tar.gz) = 288107 +SHA256 (flot-0.8.3.zip) = d70600ab58f0f23bb7b08974f992e2398f0b0d643e37abf54a1f7f609ef67b8e +SIZE (flot-0.8.3.zip) = 651654 diff -r 3c00183fe6de www/flot/pkg-descr --- a/www/flot/pkg-descr Fri Apr 25 15:39:46 2014 +0000 +++ b/www/flot/pkg-descr Sat Apr 26 19:24:54 2014 +0200 @@ -3,4 +3,4 @@ usage (all settings are optional), attractive looks and interactive features like zooming and mouse tracking. -WWW: http://code.google.com/p/flot/ +WWW: http://www.flotcharts.org/ diff -r 3c00183fe6de www/flot/pkg-plist --- a/www/flot/pkg-plist Fri Apr 25 15:39:46 2014 +0000 +++ b/www/flot/pkg-plist Sat Apr 26 19:24:54 2014 +0200 @@ -2,8 +2,14 @@ %%WWWDIR%%/excanvas.min.js %%WWWDIR%%/jquery.colorhelpers.js %%WWWDIR%%/jquery.colorhelpers.min.js +%%WWWDIR%%/jquery.flot.canvas.js +%%WWWDIR%%/jquery.flot.canvas.min.js +%%WWWDIR%%/jquery.flot.categories.js +%%WWWDIR%%/jquery.flot.categories.min.js %%WWWDIR%%/jquery.flot.crosshair.js %%WWWDIR%%/jquery.flot.crosshair.min.js +%%WWWDIR%%/jquery.flot.errorbars.js +%%WWWDIR%%/jquery.flot.errorbars.min.js %%WWWDIR%%/jquery.flot.fillbetween.js %%WWWDIR%%/jquery.flot.fillbetween.min.js %%WWWDIR%%/jquery.flot.image.js @@ -24,6 +30,8 @@ %%WWWDIR%%/jquery.flot.symbol.min.js %%WWWDIR%%/jquery.flot.threshold.js %%WWWDIR%%/jquery.flot.threshold.min.js -%%WWWDIR%%/jquery.js -%%WWWDIR%%/jquery.min.js +%%WWWDIR%%/jquery.flot.time.js +%%WWWDIR%%/jquery.flot.time.min.js +%%NOJQUERY%%%%WWWDIR%%/jquery.js +%%NOJQUERY%%%%WWWDIR%%/jquery.min.js @dirrmtry %%WWWDIR%% --- update.diff ends here ---