Date: Mon, 7 Aug 2006 07:17:20 GMT From: Mark Starovoytov <mark_sf@kikg.ifmo.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/101555: Update port: mail/libsieve Fix compilation on 4.x Message-ID: <200608070717.k777HKjt033818@www.freebsd.org> Resent-Message-ID: <200608070720.k777KF16093952@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101555 >Category: ports >Synopsis: Update port: mail/libsieve Fix compilation on 4.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 07 07:20:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Mark Starovoytov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD relay.rubinrelax.spb.ru 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed Aug 2 15:42:10 UTC 2006 root@:/usr/obj/usr/src/sys/2828_60_03 i386 >Description: Patch to fix the compilation of mail/libsieve port on FreeBSD 4.x >How-To-Repeat: >Fix: --- libsieve-2.1.13_1.diff begins here --- diff -urN mail-libsieve.orig/Makefile mail-libsieve/Makefile --- mail-libsieve.orig/Makefile Mon Aug 7 10:07:24 2006 +++ mail-libsieve/Makefile Mon Aug 7 10:55:24 2006 @@ -1,12 +1,13 @@ # New ports collection makefile for: libsieve -# Date created: 4 August 2006 -# Whom: Mark Starovoytov <mark_sf@kikg.ifmo.ru> +# Date created: 4 August 2006 +# Whom: Mark Starovoytov <mark_sf@kikg.ifmo.ru> # -# $FreeBSD: ports/mail/libsieve/Makefile,v 1.1 2006/08/05 22:21:37 edwin Exp $ +# $FreeBSD$ # PORTNAME= libsieve PORTVERSION= 2.1.13 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= libsieve @@ -22,5 +23,7 @@ BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src USE_LDCONFIG= yes +# get rid of the `size_t' problem in header.y +USE_GCC= 3.2+ .include <bsd.port.mk> diff -urN mail-libsieve.orig/files/patch-aa mail-libsieve/files/patch-aa --- mail-libsieve.orig/files/patch-aa Thu Jan 1 00:00:00 1970 +++ mail-libsieve/files/patch-aa Mon Aug 7 10:49:26 2006 @@ -0,0 +1,47 @@ +--- src/sv_interface/tree.h.orig Tue Jul 18 17:17:23 2006 ++++ src/sv_interface/tree.h Mon Aug 7 10:11:05 2006 +@@ -30,7 +30,7 @@ + + #include "comparator.h" + +-//#include <sys/types.h> ++#include <sys/types.h> + #include "regex.h" + + +--- src/sv_parser/comparator.h Tue Jul 18 17:15:16 2006 ++++ src/sv_parser/comparator.h Mon Aug 7 10:05:29 2006 +@@ -27,6 +27,8 @@ + #ifndef COMPARATOR_H + #define COMPARATOR_H + ++// sys/types.h was required prior to the FreeBSD 5.0 ++#include <sys/types.h> + #include "regex.h" + + /* compares pat to text; returns 1 if it's true, 0 otherwise +--- src/sv_parser/sieve.y.orig Mon Jul 24 14:24:53 2006 ++++ src/sv_parser/sieve.y Mon Aug 7 10:28:04 2006 +@@ -36,6 +36,9 @@ + #include <ctype.h> + + /* sv_regex */ ++/* POSIX says that <sys/types.h> must be included (by the caller) before ++ <regex.h>. */ ++#include <sys/types.h> + #include "regex.h" + + /* sv_parser */ +--- src/sv_util/xsize.h.orig Tue Jul 18 17:15:16 2006 ++++ src/sv_util/xsize.h Mon Aug 7 10:47:36 2006 +@@ -26,6 +26,10 @@ + #include <limits.h> + #if HAVE_STDINT_H + # include <stdint.h> ++#else ++// stdint.h was introduced in FreeBSD 5.0 ++// limits.h in 4.0 has SIZE_T_MAX, not SIZE_MAX ++# define SIZE_MAX SIZE_T_MAX + #endif + + /* The size of memory objects is often computed through expressions of --- libsieve-2.1.13_1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608070717.k777HKjt033818>