- Update to 0.63

PR:		ports/92026
Submitted by:	Johan van Selst <johans@stack.nl>

7 files changed, 84 insertions, 10 deletions

diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile
index 9db885f3e99..35214fe0551 100644
--- a/lang/tinycobol/Makefile
+++ b/lang/tinycobol/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tinycobol
-PORTVERSION=	0.62
+PORTVERSION=	0.63
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tiny-cobol
@@ -23,9 +23,9 @@ HAS_CONFIGURE=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ARGS=	--with-libdb=3 --with-readline
+CONFIGURE_ARGS=	--with-libdb=3
 CPPFLAGS=	-I${LOCALBASE}/include
-CFLAGS=		${CPPFGLAGS}
+CFLAGS=		${CPPFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -37,4 +37,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/info/*.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# doesn't work with readline on FreeBSD 4.x
+.if ${OSVERSION} >= 500000
+CONFIGURE_ARGS+=	--with-readline
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/tinycobol/distinfo b/lang/tinycobol/distinfo
index 54b6d452c30..de1a4ed29c9 100644
--- a/lang/tinycobol/distinfo
+++ b/lang/tinycobol/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinycobol-0.62.tar.gz) = ba75acd052891b58db282729e38645fc
-SHA256 (tinycobol-0.62.tar.gz) = bae1e9bf70c2f9ce248b55faeb836b0fd25651973f5d34f9ce234d98669edc60
-SIZE (tinycobol-0.62.tar.gz) = 835871
+MD5 (tinycobol-0.63.tar.gz) = 21eab75899776d739cceca0c245f1d44
+SHA256 (tinycobol-0.63.tar.gz) = 7fac5e09b3c8b292957c6209df615d429f7c454859b4183cecff4c78978d4d22
+SIZE (tinycobol-0.63.tar.gz) = 847010
diff --git a/lang/tinycobol/files/patch-cobrun_Makefile.in b/lang/tinycobol/files/patch-cobrun_Makefile.in
new file mode 100644
index 00000000000..eccf7add133
--- /dev/null
+++ b/lang/tinycobol/files/patch-cobrun_Makefile.in
@@ -0,0 +1,27 @@
+--- cobrun/Makefile.in.orig	Thu Jul 21 14:57:52 2005
++++ cobrun/Makefile.in	Thu Jan 19 21:52:38 2006
+@@ -19,11 +19,11 @@
+ 
+ CCX=@CC@
+ 
+-INCLUDES=-I../lib -I../
++INCLUDES=@INCLUDES@
+ LIBS=
+-LIBS1=-lncurses -ldb -lm -ldl
+-LIBS2=-L../lib -lhtcobol -lncurses -ldb -lm -ldl
+-LDFLAGS=
++LIBS1=-lncurses @htg_ld_args_m@ @htg_ld_args_db@ @htg_ld_args_readline@
++LIBS2=-L../lib -lhtcobol -lncurses @htg_ld_args_m@ @htg_ld_args_db@ 
++LDFLAGS=@LDFLAGS@
+ CCXFLAGS=${INCLUDES}
+ 
+ 
+@@ -54,7 +54,7 @@
+ ${PROG1}: 
+ 	${CCX} ${SRC1} -Wl,-export-dynamic -o ${PROG1} \
+ 	${INCLUDES} -Wl,-whole-archive ${tc_library} \
+-	-Wl,-no-whole-archive $(LIBS1)
++	-Wl,-no-whole-archive $(LDFLAGS) $(LIBS1)
+ 
+ # Shared library version
+ ${PROG2}: ${OBJ2}
diff --git a/lang/tinycobol/files/patch-compiler_scan.l b/lang/tinycobol/files/patch-compiler_scan.l
index e43424664d9..ce3bb73b819 100644
--- a/lang/tinycobol/files/patch-compiler_scan.l
+++ b/lang/tinycobol/files/patch-compiler_scan.l
@@ -1,5 +1,5 @@
---- compiler/scan.l.orig       Tue Nov 23 04:47:01 2004
-+++ compiler/scan.l    Thu Apr 14 18:46:07 2005
+--- compiler/scan.l.orig	Thu Jul 21 14:57:46 2005
++++ compiler/scan.l	Thu Jan 19 21:08:45 2006
 @@ -24,7 +24,6 @@
  */
  
@@ -8,7 +8,7 @@
  #include "htglobals.h"
  #include <ctype.h>
  
-@@ -91,6 +90,7 @@
+@@ -93,6 +92,7 @@
  
  #include "htcoboly.h"
  #include "htcobol.tab.h"    /* definitions from YACC */
diff --git a/lang/tinycobol/files/patch-configure b/lang/tinycobol/files/patch-configure
new file mode 100644
index 00000000000..97647454b7b
--- /dev/null
+++ b/lang/tinycobol/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Thu Jul 21 14:57:45 2005
++++ configure	Thu Jan 19 22:17:40 2006
+@@ -3806,6 +3806,7 @@
+ s%@tcobpp_version@%$tcobpp_version%g
+ s%@htg_ld_args_m@%$htg_ld_args_m%g
+ s%@htg_ld_args_db@%$htg_ld_args_db%g
++s%@htg_ld_args_readline@%$htg_ld_args_readline%g
+ s%@asx_cmd@%$asx_cmd%g
+ s%@ccx_cmd@%$ccx_cmd%g
+ s%@ranlibx_cmd@%$ranlibx_cmd%g
diff --git a/lang/tinycobol/files/patch-lib_Makefile.in b/lang/tinycobol/files/patch-lib_Makefile.in
new file mode 100644
index 00000000000..888c9027fb1
--- /dev/null
+++ b/lang/tinycobol/files/patch-lib_Makefile.in
@@ -0,0 +1,26 @@
+--- lib/Makefile.in.orig	Thu Jul 21 14:57:47 2005
++++ lib/Makefile.in	Thu Jan 19 22:19:28 2006
+@@ -32,7 +32,7 @@
+ GREP  = grep -v
+ 
+ MAKEDEPEND=@MAKEDEPEND@
+-LIBS=-ldl @htg_ld_args_m@ @htg_ld_args_db@ -lncurses
++LIBS=@htg_ld_args_m@ @htg_ld_args_db@ -lncurses
+ #
+ # Default install directory is set in htconfig.h
+ #
+@@ -113,12 +113,12 @@
+ # Rules for building the shared library
+ #
+ ${SHARED_LIB1}: ${OBJD1}
+-	${CCX} -shared -Wl,-soname,lib${lib_name1}.so.0 -o ${SHARED_LIB1} $(OBJD1) ${LIBS} 
++	${CCX} @LDFLAGS@ -shared -Wl,-soname,lib${lib_name1}.so.0 -o ${SHARED_LIB1} $(OBJD1) ${LIBS} 
+ 	${LNK} $(SHARED_LIB1) lib$(lib_name1).so.0
+ 	${LNK} $(SHARED_LIB1) lib$(lib_name1).so
+ 
+ ${SHARED_LIB2}: ${OBJD2}
+-	${CCX} -shared -Wl,-soname,lib${lib_name2}.so.0 -o ${SHARED_LIB2} $(OBJD2) ${LIBS}
++	${CCX} @LDFLAGS@ -shared -Wl,-soname,lib${lib_name2}.so.0 -o ${SHARED_LIB2} $(OBJD2) ${LIBS}
+ 	${LNK} $(SHARED_LIB2) lib$(lib_name2).so.0
+ 	${LNK} $(SHARED_LIB2) lib$(lib_name2).so
+ 
diff --git a/lang/tinycobol/pkg-plist b/lang/tinycobol/pkg-plist
index 54745a65e55..86698405468 100644
--- a/lang/tinycobol/pkg-plist
+++ b/lang/tinycobol/pkg-plist
@@ -1,5 +1,9 @@
 bin/htcobol
+bin/htcobrun
 lib/libhtcobol.a
+lib/libhtcobol.so
+lib/libhtcobol.so.0
+lib/libhtcobol.so.0.63.0
 share/htcobol/htcobolrc
 share/htcobol/htrtconf
 share/htcobol/copybooks/screen.cpy