From cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 23 May 2019 19:22:54 +0000 Subject: all: replace SUBST_SED with the simpler SUBST_VARS pkglint -Wall -r --only "substitution command" -F With manual review and indentation fixes since pkglint doesn't get that part correct in every case. --- graphics/camlimages/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'graphics/camlimages') diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index ffbad9fdd97..31bb25ce644 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.117 2019/05/05 22:49:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.118 2019/05/23 19:23:01 rillig Exp $ VERSION= 4.0.1 PKGNAME= camlimages-${VERSION} @@ -23,9 +23,9 @@ WRKSRC= ${WRKDIR}/camlspotter-camlimages-v${VERSION} SUBST_CLASSES+= omf SUBST_STAGE.omf= pre-configure SUBST_FILES.omf= OMakefile -SUBST_SED.omf= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.omf+= -e 's,@X11BASE@,${X11BASE},g' -SUBST_SED.omf+= -e s%@LDFLAGS@%${LDFLAGS:Q}%g +SUBST_VARS.omf= PREFIX +SUBST_VARS.omf+= X11BASE +SUBST_VARS.omf+= LDFLAGS SUBST_SED.omf+= -e 's,@OCAMLFIND_DESTDIR@,${DESTDIR}${PREFIX}/lib/ocaml/site-lib,g' SUBST_SED.omf+= -e 's,@OCAMLFIND_LDCONF@,/dev/null,g' SUBST_MESSAGE.omf= Fixing vars in OMakefile -- cgit v1.2.3