Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Sep 23, 2019
1 parent 99bca1a commit dde2cec
Show file tree
Hide file tree
Showing 131 changed files with 1,907 additions and 155 deletions.
1 change: 1 addition & 0 deletions archivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
SUBDIR += py-librtfcomp
SUBDIR += py-lz4
SUBDIR += py-lzma
SUBDIR += py-lzstring
SUBDIR += py-pyliblzma
SUBDIR += py-python-lhafile
SUBDIR += py-python-lzo
Expand Down
20 changes: 20 additions & 0 deletions archivers/py-lzstring/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# $FreeBSD$

PORTNAME= lzstring
DISTVERSION= 1.0.4
CATEGORIES= archivers python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

MAINTAINER= [email protected]
COMMENT= LZ-based in-memory string compression

LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md

USES= python
USE_PYTHON= autoplist distutils

NO_ARCH= yes

.include <bsd.port.mk>
3 changes: 3 additions & 0 deletions archivers/py-lzstring/distinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TIMESTAMP = 1569116524
SHA256 (lzstring-1.0.4.tar.gz) = 1afa61e598193fbcc211e0899f09a9679e33f9102bccc37fbfda0b7fef4d9ea2
SIZE (lzstring-1.0.4.tar.gz) = 4256
4 changes: 4 additions & 0 deletions archivers/py-lzstring/pkg-descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
LZ-based, in-memory string compression module, based on the LZ-String
javascript module.

WWW: https://pypi.python.org/pypi/lzstring
2 changes: 1 addition & 1 deletion benchmarks/fio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= fio
PORTVERSION= 3.15
PORTVERSION= 3.16
CATEGORIES= benchmarks
MASTER_SITES= http://brick.kernel.dk/snaps/

Expand Down
6 changes: 3 additions & 3 deletions benchmarks/fio/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1568382760
SHA256 (fio-3.15.tar.bz2) = 246369954833e0d6be5ef4f9c47968adafcb4a0751badca2cdd80700b4bc5784
SIZE (fio-3.15.tar.bz2) = 876140
TIMESTAMP = 1568984907
SHA256 (fio-3.16.tar.bz2) = 77f5b6e11f8d7f08416af100359ec295620673ddacef370f840f2a4e1a33119e
SIZE (fio-3.16.tar.bz2) = 881436
1 change: 1 addition & 0 deletions benchmarks/fio/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ man/man1/fio_generate_plots.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/libhdfs.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/libpmem.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mtd.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nbd.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netio.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netio_multicast.fio
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/null.fio
Expand Down
3 changes: 1 addition & 2 deletions databases/galera/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= galera
PORTVERSION?= 25.3.27
PORTREVISION= 2
PORTVERSION?= 25.3.28
DISTVERSIONPREFIX?= release_
CATEGORIES= databases

Expand Down
6 changes: 3 additions & 3 deletions databases/galera/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TIMESTAMP = 1563790559
SHA256 (codership-galera-release_25.3.27_GH0.tar.gz) = df943a9f282a58df4b02fe05df5cbf387fd251d82c29f4021954602cc67a8f7b
SIZE (codership-galera-release_25.3.27_GH0.tar.gz) = 3292352
TIMESTAMP = 1567520244
SHA256 (codership-galera-release_25.3.28_GH0.tar.gz) = e49fef6a2451261c01170727f763094b4e69b99ccb1e45a4fdc7cf5f291913cc
SIZE (codership-galera-release_25.3.28_GH0.tar.gz) = 3293508
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
2 changes: 1 addition & 1 deletion databases/pspg/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pspg
DISTVERSION= 2.0.3
DISTVERSION= 2.0.4
CATEGORIES= databases

MAINTAINER= [email protected]
Expand Down
6 changes: 3 additions & 3 deletions databases/pspg/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1568378023
SHA256 (okbob-pspg-2.0.3_GH0.tar.gz) = 7378e342c72670c1c3b70bf2ed3c8ae49407c7e77926b37b4a65c31cc1d5c248
SIZE (okbob-pspg-2.0.3_GH0.tar.gz) = 1328577
TIMESTAMP = 1569153286
SHA256 (okbob-pspg-2.0.4_GH0.tar.gz) = 6711a96ede9a2fd4afb849693929a5ef422e731652e63a35706e8a1811e78975
SIZE (okbob-pspg-2.0.4_GH0.tar.gz) = 1329049
2 changes: 1 addition & 1 deletion databases/tiledb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ USES= cmake compiler:c++11-lang ssl

CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2
CMAKE_OFF= TILEDB_CMAKE_IDE TILEDB_WERROR TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE
CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS TILEDB_WERROR
CMAKE_ON= TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS TILEDB_TOOLS

GH_ACCOUNT= TileDB-Inc
GH_PROJECT= TileDB
Expand Down
9 changes: 9 additions & 0 deletions devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@
SUBDIR += codesearch-py
SUBDIR += codeville
SUBDIR += codeworker
SUBDIR += collada-dom
SUBDIR += colorgcc
SUBDIR += colormake
SUBDIR += commit-patch
Expand Down Expand Up @@ -5392,6 +5393,14 @@
SUBDIR += roboctl
SUBDIR += robodoc
SUBDIR += root-doc
SUBDIR += ros-catkin_pkg
SUBDIR += ros-rosdep
SUBDIR += ros-rosdistro
SUBDIR += ros-rosinstall
SUBDIR += ros-rosinstall_generator
SUBDIR += ros-rospkg
SUBDIR += ros-vcstools
SUBDIR += ros-wstool
SUBDIR += rote
SUBDIR += rpc2
SUBDIR += rpclib
Expand Down
27 changes: 27 additions & 0 deletions devel/collada-dom/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# $FreeBSD$

PORTNAME= collada-dom
DISTVERSION= 2.5.0
CATEGORIES= devel

MAINTAINER= [email protected]
COMMENT= COLLADA Document Object Model (DOM) C++ Library

LICENSE= MIT

LIB_DEPENDS+= libminizip.so:archivers/minizip \
libpcre.so:devel/pcre \
libboost_filesystem.so:devel/boost-libs \
libboost_system.so:devel/boost-libs

USES= cmake gnome
USE_LDCONFIG= yes

USE_GNOME+= libxml2

USE_GITHUB= yes
GH_ACCOUNT= rdiankov
GH_PROJECT= collada-dom
GH_TAGNAME= v${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}

.include <bsd.port.mk>
3 changes: 3 additions & 0 deletions devel/collada-dom/distinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TIMESTAMP = 1557428395
SHA256 (rdiankov-collada-dom-2.5.0-v2.5.0_GH0.tar.gz) = 3be672407a7aef60b64ce4b39704b32816b0b28f61ebffd4fbd02c8012901e0d
SIZE (rdiankov-collada-dom-2.5.0-v2.5.0_GH0.tar.gz) = 4509266
20 changes: 20 additions & 0 deletions devel/collada-dom/files/patch-CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- CMakeLists.txt.orig 2019-05-09 19:44:01 UTC
+++ CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 2.6.0)
project (collada-dom)
set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )

+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
# Define here the needed parameters
set (COLLADA_DOM_VERSION_MAJOR 2)
set (COLLADA_DOM_VERSION_MINOR 5)
@@ -138,7 +140,7 @@ if( APPLE OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions("-Dftello64=ftello")
endif()

-set(COLLADA_DOM_INCLUDE_INSTALL_DIR "include/collada-dom${COLLADA_DOM_SOVERSION}")
+set(COLLADA_DOM_INCLUDE_INSTALL_DIR "include/collada-dom")

set(COLLADA_DOM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dom/include)
set(COLLADA_DOM_LINK_DIRS "")
29 changes: 29 additions & 0 deletions devel/collada-dom/files/patch-dom_src_dae_daeDom.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- dom/src/dae/daeDom.cpp.orig 2019-05-09 19:35:00 UTC
+++ dom/src/dae/daeDom.cpp
@@ -111,7 +111,7 @@ daeInt getDomAnyID(DAE& dae)
return ColladaDOM141::domAny::ID();
}
#endif
- return NULL;
+ return 0;
}

daeInt getDomSourceID(DAE& dae)
@@ -126,7 +126,7 @@ daeInt getDomSourceID(DAE& dae)
return ColladaDOM141::domSource::ID();
}
#endif
- return NULL;
+ return 0;
}

daeInt getDomCOLLADAID(const char* specversion)
@@ -141,7 +141,7 @@ daeInt getDomCOLLADAID(const char* specversion)
return ColladaDOM141::domCOLLADA::ID();
}
#endif
- return NULL;
+ return 0;
}

void copyElementAny(daeElementRef dstAny, daeElement* srcAny)
20 changes: 20 additions & 0 deletions devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- dom/src/dae/daeUtils.cpp.orig 2019-05-09 19:37:18 UTC
+++ dom/src/dae/daeUtils.cpp
@@ -152,7 +152,7 @@ char cdom::getFileSeparator() {
const string& cdom::getSystemTmpDir() {
#ifdef WIN32
static string tmpDir = string(getenv("TMP")) + getFileSeparator();
-#elif defined(__linux__) || defined(__linux)
+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
static string tmpDir = "/tmp/";
#elif defined __APPLE_CC__
static string tmpDir = string(getenv("TMPDIR"));
@@ -171,7 +171,7 @@ string cdom::getRandomFileName() {
std::string tmp(tmpnam(&tmpbuffer[0]));
#ifdef WIN32
randomSegment = tmp.substr(tmp.find_last_of('\\')+1);
-#elif defined(__linux__) || defined(__linux)
+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
randomSegment = tmp.substr(tmp.find_last_of('/')+1);
#elif defined __APPLE_CC__
randomSegment = tmp.substr(tmp.find_last_of('/')+1);
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp.orig 2019-05-09 19:36:39 UTC
+++ dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
@@ -32,7 +32,7 @@
#include <iomanip>
using namespace std;

-#include <zip.h> // for saving compressed files
+#include <minizip/zip.h> // for saving compressed files
#ifdef _WIN32
#include <iowin32.h>
#else
16 changes: 16 additions & 0 deletions devel/collada-dom/pkg-descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
A C++ library that provides an API to the COLLADA Document Object Model

The COLLADA Document Object Model (DOM) is an application programming
interface (API) that provides a C++ object representation of a COLLADA
XML instance document.

This project is a library for loading and saving COLLADA documents
that can contain 2D, 3D, physics and other types of content. It allows
developers to create applications that can exchange COLLADA documents
with commercial content creation tools such as Maya, Max or Softimage.

This project is a very lightweight version of the Sourceforce Collada
Repository. It maintains only the base collada parser with minimal
dependencies.

WWW: https://github.com/rdiankov/collada-dom
Loading

0 comments on commit dde2cec

Please sign in to comment.