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'.

4 files changed, 56 insertions, 27 deletions

diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index c1e71739637..bfed544d020 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/10/31 11:19:52 asau Exp $
+# $NetBSD: Makefile,v 1.8 2015/09/30 16:39:45 richard Exp $
 #
 
-DISTNAME=	ucpp-1.3
+DISTNAME=	ucpp-1.3.2
 CATEGORIES=	devel
 MASTER_SITES=	http://ucpp.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,13 +9,19 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ucpp/
 COMMENT=	C preprocessor and lexer
+LICENSE=	modified-bsd
 
+WRKSRC=	${WRKDIR}/${PKGBASE}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
-CFLAGS+=	-DSTD_MACROS=NULL -DSTD_ASSERT=NULL
-MAKE_FLAGS+=	FLAGS=${CFLAGS:Q}
+CFLAGS+=	-DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF
+SUBST_CLASSES+=	config
+SUBST_STAGE.config=	post-patch
+SUBST_FILES.config=	config.h
+# remove /usr/local/include from default path
+SUBST_SED.config=	-e 's|"/usr/local/include", ||'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ucpp ${DESTDIR}${PREFIX}/bin
diff --git a/devel/ucpp/distinfo b/devel/ucpp/distinfo
index 37d4afb3a07..a7736f01dcc 100644
--- a/devel/ucpp/distinfo
+++ b/devel/ucpp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/03/26 17:14:32 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/09/30 16:39:45 richard Exp $
 
-SHA1 (ucpp-1.3.tar.bz2) = 12caf535986e3919d58c47ca35ae9ed4efaa1cf0
-RMD160 (ucpp-1.3.tar.bz2) = 08f9ef1ada15c7451b7966733fb0a63bbe6b179a
-Size (ucpp-1.3.tar.bz2) = 73958 bytes
-SHA1 (patch-aa) = 120c4f63cbd44e6831c3ca8dee0bca885debd99d
+SHA1 (ucpp-1.3.2.tar.bz2) = ca24dec02352f8ac7261a85eb7a49f2c39c08268
+RMD160 (ucpp-1.3.2.tar.bz2) = 0658c5b730c602a0b1ee15fc717122e83a98f22d
+Size (ucpp-1.3.2.tar.bz2) = 75467 bytes
+SHA1 (patch-aa) = 72daeb194597d6b8aca952fcc3808f55932a6f79
+SHA1 (patch-cpp.c) = 542158a2e37bc71bc56a458bfe23cf70e91ace1d
diff --git a/devel/ucpp/patches/patch-aa b/devel/ucpp/patches/patch-aa
index 70b10af104c..2e42dc5caf5 100644
--- a/devel/ucpp/patches/patch-aa
+++ b/devel/ucpp/patches/patch-aa
@@ -1,29 +1,36 @@
-$NetBSD: patch-aa,v 1.3 2009/03/26 17:14:32 joerg Exp $
-
---- Makefile.orig	2008-10-01 19:15:41.000000000 +0200
+$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
-@@ -80,14 +80,10 @@ LIBS =
+@@ -56,8 +56,8 @@
+ #FLAGS = -O -m -DMEM_CHECK
  
- #STAND_ALONE = -DSTAND_ALONE
+ # 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
--	FINAL_STEP = $(CC) $(LDFLAGS) -o ucpp $(COBJ) $(LIBS)
+-	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) $(STAND_ALONE)
-+CFLAGS = $(FLAGS) -DSTAND_ALONE
+-CFLAGS = $(FLAGS)
++#CFLAGS = $(FLAGS)
  
  all: ucpp
  	@ar cq libucpp.a *.o
-@@ -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
diff --git a/devel/ucpp/patches/patch-cpp.c b/devel/ucpp/patches/patch-cpp.c
new file mode 100644
index 00000000000..390ece1208b
--- /dev/null
+++ b/devel/ucpp/patches/patch-cpp.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-cpp.c,v 1.1 2015/09/30 16:39:45 richard Exp $
+patch borrowed from libreoffice for more information in options processing.
+--- cpp.c.orig	2011-08-09 05:13:15.000000000 +0000
++++ cpp.c
+@@ -2464,7 +2464,9 @@ static int parse_opt(int argc, char *arg
+ 			warning(-1, "unknown option '%s'", argv[i]);
+ 	} else {
+ 		if (filename != 0) {
+-			error(-1, "spurious filename '%s'", argv[i]);
++			error(-1, "spurious duplicate filename '%s' - vs. '%s'",
++			    argv[i], filename);
++
+ 			return 2;
+ 		}
+ 		filename = argv[i];