Update opencobol to version 1.1, from Robert Doerfler (rodo@bloerp.de).

5 files changed, 25 insertions, 34 deletions

diff --git a/lang/opencobol/Makefile b/lang/opencobol/Makefile
index 6ca6a10f0f3..3686927cf5a 100644
--- a/lang/opencobol/Makefile
+++ b/lang/opencobol/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2012/01/18 13:57:34 adam Exp $
+# $NetBSD: Makefile,v 1.24 2012/03/23 23:19:37 hans Exp $
+#
 
-DISTNAME=	open-cobol-1.0
-PKGNAME=	opencobol-1.0
-PKGREVISION=	3
+DISTNAME=	open-cobol-1.1
+PKGNAME=	opencobol-1.1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-cobol/}
+MASTER_SITES=	http://www.sim-basis.de/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.opencobol.org/
+MAINTAINER=	rodo@bloerp.de
+HOMEPAGE=	http://www.sim-basis.de/
 COMMENT=	Open-source COBOL compiler
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/lang/opencobol/PLIST b/lang/opencobol/PLIST
index 96496efcc82..cbb2e999f05 100644
--- a/lang/opencobol/PLIST
+++ b/lang/opencobol/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/06/02 12:38:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/03/23 23:19:37 hans Exp $
 bin/cob-config
 bin/cobc
 bin/cobcrun
@@ -26,3 +26,4 @@ share/open-cobol/config/default.conf
 share/open-cobol/config/ibm.conf
 share/open-cobol/config/mf.conf
 share/open-cobol/config/mvs.conf
+share/open-cobol/copy/screenio.cpy
diff --git a/lang/opencobol/distinfo b/lang/opencobol/distinfo
index 31ab5b95a0b..8b1451f0a48 100644
--- a/lang/opencobol/distinfo
+++ b/lang/opencobol/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2010/06/02 12:38:29 adam Exp $
+$NetBSD: distinfo,v 1.8 2012/03/23 23:19:37 hans Exp $
 
-SHA1 (open-cobol-1.0.tar.gz) = 4c0930a74e92014317b2f237aaedc90acc2b72df
-RMD160 (open-cobol-1.0.tar.gz) = 28c666885e46aeaed0f12b425b1f11a5125db490
-Size (open-cobol-1.0.tar.gz) = 934641 bytes
-SHA1 (patch-aa) = 545a02656d9da9fce8fdbb2805f81f1e65ae565d
-SHA1 (patch-ab) = e102bdb564e9b186329c34f9adab699e154fe9a6
+SHA1 (open-cobol-1.1.tar.gz) = a833f011cd0f56d0aa3d97a56258ddd5141b594c
+RMD160 (open-cobol-1.1.tar.gz) = 931cd83d5ebbfae66b6e2601bb100e07a10d61a6
+Size (open-cobol-1.1.tar.gz) = 1007791 bytes
+SHA1 (patch-aa) = 7d8274b9d4665dc9f53182e336665b3c8b8ebbdb
+SHA1 (patch-ab) = 93de2da84e58db8abd10202241e434783cc5052d
diff --git a/lang/opencobol/patches/patch-aa b/lang/opencobol/patches/patch-aa
index 7f888df3eb3..1f471878d2a 100644
--- a/lang/opencobol/patches/patch-aa
+++ b/lang/opencobol/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2010/06/02 12:38:29 adam Exp $
+$NetBSD: patch-aa,v 1.5 2012/03/23 23:19:37 hans Exp $
 
---- configure.orig	2007-12-27 10:57:51.000000000 +0000
+--- configure.orig	2012-03-23 22:06:12.000000000 +0000
 +++ configure
-@@ -24347,7 +24347,7 @@ echo "$as_me: error: Include file db.h i
+@@ -24810,7 +24810,7 @@ echo "$as_me: error: Include file db.h i
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2010/06/02 12:38:29 adam Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -26067,7 +26067,7 @@ then
+@@ -26532,7 +26532,7 @@ then
    COB_CFLAGS="$COB_CFLAGS $CPPFLAGS"
  fi
  
diff --git a/lang/opencobol/patches/patch-ab b/lang/opencobol/patches/patch-ab
index ef37821ad22..2e5ed0d7d06 100644
--- a/lang/opencobol/patches/patch-ab
+++ b/lang/opencobol/patches/patch-ab
@@ -1,21 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2010/06/02 12:38:29 adam Exp $
+$NetBSD: patch-ab,v 1.5 2012/03/23 23:19:37 hans Exp $
 
---- libcob/fileio.c.orig	2007-12-27 10:57:51.000000000 +0000
+--- libcob/fileio.c.orig	2012-03-23 22:08:24.000000000 +0000
 +++ libcob/fileio.c
-@@ -79,16 +79,8 @@
- #include <db3/db_185.h>
- #elif HAVE_DB4_DB_185_H
- #include <db4/db_185.h>
--#elif HAVE_DB4_1_DB_185_H
--#include <db4.1/db_185.h>
--#elif HAVE_DB4_2_DB_185_H
--#include <db4.2/db_185.h>
--#elif HAVE_DB4_3_DB_185_H
--#include <db4.3/db_185.h>
--#elif HAVE_DB4_4_DB_185_H
--#include <db4.4/db_185.h>
--#elif HAVE_DB4_5_DB_185_H
--#include <db4.5/db_185.h>
+@@ -87,6 +87,8 @@
+ #include <db4.4/db_185.h>
+ #elif HAVE_DB4_5_DB_185_H
+ #include <db4.5/db_185.h>
 +#elif HAVE_DB5_DB_185_H
 +#include <db5/db_185.h>
  #elif HAVE_DB_H