Attachment #25098 for bug #42786

View | Details | Raw Unified | Return to bug 42786
Collapse All | Expand All

Lines 6-12 Link Here

(-)plucker/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= plucker	8	PORTNAME= plucker
9	PORTVERSION= 1.1.13	9	PORTVERSION= 1.1.14
10	CATEGORIES= palm www	10	CATEGORIES= palm www
11	MASTER_SITES= http://plkr.org/download/plucker-1.1/	11	MASTER_SITES= http://plkr.org/download/plucker-1.1/
12	DISTNAME= ${PORTNAME}_bin-${PORTVERSION}	12	DISTNAME= ${PORTNAME}_bin-${PORTVERSION}
Lines 21-27 Link Here
21	RUN_DEPENDS= ${BUILD_DEPENDS}	21	RUN_DEPENDS= ${BUILD_DEPENDS}
22		22
23	USE_PYTHON= yes	23	USE_PYTHON= yes
24	USE_BZIP= yes	24	USE_BZIP2= yes
25	PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}	25	PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27	INSTALL_TARGET= install-prc-files install-data install-pyplucker	27	INSTALL_TARGET= install-prc-files install-data install-pyplucker

Line 1 Link Here

(-)plucker/distinfo (-1 / +1 lines)
1	MD5 (plucker_bin-1.1.13.tar.gz) = 8d5bc2852aa5297c04de4222779c780d	1	MD5 (plucker_bin-1.1.14.tar.bz2) = 81571d88ed5c009491cb50509bd38ec8

Line 0 Link Here

(-)plucker/files/patch-configure (+11 lines)
	1	--- configure.orig Sat Oct 27 22:06:04 2001
	2	+++ configure Sun Sep 15 00:26:05 2002
	3	@@ -974,7 +974,7 @@
	4	test -n "$SED" && break
	5	done
	6
	7	- $SED --version 2>&1 \| grep GNU >/dev/null 2>&1
	8	+# $SED --version 2>&1 \| grep GNU >/dev/null 2>&1
	9	if test "$?" != "0" ; then
	10	echo "configure: warning: "Version of sed on path must be GNU sed to build manual"" 1>&2
	11	BUILD_MANUAL=no

Line 0 Link Here

(-)plucker/files/patch-configure.in (+11 lines)
	1	--- configure.in.orig Sat Oct 27 22:06:03 2001
	2	+++ configure.in Sun Sep 15 00:22:44 2002
	3	@@ -202,7 +202,7 @@
	4
	5	if test "$BUILD_MANUAL" = "yes"; then
	6	AC_PATH_PROGS(SED, gsed sed)
	7	- [$SED --version 2>&1 \| grep GNU >/dev/null 2>&1]
	8	+dnl [$SED --version 2>&1 \| grep GNU >/dev/null 2>&1]
	9	if test "$?" != "0" ; then
	10	AC_MSG_WARN("Version of sed on path must be GNU sed to build manual")
	11	BUILD_MANUAL=no




--- 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@"

+PILOTXFER=os.path.join("@prefix@", "bin", "pilot-xfer")
 
 if os.environ.has_key ('HOME'):
     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))
 
 
 #
@@ -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()
 else:
     print "\nThe program 'pilot-xfer' is missing so the Palm applications cannot be installed. You'll find them in %s." % PALMDIR

Return to bug 42786

Lines 1-5 Link Here

(-)plucker/files/patch-unix-setup.py.in (-11 / +11 lines)
1	--- unix/setup.py.in.orig Fri Sep 14 03:34:24 2001	1	--- unix/setup.py.in.orig Sat Oct 27 21:53:35 2001
2	+++ unix/setup.py.in Fri Oct 5 23:57:20 2001	2	+++ unix/setup.py.in Sun Sep 15 00:07:50 2002
3	@@ -14,8 +14,9 @@	3	@@ -14,8 +14,9 @@
4		4
5	VERSION="@VERSION@"	5	VERSION="@VERSION@"
Lines 11-32 Link Here
11	+PILOTXFER=os.path.join("@prefix@", "bin", "pilot-xfer")	11	+PILOTXFER=os.path.join("@prefix@", "bin", "pilot-xfer")
12		12
13	if os.environ.has_key ('HOME'):	13	if os.environ.has_key ('HOME'):
14	USERDIR = os.environ["HOME"]	14	USERDIR = os.environ["HOME"]
15	@@ -99,7 +100,7 @@	15	@@ -117,7 +118,7 @@
16	if get_answer("Install the User's Guide, too", 'y'):	16	if get_answer("Install the User's Guide, too", 'y'):
17	guide = os.path.join(PALMDIR, "PluckerUserGuide.pdb")	17	guide = os.path.join(PALMDIR, "PluckerUserGuide.pdb")
18		18
19	- os.system("pilot-xfer -i %s %s %s" % (viewer, zlib, guide))	19	- os.system("pilot-xfer -i %s %s %s" % (viewer, zlib, guide))
20	+ os.system(PILOTXFER + " -i %s %s %s" % (viewer, zlib, guide))	20	+ os.system(PILOTXFER + " -i %s %s %s" % (viewer, zlib, guide))
21		21
22		22
23	#	23	#
24	@@ -131,7 +132,7 @@	24	@@ -149,7 +150,7 @@
25		25
26	install_config_files()	26	install_config_files()
27		27
28	-if not os.system('pilot-xfer > /dev/null 2>&1'):	28	-if not os.system('pilot-xfer > /dev/null 2>&1'):
29	+if not os.system(PILOTXFER + ' > /dev/null 2>&1'):	29	+if not os.system(PILOTXFER + ' > /dev/null 2>&1'):
30	install_viewer()	30	install_viewer()
31	else:	31	else:
32	print "\nThe program 'pilot-xfer' is missing so the Palm applications cannot be installed. You'll find them in %s." % PALMDIR	32	print "\nThe program 'pilot-xfer' is missing so the Palm applications cannot be installed. You'll find them in %s." % PALMDIR