On 04/27/18 06:46, Klemens Nanni wrote:
Can you please use spaces or tabs consistently in WANTLIB (and squash
both lines into one)?
Further comments inline.
On Wed, Apr 25, 2018 at 05:05:05PM -0400, Brian Callahan wrote:
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/cfdg/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 16 Nov 2017 23:20:38 -0000 1.20
+++ Makefile 25 Apr 2018 21:03:43 -0000
@@ -2,17 +2,14 @@
COMMENT = Context Free Design Grammar
-VERSION = 3.0.9
+VERSION = 3.0.11
DISTNAME = ContextFreeSource${VERSION}
PKGNAME = cfdg-${VERSION}
-REVISION = 0
CATEGORIES = graphics
HOMEPAGE = http://www.contextfreeart.org/
Has TLS, so does MASTER_SITES.
-MAINTAINER = jared r r spiegel <j...@ice-nine.org>
-
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -30,7 +27,8 @@ COMPILER = base-clang ports-gcc
USE_GMAKE = Yes
-WRKDIST = ${WRKDIR}/context-free-${VERSION}
+# 3.0.11 is a bad tarball...
+WRKDIST = ${WRKDIR}
MAKE_ENV += CPPFLAGS="${CFLAGS}"
MAKE_FLAGS = CXX=c++ CC=c++ COMPILER_LIBCXX="${LIBCXX}"
Why is c++ hardcoded here?
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/cfdg/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Dec 2015 08:16:15 -0000 1.5
+++ distinfo 25 Apr 2018 21:03:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (ContextFreeSource3.0.9.tgz) =
VALtqBZuPQQnpodIeEANs02qJA1fuEoAFYrEbL6NF8s=
-SIZE (ContextFreeSource3.0.9.tgz) = 8072254
+SHA256 (ContextFreeSource3.0.11.tgz) =
RmDRxdufQtMeCVVz1nAoJ925yn+X7DBNY6NpTx/knR4=
+SIZE (ContextFreeSource3.0.11.tgz) = 3007073
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/cfdg/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 2 May 2017 15:39:54 -0000 1.4
+++ patches/patch-Makefile 25 Apr 2018 21:03:43 -0000
@@ -35,8 +35,8 @@ Index: Makefile
#
CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
--CPPFLAGS += -O3 -Wall -march=native -Wno-parentheses -std=c++0x
-+CPPFLAGS += -Wall -Wno-parentheses -std=c++0x
+-CPPFLAGS += -O3 -Wall -Wextra -march=native -Wno-parentheses -std=c++14
++CPPFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14
#CPPFLAGS += -g
# Add this for clang
Index: patches/patch-runtests_sh
===================================================================
RCS file: patches/patch-runtests_sh
diff -N patches/patch-runtests_sh
--- patches/patch-runtests_sh 1 Dec 2015 08:16:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-runtests_sh,v 1.1 2015/12/01 08:16:16 jasper Exp $
-
-https://github.com/MtnViewJohn/context-free/pull/5
-
---- runtests.sh.orig Wed Nov 25 09:55:19 2015
-+++ runtests.sh Wed Nov 25 09:55:24 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- mkdir output
- for file in input/tests/*.cfdg input/*.cfdg ; do echo -n "$file "; if ./cfdg -Pq
"$file" output/test.png ; then echo ' pass' ; : ; else echo ' FAIL' ; break;
fi ; done
Updated diff.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/cfdg/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 16 Nov 2017 23:20:38 -0000 1.20
+++ Makefile 27 Apr 2018 14:34:03 -0000
@@ -2,25 +2,21 @@
COMMENT = Context Free Design Grammar
-VERSION = 3.0.9
+VERSION = 3.0.11
DISTNAME = ContextFreeSource${VERSION}
PKGNAME = cfdg-${VERSION}
-REVISION = 0
CATEGORIES = graphics
-HOMEPAGE = http://www.contextfreeart.org/
-
-MAINTAINER = jared r r spiegel <j...@ice-nine.org>
+HOMEPAGE = https://www.contextfreeart.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://www.contextfreeart.org/download/
+MASTER_SITES = https://www.contextfreeart.org/download/
EXTRACT_SUFX = .tgz
-WANTLIB = c m png z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c m png z
BUILD_DEPENDS = devel/bison
@@ -30,10 +26,11 @@ COMPILER = base-clang ports-gcc
USE_GMAKE = Yes
-WRKDIST = ${WRKDIR}/context-free-${VERSION}
+# 3.0.11 is a bad tarball...
+WRKDIST = ${WRKDIR}
MAKE_ENV += CPPFLAGS="${CFLAGS}"
-MAKE_FLAGS = CXX=c++ CC=c++ COMPILER_LIBCXX="${LIBCXX}"
+MAKE_FLAGS = CXX="${CXX}" CC="${CXX}" COMPILER_LIBCXX="${LIBCXX}"
EXAMPLEDIR = ${PREFIX}/share/examples/cfdg
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/cfdg/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Dec 2015 08:16:15 -0000 1.5
+++ distinfo 27 Apr 2018 14:34:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (ContextFreeSource3.0.9.tgz) = VALtqBZuPQQnpodIeEANs02qJA1fuEoAFYrEbL6NF8s=
-SIZE (ContextFreeSource3.0.9.tgz) = 8072254
+SHA256 (ContextFreeSource3.0.11.tgz) = RmDRxdufQtMeCVVz1nAoJ925yn+X7DBNY6NpTx/knR4=
+SIZE (ContextFreeSource3.0.11.tgz) = 3007073
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/cfdg/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 2 May 2017 15:39:54 -0000 1.4
+++ patches/patch-Makefile 27 Apr 2018 14:34:03 -0000
@@ -35,8 +35,8 @@ Index: Makefile
#
CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
--CPPFLAGS += -O3 -Wall -march=native -Wno-parentheses -std=c++0x
-+CPPFLAGS += -Wall -Wno-parentheses -std=c++0x
+-CPPFLAGS += -O3 -Wall -Wextra -march=native -Wno-parentheses -std=c++14
++CPPFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14
#CPPFLAGS += -g
# Add this for clang
Index: patches/patch-runtests_sh
===================================================================
RCS file: patches/patch-runtests_sh
diff -N patches/patch-runtests_sh
--- patches/patch-runtests_sh 1 Dec 2015 08:16:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-runtests_sh,v 1.1 2015/12/01 08:16:16 jasper Exp $
-
-https://github.com/MtnViewJohn/context-free/pull/5
-
---- runtests.sh.orig Wed Nov 25 09:55:19 2015
-+++ runtests.sh Wed Nov 25 09:55:24 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- mkdir output
- for file in input/tests/*.cfdg input/*.cfdg ; do echo -n "$file "; if ./cfdg -Pq "$file" output/test.png ; then echo ' pass' ; : ; else echo ' FAIL' ; break; fi ; done
