Wed Jun 2 12:38:29 2010 UTC ()
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.


(adam)
diff -r1.19 -r1.20 pkgsrc/lang/opencobol/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/opencobol/PLIST
diff -r1.6 -r1.7 pkgsrc/lang/opencobol/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/opencobol/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/lang/opencobol/patches/patch-ab
cvs diff -r1.19 -r1.20 pkgsrc/lang/opencobol/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/opencobol/Makefile 2010/03/24 19:43:25 1.19
+++ pkgsrc/lang/opencobol/Makefile 2010/06/02 12:38:29 1.20
@@ -1,41 +1,38 @@ @@ -1,41 +1,38 @@
1# $NetBSD: Makefile,v 1.19 2010/03/24 19:43:25 asau Exp $ 1# $NetBSD: Makefile,v 1.20 2010/06/02 12:38:29 adam Exp $
2# 
3 2
4DISTNAME= open-cobol-0.32 3DISTNAME= open-cobol-1.0
5PKGNAME= opencobol-0.32 4PKGNAME= opencobol-1.0
6PKGREVISION= 3 5CATEGORIES= lang
7CATEGORIES= lang 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open-cobol/}
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open-cobol/} 7
9 8MAINTAINER= pkgsrc-users@NetBSD.org
10MAINTAINER= pkgsrc-users@NetBSD.org 9HOMEPAGE= http://www.opencobol.org/
11HOMEPAGE= http://www.opencobol.org/ 10COMMENT= Open-source COBOL compiler
12COMMENT= Open-source COBOL compiler 
13 11
14PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
15 13
16GNU_CONFIGURE= yes 14BDB_ACCEPTED= db4 db5
17USE_TOOLS+= msgfmt 
18USE_LIBTOOL= yes 15USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
 17USE_TOOLS+= msgfmt
 18GNU_CONFIGURE= yes
 19CONFIGURE_ARGS+= --with-db
 20CONFIGURE_ARGS+= --with-lfs
 21CONFIGURE_ARGS+= --without-readline
20INFO_FILES= yes 22INFO_FILES= yes
21 23
22TEST_TARGET= check 24TEST_TARGET= check
23 25
24CONFIGURE_ARGS+= --without-readline 26SUBST_CLASSES+= bdb
25CONFIGURE_ARGS+= --with-lfs 27SUBST_MESSAGE.bdb= Fixing bdb library names.
26 28SUBST_STAGE.bdb= pre-configure
27# XXX: followings can be removed when update to 0.33. 29SUBST_FILES.bdb= configure
28SUBST_CLASSES+= fixchkgmp 30SUBST_SED.bdb= -e 's,db-4.5,db5,g'
29SUBST_STAGE.fixchkgmp= pre-configure 31SUBST_SED.bdb+= -e 's,db-4.4,db4,g'
30SUBST_FILES.fixchkgmp= configure 
31SUBST_SED.fixchkgmp= -e 's|__gmp_rand|__gmp_randinit|g' 
32 32
33.include "../../devel/gettext-lib/buildlink3.mk" 33.include "../../devel/gettext-lib/buildlink3.mk"
34.include "../../devel/gmp/buildlink3.mk" 34.include "../../devel/gmp/buildlink3.mk"
35.include "../../devel/libltdl/buildlink3.mk" 35.include "../../devel/libltdl/buildlink3.mk"
36.include "../../devel/ncurses/buildlink3.mk" 36.include "../../devel/ncurses/buildlink3.mk"
37.include "../../mk/bdb.buildlink3.mk" 37.include "../../mk/bdb.buildlink3.mk"
38.if ${BDB_TYPE} != "db1" 
39CONFIGURE_ARGS+= --with-db 
40.endif 
41.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/opencobol/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/opencobol/PLIST 2009/06/14 18:03:37 1.7
+++ pkgsrc/lang/opencobol/PLIST 2010/06/02 12:38:29 1.8
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:03:37 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.8 2010/06/02 12:38:29 adam Exp $
2bin/cob-config 2bin/cob-config
3bin/cobc 3bin/cobc
4bin/cobcrun 4bin/cobcrun
5include/libcob.h 5include/libcob.h
6include/libcob/byteswap.h 6include/libcob/byteswap.h
7include/libcob/call.h 7include/libcob/call.h
 8include/libcob/codegen.h
8include/libcob/common.h 9include/libcob/common.h
9include/libcob/exception.def 10include/libcob/exception.def
10include/libcob/fileio.h 11include/libcob/fileio.h
 12include/libcob/intrinsic.h
11include/libcob/move.h 13include/libcob/move.h
12include/libcob/numeric.h 14include/libcob/numeric.h
13include/libcob/screenio.h 15include/libcob/screenio.h
14include/libcob/strings.h 16include/libcob/strings.h
 17include/libcob/system.def
15include/libcob/termio.h 18include/libcob/termio.h
16info/open-cobol.info 19info/open-cobol.info
17lib/libcob.la 20lib/libcob.la
18share/locale/ja/LC_MESSAGES/open-cobol.mo 21share/locale/ja/LC_MESSAGES/open-cobol.mo
 22share/open-cobol/config/bs2000.conf
19share/open-cobol/config/cobol2002.conf 23share/open-cobol/config/cobol2002.conf
20share/open-cobol/config/cobol85.conf 24share/open-cobol/config/cobol85.conf
21share/open-cobol/config/default.conf 25share/open-cobol/config/default.conf
22share/open-cobol/config/ibm.conf 26share/open-cobol/config/ibm.conf
23share/open-cobol/config/mf.conf 27share/open-cobol/config/mf.conf
24share/open-cobol/config/mvs.conf 28share/open-cobol/config/mvs.conf
25share/open-cobol/config/v023.conf 
cvs diff -r1.6 -r1.7 pkgsrc/lang/opencobol/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/opencobol/distinfo 2007/01/14 15:19:04 1.6
+++ pkgsrc/lang/opencobol/distinfo 2010/06/02 12:38:29 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2007/01/14 15:19:04 rillig Exp $ 1$NetBSD: distinfo,v 1.7 2010/06/02 12:38:29 adam Exp $
2 2
3SHA1 (open-cobol-0.32.tar.gz) = 9d30d0107b098c4638aa78643d833b9b2946565e 3SHA1 (open-cobol-1.0.tar.gz) = 4c0930a74e92014317b2f237aaedc90acc2b72df
4RMD160 (open-cobol-0.32.tar.gz) = 920efc8f63f5b3f9204934108f16812569d9675c 4RMD160 (open-cobol-1.0.tar.gz) = 28c666885e46aeaed0f12b425b1f11a5125db490
5Size (open-cobol-0.32.tar.gz) = 768635 bytes 5Size (open-cobol-1.0.tar.gz) = 934641 bytes
6SHA1 (patch-aa) = 635e0ec19fdcf689fc6dfdbd910825c791825c36 6SHA1 (patch-aa) = 545a02656d9da9fce8fdbb2805f81f1e65ae565d
7SHA1 (patch-ab) = 85f82b5c7f4a2a9cbb8b830a5d3c4a6d55e531f9 7SHA1 (patch-ab) = e102bdb564e9b186329c34f9adab699e154fe9a6
cvs diff -r1.3 -r1.4 pkgsrc/lang/opencobol/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/opencobol/patches/patch-aa 2007/01/06 20:45:45 1.3
+++ pkgsrc/lang/opencobol/patches/patch-aa 2010/06/02 12:38:29 1.4
@@ -1,15 +1,22 @@ @@ -1,15 +1,22 @@
1$NetBSD: patch-aa,v 1.3 2007/01/06 20:45:45 rillig Exp $ 1$NetBSD: patch-aa,v 1.4 2010/06/02 12:38:29 adam Exp $
2 2
3All generated programs must be linked with this flag to find libcob. 3--- configure.orig 2007-12-27 10:57:51.000000000 +0000
4 4+++ configure
5--- configure.orig 2005-05-03 11:31:14.000000000 +0200 5@@ -24347,7 +24347,7 @@ echo "$as_me: error: Include file db.h i
6+++ configure 2007-01-06 21:41:08.000000000 +0100 6
7@@ -25089,7 +25089,7 @@ else 7
8 COB_CFLAGS="-I$includedir" 8
 9-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
 10+for ac_header in db.h db_185.h db3/db_185.h db4/db_185.h db5/db_185.h
 11 do
 12 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 13 if eval "test \"\${$as_ac_Header+set}\" = set"; then
 14@@ -26067,7 +26067,7 @@ then
 15 COB_CFLAGS="$COB_CFLAGS $CPPFLAGS"
9 fi 16 fi
10  17
11-COB_LIBS="-L$libdir -lcob ${LIBCOB_LIBS}" 18-COB_LIBS="-L$libdir -lcob ${LIBCOB_LIBS}"
12+COB_LIBS="-L$libdir -Wl,-R$libdir -lcob ${LIBCOB_LIBS}" 19+COB_LIBS="-L$libdir -Wl,-R$libdir -lcob ${LIBCOB_LIBS}"
13 COB_CONFIG_DIR="$datadir/$PACKAGE_TARNAME/config" 20 COB_LDFLAGS=""
14 COB_LIBRARY_PATH=".:$libdir/$PACKAGE_TARNAME" 21 if test "x$LDFLAGS" != "x"
15 COB_MODULE_EXT=`echo "$shlibext" | sed 's/dll\.a/dll/'` 22 then
cvs diff -r1.3 -r1.4 pkgsrc/lang/opencobol/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/opencobol/patches/patch-ab 2007/01/14 15:19:04 1.3
+++ pkgsrc/lang/opencobol/patches/patch-ab 2010/06/02 12:38:29 1.4
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: patch-ab,v 1.3 2007/01/14 15:19:04 rillig Exp $ 1$NetBSD: patch-ab,v 1.4 2010/06/02 12:38:29 adam Exp $
2 2
3This patch supports the pkgsrc setting BDB185_DEFAULT=db4. According to 3--- libcob/fileio.c.orig 2007-12-27 10:57:51.000000000 +0000
4its author, David A. Holland, it is still a hack. 4+++ libcob/fileio.c
5 5@@ -79,16 +79,8 @@
6From PR 35417. 6 #include <db3/db_185.h>
7 7 #elif HAVE_DB4_DB_185_H
8--- libcob/fileio.c.orig 2005-05-03 05:31:14.000000000 -0400 8 #include <db4/db_185.h>
9+++ libcob/fileio.c 2007-01-13 11:42:01.000000000 -0500 9-#elif HAVE_DB4_1_DB_185_H
10@@ -48,7 +48,11 @@ 10-#include <db4.1/db_185.h>
11 #endif 11-#elif HAVE_DB4_2_DB_185_H
12  12-#include <db4.2/db_185.h>
13 #if HAVE_DBOPEN 13-#elif HAVE_DB4_3_DB_185_H
14+#if defined(WITH_DB) 14-#include <db4.3/db_185.h>
15+#include <db_185.h> 15-#elif HAVE_DB4_4_DB_185_H
16+#else 16-#include <db4.4/db_185.h>
 17-#elif HAVE_DB4_5_DB_185_H
 18-#include <db4.5/db_185.h>
 19+#elif HAVE_DB5_DB_185_H
 20+#include <db5/db_185.h>
 21 #elif HAVE_DB_H
17 #include <db.h> 22 #include <db.h>
18+#endif 23 #endif
19 #else 
20 #if HAVE_DB1_DB_H 
21 #include <db1/db.h>