Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*/*: sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2017-08-07 09:06:02 +02:00
parent 23fd754e5a
commit 72f4db398e
57 changed files with 505 additions and 384 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
audio/taglib/Makefile
View file

@ -2,21 +2,23 @@
# $FreeBSD$
PORTNAME= taglib
PORTVERSION= 1.10
PORTVERSION= 1.11.1
CATEGORIES= audio
MASTER_SITES= http://taglib.github.io/releases/
MAINTAINER= jhale@FreeBSD.org
COMMENT= Library for manipulating ID3 tags and Ogg comments
LICENSE= LGPL21 MPL
LICENSE= LGPL21 MPL11
LICENSE_COMB= dual
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL
LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL
USES= cmake cpe pathfix
CMAKE_ARGS= -DWITH_ASF:BOOL=ON \
-DWITH_MP4:BOOL=ON
-DWITH_MP4:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON
USE_LDCONFIG= yes
CPE_VENDOR= scott_wheeler
@ -24,6 +26,12 @@ CPE_VENDOR= scott_wheeler
OPTIONS_DEFINE= RCC
OPTIONS_SUB= yes
# The official patches for this can be obtained from:
# http://darksoft.org/files/rusxmms/patches/
# however, they do not seem to yet have any for taglib-1.11.1.
# So instead, use:
# https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/
#
RCC_DESC= Build with RusXMMS librcc patches (experimental)
RCC_LIB_DEPENDS= librcc.so:devel/librcc
RCC_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc

5
audio/taglib/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (taglib-1.10.tar.gz) = 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa
SIZE (taglib-1.10.tar.gz) = 1233893
TIMESTAMP = 1501054372
SHA256 (taglib-1.11.1.tar.gz) = b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
SIZE (taglib-1.11.1.tar.gz) = 1261620

332
audio/taglib/files/extrapatch-rcc
View file

@ -1,38 +1,47 @@
--- ConfigureChecks.cmake.orig 2015-11-11 21:41:59 UTC
+++ ConfigureChecks.cmake
@@ -201,6 +201,8 @@ if(NOT ZLIB_SOURCE)
endif()
Obtained from:
https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/taglib-1.11.1-ds-rusxmms.patch?format=raw
diff --git CMakeLists.txt CMakeLists.txt
index a59efc9..eda2f53 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -120,6 +120,8 @@ if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
set(HAVE_ZLIB_SOURCE 1)
endif()
+SET(HAVE_LIBRCC 1)
+
if(BUILD_TESTS)
find_package(CppUnit)
if(NOT CppUnit_FOUND)
--- config.h.cmake.orig 2015-11-11 21:41:59 UTC
include_directories(${CMAKE_CURRENT_BINARY_DIR})
configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
diff --git config.h.cmake config.h.cmake
index 7eb5993..8d4a541 100644
--- config.h.cmake
+++ config.h.cmake
@@ -22,6 +22,9 @@
/* Defined if you have libz */
#cmakedefine HAVE_ZLIB 1
@@ -30,4 +30,7 @@
/* Indicates whether debug messages are shown even in release mode */
#cmakedefine TRACE_IN_RELEASE 1
+/* Defined if you have LibRCC from RusXMMS project */
+#cmakedefine HAVE_LIBRCC 1
+
/* Indicates whether debug messages are shown even in release mode */
#cmakedefine TRACE_IN_RELEASE 1
--- examples/tagreader_c.c.orig 2015-11-11 21:41:59 UTC
#cmakedefine TESTS_DIR "@TESTS_DIR@"
diff --git examples/tagreader_c.c examples/tagreader_c.c
index 0436992..e0f17d8 100644
--- examples/tagreader_c.c
+++ examples/tagreader_c.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
TagLib_Tag *tag;
const TagLib_AudioProperties *properties;
- taglib_set_strings_unicode(FALSE);
+// taglib_set_strings_unicode(FALSE);
+ //taglib_set_strings_unicode(FALSE);
for(i = 1; i < argc; i++) {
printf("******************** \"%s\" ********************\n", argv[i]);
--- examples/tagwriter.cpp.orig 2015-11-11 21:41:59 UTC
diff --git examples/tagwriter.cpp examples/tagwriter.cpp
index ed8b0d7..6a7a263 100644
--- examples/tagwriter.cpp
+++ examples/tagwriter.cpp
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) {
@ -43,9 +52,11 @@
TagLib::List<TagLib::FileRef>::ConstIterator it;
for(it = fileList.begin(); it != fileList.end(); ++it) {
--- taglib/CMakeLists.txt.orig 2015-11-11 21:41:59 UTC
diff --git taglib/CMakeLists.txt taglib/CMakeLists.txt
index 000f793..e30471e 100644
--- taglib/CMakeLists.txt
+++ taglib/CMakeLists.txt
@@ -38,6 +38,7 @@ set(tag_HDRS
@@ -42,6 +42,7 @@ set(tag_HDRS
audioproperties.h
taglib_export.h
${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h
@ -53,7 +64,7 @@
toolkit/taglib.h
toolkit/tstring.h
toolkit/tlist.h
@@ -291,6 +292,7 @@ set(xm_SRCS
@@ -297,6 +298,7 @@ set(xm_SRCS
)
set(toolkit_SRCS
@ -61,7 +72,7 @@
toolkit/tstring.cpp
toolkit/tstringlist.cpp
toolkit/tbytevector.cpp
@@ -337,7 +339,7 @@ set(tag_LIB_SRCS
@@ -345,7 +347,7 @@ set(tag_LIB_SRCS
add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
if(ZLIB_FOUND)
@ -69,10 +80,12 @@
+ target_link_libraries(tag rcc ${ZLIB_LIBRARIES})
endif()
set_target_properties(tag PROPERTIES
--- taglib/mpeg/id3v1/id3v1tag.cpp.orig 2015-11-11 21:41:59 UTC
if(HAVE_BOOST_ATOMIC)
diff --git taglib/mpeg/id3v1/id3v1tag.cpp taglib/mpeg/id3v1/id3v1tag.cpp
index ca93041..dca5f7a 100644
--- taglib/mpeg/id3v1/id3v1tag.cpp
+++ taglib/mpeg/id3v1/id3v1tag.cpp
@@ -64,17 +64,18 @@ StringHandler::StringHandler()
@@ -69,15 +69,15 @@ StringHandler::StringHandler()
String ID3v1::StringHandler::parse(const ByteVector &data) const
{
@ -82,29 +95,30 @@
ByteVector ID3v1::StringHandler::render(const String &s) const
{
if(!s.isLatin1())
{
+ if (String::ID3WType(String::Latin1) == String::Latin1)
- if(s.isLatin1())
- return s.data(String::Latin1);
- else
+ if(!s.isLatin1() && String::ID3WType(String::Latin1) == String::Latin1)
return ByteVector();
}
- return s.data(String::Latin1);
+
+ return s.data(String::Latin1ID3);
}
////////////////////////////////////////////////////////////////////////////////
@@ -257,7 +258,7 @@ void ID3v1::Tag::parse(const ByteVector
d->track = uchar(data[offset + 29]);
@@ -262,7 +262,7 @@ void ID3v1::Tag::parse(const ByteVector &data)
d->track = static_cast<unsigned char>(data[offset + 29]);
}
else
- d->comment = data.mid(offset, 30);
+ d->comment = TagPrivate::stringHandler->parse(data.mid(offset, 30));
+ d->comment = stringHandler->parse(data.mid(offset, 30));
offset += 30;
--- taglib/mpeg/id3v2/frames/commentsframe.cpp.orig 2015-11-11 21:41:59 UTC
diff --git taglib/mpeg/id3v2/frames/commentsframe.cpp taglib/mpeg/id3v2/frames/commentsframe.cpp
index b561832..9cfaba2 100644
--- taglib/mpeg/id3v2/frames/commentsframe.cpp
+++ taglib/mpeg/id3v2/frames/commentsframe.cpp
@@ -150,10 +150,10 @@ void CommentsFrame::parseFields(const By
@@ -148,10 +148,10 @@ void CommentsFrame::parseFields(const ByteVector &data)
return;
}
@ -117,12 +131,13 @@
ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
@@ -174,10 +174,12 @@ ByteVector CommentsFrame::renderFields()
@@ -171,11 +171,13 @@ ByteVector CommentsFrame::renderFields() const
ByteVector v;
String::Type encoding = d->textEncoding;
+
+ encoding = String::ID3WType(encoding);
+
encoding = checkTextEncoding(d->description, encoding);
encoding = checkTextEncoding(d->text, encoding);
@ -131,9 +146,11 @@
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));
--- taglib/mpeg/id3v2/frames/textidentificationframe.cpp.orig 2015-11-11 21:41:59 UTC
diff --git taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index d9d3b29..74f69da 100644
--- taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -187,12 +187,12 @@ void TextIdentificationFrame::parseField
@@ -191,12 +191,12 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
// read the string data type (the first byte of the field data)
@ -148,13 +165,13 @@
// build a small counter to strip nulls off the end of the field
@@ -223,11 +223,14 @@ void TextIdentificationFrame::parseField
@@ -227,11 +227,14 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
ByteVector TextIdentificationFrame::renderFields() const
{
- String::Type encoding = checkTextEncoding(d->fieldList, d->textEncoding);
+ String::Type encoding = d->textEncoding;
+
+
+ encoding = String::ID3WType(encoding);
+ encoding = checkTextEncoding(d->fieldList, encoding);
@ -165,9 +182,11 @@
for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
--- taglib/mpeg/id3v2/id3v2frame.cpp.orig 2015-11-11 21:41:59 UTC
diff --git taglib/mpeg/id3v2/id3v2frame.cpp taglib/mpeg/id3v2/id3v2frame.cpp
index 1f896fa..ef9d91d 100644
--- taglib/mpeg/id3v2/id3v2frame.cpp
+++ taglib/mpeg/id3v2/id3v2frame.cpp
@@ -339,7 +339,7 @@ String::Type Frame::checkEncoding(const
@@ -297,7 +297,7 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin
if((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4)
return String::UTF16;
@ -176,7 +195,10 @@
return encoding;
for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) {
--- taglib/toolkit/rccpatch.cpp.orig 2016-07-26 16:05:28 UTC
diff --git taglib/toolkit/rccpatch.cpp taglib/toolkit/rccpatch.cpp
new file mode 100644
index 0000000..af99323
--- /dev/null
+++ taglib/toolkit/rccpatch.cpp
@@ -0,0 +1,237 @@
+#include <stdlib.h>
@ -416,7 +438,10 @@
+#endif /* HAVE_LIBRCC */
+ return TagLib::String::Latin1;
+}
--- taglib/toolkit/rccpatch.h.orig 2016-07-26 16:05:28 UTC
diff --git taglib/toolkit/rccpatch.h taglib/toolkit/rccpatch.h
new file mode 100644
index 0000000..31f4410
--- /dev/null
+++ taglib/toolkit/rccpatch.h
@@ -0,0 +1,20 @@
+#ifndef _RCC_PATCH_H
@ -439,77 +464,109 @@
+TagLib::String::Type rccTaglibPatchGetID3Type();
+
+#endif /* _RCC_PATCH_H */
--- taglib/toolkit/tstring.cpp.orig 2015-11-11 21:41:59 UTC
diff --git taglib/toolkit/tstring.cpp taglib/toolkit/tstring.cpp
index 8328790..278256f 100644
--- taglib/toolkit/tstring.cpp
+++ taglib/toolkit/tstring.cpp
@@ -29,6 +29,7 @@
#include <config.h>
#endif
@@ -42,6 +42,7 @@
#include <trefcounter.h>
#include <tutils.h>
+#include "rccpatch.h"
#include "tstring.h"
#include "tdebug.h"
#include "tstringlist.h"
@@ -167,8 +168,11 @@ String::String(const String &s)
String::String(const std::string &s, Type t)
: d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(s.c_str(), s.length());
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(s.c_str(), s.length(), true, t);
else if(t == String::UTF8)
copyFromUTF8(s.c_str(), s.length());
else {
@@ -215,8 +219,11 @@ String::String(const wchar_t *s, Type t)
String::String(const char *s, Type t)
: d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(s, ::strlen(s));
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(s, ::strlen(s), true, t);
else if(t == String::UTF8)
copyFromUTF8(s, ::strlen(s));
else {
@@ -237,7 +244,10 @@ String::String(wchar_t c, Type t)
String::String(char c, Type t)
: d(new StringPrivate(1, static_cast<uchar>(c)))
{
- if(t != Latin1 && t != UTF8) {
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t != Latin1 && t != Latin1ID3 && t != Latin1ID3V2 && t != UTF8) {
debug("String::String() -- char should not contain UTF16.");
namespace
@@ -120,15 +121,37 @@ namespace
else
return String::UTF16BE;
}
}
@@ -248,8 +258,11 @@ String::String(const ByteVector &v, Type
+
+ void copyFromUTF8(std::wstring &data, const char *s, size_t length);
// Converts a Latin-1 string into UTF-16(without BOM/CPU byte order)
// and copies it to the internal buffer.
- void copyFromLatin1(std::wstring &data, const char *s, size_t length)
+ void copyFromLatin1(std::wstring &data, const char *s, size_t length, bool prepare = false, String::Type t = String::Latin1)
{
data.resize(length);
for(size_t i = 0; i < length; ++i)
data[i] = static_cast<unsigned char>(s[i]);
+
+
+ // librcc conversation
+ if (prepare) {
+
+ ByteVector v;
+ std::string str = std::string(s, length);
+
+ if (t == String::Latin1ID3) v = rccTaglibPatchRecodeInputID3(str, false);
+ else if (t == String::Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(str, true);
+ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(str);
+
+ if (v.size()) {
+ copyFromUTF8(data, v.data(), v.size());
+ } else {
+ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed,
+ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8
+ //if (Unicode::isLegalUTF8(s)) t = UTF8;
+ }
+ }
}
// Converts a UTF-8 string into UTF-16(without BOM/CPU byte order)
@@ -264,8 +287,11 @@ String::String(const String &s) :
String::String(const std::string &s, Type t) :
d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(d->data, s.c_str(), s.length());
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, s.c_str(), s.length(), true, t);
else if(t == String::UTF8)
copyFromUTF8(d->data, s.c_str(), s.length());
else {
@@ -312,8 +338,11 @@ String::String(const wchar_t *s, Type t) :
String::String(const char *s, Type t) :
d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(d->data, s, ::strlen(s));
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, s, ::strlen(s), true, t);
else if(t == String::UTF8)
copyFromUTF8(d->data, s, ::strlen(s));
else {
@@ -344,9 +373,13 @@ String::String(const ByteVector &v, Type t) :
{
if(v.isEmpty())
return;
+
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, v.data(), v.size(), true, t);
- if(t == Latin1)
- copyFromLatin1(v.data(), v.size());
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(v.data(), v.size(), true, t);
- copyFromLatin1(d->data, v.data(), v.size());
else if(t == UTF8)
copyFromUTF8(v.data(), v.size());
copyFromUTF8(d->data, v.data(), v.size());
else
@@ -396,8 +409,37 @@ bool String::isNull() const
@@ -499,8 +532,38 @@ bool String::isNull() const
ByteVector String::data(Type t) const
{
- switch(t)
- {
+ ByteVector v;
+ ByteVector v;
+
+ if (t == Locale) {
+ // The source is either Unicode or real Latin1 (if rcc is bypassed)
+ std::string s = to8Bit(true);
@ -543,39 +600,7 @@
case Latin1:
{
ByteVector v(size(), 0);
@@ -738,12 +780,29 @@ void String::detach()
// private members
////////////////////////////////////////////////////////////////////////////////
-void String::copyFromLatin1(const char *s, size_t length)
+void String::copyFromLatin1(const char *s, size_t length, bool prepare, Type t)
{
d->data.resize(length);
-
for(size_t i = 0; i < length; ++i)
d->data[i] = static_cast<uchar>(s[i]);
+
+ // librcc conversation
+ if (prepare) {
+ std::string s = to8Bit(false);
+ ByteVector v;
+
+ if (t == Latin1ID3) v = rccTaglibPatchRecodeInputID3(s, false);
+ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(s, true);
+ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(s);
+
+ if (v.size()) {
+ copyFromUTF8(v.data(), v.size());
+ } else {
+ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed,
+ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8
+ //if (Unicode::isLegalUTF8(s)) t = UTF8;
+ }
+ }
}
void String::copyFromUTF8(const char *s, size_t length)
@@ -859,7 +918,33 @@ const TagLib::String operator+(const Tag
@@ -822,7 +885,35 @@ const TagLib::String operator+(const TagLib::String &s1, const char *s2)
std::ostream &operator<<(std::ostream &s, const TagLib::String &str)
{
@ -610,44 +635,39 @@
+ return Latin1;
+ return type;
+}
--- taglib/toolkit/tstring.h.orig 2015-11-11 21:41:59 UTC
+
+
diff --git taglib/toolkit/tstring.h taglib/toolkit/tstring.h
index b1be04b..b21f297 100644
--- taglib/toolkit/tstring.h
+++ taglib/toolkit/tstring.h
@@ -96,6 +96,18 @@ namespace TagLib {
*/
enum Type {
/*!
+ * Determine using current locale settings
+ */
+ * Determine using current locale settings
+ */
+ Locale = -1,
+ /*!
+ * Latin1 for ID3 tags.
+ */
+ /*!
+ * Latin1 for ID3 tags.
+ */
+ Latin1ID3 = 65,
+ /*!
+ * Latin1 for ID3v2 tags.
+ */
+ /*!
+ * Latin1 for ID3v2 tags.
+ */
+ Latin1ID3V2 = 66,
+ /*!
* IS08859-1, or <i>Latin1</i> encoding. 8 bit characters.
*/
Latin1 = 0,
@@ -118,6 +130,10 @@ namespace TagLib {
@@ -117,6 +129,10 @@ namespace TagLib {
*/
UTF16LE = 4
};
+
+ static Type ID3Type(int i);
+ static Type ID3WType(Type type);
+ static Type ID3RealType(Type type);
+
/*!
* Constructs an empty String.
*/
@@ -519,7 +535,7 @@ namespace TagLib {
* Converts a \e Latin-1 string into \e UTF-16(without BOM/CPU byte order)
* and copies it to the internal buffer.
*/
- void copyFromLatin1(const char *s, size_t length);
+ void copyFromLatin1(const char *s, size_t length, bool prepare = false, Type t = Latin1);
/*!
* Converts a \e UTF-8 string into \e UTF-16(without BOM/CPU byte order)
* Constructs an empty String.

3
audio/taglib/pkg-plist
View file

@ -56,6 +56,7 @@ include/taglib/oggpageheader.h
include/taglib/opusfile.h
include/taglib/opusproperties.h
include/taglib/ownershipframe.h
include/taglib/podcastframe.h
include/taglib/popularimeterframe.h
include/taglib/privateframe.h
%%RCC%%include/taglib/rccpatch.h
@ -106,7 +107,7 @@ include/taglib/xmfile.h
include/taglib/xmproperties.h
lib/libtag.so
lib/libtag.so.1
lib/libtag.so.1.15.1
lib/libtag.so.1.17.0
lib/libtag_c.so
lib/libtag_c.so.0
lib/libtag_c.so.0.0.0

5
audio/tomahawk/Makefile
View file

@ -31,6 +31,11 @@ CMAKE_ARGS= -DBUILD_RELEASE="ON"
CXXFLAGS+= -Wno-cast-align -I${LOCALBASE}/include
LDFLAGS+= -lz
BROKEN= Does not build against new qtkeychain-0.80.0
# https://github.com/tomahawk-player/tomahawk/commit/c8389592488c07079f40e7edb9195cfabbc58740
DEPRECATED= Project is dead upstream.
EXPIRATION_DATE=2017-08-31
GH_ACCOUNT= tomahawk-player
TELEPATHY_LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4

5
databases/redis-devel/Makefile
View file

@ -2,8 +2,9 @@
# $FreeBSD$
PORTNAME= redis
DISTVERSION= 4.0-rc3
DISTVERSION= 4.0.1
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
PKGNAMESUFFIX= -devel
MAINTAINER= osa@FreeBSD.org
@ -12,8 +13,6 @@ COMMENT= Persistent key-value database with built-in net interface
LICENSE= BSD3CLAUSE
USES= execinfo
USE_GITHUB= yes
GH_ACCOUNT= antirez
OPTIONS_DEFINE= TESTS TRIB
OPTIONS_RADIO= EXTLUA

6
databases/redis-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1496741468
SHA256 (antirez-redis-4.0-rc3_GH0.tar.gz) = bc948bcb32dc4ba43412dd791b4bb48c64de9debb797346b9c9f1b2cb98f96f4
SIZE (antirez-redis-4.0-rc3_GH0.tar.gz) = 1743279
TIMESTAMP = 1501940723
SHA256 (redis-4.0.1.tar.gz) = 2049cd6ae9167f258705081a6ef23bb80b7eff9ff3d0d7481e89510f27457591
SIZE (redis-4.0.1.tar.gz) = 1711660

16
databases/redis-devel/files/extra-patch-src-Makefile.lua
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2017-05-06 13:55:29.224222000 -0400
+++ src/Makefile 2017-05-06 13:57:41.129934000 -0400
--- src/Makefile.orig 2017-08-06 10:42:53.992510000 -0400
+++ src/Makefile 2017-08-06 10:44:57.344366000 -0400
@@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@ -9,7 +9,7 @@
NODEPS:=clean distclean
# Default settings
@@ -58,8 +58,8 @@
@@ -63,8 +63,8 @@
# Override default settings if possible
-include .make-settings
@ -20,7 +20,7 @@
FINAL_LIBS=-lm
ifeq ($(uname_S),SunOS)
@@ -107,7 +107,7 @@
@@ -112,7 +112,7 @@
endif
endif
# Include paths to dependencies
@ -29,7 +29,7 @@
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -125,6 +125,9 @@
@@ -130,6 +130,9 @@
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
endif
@ -39,15 +39,15 @@
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@@ -145,6 +148,7 @@
@@ -150,6 +153,7 @@
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
REDIS_CLI_NAME=redis-cli
REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -197,7 +201,7 @@
@@ -201,7 +205,7 @@
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

16
databases/redis-devel/files/extra-patch-src-Makefile.luajit
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2017-05-06 13:55:29.224222000 -0400
+++ src/Makefile 2017-05-06 13:57:41.129934000 -0400
--- src/Makefile.orig 2017-08-06 10:48:29.559222000 -0400
+++ src/Makefile 2017-08-06 10:50:45.155432000 -0400
@@ -16,7 +16,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@ -9,7 +9,7 @@
NODEPS:=clean distclean
# Default settings
@@ -58,8 +58,8 @@
@@ -63,8 +63,8 @@
# Override default settings if possible
-include .make-settings
@ -20,7 +20,7 @@
FINAL_LIBS=-lm
ifeq ($(uname_S),SunOS)
@@ -107,7 +107,7 @@
@@ -112,7 +112,7 @@
endif
endif
# Include paths to dependencies
@ -29,7 +29,7 @@
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -125,6 +125,9 @@
@@ -130,6 +130,9 @@
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
endif
@ -39,15 +39,15 @@
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@@ -145,6 +148,7 @@
@@ -150,6 +153,7 @@
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
REDIS_CLI_NAME=redis-cli
REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -197,7 +201,7 @@
@@ -201,7 +205,7 @@
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

2
databases/redis/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
DISTVERSION= 3.2.9
DISTVERSION= 3.2.10
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/

6
databases/redis/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1496620704
SHA256 (redis-3.2.9.tar.gz) = 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
SIZE (redis-3.2.9.tar.gz) = 1547695
TIMESTAMP = 1502031657
SHA256 (redis-3.2.10.tar.gz) = 411c604a716104f7f5a326abfad32de9cea10f15f987bec45cf86f315e9e63a0
SIZE (redis-3.2.10.tar.gz) = 1550261

2
devel/jenkins/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jenkins
PORTVERSION= 2.71
PORTVERSION= 2.72
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
DISTNAME= jenkins

6
devel/jenkins/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500896706
SHA256 (jenkins/2.71/jenkins.war) = 14727da24054e956dc8b8514998e19001c99efce637891f544d2a9b3d9ea752c
SIZE (jenkins/2.71/jenkins.war) = 72956752
TIMESTAMP = 1502058553
SHA256 (jenkins/2.72/jenkins.war) = 7f1a9271fe4cc0680071781efb0586477168477c7f914d71c52db177906d376e
SIZE (jenkins/2.72/jenkins.war) = 72961690

5
devel/p5-Devel-Size/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Devel-Size
PORTVERSION= 0.80
PORTVERSION= 0.81
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -16,4 +16,7 @@ LICENSES= ART10 GPLv1
USES= perl5
USE_PERL5= configure
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/Size/Size.so
.include <bsd.port.mk>

5
devel/p5-Devel-Size/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (Devel-Size-0.80.tar.gz) = ca3a089cb263ab6b9751df777cf6d3df3ba470d471d300a8076e4be6e288d057
SIZE (Devel-Size-0.80.tar.gz) = 72856
TIMESTAMP = 1502014718
SHA256 (Devel-Size-0.81.tar.gz) = 7714cd56b9092f0139f12bbbc3ef3758fe9fc64083f7493114deca53b401f949
SIZE (Devel-Size-0.81.tar.gz) = 73184

3
devel/p5-ExtUtils-ParseXS/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ExtUtils-ParseXS
PORTVERSION= 3.24
PORTREVISION= 1
PORTVERSION= 3.35
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SMUELLER

5
devel/p5-ExtUtils-ParseXS/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (ExtUtils-ParseXS-3.24.tar.gz) = 30b60b8208fc9b7746ed934b678bb9618a8f28994dae8774548353a7b550371e
SIZE (ExtUtils-ParseXS-3.24.tar.gz) = 66863
TIMESTAMP = 1502031346
SHA256 (ExtUtils-ParseXS-3.35.tar.gz) = 41def0511278a2a8ba9afa25ccab45b0453f75e7fd774e8644b5f9a57cc4ee1c
SIZE (ExtUtils-ParseXS-3.35.tar.gz) = 68623

2
devel/py-pefile/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pefile
PORTVERSION= 2017.5.26
PORTVERSION= 2017.8.1
CATEGORIES= devel python
MASTER_SITES= https://github.com/erocarrera/pefile/releases/download/v${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-pefile/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495864873
SHA256 (pefile-2017.5.26.tar.gz) = 1fd02ae5489dd87ec7c9ecf44b675e92ee4a34e513efe7417befeb9f438e9987
SIZE (pefile-2017.5.26.tar.gz) = 60766
TIMESTAMP = 1502010353
SHA256 (pefile-2017.8.1.tar.gz) = 363f7d1f4d58b7bf8a46dd8b1d48805d270d1ea4dab2526ce183d71ed89075b1
SIZE (pefile-2017.8.1.tar.gz) = 60809

1
german/wordpress/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= wordpress
PORTVERSION= 4.8.1
PORTREVISION= 1
DISTVERSIONSUFFIX= -de_DE
CATEGORIES= german www
MASTER_SITES= http://de.wordpress.org/

6
german/wordpress/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1501750341
SHA256 (wordpress-4.8.1-de_DE.tar.gz) = d7d699d73ee5cbe9e4a78bc3ff26d72e09381ab8488173c1b0f67be66fda1d23
SIZE (wordpress-4.8.1-de_DE.tar.gz) = 8660478
TIMESTAMP = 1501953514
SHA256 (wordpress-4.8.1-de_DE.tar.gz) = 5363d171a81825ee72e09f9ec675bc8ed59e71a078363a4c22156b26e148e785
SIZE (wordpress-4.8.1-de_DE.tar.gz) = 8660299

2
graphics/cairo-reference/pkg-descr
View file

@ -1,3 +1,3 @@
This port contains the programming reference for graphics/cairo.
WWW: http://www.cairographics.org
WWW: https://www.cairographics.org/

4
graphics/dspdfviewer/Makefile
View file

@ -39,4 +39,8 @@ PLIST_FILES= bin/dspdfviewer \
CFLAGS+= -Wno-error=undefined-func-template
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039
CFLAGS+= -Wno-error=zero-as-null-pointer-constant
.endif
.include <bsd.port.post.mk>

3
graphics/gle-graphics/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= gle-graphics
DISTVERSION= 4.2.4cf
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= graphics print
MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1}
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@ -44,7 +44,6 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}
REINPLACE_FILES= configure
USE_GCC= yes
USE_GL= yes
USE_LDCONFIG= yes
USE_QT4= corelib gui moc network opengl rcc qmake_build

20
graphics/gle-graphics/files/patch-src_gle_d__x.cpp Normal file
View file

@ -0,0 +1,20 @@
--- src/gle/d_x.cpp.orig 2011-10-26 21:10:54 UTC
+++ src/gle/d_x.cpp
@@ -199,7 +199,7 @@ void X11GLEDevice::setfillstyle(int i) {
#define BM_HEIGHT 16
Pixmap bm;
//unsigned
-const char bm_bits[][32] = {
+const unsigned char bm_bits[][32] = {
{ 0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04,
0x00, 0x02, 0x00, 0x01, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00,
0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x00}, /* SHADE */
@@ -238,7 +238,7 @@ const char bm_bits[][32] = {
0x1c, 0x38, 0x0e, 0x70, 0x07, 0xe0, 0x03, 0xc0} /* GRID 5 */
};
- bm = XCreateBitmapFromData(dpy,window1,bm_bits[i],BM_WIDTH,BM_HEIGHT);
+ bm = XCreateBitmapFromData(dpy,window1,(const char*)bm_bits[i],BM_WIDTH,BM_HEIGHT);
XSetStipple(dpy, gcf, bm);
XSetFillStyle(dpy, gcf, FillStippled);
XFreePixmap(dpy, bm);

11
graphics/gle-graphics/files/patch-src_gle_op__def.h Normal file
View file

@ -0,0 +1,11 @@
--- src/gle/op_def.h.orig 2011-10-26 21:10:54 UTC
+++ src/gle/op_def.h
@@ -40,7 +40,7 @@ struct op_key {
char name[256];
int typ;
int pos;
- int idx;
+ signed long idx;
};
#define typ_end 0

18
graphics/gle-graphics/files/patch-src_gle_surface_ffitcontour.cpp Normal file
View file

@ -0,0 +1,18 @@
--- src/gle/surface/ffitcontour.cpp.orig 2011-06-13 08:36:41 UTC
+++ src/gle/surface/ffitcontour.cpp
@@ -43,15 +43,9 @@
/* "f2c.h" defines abs() -- conflict with the definition in <math.h> */
/* changing the order solves the problem */
-#if ( defined(__OS2__) && defined(__EMX__) ) || defined(__WIN32__)
#include <stdio.h>
#include <math.h>
#include "f2c.h"
-#else
-#include "f2c.h"
-#include <stdio.h>
-#include <math.h>
-#endif
doublereal gutre2_(real* a, real* b);
void gd_message__(const char *s, int l);

15
graphics/gle-graphics/files/patch-src_gle_tokens_StringKeyHash.h Normal file
View file

@ -0,0 +1,15 @@
--- src/gle/tokens/StringKeyHash.h.orig 2012-02-19 21:07:34 UTC
+++ src/gle/tokens/StringKeyHash.h
@@ -75,10 +75,12 @@
using namespace std;
#ifndef GCC2
+#ifndef _LIBCPP_VERSION
#ifndef _MSC_VER
using namespace __gnu_cxx; // using gnu extensions such as "hash"
#endif
#endif
+#endif
#include "RefCount.h"
#include "BinIO.h"

2
graphics/libjpeg-turbo/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= lib
PORTREVISION= 1
PORTREVISION= 0
COMMENT= SIMD-accelerated JPEG codec library, provides libTurboJPEG

5
mail/dovecot2/Makefile
View file

@ -3,8 +3,7 @@
######################################################################
# Anytime PORTVERSION changes please bump PORTREVISION of #
# mail/dovecot2-pigeonhole and also mail/dovecot2-antispam-plugin. #
# Please see ports/135311 and ports/146029 for an explanation. #
# mail/dovecot2-pigeonhole. See ports/146029 for an explanation. #
# #
# Please be careful when updating this port as changes to this port #
# can break mail/dovecot2-pigeonhole. In order to ensure the least #
@ -25,8 +24,6 @@ COMMENT= Secure, fast and powerful IMAP and POP3 server
LICENSE= LGPL21 MIT
LICENSE_COMB= dual
CONFLICTS= dovecot-1.[0-9]*
USES= cpe iconv libtool ssl
USE_RC_SUBR= dovecot

27
multimedia/xmms/Makefile
View file

@ -14,10 +14,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X Multimedia System -- audio player with Winamp GUI
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS?= ru-xmms-[0-9]* zh-xmms-[0-9]*
GNU_CONFIGURE= yes
USES= desktop-file-utils gmake iconv libtool pathfix tar:bzip2
USES= desktop-file-utils gmake iconv libtool localbase pathfix tar:bzip2
USE_GNOME= gtk12
USE_LDCONFIG= yes
USE_XORG= sm x11 xxf86vm
@ -26,8 +27,6 @@ CONFIGURE_ARGS= xmms_cv_newpcm_driver=yes --disable-static
CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \
OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INPUT_PLUGINS= cdaudio mpg123 tonegen wav
OUTPUT_PLUGINS= OSS disk_writer
@ -41,11 +40,13 @@ OPTIONS_SUB= yes
ESOUND_CONFIGURE_ENABLE=esd
ESOUND_USE= GNOME=esound
ESOUND_VARS= OUTPUT_PLUGINS+=esd
IPV6_CONFIGURE_ENABLE= ipv6
MIKMOD_CONFIGURE_ENABLE=mikmod
MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod
MIKMOD_VARS= INPUT_PLUGINS+=mikmod
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
@ -55,35 +56,19 @@ SIMD_CONFIGURE_ENABLE= simd
SPEC_DESC= Visualization opengl_spectrum
SPEC_CONFIGURE_ENABLE= opengl
SPEC_USE= GL=gl
SPEC_VARS= VISUALIZATION_PLUGINS+=opengl_spectrum
VFILEINFO_DESC= Enable Extended Vorbis Fileinfo
VFILEINFO_CPPFLAGS= -DALL_VORBIS_TAGS
VORBIS_CONFIGURE_ENABLE=vorbis
VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
VORBIS_VARS= INPUT_PLUGINS+=vorbis
.if !defined(WITH_DEBUG)
INSTALL_TARGET= install-strip
.endif
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MESOUND}
OUTPUT_PLUGINS+= esd
.endif
.if ${PORT_OPTIONS:MMIKMOD}
INPUT_PLUGINS+= mikmod
.endif
.if ${PORT_OPTIONS:MVORBIS}
INPUT_PLUGINS+= vorbis
.endif
.if ${PORT_OPTIONS:MSPEC}
VISUALIZATION_PLUGINS+= opengl_spectrum
.endif
post-patch:
@${REINPLACE_CMD} -e 's/alsa_found=yes/alsa_found=no/' \
${WRKSRC}/configure

127
net-im/mastodon/Makefile
View file

@ -2,8 +2,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
PORTREVISION= 1
DISTVERSION= 1.5.1
CATEGORIES= net-im www
MAINTAINER= jrm@FreeBSD.org
@ -14,76 +13,74 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libidn2.so:dns/libidn2
RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
gmake>0:devel/gmake \
libpqtypes>1.5.0:databases/libpqtypes \
npm>=0:www/npm
libpqtypes>1.5.0:databases/libpqtypes
# Dependencies below match Gemfile layout
RUN_DEPENDS+= rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
RUN_DEPENDS+= rubygem-pkg-config>=1.2.3:devel/rubygem-pkg-config
RUN_DEPENDS+= rubygem-puma>0:www/rubygem-puma \
rubygem-rails5>0:www/rubygem-rails5 \
rubygem-uglifier>0:www/rubygem-uglifier
RUN_DEPENDS+= rubygem-puma>=3.9.1:www/rubygem-puma \
rubygem-rails5>=5.1.3:www/rubygem-rails5 \
rubygem-uglifier>=3.2.0:www/rubygem-uglifier
RUN_DEPENDS+= rubygem-hamlit-rails-rails5>0:www/rubygem-hamlit-rails-rails5 \
rubygem-pg>0:databases/rubygem-pg \
rubygem-pghero-rails5>0:databases/rubygem-pghero-rails5 \
rubygem-dotenv-rails-rails5>0:misc/rubygem-dotenv-rails-rails5
RUN_DEPENDS+= rubygem-hamlit-rails-rails5>=0.2.0:www/rubygem-hamlit-rails-rails5 \
rubygem-pg>=0.21.0:databases/rubygem-pg \
rubygem-pghero-rails5>=1.7.0:databases/rubygem-pghero-rails5 \
rubygem-dotenv-rails-rails5>=2.2.1:misc/rubygem-dotenv-rails-rails5
RUN_DEPENDS+= rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
rubygem-paperclip-rails5>0:devel/rubygem-paperclip-rails5 \
rubygem-paperclip-av-transcoder>0:multimedia/rubygem-paperclip-av-transcoder
RUN_DEPENDS+= rubygem-aws-sdk>=2.10.17:devel/rubygem-aws-sdk \
rubygem-paperclip-rails5>=5.1.0:devel/rubygem-paperclip-rails5 \
rubygem-paperclip-av-transcoder>=0.6.4:multimedia/rubygem-paperclip-av-transcoder
RUN_DEPENDS+= rubygem-active_model_serializers>0:databases/rubygem-active_model_serializers \
rubygem-addressable>0:www/rubygem-addressable \
rubygem-browser>0:www/rubygem-browser \
rubygem-charlock_holmes>0:textproc/rubygem-charlock_holmes \
rubygem-cld3>0:textproc/rubygem-cld3 \
rubygem-devise-rails5>0:devel/rubygem-devise-rails5 \
rubygem-devise-two-factor-rails5>0:security/rubygem-devise-two-factor-rails5 \
rubygem-doorkeeper-rails5>0:security/rubygem-doorkeeper-rails5 \
rubygem-fast_blank>0:devel/rubygem-fast_blank \
rubygem-goldfinger>0:www/rubygem-goldfinger \
rubygem-hiredis>0:databases/rubygem-hiredis \
rubygem-redis-namespace>0:databases/rubygem-redis-namespace \
rubygem-htmlentities>0:textproc/rubygem-htmlentities \
rubygem-http>0:www/rubygem-http \
rubygem-http_accept_language>0:devel/rubygem-http_accept_language \
rubygem-httplog>0:sysutils/rubygem-httplog \
rubygem-idn-ruby>0:dns/rubygem-idn-ruby \
rubygem-kaminari-rails5>0:www/rubygem-kaminari-rails5 \
rubygem-link_header>0:www/rubygem-link_header \
rubygem-nokogiri>0:textproc/rubygem-nokogiri \
rubygem-oj>0:devel/rubygem-oj \
rubygem-ostatus2>0:www/rubygem-ostatus2 \
rubygem-ox>0:textproc/rubygem-ox \
rubygem-pundit>0:security/rubygem-pundit \
rubygem-rabl>0:devel/rubygem-rabl \
rubygem-rack-attack>0:www/rubygem-rack-attack \
rubygem-rack-cors0>0:www/rubygem-rack-cors0 \
rubygem-rack-timeout>0:www/rubygem-rack-timeout \
rubygem-rails-i18n>0:devel/rubygem-rails-i18n \
rubygem-rails-settings-cached-rails5>0:www/rubygem-rails-settings-cached-rails5 \
rubygem-redis>0:databases/rubygem-redis \
rubygem-mario-redis-lock>0:databases/rubygem-mario-redis-lock \
rubygem-rqrcode>0:www/rubygem-rqrcode \
rubygem-ruby-oembed>0:www/rubygem-ruby-oembed \
rubygem-sanitize>0:textproc/rubygem-sanitize \
rubygem-sidekiq>0:devel/rubygem-sidekiq \
rubygem-sidekiq-scheduler>0:devel/rubygem-sidekiq-scheduler \
rubygem-sidekiq-unique-jobs>0:devel/rubygem-sidekiq-unique-jobs \
rubygem-sidekiq-bulk-rails5>0:devel/rubygem-sidekiq-bulk-rails5 \
rubygem-simple-navigation>0:devel/rubygem-simple-navigation \
rubygem-simple_form-rails5>0:devel/rubygem-simple_form-rails5 \
rubygem-sprockets-rails-rails5>0:devel/rubygem-sprockets-rails-rails5 \
rubygem-statsd-instrument>0:devel/rubygem-statsd-instrument \
rubygem-twitter-text>0:textproc/rubygem-twitter-text \
rubygem-tzinfo-data>0:devel/rubygem-tzinfo-data \
rubygem-webpacker-rails5>0:devel/rubygem-webpacker-rails5 \
rubygem-webpush>0:security/rubygem-webpush
RUN_DEPENDS+= rubygem-active_model_serializers>=0.10.6:databases/rubygem-active_model_serializers \
rubygem-addressable>=2.5.1_1:www/rubygem-addressable \
rubygem-browser>=2.4.0:www/rubygem-browser \
rubygem-charlock_holmes>=0.7.3_5:textproc/rubygem-charlock_holmes \
rubygem-cld3>=3.1.3_1:textproc/rubygem-cld3 \
rubygem-devise-rails5>=4.3.0:devel/rubygem-devise-rails5 \
rubygem-devise-two-factor-rails5>=3.0.0:security/rubygem-devise-two-factor-rails5 \
rubygem-doorkeeper-rails5>=4.2.6:security/rubygem-doorkeeper-rails5 \
rubygem-fast_blank>=1.0.0:devel/rubygem-fast_blank \
rubygem-goldfinger>=2.0.1:www/rubygem-goldfinger \
rubygem-hiredis>=0.6.1:databases/rubygem-hiredis \
rubygem-redis-namespace>=1.5.3:databases/rubygem-redis-namespace \
rubygem-htmlentities>=4.3.4:textproc/rubygem-htmlentities \
rubygem-http>=2.2.2:www/rubygem-http \
rubygem-http_accept_language>=2.1.1:devel/rubygem-http_accept_language \
rubygem-httplog>=0.99.7:sysutils/rubygem-httplog \
rubygem-idn-ruby>=0.1.0:dns/rubygem-idn-ruby \
rubygem-kaminari-rails5>=1.0.1:www/rubygem-kaminari-rails5 \
rubygem-link_header>=0.0.8:www/rubygem-link_header \
rubygem-nokogiri>=1.8.0_1:textproc/rubygem-nokogiri \
rubygem-oj>=3.3.4:devel/rubygem-oj \
rubygem-ostatus2>=2.0.1:www/rubygem-ostatus2 \
rubygem-ox>=2.5.0:textproc/rubygem-ox \
rubygem-pundit>=1.1.0:security/rubygem-pundit \
rubygem-rabl>=0.13.1_1:devel/rubygem-rabl \
rubygem-rack-attack>=5.0.1:www/rubygem-rack-attack \
rubygem-rack-cors0>=0.4.1:www/rubygem-rack-cors0 \
rubygem-rack-timeout>=0.4.2:www/rubygem-rack-timeout \
rubygem-rails-i18n>=5.0.4:devel/rubygem-rails-i18n \
rubygem-rails-settings-cached-rails5>=0.6.6:www/rubygem-rails-settings-cached-rails5 \
rubygem-redis>=3.3.3:databases/rubygem-redis \
rubygem-mario-redis-lock>=1.2.0:databases/rubygem-mario-redis-lock \
rubygem-rqrcode>=0.10.1:www/rubygem-rqrcode \
rubygem-ruby-oembed>=0.12.0:www/rubygem-ruby-oembed \
rubygem-sanitize>=4.5.0:textproc/rubygem-sanitize \
rubygem-sidekiq>=5.0.4:devel/rubygem-sidekiq \
rubygem-sidekiq-scheduler>=2.1.8:devel/rubygem-sidekiq-scheduler \
rubygem-sidekiq-unique-jobs>=5.0.9:devel/rubygem-sidekiq-unique-jobs \
rubygem-sidekiq-bulk-rails5>=0.1.1:devel/rubygem-sidekiq-bulk-rails5 \
rubygem-simple-navigation>=4.0.5_1:devel/rubygem-simple-navigation \
rubygem-simple_form-rails5>=3.5.0:devel/rubygem-simple_form-rails5 \
rubygem-sprockets-rails-rails5>=3.2.0:devel/rubygem-sprockets-rails-rails5 \
rubygem-statsd-instrument>=2.1.4:devel/rubygem-statsd-instrument \
rubygem-twitter-text>=1.14.7:textproc/rubygem-twitter-text \
rubygem-tzinfo-data>=1.2017.2:devel/rubygem-tzinfo-data \
rubygem-webpacker-rails5>=2.0:devel/rubygem-webpacker-rails5 \
rubygem-webpush>=0.3.2_1:security/rubygem-webpush
RUN_DEPENDS+= rubygem-lograge-rails5>0:www/rubygem-lograge-rails5 \
rubygem-redis-rails-rails5>0:www/rubygem-redis-rails-rails5
RUN_DEPENDS+= rubygem-lograge-rails5>=0.6.0:www/rubygem-lograge-rails5 \
rubygem-redis-rails-rails5>=5.0.2:www/rubygem-redis-rails-rails5
USES= gnome pgsql python:2 shebangfix
USE_GITHUB= yes

6
net-im/mastodon/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1501596174
SHA256 (tootsuite-mastodon-v1.5.0_GH0.tar.gz) = bead519f6a0fb2d45f7e83c5fa50c0340ff61b8d4c51154c6d92e490d558192a
SIZE (tootsuite-mastodon-v1.5.0_GH0.tar.gz) = 9993509
TIMESTAMP = 1502067757
SHA256 (tootsuite-mastodon-v1.5.1_GH0.tar.gz) = 1caa5eaf1c5095203f52c7eb4b3f13fff31569dbf0b9f2af0320995b2ac9677b
SIZE (tootsuite-mastodon-v1.5.1_GH0.tar.gz) = 9990113

15
net-im/mastodon/files/patch-package.json Normal file
View file

@ -0,0 +1,15 @@
--- package.json.orig 2017-08-05 12:54:54 UTC
+++ package.json
@@ -7,10 +7,9 @@
"build:production": "cross-env RAILS_ENV=production ./bin/webpack",
"manage:translations": "node ./config/webpack/translationRunner.js",
"start": "node ./streaming/index.js",
- "test": "npm run test:lint && npm run test:mocha",
+ "test": "yarn run test:lint && yarn run test:mocha",
"test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
- "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js",
- "postinstall": "npm rebuild node-sass"
+ "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js"
},
"repository": {
"type": "git",

11
net-im/mastodon/files/patch-yarn.lock Normal file
View file

@ -0,0 +1,11 @@
--- yarn.lock.orig 2017-08-05 12:54:17 UTC
+++ yarn.lock
@@ -6587,6 +6587,8 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
uws@^8.14.0:
version "8.14.0"
resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
+ dependencies:
+ node-gyp "^3.3.1"
validate-npm-package-license@^3.0.1:
version "3.0.1"

1
net-im/mastodon/pkg-plist
View file

@ -922,6 +922,7 @@
%%WWWDIR%%/app/views/layouts/embedded.html.haml
%%WWWDIR%%/app/views/layouts/error.html.haml
%%WWWDIR%%/app/views/layouts/mailer.text.erb
%%WWWDIR%%/app/views/layouts/modal.html.haml
%%WWWDIR%%/app/views/layouts/public.html.haml
%%WWWDIR%%/app/views/manifests/show.json.rabl
%%WWWDIR%%/app/views/notification_mailer/_status.text.erb

4
net-mgmt/2ping/Makefile
View file

@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= 2ping
PORTVERSION= 4.0.1
PORTVERSION= 4.1
CATEGORIES= net-mgmt perl5
MASTER_SITES= http://www.finnie.org/software/2ping/ \
MASTER_SITES= https://www.finnie.org/software/2ping/ \
LOCAL/sunpoet
MAINTAINER= sunpoet@FreeBSD.org

6
net-mgmt/2ping/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500809079
SHA256 (2ping-4.0.1.tar.gz) = 95aa1a694da402cee7fefd1da61a08828bf11d82b012824802098a3d5e380567
SIZE (2ping-4.0.1.tar.gz) = 67347
TIMESTAMP = 1502014711
SHA256 (2ping-4.1.tar.gz) = 85331ae57f445bc8895ba4e61da4c7300b67fde55642f5e42ea02f2daf07b1ed
SIZE (2ping-4.1.tar.gz) = 69510

2
net-mgmt/icingaweb2-module-map/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= icingaweb2-module-map
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0
DISTVERSION= 1.0.1
CATEGORIES= net-mgmt www
MAINTAINER= lme@FreeBSD.org

6
net-mgmt/icingaweb2-module-map/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1501967560
SHA256 (nbuchwitz-icingaweb2-module-map-v1.0.0_GH0.tar.gz) = 5003d4ff31dfc5252cf7e7f85feb99c7ee5c8e91196f3594e64a403da6169fb8
SIZE (nbuchwitz-icingaweb2-module-map-v1.0.0_GH0.tar.gz) = 1547054
TIMESTAMP = 1502042784
SHA256 (nbuchwitz-icingaweb2-module-map-v1.0.1_GH0.tar.gz) = 58b738cacd5d691f0c349aa1f69e183446a0ed89e20d640b2bafe3b207b9e73a
SIZE (nbuchwitz-icingaweb2-module-map-v1.0.1_GH0.tar.gz) = 1550863

3
net-mgmt/icingaweb2-module-map/pkg-plist
View file

@ -11,6 +11,7 @@
%%WWWDIR%%/library/Map/ProvidedHook/Monitoring/HostActions.php
%%WWWDIR%%/module.info
%%WWWDIR%%/public/css/module.less
%%WWWDIR%%/public/css/third-party/L.Control.Locate.min.css
%%WWWDIR%%/public/css/third-party/MarkerCluster.Default.css
%%WWWDIR%%/public/css/third-party/MarkerCluster.css
%%WWWDIR%%/public/css/third-party/leaflet.css
@ -26,12 +27,14 @@
%%WWWDIR%%/public/img/marker-icon.png
%%WWWDIR%%/public/img/marker-shadow.png
%%WWWDIR%%/public/js/module.js
%%WWWDIR%%/public/js/third-party/L.Control.Locate.min.js
%%WWWDIR%%/public/js/third-party/leaflet.js
%%WWWDIR%%/public/js/third-party/leaflet.markercluster.js
%%WWWDIR%%/run.php
%%WWWDIR%%/screenshots/clustered-map.png
%%WWWDIR%%/screenshots/clustered-map2.png
%%WWWDIR%%/screenshots/configuration-tab.png
%%WWWDIR%%/screenshots/dashboard.png
%%WWWDIR%%/screenshots/detailed-map.png
%%WWWDIR%%/screenshots/host-action.png
%%WWWDIR%%/screenshots/host-details.png

9
net/py-ripe.atlas.cousteau/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ripe.atlas.cousteau
PORTVERSION= 1.0.6
PORTVERSION= 1.4
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX=${PYTHON_PKGNAMEPREFIX}
@ -11,12 +11,15 @@ MAINTAINER= mstucchi@ripe.net
COMMENT= Python wrapper around the RIPE Atlas API
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client \
${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests
${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client
USES= python
NO_ARCH= yes
USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>

5
net/py-ripe.atlas.cousteau/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (ripe.atlas.cousteau-1.0.6.tar.gz) = 1407b003a03f359739d35010812af2841bc9df2784cd2078e55ac34d0a858ad6
SIZE (ripe.atlas.cousteau-1.0.6.tar.gz) = 45467
TIMESTAMP = 1501961426
SHA256 (ripe.atlas.cousteau-1.4.tar.gz) = 41e0c91ae4459a6c101448f5bafb043ba44b4abfd9a80a5ae0b4c3a1bb550a52
SIZE (ripe.atlas.cousteau-1.4.tar.gz) = 49303

2
security/py-artifacts/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= artifacts
PORTVERSION= 20170618
PORTVERSION= 20170806
CATEGORIES= security python
MASTER_SITES= CHEESESHOP \
https://github.com/ForensicArtifacts/artifacts/releases/download/${PORTVERSION}/

6
security/py-artifacts/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1497806646
SHA256 (artifacts-20170618.tar.gz) = 3162bb52aa26dd5b1ef93488ccc5794d86bb0a9dfcfcc12841a43f709a27df5f
SIZE (artifacts-20170618.tar.gz) = 58295
TIMESTAMP = 1502056290
SHA256 (artifacts-20170806.tar.gz) = fa4bd77c5cb0ac3c6ebd43a0101c495194adce27ec46d774219bea7608e91e8c
SIZE (artifacts-20170806.tar.gz) = 58705

8
security/py-certbot/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= certbot
PORTVERSION= 0.16.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
@ -14,7 +15,7 @@ COMMENT= Let's Encrypt client
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme==${PKGVERSION}:security/py-acme \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme \
${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography \
@ -28,8 +29,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme==${PKGVERSION}:security/py-acme \
${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
USES= python:-2.7
USE_PYTHON= autoplist distutils
# Actually 2.7,3.3+
USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes

2
security/py-dfdatetime/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dfdatetime
PORTVERSION= 20170704
PORTVERSION= 20170719
CATEGORIES= security devel python
MASTER_SITES= CHEESESHOP \
https://github.com/log2timeline/dfdatetime/releases/download/${PORTVERSION}/

6
security/py-dfdatetime/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1499163309
SHA256 (dfdatetime-20170704.tar.gz) = 71cb5926fa70ffcfbffa4fea7893c9c7178b656df2e3294f3d605f590442d452
SIZE (dfdatetime-20170704.tar.gz) = 27729
TIMESTAMP = 1501704527
SHA256 (dfdatetime-20170719.tar.gz) = 5715ee9d3b070e83a8877ee04d55c1353c35dfb739f2bbeb0edb05de4ee1b791
SIZE (dfdatetime-20170719.tar.gz) = 27920

4
security/py-dfvfs/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dfvfs
PORTVERSION= 20170406
PORTVERSION= 20170723
CATEGORIES= security devel python
MASTER_SITES= https://github.com/log2timeline/dfvfs/releases/download/${PORTVERSION}/ \
LOCAL/antoine
@ -32,6 +32,7 @@ RUN_DEPENDS= libbde>=a:devel/libbde \
${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
NO_ARCH= yes
USES= python:2.7
@ -48,6 +49,7 @@ TEST_DEPENDS+= ca_root_nss>=0:security/ca_root_nss
.endif
do-test:
@${TOUCH} ${TEST_WRKSRC}/utils/__init__.py
@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_tests.py)
.include <bsd.port.post.mk>

6
security/py-dfvfs/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1491542667
SHA256 (dfvfs-20170406.tar.gz) = 6106edab6682efc215f47ab0d2348b47de60d3eb43c5eafcd745d595e902c5ab
SIZE (dfvfs-20170406.tar.gz) = 165327
TIMESTAMP = 1501704272
SHA256 (dfvfs-20170723.tar.gz) = 33b9ec370d38d44c7b18edf9f8000529281fa6c2020a0062621ddb3a4a4f1299
SIZE (dfvfs-20170723.tar.gz) = 77652139

4
sysutils/py-pytsk/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pytsk
PORTVERSION= 20170508
PORTREVISION= 1
PORTVERSION= 20170802
CATEGORIES= sysutils security devel python
MASTER_SITES= CHEESESHOP \
https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/
@ -14,6 +13,7 @@ MAINTAINER= antoine@FreeBSD.org
COMMENT= Python bindings for the Sleuthkit
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libtalloc.so:devel/talloc \
libtsk.so:sysutils/sleuthkit

6
sysutils/py-pytsk/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1494336296
SHA256 (pytsk3-20170508.tar.gz) = 23865b4830f2d2819089d7fb2e6eaa1d0a592481580b37faf0e164e5dd99ac51
SIZE (pytsk3-20170508.tar.gz) = 3004540
TIMESTAMP = 1501704664
SHA256 (pytsk3-20170802.tar.gz) = 32259447c997104865ee5e09fb106fc1451019d57a6d4ffa82cbbce45a7b5495
SIZE (pytsk3-20170802.tar.gz) = 2934331

69
sysutils/py-pytsk/files/patch-setup.py
View file

@ -1,44 +1,43 @@
# Unbundle sleuthkit and talloc
--- setup.py.orig 2017-01-28 14:19:35 UTC
--- setup.py.orig 2017-08-01 06:49:05 UTC
+++ setup.py
@@ -169,9 +169,9 @@ class BuildExtCommand(build_ext):
@@ -178,9 +178,9 @@ class BuildExtCommand(build_ext):
def run(self):
compiler = new_compiler(compiler=self.compiler)
# pylint: disable=attribute-defined-outside-init
- self.define = self.configure_source_tree(compiler)
+ self.define = [("HAVE_TSK_LIBTSK_H", "")]
def run(self):
compiler = new_compiler(compiler=self.compiler)
- self.define = self.configure_source_tree(compiler)
+ self.define = [("HAVE_TSK_LIBTSK_H", "")]
- libtsk_path = os.path.join("sleuthkit", "tsk")
+ libtsk_path = os.path.join("%%LOCALBASE%%", "include", "tsk")
- libtsk_path = "sleuthkit/tsk"
+ libtsk_path = "%%LOCALBASE%%/include/tsk"
if not os.access("pytsk3.c", os.R_OK):
# Generate the Python binding code (pytsk3.c).
@@ -390,7 +390,7 @@ class ProjectBuilder(object):
self._argv = argv
if not os.access("pytsk3.c", os.R_OK):
# Generate the Python binding code (pytsk3.c).
@@ -325,7 +325,7 @@ class ProjectBuilder(object):
self._argv = argv
# The path to the sleuthkit/tsk directory.
- self._libtsk_path = os.path.join("sleuthkit", "tsk")
+ self._libtsk_path = os.path.join("%%LOCALBASE%%", "include", "tsk")
# The path to the "tsk" directory.
- self._libtsk_path = "sleuthkit/tsk"
+ self._libtsk_path = "%%LOCALBASE%%/include/tsk"
# Paths under the sleuthkit/tsk directory which contain files we need
# to compile.
@@ -400,13 +400,13 @@ class ProjectBuilder(object):
# The args for the extension builder.
self.extension_args = {
"define_macros": [],
- "include_dirs": ["talloc", self._libtsk_path, "sleuthkit", "."],
- "library_dirs": [],
- "libraries": []}
+ "include_dirs": [".", os.path.join("%%LOCALBASE%%", "include")],
+ "library_dirs": [os.path.join("%%LOCALBASE%%","lib")],
+ "libraries": ["tsk", "talloc"]}
# paths under the tsk/ directory which contain files we need to compile.
self._sub_library_names = "auto base docs fs hashdb img vs".split()
@@ -333,14 +333,14 @@ class ProjectBuilder(object):
# The args for the extension builder.
self.extension_args = dict(
define_macros=[],
- include_dirs=["talloc", "sleuthkit/tsk", "sleuthkit", "."],
- library_dirs=[],
- libraries=[],
+ include_dirs=[".", "%%LOCALBASE%%/include"],
+ library_dirs=["%%LOCALBASE%%/lib"],
+ libraries=["tsk", "talloc"],
)
# The sources to build.
self._source_files = [
- "class.c", "error.c", "tsk3.c", "pytsk3.c", "talloc/talloc.c"]
+ "class.c", "error.c", "tsk3.c", "pytsk3.c"]
# The sources to build.
self._source_files = ["class.c", "error.c", "tsk3.c",
- "pytsk3.c", "talloc/talloc.c"]
+ "pytsk3.c"]
# Path to the top of the unpacked sleuthkit sources.
self._sleuthkit_path = "sleuthkit"
# Path to the top of the unpacked sleuthkit sources.
self._sleuthkit_path = "sleuthkit"

2
sysutils/rubygem-facter/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= facter
PORTVERSION= 2.4.6
PORTVERSION= 2.5.0
CATEGORIES= sysutils rubygems
MASTER_SITES= RG \
http://downloads.puppetlabs.com/facter/

6
sysutils/rubygem-facter/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1470319555
SHA256 (rubygem/facter-2.4.6.gem) = 56ffc5fbcd550fcdb4788bc4d7fd0199bff69937d6df1e5a1f61c92d143d78fe
SIZE (rubygem/facter-2.4.6.gem) = 246272
TIMESTAMP = 1502016414
SHA256 (rubygem/facter-2.5.0.gem) = dd9c42a76630a7334570419b03886a1e2f0dc298db3630f92ed25090fad5241c
SIZE (rubygem/facter-2.5.0.gem) = 246784

9
www/rubygem-goldfinger/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= goldfinger
DISTVERSION= 2.0.0
PORTVERSION= 2.0.1
CATEGORIES= www rubygems
MASTER_SITES= RG
@ -11,13 +11,12 @@ COMMENT= Webfinger utility for Ruby
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-addressable>=2.4:www/rubygem-addressable \
rubygem-http>=2.0:www/rubygem-http \
rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
RUN_DEPENDS= rubygem-addressable>=2.5:www/rubygem-addressable \
rubygem-http>=2.2:www/rubygem-http \
rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri \
rubygem-oj>=3.0:devel/rubygem-oj
NO_ARCH= yes
USES= gem
USE_RUBY= yes

6
www/rubygem-goldfinger/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1501017446
SHA256 (rubygem/goldfinger-2.0.0.gem) = 85d587b7b23ac71309119c4efe9187f1b042e6dc561ae65c9a91828f6aa733a6
SIZE (rubygem/goldfinger-2.0.0.gem) = 8192
TIMESTAMP = 1502020761
SHA256 (rubygem/goldfinger-2.0.1.gem) = c8778ee96fd017f4ee9e2b7ce408681d254634fe2295e034288484613840a04e
SIZE (rubygem/goldfinger-2.0.1.gem) = 8192