8 files changed, 40 insertions, 26 deletions

diff --git a/palm/plucker/Makefile b/palm/plucker/Makefile
index 179e7753c70b..0d41a50e5626 100644
--- a/palm/plucker/Makefile
+++ b/palm/plucker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	plucker
-PORTVERSION=	1.6
+PORTVERSION=	1.6.1
 CATEGORIES=	palm www
 MASTER_SITES=	http://downloads.plkr.org/${PORTVERSION}/ \
 		http://downloads.hideho.org/${PORTNAME}/${PORTVERSION}/
@@ -32,6 +32,8 @@ MAN1=		plucker-build.1 plucker-decode.1 plucker-dump.1
 FIND?=		find
 NO_BUILD=	yes
 
+MYPORTDOCS=	AUTHORS BUGREPORT CREDITS ChangeLog FAQ NEWS README REQUIREMENTS TODO
+
 .include <bsd.port.pre.mk>
 
 post-build:
@@ -70,7 +72,9 @@ do-install:
 .for F in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/parser/${F} ${MAN1PREFIX}/man/man1
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/[A-Z]* ${DOCSDIR}
+.for F in ${MYPORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/manual
 .endif
 
diff --git a/palm/plucker/distinfo b/palm/plucker/distinfo
index 01f3c85988b7..ae54625785f5 100644
--- a/palm/plucker/distinfo
+++ b/palm/plucker/distinfo
@@ -1,3 +1,3 @@
-MD5 (plucker_docs-1.6.tar.bz2) = 8f841b6370f1f7b4c55246ad36b6dd70
-MD5 (plucker_parser-1.6.tar.bz2) = ea847f012855c78e2d18d87ead254f5a
-MD5 (plucker_viewer-1.6.tar.bz2) = d54f49fb769abcdbb39646e43d2e12f1
+MD5 (plucker_docs-1.6.1.tar.bz2) = 2dcc0032c726c7753d701b6b55bec96a
+MD5 (plucker_parser-1.6.1.tar.bz2) = e8f6582af2a948f291446c11b30b5c3f
+MD5 (plucker_viewer-1.6.1.tar.bz2) = 00b39eaf934e1ac5a2244dce19549e3e
diff --git a/palm/plucker/files/patch-parser::PyPlucker::Parser.py b/palm/plucker/files/patch-parser::PyPlucker::Parser.py
new file mode 100644
index 000000000000..7c20693e7df6
--- /dev/null
+++ b/palm/plucker/files/patch-parser::PyPlucker::Parser.py
@@ -0,0 +1,8 @@
+--- parser/PyPlucker/Parser.py.orig	Wed Dec 24 16:05:12 2003
++++ parser/PyPlucker/Parser.py	Wed Dec 24 16:05:21 2003
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++# -*- coding: iso-8859-1 -*-
+ 
+ """
+ Parser.py   $Id: Parser.py,v 1.21 2003/02/18 01:29:38 chrish Exp $
diff --git a/palm/plucker/files/patch-parser::PyPlucker::TextParser.py b/palm/plucker/files/patch-parser::PyPlucker::TextParser.py
new file mode 100644
index 000000000000..a980e0df1d62
--- /dev/null
+++ b/palm/plucker/files/patch-parser::PyPlucker::TextParser.py
@@ -0,0 +1,9 @@
+--- parser/PyPlucker/TextParser.py.orig	Fri Nov  7 19:36:39 2003
++++ parser/PyPlucker/TextParser.py	Wed Dec 24 16:40:15 2003
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env python
+ #  -*- mode: python; indent-tabs-mode: nil; -*-
++#  -*- coding: iso-8859-1 -*-
+ 
+ """
+ 
diff --git a/palm/plucker/files/patch-parser::PyPlucker::helper::doc_compress.py b/palm/plucker/files/patch-parser::PyPlucker::helper::doc_compress.py
new file mode 100644
index 000000000000..5ec61931bed2
--- /dev/null
+++ b/palm/plucker/files/patch-parser::PyPlucker::helper::doc_compress.py
@@ -0,0 +1,7 @@
+--- parser/PyPlucker/helper/doc_compress.py.orig	Fri Nov  7 19:36:39 2003
++++ parser/PyPlucker/helper/doc_compress.py	Wed Dec 24 16:28:47 2003
+@@ -1,3 +1,4 @@
++# -*- coding: iso-8859-1 -*-
+ #
+ #  Original RCS-Id from Rob Tillotson <robt@debian.org>:
+ #      Id: doc_compress.py,v 1.2 1999/08/09 21:59:13 rob Exp
diff --git a/palm/plucker/files/patch-parser::PyPlucker::helper::prc.py b/palm/plucker/files/patch-parser::PyPlucker::helper::prc.py
new file mode 100644
index 000000000000..7714c81fc9bf
--- /dev/null
+++ b/palm/plucker/files/patch-parser::PyPlucker::helper::prc.py
@@ -0,0 +1,7 @@
+--- parser/PyPlucker/helper/prc.py.orig	Fri Nov  7 19:36:39 2003
++++ parser/PyPlucker/helper/prc.py	Wed Dec 24 16:29:02 2003
+@@ -1,3 +1,4 @@
++# -*- coding: iso-8859-1 -*-
+ #
+ #  $Id: prc.py,v 1.13 2002/10/10 21:58:18 janssen Exp $
+ #  Original RCSId: prc.py,v 1.6 1999/07/16 05:32:01 rob Exp 
diff --git a/palm/plucker/files/patch-parser::python::PyPlucker::Writer.py b/palm/plucker/files/patch-parser::python::PyPlucker::Writer.py
deleted file mode 100644
index 1923e272537f..000000000000
--- a/palm/plucker/files/patch-parser::python::PyPlucker::Writer.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- parser/PyPlucker/Writer.py.bak	Tue Oct 15 14:47:39 2002
-+++ parser/PyPlucker/Writer.py	Fri Jan 31 15:18:09 2003
-@@ -81,7 +81,7 @@
-         self._current_id = 11
- 
-         # make sure record number 2 goes to the 'home' document (why?)
--        url = self._alias_list.get('plucker:/home.html')
-+        url = self._alias_list.get('plucker:///home.html')
-         if url:
-             while self._alias_list.has_key(url):
-                 url = self._alias_list.get(url)
-@@ -91,7 +91,7 @@
-             else:
-                 self._url_to_id_mapping[url] = 2
-         else:
--            doc = self._url_to_doc_mapping.get('plucker:/home.html')
-+            doc = self._url_to_doc_mapping.get('plucker:///home.html')
-             if doc:
-                 self._doc_to_id_mapping[doc] = 2
-             else:
diff --git a/palm/plucker/pkg-plist b/palm/plucker/pkg-plist
index e9956d8c00d5..93ddbb24dd96 100644
--- a/palm/plucker/pkg-plist
+++ b/palm/plucker/pkg-plist
@@ -46,7 +46,6 @@ bin/plucker-decode
 %%DATADIR%%/viewer_zh_CN.prc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGREPORT
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ