pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/graphviz graphviz: fix build error on FreeBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/909f67b98124
branches:  trunk
changeset: 441322:909f67b98124
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Sun Nov 01 13:36:36 2020 +0000

description:
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.

diffstat:

 graphics/graphviz/Makefile |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r ed92a284c2d8 -r 909f67b98124 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Sun Nov 01 13:30:22 2020 +0000
+++ b/graphics/graphviz/Makefile        Sun Nov 01 13:36:36 2020 +0000
@@ -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_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_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



Home | Main Index | Thread Index | Old Index