From 9005f5c3686f2386f4fe4cffa37db64025ab02fc Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 13 Aug 2004 04:38:02 +0000 Subject: Update pkgtools/libnbcompat to 20040813. Changes from version 20040809 include working around an apparent bug in an autoconf macro defined in aclocal.m4. This should now cause getopt_long() to be built on systems that are missing getopt.h. This version of libnbcompat has been tested on the following platforms: FreeBSD-4.8/i386 MacOS X 10.2.8 NetBSD-1.6.2/i386 --- pkgtools/libnbcompat/Makefile | 4 ++-- pkgtools/libnbcompat/buildlink3.mk | 4 ++-- pkgtools/libnbcompat/files/README | 14 +++----------- pkgtools/libnbcompat/files/configure | 25 ++++++++++++++----------- pkgtools/libnbcompat/files/configure.ac | 22 +++++++++++++--------- 5 files changed, 34 insertions(+), 35 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile index 8bb0219e2e1..a1136f82a95 100644 --- a/pkgtools/libnbcompat/Makefile +++ b/pkgtools/libnbcompat/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2004/08/10 18:47:55 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2004/08/13 04:38:02 jlam Exp $ # # NOTE: If you update this package, it is *mandatory* that you update # pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual # list of tested and supported platforms. # -DISTNAME= libnbcompat-20040809 +DISTNAME= libnbcompat-20040813 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk index 6a708b03ea8..71f5ecbc89f 100644 --- a/pkgtools/libnbcompat/buildlink3.mk +++ b/pkgtools/libnbcompat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/08/10 18:47:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/08/13 04:38:02 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnbcompat} BUILDLINK_PACKAGES+= libnbcompat .if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20040809 +BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20040813 BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat BUILDLINK_DEPMETHOD.libnbcompat?= build BUILDLINK_LDADD.libnbcompat= -lnbcompat diff --git a/pkgtools/libnbcompat/files/README b/pkgtools/libnbcompat/files/README index 7b25f04b996..f22eee93561 100644 --- a/pkgtools/libnbcompat/files/README +++ b/pkgtools/libnbcompat/files/README @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.3 2004/08/11 21:20:30 jlam Exp $ +$NetBSD: README,v 1.4 2004/08/13 04:38:02 jlam Exp $ 0 Introduction ============== @@ -43,20 +43,12 @@ breakage seep in. Proper methodology for updating this package is: *NOTE* the most recent libnbcompat. *NOTE* -libnbcompat-20040809 has been tested to build and install correctly +libnbcompat-20040813 has been tested to build and install correctly on the following operating systems: FreeBSD-4.8/i386 - FreeBSD-5.2.1/i386 - IRIX 6.5 - MacOS X 10.3.4 - MacOS X 10.3.5 + MacOS X 10.2.8 NetBSD-1.6.2/i386 - NetBSD-2.0_BETA/i386 - OpenBSD-3.3/i386 - Red Hat Linux 8.0 - Solaris 8 - Solaris 9 3 Usage diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure index 45998e64d61..2eb1fc02aba 100755 --- a/pkgtools/libnbcompat/files/configure +++ b/pkgtools/libnbcompat/files/configure @@ -4723,6 +4723,7 @@ esac fi +pkg_use_nbcompat_getopt_long=yes for ac_header in getopt.h do @@ -4926,16 +4927,26 @@ fi echo "$as_me:$LINENO: result: $pkg_cv_have_struct_option" >&5 echo "${ECHO_T}$pkg_cv_have_struct_option" >&6 if test "x$pkg_cv_have_struct_option" = "xyes"; then - : + pkg_use_nbcompat_getopt_long=no else + pkg_use_nbcompat_getopt_long=yes + : + fi - cat >>confdefs.h <<\_ACEOF + +fi + +done + + +if test $pkg_use_nbcompat_getopt_long = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_NBCOMPAT_GETOPT_LONG 1 _ACEOF - case $LIBOBJS in + case $LIBOBJS in "getopt_long.$ac_objext" | \ *" getopt_long.$ac_objext" | \ "getopt_long.$ac_objext "* | \ @@ -4943,16 +4954,8 @@ _ACEOF *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext" ;; esac - - : - fi - - fi -done - - pkg_use_nbcompat_vis=yes for ac_header in vis.h diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac index ca8492d2433..f15aad85171 100644 --- a/pkgtools/libnbcompat/files/configure.ac +++ b/pkgtools/libnbcompat/files/configure.ac @@ -1,4 +1,4 @@ -dnl $NetBSD: configure.ac,v 1.45 2004/08/10 18:47:55 jlam Exp $ +dnl $NetBSD: configure.ac,v 1.46 2004/08/13 04:38:02 jlam Exp $ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) @@ -110,19 +110,23 @@ AC_CHECK_FUNC(SHA1File, [:], [ AC_LIBOBJ(sha1hl) ]) +pkg_use_nbcompat_getopt_long=yes AC_CHECK_HEADERS([getopt.h], [ AC_MSG_TRY_COMPILE([for struct option], pkg_cv_have_struct_option, [ #include ], [ struct option X; ], - [:], [ - AC_DEFINE(HAVE_NBCOMPAT_GETOPT_LONG) - AH_TEMPLATE([HAVE_NBCOMPAT_GETOPT_LONG], [ - Define to 1 if the `getopt_long' function is - built into the library. - ]) - AC_LIBOBJ(getopt_long) - ]) + [pkg_use_nbcompat_getopt_long=no], + [pkg_use_nbcompat_getopt_long=yes]) ]) +if test $pkg_use_nbcompat_getopt_long = yes; then + AC_DEFINE(HAVE_NBCOMPAT_GETOPT_LONG) + AH_TEMPLATE([HAVE_NBCOMPAT_GETOPT_LONG], [ + Define to 1 if the `getopt_long' function is + built into the library. + ]) + AC_LIBOBJ(getopt_long) +fi + dnl Check that this vis.h has *vis()-related functions because Solaris' dnl vis.h doesn't. Also, only consider the header found if it defines dnl all of the functions that we need. -- cgit v1.2.3