diff options
| -rw-r--r-- | lang/opencobol/Makefile | 14 | ||||
| -rw-r--r-- | lang/opencobol/PLIST | 5 | ||||
| -rw-r--r-- | lang/opencobol/distinfo | 11 | ||||
| -rw-r--r-- | lang/opencobol/patches/patch-aa | 22 | ||||
| -rw-r--r-- | lang/opencobol/patches/patch-ab | 12 | ||||
| -rw-r--r-- | lang/opencobol/patches/patch-ad | 49 |
6 files changed, 10 insertions, 103 deletions
diff --git a/lang/opencobol/Makefile b/lang/opencobol/Makefile index 9bf67191510..150125b69d9 100644 --- a/lang/opencobol/Makefile +++ b/lang/opencobol/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/12/11 12:53:02 obache Exp $ +# $NetBSD: Makefile,v 1.14 2007/01/06 20:22:11 rillig Exp $ # -DISTNAME= open-cobol-0.23 -PKGNAME= ${DISTNAME:S/-//} -PKGREVISION= 4 +DISTNAME= open-cobol-0.32 +PKGNAME= opencobol-0.32 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open-cobol/} @@ -15,17 +14,12 @@ GNU_CONFIGURE= yes USE_TOOLS+= msgfmt USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -INFO_FILES= # PLIST -INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} +INFO_FILES= yes TEST_TARGET= check CONFIGURE_ARGS+= --without-readline CONFIGURE_ARGS+= --with-lfs -CONFIGURE_ENV+= NCURSES_LIB=${BUILDLINK_LDADD.ncurses:Q} - -EGDIR= ${PREFIX}/share/examples/open-cobol -CONF_FILES= ${EGDIR}/libconf.conf ${PKG_SYSCONFDIR}/libconf.conf # XXX: followings can be removed when update to 0.33. SUBST_CLASSES+= fixchkgmp diff --git a/lang/opencobol/PLIST b/lang/opencobol/PLIST index b197accfd8c..ad831f1fb97 100644 --- a/lang/opencobol/PLIST +++ b/lang/opencobol/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:23 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2007/01/06 20:22:11 rillig Exp $ bin/cob-config bin/cobc include/libcob.h +include/libcob/byteswap.h include/libcob/call.h include/libcob/common.h include/libcob/exception.def @@ -13,7 +14,5 @@ include/libcob/strings.h include/libcob/termio.h info/open-cobol.info lib/libcob.la -share/examples/open-cobol/libcob.conf share/locale/ja/LC_MESSAGES/open-cobol.mo -@dirrm share/examples/open-cobol @dirrm include/libcob diff --git a/lang/opencobol/distinfo b/lang/opencobol/distinfo index 8f645545f9e..5f468c4b471 100644 --- a/lang/opencobol/distinfo +++ b/lang/opencobol/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.3 2006/04/04 19:21:39 jlam Exp $ +$NetBSD: distinfo,v 1.4 2007/01/06 20:22:11 rillig Exp $ -SHA1 (open-cobol-0.23.tar.gz) = 52ce50e80ba62148fbbf622232745f528f33c61d -RMD160 (open-cobol-0.23.tar.gz) = 72a439ac7ee0caab3b48aa84d4bf109415192160 -Size (open-cobol-0.23.tar.gz) = 658911 bytes -SHA1 (patch-aa) = 801c5c3ff8ff4dd437322bd1065d8b8c4b72ff31 -SHA1 (patch-ab) = 845d386051dd3f73dca44e5de2e4eb53e280090c -SHA1 (patch-ad) = 69becd5db1b0b54b713c940467e5d4d1b73a8df4 +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 diff --git a/lang/opencobol/patches/patch-aa b/lang/opencobol/patches/patch-aa deleted file mode 100644 index acfc4670af6..00000000000 --- a/lang/opencobol/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/06/29 02:57:36 xtraeme Exp $ - ---- libcob/fileio.c.orig Wed Jun 11 15:40:20 2003 -+++ libcob/fileio.c Wed Aug 27 09:57:31 2003 -@@ -202,13 +202,10 @@ - else - { - /* discard input until the next newline */ -- int c = getc (f->file); -- while (c != '\r' && c != '\n' && c != EOF) -- c = getc (f->file); -- if (c == '\r') -- c = getc (f->file); -- if (c != '\n' && c != EOF) -- ungetc (c, f->file); -+ char buff[BUFSIZ]; -+ while (fgets (buff, BUFSIZ, f->file) !=NULL) -+ if (strchr (buff, '\n') != NULL) -+ break; - } - - memcpy (f->record->data, buff, f->record->size); diff --git a/lang/opencobol/patches/patch-ab b/lang/opencobol/patches/patch-ab deleted file mode 100644 index 6848300b9b6..00000000000 --- a/lang/opencobol/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/06/29 02:57:37 xtraeme Exp $ - ---- libcob/screenio.c.orig Thu Apr 3 06:02:51 2003 -+++ libcob/screenio.c Tue Apr 29 04:09:44 2003 -@@ -19,6 +19,7 @@ - - #include "config.h" - -+#include <sys/types.h> - #include <string.h> - #if HAVE_CURSES_H - #include <curses.h> diff --git a/lang/opencobol/patches/patch-ad b/lang/opencobol/patches/patch-ad deleted file mode 100644 index 915e718e4cf..00000000000 --- a/lang/opencobol/patches/patch-ad +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/04/04 19:21:39 jlam Exp $ - ---- configure.orig 2003-06-11 16:13:55.000000000 -0400 -+++ configure -@@ -1932,9 +1932,9 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - --COBC_LIBS="" -+COBC_LIBS="$LDFLAGS" - COBC_CFLAGS="" --LIBCOB_LIBS="-lm" -+LIBCOB_LIBS="$LDFLAGS -lm" - LIBCOB_CFLAGS="" - - # Configure options. -@@ -22701,13 +22701,13 @@ fi - done - - --echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 --echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for initscr in $NCURSES_LIB" >&5 -+echo $ECHO_N "checking for initscr in $NCURSES_LIB... $ECHO_C" >&6 - if test "${ac_cv_lib_ncurses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncurses $LIBS" -+LIBS="$NCURSES_LIB $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -22760,13 +22760,13 @@ if test $ac_cv_lib_ncurses_initscr = yes - #define HAVE_LIBNCURSES 1 - _ACEOF - -- LIBS="-lncurses $LIBS" -+ LIBS="$NCURSES_LIB $LIBS" - - fi - - if test "x$ac_cv_lib_ncurses_initscr" = "xyes"; then - USE_NCURSES="yes" -- LIBCOB_LIBS="$LIBCOB_LIBS -lncurses" -+ LIBCOB_LIBS="$LIBCOB_LIBS $NCURSES_LIB" - fi - - # Checks for readline. |