Ravenports generated: 20 May 2018 09:12

kraileth · May 20, 2018 · dff6494 · dff6494
1 parent c658e49
commit dff6494
Show file tree

Hide file tree

Showing 17 changed files with 422 additions and 136 deletions.
diff --git a/Mk/Misc/port_dates b/Mk/Misc/port_dates
@@ -136,7 +136,7 @@ autoselect-python 1526675573 1526675573
 autotools-wrappers 1493266522 1526016420
 aws 1493684870 1526016420
 bash 1492921936 1526319658
-bc 1526582023 1526582023
+bc 1526582023 1526819488
 bind 1506720704 1526768476
 binutils 1491538715 1524677894
 bison 1491446387 1526016420
@@ -146,7 +146,7 @@ boehm_garbage_collector 1496875210 1526016420
 booch95 1492834910 1524677894
 boost-jam 1493137638 1524079343
 boost-libraries 1493137638 1526016420
-brotli 1526582023 1526582023
+brotli 1526582023 1526819488
 bsd-patch 1504713119 1524677894
 bsd-which 1512834904 1524677894
 byacc 1490805406 1526218154
@@ -259,7 +259,7 @@ gif 1497500768 1524677894
 git 1504588432 1526016420
 gitolite 1506720704 1526016420
 glew 1516233363 1517086790
-glib 1496467901 1526016420
+glib 1496467901 1526819488
 glib-networking 1512834904 1521734860
 glibmm 1526517666 1526517666
 glm 1516124038 1526016420
@@ -274,7 +274,7 @@ gnatcross-bootstrap 1507905256 1522711427
 gnatcross-sysroot-freebsd 1507672935 1526016420
 gnatcross-sysroot-solaris 1508336910 1526016420
 gnome-keyring 1521125041 1526016420
-gnucash 1526510531 1526768476
+gnucash 1526510531 1526819488
 gnugrep 1490999056 1526016420
 gnupg 1517613621 1526016420
 gnuplot 1525928267 1526016420
@@ -1373,7 +1373,7 @@ pkg-bsd 1491104411 1526016420
 pkgconfig 1490831720 1524677894
 png 1496467901 1526016420
 polkit 1522372889 1526016420
-poppler 1515467326 1526016420
+poppler 1515467326 1526819488
 poppler-data 1515467326 1524665181
 popt 1505322911 1505936588
 postgis 1519763665 1526016420
@@ -1505,7 +1505,7 @@ python-rjsmin 1517585344 1525045110
 python-ruamel.yaml 1523886665 1523886665
 python-rubymarshal 1522601333 1525045110
 python-salt 1506698355 1524677894
-python-setuptools 1492787395 1525045110
+python-setuptools 1492787395 1526819488
 python-setuptools_git 1506630685 1525045110
 python-setuptools_scm 1496175470 1526319658
 python-sh 1517585344 1525045110

diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
@@ -56,6 +56,7 @@ CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING="${CC}" \
 			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 			-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
 			-DCMAKE_INSTALL_DOCDIR:PATH="share/doc/${NAMEBASE}" \
+			-DCMAKE_INSTALL_LIBDIR:STRING="lib" \
 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
 			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \

diff --git a/bucket_0E/glm b/bucket_0E/glm
@@ -25,8 +25,6 @@ LICENSE_SCHEME=		solo
 
 FPC_EQUIVALENT=		math/glm
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING="lib"
-
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -type f -delete
 

diff --git a/bucket_2C/freeglut b/bucket_2C/freeglut
@@ -33,7 +33,6 @@ FPC_EQUIVALENT=		graphics/freeglut
 
 INSTALL_TARGET=		install/strip
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING=lib
 VAR_OPSYS[freebsd]=	LDFLAGS=-lusbhid
 			LDFLAGS=-lm
 VAR_OPSYS[sunos]=	LDFLAGS=-lrt

diff --git a/bucket_2C/woff2 b/bucket_2C/woff2
@@ -29,8 +29,6 @@ FPC_EQUIVALENT=		devel/woff2
 
 SOVERSION=		1.0.2
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING="lib"
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/woff2_* ${STAGEDIR}${PREFIX}/bin
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so

diff --git a/bucket_2F/qt-gstreamer b/bucket_2F/qt-gstreamer
@@ -34,7 +34,6 @@ CMAKE_ARGS=		-DUSE_GST_PLUGIN_DIR:BOOL=OFF
 			-DUSE_QT_PLUGIN_DIR:BOOL=OFF
 			-DQT_VERSION=5
 			-DCMAKE_PREFIX_PATH:PATH="{{PREFIX}}/lib/qt5/cmake/"
-			-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so

diff --git a/bucket_34/opencv b/bucket_34/opencv
@@ -99,7 +99,6 @@ CMAKE_ARGS=		-DWITH_VTK:BOOL=OFF
 			-DBUILD_opencv_java:BOOL=OFF
 			-DBUILD_opencv_python2:BOOL=OFF
 			-DBUILD_opencv_python3:BOOL=OFF
-			-DCMAKE_INSTALL_LIBDIR:STRING=lib
 VAR_ARCH[x86_64]=	CMAKE_ARGS=-DCPU_BASELINE_DISABLE:STRING="FP16,POPCNT,FMA3"
 
 post-patch:

diff --git a/bucket_3E/sfcgal b/bucket_3E/sfcgal
@@ -37,7 +37,6 @@ SOVERSION=		1.3.5
 
 CXXFLAGS=		-Wno-deprecated-declarations
 LDFLAGS=		{{LOCALBASE}}/lib/libboost_serialization.so
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSFCGAL.so

diff --git a/bucket_44/pugixml b/bucket_44/pugixml
@@ -33,7 +33,6 @@ CMAKE_ARGS=		-DBUILD_SHARED_LIBS=ON
 			-DBUILD_STATIC_LIBS=ON
 			-DBUILD_TESTS=OFF
 			-DBUILD_PKGCONFIG=ON
-			-DCMAKE_INSTALL_LIBDIR:STRING=lib
 
 post-patch:
 	${TAIL} -n 23 ${WRKSRC}/src/pugixml.hpp >> ${WRKDIR}/LICENSE_MIT
@@ -72,10 +71,10 @@ lib/
  libpugixml.so.%%SOVERSION%%
 
 
-[FILE:1397:patches/patch-CMakeLists.txt]
---- CMakeLists.txt.orig	2018-04-04 16:53:16.000000000 +0200
-+++ CMakeLists.txt	2018-05-16 17:20:41.177952000 +0200
-@@ -4,7 +4,7 @@
+[FILE:1415:patches/patch-CMakeLists.txt]
+--- CMakeLists.txt.orig	2018-04-04 14:53:16 UTC
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ project(pugixml)
 
  option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
  option(BUILD_TESTS "Build tests" OFF)
@@ -84,7 +83,7 @@ lib/
 
  set(BUILD_DEFINES "" CACHE STRING "Build defines")
 
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ endif()
  set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
  get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
 
@@ -93,7 +92,7 @@ lib/
  	# Install library into its own directory under LIBDIR
  	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
  endif()
-@@ -71,10 +71,8 @@
+@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-c
  install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
  install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
 
@@ -108,9 +107,9 @@ lib/
  	file(GLOB TEST_SOURCES tests/*.cpp)
 
 
-[FILE:685:patches/patch-scripts_pugixml.pc.in]
---- scripts/pugixml.pc.in.orig	2018-04-04 16:53:16.000000000 +0200
-+++ scripts/pugixml.pc.in	2018-05-16 17:21:06.250986000 +0200
+[FILE:637:patches/patch-scripts_pugixml.pc.in]
+--- scripts/pugixml.pc.in.orig	2018-04-04 14:53:16 UTC
++++ scripts/pugixml.pc.in
 @@ -1,11 +1,11 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=${prefix}

diff --git a/bucket_58/webkit2 b/bucket_58/webkit2
@@ -76,7 +76,6 @@ CMAKE_ARGS=		-DPORT=GTK
 			-DENABLE_GEOLOCATION:BOOL=true
 			-DENABLE_GLES2:BOOL=ON
 			-DENABLE_MINIBROWSER:BOOL=ON
-			-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 
 [GTK3].DESCRIPTION=			Build GTK+3 variant
 [GTK3].MAKEFILE_ON=			BROWSER_PLUGIN_DIR={{LOCALBASE}}/lib/browser_plugins/symlinks/webkit-gtk3

diff --git a/bucket_6C/gnucash b/bucket_6C/gnucash
@@ -86,7 +86,6 @@ CMAKE_ARGS=		-DWITH_AQBANKING:BOOL=true
 			-DWITH_OFX:BOOL=true
 			-DCOMPILE_GSCHEMAS=OFF
 			-DENABLE_BINRELOC=OFF
-			-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 
 post-patch:
 	# disable testing and fix XDG_DATA_DIRS

diff --git a/bucket_93/uchardet b/bucket_93/uchardet
@@ -21,8 +21,6 @@ USES=			cmake c++:single
 
 FPC_EQUIVALENT=		textproc/uchardet
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING=lib
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uchardet
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libuchardet.so

diff --git a/bucket_A0/jasper b/bucket_A0/jasper
@@ -31,7 +31,6 @@ CMAKE_ARGS=		-DJAS_ENABLE_DOC:BOOL=ON
 			-DJAS_ENABLE_LIBJPEG:BOOL=ON
 			-DJAS_ENABLE_OPENGL:BOOL=ON
 			-DJAS_ENABLE_SHARED:BOOL=ON
-			-DCMAKE_INSTALL_LIBDIR:STRING=lib
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

diff --git a/bucket_B4/cgal b/bucket_B4/cgal
@@ -47,7 +47,6 @@ SHEBANG_FILES=		scripts/cgal_create_CMakeLists
 SOVERSION=		13.0.2
 
 CMAKE_ARGS=		-DWITH_CGAL_Qt5=OFF
-			-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/CGAL-4.12

diff --git a/bucket_C1/libzip b/bucket_C1/libzip
@@ -32,8 +32,6 @@ FPC_EQUIVALENT=		archivers/libzip
 
 SOVERSION=		5.0
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_LIBDIR:STRING="lib"
-
 post-patch:
 	${REINPLACE_CMD} -e '/SET(CMAKE_INSTALL_RPATH /d' \
 		${WRKSRC}/CMakeLists.txt