Date: Tue, 28 Nov 2006 21:31:14 -0800 (PST) From: "Eric P. Scott" <eps+pbug0611@ana.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105985: graphics/icoutils: fix compilation problems Message-ID: <200611290531.kAT5VEol005269@anna.ana.com> Resent-Message-ID: <200611290710.kAT7AQhK092494@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105985 >Category: ports >Synopsis: graphics/icoutils: fix compilation problems >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Nov 29 07:10:25 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Eric P. Scott >Release: FreeBSD 4.11-SECURITY i386 >Organization: ana-systems, Inc. >Environment: System: FreeBSD fourever 4.11-SECURITY FreeBSD 4.11-SECURITY #0: Tue Feb 28 16:06:29 GMT 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: icoutils fails to build on FreeBSD 4.x >How-To-Repeat: See http://pointyhat.freebsd.org/errorlogs/ >Fix: Back out Makefile version 1.7 changes and apply REINPLACE only where needed; add missing USE_GETOPT_LONG; correct blatant errors in lib/stdint_.h and resolve conflicts with config.h 1. Add as files/patch-stdint_.h: ------- --- lib/stdint_.h.orig Thu Mar 17 10:31:11 2005 +++ lib/stdint_.h @@ -126,6 +126,7 @@ /* 7.18.1.5. Greatest-width integer types */ +#undef intmax_t #if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ typedef int64_t intmax_t; typedef uint64_t uintmax_t; @@ -150,11 +151,11 @@ #define INT32_MAX 2147483647 #define UINT32_MAX 4294967295U #if @HAVE_LONG_64BIT@ -#define INT64_MIN (~INT64_MIN) +#define INT64_MIN (~INT64_MAX) #define INT64_MAX 9223372036854775807L #define UINT64_MAX 18446744073709551615UL #elif @HAVE_LONG_LONG_64BIT@ -#define INT64_MIN (~INT64_MIN) +#define INT64_MIN (~INT64_MAX) #define INT64_MAX 9223372036854775807LL #define UINT64_MAX 18446744073709551615ULL #endif @@ -220,7 +221,9 @@ #define SIG_ATOMIC_MIN 0 #define SIG_ATOMIC_MAX 127 +#ifndef SIZE_MAX #define SIZE_MAX (~(size_t)0) +#endif /* wchar_t limits already defined in <stddef.h>. */ /* wint_t limits already defined in <wchar.h>. */ ------- 2. Changes to Makefile: ------- --- Makefile.orig Sun May 7 16:46:08 2006 +++ Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +USE_GETOPT_LONG= yes USE_GETTEXT= yes USE_PERL5_RUN= yes GNU_CONFIGURE= yes @@ -33,10 +34,9 @@ bin/wrestool post-patch: - @${FIND} ${WRKSRC} -type f -print0 | \ + @${FIND} ${WRKSRC}/extresso -type f -print0 | \ ${XARGS} -0 -x -n 10 \ ${REINPLACE_CMD} -E \ - -e 's|stdint\.h|inttypes\.h|g' \ -e 's|/usr/bin/perl|${PERL5}|' .include <bsd.port.pre.mk> ------- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611290531.kAT5VEol005269>