5 files changed, 37 insertions, 15 deletions

diff --git a/palm/plucker/Makefile b/palm/plucker/Makefile
index 286acd0a3e57..2f98f2059aa0 100644
--- a/palm/plucker/Makefile
+++ b/palm/plucker/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	plucker
-PORTVERSION=	1.1.13
+PORTVERSION=	1.1.14
 CATEGORIES=	palm www
 MASTER_SITES=	http://plkr.org/download/plucker-1.1/
 DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
 
-MAINTAINER=	noway@nohow.demon.co.uk
+MAINTAINER=	mt@primats.org.ua
 
 BUILD_DEPENDS=	ppmtoTbmp:${PORTSDIR}/palm/ppmtoTbmp \
 		convert:${PORTSDIR}/graphics/ImageMagick \
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	ppmtoTbmp:${PORTSDIR}/palm/ppmtoTbmp \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
-USE_BZIP=	yes
+USE_BZIP2=	yes
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALL_TARGET=	install-prc-files install-data install-pyplucker
diff --git a/palm/plucker/distinfo b/palm/plucker/distinfo
index b5e6cf766689..a82ba88ae3ab 100644
--- a/palm/plucker/distinfo
+++ b/palm/plucker/distinfo
@@ -1 +1 @@
-MD5 (plucker_bin-1.1.13.tar.gz) = 8d5bc2852aa5297c04de4222779c780d
+MD5 (plucker_bin-1.1.14.tar.bz2) = 81571d88ed5c009491cb50509bd38ec8
diff --git a/palm/plucker/files/patch-configure b/palm/plucker/files/patch-configure
new file mode 100644
index 000000000000..14b432c5f3f2
--- /dev/null
+++ b/palm/plucker/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Oct 27 22:06:04 2001
++++ configure	Sun Sep 15 00:26:05 2002
+@@ -974,7 +974,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
+     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
new file mode 100644
index 000000000000..c68d1b3c3e9b
--- /dev/null
+++ b/palm/plucker/files/patch-configure.in
@@ -0,0 +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 @@
+ 
+ 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]
+     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/files/patch-unix-setup.py.in b/palm/plucker/files/patch-unix-setup.py.in
index 8a19b724e8db..5c52bb32551a 100644
--- a/palm/plucker/files/patch-unix-setup.py.in
+++ b/palm/plucker/files/patch-unix-setup.py.in
@@ -1,5 +1,5 @@
---- unix/setup.py.in.orig	Fri Sep 14 03:34:24 2001
-+++ unix/setup.py.in	Fri Oct  5 23:57:20 2001
+--- unix/setup.py.in.orig	Sat Oct 27 21:53:35 2001
++++ unix/setup.py.in	Sun Sep 15 00:07:50 2002
 @@ -14,8 +14,9 @@
  
  VERSION="@VERSION@"
@@ -11,22 +11,22 @@
 +PILOTXFER=os.path.join("@prefix@", "bin", "pilot-xfer")
  
  if os.environ.has_key ('HOME'):
- 	USERDIR = os.environ["HOME"]
-@@ -99,7 +100,7 @@
- 		if get_answer("Install the User's Guide, too", 'y'):
- 			guide = os.path.join(PALMDIR, "PluckerUserGuide.pdb")
+     USERDIR = os.environ["HOME"]
+@@ -117,7 +118,7 @@
+         if get_answer("Install the User's Guide, too", 'y'):
+             guide = os.path.join(PALMDIR, "PluckerUserGuide.pdb")
  
--		os.system("pilot-xfer -i %s %s %s" % (viewer, zlib, guide))
-+		os.system(PILOTXFER + " -i %s %s %s" % (viewer, zlib, guide))
+-        os.system("pilot-xfer -i %s %s %s" % (viewer, zlib, guide))
++	os.system(PILOTXFER + " -i %s %s %s" % (viewer, zlib, guide))
  
  
  #
-@@ -131,7 +132,7 @@
+@@ -149,7 +150,7 @@
  
  install_config_files()
  
 -if not os.system('pilot-xfer > /dev/null 2>&1'):
 +if not os.system(PILOTXFER + ' > /dev/null 2>&1'):
- 	install_viewer()
+     install_viewer()
  else:
- 	print "\nThe program 'pilot-xfer' is missing so the Palm applications cannot be installed. You'll find them in %s." % PALMDIR
+     print "\nThe program 'pilot-xfer' is missing so the Palm applications cannot be installed. You'll find them in %s." % PALMDIR