CVS commit: pkgsrc/graphics/freeimage

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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