CVS commit: pkgsrc/graphics/graphviz

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Nov  1 13:36:36 UTC 2020

Modified Files:
        pkgsrc/graphics/graphviz: Makefile

Log Message:
graphviz: fix build error on FreeBSD

pkgsrc changes:
---------------
  * The fix comes from the FreeBSD port. It does not seem to be necessary
    to report the problem upstream because the incriminated file
    (sfclrlock.c) no longer exists in their master branch.


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 pkgsrc/graphics/graphviz/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.222 pkgsrc/graphics/graphviz/Makefile:1.223
--- pkgsrc/graphics/graphviz/Makefile:1.222     Wed Sep  2 03:23:10 2020
+++ pkgsrc/graphics/graphviz/Makefile   Sun Nov  1 13:36:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2020/09/02 03:23:10 gutteridge Exp $
+# $NetBSD: Makefile,v 1.223 2020/11/01 13:36:36 triaxx Exp $
 
 DISTNAME=      graphviz-2.44.1
 PKGREVISION=   3
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+=      --without-qt
 CONFIGURE_ENV+=                ac_cv_prog_PHP=
 CONFIGURE_ENV+=                ac_cv_prog_RUBY=
 CPPFLAGS+=             -DNO_POSTSCRIPT_ALIAS=1
+
 PKGCONFIG_OVERRIDE+=   lib/cdt/libcdt.pc.in
 PKGCONFIG_OVERRIDE+=   lib/cgraph/libcgraph.pc.in
 PKGCONFIG_OVERRIDE+=   lib/edgepaint/liblab_gamut.pc.in
@@ -62,11 +63,22 @@ REPLACE_FILES.tclsh=        tclpkg/gv/demo/modg
 REPLACE_PERL+=         tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
                        contrib/dirgraph/dirgraph.pl
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-2*)
 BUILDLINK_TRANSFORM+=  rm:-Wno-unused-parameter
 .endif
 
+.if ${OPSYS} == "FreeBSD"
+SUBST_CLASSES+=                sfflags
+SUBST_STAGE.sfflags=   pre-configure
+SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD.
+SUBST_FILES.sfflags=   lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h
+SUBST_FILES.sfflags+=  lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c
+SUBST_SED.sfflags=     -e 's|SF_FLAGS|SFIO_FLAGS|g'
+.endif
+
 # Prevent another config.status run.
 pre-build:
        touch ${WRKSRC}/Makefile ${WRKSRC}/graphviz_version.h