--- lang/tinycobol/Makefile	2008-03-20 19:49:36.000000000 +0900
+++ lang/tinycobol/Makefile	2008-11-17 21:57:37.000000000 +0900
@@ -6,35 +6,47 @@ 
 #
 
 PORTNAME=	tinycobol
-PORTVERSION=	0.63
-PORTREVISION=	1
+PORTVERSION=	0.64
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tiny-cobol
+MASTER_SITES=	SF/tiny-cobol
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tiny COBOL compiler for IA32 platforms
 
-LIB_DEPENDS=	db3:${PORTSDIR}/databases/db3
-
-USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386
-HAS_CONFIGURE=	yes
+
+USE_BZIP2=	yes
+USE_BDB=	3
 USE_BISON=	build
 USE_GMAKE=	yes
-
-CONFIGURE_ARGS=	--with-libdb=3 \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-cobf2f \
+		--with-libdb=3 \
 		--with-readline
-CPPFLAGS=	-I${LOCALBASE}/include
-CFLAGS+=		${CPPFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+MANCOMPRESSED=	yes
+MAN1=		htcobf2f.1 htcobol.1 htcobrun.1
+
+CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
-MAN1=		htcobol.1 htcobf2f.1
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e \
+		'/^INSTALL_PROGRAM=/s|=.*|=@INSTALL_PROGRAM@|g ; \
+		 /cobdir_docdir/s|^|#|g'
 
 post-install:
+	@(cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
+		install-static-libs install-shared-libs)
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/info/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/info/*.txt ${DOCSDIR}
 .endif
 
--- lang/tinycobol/distinfo	2006-01-21 03:11:37.000000000 +0900
+++ lang/tinycobol/distinfo	2008-11-17 18:31:54.000000000 +0900
@@ -1,3 +1,3 @@ 
-MD5 (tinycobol-0.63.tar.gz) = 21eab75899776d739cceca0c245f1d44
-SHA256 (tinycobol-0.63.tar.gz) = 7fac5e09b3c8b292957c6209df615d429f7c454859b4183cecff4c78978d4d22
-SIZE (tinycobol-0.63.tar.gz) = 847010
+MD5 (tinycobol-0.64.tar.bz2) = c8f4e15f88fbe3d6c7239c3c20811fec
+SHA256 (tinycobol-0.64.tar.bz2) = 90d14ec5e1037a5d1b0ca8ff853a32c457c3116a1a9795906d32ca356957135d
+SIZE (tinycobol-0.64.tar.bz2) = 741132
--- lang/tinycobol/files/patch-cobrun_Makefile.in	2006-01-21 00:35:39.000000000 +0900
+++ lang/tinycobol/files/patch-cobrun_Makefile.in	2008-11-17 21:36:58.000000000 +0900
@@ -1,27 +1,11 @@ 
---- 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 @@
+--- cobrun/Makefile.in.orig	2008-10-30 16:52:49.000000000 +0900
++++ cobrun/Makefile.in	2008-11-17 21:15:37.000000000 +0900
+@@ -37,7 +37,7 @@
+ LIBS1=@htg_ld_args_defaults@
+ LIBS2=-L../lib -lhtcobol @htg_ld_args_defaults@
+ LDFLAGS=@LDFLAGS@
+-CCXFLAGS=${INCLUDES}
++CCXFLAGS=${INCLUDES} @CPPFLAGS@ @CFLAGS@
  
- CCX=@CC@
+ SRC01 = htcobrun.c
  
--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}
--- lang/tinycobol/files/patch-compiler__Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ lang/tinycobol/files/patch-compiler__Makefile.in	2008-11-17 21:37:24.000000000 +0900
@@ -0,0 +1,14 @@ 
+--- compiler/Makefile.in.orig	2008-10-30 16:52:49.000000000 +0900
++++ compiler/Makefile.in	2008-11-17 21:18:06.000000000 +0900
+@@ -38,9 +38,9 @@
+ # -DDEBUG_COMPILER -DDEBUG_SCANNER
+ #
+ INCLUDES=@INCLUDES@
+-CCXFLAGS=${INCLUDES} @CCXFLAGS@ -Wall -pedantic -Wno-long-long
++CCXFLAGS=${INCLUDES} @CCXFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -pedantic -Wno-long-long
+ #CCXFLAGS1=${INCLUDES} @CCXFLAGS@
+-CCXFLAGS1=${INCLUDES}
++CCXFLAGS1=${INCLUDES} @CPPFLAGS@ @CFLAGS@
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
--- lang/tinycobol/files/patch-compiler_scan.l	2006-01-21 03:11:37.000000000 +0900
+++ lang/tinycobol/files/patch-compiler_scan.l	1970-01-01 09:00:00.000000000 +0900
@@ -1,18 +0,0 @@ 
---- 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 @@
- */
- 
- %{
--#include "htcoblib.h"
- #include "htglobals.h"
- #include <ctype.h>
- 
-@@ -93,6 +92,7 @@
- 
- #include "htcoboly.h"
- #include "htcobol.tab.h"    /* definitions from YACC */
-+#include "htcoblib.h"
- #include "reswords.h"
- 
- #define TOKTEXT_SIZE 1024
--- lang/tinycobol/files/patch-configure	2006-01-21 00:35:39.000000000 +0900
+++ lang/tinycobol/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- 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
--- lang/tinycobol/files/patch-lib_Makefile.in	2006-01-21 00:35:39.000000000 +0900
+++ lang/tinycobol/files/patch-lib_Makefile.in	2008-11-17 21:16:44.000000000 +0900
@@ -1,26 +1,13 @@ 
---- 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
+--- lib/Makefile.in.orig	2008-10-30 16:52:50.000000000 +0900
++++ lib/Makefile.in	2008-11-17 21:16:30.000000000 +0900
+@@ -36,8 +36,8 @@
+ INCLUDES=@INCLUDES@
+ LIBS=@htg_ld_args_defaults@
+ LDFLAGS=@LDFLAGS@
+-CCXFLAGS=${INCLUDES} @CCXFLAGS@ -Wall 
+-CCXFLAGS1=${INCLUDES} @CCXFLAGS@ -Wall -fPIC -DPIC
++CCXFLAGS=${INCLUDES} @CCXFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall 
++CCXFLAGS1=${INCLUDES} @CCXFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -fPIC -DPIC
+ ACXFLAGS=@ACXFLAGS@
  
- 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
- 
--- lang/tinycobol/files/patch-utils__cobf2f__Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ lang/tinycobol/files/patch-utils__cobf2f__Makefile.in	2008-11-17 21:42:43.000000000 +0900
@@ -0,0 +1,11 @@ 
+--- utils/cobf2f/Makefile.in.orig	2008-10-30 16:52:55.000000000 +0900
++++ utils/cobf2f/Makefile.in	2008-11-17 21:34:00.000000000 +0900
+@@ -29,7 +29,7 @@
+ 
+ #
+ INCLUDES= -I. -I../../
+-CCXFLAGS=${INCLUDES} @CCXFLAGS@
++CCXFLAGS=${INCLUDES} @CCXFLAGS@ @CPPFLAGS@ @CFLAGS@
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
--- lang/tinycobol/pkg-plist	2006-01-21 03:11:37.000000000 +0900
+++ lang/tinycobol/pkg-plist	2008-11-17 21:55:54.000000000 +0900
@@ -1,18 +1,30 @@ 
+bin/htcobf2f
 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
+lib/libhtcobol.so.%%VERSION%%.0
 %%PORTDOCS%%%%DOCSDIR%%/Comments.old.txt
 %%PORTDOCS%%%%DOCSDIR%%/Compiler-Overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/GAS.asm-i386.Info.txt
 %%PORTDOCS%%%%DOCSDIR%%/ProgramHeaders.Info.txt
 %%PORTDOCS%%%%DOCSDIR%%/VarStructure.Info.txt
 %%PORTDOCS%%%%DOCSDIR%%/compiler-design-future.txt
-@dirrm share/htcobol/copybooks
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/htcobf2f.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobf2f_en.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobf2f_en.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobol.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_en.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_en.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_es.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_fr.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_it.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobol_pt_BR.txt
+%%PORTDOCS%%%%DOCSDIR%%/htcobrun.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobrun_en.html
+%%PORTDOCS%%%%DOCSDIR%%/htcobrun_en.txt
+share/htcobol/htcobolrc
+share/htcobol/htrtconf
 @dirrm share/htcobol
+%%PORTDOCS%%@dirrm %%DOCSDIR%%