[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files Consistent...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files Consistent...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:04:22 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0eb43e4529c0
branches:  pkg_install-renovation
changeset: 541548:0eb43e4529c0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 23 15:51:22 2008 +0000

description:
Consistently use the libnbcompat header for md5 if this is not a native
NetBSD build.

diffstat:

 pkgtools/pkg_install/files/admin/check.c   |  8 +++++---
 pkgtools/pkg_install/files/admin/main.c    |  8 +++++---
 pkgtools/pkg_install/files/configure       |  3 +--
 pkgtools/pkg_install/files/configure.ac    |  2 +-
 pkgtools/pkg_install/files/create/pl.c     |  8 +++++---
 pkgtools/pkg_install/files/lib/config.h.in |  9 +++------
 pkgtools/pkg_install/files/lib/plist.c     |  8 +++++---
 7 files changed, 25 insertions(+), 21 deletions(-)

diffs (176 lines):

diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/admin/check.c
--- a/pkgtools/pkg_install/files/admin/check.c  Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/check.c  Fri May 23 15:51:22 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check.c,v 1.2 2008/03/09 19:25:16 joerg Exp $  */
+/*     $NetBSD: check.c,v 1.2.4.1 2008/05/23 15:51:22 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: check.c,v 1.2 2008/03/09 19:25:16 joerg Exp $");
+__RCSID("$NetBSD: check.c,v 1.2.4.1 2008/05/23 15:51:22 joerg Exp $");
 #endif
 
 /*-
@@ -65,7 +65,9 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#if HAVE_MD5_H
+#ifndef NETBSD
+#include <nbcompat/md5.h>
+#else
 #include <md5.h>
 #endif
 #if HAVE_LIMITS_H
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c   Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c   Fri May 23 15:51:22 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.42.2.2 2008/05/11 20:20:38 joerg Exp $      */
+/*     $NetBSD: main.c,v 1.42.2.3 2008/05/23 15:51:22 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.42.2.2 2008/05/11 20:20:38 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.42.2.3 2008/05/23 15:51:22 joerg Exp $");
 #endif
 
 /*-
@@ -66,7 +66,9 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#if HAVE_MD5_H
+#ifndef NETBSD
+#include <nbcompat/md5.h>
+#else
 #include <md5.h>
 #endif
 #if HAVE_LIMITS_H
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure      Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/configure      Fri May 23 15:51:22 2008 +0000
@@ -4612,9 +4612,8 @@
 
 
 
-
 for ac_header in assert.h ctype.h dirent.h err.h errno.h fnctl.h \
-       fnmatch.h glob.h grp.h inttypes.h limits.h md5.h netdb.h \
+       fnmatch.h glob.h grp.h inttypes.h limits.h netdb.h \
        pwd.h regex.h signal.h stdarg.h stdio.h stdlib.h string.h \
        termcap.h termios.h time.h unistd.h vis.h
 do
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/configure.ac
--- a/pkgtools/pkg_install/files/configure.ac   Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/configure.ac   Fri May 23 15:51:22 2008 +0000
@@ -68,7 +68,7 @@
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([assert.h ctype.h dirent.h err.h errno.h fnctl.h \
-       fnmatch.h glob.h grp.h inttypes.h limits.h md5.h netdb.h \
+       fnmatch.h glob.h grp.h inttypes.h limits.h netdb.h \
        pwd.h regex.h signal.h stdarg.h stdio.h stdlib.h string.h \
        termcap.h termios.h time.h unistd.h vis.h])
 AC_CHECK_HEADERS([db1/db.h db_185.h db.h])
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/create/pl.c
--- a/pkgtools/pkg_install/files/create/pl.c    Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/create/pl.c    Fri May 23 15:51:22 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pl.c,v 1.10 2007/08/03 13:15:59 joerg Exp $    */
+/*     $NetBSD: pl.c,v 1.10.8.1 2008/05/23 15:51:22 joerg Exp $        */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: pl.c,v 1.11 1997/10/08 07:46:35 charnier Exp";
 #else
-__RCSID("$NetBSD: pl.c,v 1.10 2007/08/03 13:15:59 joerg Exp $");
+__RCSID("$NetBSD: pl.c,v 1.10.8.1 2008/05/23 15:51:22 joerg Exp $");
 #endif
 #endif
 
@@ -40,7 +40,9 @@
 #if HAVE_ERR_H
 #include <err.h>
 #endif
-#if HAVE_MD5_H
+#ifndef NETBSD
+#include <nbcompat/md5.h>
+#else
 #include <md5.h>
 #endif
 
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/lib/config.h.in
--- a/pkgtools/pkg_install/files/lib/config.h.in        Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/config.h.in        Fri May 23 15:51:22 2008 +0000
@@ -54,9 +54,6 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the <md5.h> header file. */
-#undef HAVE_MD5_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -196,17 +193,17 @@
 #undef STDC_HEADERS
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT32_T
 
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT64_T
 
 /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT8_T
 
diff -r 9c7446de3d1b -r 0eb43e4529c0 pkgtools/pkg_install/files/lib/plist.c
--- a/pkgtools/pkg_install/files/lib/plist.c    Fri May 23 15:36:48 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/plist.c    Fri May 23 15:51:22 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plist.c,v 1.17.4.2 2008/05/20 15:00:44 joerg Exp $     */
+/*     $NetBSD: plist.c,v 1.17.4.3 2008/05/23 15:51:22 joerg Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
 #else
-__RCSID("$NetBSD: plist.c,v 1.17.4.2 2008/05/20 15:00:44 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.17.4.3 2008/05/23 15:51:22 joerg Exp $");
 #endif
 #endif
 
@@ -71,7 +71,9 @@
 #if HAVE_ERR_H
 #include <err.h>
 #endif
-#if HAVE_MD5_H
+#ifndef NETBSD
+#include <nbcompat/md5.h>
+#else
 #include <md5.h>
 #endif

Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated misc/p5-Locale-Maketext-Fuzzy to 0.10
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/libxml2 Update to 2.6.32:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated misc/p5-Locale-Maketext-Fuzzy to 0.10
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/libxml2 Update to 2.6.32:
Indexes:

Home | Main Index | Thread Index | Old Index