Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
+18 -2
View File
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2014/05/16 01:21:12 pho Exp $
# $NetBSD: Makefile,v 1.5 2016/09/08 17:32:49 richard Exp $
DISTNAME= graphite2-1.2.4
DISTNAME= graphite2-1.3.7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=silgraphite/}
EXTRACT_SUFX= .tgz
@@ -14,4 +14,20 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_LIBTOOL= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
# Linux seems to need this to build by default, but apparently it is
# only used for test, so for now use 'build' dependency
BUILDLINK_DEPMETHOD.freetype2?= build
.include "../../graphics/freetype2/buildlink3.mk"
.endif
# python and py-fonttools seem to be used only during test
# uncomment the following to do so
#TEST_TARGET= test
#PYTHON_FOR_BUILD_ONLY?= tool
#.include "../../lang/python/tool.mk"
#BUILD_DEPENDS+= ${PYPKGPREFIX}-fonttools-[0-9]*:../../fonts/py-fonttools/
.include "../../mk/bsd.pkg.mk"
+4 -2
View File
@@ -1,10 +1,12 @@
@comment $NetBSD: PLIST,v 1.2 2014/05/16 01:21:12 pho Exp $
@comment $NetBSD: PLIST,v 1.3 2016/01/26 13:56:23 wiz Exp $
bin/gr2fonttest
include/graphite2/Font.h
include/graphite2/Log.h
include/graphite2/Segment.h
include/graphite2/Types.h
lib/libgraphite2.la
lib/libgraphite2.so
lib/libgraphite2.so.3
lib/libgraphite2.so.3.0.1
lib/pkgconfig/graphite2.pc
share/graphite2/graphite2-release.cmake
share/graphite2/graphite2.cmake
+6 -6
View File
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.3 2014/05/16 12:51:24 wiz Exp $
$NetBSD: distinfo,v 1.7 2016/03/24 20:31:02 wiz Exp $
SHA1 (graphite2-1.2.4.tgz) = 5b3a907fee3ce0c6efcc2b31d0d98939ec031b7d
RMD160 (graphite2-1.2.4.tgz) = a4adc89befc86a9adcab3b0dbd6caf2ac3866fb4
Size (graphite2-1.2.4.tgz) = 6938866 bytes
SHA1 (patch-Graphite.cmake) = 32cab319afa56ecb5f379e4097fe9059a89d2b59
SHA1 (patch-src_CMakeLists.txt) = 31f9f7d4751f4a95e0567120aa232dca68029d37
SHA1 (graphite2-1.3.7.tgz) = 83fde60cca7ce82d3b90b335a6e6ea719d15ffec
RMD160 (graphite2-1.3.7.tgz) = a4fe7f52d67e126c20678863309aaf2b85a7ddf7
SHA512 (graphite2-1.3.7.tgz) = 163ac1455003398690b173f2ce56509bba1ae1e480585635888e3b061fef1ff8493c86f4647efde65ea10cd82b4048fcc8e882ea56811a8169956ad27bd10b8f
Size (graphite2-1.3.7.tgz) = 3883666 bytes
SHA1 (patch-src_CMakeLists.txt) = 4751d4cb699a368b9b612a18c45176346e29968b
@@ -1,15 +0,0 @@
$NetBSD: patch-Graphite.cmake,v 1.1 2014/05/16 01:21:12 pho Exp $
CREATE_LIBTOOL_FILE: Fix incorrect library_names on Darwin
--- Graphite.cmake.orig 2014-05-16 01:00:36.000000000 +0000
+++ Graphite.cmake
@@ -46,7 +46,7 @@ FUNCTION(CREATE_LIBTOOL_FILE _target _in
FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
FILE(APPEND ${_laname} "# Names of this library.\n")
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- FILE(APPEND ${_laname} "library_names='${_lanamwe}.${_target_current}.${_target_revision}.${_target_age}.${_soext} ${_lanamewe}.${_target_current}.${_soext} ${_soname}'\n\n")
+ FILE(APPEND ${_laname} "library_names='${_lanamewe}.${_target_current}.${_target_revision}.${_target_age}${_soext} ${_lanamewe}.${_target_current}${_soext} ${_soname}'\n\n")
else (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_revision}.${_target_age} ${_soname}.${_target_current} ${_soname}'\n\n")
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@@ -1,4 +1,4 @@
$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/05/16 12:51:24 wiz Exp $
$NetBSD: patch-src_CMakeLists.txt,v 1.4 2016/02/07 01:05:11 ryoon Exp $
Don't pass -nodefaultlibs to compiler or the build fails for missing
symbols on PowerPC and possibly other platforms. I can't see any
@@ -7,23 +7,23 @@ reason why they do this at all.
The problem is already reported to the upstream:
http://sourceforge.net/p/silgraphite/bugs/56/
--- src/CMakeLists.txt.orig 2013-11-29 06:21:26.000000000 +0000
--- src/CMakeLists.txt.orig 2016-01-15 04:17:18.000000000 +0000
+++ src/CMakeLists.txt
@@ -113,7 +113,7 @@ endif (${CMAKE_BUILD_TYPE} STREQUAL "Cla
@@ -109,7 +109,7 @@ set_target_properties(graphite2 PROPERTI
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set_target_properties(graphite2 PROPERTIES
COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
+ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}"
LINKER_LANGUAGE C)
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
@@ -123,28 +123,27 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-Wdouble-promotion)
@@ -126,23 +126,17 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
else (GRAPHITE2_ASAN)
target_link_libraries(graphite2 c gcc)
endif (GRAPHITE2_ASAN)
- include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
@@ -31,23 +31,15 @@ http://sourceforge.net/p/silgraphite/bugs/56/
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set_target_properties(graphite2 PROPERTIES
COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
- LINK_FLAGS "-nodefaultlibs"
+ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}"
LINKER_LANGUAGE C)
target_link_libraries(graphite2 c)
- include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
set_target_properties(graphite2 PROPERTIES
COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
+else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+include(Graphite)
+CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")