pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update pkgtools/libnbcompat to 20040813. Changes from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fe720d2f6e96
branches: trunk
changeset: 479352:fe720d2f6e96
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 13 04:38:02 2004 +0000
description:
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
diffstat:
doc/CHANGES | 3 +-
pkgtools/libnbcompat/Makefile | 4 +-
pkgtools/libnbcompat/buildlink3.mk | 4 +-
pkgtools/libnbcompat/files/README | 14 ++---------
pkgtools/libnbcompat/files/configure | 37 +++++++++++++++++---------------
pkgtools/libnbcompat/files/configure.ac | 22 +++++++++++--------
6 files changed, 42 insertions(+), 42 deletions(-)
diffs (184 lines):
diff -r bd49adc064bf -r fe720d2f6e96 doc/CHANGES
--- a/doc/CHANGES Fri Aug 13 03:43:23 2004 +0000
+++ b/doc/CHANGES Fri Aug 13 04:38:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6858 2004/08/13 03:22:22 minskim Exp $
+$NetBSD: CHANGES,v 1.6859 2004/08/13 04:39:03 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -3806,3 +3806,4 @@
Updated opera7 to 7.54 [jdolecek 2004-08-13]
Updated alee-ttf to 1.3 [minskim 2004-08-13]
Updated baekmuk-ttf to 2.2 [minskim 2004-08-13]
+ Updated libnbcompat to 20040813 [jlam 2004-08-13]
diff -r bd49adc064bf -r fe720d2f6e96 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile Fri Aug 13 03:43:23 2004 +0000
+++ b/pkgtools/libnbcompat/Makefile Fri Aug 13 04:38:02 2004 +0000
@@ -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 -r bd49adc064bf -r fe720d2f6e96 pkgtools/libnbcompat/buildlink3.mk
--- a/pkgtools/libnbcompat/buildlink3.mk Fri Aug 13 03:43:23 2004 +0000
+++ b/pkgtools/libnbcompat/buildlink3.mk Fri Aug 13 04:38:02 2004 +0000
@@ -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+= 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 -r bd49adc064bf -r fe720d2f6e96 pkgtools/libnbcompat/files/README
--- a/pkgtools/libnbcompat/files/README Fri Aug 13 03:43:23 2004 +0000
+++ b/pkgtools/libnbcompat/files/README Fri Aug 13 04:38:02 2004 +0000
@@ -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 @@
*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 <jlam%NetBSD.org@localhost>
- FreeBSD-5.2.1/i386 <seb%NetBSD.org@localhost>
- IRIX 6.5 <schmonz%NetBSD.org@localhost>
- MacOS X 10.3.4 <schmonz%NetBSD.org@localhost>
- MacOS X 10.3.5 <masahiro%wide.ad.jp@localhost>
+ MacOS X 10.2.8 <jlam%NetBSD.org@localhost>
NetBSD-1.6.2/i386 <jlam%NetBSD.org@localhost>
- NetBSD-2.0_BETA/i386 <wiz%NetBSD.org@localhost>
- OpenBSD-3.3/i386 <dmcmahill%NetBSD.org@localhost>
- Red Hat Linux 8.0 <cube%NetBSD.org@localhost>
- Solaris 8 <sketch%NetBSD.org@localhost>
- Solaris 9 <sketch%NetBSD.org@localhost>
3 Usage
diff -r bd49adc064bf -r fe720d2f6e96 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure Fri Aug 13 03:43:23 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure Fri Aug 13 04:38:02 2004 +0000
@@ -4723,6 +4723,7 @@
fi
+pkg_use_nbcompat_getopt_long=yes
for ac_header in getopt.h
do
@@ -4926,24 +4927,9 @@
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
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_NBCOMPAT_GETOPT_LONG 1
-_ACEOF
-
-
-
- case $LIBOBJS in
- "getopt_long.$ac_objext" | \
- *" getopt_long.$ac_objext" | \
- "getopt_long.$ac_objext "* | \
- *" getopt_long.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext" ;;
-esac
-
-
+ pkg_use_nbcompat_getopt_long=yes
:
fi
@@ -4953,6 +4939,23 @@
done
+if test $pkg_use_nbcompat_getopt_long = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NBCOMPAT_GETOPT_LONG 1
+_ACEOF
+
+
+
+ case $LIBOBJS in
+ "getopt_long.$ac_objext" | \
+ *" getopt_long.$ac_objext" | \
+ "getopt_long.$ac_objext "* | \
+ *" getopt_long.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext" ;;
+esac
+
+fi
+
pkg_use_nbcompat_vis=yes
for ac_header in vis.h
diff -r bd49adc064bf -r fe720d2f6e96 pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac Fri Aug 13 03:43:23 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac Fri Aug 13 04:38:02 2004 +0000
@@ -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_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 <getopt.h> ], [ 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.
Home |
Main Index |
Thread Index |
Old Index