pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/posix_headers Correct resolver prototypes. Ad...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9692e0496ce
branches:  trunk
changeset: 528308:f9692e0496ce
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Apr 28 21:03:56 2007 +0000

description:
Correct resolver prototypes. Add strto(u)ll glue. Provide inlined setenv(3)

diffstat:

 pkgtools/posix_headers/Makefile       |   8 ++++----
 pkgtools/posix_headers/buildlink3.mk  |   4 ++--
 pkgtools/posix_headers/files/resolv.h |   8 ++++----
 pkgtools/posix_headers/files/stdlib.h |  26 ++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r d7d31da9adb6 -r f9692e0496ce pkgtools/posix_headers/Makefile
--- a/pkgtools/posix_headers/Makefile   Sat Apr 28 20:17:04 2007 +0000
+++ b/pkgtools/posix_headers/Makefile   Sat Apr 28 21:03:56 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/04/27 13:54:24 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2007/04/28 21:03:56 tnn Exp $
 
 DISTNAME=              posix_headers-0.4
-PKGREVISION=           2
+PKGREVISION=           5
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -18,8 +18,8 @@
 
 PLIST_SRC=             ${WRKDIR}/PLIST_SRC
 
-POSIX_HEADERS.HPUX=    sys/select.h stdint.h math.h resolv.h
-SUBST_HEADERS.HPUX=    math.h resolv.h
+POSIX_HEADERS.HPUX=    sys/select.h stdint.h math.h resolv.h stdlib.h
+SUBST_HEADERS.HPUX=    math.h resolv.h stdlib.h
 
 BUILDING_POSIX_HEADERS=        yes
 
diff -r d7d31da9adb6 -r f9692e0496ce pkgtools/posix_headers/buildlink3.mk
--- a/pkgtools/posix_headers/buildlink3.mk      Sat Apr 28 20:17:04 2007 +0000
+++ b/pkgtools/posix_headers/buildlink3.mk      Sat Apr 28 21:03:56 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/04/27 13:54:24 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/04/28 21:03:56 tnn Exp $
 
-BUILD_DEPENDS+=                posix_headers>=0.4nb2:../../pkgtools/posix_headers
+BUILD_DEPENDS+=                posix_headers>=0.4nb5:../../pkgtools/posix_headers
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 POSIX_HEADERS_BUILDLINK3_MK:=  ${POSIX_HEADERS_BUILDLINK3_MK}+
diff -r d7d31da9adb6 -r f9692e0496ce pkgtools/posix_headers/files/resolv.h
--- a/pkgtools/posix_headers/files/resolv.h     Sat Apr 28 20:17:04 2007 +0000
+++ b/pkgtools/posix_headers/files/resolv.h     Sat Apr 28 21:03:56 2007 +0000
@@ -1,16 +1,16 @@
-/* $NetBSD: resolv.h,v 1.1 2007/04/27 13:54:24 tnn Exp $ */
+/* $NetBSD: resolv.h,v 1.2 2007/04/28 21:03:56 tnn Exp $ */
 #ifndef _PKGSRC_RESOLV_H_
 #define _PKGSRC_RESOLV_H_
 #include "@REAL_HEADER@"
 #ifdef __hpux
 /* Missing prototypes. We have them in libc though. */
-ssize_t res_query(char*, int, int, u_char, int);
-ssize_t res_search(char*, int, int, u_char, int);
+ssize_t res_query(char*, int, int, u_char*, int);
+ssize_t res_search(char*, int, int, u_char*, int);
 ssize_t res_mkquery(int, const char*, int, int, const char*, int,\
                        const char*, char*, int);
 ssize_t res_send(const char*, ssize_t, char*, int);
 int res_init();
 ssize_t dn_comp(const char*, u_char*, ssize_t, u_char**, u_char**);
-ssize_t dn_expand(const u_char*, const u_char*, u_char*, int);
+ssize_t dn_expand(const u_char*, const u_char*, const u_char*, u_char*, int);
 #endif /* __hpux */
 #endif /* _PKGSRC_RESOLV_H_ */
diff -r d7d31da9adb6 -r f9692e0496ce pkgtools/posix_headers/files/stdlib.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/posix_headers/files/stdlib.h     Sat Apr 28 21:03:56 2007 +0000
@@ -0,0 +1,26 @@
+/* $NetBSD: stdlib.h,v 1.1 2007/04/28 21:03:56 tnn Exp $ */
+#ifndef _PKGSRC_STDLIB_H_
+#define _PKGSRC_STDLIB_H_
+#include "@REAL_HEADER@"
+#ifdef __hpux
+/* What were they thinking? */
+#include <inttypes.h>
+#define strtoll __strtoll
+#define strtoull __strtoull
+#include <string.h>
+#include <stdio.h>
+/* provide a setenv(3) implementation */
+static __inline int setenv(const char *name, const char *value, int overwrite);
+static __inline int setenv(const char *name, const char *value, int overwrite) {
+       char *c;
+       int ret;
+       if (!overwrite && getenv(name)) return(-1);
+       c = malloc(strlen(name)+strlen(value)+2);
+       if(!c) return(-1);
+       sprintf(c, "%s=%s", name, value);
+       ret = putenv(c);
+       free(c);
+       return(ret);
+}
+#endif /* __hpux */
+#endif /* _PKGSRC_STDLIB_H_ */



Home | Main Index | Thread Index | Old Index