7 files changed, 30 insertions, 89 deletions

diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile
index d7dfb0403d13..97e346c8246a 100644
--- a/lang/tinycobol/Makefile
+++ b/lang/tinycobol/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tinycobol
-PORTVERSION=	0.54
+PORTVERSION=	0.55
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tiny-cobol
diff --git a/lang/tinycobol/distinfo b/lang/tinycobol/distinfo
index df153f4ace41..8fd833d0b591 100644
--- a/lang/tinycobol/distinfo
+++ b/lang/tinycobol/distinfo
@@ -1 +1 @@
-MD5 (tinycobol-0.54.tar.gz) = 1eea2101ba2eb88d3635bab63a9dbf26
+MD5 (tinycobol-0.55.tar.gz) = c5b2df8247b9fbb335e78c234e0b5eea
diff --git a/lang/tinycobol/files/patch-aa b/lang/tinycobol/files/patch-aa
index df00062364f4..7bc66d1f3665 100644
--- a/lang/tinycobol/files/patch-aa
+++ b/lang/tinycobol/files/patch-aa
@@ -1,61 +1,28 @@
---- configure.orig	Tue Dec  5 20:13:21 2000
-+++ configure	Wed Dec  6 20:03:52 2000
-@@ -1768,7 +1768,7 @@
- if test "${db_version}" = "2" ; then
-   echo -n "checking library db for version 1.85 compatibility..."
-   LIBS_BK="$LIBS"
--  LIBS="$LIBS -ldb"
-+  LIBS="$LIBS -ldb2"
- cat > conftest.$ac_ext <<EOF
- #line 1774 "configure"
- #include "confdefs.h"
-@@ -1876,13 +1876,13 @@
- rm -f conftest*
-  
-                  
--  echo $ac_n "checking for -ldb""... $ac_c" 1>&6
-+  echo $ac_n "checking for -ldb2""... $ac_c" 1>&6
- ac_lib_var=`echo db'_'dbopen | tr './+\055' '__p_'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1888 "configure"
- #include "confdefs.h"
-@@ -1924,13 +1924,13 @@
+--- configure.orig	Sun Oct 28 22:39:13 2001
++++ configure	Tue Jan 29 08:13:45 2002
+@@ -65,6 +65,7 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++LDFLAGS='-L /usr/local/lib'
  
- # if header db.h found check library db1 is version 1.85 
- if test "${db_version}" = "3" ; then
--  echo $ac_n "checking for -ldb""... $ac_c" 1>&6
-+  echo $ac_n "checking for -ldb2""... $ac_c" 1>&6
- ac_lib_var=`echo db'_'dbopen | tr './+\055' '__p_'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ ac_prev=
+ for ac_option
+@@ -512,7 +513,7 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+@@ -2024,7 +2025,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb2  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1936 "configure"
+ #line 2030 "configure"
  #include "confdefs.h"
-@@ -2104,7 +2104,7 @@
- fi
- 
- # check for header and library for readline
--htg_ld_args_default2="-lhtcobol -ldb -lncurses -lm"
-+htg_ld_args_default2="-lhtcobol -ldb2 -lncurses -lm"
- # Check whether --with-readline or --without-readline was given.
- if test "${with_readline+set}" = set; then
-   withval="$with_readline"
-@@ -2178,7 +2178,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  htg_ld_args_default2="-lhtcobol -ldb -lncurses -lreadline -lm"
-+  htg_ld_args_default2="-lhtcobol -ldb2 -lncurses -lreadline -lm"
- else
-   echo "$ac_t""no" 1>&6
- { echo "configure: error: "readline lib is required by create COBOL executable... aborting"" 1>&2; exit 1; }
diff --git a/lang/tinycobol/files/patch-ab b/lang/tinycobol/files/patch-ab
deleted file mode 100644
index bdf80bd8f705..000000000000
--- a/lang/tinycobol/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- htconfig.h.in.orig	Tue Dec  5 20:13:21 2000
-+++ htconfig.h.in	Wed Dec  6 20:04:57 2000
-@@ -134,8 +134,8 @@
- 
- /* Default linker args 2  */
- /* 
-- #define HTG_LD_ARGS_DEFAULT2    "-lhtcobol -ldb -lncurses -lm " 
-- #define HTG_LD_ARGS_DEFAULT2    "-lhtcobol -ldb -lncurses -lreadline -lm " 
-+ #define HTG_LD_ARGS_DEFAULT2    "-lhtcobol -ldb2 -lncurses -lm " 
-+ #define HTG_LD_ARGS_DEFAULT2    "-lhtcobol -ldb2 -lncurses -lreadline -lm " 
-  #define HTG_LD_ARGS_DEFAULT2    "-lhtcobol -lm -dl" 
- */
- #undef HTG_LD_ARGS_DEFAULT2
diff --git a/lang/tinycobol/files/patch-ac b/lang/tinycobol/files/patch-ac
deleted file mode 100644
index d4b54909092e..000000000000
--- a/lang/tinycobol/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- compiler/cobopt.orig	Thu Oct 26 10:05:09 2000
-+++ compiler/cobopt	Thu Oct 26 10:05:14 2000
-@@ -14,8 +14,8 @@
- 
- #LD_PATH: -L/usr/lib -L/opt/cobol/lib 
- LD_PATH: -L/usr/lib -L/usr/local/lib 
--#LD_LIBS: -lhtcobol -ldb -lm -lreadline
--LD_LIBS: -lhtcobol -ldb -lm
-+LD_LIBS: -lhtcobol -ldb2 -lm -lreadline
-+#LD_LIBS: -lhtcobol -ldb2 -lm
- #XREF - generate sumbolic cross-ref in listing - not implimented
- #NOXREF - not implemented
- #COPYBOOKS_PATH: -Ipath - not implimented 
diff --git a/lang/tinycobol/files/patch-ad b/lang/tinycobol/files/patch-ad
index 4ed09f0a521b..1f8e1682d239 100644
--- a/lang/tinycobol/files/patch-ad
+++ b/lang/tinycobol/files/patch-ad
@@ -1,8 +1,8 @@
---- compiler/createver.sh.orig	Thu Oct 26 09:41:52 2000
-+++ compiler/createver.sh	Thu Oct 26 09:41:59 2000
+--- compiler/createver.sh.orig	Sun Oct 28 22:39:48 2001
++++ compiler/createver.sh	Tue Jan 29 08:14:03 2002
 @@ -1,4 +1,4 @@
--#!/bin/bash - 
-+#!/bin/sh - 
+-#!/bin/bash  
++#!/bin/sh  
  #
  #  This shell script create a version number, system, compiled date.  
  #
diff --git a/lang/tinycobol/files/patch-ae b/lang/tinycobol/files/patch-ae
index ad68438db278..4209cf01349f 100644
--- a/lang/tinycobol/files/patch-ae
+++ b/lang/tinycobol/files/patch-ae
@@ -1,8 +1,8 @@
---- cobpp/createver.sh.orig	Wed Dec  6 20:12:59 2000
-+++ cobpp/createver.sh	Wed Dec  6 20:13:05 2000
+--- cobpp/createver.sh.orig	Sun Oct 28 22:39:46 2001
++++ cobpp/createver.sh	Tue Jan 29 08:13:59 2002
 @@ -1,4 +1,4 @@
--#!/bin/bash - 
-+#!/bin/sh - 
+-#!/bin/bash  
++#!/bin/sh  
  #
  #  This shell script create a version number, system, compiled date.  
  #