Received: by mail.netbsd.org (Postfix, from userid 605) id 374B784EC2; Tue, 13 Dec 2022 13:34:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 68B8E84EC0 for ; Tue, 13 Dec 2022 13:34:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ieCdo6FWcsvT for ; Tue, 13 Dec 2022 13:34:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B254984D4B for ; Tue, 13 Dec 2022 13:34:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AB8CFFA90; Tue, 13 Dec 2022 13:34:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1670938488254620" MIME-Version: 1.0 Date: Tue, 13 Dec 2022 13:34:48 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/graphics/freeimage To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20221213133448.AB8CFFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1670938488254620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Dec 13 13:34:48 UTC 2022 Modified Files: pkgsrc/graphics/freeimage: Makefile.common Removed Files: pkgsrc/graphics/freeimage: hacks.mk Log Message: freeimage: Fix unzip problems. Move fix out of hacks.mk and generalise for all systems, the problem is that NetBSD unzip behaves differently to other implementations, which is why we end up with these problems. Also make it pkglint clean while here. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/freeimage/Makefile.common cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/freeimage/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1670938488254620 Content-Disposition: inline Content-Length: 1148 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/freeimage/Makefile.common diff -u pkgsrc/graphics/freeimage/Makefile.common:1.4 pkgsrc/graphics/freeimage/Makefile.common:1.5 --- pkgsrc/graphics/freeimage/Makefile.common:1.4 Tue Dec 13 13:31:11 2022 +++ pkgsrc/graphics/freeimage/Makefile.common Tue Dec 13 13:34:48 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2022/12/13 13:31:11 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.5 2022/12/13 13:34:48 jperkin Exp $ # used by graphics/freeimage/Makefile # used by graphics/freeimageplus/Makefile @@ -24,6 +24,16 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics INSTALLATION_DIRS+= include lib share/doc/${PKGBASE} +# Systems that use unzip from pkgsrc end up with DOS line endings, so +# we need to ensure files can be patched. +SUBST_CLASSES+= cr +SUBST_STAGE.cr= post-extract +SUBST_FILES.cr+= Source/FreeImage/PluginBMP.cpp +SUBST_FILES.cr+= Source/FreeImage/PluginDDS.cpp +SUBST_FILES.cr+= Source/FreeImage/PluginTIFF.cpp +SUBST_FILTER_CMD.cr= ${TR} -d '\r' +SUBST_NOOP_OK.cr= yes + pre-configure: # G3 and JPEGTransform can't be built, # due to using private headers in bundled libs --_----------=_1670938488254620--