CVS commit: pkgsrc/converters/utf8proc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 21 17:49:50 UTC 2018

Modified Files:
        pkgsrc/converters/utf8proc: Makefile distinfo
Added Files:
        pkgsrc/converters/utf8proc/patches: patch-CMakeLists.txt

Log Message:
utf8proc: use correct shared library installation


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/utf8proc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/utf8proc/distinfo
cvs rdiff -u -r0 -r1.1 \
    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/Makefile
diff -u pkgsrc/converters/utf8proc/Makefile:1.2 pkgsrc/converters/utf8proc/Makefile:1.3
--- pkgsrc/converters/utf8proc/Makefile:1.2     Mon May 21 17:02:42 2018
+++ pkgsrc/converters/utf8proc/Makefile Mon May 21 17:49:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/05/21 17:02:42 adam Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/21 17:49:50 adam Exp $
 
 DISTNAME=      utf8proc-2.1.1
 CATEGORIES=    converters
@@ -12,25 +12,6 @@ LICENSE=     mit
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c99
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}/build
-
-CMAKE_ARG_PATH=        ..
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
 
-INSTALLATION_DIRS+=    include lib
-
-post-extract:
-       ${MKDIR} ${WRKSRC}
-
-.include "../../mk/bsd.prefs.mk"
-
-do-install:
-       ${INSTALL_DATA} ${WRKDIR}/${PKGNAME_NOREV}/utf8proc.h \
-               ${DESTDIR}${PREFIX}/include/
-       ${INSTALL_LIB} ${WRKSRC}/libutf8proc.* ${DESTDIR}${PREFIX}/lib/
-.if ${OPSYS} == "Darwin"
-       install_name_tool -id ${PREFIX}/lib/libutf8proc.${PKGVERSION_NOREV}.dylib \
-            ${DESTDIR}${PREFIX}/lib/libutf8proc.${PKGVERSION_NOREV}.dylib
-.endif
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/utf8proc/distinfo
diff -u pkgsrc/converters/utf8proc/distinfo:1.1 pkgsrc/converters/utf8proc/distinfo:1.2
--- pkgsrc/converters/utf8proc/distinfo:1.1     Mon Apr 30 19:31:47 2018
+++ pkgsrc/converters/utf8proc/distinfo Mon May 21 17:49:50 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/04/30 19:31:47 minskim Exp $
+$NetBSD: distinfo,v 1.2 2018/05/21 17:49:50 adam Exp $
 
 SHA1 (utf8proc-2.1.1.tar.gz) = 8c02fc26fbe7ab1c4c0d2fce3efecb4df8d935b9
 RMD160 (utf8proc-2.1.1.tar.gz) = c1294da1de99bb2ee6fad01d3dbf9e25e4ef0581
 SHA512 (utf8proc-2.1.1.tar.gz) = 66c3e79439dd4c4b148ec3a2a9f96442fcccb9e488384e52807f513dad64d4b7adea8626c60d21ea401ce4240ced0c71265de51c4d1550c37c8db9176dbb4fe8
 Size (utf8proc-2.1.1.tar.gz) = 152198 bytes
+SHA1 (patch-CMakeLists.txt) = f2af4dc22a77b7d7518741af9edf691bdd01bef9

Added files:

Index: pkgsrc/converters/utf8proc/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/converters/utf8proc/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon May 21 17:49:50 2018
+++ pkgsrc/converters/utf8proc/patches/patch-CMakeLists.txt     Mon May 21 17:49:50 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/21 17:49:50 adam Exp $
+
+Allow in-tree builds.
+Add install targets.
+
+--- CMakeLists.txt.orig        2018-04-27 13:58:34.000000000 +0000
++++ CMakeLists.txt
+@@ -1,8 +1,5 @@
+ cmake_minimum_required (VERSION 2.8)
+ 
+-include (utils.cmake)
+-
+-disallow_intree_builds()
+ 
+ project (utf8proc C)
+ 
+@@ -31,3 +28,6 @@ set_target_properties (utf8proc PROPERTI
+   VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}"
+   SOVERSION ${SO_MAJOR}
+ )
++
++install (TARGETS utf8proc DESTINATION lib)
++install (FILES "${PROJECT_SOURCE_DIR}/utf8proc.h" DESTINATION include)