Subject: Re: pkg/31952 postfix 2.2.5 does not build on 2.1-RELEASE
To: None <martti@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org>
From: Thomas Klausner <wiz@NetBSD.org>
List: pkgsrc-bugs
Date: 11/11/2005 07:15:04
The following reply was made to PR pkg/31952; it has been noted by GNATS.
From: Thomas Klausner <wiz@NetBSD.org>
To: Peter Eisch <peter@boku.net>
Cc: gnats-bugs@NetBSD.org
Subject: Re: pkg/31952 postfix 2.2.5 does not build on 2.1-RELEASE
Date: Fri, 11 Nov 2005 08:14:13 +0100
On Fri, Nov 11, 2005 at 04:04:01AM +0000, Peter Eisch wrote:
> It seems as though someone committed a change to Postfix that assumes that
> it's being built against -current or 3.x. Many of us, though, don't run
> -current in production but would like to use a pkgsrc version of postfix
> that includes sasl or tls.
>
> I am not yet a pkgsrc samurai, so I cannot provide an exact patch, but my
> stab at a solution would be to fix patch-ag to also include something like:
>
> --- src/util/sys_defs.h.orig 2005-07-11 15:00:38.000000000 -0500
> +++ src/util/sys_defs.h 2005-11-10 21:10:47.000000000 -0600
> @@ -50,7 +50,7 @@
> #endif
> #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
> #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
> -#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
> +#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 299000900)
> # define USE_STATVFS
> # define STATVFS_IN_SYS_STATVFS_H
> #else
> @@ -122,7 +122,7 @@
> #define SOCKOPT_SIZE socklen_t
> #endif
>
> -#if __NetBSD_Version__ >= 200060000 /* 2.0F */
> +#if __NetBSD_Version__ >= 299000900 /* 2.0F */
> #define HAS_CLOSEFROM
> #endif
patch-ag currently looks like this:
$NetBSD: patch-ag,v 1.16 2005/09/06 08:10:58 abs Exp $
--- src/util/sys_defs.h.orig 2005-02-04 02:07:44.000000000 +0200
+++ src/util/sys_defs.h 2005-04-04 20:55:05.000000000 +0300
@@ -157,5 +157,11 @@
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
+#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 *
/
+#define USE_STATVFS
+#define STATVFS_IN_SYS_STATVFS_H
+#else
#define USE_STATFS
#define STATFS_IN_SYS_MOUNT_H
+#endif
#define HAS_POSIX_REGEXP
So I wonder where you see this
#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
line.
Could you please update your pkgsrc?
Thomas