ports/92026: lang/tinycobol: update to version 0.63 (and fix)
Johan van Selst
johans at stack.nl
Thu Jan 19 21:50:03 UTC 2006
>Number: 92026
>Category: ports
>Synopsis: lang/tinycobol: update to version 0.63 (and fix)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 19 21:50:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Johan van Selst
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 6.0-STABLE FreeBSD 6.0-STABLE #9: Wed Jan 11 14:40:03 CET 2006 johans at mud.stack.nl:/usr/obj/usr/src/sys/mud i386
>Description:
Update to latest version 0.63.
While we're at it, fix parts of the compilation that failed silently.
This gives us extra binaries and libraries.
>How-To-Repeat:
>Fix:
This introduces three new patchfiles.
These patches mostly ensure that compilation respects variables
discovered by ./configure (such as $LDFLAGS)
patch-configure
patch-lib_Makefile.in
patch-cobrun_Makefile.in
diff -uNr tinycobol/Makefile tinycobol/Makefile
--- tinycobol/Makefile Fri Apr 15 04:02:30 2005
+++ tinycobol/Makefile Thu Jan 19 22:31:14 2006
@@ -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 @@
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 @@
${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 -uNr tinycobol/distinfo tinycobol/distinfo
--- tinycobol/distinfo Sat Nov 26 04:13:39 2005
+++ tinycobol/distinfo Thu Jan 19 21:08:40 2006
@@ -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 -uNr tinycobol/files/patch-cobrun_Makefile.in tinycobol/files/patch-cobrun_Makefile.in
--- tinycobol/files/patch-cobrun_Makefile.in Thu Jan 1 01:00:00 1970
+++ tinycobol/files/patch-cobrun_Makefile.in Thu Jan 19 21:52:51 2006
@@ -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 -uNr tinycobol/files/patch-compiler_scan.l tinycobol/files/patch-compiler_scan.l
--- tinycobol/files/patch-compiler_scan.l Thu Apr 14 19:27:31 2005
+++ tinycobol/files/patch-compiler_scan.l Thu Jan 19 21:15:57 2006
@@ -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 -uNr tinycobol/files/patch-configure tinycobol/files/patch-configure
--- tinycobol/files/patch-configure Thu Jan 1 01:00:00 1970
+++ tinycobol/files/patch-configure Thu Jan 19 22:17:51 2006
@@ -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 -uNr tinycobol/files/patch-lib_Makefile.in tinycobol/files/patch-lib_Makefile.in
--- tinycobol/files/patch-lib_Makefile.in Thu Jan 1 01:00:00 1970
+++ tinycobol/files/patch-lib_Makefile.in Thu Jan 19 22:20:24 2006
@@ -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 -uNr tinycobol/pkg-plist tinycobol/pkg-plist
--- tinycobol/pkg-plist Fri Apr 15 04:02:30 2005
+++ tinycobol/pkg-plist Thu Jan 19 22:20:41 2006
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list