ucpp: Update to 1.3.5

Switched upstream to gitlab, now using autotools, build the library.

6 files changed, 36 insertions, 77 deletions

diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index bf3a66893eb..7224c847a12 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,29 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:31 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/24 13:34:34 nia Exp $
 
-DISTNAME=	ucpp-1.3.2
+DISTNAME=	ucpp-1.3.5
 CATEGORIES=	devel
-#MASTER_SITES=	http://ucpp.googlecode.com/files/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://gitlab.com/scarabeusiv/ucpp/uploads/79f08e39c676f15ed8a59335f6c9b924/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/lpsantil/ucpp
+HOMEPAGE=	https://gitlab.com/scarabeusiv/ucpp
 COMMENT=	C preprocessor and lexer
 LICENSE=	modified-bsd
 
-WRKSRC=	${WRKDIR}/${PKGBASE}
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=	--disable-werror
 
-CFLAGS+=		-DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF
-SUBST_CLASSES+=		config
-SUBST_STAGE.config=	pre-configure
-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
-	${INSTALL_MAN} ${WRKSRC}/ucpp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+PKGCONFIG_OVERRIDE+=	libucpp.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ucpp/PLIST b/devel/ucpp/PLIST
index dd932068ecf..1a1d0f2889e 100644
--- a/devel/ucpp/PLIST
+++ b/devel/ucpp/PLIST
@@ -1,3 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/24 16:23:23 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/24 13:34:34 nia Exp $
 bin/ucpp
+include/libucpp/cpp.h
+include/libucpp/hash.h
+include/libucpp/mem.h
+include/libucpp/nhash.h
+include/libucpp/tune.h
+include/libucpp/ucpp-config.h
+include/libucpp/ucppi.h
+lib/libucpp.la
+lib/pkgconfig/libucpp.pc
 man/man1/ucpp.1
diff --git a/devel/ucpp/buildlink3.mk b/devel/ucpp/buildlink3.mk
new file mode 100644
index 00000000000..9789ec5e420
--- /dev/null
+++ b/devel/ucpp/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2020/11/24 13:34:34 nia Exp $
+
+BUILDLINK_TREE+=	ucpp
+
+.if !defined(UCPP_BUILDLINK3_MK)
+UCPP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ucpp+=	ucpp>=1.3.5
+BUILDLINK_PKGSRCDIR.ucpp?=	../../devel/ucpp
+.endif	# UCPP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-ucpp
diff --git a/devel/ucpp/distinfo b/devel/ucpp/distinfo
index fcfdb1a6432..71fa499bbb2 100644
--- a/devel/ucpp/distinfo
+++ b/devel/ucpp/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:29:37 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/11/24 13:34:34 nia Exp $
 
-SHA1 (ucpp-1.3.2.tar.bz2) = ca24dec02352f8ac7261a85eb7a49f2c39c08268
-RMD160 (ucpp-1.3.2.tar.bz2) = 0658c5b730c602a0b1ee15fc717122e83a98f22d
-SHA512 (ucpp-1.3.2.tar.bz2) = a8a22162c0e26bc8281928f921f4e531108ba02658fd9c7a1760ae2fe938c910215aa4db02e5c7f0c5ea1aa66d89157bc780f2f13c57fa603de6c2d0c48cfd32
-Size (ucpp-1.3.2.tar.bz2) = 75467 bytes
-SHA1 (patch-aa) = 72daeb194597d6b8aca952fcc3808f55932a6f79
-SHA1 (patch-cpp.c) = 542158a2e37bc71bc56a458bfe23cf70e91ace1d
+SHA1 (ucpp-1.3.5.tar.xz) = 6c9f2a8d52720d8b2f04aac067df29cd387aa185
+RMD160 (ucpp-1.3.5.tar.xz) = cbfe5fcf92023aa38dd5e84f1ec6ec2133cf2bea
+SHA512 (ucpp-1.3.5.tar.xz) = 3ded8f7bc2b238adb6e7f4162aee48e039dfe7cee31b700c38e8f147634d47cd1ceaf39c343549b0d4a58358e6b9743f7e84f87b253dc19c05e543d68ade24ce
+Size (ucpp-1.3.5.tar.xz) = 289468 bytes
diff --git a/devel/ucpp/patches/patch-aa b/devel/ucpp/patches/patch-aa
deleted file mode 100644
index 2e42dc5caf5..00000000000
--- a/devel/ucpp/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$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
diff --git a/devel/ucpp/patches/patch-cpp.c b/devel/ucpp/patches/patch-cpp.c
deleted file mode 100644
index 390ece1208b..00000000000
--- a/devel/ucpp/patches/patch-cpp.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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];