8 files changed, 84 insertions, 42 deletions

diff --git a/palm/plucker/Makefile b/palm/plucker/Makefile
index 20acfde4fd83..bdc43dada29f 100644
--- a/palm/plucker/Makefile
+++ b/palm/plucker/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	plucker
-PORTVERSION=	1.6.2
+PORTVERSION=	1.8
 CATEGORIES=	palm www
 MASTER_SITES=	http://downloads.plkr.org/${PORTVERSION}/ \
 		http://downloads.hideho.org/${PORTNAME}/${PORTVERSION}/
 DISTFILES=	${PORTNAME}_viewer-${PORTVERSION}.tar.bz2 \
+		${PORTNAME}_viewer_extras-${PORTVERSION}.tar.bz2 \
 		${PORTNAME}_parser-${PORTVERSION}.tar.bz2 \
 		${PORTNAME}_docs-${PORTVERSION}.tar.bz2
 
@@ -32,23 +33,23 @@ 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
+MYPORTDOCS=	AUTHORS BUGREPORT COPYING CREDITS ChangeLog FAQ NEWS README REQUIREMENTS
 
 .include <bsd.port.pre.mk>
 
 post-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${WRKSRC}/parser/PyPlucker
+		${WRKSRC}/PyPlucker
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${WRKSRC}/parser/PyPlucker
+		${WRKSRC}/PyPlucker
 
 do-install:
 	${MKDIR} ${PYTHON_SITELIBDIR}/PyPlucker/helper
-	cd ${WRKSRC}/parser; ${FIND} PyPlucker \
+	cd ${WRKSRC}; ${FIND} PyPlucker \
 		\( -name "*.py" -or -name "*.py?" \) \
 		-exec ${INSTALL_DATA} {} ${PYTHON_SITELIBDIR}/{} \;
 .for F in Spider.py PluckerDocs.py Decode.py
-	${INSTALL_SCRIPT} ${WRKSRC}/parser/PyPlucker/${F} \
+	${INSTALL_SCRIPT} ${WRKSRC}/PyPlucker/${F} \
 		${PYTHON_SITELIBDIR}/PyPlucker
 .endfor
 	${LN} -sf ${PYTHON_SITELIBDIR}/PyPlucker/Spider.py \
@@ -58,24 +59,28 @@ do-install:
 	${LN} -sf ${PYTHON_SITELIBDIR}/PyPlucker/Decode.py \
 		${PREFIX}/bin/plucker-dump
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/viewer/PluckerUserGuide.pdb \
-		${WRKSRC}/viewer/*.prc ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/PluckerUserGuide.pdb \
+		${WRKSRC}/*.prc ${DATADIR}
 	${MKDIR} ${PREFIX}/etc/plucker
-	${INSTALL_DATA} ${WRKSRC}/parser/exclusionlist.txt \
+	${INSTALL_DATA} ${WRKSRC}/exclusionlist.txt \
 		${PREFIX}/etc/plucker/exclusionlist.txt.sample
-	${INSTALL_DATA} ${WRKSRC}/parser/home.html \
+	${INSTALL_DATA} ${WRKSRC}/home.html \
 		${PREFIX}/etc/plucker/home.html.sample
-	${INSTALL_DATA} ${WRKSRC}/parser/pluckerrc.sample \
+	${INSTALL_DATA} ${WRKSRC}/pluckerrc.sample \
 		${PREFIX}/etc/plucker
+.for F in fonts ppi xlit
+	${MKDIR} ${DATADIR}/${F}
+	${INSTALL_DATA} ${WRKSRC}/${F}/* ${DATADIR}/${F}
+.endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/manual
 .for F in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/parser/${F} ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${F} ${MAN1PREFIX}/man/man1
 .endfor
 .for F in ${MYPORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/manual
+	${INSTALL_DATA} ${WRKSRC}/manual/* ${DOCSDIR}/manual
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/palm/plucker/distinfo b/palm/plucker/distinfo
index 730b324e5b87..de46f1038a94 100644
--- a/palm/plucker/distinfo
+++ b/palm/plucker/distinfo
@@ -1,6 +1,8 @@
-MD5 (plucker_docs-1.6.2.tar.bz2) = 2458c620a4f0a3573b4a2b98f463f7ad
-SIZE (plucker_docs-1.6.2.tar.bz2) = 349267
-MD5 (plucker_parser-1.6.2.tar.bz2) = 686dd7eeabdf35739e889e47a720a9cc
-SIZE (plucker_parser-1.6.2.tar.bz2) = 106282
-MD5 (plucker_viewer-1.6.2.tar.bz2) = 5da4be133f895a1bfbef8d177ef52721
-SIZE (plucker_viewer-1.6.2.tar.bz2) = 922903
+MD5 (plucker_docs-1.8.tar.bz2) = e6762493227ae408ff1a56ae26212eeb
+SIZE (plucker_docs-1.8.tar.bz2) = 325847
+MD5 (plucker_parser-1.8.tar.bz2) = 7c7ad2591232d6208a9967244f7280a4
+SIZE (plucker_parser-1.8.tar.bz2) = 119960
+MD5 (plucker_viewer-1.8.tar.bz2) = 08defa62239b862c042aa8725d0bbf84
+SIZE (plucker_viewer-1.8.tar.bz2) = 285270
+MD5 (plucker_viewer_extras-1.8.tar.bz2) = 4d78f3ef880953d9d452912814e2804b
+SIZE (plucker_viewer_extras-1.8.tar.bz2) = 21668
diff --git a/palm/plucker/files/patch-parser::PyPlucker::Parser.py b/palm/plucker/files/patch-PyPlucker::Parser.py
index 7c20693e7df6..69782bedaf19 100644
--- a/palm/plucker/files/patch-parser::PyPlucker::Parser.py
+++ b/palm/plucker/files/patch-PyPlucker::Parser.py
@@ -1,5 +1,5 @@
---- parser/PyPlucker/Parser.py.orig	Wed Dec 24 16:05:12 2003
-+++ parser/PyPlucker/Parser.py	Wed Dec 24 16:05:21 2003
+--- PyPlucker/Parser.py.orig	Wed Dec 24 16:05:12 2003
++++ PyPlucker/Parser.py	Wed Dec 24 16:05:21 2003
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +# -*- coding: iso-8859-1 -*-
diff --git a/palm/plucker/files/patch-parser::PyPlucker::TextParser.py b/palm/plucker/files/patch-PyPlucker::TextParser.py
index a980e0df1d62..bd598fbd2321 100644
--- a/palm/plucker/files/patch-parser::PyPlucker::TextParser.py
+++ b/palm/plucker/files/patch-PyPlucker::TextParser.py
@@ -1,5 +1,5 @@
---- parser/PyPlucker/TextParser.py.orig	Fri Nov  7 19:36:39 2003
-+++ parser/PyPlucker/TextParser.py	Wed Dec 24 16:40:15 2003
+--- PyPlucker/TextParser.py.orig	Fri Nov  7 19:36:39 2003
++++ PyPlucker/TextParser.py	Wed Dec 24 16:40:15 2003
 @@ -1,5 +1,6 @@
  #!/usr/bin/env python
  #  -*- mode: python; indent-tabs-mode: nil; -*-
diff --git a/palm/plucker/files/patch-parser::PyPlucker::helper::doc_compress.py b/palm/plucker/files/patch-PyPlucker::helper::doc_compress.py
index 5ec61931bed2..591c9f2ae822 100644
--- a/palm/plucker/files/patch-parser::PyPlucker::helper::doc_compress.py
+++ b/palm/plucker/files/patch-PyPlucker::helper::doc_compress.py
@@ -1,5 +1,5 @@
---- 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
+--- PyPlucker/helper/doc_compress.py.orig	Fri Nov  7 19:36:39 2003
++++ PyPlucker/helper/doc_compress.py	Wed Dec 24 16:28:47 2003
 @@ -1,3 +1,4 @@
 +# -*- coding: iso-8859-1 -*-
  #
diff --git a/palm/plucker/files/patch-PyPlucker::helper::gettext.py b/palm/plucker/files/patch-PyPlucker::helper::gettext.py
new file mode 100644
index 000000000000..d1267e55de30
--- /dev/null
+++ b/palm/plucker/files/patch-PyPlucker::helper::gettext.py
@@ -0,0 +1,20 @@
+--- PyPlucker/helper/gettext.py.orig	Wed May 19 18:18:19 2004
++++ PyPlucker/helper/gettext.py	Fri Oct 29 16:04:44 2004
+@@ -128,7 +128,7 @@
+                 else:
+                         return # assume C locale
+ 
+-                if _lsbStrToInt(buffer[:4]) != 0x950412de:
++                if _lsbStrToInt(buffer[:4]) != 0x950412deL:
+                         # magic number doesn't match
+                         raise error, 'Bad magic number in %s' % (catalog,)
+ 
+@@ -173,7 +173,7 @@
+                         f = open(file, "wb")
+                 except IOError:
+                         raise error, "can't open " + file + " for writing"
+-                f.write(_intToLsbStr(0x950412de))    # magic number
++                f.write(_intToLsbStr(0x950412deL))   # magic number
+                 f.write(_intToLsbStr(0))             # revision
+                 f.write(_intToLsbStr(len(self.cat))) # nstrings
+ 
diff --git a/palm/plucker/files/patch-parser::PyPlucker::helper::prc.py b/palm/plucker/files/patch-PyPlucker::helper::prc.py
index 7714c81fc9bf..7ac5678c77f5 100644
--- a/palm/plucker/files/patch-parser::PyPlucker::helper::prc.py
+++ b/palm/plucker/files/patch-PyPlucker::helper::prc.py
@@ -1,5 +1,5 @@
---- 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
+--- PyPlucker/helper/prc.py.orig	Fri Nov  7 19:36:39 2003
++++ PyPlucker/helper/prc.py	Wed Dec 24 16:29:02 2003
 @@ -1,3 +1,4 @@
 +# -*- coding: iso-8859-1 -*-
  #
diff --git a/palm/plucker/pkg-plist b/palm/plucker/pkg-plist
index 93ddbb24dd96..6f723d9d080c 100644
--- a/palm/plucker/pkg-plist
+++ b/palm/plucker/pkg-plist
@@ -1,6 +1,6 @@
 bin/plucker-build
-bin/plucker-dump
 bin/plucker-decode
+bin/plucker-dump
 %%PYTHON_SITELIBDIR%%/PyPlucker/AliasList.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/ConfigFiles.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/ConversionParser.py
@@ -28,31 +28,39 @@ bin/plucker-decode
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/gettext.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/prc.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/timeoutsocket.py
+%%DATADIR%%/fonts/AllStandard.prc
+%%DATADIR%%/fonts/AllSystem.prc
+%%DATADIR%%/fonts/SonyLargeBold.prc
+%%DATADIR%%/fonts/SonySmallBold.prc
+%%DATADIR%%/ppi/ppi_ca.prc
+%%DATADIR%%/ppi/ppi_cs.prc
+%%DATADIR%%/ppi/ppi_da.prc
+%%DATADIR%%/ppi/ppi_de.prc
+%%DATADIR%%/ppi/ppi_en.prc
+%%DATADIR%%/ppi/ppi_es.prc
+%%DATADIR%%/ppi/ppi_fo.prc
+%%DATADIR%%/ppi/ppi_fr.prc
+%%DATADIR%%/ppi/ppi_it.prc
+%%DATADIR%%/ppi/ppi_ja.prc
+%%DATADIR%%/ppi/ppi_no.prc
+%%DATADIR%%/ppi/ppi_pl.prc
+%%DATADIR%%/ppi/ppi_ru.prc
+%%DATADIR%%/ppi/ppi_th.prc
+%%DATADIR%%/ppi/ppi_tr.prc
+%%DATADIR%%/ppi/ppi_zh_CN.prc
+%%DATADIR%%/xlit/plucker-xlit.pdb
 %%DATADIR%%/PluckerUserGuide.pdb
 %%DATADIR%%/SysZLib.prc
-%%DATADIR%%/viewer_cs.prc
-%%DATADIR%%/viewer_da.prc
-%%DATADIR%%/viewer_de.prc
 %%DATADIR%%/viewer_en.prc
-%%DATADIR%%/viewer_es.prc
-%%DATADIR%%/viewer_fo.prc
-%%DATADIR%%/viewer_fr.prc
-%%DATADIR%%/viewer_it.prc
-%%DATADIR%%/viewer_ja.prc
-%%DATADIR%%/viewer_pl.prc
-%%DATADIR%%/viewer_ru.prc
-%%DATADIR%%/viewer_th.prc
-%%DATADIR%%/viewer_tr.prc
-%%DATADIR%%/viewer_zh_CN.prc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGREPORT
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/REQUIREMENTS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/manual/Autoscroll.gif
 %%PORTDOCS%%%%DOCSDIR%%/manual/Bookmarks.gif
 %%PORTDOCS%%%%DOCSDIR%%/manual/Category.gif
@@ -171,6 +179,10 @@ bin/plucker-decode
 %%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node80.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node81.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node82.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node83.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node84.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node85.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev.gif
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.gif
@@ -184,4 +196,7 @@ etc/plucker/pluckerrc.sample
 @dirrm etc/plucker
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/ppi
+@dirrm %%DATADIR%%/xlit
 @dirrm %%DATADIR%%