Index: head/www/yourls/Makefile
===================================================================
--- head/www/yourls/Makefile	(revision 378799)
+++ head/www/yourls/Makefile	(revision 378800)
@@ -1,30 +1,31 @@
 # Created by: Joe Horn <joehorn@gmail.com>
 # $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
 
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
 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>
Index: head/www/yourls/distinfo
===================================================================
--- head/www/yourls/distinfo	(revision 378799)
+++ head/www/yourls/distinfo	(revision 378800)
@@ -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
Index: head/www/yourls/pkg-plist
===================================================================
--- head/www/yourls/pkg-plist	(revision 378799)
+++ head/www/yourls/pkg-plist	(revision 378800)
@@ -1,391 +1,451 @@
 @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
 %%WWWDIR%%/css/share.css
 %%WWWDIR%%/css/style.css
 %%WWWDIR%%/css/tablesorter.css
 %%WWWDIR%%/images/accept.png
 %%WWWDIR%%/images/asc.gif
 %%WWWDIR%%/images/bg.gif
 %%WWWDIR%%/images/blank.gif
 %%WWWDIR%%/images/cancel.png
 %%WWWDIR%%/images/chart_bar.png
 %%WWWDIR%%/images/chart_bar_add.png
 %%WWWDIR%%/images/copy-large.png
 %%WWWDIR%%/images/copy.png
 %%WWWDIR%%/images/delete.png
 %%WWWDIR%%/images/desc.gif
 %%WWWDIR%%/images/error.png
 %%WWWDIR%%/images/facebook.png
 %%WWWDIR%%/images/favicon.gif
 %%WWWDIR%%/images/filter.gif
 %%WWWDIR%%/images/friendfeed.png
 %%WWWDIR%%/images/loading.gif
 %%WWWDIR%%/images/pencil.png
 %%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
 %%WWWDIR%%/includes/geo/flags/flag_ac.gif
 %%WWWDIR%%/includes/geo/flags/flag_ad.gif
 %%WWWDIR%%/includes/geo/flags/flag_ae.gif
 %%WWWDIR%%/includes/geo/flags/flag_af.gif
 %%WWWDIR%%/includes/geo/flags/flag_ag.gif
 %%WWWDIR%%/includes/geo/flags/flag_ai.gif
 %%WWWDIR%%/includes/geo/flags/flag_al.gif
 %%WWWDIR%%/includes/geo/flags/flag_am.gif
 %%WWWDIR%%/includes/geo/flags/flag_an.gif
 %%WWWDIR%%/includes/geo/flags/flag_ao.gif
 %%WWWDIR%%/includes/geo/flags/flag_ap.gif
 %%WWWDIR%%/includes/geo/flags/flag_aq.gif
 %%WWWDIR%%/includes/geo/flags/flag_ar.gif
 %%WWWDIR%%/includes/geo/flags/flag_as.gif
 %%WWWDIR%%/includes/geo/flags/flag_at.gif
 %%WWWDIR%%/includes/geo/flags/flag_au.gif
 %%WWWDIR%%/includes/geo/flags/flag_aw.gif
 %%WWWDIR%%/includes/geo/flags/flag_ax.gif
 %%WWWDIR%%/includes/geo/flags/flag_az.gif
 %%WWWDIR%%/includes/geo/flags/flag_ba.gif
 %%WWWDIR%%/includes/geo/flags/flag_bb.gif
 %%WWWDIR%%/includes/geo/flags/flag_bd.gif
 %%WWWDIR%%/includes/geo/flags/flag_be.gif
 %%WWWDIR%%/includes/geo/flags/flag_bf.gif
 %%WWWDIR%%/includes/geo/flags/flag_bg.gif
 %%WWWDIR%%/includes/geo/flags/flag_bh.gif
 %%WWWDIR%%/includes/geo/flags/flag_bi.gif
 %%WWWDIR%%/includes/geo/flags/flag_bj.gif
 %%WWWDIR%%/includes/geo/flags/flag_bl.gif
 %%WWWDIR%%/includes/geo/flags/flag_bm.gif
 %%WWWDIR%%/includes/geo/flags/flag_bn.gif
 %%WWWDIR%%/includes/geo/flags/flag_bo.gif
 %%WWWDIR%%/includes/geo/flags/flag_br.gif
 %%WWWDIR%%/includes/geo/flags/flag_bs.gif
 %%WWWDIR%%/includes/geo/flags/flag_bt.gif
 %%WWWDIR%%/includes/geo/flags/flag_bv.gif
 %%WWWDIR%%/includes/geo/flags/flag_bw.gif
 %%WWWDIR%%/includes/geo/flags/flag_bx.gif
 %%WWWDIR%%/includes/geo/flags/flag_by.gif
 %%WWWDIR%%/includes/geo/flags/flag_bz.gif
 %%WWWDIR%%/includes/geo/flags/flag_ca.gif
 %%WWWDIR%%/includes/geo/flags/flag_cc.gif
 %%WWWDIR%%/includes/geo/flags/flag_cd.gif
 %%WWWDIR%%/includes/geo/flags/flag_cf.gif
 %%WWWDIR%%/includes/geo/flags/flag_cg.gif
 %%WWWDIR%%/includes/geo/flags/flag_ch.gif
 %%WWWDIR%%/includes/geo/flags/flag_ci.gif
 %%WWWDIR%%/includes/geo/flags/flag_ck.gif
 %%WWWDIR%%/includes/geo/flags/flag_cl.gif
 %%WWWDIR%%/includes/geo/flags/flag_cm.gif
 %%WWWDIR%%/includes/geo/flags/flag_cn.gif
 %%WWWDIR%%/includes/geo/flags/flag_co.gif
 %%WWWDIR%%/includes/geo/flags/flag_cr.gif
 %%WWWDIR%%/includes/geo/flags/flag_cs.gif
 %%WWWDIR%%/includes/geo/flags/flag_cu.gif
 %%WWWDIR%%/includes/geo/flags/flag_cv.gif
 %%WWWDIR%%/includes/geo/flags/flag_cx.gif
 %%WWWDIR%%/includes/geo/flags/flag_cy.gif
 %%WWWDIR%%/includes/geo/flags/flag_cz.gif
 %%WWWDIR%%/includes/geo/flags/flag_de.gif
 %%WWWDIR%%/includes/geo/flags/flag_dj.gif
 %%WWWDIR%%/includes/geo/flags/flag_dk.gif
 %%WWWDIR%%/includes/geo/flags/flag_dm.gif
 %%WWWDIR%%/includes/geo/flags/flag_do.gif
 %%WWWDIR%%/includes/geo/flags/flag_dz.gif
 %%WWWDIR%%/includes/geo/flags/flag_ec.gif
 %%WWWDIR%%/includes/geo/flags/flag_ee.gif
 %%WWWDIR%%/includes/geo/flags/flag_eg.gif
 %%WWWDIR%%/includes/geo/flags/flag_eh.gif
 %%WWWDIR%%/includes/geo/flags/flag_er.gif
 %%WWWDIR%%/includes/geo/flags/flag_es.gif
 %%WWWDIR%%/includes/geo/flags/flag_et.gif
 %%WWWDIR%%/includes/geo/flags/flag_eu.gif
 %%WWWDIR%%/includes/geo/flags/flag_fi.gif
 %%WWWDIR%%/includes/geo/flags/flag_fj.gif
 %%WWWDIR%%/includes/geo/flags/flag_fk.gif
 %%WWWDIR%%/includes/geo/flags/flag_fm.gif
 %%WWWDIR%%/includes/geo/flags/flag_fo.gif
 %%WWWDIR%%/includes/geo/flags/flag_fr.gif
 %%WWWDIR%%/includes/geo/flags/flag_fx.gif
 %%WWWDIR%%/includes/geo/flags/flag_ga.gif
 %%WWWDIR%%/includes/geo/flags/flag_gb.gif
 %%WWWDIR%%/includes/geo/flags/flag_gd.gif
 %%WWWDIR%%/includes/geo/flags/flag_ge.gif
 %%WWWDIR%%/includes/geo/flags/flag_gf.gif
 %%WWWDIR%%/includes/geo/flags/flag_gg.gif
 %%WWWDIR%%/includes/geo/flags/flag_gh.gif
 %%WWWDIR%%/includes/geo/flags/flag_gi.gif
 %%WWWDIR%%/includes/geo/flags/flag_gl.gif
 %%WWWDIR%%/includes/geo/flags/flag_gm.gif
 %%WWWDIR%%/includes/geo/flags/flag_gn.gif
 %%WWWDIR%%/includes/geo/flags/flag_gp.gif
 %%WWWDIR%%/includes/geo/flags/flag_gq.gif
 %%WWWDIR%%/includes/geo/flags/flag_gr.gif
 %%WWWDIR%%/includes/geo/flags/flag_gs.gif
 %%WWWDIR%%/includes/geo/flags/flag_gt.gif
 %%WWWDIR%%/includes/geo/flags/flag_gu.gif
 %%WWWDIR%%/includes/geo/flags/flag_gw.gif
 %%WWWDIR%%/includes/geo/flags/flag_gy.gif
 %%WWWDIR%%/includes/geo/flags/flag_hk.gif
 %%WWWDIR%%/includes/geo/flags/flag_hm.gif
 %%WWWDIR%%/includes/geo/flags/flag_hn.gif
 %%WWWDIR%%/includes/geo/flags/flag_hr.gif
 %%WWWDIR%%/includes/geo/flags/flag_ht.gif
 %%WWWDIR%%/includes/geo/flags/flag_hu.gif
 %%WWWDIR%%/includes/geo/flags/flag_id.gif
 %%WWWDIR%%/includes/geo/flags/flag_ie.gif
 %%WWWDIR%%/includes/geo/flags/flag_il.gif
 %%WWWDIR%%/includes/geo/flags/flag_im.gif
 %%WWWDIR%%/includes/geo/flags/flag_in.gif
 %%WWWDIR%%/includes/geo/flags/flag_io.gif
 %%WWWDIR%%/includes/geo/flags/flag_iq.gif
 %%WWWDIR%%/includes/geo/flags/flag_ir.gif
 %%WWWDIR%%/includes/geo/flags/flag_is.gif
 %%WWWDIR%%/includes/geo/flags/flag_it.gif
 %%WWWDIR%%/includes/geo/flags/flag_je.gif
 %%WWWDIR%%/includes/geo/flags/flag_jm.gif
 %%WWWDIR%%/includes/geo/flags/flag_jo.gif
 %%WWWDIR%%/includes/geo/flags/flag_jp.gif
 %%WWWDIR%%/includes/geo/flags/flag_ke.gif
 %%WWWDIR%%/includes/geo/flags/flag_kg.gif
 %%WWWDIR%%/includes/geo/flags/flag_kh.gif
 %%WWWDIR%%/includes/geo/flags/flag_ki.gif
 %%WWWDIR%%/includes/geo/flags/flag_km.gif
 %%WWWDIR%%/includes/geo/flags/flag_kn.gif
 %%WWWDIR%%/includes/geo/flags/flag_kp.gif
 %%WWWDIR%%/includes/geo/flags/flag_kr.gif
 %%WWWDIR%%/includes/geo/flags/flag_kw.gif
 %%WWWDIR%%/includes/geo/flags/flag_ky.gif
 %%WWWDIR%%/includes/geo/flags/flag_kz.gif
 %%WWWDIR%%/includes/geo/flags/flag_la.gif
 %%WWWDIR%%/includes/geo/flags/flag_lb.gif
 %%WWWDIR%%/includes/geo/flags/flag_lc.gif
 %%WWWDIR%%/includes/geo/flags/flag_le.gif
 %%WWWDIR%%/includes/geo/flags/flag_li.gif
 %%WWWDIR%%/includes/geo/flags/flag_lk.gif
 %%WWWDIR%%/includes/geo/flags/flag_lr.gif
 %%WWWDIR%%/includes/geo/flags/flag_ls.gif
 %%WWWDIR%%/includes/geo/flags/flag_lt.gif
 %%WWWDIR%%/includes/geo/flags/flag_lu.gif
 %%WWWDIR%%/includes/geo/flags/flag_lv.gif
 %%WWWDIR%%/includes/geo/flags/flag_ly.gif
 %%WWWDIR%%/includes/geo/flags/flag_ma.gif
 %%WWWDIR%%/includes/geo/flags/flag_mc.gif
 %%WWWDIR%%/includes/geo/flags/flag_md.gif
 %%WWWDIR%%/includes/geo/flags/flag_me.gif
 %%WWWDIR%%/includes/geo/flags/flag_mf.gif
 %%WWWDIR%%/includes/geo/flags/flag_mg.gif
 %%WWWDIR%%/includes/geo/flags/flag_mh.gif
 %%WWWDIR%%/includes/geo/flags/flag_mk.gif
 %%WWWDIR%%/includes/geo/flags/flag_ml.gif
 %%WWWDIR%%/includes/geo/flags/flag_mm.gif
 %%WWWDIR%%/includes/geo/flags/flag_mn.gif
 %%WWWDIR%%/includes/geo/flags/flag_mo.gif
 %%WWWDIR%%/includes/geo/flags/flag_mp.gif
 %%WWWDIR%%/includes/geo/flags/flag_mq.gif
 %%WWWDIR%%/includes/geo/flags/flag_mr.gif
 %%WWWDIR%%/includes/geo/flags/flag_ms.gif
 %%WWWDIR%%/includes/geo/flags/flag_mt.gif
 %%WWWDIR%%/includes/geo/flags/flag_mu.gif
 %%WWWDIR%%/includes/geo/flags/flag_mv.gif
 %%WWWDIR%%/includes/geo/flags/flag_mw.gif
 %%WWWDIR%%/includes/geo/flags/flag_mx.gif
 %%WWWDIR%%/includes/geo/flags/flag_my.gif
 %%WWWDIR%%/includes/geo/flags/flag_mz.gif
 %%WWWDIR%%/includes/geo/flags/flag_na.gif
 %%WWWDIR%%/includes/geo/flags/flag_nc.gif
 %%WWWDIR%%/includes/geo/flags/flag_ne.gif
 %%WWWDIR%%/includes/geo/flags/flag_nf.gif
 %%WWWDIR%%/includes/geo/flags/flag_ng.gif
 %%WWWDIR%%/includes/geo/flags/flag_ni.gif
 %%WWWDIR%%/includes/geo/flags/flag_nl.gif
 %%WWWDIR%%/includes/geo/flags/flag_no.gif
 %%WWWDIR%%/includes/geo/flags/flag_np.gif
 %%WWWDIR%%/includes/geo/flags/flag_nr.gif
 %%WWWDIR%%/includes/geo/flags/flag_nu.gif
 %%WWWDIR%%/includes/geo/flags/flag_nz.gif
 %%WWWDIR%%/includes/geo/flags/flag_o1.gif
 %%WWWDIR%%/includes/geo/flags/flag_om.gif
 %%WWWDIR%%/includes/geo/flags/flag_pa.gif
 %%WWWDIR%%/includes/geo/flags/flag_pe.gif
 %%WWWDIR%%/includes/geo/flags/flag_pf.gif
 %%WWWDIR%%/includes/geo/flags/flag_pg.gif
 %%WWWDIR%%/includes/geo/flags/flag_ph.gif
 %%WWWDIR%%/includes/geo/flags/flag_pk.gif
 %%WWWDIR%%/includes/geo/flags/flag_pl.gif
 %%WWWDIR%%/includes/geo/flags/flag_pm.gif
 %%WWWDIR%%/includes/geo/flags/flag_pn.gif
 %%WWWDIR%%/includes/geo/flags/flag_pr.gif
 %%WWWDIR%%/includes/geo/flags/flag_ps.gif
 %%WWWDIR%%/includes/geo/flags/flag_pt.gif
 %%WWWDIR%%/includes/geo/flags/flag_pw.gif
 %%WWWDIR%%/includes/geo/flags/flag_py.gif
 %%WWWDIR%%/includes/geo/flags/flag_qa.gif
 %%WWWDIR%%/includes/geo/flags/flag_re.gif
 %%WWWDIR%%/includes/geo/flags/flag_ro.gif
 %%WWWDIR%%/includes/geo/flags/flag_rs.gif
 %%WWWDIR%%/includes/geo/flags/flag_ru.gif
 %%WWWDIR%%/includes/geo/flags/flag_rw.gif
 %%WWWDIR%%/includes/geo/flags/flag_sa.gif
 %%WWWDIR%%/includes/geo/flags/flag_sb.gif
 %%WWWDIR%%/includes/geo/flags/flag_sc.gif
 %%WWWDIR%%/includes/geo/flags/flag_sd.gif
 %%WWWDIR%%/includes/geo/flags/flag_se.gif
 %%WWWDIR%%/includes/geo/flags/flag_sg.gif
 %%WWWDIR%%/includes/geo/flags/flag_sh.gif
 %%WWWDIR%%/includes/geo/flags/flag_si.gif
 %%WWWDIR%%/includes/geo/flags/flag_sj.gif
 %%WWWDIR%%/includes/geo/flags/flag_sk.gif
 %%WWWDIR%%/includes/geo/flags/flag_sl.gif
 %%WWWDIR%%/includes/geo/flags/flag_sm.gif
 %%WWWDIR%%/includes/geo/flags/flag_sn.gif
 %%WWWDIR%%/includes/geo/flags/flag_so.gif
 %%WWWDIR%%/includes/geo/flags/flag_sr.gif
 %%WWWDIR%%/includes/geo/flags/flag_st.gif
 %%WWWDIR%%/includes/geo/flags/flag_su.gif
 %%WWWDIR%%/includes/geo/flags/flag_sv.gif
 %%WWWDIR%%/includes/geo/flags/flag_sy.gif
 %%WWWDIR%%/includes/geo/flags/flag_sz.gif
 %%WWWDIR%%/includes/geo/flags/flag_tc.gif
 %%WWWDIR%%/includes/geo/flags/flag_td.gif
 %%WWWDIR%%/includes/geo/flags/flag_tf.gif
 %%WWWDIR%%/includes/geo/flags/flag_tg.gif
 %%WWWDIR%%/includes/geo/flags/flag_th.gif
 %%WWWDIR%%/includes/geo/flags/flag_tj.gif
 %%WWWDIR%%/includes/geo/flags/flag_tk.gif
 %%WWWDIR%%/includes/geo/flags/flag_tl.gif
 %%WWWDIR%%/includes/geo/flags/flag_tm.gif
 %%WWWDIR%%/includes/geo/flags/flag_tn.gif
 %%WWWDIR%%/includes/geo/flags/flag_to.gif
 %%WWWDIR%%/includes/geo/flags/flag_tp.gif
 %%WWWDIR%%/includes/geo/flags/flag_tr.gif
 %%WWWDIR%%/includes/geo/flags/flag_tt.gif
 %%WWWDIR%%/includes/geo/flags/flag_tv.gif
 %%WWWDIR%%/includes/geo/flags/flag_tw.gif
 %%WWWDIR%%/includes/geo/flags/flag_tz.gif
 %%WWWDIR%%/includes/geo/flags/flag_ua.gif
 %%WWWDIR%%/includes/geo/flags/flag_ug.gif
 %%WWWDIR%%/includes/geo/flags/flag_uk.gif
 %%WWWDIR%%/includes/geo/flags/flag_um.gif
 %%WWWDIR%%/includes/geo/flags/flag_us.gif
 %%WWWDIR%%/includes/geo/flags/flag_uy.gif
 %%WWWDIR%%/includes/geo/flags/flag_uz.gif
 %%WWWDIR%%/includes/geo/flags/flag_va.gif
 %%WWWDIR%%/includes/geo/flags/flag_vc.gif
 %%WWWDIR%%/includes/geo/flags/flag_ve.gif
 %%WWWDIR%%/includes/geo/flags/flag_vg.gif
 %%WWWDIR%%/includes/geo/flags/flag_vi.gif
 %%WWWDIR%%/includes/geo/flags/flag_vn.gif
 %%WWWDIR%%/includes/geo/flags/flag_vu.gif
 %%WWWDIR%%/includes/geo/flags/flag_wf.gif
 %%WWWDIR%%/includes/geo/flags/flag_ws.gif
 %%WWWDIR%%/includes/geo/flags/flag_ye.gif
 %%WWWDIR%%/includes/geo/flags/flag_yt.gif
 %%WWWDIR%%/includes/geo/flags/flag_yu.gif
 %%WWWDIR%%/includes/geo/flags/flag_za.gif
 %%WWWDIR%%/includes/geo/flags/flag_zm.gif
 %%WWWDIR%%/includes/geo/flags/flag_zr.gif
 %%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
 %%WWWDIR%%/js/infos.js
 %%WWWDIR%%/js/insert.js
 %%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
 %%WWWDIR%%/user/plugins/random-bg/img/bg_cross.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_diag.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_fuzzy.png
 %%WWWDIR%%/user/plugins/random-bg/img/bg_fuzzy_bits.png
 %%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
 %%WWWDIR%%/user/plugins/sample-toolbar/img/favicon.gif
 %%WWWDIR%%/user/plugins/sample-toolbar/img/toolbar_bg.png
 %%WWWDIR%%/user/plugins/sample-toolbar/js/toolbar.js
 %%WWWDIR%%/user/plugins/sample-toolbar/plugin.php
 %%WWWDIR%%/yourls-api.php
 %%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