- Update to 1.29

Changes:

  * Fixed bug with handling of priorities and associativity (thanx Sjoerd Cranen)
  * Fixed a bug in error recovery.
  * Fixed a slash escapes in string literals (thanx Sjoerd Cranen)
  * Fixed bug with actions containing commments containing '
  * Python 2.6+ support (thanx to jonas@lophus.org)

- Trim Makefile header
- Convert to OptionsNG
This commit is contained in:
Pietro Cerutti 2013-01-23 16:49:23 +00:00
parent a3d8fd32c4
commit 8c0ebdb48c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=310882
3 changed files with 30 additions and 42 deletions

View file

@ -1,13 +1,8 @@
# ex:ts=8
# Ports collection makefile for: dparser
# Date created: Nov 11, 2003
# Whom: ijliao
#
# Created by: ijliao
# $FreeBSD$
#
PORTNAME= dparser
PORTVERSION= 1.26
PORTVERSION= 1.29
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/
DISTNAME= d-${PORTVERSION}-src
@ -15,17 +10,23 @@ DISTNAME= d-${PORTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
COMMENT= A simple but powerful tool for parsing
OPTIONS_DEFINE= BOEHM DOCS
BOEHM_DESC= Boehm garbage collector support
WRKSRC= ${WRKDIR}/d
EXTRACT_AFTER_ARGS= |${TAR} -xf - --exclude "*my*"
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}" D_OPTIMIZE=
MAKE_ARGS= CC="${CC}" D_OPTIMIZE= PREFIX=${PREFIX}
MAN1= make_dparser.1
PORTDOCS= faq.html index.html manual.html
PORTDOCS= *
PLIST_FILES= bin/make_dparser include/dparse.h include/dparse_tables.h \
include/dparse_tree.h include/dsymtab.h lib/${LIBDPARSE}
.if defined(WITH_GC)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBOEHM}
LIB_DEPENDS+= gc:${PORTSDIR}/devel/boehm-gc
MAKE_ARGS+= D_USE_GC=1 \
GC_CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
@ -34,8 +35,6 @@ LIBDPARSE= libdparse_gc.a
LIBDPARSE= libdparse.a
.endif
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64"
BROKEN= Does not build on ia64
.endif
@ -48,9 +47,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/dparse_tree.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/dsymtab.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/${LIBDPARSE} ${PREFIX}/lib
.if !defined(NOPORTDOCS)
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (d-1.26-src.tar.gz) = c5797cbb92f44ee3ef529b3268bf5c519bd6c72bf80df5aea5a564746df42718
SIZE (d-1.26-src.tar.gz) = 185893
SHA256 (d-1.29-src.tar.gz) = 40cf36871324eac96b710cb4db27bd075099a5da2c9dcdcfc0fcf9dcdf2beb14
SIZE (d-1.29-src.tar.gz) = 239082

View file

@ -1,7 +1,7 @@
--- Makefile.orig 2010-12-23 19:00:21.000000000 +0000
+++ Makefile 2010-12-23 19:01:59.000000000 +0000
--- Makefile.orig 2013-01-23 03:56:43.000000000 +0100
+++ Makefile 2013-01-23 17:40:57.000000000 +0100
@@ -11,7 +11,7 @@
MINOR=26
MINOR=29
RELEASE=$(MAJOR).$(MINOR)
-CC = gcc
@ -18,32 +18,31 @@
CFLAGS += -fPIC
endif
@@ -64,14 +64,7 @@
@@ -64,10 +64,10 @@
CFLAGS += -DUSE_FREELISTS
endif
-D_BUILD_VERSION = $(shell svnversion .)
-ifeq ($(D_BUILD_VERSION),exported)
- D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
- ifeq ($(D_BUILD_VERSION),)
- D_BUILD_VERSION = $(shell cat D_BUILD_VERSION)
- endif
-D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
-ifeq ($(D_BUILD_VERSION),)
- D_BUILD_VERSION = $(shell cat D_BUILD_VERSION)
-endif
-CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
+CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"\"
+#D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
+#ifeq ($(D_BUILD_VERSION),)
+ D_BUILD_VERSION = $(shell cat BUILD_VERSION)
+#endif
CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
CFLAGS += -Wall
# debug flags
@@ -99,7 +92,7 @@
@@ -96,7 +96,7 @@
PYTHON_FILES = d/python/Makefile d/python/*.py d/python/*.c d/python/*.h d/python/*.i d/python/README d/python/*.html d/python/contrib/d* d/python/tests/*.py
VERILOG_FILES = d/verilog/Makefile d/verilog/verilog.g d/verilog/README d/verilog/ambig.c \
d/verilog/main.c d/verilog/vparse.c d/verilog/vparse.h d/verilog/verilog_tests
-TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) d/BUILD_VERSION \
+TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) \
+TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) \
d/grammar.g d/sample.g d/my.g
LIB_SRCS = arg.c parse.c scan.c symtab.c util.c read_binary.c dparse_tree.c
@@ -146,7 +139,7 @@
@@ -143,7 +143,7 @@
ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS)
@ -52,13 +51,3 @@
version:
echo $(OS_TYPE) $(OS_VERSION)
@@ -205,9 +198,6 @@
nroff -man make_dparser.1 | sed -e 's/.//g' > make_dparser.cat
build_version:
- rm -f BUILD_VERSION.tmp
- echo $(D_BUILD_VERSION) > BUILD_VERSION.tmp
- mv BUILD_VERSION.tmp BUILD_VERSION
tar:
(cd ..;tar czf d-$(RELEASE)-src.tar.gz d/*.c d/*.h $(TAR_FILES))