devel/dparser: update to 1.31
This commit is contained in:
parent
f757a6ba8b
commit
9cf358159e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=492787
4 changed files with 48 additions and 28 deletions
|
@ -2,11 +2,9 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= dparser
|
||||
PORTVERSION= 1.30
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 1.31
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= SF/${PORTNAME}/
|
||||
DISTNAME= d-${PORTVERSION}-src
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Simple but powerful tool for parsing
|
||||
|
@ -14,10 +12,12 @@ COMMENT= Simple but powerful tool for parsing
|
|||
LICENSE= BSD3CLAUSE
|
||||
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
|
||||
|
||||
WRKSRC= ${WRKDIR}/d
|
||||
USES= gmake
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= jplevyak
|
||||
|
||||
EXTRACT_AFTER_ARGS= --exclude "*my*"
|
||||
USES= gmake
|
||||
MAKE_ARGS= CC="${CC}" D_OPTIMIZE= PREFIX=${PREFIX}
|
||||
|
||||
PORTDOCS= *
|
||||
|
@ -29,11 +29,15 @@ OPTIONS_DEFINE= BOEHM DOCS
|
|||
BOEHM_DESC= Boehm garbage collector support
|
||||
|
||||
BOEHM_LIB_DEPENDS= libgc.so:devel/boehm-gc
|
||||
BOEHM_MAKE_ARGS= D_USE_GC=1 \
|
||||
GC_CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
|
||||
BOEHM_MAKE_ARGS= D_USE_GC=1 LOCALBASE=${LOCALBASE}
|
||||
BOEHM_VARS= LIBDPARSE=libdparse_gc.a
|
||||
BOEHM_VARS_OFF= LIBDPARSE=libdparse.a
|
||||
|
||||
TEST_TARGET= test
|
||||
|
||||
post-patch:
|
||||
@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/D_BUILD_VERSION
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/make_dparser ${STAGEDIR}${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/make_dparser.1 ${STAGEDIR}${PREFIX}/man/man1
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
SHA256 (d-1.30-src.tar.gz) = 4c4a61bd5954d75da89cbcfe8f6aac3a113769939b31ce2bf4b20b7b3a31cdd8
|
||||
SIZE (d-1.30-src.tar.gz) = 239510
|
||||
TIMESTAMP = 1549984176
|
||||
SHA256 (jplevyak-dparser-v1.31_GH0.tar.gz) = 8fed643095893396ef5f88eaa70497a42585fe8ded0349085fd0abafafe4aee2
|
||||
SIZE (jplevyak-dparser-v1.31_GH0.tar.gz) = 190612
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- Makefile.orig 2013-03-02 21:22:20 UTC
|
||||
--- Makefile.orig 2019-01-10 00:20:05 UTC
|
||||
+++ Makefile
|
||||
@@ -11,7 +11,7 @@ MAJOR=1
|
||||
MINOR=30
|
||||
MINOR=31
|
||||
RELEASE=$(MAJOR).$(MINOR)
|
||||
|
||||
-CC = gcc
|
||||
|
@ -9,7 +9,7 @@
|
|||
|
||||
ifndef PREFIX
|
||||
PREFIX=/usr/local
|
||||
@@ -38,7 +38,7 @@ ifeq ($(ARCH),i686)
|
||||
@@ -38,18 +38,21 @@ ifeq ($(ARCH),i686)
|
||||
ARCH = x86
|
||||
endif
|
||||
|
||||
|
@ -18,7 +18,22 @@
|
|||
CFLAGS += -fPIC
|
||||
endif
|
||||
|
||||
@@ -64,10 +64,10 @@ ifdef D_USE_FREELISTS
|
||||
ifeq ($(OS_TYPE),CYGWIN)
|
||||
GC_CFLAGS += -L/usr/local/lib
|
||||
else
|
||||
-GC_CFLAGS += -I/usr/local/include -L/usr/local/lib
|
||||
+GC_CFLAGS += -I/usr/local/include
|
||||
endif
|
||||
|
||||
ifdef D_USE_GC
|
||||
CFLAGS += -DUSE_GC ${GC_CFLAGS}
|
||||
+ifeq ($(OS_TYPE),FreeBSD)
|
||||
+ LIBS += -L${LOCALBASE}/lib
|
||||
+endif
|
||||
LIBS += -lgc
|
||||
ifeq ($(OS_TYPE),Linux)
|
||||
LIBS += -ldl
|
||||
@@ -64,10 +67,10 @@ ifdef D_USE_FREELISTS
|
||||
CFLAGS += -DUSE_FREELISTS
|
||||
endif
|
||||
|
||||
|
@ -32,16 +47,7 @@
|
|||
CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
|
||||
|
||||
CFLAGS += -Wall
|
||||
@@ -94,7 +94,7 @@ TEST_FILES = d/parser_tests d/baseline $
|
||||
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/D_BUILD_VERSION \
|
||||
+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
|
||||
@@ -141,7 +141,7 @@ endif
|
||||
@@ -143,7 +146,7 @@ endif
|
||||
|
||||
ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS)
|
||||
|
||||
|
|
|
@ -1,11 +1,20 @@
|
|||
--- arg.c.orig 2013-01-23 02:14:58 UTC
|
||||
--- arg.c.orig 2019-01-10 00:20:05 UTC
|
||||
+++ arg.c
|
||||
@@ -40,7 +40,7 @@ process_arg(ArgumentState *arg_state, in
|
||||
@@ -31,7 +31,7 @@ void process_arg(ArgumentState *arg_state, int i, char
|
||||
*(double *)desc[i].location = atof(arg);
|
||||
break;
|
||||
case 'L':
|
||||
- *(int64 *)desc[i].location = atoll(arg);
|
||||
+ *(int64 *)desc[i].location = strtoll(arg,NULL,10);
|
||||
break;
|
||||
case 'S': strncpy((char *)desc[i].location,arg, atoi(desc[i].type+1));
|
||||
break;
|
||||
case 'S':
|
||||
strncpy((char *)desc[i].location, arg, atoi(desc[i].type + 1));
|
||||
@@ -143,7 +143,7 @@ void usage(ArgumentState *arg_state, char *arg_unused)
|
||||
#if defined(__alpha)
|
||||
" %-9ld",
|
||||
#else
|
||||
-#if defined(FreeBSD)
|
||||
+#if defined(__FreeBSD__)
|
||||
" %-9qd",
|
||||
#else
|
||||
" %-9" PRId64,
|
||||
|
|
Loading…
Reference in a new issue