From tkato@prontomail.com  Mon Nov 18 13:20:28 2002
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F0EE537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Nov 2002 13:20:27 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD0843EA3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Nov 2002 13:20:20 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from socigeog.hmt.toyama-u.ac.jp (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (8.12.6/8.12.3) with SMTP id gAILKI6A000730
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 19 Nov 2002 06:20:18 +0900 (JST)
	(envelope-from tkato@prontomail.com)
Message-Id: <20021119061648.4adea6ce.tkato@prontomail.com>
Date: Tue, 19 Nov 2002 06:16:48 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: lang/open-cobol

>Number:         45443
>Category:       ports
>Synopsis:       Update port: lang/open-cobol
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 18 13:30:11 PST 2002
>Closed-Date:    Wed Nov 20 05:04:13 PST 2002
>Last-Modified:  Wed Nov 20 05:04:13 PST 2002
>Originator:     KATO Tsuguru
>Release:        4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix LIB_DEPENDS
- Do not install useless .la files

New file:
files/patch-ltmain.sh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/lang/open-cobol/Makefile lang/open-cobol/Makefile
--- /usr/ports/lang/open-cobol/Makefile	Mon Nov 11 19:00:11 2002
+++ lang/open-cobol/Makefile	Mon Nov 11 20:38:36 2002
@@ -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 -urN /usr/ports/lang/open-cobol/files/patch-ltmain.sh lang/open-cobol/files/patch-ltmain.sh
--- /usr/ports/lang/open-cobol/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ lang/open-cobol/files/patch-ltmain.sh	Sat Nov  9 18:07:12 2002
@@ -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 -urN /usr/ports/lang/open-cobol/pkg-plist lang/open-cobol/pkg-plist
--- /usr/ports/lang/open-cobol/pkg-plist	Tue Aug  6 22:09:45 2002
+++ lang/open-cobol/pkg-plist	Sat Nov  9 18:00:03 2002
@@ -2,7 +2,6 @@
 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/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
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Wed Nov 20 05:04:02 PST 2002 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45443 
>Unformatted:
