Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Feb 2015 21:05:38 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378800 - head/www/yourls
Message-ID:  <201502102105.t1AL5c3t021184@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Tue Feb 10 21:05:38 2015
New Revision: 378800
URL: https://svnweb.freebsd.org/changeset/ports/378800
QAT: https://qat.redports.org/buildarchive/r378800/

Log:
  - Update to version 1.7, project now hosted on Github [1]
  - Clean pkg-plist [1]
  - Unmute install command, don't install hidden files
  - Project developers changed license to MIT:
    https://github.com/YOURLS/YOURLS/issues/1528
  - Also tarball now contains Requests sources under
    ISC license (%%WWWDIR%%%/includes/Requests)
  
  PR:		196941 [1]
  Submitted by:	Chip Marshall <chip@2bithacker.net> [1]

Modified:
  head/www/yourls/Makefile
  head/www/yourls/distinfo
  head/www/yourls/pkg-plist

Modified: head/www/yourls/Makefile
==============================================================================
--- head/www/yourls/Makefile	Tue Feb 10 21:04:54 2015	(r378799)
+++ head/www/yourls/Makefile	Tue Feb 10 21:05:38 2015	(r378800)
@@ -2,20 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	yourls
-DISTVERSION=	1.5.1
+PORTVERSION=	1.7
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Your Own URL Shortener
 
-LICENSE=	GPLv3
+LICENSE=	ISCL MIT
+LICENSE_COMB=	multi
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME:tu}
+GH_PROJECT=	${PORTNAME:tu}
+GH_COMMIT=	68cdac8
 
-USES=		zip:infozip
-NO_BUILD=	YES
+NO_BUILD=	yes
 
 USE_PHP=	bcmath curl json mysql pcre xml
 
@@ -25,6 +26,6 @@ PLIST_SUB=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! -name \.*")
 
 .include <bsd.port.mk>

Modified: head/www/yourls/distinfo
==============================================================================
--- head/www/yourls/distinfo	Tue Feb 10 21:04:54 2015	(r378799)
+++ head/www/yourls/distinfo	Tue Feb 10 21:05:38 2015	(r378800)
@@ -1,2 +1,2 @@
-SHA256 (yourls-1.5.1.zip) = a326e2a4d272c53646adb46395c9d2fcfe41d445e42a619221f21f7546a74884
-SIZE (yourls-1.5.1.zip) = 1333523
+SHA256 (yourls-1.7.tar.gz) = b43a6311730545fb2f02e2a757b03d2017c48ac09b368e33e2e4eb9810d9ff04
+SIZE (yourls-1.7.tar.gz) = 1750857

Modified: head/www/yourls/pkg-plist
==============================================================================
--- head/www/yourls/pkg-plist	Tue Feb 10 21:04:54 2015	(r378799)
+++ head/www/yourls/pkg-plist	Tue Feb 10 21:05:38 2015	(r378800)
@@ -1,12 +1,15 @@
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
+%%WWWDIR%%/CHANGELOG.md
+%%WWWDIR%%/CONTRIBUTING.md
+%%WWWDIR%%/LICENSE.md
+%%WWWDIR%%/README.md
 %%WWWDIR%%/admin/admin-ajax.php
 %%WWWDIR%%/admin/index.php
 %%WWWDIR%%/admin/install.php
 %%WWWDIR%%/admin/plugins.php
 %%WWWDIR%%/admin/tools.php
 %%WWWDIR%%/admin/upgrade.php
-%%WWWDIR%%/changelog.txt
 %%WWWDIR%%/css/cal.css
 %%WWWDIR%%/css/infos.css
 %%WWWDIR%%/css/palette.png
@@ -34,20 +37,90 @@
 %%WWWDIR%%/images/share.png
 %%WWWDIR%%/images/twitter.png
 %%WWWDIR%%/images/yourls-logo.png
+%%WWWDIR%%/includes/Requests/README.md
+%%WWWDIR%%/includes/Requests/Requests.php
+%%WWWDIR%%/includes/Requests/Requests/Auth.php
+%%WWWDIR%%/includes/Requests/Requests/Auth/Basic.php
+%%WWWDIR%%/includes/Requests/Requests/Cookie.php
+%%WWWDIR%%/includes/Requests/Requests/Cookie/Jar.php
+%%WWWDIR%%/includes/Requests/Requests/Exception.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/400.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/401.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/402.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/403.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/404.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/405.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/406.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/407.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/408.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/409.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/410.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/411.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/412.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/413.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/414.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/415.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/416.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/417.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/418.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/428.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/429.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/431.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/500.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/501.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/502.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/503.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/504.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/505.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/511.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/Unknown.php
+%%WWWDIR%%/includes/Requests/Requests/Hooker.php
+%%WWWDIR%%/includes/Requests/Requests/Hooks.php
+%%WWWDIR%%/includes/Requests/Requests/IDNAEncoder.php
+%%WWWDIR%%/includes/Requests/Requests/IPv6.php
+%%WWWDIR%%/includes/Requests/Requests/IRI.php
+%%WWWDIR%%/includes/Requests/Requests/Proxy.php
+%%WWWDIR%%/includes/Requests/Requests/Proxy/HTTP.php
+%%WWWDIR%%/includes/Requests/Requests/Response.php
+%%WWWDIR%%/includes/Requests/Requests/Response/Headers.php
+%%WWWDIR%%/includes/Requests/Requests/SSL.php
+%%WWWDIR%%/includes/Requests/Requests/Session.php
+%%WWWDIR%%/includes/Requests/Requests/Transport.php
+%%WWWDIR%%/includes/Requests/Requests/Transport/cURL.php
+%%WWWDIR%%/includes/Requests/Requests/Transport/cacert.pem
+%%WWWDIR%%/includes/Requests/Requests/Transport/fsockopen.php
+%%WWWDIR%%/includes/Requests/Requests/Utility/CaseInsensitiveDictionary.php
+%%WWWDIR%%/includes/Requests/Requests/Utility/FilteredIterator.php
 %%WWWDIR%%/includes/auth.php
 %%WWWDIR%%/includes/class-mysql.php
+%%WWWDIR%%/includes/ezSQL/README.md
+%%WWWDIR%%/includes/ezSQL/ez_sql_core.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_core_yourls.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_mysql.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_mysql_yourls.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_mysqli.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_mysqli_yourls.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_pdo.php
+%%WWWDIR%%/includes/ezSQL/ez_sql_pdo_yourls.php
+%%WWWDIR%%/includes/functions-api.php
 %%WWWDIR%%/includes/functions-auth.php
 %%WWWDIR%%/includes/functions-compat.php
+%%WWWDIR%%/includes/functions-deprecated.php
 %%WWWDIR%%/includes/functions-formatting.php
 %%WWWDIR%%/includes/functions-html.php
 %%WWWDIR%%/includes/functions-http.php
 %%WWWDIR%%/includes/functions-infos.php
 %%WWWDIR%%/includes/functions-install.php
+%%WWWDIR%%/includes/functions-kses.php
+%%WWWDIR%%/includes/functions-l10n.php
 %%WWWDIR%%/includes/functions-plugins.php
 %%WWWDIR%%/includes/functions-upgrade.php
 %%WWWDIR%%/includes/functions-xml.php
 %%WWWDIR%%/includes/functions.php
 %%WWWDIR%%/includes/geo/GeoIP.dat
+%%WWWDIR%%/includes/geo/GeoIPv6.dat
+%%WWWDIR%%/includes/geo/README.md
 %%WWWDIR%%/includes/geo/flags/flag_.gif
 %%WWWDIR%%/includes/geo/flags/flag_a1.gif
 %%WWWDIR%%/includes/geo/flags/flag_a2.gif
@@ -312,8 +385,15 @@
 %%WWWDIR%%/includes/geo/flags/flag_zw.gif
 %%WWWDIR%%/includes/geo/flags/flag_zz.gif
 %%WWWDIR%%/includes/geo/geoip.inc
-%%WWWDIR%%/includes/geo/readme.txt
 %%WWWDIR%%/includes/load-yourls.php
+%%WWWDIR%%/includes/phpass/PasswordHash.php
+%%WWWDIR%%/includes/phpass/README.md
+%%WWWDIR%%/includes/phpass/test.php
+%%WWWDIR%%/includes/pomo/entry.php
+%%WWWDIR%%/includes/pomo/mo.php
+%%WWWDIR%%/includes/pomo/po.php
+%%WWWDIR%%/includes/pomo/streams.php
+%%WWWDIR%%/includes/pomo/translations.php
 %%WWWDIR%%/includes/version.php
 %%WWWDIR%%/js/ZeroClipboard.swf
 %%WWWDIR%%/js/common.js
@@ -322,25 +402,27 @@
 %%WWWDIR%%/js/jquery-1.3.2.min.js
 %%WWWDIR%%/js/jquery-1.4.3.min.js
 %%WWWDIR%%/js/jquery-1.6.1.min.js
+%%WWWDIR%%/js/jquery-1.8.2.min.js
+%%WWWDIR%%/js/jquery-1.9.1.min.js
 %%WWWDIR%%/js/jquery.cal.js
 %%WWWDIR%%/js/jquery.notifybar.js
 %%WWWDIR%%/js/jquery.tablesorter.min.js
 %%WWWDIR%%/js/jquery.zclip.min.js
 %%WWWDIR%%/js/share.js
-%%WWWDIR%%/license.txt
 %%WWWDIR%%/pages/examplepage.php
 %%WWWDIR%%/pages/index.html
 %%WWWDIR%%/readme.html
-%%WWWDIR%%/sample-public-api.php.txt
-%%WWWDIR%%/sample-public-front-page.php.txt
-%%WWWDIR%%/sample-remote-api-call.php.txt
+%%WWWDIR%%/sample-public-api.txt
+%%WWWDIR%%/sample-public-front-page.txt
+%%WWWDIR%%/sample-remote-api-call.txt
 %%WWWDIR%%/sample-robots.txt
 %%WWWDIR%%/user/config-sample.php
 %%WWWDIR%%/user/index.html
-%%WWWDIR%%/user/plugins/hyphens-in-urls/README.txt
+%%WWWDIR%%/user/languages/index.html
+%%WWWDIR%%/user/plugins/hyphens-in-urls/README.md
 %%WWWDIR%%/user/plugins/hyphens-in-urls/plugin.php
 %%WWWDIR%%/user/plugins/index.html
-%%WWWDIR%%/user/plugins/random-bg/README.txt
+%%WWWDIR%%/user/plugins/random-bg/README.md
 %%WWWDIR%%/user/plugins/random-bg/img/bg_ants.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_boobs.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_circles.png
@@ -351,11 +433,11 @@
 %%WWWDIR%%/user/plugins/random-bg/img/bg_life.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_yourls.png
 %%WWWDIR%%/user/plugins/random-bg/plugin.php
-%%WWWDIR%%/user/plugins/sample-page/README.txt
+%%WWWDIR%%/user/plugins/sample-page/README.md
 %%WWWDIR%%/user/plugins/sample-page/plugin.php
-%%WWWDIR%%/user/plugins/sample-plugin/README.txt
+%%WWWDIR%%/user/plugins/sample-plugin/README.md
 %%WWWDIR%%/user/plugins/sample-plugin/plugin.php
-%%WWWDIR%%/user/plugins/sample-toolbar/README.txt
+%%WWWDIR%%/user/plugins/sample-toolbar/README.md
 %%WWWDIR%%/user/plugins/sample-toolbar/css/toolbar.css
 %%WWWDIR%%/user/plugins/sample-toolbar/img/close_button.gif
 %%WWWDIR%%/user/plugins/sample-toolbar/img/close_button_red.gif
@@ -367,25 +449,3 @@
 %%WWWDIR%%/yourls-go.php
 %%WWWDIR%%/yourls-infos.php
 %%WWWDIR%%/yourls-loader.php
-@dir %%WWWDIR%%/admin
-@dir %%WWWDIR%%/css
-@dir %%WWWDIR%%/images
-@dir %%WWWDIR%%/includes/geo/flags
-@dir %%WWWDIR%%/includes/geo
-@dir %%WWWDIR%%/includes
-@dir %%WWWDIR%%/js
-@dir %%WWWDIR%%/pages
-@dir %%WWWDIR%%/user/plugins/hyphens-in-urls
-@dir %%WWWDIR%%/user/plugins/random-bg/img
-@dir %%WWWDIR%%/user/plugins/random-bg
-@dir %%WWWDIR%%/user/plugins/sample-page
-@dir %%WWWDIR%%/user/plugins/sample-plugin
-@dir %%WWWDIR%%/user/plugins/sample-toolbar/css
-@dir %%WWWDIR%%/user/plugins/sample-toolbar/img
-@dir %%WWWDIR%%/user/plugins/sample-toolbar/js
-@dir %%WWWDIR%%/user/plugins/sample-toolbar
-@dir %%WWWDIR%%/user/plugins
-@dir %%WWWDIR%%/user
-@dir %%WWWDIR%%
-@owner root
-@group wheel



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502102105.t1AL5c3t021184>