On Wed, Apr 28, 2021 at 07:21:44PM -0600, Todd C. Miller wrote: > Another port I'd like to update needs a newer version of bison that > we provide so I've updated to the lastest version.
The bison update broke the build of graphics/cfdg on sparc64 and thus likely on all other base-gcc arches. The first build failure is here (it uses bison 3.7.6): http://build-failures.rhaalovely.net/sparc64/2021-05-17/graphics/cfdg.log Here's an update to the latest version. This builds on amd64 and sparc64 and some basic tests show that it works. All regress tests pass on both architectures. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/cfdg/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 12 Jul 2019 20:46:57 -0000 1.22 +++ Makefile 6 Jun 2021 19:47:03 -0000 @@ -2,7 +2,7 @@ COMMENT = Context Free Design Grammar -VERSION = 3.0.11 +VERSION = 3.3 DISTNAME = ContextFreeSource${VERSION} PKGNAME = cfdg-${VERSION} @@ -16,11 +16,12 @@ PERMIT_PACKAGE = Yes MASTER_SITES = https://www.contextfreeart.org/download/ EXTRACT_SUFX = .tgz -WANTLIB += ${COMPILER_LIBCXX} c m png z +WANTLIB += ${COMPILER_LIBCXX} c icudata icui18n icuuc m png BUILD_DEPENDS = devel/bison -LIB_DEPENDS = graphics/png +LIB_DEPENDS = graphics/png \ + textproc/icu4c COMPILER = base-clang ports-gcc Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/cfdg/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 27 Apr 2018 14:59:43 -0000 1.6 +++ distinfo 6 Jun 2021 19:06:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (ContextFreeSource3.0.11.tgz) = RmDRxdufQtMeCVVz1nAoJ925yn+X7DBNY6NpTx/knR4= -SIZE (ContextFreeSource3.0.11.tgz) = 3007073 +SHA256 (ContextFreeSource3.3.tgz) = vVHcxeoqevA5GNfiKZKzwVCP1JtS73WZqxrWjq5ns+A= +SIZE (ContextFreeSource3.3.tgz) = 4037507 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/graphics/cfdg/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile --- patches/patch-Makefile 27 Apr 2018 14:59:43 -0000 1.5 +++ patches/patch-Makefile 6 Jun 2021 19:13:27 -0000 @@ -2,41 +2,43 @@ $OpenBSD: patch-Makefile,v 1.5 2018/04/2 Index: Makefile --- Makefile.orig +++ Makefile -@@ -18,13 +18,13 @@ SRC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $( - vpath %.cpp $(SRC_DIRS) +@@ -19,7 +19,7 @@ vpath %.cpp $(SRC_DIRS) + vpath %.cfdg input - INC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(AGG_DIR)/include $(COMMON_DIR)/agg-extras $(FFMPEG_DIR)/include + INC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(COMMON_DIR)/agg-extras -INC_DIRS += /usr/local/include +INC_DIRS += $(LOCALBASE)/include # + # Installation directories +@@ -34,7 +34,7 @@ MAN_DIR = $(DESTDIR)$(prefix)/share/man # Library directories for FFmpeg and libpng # --LIB_DIRS = $(FFMPEG_DIR)/lib /usr/local/lib -+LIB_DIRS = $(FFMPEG_DIR)/lib $(LOCALBASE)/lib +-LIB_DIRS = /usr/local/lib ++LIB_DIRS = $(LOCALBASE)/lib # # Sources and Objects -@@ -52,7 +52,11 @@ LIBS = png z m +@@ -75,7 +75,11 @@ LIBS = png m ifeq ($(shell uname -s), Darwin) - LIBS += c++ + LIBS += c++ icucore else -- LIBS += stdc++ +- LIBS += stdc++ atomic icui18n icuuc icudata + ifeq ($(shell uname -s), OpenBSD) -+ LIBS += $(LIBCXX) ++ LIBS += $(LIBCXX) icui18n icuuc icudata + else -+ LIBS += stdc++ ++ LIBS += stdc++ atomic icui18n icuuc icudata + endif endif # -@@ -143,7 +147,7 @@ test: cfdg +@@ -196,7 +200,7 @@ check: cfdg # - CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS)) --CPPFLAGS += -O3 -Wall -Wextra -march=native -Wno-parentheses -std=c++14 -+CPPFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14 - #CPPFLAGS += -g + CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS)) +-CXXFLAGS += -O2 -Wall -Wextra -march=native -Wno-parentheses -std=c++14 ++CXXFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14 + CXXFLAGS += -g -D_GLIBCXX_USE_C99_MATH=1 + CPPFLAGS += -DNDEBUG - # Add this for clang Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/cfdg/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 2 Dec 2015 18:20:27 -0000 1.4 +++ pkg/PLIST 6 Jun 2021 19:19:48 -0000 @@ -8,29 +8,50 @@ share/examples/cfdg/input/alphabet.cfdg share/examples/cfdg/input/chanukah.cfdg share/examples/cfdg/input/cilia.cfdg share/examples/cfdg/input/ciliasun.cfdg +share/examples/cfdg/input/ciliasun_v2.cfdg share/examples/cfdg/input/demo1.cfdg +share/examples/cfdg/input/demo1_v2.cfdg share/examples/cfdg/input/demo2.cfdg +share/examples/cfdg/input/demo2_v2.cfdg share/examples/cfdg/input/funky_flower.cfdg +share/examples/cfdg/input/funky_flower_v2.cfdg share/examples/cfdg/input/i_curves.cfdg +share/examples/cfdg/input/i_curves_v2.cfdg share/examples/cfdg/input/i_pix.cfdg +share/examples/cfdg/input/i_pix_v2.cfdg share/examples/cfdg/input/i_polygons.cfdg +share/examples/cfdg/input/i_polygons_v2.cfdg share/examples/cfdg/input/lesson.cfdg share/examples/cfdg/input/lesson2.cfdg +share/examples/cfdg/input/lesson2_v2.cfdg +share/examples/cfdg/input/lesson_v2.cfdg share/examples/cfdg/input/mtree.cfdg +share/examples/cfdg/input/mtree_v2.cfdg share/examples/cfdg/input/octopi.cfdg +share/examples/cfdg/input/octopi_v2.cfdg share/examples/cfdg/input/point.cfdg share/examples/cfdg/input/quadcity.cfdg +share/examples/cfdg/input/quadcity_v2.cfdg share/examples/cfdg/input/rendering-tests.cfdg share/examples/cfdg/input/rose.cfdg +share/examples/cfdg/input/rose_v2.cfdg share/examples/cfdg/input/sierpinski.cfdg +share/examples/cfdg/input/sierpinski_v2.cfdg share/examples/cfdg/input/snowflake.cfdg +share/examples/cfdg/input/snowflake_v2.cfdg share/examples/cfdg/input/tangle.cfdg +share/examples/cfdg/input/tangle_v2.cfdg share/examples/cfdg/input/thingy.cfdg share/examples/cfdg/input/thorns.cfdg share/examples/cfdg/input/tree_number_5.cfdg share/examples/cfdg/input/triples.cfdg +share/examples/cfdg/input/triples_v2.cfdg share/examples/cfdg/input/underground.cfdg +share/examples/cfdg/input/underground_v2.cfdg share/examples/cfdg/input/weighting_demo.cfdg +share/examples/cfdg/input/weighting_demo_v2.cfdg share/examples/cfdg/input/welcome.cfdg +share/examples/cfdg/input/welcome_v2.cfdg share/examples/cfdg/input/xmas.cfdg share/examples/cfdg/input/ziggy.cfdg +share/examples/cfdg/input/ziggy_v2.cfdg
