ports/79923: lang/tinycobol: upgrade to version 0.62

[Johan van Selst]

>Number:         79923
>Category:       ports
>Synopsis:       lang/tinycobol: upgrade to version 0.62
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 14 17:10:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Update to new version.

	It now installs a static library rather than a shared library.
	While we're at it, use db3 (not db2) and fix with-readline option.

>How-To-Repeat:
	
>Fix:

	

	Attached patch removes files/patch-aa and files/patch-ab
	and introduces a new files/patch-compiler_scan.l

diff -uNr tinycobol/Makefile tinycobol/Makefile
--- tinycobol/Makefile	Thu Jun  3 00:17:13 2004
+++ tinycobol/Makefile	Thu Apr 14 18:55:30 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tinycobol
-PORTVERSION=	0.61
+PORTVERSION=	0.62
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tiny-cobol
@@ -14,7 +14,7 @@
 MAINTAINER=	ports at freebsd.org
 COMMENT=	A tiny COBOL compiler for IA32 platforms
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
+LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
 
 INSTALLS_SHLIB=	yes
 ONLY_FOR_ARCHS=	i386
@@ -23,16 +23,14 @@
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ARGS=	--with-libdb=2
-# --with-readline disabled because of CPP-clash between readline/chardefs.h
-#   and htcobol.tab.h:PAGE/RETURN/ALPHABETIC
-#CONFIGURE_ARGS+=	--with-readline
+CONFIGURE_ARGS=	--with-libdb=3
+CONFIGURE_ARGS+=	--with-readline
 CPPFLAGS=	-I${LOCALBASE}/include
 CFLAGS=		${CPPFGLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		htcobol.1 htcobf2f.1 htcobolpp.1
+MAN1=		htcobol.1 htcobf2f.1
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -uNr tinycobol/distinfo tinycobol/distinfo
--- tinycobol/distinfo	Sun May 30 01:14:29 2004
+++ tinycobol/distinfo	Thu Apr 14 18:09:51 2005
@@ -1,2 +1,2 @@
-MD5 (tinycobol-0.61.tar.gz) = d9b5c00a2407ab8b42689a7d21c62af2
-SIZE (tinycobol-0.61.tar.gz) = 817294
+MD5 (tinycobol-0.62.tar.gz) = ba75acd052891b58db282729e38645fc
+SIZE (tinycobol-0.62.tar.gz) = 835871
diff -uNr tinycobol/files/patch-aa tinycobol/files/patch-aa
--- tinycobol/files/patch-aa	Sun May 30 01:14:29 2004
+++ tinycobol/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig	Fri Mar  5 11:33:30 2004
-+++ configure	Fri Mar  5 11:33:43 2004
-@@ -698,7 +698,7 @@
- curses_header='ncurses.h'
- curses_library='ncurses'
- LIBS="-L/usr/lib $M_LIBS"
--INCLUDES="-I/usr/include -I../lib -I../"
-+INCLUDES="-I/usr/include -I/usr/local/include -I../lib -I../"
- 
- # Check for executable suffix
- # Set include and libraries paths
diff -uNr tinycobol/files/patch-ab tinycobol/files/patch-ab
--- tinycobol/files/patch-ab	Tue Nov  5 22:51:58 2002
+++ tinycobol/files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Sun Oct 20 04:37:38 2002
-+++ lib/Makefile.in	Tue Nov  5 16:29:57 2002
-@@ -28,7 +28,7 @@
- GREP = grep -v
- 
- MAKEDEPEND=@MAKEDEPEND@
--LIBS=-ldl @htg_ld_args_m@ @htg_ld_args_db@ -lncurses
-+LIBS=-L/usr/local/lib @htg_ld_args_m@ @htg_ld_args_db@ -lncurses
- #
- # Default install directory is set in htconfig.h
- #
diff -uNr tinycobol/files/patch-compiler_scan.l tinycobol/files/patch-compiler_scan.l
--- tinycobol/files/patch-compiler_scan.l	Thu Jan  1 01:00:00 1970
+++ tinycobol/files/patch-compiler_scan.l	Thu Apr 14 18:46:29 2005
@@ -0,0 +1,18 @@
+--- compiler/scan.l.orig	Tue Nov 23 04:47:01 2004
++++ compiler/scan.l	Thu Apr 14 18:46:07 2005
+@@ -24,7 +24,6 @@
+ */
+ 
+ %{
+-#include "htcoblib.h"
+ #include "htglobals.h"
+ #include <ctype.h>
+ 
+@@ -91,6 +90,7 @@
+ 
+ #include "htcoboly.h"
+ #include "htcobol.tab.h"    /* definitions from YACC */
++#include "htcoblib.h"
+ #include "reswords.h"
+ 
+ #define TOKTEXT_SIZE 1024
diff -uNr tinycobol/pkg-plist tinycobol/pkg-plist
--- tinycobol/pkg-plist	Sun May 30 01:14:29 2004
+++ tinycobol/pkg-plist	Thu Apr 14 18:56:42 2005
@@ -1,9 +1,7 @@
 bin/htcobol
+lib/libhtcobol.a
 share/htcobol/htcobolrc
-lib/libhtcobol.so.0.61.0
-lib/libhtcobol.so
-lib/libhtcobol.so.0
-share/htcobol/htcobolpp
+share/htcobol/htrtconf
 share/htcobol/copybooks/screen.cpy
 %%PORTDOCS%%%%DOCSDIR%%/Comments.old.txt
 %%PORTDOCS%%%%DOCSDIR%%/Compiler-Overview.txt

>Release-Note:
>Audit-Trail:
>Unformatted: