Thu Jun 4 16:46:35 2020 UTC ()
converters/utf8proc: Add support for pkg-config, Reduce build dependencies

- Drop cmake
  Drive libtool directly (utf8proc can be build with a single compiler call).
  This removes the C++11 build dependency for cmake (C99 is now sufficient)
  and more build dependencies that are at least an order of magnitude larger
  than utf8proc itself.
- Drop patch for cmake
- Add support for pkg-config
  Install "libutf8proc.pc".
- Bump PKGREVISION for additional installed files.
- Remove supported Unicode version from DESCR
  Was not maintained in the past
- Take maintainership

OK from minskim@
OK from wiz@ (as long as I am MAINTAINER)


(micha)
diff -r1.1 -r1.2 pkgsrc/converters/utf8proc/DESCR
diff -r1.7 -r1.8 pkgsrc/converters/utf8proc/Makefile
diff -r1.4 -r1.5 pkgsrc/converters/utf8proc/PLIST
diff -r1.6 -r1.7 pkgsrc/converters/utf8proc/distinfo
diff -r1.2 -r0 pkgsrc/converters/utf8proc/patches/patch-CMakeLists.txt

cvs diff -r1.1 -r1.2 pkgsrc/converters/utf8proc/DESCR (expand / switch to unified diff)

--- pkgsrc/converters/utf8proc/DESCR 2018/04/30 19:31:47 1.1
+++ pkgsrc/converters/utf8proc/DESCR 2020/06/04 16:46:35 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1utf8proc is a small, clean C library that provides Unicode 1utf8proc is a small, clean C library that provides Unicode
2normalization, case-folding, and other operations for data in the 2normalization, case-folding, and other operations for data in the
3UTF-8 encoding, supporting Unicode version 9.0. 3UTF-8 encoding (some of the underlying functions for UTF-32 are
 4exported too).

cvs diff -r1.7 -r1.8 pkgsrc/converters/utf8proc/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/utf8proc/Makefile 2020/03/31 17:36:19 1.7
+++ pkgsrc/converters/utf8proc/Makefile 2020/06/04 16:46:35 1.8
@@ -1,17 +1,49 @@ @@ -1,17 +1,49 @@
1# $NetBSD: Makefile,v 1.7 2020/03/31 17:36:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2020/06/04 16:46:35 micha Exp $
2 2
3DISTNAME= utf8proc-2.5.0 3DISTNAME= utf8proc-2.5.0
 4PKGREVISION= 1
4CATEGORIES= converters 5CATEGORIES= converters
5MASTER_SITES= ${MASTER_SITE_GITHUB:=JuliaLang/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=JuliaLang/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= minskim@NetBSD.org 9MAINTAINER= micha@NetBSD.org
9HOMEPAGE= https://julialang.org/utf8proc/ 10HOMEPAGE= https://julialang.org/utf8proc/
10COMMENT= Clean C library for processing UTF-8 Unicode data 11COMMENT= C library for processing Unicode data
11LICENSE= mit 12LICENSE= mit
12 13
13USE_CMAKE= yes 
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON 15USE_LIBTOOL= yes
 16
 17INSTALLATION_DIRS= include lib lib/pkgconfig
 18
 19# Use ABI version from CMakeLists.txt to stay compatible with cmake builds
 20MAJOR= 2
 21MINOR= 3
 22PATCH= 2
 23
 24do-configure:
 25 cd ${WRKSRC} && ${SED} \
 26 -e 's#PREFIX#${PREFIX}#' \
 27 -e 's#LIBDIR#lib#' \
 28 -e 's#INCLUDEDIR#include#' \
 29 -e 's#VERSION#${MAJOR}.${MINOR}.${PATCH}#' \
 30 -e 's#Description:.*$$#Description: ${COMMENT}#' \
 31 libutf8proc.pc.in >libutf8proc.pc
 32
 33do-build:
 34 cd ${WRKSRC} && ${LIBTOOL} --tag=CC --mode=compile \
 35 ${CC} ${CPPFLAGS} ${CFLAGS} -c -o utf8proc.lo utf8proc.c
 36 cd ${WRKSRC} && ${LIBTOOL} --tag=CC --mode=link \
 37 ${CC} ${LDFLAGS} -o libutf8proc.la utf8proc.lo \
 38 -rpath ${PREFIX}/lib \
 39 -version-number ${MAJOR}:${MINOR}:${PATCH}
 40
 41do-install:
 42 cd ${WRKSRC} && ${LIBTOOL} --mode=install \
 43 ${INSTALL_LIB} libutf8proc.la ${DESTDIR}${PREFIX}/lib
 44 cd ${WRKSRC} && \
 45 ${INSTALL_DATA} utf8proc.h ${DESTDIR}${PREFIX}/include
 46 cd ${WRKSRC} && \
 47 ${INSTALL_DATA} libutf8proc.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
16 48
17.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/converters/utf8proc/PLIST (expand / switch to unified diff)

--- pkgsrc/converters/utf8proc/PLIST 2020/03/31 17:36:19 1.4
+++ pkgsrc/converters/utf8proc/PLIST 2020/06/04 16:46:35 1.5
@@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
1@comment $NetBSD: PLIST,v 1.4 2020/03/31 17:36:19 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2020/06/04 16:46:35 micha Exp $
2include/utf8proc.h 2include/utf8proc.h
3lib/libutf8proc.so 3lib/libutf8proc.la
4lib/libutf8proc.so.2 4lib/pkgconfig/libutf8proc.pc
5lib/libutf8proc.so.2.3.2 

cvs diff -r1.6 -r1.7 pkgsrc/converters/utf8proc/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/utf8proc/distinfo 2020/03/31 17:36:19 1.6
+++ pkgsrc/converters/utf8proc/distinfo 2020/06/04 16:46:35 1.7
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.6 2020/03/31 17:36:19 wiz Exp $ 1$NetBSD: distinfo,v 1.7 2020/06/04 16:46:35 micha Exp $
2 2
3SHA1 (utf8proc-2.5.0.tar.gz) = a868878257355456e08b5f21bc2ee6a164386865 3SHA1 (utf8proc-2.5.0.tar.gz) = a868878257355456e08b5f21bc2ee6a164386865
4RMD160 (utf8proc-2.5.0.tar.gz) = 47d14e079f805d93e2896a0561e6cfb029de160e 4RMD160 (utf8proc-2.5.0.tar.gz) = 47d14e079f805d93e2896a0561e6cfb029de160e
5SHA512 (utf8proc-2.5.0.tar.gz) = 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014 5SHA512 (utf8proc-2.5.0.tar.gz) = 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
6Size (utf8proc-2.5.0.tar.gz) = 155485 bytes 6Size (utf8proc-2.5.0.tar.gz) = 155485 bytes
7SHA1 (patch-CMakeLists.txt) = df574d345dd4d39ae83f2fe7d8669d28524a1a5e 

File Deleted: pkgsrc/converters/utf8proc/patches/Attic/patch-CMakeLists.txt