From a50268d00196eeb658505540d76ad827cc822da5 Mon Sep 17 00:00:00 2001 From: arved Date: Fri, 3 Jan 2003 17:55:27 +0000 Subject: Update to 0.10 PR: 46307 Submitted by: KATO Tsuguru --- lang/open-cobol/Makefile | 14 ++++----- lang/open-cobol/distinfo | 2 +- lang/open-cobol/files/patch-config::ltmain.sh | 15 ++++++++++ lang/open-cobol/files/patch-fileio.h | 11 ------- lang/open-cobol/files/patch-ltmain.sh | 41 --------------------------- lang/open-cobol/pkg-plist | 7 ++--- 6 files changed, 25 insertions(+), 65 deletions(-) create mode 100644 lang/open-cobol/files/patch-config::ltmain.sh delete mode 100644 lang/open-cobol/files/patch-fileio.h delete mode 100644 lang/open-cobol/files/patch-ltmain.sh (limited to 'lang/open-cobol') diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile index 1a4e30e5afe7..699124308985 100644 --- a/lang/open-cobol/Makefile +++ b/lang/open-cobol/Makefile @@ -7,30 +7,30 @@ # PORTNAME= open-cobol -PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTVERSION= 0.10 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 \ - intl.4:${PORTSDIR}/devel/gettext \ +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig +LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ ltdl.1:${PORTSDIR}/devel/libtool \ gmp.6:${PORTSDIR}/math/libgmp4 +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -USE_BISON= yes 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" + LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" CONFIGURE_ARGS= --with-readline INSTALLS_SHLIB= yes post-patch: - @${REINPLACE_CMD} -e "s|-ldb|-ldb4|g" ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/lang/open-cobol/distinfo b/lang/open-cobol/distinfo index 8d27ba88212b..8de1f37cad56 100644 --- a/lang/open-cobol/distinfo +++ b/lang/open-cobol/distinfo @@ -1 +1 @@ -MD5 (open-cobol-0.9.7.tar.gz) = 399a9cf4f6cf8226ba6b8e424df56e2e +MD5 (open-cobol-0.10.tar.gz) = 613ccc8415e591eab1f42f9e324c24df diff --git a/lang/open-cobol/files/patch-config::ltmain.sh b/lang/open-cobol/files/patch-config::ltmain.sh new file mode 100644 index 000000000000..c1404aef33c2 --- /dev/null +++ b/lang/open-cobol/files/patch-config::ltmain.sh @@ -0,0 +1,15 @@ +--- config/ltmain.sh.orig Fri Nov 22 17:03:54 2002 ++++ config/ltmain.sh Thu Dec 12 20:35:02 2002 +@@ -4280,10 +4280,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/files/patch-fileio.h b/lang/open-cobol/files/patch-fileio.h deleted file mode 100644 index fd46730f0058..000000000000 --- a/lang/open-cobol/files/patch-fileio.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libcob/fileio.h.orig Tue Aug 6 15:19:11 2002 -+++ libcob/fileio.h Tue Aug 6 15:19:18 2002 -@@ -21,7 +21,7 @@ - #define COB_FILEIO_H - - #include --#include -+#include - #include - - #define COB_EQ 1 /* x == y */ diff --git a/lang/open-cobol/files/patch-ltmain.sh b/lang/open-cobol/files/patch-ltmain.sh deleted file mode 100644 index d2bc925b6736..000000000000 --- a/lang/open-cobol/files/patch-ltmain.sh +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 9def41d0855a..3c62899dad86 100644 --- a/lang/open-cobol/pkg-plist +++ b/lang/open-cobol/pkg-plist @@ -1,17 +1,15 @@ bin/cob-config bin/cobc bin/cobpp -etc/open-cobol/libcob.conf +etc/libcob.conf include/libcob.h include/libcob/call.h -include/libcob/cobconfig.h include/libcob/common.h include/libcob/fileio.h include/libcob/move.h include/libcob/numeric.h include/libcob/screenio.h include/libcob/strings.h -include/libcob/support.h include/libcob/termio.h @unexec install-info --delete %D/info/open-cobol.info %D/info/dir info/open-cobol.info @@ -19,7 +17,6 @@ info/open-cobol.info lib/libcob.a lib/libcob.so lib/libcob.so.0 -share/aclocal/cob.m4 +libdata/pkgconfig/cob.pc share/locale/ja/LC_MESSAGES/open-cobol.mo @dirrm include/libcob -@dirrm etc/open-cobol -- cgit