Changes 1.0:

* New compile option '-x'. This causes the compiler to produce an
  executable program. '-fmain' is deprecated.
* Remove long option --verbose. Use '-v' for verbosity. Problem is
  with getopt_long_only which does not like eg. -mv
* New conformity option -std=bs2000.
* FUNCTION is implemented. See cobc/reserved.c for a list of what is
  implemented.
* Nested programs are partially supported.
* LINAGE is implemented.
* EXTERNAL on FD is implemented.
* SAME RECORD AREA is implemented.
* New config variables -
* Support for non-gcc compilers.
* Large file support, system dynamic loading and Berkeley DB inclusion
  are default for the configure.
* New configure option --with-patch-level=<n>
* At run time, version checking is done. ie. When executing/loading
  Cobol programs, the version (eg. 0.33) and the patch level (eg. 0)
  are checked against the OC library version/patch level.
* Libtool is not required for systems that support native dynamic
  loading. This includes Linux, Cygwin and MingW amongst others.
* Note to developers : See README for required software versions.

5 files changed, 69 insertions, 60 deletions

diff --git a/lang/opencobol/Makefile b/lang/opencobol/Makefile
index fd945b7da33..3823ba34214 100644
--- a/lang/opencobol/Makefile
+++ b/lang/opencobol/Makefile
@@ -1,41 +1,38 @@
-# $NetBSD: Makefile,v 1.19 2010/03/24 19:43:25 asau Exp $
-#
+# $NetBSD: Makefile,v 1.20 2010/06/02 12:38:29 adam Exp $
 
-DISTNAME=		open-cobol-0.32
-PKGNAME=		opencobol-0.32
-PKGREVISION=		3
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=open-cobol/}
+DISTNAME=	open-cobol-1.0
+PKGNAME=	opencobol-1.0
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-cobol/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.opencobol.org/
-COMMENT=		Open-source COBOL compiler
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.opencobol.org/
+COMMENT=	Open-source COBOL compiler
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		msgfmt
+BDB_ACCEPTED=		db4 db5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-db
+CONFIGURE_ARGS+=	--with-lfs
+CONFIGURE_ARGS+=	--without-readline
 INFO_FILES=		yes
 
 TEST_TARGET=		check
 
-CONFIGURE_ARGS+=	--without-readline
-CONFIGURE_ARGS+=	--with-lfs
-
-# XXX: followings can be removed when update to 0.33.
-SUBST_CLASSES+=		fixchkgmp
-SUBST_STAGE.fixchkgmp=	pre-configure
-SUBST_FILES.fixchkgmp=	configure
-SUBST_SED.fixchkgmp=	-e 's|__gmp_rand|__gmp_randinit|g'
+SUBST_CLASSES+=		bdb
+SUBST_MESSAGE.bdb=	Fixing bdb library names.
+SUBST_STAGE.bdb=	pre-configure
+SUBST_FILES.bdb=	configure
+SUBST_SED.bdb=		-e 's,db-4.5,db5,g'
+SUBST_SED.bdb+=		-e 's,db-4.4,db4,g'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
-.if ${BDB_TYPE} != "db1"
-CONFIGURE_ARGS+=	--with-db
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/opencobol/PLIST b/lang/opencobol/PLIST
index 8c673144ed5..96496efcc82 100644
--- a/lang/opencobol/PLIST
+++ b/lang/opencobol/PLIST
@@ -1,25 +1,28 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:03:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/06/02 12:38:29 adam Exp $
 bin/cob-config
 bin/cobc
 bin/cobcrun
 include/libcob.h
 include/libcob/byteswap.h
 include/libcob/call.h
+include/libcob/codegen.h
 include/libcob/common.h
 include/libcob/exception.def
 include/libcob/fileio.h
+include/libcob/intrinsic.h
 include/libcob/move.h
 include/libcob/numeric.h
 include/libcob/screenio.h
 include/libcob/strings.h
+include/libcob/system.def
 include/libcob/termio.h
 info/open-cobol.info
 lib/libcob.la
 share/locale/ja/LC_MESSAGES/open-cobol.mo
+share/open-cobol/config/bs2000.conf
 share/open-cobol/config/cobol2002.conf
 share/open-cobol/config/cobol85.conf
 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/config/v023.conf
diff --git a/lang/opencobol/distinfo b/lang/opencobol/distinfo
index 710dde36934..31ab5b95a0b 100644
--- a/lang/opencobol/distinfo
+++ b/lang/opencobol/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/01/14 15:19:04 rillig Exp $
+$NetBSD: distinfo,v 1.7 2010/06/02 12:38:29 adam Exp $
 
-SHA1 (open-cobol-0.32.tar.gz) = 9d30d0107b098c4638aa78643d833b9b2946565e
-RMD160 (open-cobol-0.32.tar.gz) = 920efc8f63f5b3f9204934108f16812569d9675c
-Size (open-cobol-0.32.tar.gz) = 768635 bytes
-SHA1 (patch-aa) = 635e0ec19fdcf689fc6dfdbd910825c791825c36
-SHA1 (patch-ab) = 85f82b5c7f4a2a9cbb8b830a5d3c4a6d55e531f9
+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
diff --git a/lang/opencobol/patches/patch-aa b/lang/opencobol/patches/patch-aa
index 9b4dc57e2d0..7f888df3eb3 100644
--- a/lang/opencobol/patches/patch-aa
+++ b/lang/opencobol/patches/patch-aa
@@ -1,15 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2007/01/06 20:45:45 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2010/06/02 12:38:29 adam Exp $
 
-All generated programs must be linked with this flag to find libcob.
-
---- configure.orig	2005-05-03 11:31:14.000000000 +0200
-+++ configure	2007-01-06 21:41:08.000000000 +0100
-@@ -25089,7 +25089,7 @@ else
-   COB_CFLAGS="-I$includedir"
+--- configure.orig	2007-12-27 10:57:51.000000000 +0000
++++ configure
+@@ -24347,7 +24347,7 @@ echo "$as_me: error: Include file db.h i
+ 
+ 
+ 
+-for ac_header in db.h db_185.h db3/db_185.h db4/db_185.h db4.1/db_185.h db4.2/db_185.h db4.3/db_185.h db4.4/db_185.h db4.5/db_185.h
++for ac_header in db.h db_185.h db3/db_185.h db4/db_185.h db5/db_185.h
+ 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
+   COB_CFLAGS="$COB_CFLAGS $CPPFLAGS"
  fi
  
 -COB_LIBS="-L$libdir -lcob ${LIBCOB_LIBS}"
 +COB_LIBS="-L$libdir -Wl,-R$libdir -lcob ${LIBCOB_LIBS}"
- COB_CONFIG_DIR="$datadir/$PACKAGE_TARNAME/config"
- COB_LIBRARY_PATH=".:$libdir/$PACKAGE_TARNAME"
- COB_MODULE_EXT=`echo "$shlibext" | sed 's/dll\.a/dll/'`
+ COB_LDFLAGS=""
+ if test "x$LDFLAGS" != "x"
+ then
diff --git a/lang/opencobol/patches/patch-ab b/lang/opencobol/patches/patch-ab
index 1df2a071c74..ef37821ad22 100644
--- a/lang/opencobol/patches/patch-ab
+++ b/lang/opencobol/patches/patch-ab
@@ -1,21 +1,23 @@
-$NetBSD: patch-ab,v 1.3 2007/01/14 15:19:04 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2010/06/02 12:38:29 adam Exp $
 
-This patch supports the pkgsrc setting BDB185_DEFAULT=db4. According to
-its author, David A. Holland, it is still a hack.
-
-From PR 35417.
-
---- libcob/fileio.c.orig	2005-05-03 05:31:14.000000000 -0400
-+++ libcob/fileio.c	2007-01-13 11:42:01.000000000 -0500
-@@ -48,7 +48,11 @@
- #endif
- 
- #if HAVE_DBOPEN
-+#if defined(WITH_DB)
-+#include <db_185.h>
-+#else
+--- libcob/fileio.c.orig	2007-12-27 10:57:51.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>
++#elif HAVE_DB5_DB_185_H
++#include <db5/db_185.h>
+ #elif HAVE_DB_H
  #include <db.h>
-+#endif
- #else
- #if HAVE_DB1_DB_H
- #include <db1/db.h>
+ #endif