From owner-svn-ports-head@freebsd.org Thu Mar 3 12:26:18 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24F2C764E; Thu, 3 Mar 2016 12:26:18 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD5DC3E3; Thu, 3 Mar 2016 12:26:17 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u23CQGu3032871; Thu, 3 Mar 2016 12:26:16 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23CQGAI032869; Thu, 3 Mar 2016 12:26:16 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201603031226.u23CQGAI032869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 3 Mar 2016 12:26:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410035 - in head/graphics/giflib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2016 12:26:18 -0000 Author: marino Date: Thu Mar 3 12:26:16 2016 New Revision: 410035 URL: https://svnweb.freebsd.org/changeset/ports/410035 Log: graphics/giflib: Unbreak DF (reallocarray) OSVERSION was used without OPSYS, but it turns out that DragonFly needs a dedicated extra patch due to having a different name for the cdefs macro. Approved by: blankets (restore working DF port/non-invasive DF support) Added: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (contents, props changed) Modified: head/graphics/giflib/Makefile Modified: head/graphics/giflib/Makefile ============================================================================== --- head/graphics/giflib/Makefile Thu Mar 3 12:09:26 2016 (r410034) +++ head/graphics/giflib/Makefile Thu Mar 3 12:26:16 2016 (r410035) @@ -30,10 +30,14 @@ BUILD_DEPENDS+= xmlto:${PORTSDIR}/textpr CONFIGURE_ENV+= have_xmlto=no .endif -.if ${OSVERSION} >= 1100072 +.if ${OPSYS} == FreeBSD +. if ${OSVERSION} >= 1100072 EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray -.else +. else EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray +. endif +.elif ${OPSYS} == DragonFly +EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray-dfly .endif post-install: Added: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly Thu Mar 3 12:26:16 2016 (r410035) @@ -0,0 +1,24 @@ +--- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC ++++ lib/dgif_lib.c +@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy + static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, + GifByteType *NextByte); + ++extern void * ++reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; ++ + /****************************************************************************** + Open a new GIF file for read, given by its name. + Returns dynamically allocated GifFileType pointer which serves as the GIF +--- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC ++++ lib/gifalloc.c +@@ -12,6 +12,9 @@ + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + ++extern void * ++reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; ++ + /****************************************************************************** + Miscellaneous utility functions + ******************************************************************************/