Date: Fri, 5 Mar 2004 13:52:31 +0100 (CET) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: patrick@FreeBSD.org Subject: ports/63796: [patch] lang/tinycobol: Update to 0.61 (unbreak) Message-ID: <200403051252.i25CqVK0006474@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200403051300.i25D0aWA076954@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63796 >Category: ports >Synopsis: [patch] lang/tinycobol: Update to 0.61 (unbreak) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 05 05:00:36 PST 2004 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.9-STABLE i386 >Organization: Lehrstuhl für Informatik II >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-STABLE FreeBSD 4.9-STABLE #12: Mon Dec 8 15:14:27 CET 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: Update to 0.61: unbreak build on -CURRENT & -STABLE >How-To-Repeat: http://bento.freebsd.org/errorlogs/i386-5-latest/tinycobol-0.59_2.log >Fix: diff -urN /usr/ports/lang/tinycobol/Makefile tinycobol/Makefile --- /usr/ports/lang/tinycobol/Makefile Wed Feb 4 06:21:44 2004 +++ tinycobol/Makefile Fri Mar 5 13:48:34 2004 @@ -6,8 +6,7 @@ # PORTNAME= tinycobol -PORTVERSION= 0.59 -PORTREVISION= 2 +PORTVERSION= 0.61 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tiny-cobol @@ -17,31 +16,28 @@ LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 +INSTALLS_SHLIBS=yes ONLY_FOR_ARCHS= i386 USE_GETOPT_LONG=yes HAS_CONFIGURE= yes USE_BISON= yes USE_GMAKE= yes -CONFIGURE_ARGS= "--with-readline" +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 CPPFLAGS= -I${LOCALBASE}/include +CFLAGS= ${CPPFGLAGS} LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= htcobol.1 htcobf2f.1 htcobolpp.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - -pre-install: - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/tinycobol ${INSTALL_DATA} ${WRKSRC}/info/*.txt ${PREFIX}/share/doc/tinycobol .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/lang/tinycobol/distinfo tinycobol/distinfo --- /usr/ports/lang/tinycobol/distinfo Tue Nov 5 22:51:28 2002 +++ tinycobol/distinfo Fri Mar 5 10:59:22 2004 @@ -1 +1,2 @@ -MD5 (tinycobol-0.59.tar.gz) = 755d41f049f6530aab7f1b9a393472ed +MD5 (tinycobol-0.61.tar.gz) = d9b5c00a2407ab8b42689a7d21c62af2 +SIZE (tinycobol-0.61.tar.gz) = 817294 diff -urN /usr/ports/lang/tinycobol/files/patch-aa tinycobol/files/patch-aa --- /usr/ports/lang/tinycobol/files/patch-aa Tue Nov 5 22:51:28 2002 +++ tinycobol/files/patch-aa Fri Mar 5 11:33:53 2004 @@ -1,38 +1,11 @@ ---- configure.orig Sun Oct 20 04:37:38 2002 -+++ configure Tue Nov 5 16:23:57 2002 -@@ -952,7 +952,7 @@ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -@@ -4070,7 +4070,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldb $LIBS" -+LIBS="-ldb2 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 4075 "configure" - #include "confdefs.h" -@@ -4679,7 +4679,7 @@ - #define USE_DB 1 - EOF - -- htg_ld_args_db="-ldb" -+ htg_ld_args_db="-ldb2" - fi - - if test "${db_version}" = "123" ; then -@@ -5229,7 +5229,7 @@ - # - +--- 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../lib -I../ -I/usr/local/include" ++INCLUDES="-I/usr/include -I/usr/local/include -I../lib -I../" - # set default directories - # + # Check for executable suffix + # Set include and libraries paths diff -urN /usr/ports/lang/tinycobol/pkg-plist tinycobol/pkg-plist --- /usr/ports/lang/tinycobol/pkg-plist Tue Nov 5 22:51:28 2002 +++ tinycobol/pkg-plist Fri Mar 5 13:33:55 2004 @@ -1,6 +1,6 @@ bin/htcobol share/htcobol/htcobolrc -lib/libhtcobol.so.0.59.0 +lib/libhtcobol.so.0.61.0 lib/libhtcobol.so lib/libhtcobol.so.0 share/htcobol/htcobolpp >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403051252.i25CqVK0006474>