Update pilot-link port to 0.11.8.

While doing so, fix tcl support; let the configure script do the
job of configuring tcl support.

4 files changed, 12 insertions, 86 deletions

diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 6e4a346ae15f..04d635a57da4 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	pilot-link
-PORTVERSION=	0.11.7
-PORTREVISION=	2
+PORTVERSION=	0.11.8
+PORTREVISION=	1
 CATEGORIES=	palm comms tk83
 MASTER_SITES=	http://www.pilot-link.org/source/
 
@@ -23,9 +23,9 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
+CFLAGS+=	-I${LOCALBASE}/include
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE}
+CONFIGURE_ARGS+=--with-perl5=${PERL5} --with-libiconv=${LOCALBASE} --with-tclinclude=/usr/local/include/tcl8.3/ --with-tcl=/usr/local/lib/tcl8.3/ --program-transform-name= 
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include "${.CURDIR}/manpages.mk"
diff --git a/palm/pilot-link-devel/distinfo b/palm/pilot-link-devel/distinfo
index 4121502055ef..c0488b95155d 100644
--- a/palm/pilot-link-devel/distinfo
+++ b/palm/pilot-link-devel/distinfo
@@ -1 +1 @@
-MD5 (pilot-link-0.11.7.tar.bz2) = 7d06c1101707125b1e385dbd3cd7ce91
+MD5 (pilot-link-0.11.8.tar.bz2) = 586f84add601e8b86da3093ab784e997
diff --git a/palm/pilot-link-devel/files/patch-aa b/palm/pilot-link-devel/files/patch-aa
deleted file mode 100644
index da18b7fbaa39..000000000000
--- a/palm/pilot-link-devel/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu Mar 21 07:31:21 2002
-+++ Makefile.in	Wed Mar 27 12:33:16 2002
-@@ -100,8 +100,8 @@
- TCLLIBS = @TCLLIBS@
- TCLTKFLAGS = @TCLTKFLAGS@
- TCLTKLIBS = @TCLTKLIBS@
--TCLTK_FLAGS = @TCLTK_FLAGS@
--TCLTK_LIBS = @TCLTK_LIBS@
-+TCLTK_FLAGS = @TCLTK_FLAGS@ -I/usr/X11R6/include
-+TCLTK_LIBS = -L/usr/lib @TCLTK_LIBS@
- TCL_BIN = @TCL_BIN@
- TCL_INC = @TCL_INC@
- TCL_LIBS = @TCL_LIBS@
diff --git a/palm/pilot-link-devel/files/patch-ab b/palm/pilot-link-devel/files/patch-ab
index a6cb9e0069aa..ed760c578139 100644
--- a/palm/pilot-link-devel/files/patch-ab
+++ b/palm/pilot-link-devel/files/patch-ab
@@ -1,77 +1,16 @@
---- configure.orig	Sat Aug 21 10:57:14 1999
-+++ configure	Sat Aug 21 11:05:26 1999
-@@ -876,9 +876,9 @@
+--- configure.orig	Tue Jul  1 14:08:40 2003
++++ configure	Wed Dec 17 23:43:55 2003
+@@ -1746,11 +1746,11 @@
+ 
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 +INSTALL_PROGRAM='${INSTALL}'
  
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 +INSTALL_DATA='${INSTALL} -m 644'
  
- # Extract the first word of "ranlib", so it can be a program name with args.
-@@ -2643,5 +2643,5 @@
- if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then
- 	for tcl_path in /usr/local/tcl8.3 /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do
--		if test -f $tcl_path/lib/tclConfig.sh; then
-+		if test -f $tcl_path/lib/tcl8.3/tclConfig.sh; then
- 			with_tcl=$tcl_path; break
- 		elif test -f $tcl_path/lib/itcl/tclConfig.sh; then
-@@ -2684,5 +2684,5 @@
- 	echo "$ac_t""not used" 1>&6
- else
--	tclConfig="$with_tcl/lib$itcl/tclConfig.sh"
-+	tclConfig="$with_tcl/lib/tcl8.3$itcl/tclConfig.sh"
- 	if test ! -f $tclConfig; then
- 		echo "$ac_t""Unable to find tclConfig.sh" 1>&6
-@@ -2690,5 +2690,5 @@
- 		. $tclConfig
- 		echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6
--		TCL_INC="-I$TCL_PREFIX/include$itcl"
-+		TCL_INC="-I$TCL_PREFIX/include/tcl8.3$itcl"
- 		TCL_BIN="$TCL_EXEC_PREFIX/bin"
- 		TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS"
-@@ -2701,5 +2701,5 @@
- 		if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then
- 			for itcl_path in $with_tcl; do
--				if test -f $itcl_path/lib$itcl/itclConfig.sh; then
-+				if test -f $itcl_path/lib/tcl8.3$itcl/itclConfig.sh; then
- 					with_itcl=$itcl_path; break
- 				fi
-@@ -2719,5 +2719,5 @@
- 			echo "$ac_t""not used" 1>&6
- 		else
--			itclConfig="$with_itcl/lib$itcl/itclConfig.sh"
-+			itclConfig="$with_itcl/lib/tcl8.3$itcl/itclConfig.sh"
- 			if test ! -f $itclConfig; then
- 				echo "$ac_t""Unable to find itclConfig.sh" 1>&6
-@@ -2725,5 +2725,5 @@
- 				. $itclConfig
- 				echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6
--				ITCL_INC="-I$TK_PREFIX/include$itcl"
-+				ITCL_INC="-I$TK_PREFIX/include/tcl8.3$itcl"
- 				#TK_BIN="$TK_EXEC_PREFIX/bin"
- 				#TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
-@@ -2743,5 +2743,5 @@
- 		if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then
- 			for tk_path in $with_tcl; do
--				if test -f $tk_path/lib$itcl/tkConfig.sh; then
-+				if test -f $tk_path/lib/tk8.3$itcl/tkConfig.sh; then
- 					with_tk=$tk_path; break
- 				fi
-@@ -2761,5 +2761,5 @@
- 			echo "$ac_t""not used" 1>&6
- 		else
--			tkConfig="$with_tk/lib$itcl/tkConfig.sh"
-+			tkConfig="$with_tk/lib/tk8.3$itcl/tkConfig.sh"
- 			if test ! -f $tkConfig; then
- 				echo "$ac_t""Unable to find tkConfig.sh" 1>&6
-@@ -2767,5 +2767,5 @@
- 				. $tkConfig
- 				echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6
--				TK_INC="-I$TK_PREFIX/include$itcl"
-+				TK_INC="-I$TK_PREFIX/include/tk8.3$itcl"
- 				TK_BIN="$TK_EXEC_PREFIX/bin"
- 				TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
+ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+ echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6