Upgrade to 1.0.0.

5 files changed, 108 insertions, 467 deletions

diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index 8f8be59eeff8..0aa80fab8b7c 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -6,33 +6,28 @@
 #
 
 PORTNAME=	gadfly
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	databases
-MASTER_SITES=	http://www.chordate.com/kwParsing/
-DISTNAME=	kwP
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gadfly
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_PYTHON=	yes
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:${PORTSDIR}/devel/py-kjbuckets
 
-GADFLYDIR=	${PYTHON_SITELIBDIR}/gadfly
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 
-do-install:
-	${MKDIR} ${GADFLYDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.py ${GADFLYDIR}
-	${INSTALL_DATA} ${WRKSRC}/sql.mar ${GADFLYDIR}
-	${ECHO_CMD} 'gadfly' > ${PYTHON_SITELIBDIR}/gadfly.pth
-	(cd ${GADFLYDIR}; ${PYTHON_CMD} gfinstall.py)
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${GADFLYDIR}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${GADFLYDIR}
+post-install:
 .if !defined(${NOPORTDOCS})
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/gadfly.JPG ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/build_html.py ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}/kjParsing
+	@${INSTALL_DATA} ${WRKSRC}/doc/demo/kjParsing/*.py \
+		${EXAMPLESDIR}/kjParsing
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/gadfly/distinfo b/databases/gadfly/distinfo
index 579ca8d6c674..025ee654d0be 100644
--- a/databases/gadfly/distinfo
+++ b/databases/gadfly/distinfo
@@ -1 +1 @@
-MD5 (kwP.tar.gz) = 00a4d7ad89e4bbd877c15349b5019474
+MD5 (gadfly-1.0.0.tar.gz) = 8dc11575e4d8042058f6ad11b32a8641
diff --git a/databases/gadfly/files/patch-re b/databases/gadfly/files/patch-re
deleted file mode 100644
index d9caffd1ff38..000000000000
--- a/databases/gadfly/files/patch-re
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -u gadfly-1.0/kjParseBuild.py gadfly/kjParseBuild.py
---- gadfly-1.0/kjParseBuild.py	Tue Oct  6 20:33:21 1998
-+++ kjParseBuild.py	Wed May 16 20:32:30 2001
-@@ -14,7 +14,7 @@
- import string
- import kjSet
- import kjParser
--import regex
-+import re
- 
- # import some constants
- from kjParser import \
-diff -u gadfly-1.0/kjParser.py gadfly/kjParser.py
---- gadfly-1.0/kjParser.py	Tue Oct  6 20:33:39 1998
-+++ kjParser.py	Wed May 16 20:32:30 2001
-@@ -13,8 +13,7 @@
- 
- import kjSet
- import string
--import regex
--import regsub
-+import re
- import string
- 
- # set this flag for regression testing at each load
-@@ -40,7 +39,7 @@
- 
- # regular expression for matching whitespace
- WHITERE = "["+string.whitespace+"]+"
--WHITEREGEX = regex.compile(WHITERE)
-+WHITEREGEX = re.compile(WHITERE)
- 
- # local errors
- LexTokenError = "LexTokenError" # may happen on bad string
-@@ -62,6 +61,17 @@
- # in FSM use the following terminal to indicate eof
- ENDOFFILETERM = (ENDOFFILETOKEN, EOFFLAG)
- 
-+# Utility function for match conversion from regex to re
-+def RMATCH(re, key, start=0):
-+    #print "RMATCH: %s -> %s <- start=%s" % (re.pattern, key, start)
-+    group = re.match(key, start)
-+    if group is None:
-+        #print "RMATCH: -1"
-+        return -1
-+    len = group.end() - group.start()
-+    #print "RMATCH: %s (%s)" % (len, group.group())
-+    return len
-+
- # utility function for error diagnostics
- def DumpStringWindow(Str, Pos, Offset=15):
-     L = []
-@@ -169,7 +179,7 @@
-        length = len(key)
-        for triple in self.regexprlist:
-           (regexpr, Flag, Function) = triple
--          index = regexpr.match(key)
-+          index = RMATCH(regexpr,key)
-           if index == length:
-              found = 1
-              # use the function to interpret the string, if given
-@@ -205,7 +215,7 @@
-   def terminal(self, string, RegExpr=None, Function=None):
-     if RegExpr != None and Function != None:
-        if type(RegExpr) == type(""):
--          RegExpr = regex.compile(RegExpr)
-+          RegExpr = re.compile(RegExpr)
-        self[ RegExpr ] = ( string, Function)
-     for triple in self.regexprlist:
-        (regexpr,token,Function) = triple
-@@ -235,7 +245,7 @@
-   # register a regular expression as a comment
-   def comment(self, string):
-     # regexpr better be a uncompiled string regular expression! (not verified)
--    regexpr = regex.compile(string)
-+    regexpr = re.compile(string)
-     self.commentpatterns = self.commentpatterns + [ regexpr ]
-     self.commentstrings = self.commentstrings + [ string ]
- 
-@@ -272,7 +282,7 @@
-            return (ENDOFFILETERM, 0)
-         # skip whitespace
-         whitespacefound = 0
--        skip = WHITEREGEX.match(String, StartPosition)
-+        skip = RMATCH(WHITEREGEX,String, StartPosition)
-         if skip > 0:
-            StartPosition = StartPosition + skip
-            totalOffset = totalOffset + skip
-@@ -281,7 +291,7 @@
-         # looking for comment
-         commentfound = 0
-         for commentexpr in self.commentpatterns:
--           offset = commentexpr.match(String,StartPosition)
-+           offset = RMATCH(commentexpr,String,StartPosition)
-            if offset != -1:
-               if offset<1:
-                  info = DumpStringWindow(String,StartPosition)
-@@ -296,7 +306,7 @@
-            return ( keypair[0], keypair[1] + totalOffset)
-         # looking for terminal
-         for (regexpr, Flag, Function) in self.regexprlist:
--           offset = regexpr.match(String,StartPosition)
-+           offset = RMATCH(regexpr,String,StartPosition)
-            if offset != -1:
-               matchstring = String[StartPosition : offset+StartPosition]
-               if Function != None:
-@@ -386,18 +396,17 @@
-        punctlist = self.punctuationlist
-        termregex = self.termregex
-        while not finished:
--          #print String[StartPosition:]
-           if len(String) <= StartPosition:
-              result = self.lastresult = (ENDOFFILETERM, 0)
-              return result
-           # skip ws and comments 
--          skip = skipprog.match(String, StartPosition)
-+          #skip = skipprog.match(String, StartPosition)
-+          skip = RMATCH(skipprog, String, StartPosition)
-           if skip>0:
-              if skip==0:
-                 info = DumpStringWindow(String, StartPosition)
-                 raise LexTokenError, \
--                     "zero length whitespace or comment "+info
--             #print "skipping", `String[StartPosition: StartPosition+skip]`
-+                  "zero length whitespace or comment "+info
-              StartPosition = StartPosition + skip
-              totalOffset = totalOffset + skip
-              continue
-@@ -408,9 +417,10 @@
-              result = self.lastresult = (keypair[0], keypair[1]+totalOffset)
-              return result
-           # look for terminal
-+          #print "Termregex: %s --> %s <-- start=%s" % (termregex.pattern, String, StartPosition)
-           offset = termregex.match(String, StartPosition)
--          if (offset>0):
--             g = termregex.group
-+          if offset is not None:
-+             g = offset.group
-              for (term, regex, flag, fn) in self.termlist:
-                  test = g(term)
-                  if test:
-@@ -420,7 +430,7 @@
-                     else:
-                        value = test
-                     result = self.lastresult = (
--                       (flag, value), offset + totalOffset)
-+                       (flag, value), offset.end() - offset.start() + totalOffset)
-                     return result
-           # error if we get here
-           info = DumpStringWindow(String, StartPosition)
-@@ -431,19 +441,19 @@
- 
-    def compile(self):
-        from string import joinfields, whitespace
--       import regex
-+       import re
-        skipregexen = self.commentstrings + [WHITERE]
--       skipregex = "\(" + joinfields(skipregexen, "\)\|\(") + "\)"
-+       skipregex = "(" + joinfields(skipregexen, ")|(") + ")"
-        #print skipregex; import sys; sys.exit(1)
--       self.skipprog = regex.compile(skipregex)
-+       self.skipprog = re.compile(skipregex)
-        termregexen = []
-        termnames = []
-        for (term, rgex, flag, fn) in self.termlist:
--           fragment = "\(<%s>%s\)" % (term, rgex)
-+           fragment = "(?P<%s>%s)" % (term, rgex)
-            termregexen.append(fragment)
-            termnames.append(term)
--       termregex = joinfields(termregexen, "\|")
--       self.termregex = regex.symcomp(termregex)
-+       termregex = joinfields(termregexen, "|")
-+       self.termregex = re.compile(termregex)
-        self.termnames = termnames
- 
- LexDictionary = lexdictionary ##### test!
-diff -u gadfly-1.0/pygram.py gadfly/pygram.py
---- gadfly-1.0/pygram.py	Tue Oct  6 20:34:43 1998
-+++ pygram.py	Wed May 16 20:32:30 2001
-@@ -375,7 +375,7 @@
- **
- """
- 
--import kjParser, string, regex
-+import kjParser, string, re
- from kjParser import KEYFLAG, ENDOFFILETERM
- 
- alphanumunder = string.letters+string.digits+"_"
-@@ -386,33 +386,33 @@
- 
- # terminator re for names
- nametermre = "[^" + alphanumunder + "]"
--nameterm = regex.compile(nametermre)
-+nameterm = re.compile(nametermre)
- 
- # terminator re for numbers (same as above but allow "." in num).
- numtermre =  "[^" + alphanumunder + "\.]"
--numterm = regex.compile(numtermre)
-+numterm = re.compile(numtermre)
- 
- parseerror = "parseerror"
- 
--pycommentre = "\(#.*\)"
-+pycommentre = r"(#.*)"
- 
- # whitespace regex outside of brackets
- #  white followed by (comment\n maybe repeated)
- #  DON'T EAT NEWLINE!!
--pywhiteoutre = "\([ \t\r\014]\|\\\\\n\)*%s?" % pycommentre
--pywhiteout = regex.compile(pywhiteoutre)
-+pywhiteoutre = r"([ \t\r\014]|[\]\n)*%s?" % pycommentre
-+pywhiteout = re.compile(pywhiteoutre)
- 
- # whitespace regex inside brackets
- #  white or newline possibly followed by comment, all maybe repeated
--pywhiteinre = pywhiteoutre #"[ \t\r]*\(\\\\\n\)*%s?" % pycommentre
--pywhitein = regex.compile(pywhiteinre)
-+pywhiteinre = pywhiteoutre #"[ \t\r]*(\\\\\n)*%s?" % pycommentre
-+pywhitein = re.compile(pywhiteinre)
- 
- # totally blank lines (only recognize if next char is newline)
- #allblankre = "\n" + pywhiteinre
--#allblank = regex.compile(allblankre)
-+#allblank = re.compile(allblankre)
- 
- # re for indentation (might accept empty string)
--indentp = regex.compile("[\t ]*")
-+indentp = re.compile(r"[\t ]*")
- 
- # two char kws and puncts
- char2kw = ["if", "or", "in", "is"]
-@@ -450,6 +450,11 @@
- 
- ### MUST HANDLE WHOLELY BLANK LINES CORRECTLY!
- 
-+def RMATCH(re, key, start=0):
-+    group = re.match(key, start)
-+    if group is None: return -1
-+    return group.end() - group.start()
-+
- class pylexdict(kjParser.LexDictionary):
-    def __init__(self):
-        kjParser.LexDictionary.__init__(self)
-@@ -504,7 +509,7 @@
-           cursor = 0
-           self.lineno = 1
-           while 1:
--             test = pywhitein.match(String, cursor)
-+             test = RMATCH(pywhitein,String, cursor)
-              if test<0: break
-              next = cursor + test
-              #print "lead skip:", next, String[cursor:next]
-@@ -565,7 +570,7 @@
-                    start = start+1
-                    #self.lineno = self.lineno+1
-              #print "matching", `String[start:start+10]`
--             skip = pywhitein.match(String, start)
-+             skip = RMATCH(pywhitein,String, start)
-              #print "skip=", skip
-              if skip<0: break
-              rs = skip + realindex + (start-realindex)
-@@ -599,7 +604,7 @@
-                 skipto = skipto + 1
-                 self.realindex = realindex = skipto
-                 continue
--             skip = pywhiteout.match(String, skipto)
-+             skip = RMATCH(pywhiteout,String, skipto)
-              nextskipto = skipto+skip
-              #skipped = String[skipto:nextskipto]
-              #if "\n" in skipped:
-@@ -610,7 +615,7 @@
-              else: break
-           skip = skipto - realindex
-        elif not atlineend:
--          skip = pywhitein.match(String, realindex)
-+          skip = RMATCH(pywhitein,String, realindex)
-        if skip<=0: 
-           skip = 0
-        else:
-@@ -631,7 +636,7 @@
-        if (self.brackets<=0 and (lastresult is newlineresult or self.atdedent)
-            and first != "\n"):
-           #print "looking for dent", realindex, `String[realindex:realindex+20]`
--          match = indentp.match(String, realindex)
-+          match = RMATCH(indentp,String, realindex)
-           if match>=0:
-              dent = String[realindex: realindex+match]
-              #print "dent match", match, `dent`
-@@ -923,7 +928,7 @@
- #
- from string import join, split
- '''
--import regex
-+import re
- 
- for a in l:
-     a.attr, a[x], b = c
-@@ -935,7 +940,7 @@
-    #doc string 
-    '''
-    '''
--   global regex, join
-+   global re, join
-    
-    d = {} 
-    for i in range(10): d[i] = i
-diff -u gadfly-1.0/sqlgen.py gadfly/sqlgen.py
---- gadfly-1.0/sqlgen.py	Tue Oct  6 20:35:03 1998
-+++ sqlgen.py	Wed May 16 20:32:30 2001
-@@ -17,7 +17,7 @@
-     from string import upper
-     return upper(str)
-     
--charstre = "'[^\n']*'"
-+charstre = "'[^']*'"
- 
- def charstfn(str):
-     return str[1:-1]
-@@ -27,7 +27,7 @@
- digits = string.digits
- # rely in python to filter out the good/bad/ugly
- intre = "[%s][%s.jJ]*" % (digits,digits)
--numlitre = "%s\([Ee][+-]?%s\)?" % (intre, intre)
-+numlitre = "%s([Ee][+-]?%s)?" % (intre, intre)
- 
- def numlitfn(str):
-     """Note: this is "safe" because regex
diff --git a/databases/gadfly/files/patch-socket b/databases/gadfly/files/patch-socket
deleted file mode 100644
index 9f8332859d8a..000000000000
--- a/databases/gadfly/files/patch-socket
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u gadfly-1.0/gfclient.py gadfly/gfclient.py
---- gadfly-1.0/gfclient.py	Tue Oct  6 20:32:00 1998
-+++ gfclient.py	Wed Jul 12 22:01:44 2000
-@@ -138,7 +138,7 @@
-         import socket
-         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-         #print type(sock), sock
--        sock.connect(self.machine, self.port)
-+        sock.connect((self.machine, self.port))
-         return sock
-         
-     def send_action(self, action, arguments, socket):
-diff -u gadfly-1.0/gfserve.py gadfly/gfserve.py
---- gadfly-1.0/gfserve.py	Tue Oct  6 20:32:32 1998
-+++ gfserve.py	Thu Sep  7 18:43:34 2000
-@@ -332,7 +332,7 @@
-             if verbose: 
-                print "set of REUSEADDR failed", sys.exc_type, sys.exc_value
-             pass
--        sock.bind(self.HOST, self.port)
-+        sock.bind((self.HOST, self.port))
-         sock.listen(self.BACKLOG)
-         self.socket = sock
-         return sock
diff --git a/databases/gadfly/pkg-plist b/databases/gadfly/pkg-plist
index a378df7b2c17..2787c4e605ff 100644
--- a/databases/gadfly/pkg-plist
+++ b/databases/gadfly/pkg-plist
@@ -1,97 +1,94 @@
-lib/%%PYTHON_VERSION%%/site-packages/gadfly.pth
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sql.mar
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.pyo
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.py
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.pyc
-lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.pyo
-%%PORTDOCS%%share/doc/gadfly/COPYRIGHT
-%%PORTDOCS%%share/doc/gadfly/gadfly.JPG
-%%PORTDOCS%%share/doc/gadfly/gadfly.html
-%%PORTDOCS%%share/doc/gadfly/gfSQL.html
-%%PORTDOCS%%share/doc/gadfly/gffaq.html
-%%PORTDOCS%%share/doc/gadfly/gfrecover.html
-%%PORTDOCS%%share/doc/gadfly/index.html
-%%PORTDOCS%%share/doc/gadfly/kwParsing.html
-%%PORTDOCS%%share/doc/gadfly/server.html
+bin/gfplus
+bin/gfserver
+%%PYTHON_SITELIBDIR%%/gadfly/__init__.py
+%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/bindings.py
+%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/client.py
+%%PYTHON_SITELIBDIR%%/gadfly/client.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/client.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/database.py
+%%PYTHON_SITELIBDIR%%/gadfly/database.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/database.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.py
+%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/grammar.py
+%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/introspection.py
+%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.py
+%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/kjParser.py
+%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/kjSet.py
+%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.py
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.py
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/operations.py
+%%PYTHON_SITELIBDIR%%/gadfly/operations.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/operations.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.py
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.py
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.py
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/semantics.py
+%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/serialize.py
+%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/server.py
+%%PYTHON_SITELIBDIR%%/gadfly/server.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/server.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/sql.py
+%%PYTHON_SITELIBDIR%%/gadfly/sql.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/sql.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.py
+%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyo
+%%PYTHON_SITELIBDIR%%/gadfly/store.py
+%%PYTHON_SITELIBDIR%%/gadfly/store.pyc
+%%PYTHON_SITELIBDIR%%/gadfly/store.pyo
+%%PORTDOCS%%share/doc/gadfly/CHANGES.txt
+%%PORTDOCS%%share/doc/gadfly/COPYRIGHT.txt
+%%PORTDOCS%%share/doc/gadfly/announcement.txt
+%%PORTDOCS%%share/doc/gadfly/build_html.py
+%%PORTDOCS%%share/doc/gadfly/faq.txt
+%%PORTDOCS%%share/doc/gadfly/gadfly.txt
+%%PORTDOCS%%share/doc/gadfly/gfplus.txt
+%%PORTDOCS%%share/doc/gadfly/index.txt
+%%PORTDOCS%%share/doc/gadfly/installation.txt
+%%PORTDOCS%%share/doc/gadfly/kjbuckets.txt
+%%PORTDOCS%%share/doc/gadfly/kwParsing.txt
+%%PORTDOCS%%share/doc/gadfly/network.txt
+%%PORTDOCS%%share/doc/gadfly/recover.txt
+%%PORTDOCS%%share/doc/gadfly/sql.txt
+%%PORTDOCS%%share/doc/gadfly/structure.txt
+%%PORTDOCS%%share/examples/gadfly/kjParsing/DLispShort.py
+%%PORTDOCS%%share/examples/gadfly/kjParsing/DumbLispGen.py
+%%PORTDOCS%%share/examples/gadfly/kjParsing/idl.py
+%%PORTDOCS%%share/examples/gadfly/kjParsing/pygram.py
+%%PORTDOCS%%share/examples/gadfly/kjParsing/pylint.py
+%%PORTDOCS%%share/examples/gadfly/kjParsing/relalg.py
+%%PORTDOCS%%@dirrm share/examples/gadfly/kjParsing
+%%PORTDOCS%%@dirrm share/examples/gadfly
 %%PORTDOCS%%@dirrm share/doc/gadfly
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/gadfly
+@dirrm %%PYTHON_SITELIBDIR%%/gadfly/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/gadfly