5 files changed, 52 insertions, 43 deletions

diff --git a/www/yourls/Makefile b/www/yourls/Makefile
index 29d87a624faa..332400e0085c 100644
--- a/www/yourls/Makefile
+++ b/www/yourls/Makefile
@@ -2,32 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	yourls
-PORTVERSION=	1.7.1
-PORTREVISION=	1
+PORTVERSION=	1.7.2
 CATEGORIES=	www
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Your Own URL Shortener
 
-LICENSE=	ISCL MIT
-LICENSE_COMB=	multi
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+USE_PHP=	bcmath curl json mysqli pcre xml
+USES=		cpe php
+
+SUB_FILES=	pkg-message
 
-USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 GH_PROJECT=	${PORTNAME:tu}
+USE_GITHUB=	yes
 
-NO_BUILD=	yes
-NO_ARCH=	yes
+do-install:
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
-USES=		cpe
-USE_PHP=	bcmath curl json mysqli pcre xml
+# maintainer section:
 
-SUB_LIST+=	PKGNAME=${PKGNAME}
-SUB_FILES+=	pkg-message
-PLIST_SUB=	WWWOWN=${WWWOWN} \
-		WWWGRP=${WWWGRP}
+MS_PLIST=	${WRKDIR}/.ms-pkg-plist
 
-do-install:
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! -name \.*")
+genplist: do-clean extract
+	@${ECHO} "@owner www" > ${MS_PLIST}
+	@${ECHO} "@group www" >> ${MS_PLIST}
+	@cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST}
+	@${ECHO} "@owner" >> ${MS_PLIST}
+	@${ECHO} "@group" >> ${MS_PLIST}
+	@${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/www/yourls/distinfo b/www/yourls/distinfo
index 7f142b031058..7611df3787f9 100644
--- a/www/yourls/distinfo
+++ b/www/yourls/distinfo
@@ -1,2 +1,3 @@
-SHA256 (YOURLS-YOURLS-1.7.1_GH0.tar.gz) = 36c77142ec1d78933dac926aeb2c8fb5414d4ef2f21c9e7cbb9a36702806ebea
-SIZE (YOURLS-YOURLS-1.7.1_GH0.tar.gz) = 1765477
+TIMESTAMP = 1494008459
+SHA256 (YOURLS-YOURLS-1.7.2_GH0.tar.gz) = 802804aa3633128658e71142bd71ad75e85f14b0c3034af9e1dd73fec1e002df
+SIZE (YOURLS-YOURLS-1.7.2_GH0.tar.gz) = 2498179
diff --git a/www/yourls/files/pkg-message.in b/www/yourls/files/pkg-message.in
index eda991f894be..e4da1d4ee60d 100644
--- a/www/yourls/files/pkg-message.in
+++ b/www/yourls/files/pkg-message.in
@@ -1,14 +1,10 @@
 
-**********************************************
+***************************************************************************
 
- %%PKGNAME%% has been installed into :
+yourls has been installed into %%WWWDIR%%
 
-    %%WWWDIR%%
+Please visit https://yourls.org/#Install for further install/upgrade
+instructions.
 
- Please visit following web page for further
- install/upgrade instructions :
-
-    http://yourls.org/#Install
-
-**********************************************
+***************************************************************************
 
diff --git a/www/yourls/pkg-descr b/www/yourls/pkg-descr
index ce10d9a4cac5..a2cb7645f6d9 100644
--- a/www/yourls/pkg-descr
+++ b/www/yourls/pkg-descr
@@ -1,7 +1,8 @@
-YOURLS is a small set of PHP scripts that will allow you
-to run your own URL shortening service (a la TinyURL).
+YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that
+will allow you to run your own URL shortening service (a la TinyURL or bitly).
 
-You can make it private or public, you can pick custom
-keyword URLs, it comes with its own API.
+Running your own URL shortener is fun, geeky and useful: you own your data and
+don't depend on third party services. It's also a great way to add branding to
+your short URLs, instead of using the same public URL shortener everyone uses.
 
-WWW: http://yourls.org/
+WWW: https://yourls.org/
diff --git a/www/yourls/pkg-plist b/www/yourls/pkg-plist
index dd9237e02f25..a8233771426c 100644
--- a/www/yourls/pkg-plist
+++ b/www/yourls/pkg-plist
@@ -2,6 +2,7 @@
 @group %%WWWGRP%%
 %%WWWDIR%%/CHANGELOG.md
 %%WWWDIR%%/CONTRIBUTING.md
+%%WWWDIR%%/ISSUE_TEMPLATE.md
 %%WWWDIR%%/LICENSE.md
 %%WWWDIR%%/README.md
 %%WWWDIR%%/admin/admin-ajax.php
@@ -40,13 +41,10 @@
 %%WWWDIR%%/includes/BookmarkletGen/BookmarkletGen.php
 %%WWWDIR%%/includes/BookmarkletGen/README.md
 %%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/Auth.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/Cookie.php
 %%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/304.php
 %%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/305.php
 %%WWWDIR%%/includes/Requests/Requests/Exception/HTTP/306.php
@@ -80,23 +78,28 @@
 %%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/Exception/HTTP.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/Transport/cURL.php
+%%WWWDIR%%/includes/Requests/Requests/Exception/Transport.php
+%%WWWDIR%%/includes/Requests/Requests/Exception.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/Proxy.php
 %%WWWDIR%%/includes/Requests/Requests/Response/Headers.php
+%%WWWDIR%%/includes/Requests/Requests/Response.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/Transport.php
 %%WWWDIR%%/includes/Requests/Requests/Utility/CaseInsensitiveDictionary.php
 %%WWWDIR%%/includes/Requests/Requests/Utility/FilteredIterator.php
+%%WWWDIR%%/includes/Requests/Requests.php
 %%WWWDIR%%/includes/auth.php
 %%WWWDIR%%/includes/class-mysql.php
 %%WWWDIR%%/includes/ezSQL/README.md
@@ -395,14 +398,13 @@
 %%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/clipboard.min.js
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/infos.js
 %%WWWDIR%%/js/insert.js
@@ -411,10 +413,10 @@
 %%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-2.2.4.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%%/pages/examplepage.php
 %%WWWDIR%%/pages/index.html
@@ -456,3 +458,5 @@
 %%WWWDIR%%/yourls-go.php
 %%WWWDIR%%/yourls-infos.php
 %%WWWDIR%%/yourls-loader.php
+@owner
+@group