# Makefile               |   17 ++++++++++-------
# distinfo               |    4 ++--
# files/patch-portell.py |   46 +++++++++++++++++++++++++++-------------------
# 3 files changed, 39 insertions(+), 28 deletions(-)
# svn status
M       Makefile
M       distinfo
M       files/patch-portell.py

Index: Makefile
===================================================================
--- Makefile	(revision 381974)
+++ Makefile	(working copy)
@@ -3,35 +3,38 @@
 
 PORTNAME=	portell
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	https://gist.githubusercontent.com/${GIST_ACCOUNT}/${GIST_ID}/download/?dummy=/
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Quick display of FreeBSD port descriptions
 
-USES=		python zip
+GIST_ACCOUNT=	rkulla
+GIST_ID=	1122022
+GIST_HASH=	f0aa9e5c6662648aa8a9aa0a321109236548482a
+DISTFILES=	${PORTNAME}-gist${GIST_ID}-${GIST_HASH}.tar.gz
+
+USES=		python
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/gist${GIST_ID}-${GIST_HASH}
+
 PLIST_FILES=	bin/portell
-PORTDOCS=	README.txt
 
 post-extract:
 	${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/portell.py
 	${REINPLACE_CMD} -e 's/free/freebsd/' ${WRKSRC}/portell.py
-	${REINPLACE_CMD} -e 's/portell.py/portell/' ${WRKSRC}/README.txt
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portell.py ${STAGEDIR}${PREFIX}/bin/portell
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
 post-install:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "###############################################################################"
 	@${ECHO_MSG} "# You must run 'portell -u' to initialize the DB"
-	@${ECHO_MSG} "# ${DOCSDIR}/README.txt for more information."
 	@${ECHO_MSG} "###############################################################################"
 	@${ECHO_MSG} ""
 .endif
Index: distinfo
===================================================================
--- distinfo	(revision 381974)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (portell-0.2.zip) = c7d76ba7d59be5276a480f2defdbd0e0c79fd51be9669354805b96817ba57306
-SIZE (portell-0.2.zip) = 1780
+SHA256 (portell-gist1122022-f0aa9e5c6662648aa8a9aa0a321109236548482a.tar.gz) = f0aba89fdaf6c2cf0031ffd7df99354fc589358f8d9616599fc158334d829b89
+SIZE (portell-gist1122022-f0aa9e5c6662648aa8a9aa0a321109236548482a.tar.gz) = 1278
Index: files/patch-portell.py
===================================================================
--- files/patch-portell.py	(revision 381974)
+++ files/patch-portell.py	(working copy)
@@ -1,26 +1,34 @@
-
-$FreeBSD$
-
---- portell.py.orig
+--- portell.py.orig	2015-03-23 03:41:57 UTC
 +++ portell.py
-@@ -14,12 +14,16 @@
+@@ -12,6 +12,8 @@ try:
+ except KeyError:
      PORTELL_DB = "/var/db/portell.db"
  
- PORTS_DIR = "/usr/ports/"
--
 +IGNORE_DIRS = { "distfiles":None, "Tools":None, "packages":None }
++
+ def display_usage():
+     print "Usage: %s <portname>" % sys.argv[0]
+     print "To update the database: %s -u" % sys.argv[0]
+@@ -47,8 +49,13 @@ def fix_dbdb():
+         os.rename(PORTELL_DB + ".db", PORTELL_DB)
  
- def write_pathname(d, dirname, names):
+ def write_pathname(db, dirname, names):
 -    '/'.join(dirname.split('/')[:5]) # chop port path subdirs
--    d[os.path.basename(dirname)] = dirname
--
-+	dirs=dirname.split('/')
-+	if len(dirs)==4:
-+	    if IGNORE_DIRS.has_key(dirs[3]):
-+		del names[:]
-+	elif len(dirs)==5:
-+	    d[dirs[4]] = dirname
-+	    del names[:]
+-    db[os.path.basename(dirname)] = dirname
++    dirs=dirname.split('/')
++    if len(dirs)==4:
++        if IGNORE_DIRS.has_key(dirs[3]):
++            del names[:]
++    elif len(dirs)==5:
++        d[dirs[4]] = dirname
++        del names[:]
  
- def update_db(msg):
-     print msg
+ def read_descr(descr_path):
+     try:
+@@ -84,4 +91,4 @@ def main():
+         db.close()
+ 
+ if __name__=='__main__':
+-    main()
+\ No newline at end of file
++    main()