3 files changed, 53 insertions, 10 deletions

diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index c2489b35bdaa..1a4e30e5afe7 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -8,22 +8,25 @@
 
 PORTNAME=	open-cobol
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext \
-		iconv:${PORTSDIR}/converters/libiconv \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt \
-		db4:${PORTSDIR}/databases/db4 \
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
+		intl.4:${PORTSDIR}/devel/gettext \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		ltdl.1:${PORTSDIR}/devel/libtool \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_REINPLACE=	yes
 USE_BISON=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt -lintl"
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt -lintl"
 CONFIGURE_ARGS=	--with-readline
 INSTALLS_SHLIB=	yes
 
diff --git a/lang/open-cobol/files/patch-ltmain.sh b/lang/open-cobol/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d2bc925b6736
--- /dev/null
+++ b/lang/open-cobol/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Thu May 16 15:14:23 2002
++++ ltmain.sh	Sat Nov  9 18:07:04 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4210,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/lang/open-cobol/pkg-plist b/lang/open-cobol/pkg-plist
index 3f853812cfe7..9def41d0855a 100644
--- a/lang/open-cobol/pkg-plist
+++ b/lang/open-cobol/pkg-plist
@@ -2,7 +2,6 @@ bin/cob-config
 bin/cobc
 bin/cobpp
 etc/open-cobol/libcob.conf
-@dirrm etc/open-cobol
 include/libcob.h
 include/libcob/call.h
 include/libcob/cobconfig.h
@@ -14,13 +13,13 @@ include/libcob/screenio.h
 include/libcob/strings.h
 include/libcob/support.h
 include/libcob/termio.h
-@dirrm include/libcob
 @unexec install-info --delete %D/info/open-cobol.info %D/info/dir
 info/open-cobol.info
 @exec install-info %D/info/open-cobol.info %D/info/dir
 lib/libcob.a
-lib/libcob.la
 lib/libcob.so
 lib/libcob.so.0
 share/aclocal/cob.m4
 share/locale/ja/LC_MESSAGES/open-cobol.mo
+@dirrm include/libcob
+@dirrm etc/open-cobol