5 files changed, 34 insertions, 15 deletions

diff --git a/palm/plucker/Makefile b/palm/plucker/Makefile
index 2f98f2059aa0..8c7c656f506f 100644
--- a/palm/plucker/Makefile
+++ b/palm/plucker/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	plucker
-PORTVERSION=	1.1.14
+PORTVERSION=	1.2
 CATEGORIES=	palm www
-MASTER_SITES=	http://plkr.org/download/plucker-1.1/
+MASTER_SITES=	http://downloads.plkr.org/1.2/
 DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
 
 MAINTAINER=	mt@primats.org.ua
@@ -22,12 +22,15 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_TARGET=	install-prc-files install-data install-pyplucker
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-docdir=${DOCSDIR} \
-		--disable-docbuild \
+		--disable-desktopbuild \
+		--disable-unpluck \
+		--disable-explode \
 		--disable-palmosbuild
 MAN1=		pluck-comics.1 plucker-build.1 plucker-decode.1 \
 		plucker-dump.1 plucker-setup.1
diff --git a/palm/plucker/distinfo b/palm/plucker/distinfo
index a82ba88ae3ab..f8ec33b52de5 100644
--- a/palm/plucker/distinfo
+++ b/palm/plucker/distinfo
@@ -1 +1 @@
-MD5 (plucker_bin-1.1.14.tar.bz2) = 81571d88ed5c009491cb50509bd38ec8
+MD5 (plucker_bin-1.2.tar.bz2) = eaf8e335bc258066b02767e9f0e631f2
diff --git a/palm/plucker/files/patch-configure b/palm/plucker/files/patch-configure
index 14b432c5f3f2..aa9145baee10 100644
--- a/palm/plucker/files/patch-configure
+++ b/palm/plucker/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sat Oct 27 22:06:04 2001
-+++ configure	Sun Sep 15 00:26:05 2002
-@@ -974,7 +974,7 @@
+--- configure.orig	Thu Oct 17 00:59:25 2002
++++ configure	Thu Oct 31 11:36:31 2002
+@@ -1126,7 +1126,7 @@
  test -n "$SED" && break
  done
  
--    $SED --version 2>&1 | grep GNU >/dev/null 2>&1
-+#    $SED --version 2>&1 | grep GNU >/dev/null 2>&1
+-    $SED --version 2>&1 < /dev/null | grep GNU >/dev/null 2>&1
++#   $SED --version 2>&1 < /dev/null | grep GNU >/dev/null 2>&1
      if test "$?" != "0" ; then
      	echo "configure: warning: "Version of sed on path must be GNU sed to build manual"" 1>&2
      	BUILD_MANUAL=no
diff --git a/palm/plucker/files/patch-configure.in b/palm/plucker/files/patch-configure.in
index c68d1b3c3e9b..83898e051626 100644
--- a/palm/plucker/files/patch-configure.in
+++ b/palm/plucker/files/patch-configure.in
@@ -1,11 +1,11 @@
---- configure.in.orig	Sat Oct 27 22:06:03 2001
-+++ configure.in	Sun Sep 15 00:22:44 2002
-@@ -202,7 +202,7 @@
+--- configure.in.orig	Thu Oct 17 00:59:24 2002
++++ configure.in	Thu Oct 31 11:38:03 2002
+@@ -229,7 +229,7 @@
  
  if test "$BUILD_MANUAL" = "yes"; then
      AC_PATH_PROGS(SED, gsed sed)
--    [$SED --version 2>&1 | grep GNU >/dev/null 2>&1]
-+dnl [$SED --version 2>&1 | grep GNU >/dev/null 2>&1]
+-    [$SED --version 2>&1 < /dev/null | grep GNU >/dev/null 2>&1]
++dnl [$SED --version 2>&1 < /dev/null | grep GNU >/dev/null 2>&1]
      if test "$?" != "0" ; then
      	AC_MSG_WARN("Version of sed on path must be GNU sed to build manual")
      	BUILD_MANUAL=no
diff --git a/palm/plucker/pkg-plist b/palm/plucker/pkg-plist
index f192e42cb0eb..a4a8da5392be 100644
--- a/palm/plucker/pkg-plist
+++ b/palm/plucker/pkg-plist
@@ -33,6 +33,9 @@ bin/plucker-setup
 %%PYTHON_SITELIBDIR%%/PyPlucker/Retriever.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/Retriever.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/Retriever.pyo
+%%PYTHON_SITELIBDIR%%/PyPlucker/Profiling.py
+%%PYTHON_SITELIBDIR%%/PyPlucker/Profiling.pyc
+%%PYTHON_SITELIBDIR%%/PyPlucker/Profiling.pyo
 %%PYTHON_SITELIBDIR%%/PyPlucker/Spider.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/Spider.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/Spider.pyo
@@ -42,12 +45,18 @@ bin/plucker-setup
 %%PYTHON_SITELIBDIR%%/PyPlucker/Url.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/Url.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/Url.pyo
+%%PYTHON_SITELIBDIR%%/PyPlucker/UtilFns.py
+%%PYTHON_SITELIBDIR%%/PyPlucker/UtilFns.pyc
+%%PYTHON_SITELIBDIR%%/PyPlucker/UtilFns.pyo
 %%PYTHON_SITELIBDIR%%/PyPlucker/Writer.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/Writer.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/Writer.pyo
 %%PYTHON_SITELIBDIR%%/PyPlucker/__init__.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/__init__.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/__init__.pyo
+%%PYTHON_SITELIBDIR%%/PyPlucker/helper/CharsetMapping.py
+%%PYTHON_SITELIBDIR%%/PyPlucker/helper/CharsetMapping.pyc
+%%PYTHON_SITELIBDIR%%/PyPlucker/helper/CharsetMapping.pyo
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/PQAAppInfo.py
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/PQAAppInfo.pyc
 %%PYTHON_SITELIBDIR%%/PyPlucker/helper/PQAAppInfo.pyo
@@ -71,16 +80,18 @@ bin/plucker-setup
 %%PORTDOCS%%share/doc/plucker/manual/Bookmarks.gif
 %%PORTDOCS%%share/doc/plucker/manual/Category.gif
 %%PORTDOCS%%share/doc/plucker/manual/CopyURL.gif
+%%PORTDOCS%%share/doc/plucker/manual/DBFormat.html
 %%PORTDOCS%%share/doc/plucker/manual/DBMgr.gif
 %%PORTDOCS%%share/doc/plucker/manual/EditBookmarks.gif
 %%PORTDOCS%%share/doc/plucker/manual/Find.gif
+%%PORTDOCS%%share/doc/plucker/manual/Gestures.gif
+%%PORTDOCS%%share/doc/plucker/manual/HWButtons.gif
 %%PORTDOCS%%share/doc/plucker/manual/Mail.gif
 %%PORTDOCS%%share/doc/plucker/manual/MainScreen.gif
 %%PORTDOCS%%share/doc/plucker/manual/Plucker_Doc.css
 %%PORTDOCS%%share/doc/plucker/manual/Plucker_Doc.html
 %%PORTDOCS%%share/doc/plucker/manual/Prefs.gif
 %%PORTDOCS%%share/doc/plucker/manual/Result.gif
-%%PORTDOCS%%share/doc/plucker/manual/Start.gif
 %%PORTDOCS%%share/doc/plucker/manual/TapAction.gif
 %%PORTDOCS%%share/doc/plucker/manual/chicken-head.gif
 %%PORTDOCS%%share/doc/plucker/manual/contents.png
@@ -166,6 +177,8 @@ bin/plucker-setup
 %%PORTDOCS%%share/doc/plucker/manual/node78.html
 %%PORTDOCS%%share/doc/plucker/manual/node79.html
 %%PORTDOCS%%share/doc/plucker/manual/node8.html
+%%PORTDOCS%%share/doc/plucker/manual/node80.html
+%%PORTDOCS%%share/doc/plucker/manual/node81.html
 %%PORTDOCS%%share/doc/plucker/manual/node9.html
 %%PORTDOCS%%share/doc/plucker/manual/prev.png
 %%PORTDOCS%%share/doc/plucker/manual/prev_g.png
@@ -180,11 +193,14 @@ share/plucker/viewer_cs.prc
 share/plucker/viewer_da.prc
 share/plucker/viewer_de.prc
 share/plucker/viewer_en.prc
+share/plucker/viewer_es.prc
 share/plucker/viewer_fo.prc
 share/plucker/viewer_fr.prc
 share/plucker/viewer_it.prc
 share/plucker/viewer_ja.prc
 share/plucker/viewer_pl.prc
+share/plucker/viewer_ru.prc
+share/plucker/viewer_tr.prc
 share/plucker/viewer_zh_CN.prc
 @dirrm %%PYTHON_SITELIBDIR%%/PyPlucker/helper
 @dirrm %%PYTHON_SITELIBDIR%%/PyPlucker