CVS commit: pkgsrc/converters/utf8proc

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Thu Jun  4 16:46:35 UTC 2020

Modified Files:
        pkgsrc/converters/utf8proc: DESCR Makefile PLIST distinfo
Removed Files:
        pkgsrc/converters/utf8proc/patches: patch-CMakeLists.txt

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/utf8proc/DESCR
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/utf8proc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/converters/utf8proc/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/converters/utf8proc/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/converters/utf8proc/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

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

Index: pkgsrc/converters/utf8proc/Makefile
diff -u pkgsrc/converters/utf8proc/Makefile:1.7 pkgsrc/converters/utf8proc/Makefile:1.8
--- pkgsrc/converters/utf8proc/Makefile:1.7     Tue Mar 31 17:36:19 2020
+++ pkgsrc/converters/utf8proc/Makefile Thu Jun  4 16:46:35 2020
@@ -1,17 +1,49 @@
-# $NetBSD: Makefile,v 1.7 2020/03/31 17:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/04 16:46:35 micha Exp $
 
 DISTNAME=      utf8proc-2.5.0
+PKGREVISION=   1
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=JuliaLang/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
-MAINTAINER=    minskim%NetBSD.org@localhost
+MAINTAINER=    micha%NetBSD.org@localhost
 HOMEPAGE=      https://julialang.org/utf8proc/
-COMMENT=       Clean C library for processing UTF-8 Unicode data
+COMMENT=       C library for processing Unicode data
 LICENSE=       mit
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c99
-CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
+USE_LIBTOOL=   yes
+
+INSTALLATION_DIRS=     include lib lib/pkgconfig
+
+# Use ABI version from CMakeLists.txt to stay compatible with cmake builds
+MAJOR= 2
+MINOR= 3
+PATCH= 2
+
+do-configure:
+       cd ${WRKSRC} && ${SED}                                          \
+               -e 's#PREFIX#${PREFIX}#'                                \
+               -e 's#LIBDIR#lib#'                                      \
+               -e 's#INCLUDEDIR#include#'                              \
+               -e 's#VERSION#${MAJOR}.${MINOR}.${PATCH}#'              \
+               -e 's#Description:.*$$#Description: ${COMMENT}#'        \
+               libutf8proc.pc.in >libutf8proc.pc
+
+do-build:
+       cd ${WRKSRC} && ${LIBTOOL} --tag=CC --mode=compile              \
+               ${CC} ${CPPFLAGS} ${CFLAGS} -c -o utf8proc.lo utf8proc.c
+       cd ${WRKSRC} && ${LIBTOOL} --tag=CC --mode=link                 \
+               ${CC} ${LDFLAGS} -o libutf8proc.la utf8proc.lo          \
+                       -rpath ${PREFIX}/lib                            \
+                       -version-number ${MAJOR}:${MINOR}:${PATCH}
+
+do-install:
+       cd ${WRKSRC} && ${LIBTOOL} --mode=install                       \
+               ${INSTALL_LIB} libutf8proc.la ${DESTDIR}${PREFIX}/lib
+       cd ${WRKSRC} &&                                                 \
+               ${INSTALL_DATA} utf8proc.h ${DESTDIR}${PREFIX}/include
+       cd ${WRKSRC} &&                                                 \
+               ${INSTALL_DATA} libutf8proc.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"

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

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