summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2002-09-23 12:57:27 +0000
committerabs <abs@pkgsrc.org>2002-09-23 12:57:27 +0000
commit9eaafb28954c4d0e7941c119bbaa69dd738d1a96 (patch)
treea388554c9c4dbeefdb95405fd5623a397159e0db /pkgtools
parent6b3f43045b58fba86dcaebc84d81c101fdbdd869 (diff)
downloadpkgsrc-9eaafb28954c4d0e7941c119bbaa69dd738d1a96.tar.gz
If defining TAILQ_FIRST and TAILQ_NEXT ensure we also define
TAILQ_HEAD_INITIALIZER - required for linux build.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/distinfo4
-rw-r--r--pkgtools/pkg_install/patches/patch-ae25
2 files changed, 21 insertions, 8 deletions
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo
index 3d61d514c36..e3009d16cd9 100644
--- a/pkgtools/pkg_install/distinfo
+++ b/pkgtools/pkg_install/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2002/08/12 01:58:25 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2002/09/23 12:57:27 abs Exp $
SHA1 (pkg_install-20020723.tar.gz) = c16763363a8ff4341c866d50e40dfa2639288009
Size (pkg_install-20020723.tar.gz) = 81502 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3f0c9b4e8853341c696c02d3f68fe53eae59fbef
SHA1 (patch-ab) = 0b5effbb41b34f96877d3f9494d6cf5054795414
SHA1 (patch-ac) = fb24ffdc0fbf4ca85d588afcfac39a960b763706
SHA1 (patch-ad) = 8c34aeb2e0ed41d6a59e4d90a71ea7ea333a36f3
-SHA1 (patch-ae) = dc5ec1e5e6b5dfa670cd94cd198583c61a44f494
+SHA1 (patch-ae) = 1e9ca0cd01c27337fb7ad688b16775cea325d7e6
SHA1 (patch-af) = b1d9ce8d3c3e592a67db7ac9676a72317a1485c5
SHA1 (patch-ag) = e30435f0a626a893934c725c605486a145e27690
SHA1 (patch-ah) = ae0cee4e6f6efd740fc0d4288f8f71dd0039a913
diff --git a/pkgtools/pkg_install/patches/patch-ae b/pkgtools/pkg_install/patches/patch-ae
index 1fdf150980c..015d3f685e2 100644
--- a/pkgtools/pkg_install/patches/patch-ae
+++ b/pkgtools/pkg_install/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2002/08/06 11:51:02 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2002/09/23 12:57:27 abs Exp $
---- lib/lib.h.orig Thu Aug 1 10:46:31 2002
-+++ lib/lib.h
+--- lib/lib.h.orig Thu Aug 1 09:46:31 2002
++++ lib/lib.h Mon Sep 23 13:50:19 2002
@@ -40,6 +40,10 @@
#include "path.h"
@@ -13,14 +13,27 @@ $NetBSD: patch-ae,v 1.3 2002/08/06 11:51:02 wiz Exp $
/* Macros */
#define SUCCESS (0)
#define FAIL (-1)
-@@ -280,6 +284,10 @@
+@@ -109,10 +113,11 @@
+ #define PKG_PATTERN_MAX FILENAME_MAX /* max length of pattern, including nul */
+ #define PKG_SUFFIX_MAX 10 /* max length of suffix, including nul */
+-/* This should only happen on 1.3 and 1.3.1, not 1.3.2 and up */
++/* For NetBSD 1.3.1 and earlier, and some non NetBSD systems */
+ #ifndef TAILQ_FIRST
+ #define TAILQ_FIRST(head) ((head)->tqh_first)
+ #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
++#define TAILQ_HEAD_INITIALIZER(head) { NULL, &(head).tqh_first }
+ #endif
+
+
+@@ -281,6 +286,10 @@
/* For all */
int pkg_perform(lpkg_head_t *);
-+
+
+#ifdef FGETLN_MISSING
+char *fgetln(FILE *, size_t *);
+#endif
-
++
/* Externs */
extern Boolean Verbose;
+ extern Boolean Fake;