head 1.5; access; symbols pkgsrc-2020Q3:1.4.0.40 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.36 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.16 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.38 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.34 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.32 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.30 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.28 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.26 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.24 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.22 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.20 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.18 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.14 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.12 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.10 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.8 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.6 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.4 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.2 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.3.0.54 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.52 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.50 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.48 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.46 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.44 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.42 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.40 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.38 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.36 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.34 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.32 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.30 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.28 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.26 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.24 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.22 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.20 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.18 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.16 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.14 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.12 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.10 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.8 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.6 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.4 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.2 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.1.1.1.0.18 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.16 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.14 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.12 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.10 pkgsrc-2008Q1:1.1.1.1.0.8 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.6 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.4 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.2 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2020.11.24.13.34.34; author nia; state dead; branches; next 1.4; commitid tFqmyOw6vdlgX8xC; 1.4 date 2015.09.30.16.39.45; author richard; state Exp; branches; next 1.3; commitid dNNb3tfkVtRmtiDy; 1.3 date 2009.03.26.17.14.32; author joerg; state Exp; branches; next 1.2; 1.2 date 2009.03.21.16.41.07; author darcy; state Exp; branches; next 1.1; 1.1 date 2007.05.24.16.23.23; author obache; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.05.24.16.23.23; author obache; state Exp; branches; next ; desc @@ 1.5 log @ucpp: Update to 1.3.5 Switched upstream to gitlab, now using autotools, build the library. @ text @$NetBSD: patch-aa,v 1.4 2015/09/30 16:39:45 richard Exp $ allow various flags and LIBS to be passed in --- Makefile.orig 2011-08-09 05:13:15.000000000 +0000 +++ Makefile @@@@ -56,8 +56,8 @@@@ #FLAGS = -O -m -DMEM_CHECK # for gcc -CC = gcc -FLAGS = -O3 -W -Wall -ansi +#CC = gcc +#FLAGS = -O3 -W -Wall -ansi #FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG #FLAGS = -O3 -mcpu=pentiumpro -fomit-frame-pointer -W -Wall -ansi -DMEM_CHECK #FLAGS = -O -pg -W -Wall -ansi -DMEM_CHECK @@@@ -80,15 +80,15 @@@@ LIBS = STAND_ALONE = -DSTAND_ALONE -ifdef STAND_ALONE - CSRC = mem.c nhash.c cpp.c lexer.c assert.c macro.c eval.c - FINAL_STEP = $(CC) $(LDFLAGS) -DUCPP_CONFIG $(STAND_ALONE) -o ucpp $(CSRC) $(LIBS) -endif +#ifdef STAND_ALONE +CSRC = mem.c nhash.c cpp.c lexer.c assert.c macro.c eval.c +FINAL_STEP = $(CC) $(LDFLAGS) -DUCPP_CONFIG $(STAND_ALONE) -o ucpp $(CSRC) $(LIBS) +#endif # ----- nothing should be changed below this line ----- COBJ = mem.o nhash.o cpp.o lexer.o assert.o macro.o eval.o -CFLAGS = $(FLAGS) +#CFLAGS = $(FLAGS) all: ucpp @@ar cq libucpp.a *.o @ 1.4 log @Update to ucpp-1.3.2 ucpp-1.3.2 * Fixed Issue 8, Included files missing a "terminating carriage return character" will interrupt preprocessing in sample.c/LEXER mode. (http://code.google.com/p/ucpp/issues/detail?id=8) ucpp-1.3.1 * Fixed Issue 5, "\r\n" carriage return characters are double counted. (http://code.google.com/p/ucpp/issues/detail?id=5) * Fixed Issue 6, Included files missing a "terminating carriage return character" will interrupt preprocessing in ucpp (STAND_ALONE mode). (http://code.google.com/p/ucpp/issues/detail?id=6) * Fixed Issue 7, STD_MACROS & STD_ASSERTS undefined when trying to build ucpp -DSTAND_ALONE. (http://code.google.com/p/ucpp/issues/detail?id=7) * Build ucpp & libucpp with 'make'. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Make ucpp actually buildable. @ text @d2 2 a3 2 --- Makefile.orig 2008-10-01 19:15:41.000000000 +0200 d5 2 a6 1 @@@@ -80,14 +80,10 @@@@ LIBS = d8 11 a18 1 #STAND_ALONE = -DSTAND_ALONE d21 2 a22 1 - FINAL_STEP = $(CC) $(LDFLAGS) -o ucpp $(COBJ) $(LIBS) d24 5 a28 1 - d32 2 a33 2 -CFLAGS = $(FLAGS) $(STAND_ALONE) +CFLAGS = $(FLAGS) -DSTAND_ALONE a36 9 @@@@ -96,7 +92,7 @@@@ clean: @@rm -f *.o ucpp core *.a ucpp: $(COBJ) - @@$(FINAL_STEP) + $(CC) $(LDFLAGS) -o ucpp $(COBJ) $(LIBS) assert.o: tune.h ucppi.h cpp.h nhash.h mem.h @@$(CC) $(CFLAGS) -c assert.c @ 1.2 log @Remove MAINTAINER at their request. Fixed up a few things so that it passes pkglint. @ text @d3 1 a3 1 --- Makefile.orig 2008-10-01 13:15:41.000000000 -0400 d5 1 a5 2 @@@@ -56,7 +56,7 @@@@ #FLAGS = -O -m -DMEM_CHECK d7 6 a12 7 # for gcc -CC = gcc +CC ?= gcc FLAGS = -O3 -W -Wall -ansi #FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG #FLAGS = -O3 -mcpu=pentiumpro -fomit-frame-pointer -W -Wall -ansi -DMEM_CHECK @@@@ -87,7 +87,7 @@@@ endif d17 1 a17 1 +CFLAGS += $(FLAGS) $(STAND_ALONE) d21 9 @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- Makefile.orig Wed Jan 15 02:07:44 2003 +++ Makefile Sun Jul 27 14:51:51 2003 @@@@ -56,8 +56,8 @@@@ a9 1 -FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG d11 2 a12 1 +FLAGS = -ansi -DAUDIT -DMEM_DEBUG d14 1 a14 3 #FLAGS = -O -pg -W -Wall -ansi -DMEM_CHECK #LDFLAGS = -pg @@@@ -80,7 +80,7 @@@@ d18 2 a19 2 -CFLAGS = $(FLAGS) -DSTAND_ALONE +CFLAGS += $(FLAGS) -DSTAND_ALONE d22 1 a22 1 @ 1.1.1.1 log @Import ucpp version 1.3. Based on PR 31480 by Jeroen Ruigrok van der Werven, fixed manual page installation path. ucpp is a C preprocessor and lexer. It has the following goals: - Strict conformance to the C99 standard (with switches to disable some extensions and mimic C90 behaviour) - Low memory consumption - Possibility to use the code as a lexer (that outputs tokens directly) @ text @@