*/*: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2017-03-07 03:12:47 +01:00
parent 4457d4f96a
commit 968ea4716c
337 changed files with 3361 additions and 2534 deletions

View File

@ -3,13 +3,14 @@
PORTNAME= libechonest
PORTVERSION= 2.3.1
#PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= nivit@FreeBSD.org
COMMENT= Collection of C++/Qt classes designed to use the APIs of The Echo Nest
LICENSE= GPLv2
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqjson.so:devel/qjson
@ -19,12 +20,12 @@ OPTIONS_DEFINE= TEST
PLIST_SUB= PORTVERSION=${PORTVERSION}
TEST_CMAKE_OFF= -DECHONEST_BUILD_TESTS:BOOL=OFF
TEST_USE= qt4=qtestlib_build
TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
TEST_USE= qt4=qtestlib_build,xml_build
USES= cmake pkgconfig
USE_GITHUB= yes
USE_LDCONFIG= yes
USE_QT4= qmake_build moc_build network rcc_build
USE_QT4= corelib qmake_build moc_build network rcc_build
.include <bsd.port.mk>

View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= mixxx
PORTVERSION= 1.11.0
PORTVERSION= 2.0.0
DISTVERSIONSUFFIX= -src
PORTREVISION= 15
CATEGORIES= audio
MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
@ -14,11 +13,14 @@ COMMENT= DJ mixing application
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libFLAC.so:audio/flac \
LIB_DEPENDS= libchromaprint.so:audio/chromaprint \
libFLAC.so:audio/flac \
libid3tag.so:audio/libid3tag \
libmad.so:audio/libmad \
libportaudio.so:audio/portaudio \
librubberband.so:audio/rubberband \
libsndfile.so:audio/libsndfile \
libvamp-sdk.so:audio/vamp-plugin-sdk \
libvorbisfile.so:audio/libvorbis \
libtag.so:audio/taglib \
libprotobuf.so:devel/protobuf
@ -27,18 +29,20 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BROKEN_aarch64= Fails to compile: Exception("invalid machine type")
USES= scons iconv
USE_QT4= corelib gui network opengl script sql svg xml \
linguisttools_build moc_build qmake_build rcc_build uic_build
USE_GL= glu
MAKE_ARGS= qtdir="${PREFIX}" optimize=0
USES= scons iconv pkgconfig
USE_QT4= corelib gui network opengl script scripttools sql svg \
testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
USE_GL= gl glu
MAKE_ARGS= qtdir="${PREFIX}" install_root="${PREFIX}" \
build=release optimize=native
LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR}
PORTDATA= *
PORTDOCS= *
OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK
OPTIONS_DEFAULT= FAAD SHOUTCAST WAVPACK
OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
OPTIONS_DEFAULT= FAAD HID SHOUTCAST OPUS WAVPACK
OPTIONS_SUB= yes
FAAD_LIB_DEPENDS= libfaad.so:audio/faad \
@ -48,7 +52,14 @@ FAAD_MAKE_ARGS_OFF= faad=0
GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools
GPERFTOOLS_MAKE_ARGS= perftools=1
GPERFTOOLS_MAKE_ARGS_OFF= perftools=0
HID_DESC= USB HID controllers support
HID_MAKE_ARGS= hid=1
HID_MAKE_ARGS_OFF= hid=0
LAME_RUN_DEPENDS= lame:audio/lame
OPUS_LIB_DEPENDS= libopus.so:audio/opus \
libopusfile.so:audio/opusfile
OPUS_MAKE_ARGS= opus=1
OPUS_MAKE_ARGS_OFF= opus=0
SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout
SHOUTCAST_MAKE_ARGS= shoutcast=1
SHOUTCAST_MAKE_ARGS_OFF= shoutcast=0
@ -66,7 +77,7 @@ post-patch:
${WRKSRC}/src/SConscript
@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx| ; \
s|^Icon=.*|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png|" \
${WRKSRC}/src/mixxx.desktop
${WRKSRC}/res/linux/mixxx.desktop
.for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h
@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
.endfor
@ -76,7 +87,7 @@ post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/*/*.so
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in Mixxx-Manual.pdf README README.macro
.for i in Mixxx-Manual.pdf README README.md
(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
${STAGEDIR}${DOCSDIR})
.endfor

View File

@ -1,2 +1,3 @@
SHA256 (mixxx-1.11.0-src.tar.gz) = 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331
SIZE (mixxx-1.11.0-src.tar.gz) = 24473835
TIMESTAMP = 1483555438
SHA256 (mixxx-2.0.0-src.tar.gz) = e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d
SIZE (mixxx-2.0.0-src.tar.gz) = 25300881

View File

@ -1,113 +1,64 @@
--- build/depends.py.orig 2013-05-08 23:20:26 UTC
--- build/depends.py.orig 2015-12-29 16:10:41 UTC
+++ build/depends.py
@@ -150,7 +150,7 @@ class FLAC(Dependence):
@@ -262,7 +262,7 @@ class Qt(Dependence):
class Qt(Dependence):
DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
- 'bsd': '/usr/local/lib/qt4',
+ 'bsd': '%%LOCALBASE%%/lib/qt4',
'osx': '/Library/Frameworks',
'windows': 'C:\\qt\\4.6.0'}
@@ -219,6 +219,7 @@ class Qt(Dependence):
build.env.Append(LIBS = 'QtOpenGL')
build.env.Append(LIBS = 'QtXml')
build.env.Append(LIBS = 'QtNetwork')
+ build.env.Append(LIBS = 'QtSql')
build.env.Append(LIBS = 'QtScript')
if use_qtwebkit:
build.env.Append(LIBS = 'QtWebKit')
@@ -264,16 +265,16 @@ class Qt(Dependence):
# Set Qt include paths for non-OSX
if not build.platform_is_osx:
- include_paths = ['$QTDIR/include/QtCore',
- '$QTDIR/include/QtGui',
- '$QTDIR/include/QtOpenGL',
- '$QTDIR/include/QtXml',
- '$QTDIR/include/QtNetwork',
- '$QTDIR/include/QtSql',
- '$QTDIR/include/QtScript',
- '$QTDIR/include/Qt']
+ include_paths = ['$QTDIR/include/qt4/QtCore',
+ '$QTDIR/include/qt4/QtGui',
+ '$QTDIR/include/qt4/QtOpenGL',
+ '$QTDIR/include/qt4/QtXml',
+ '$QTDIR/include/qt4/QtNetwork',
+ '$QTDIR/include/qt4/QtSql',
+ '$QTDIR/include/qt4/QtScript',
+ '$QTDIR/include/qt4/Qt']
if use_qtwebkit:
- include_paths.append('$QTDIR/include/QtWebKit')
+ include_paths.append('$QTDIR/include/qt4/QtWebKit')
elif build.platform_is_bsd:
build.env.Append(LIBS=qt_modules)
- include_paths = ['$QTDIR/include/%s' % module
+ include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
for module in qt_modules]
build.env.Append(CPPPATH=include_paths)
elif build.platform_is_osx:
@@ -358,7 +358,7 @@ class Qt(Dependence):
if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
qtdir = build.env['QTDIR']
framework_path = Qt.find_framework_libdir(qtdir, qt5)
- if os.path.isdir(framework_path):
+ if framework_path and os.path.isdir(framework_path):
build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
build.env.Append(LINKFLAGS="-L" + framework_path)
# Set the rpath for linux/bsd/osx.
@@ -387,7 +388,7 @@ class TagLib(Dependence):
# the files correctly. Adding this folder ot the include path should fix
# it, though might cause issues. This is safe to remove once we
# deprecate Karmic support. rryan 2/2011
- build.env.Append(CPPPATH='/usr/include/taglib/')
+ build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
@@ -1045,7 +1045,6 @@ class MixxxCore(Feature):
if build.platform_is_windows and build.static_dependencies:
build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
@@ -782,14 +783,9 @@ class MixxxCore(Feature):
if build.toolchain_is_gnu:
# Default GNU Options
# TODO(XXX) always generate debugging info?
- build.env.Append(CCFLAGS = '-pipe')
build.env.Append(CCFLAGS = '-Wall')
build.env.Append(CCFLAGS = '-Wextra')
- build.env.Append(CCFLAGS = '-g')
- build.env.Append(CCFLAGS='-pipe')
build.env.Append(CCFLAGS='-Wall')
build.env.Append(CCFLAGS='-Wextra')
- # Check that g++ is present (yeah, SCONS is a bit dumb here)
- if os.system("which g++ > /dev/null"): #Checks for non-zero return code
- raise Exception("Did not find g++.")
elif build.toolchain_is_msvs:
# Validate the specified winlib directory exists
mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
@@ -851,16 +847,19 @@ class MixxxCore(Feature):
@@ -1146,11 +1145,13 @@ class MixxxCore(Feature):
elif build.platform_is_bsd:
build.env.Append(CPPDEFINES='__BSD__')
- build.env.Append(CPPPATH=['/usr/include',
- '/usr/local/include',
- '/usr/X11R6/include/'])
- build.env.Append(LIBPATH=['/usr/lib/',
- '/usr/local/lib',
- '/usr/X11R6/lib'])
build.env.Append(LIBS='pthread')
+ build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
+ '%%LOCALBASE%%/include/qt4',
+ '%%LOCALBASE%%/include'])
+ '%%LOCALBASE%%/include',
'/usr/X11R6/include/'])
- build.env.Append(LIBPATH=['/usr/lib/',
- '/usr/local/lib',
+ build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',
+ '%%LOCALBASE%%/lib/qt4',
+ '%%LOCALBASE%%/lib'])
+ build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so',
+ '-Wl,-rpath,%%LOCALBASE%%/lib/qt4',
+ '-Wl,-rpath,%%LOCALBASE%%/lib'])
+ '%%LOCALBASE%%/lib',
'/usr/X11R6/lib'])
build.env.Append(LIBS='pthread')
# why do we need to do this on OpenBSD and not on Linux? if we
# don't then CheckLib("vorbisfile") fails
- build.env.Append(LIBS=['ogg', 'vorbis'])
+ # build.env.Append(LIBS=['ogg', 'vorbis'])
# Define for things that would like to special case UNIX (Linux or BSD)
if build.platform_is_bsd or build.platform_is_linux:
@@ -897,14 +896,14 @@ class MixxxCore(Feature):
@@ -1188,7 +1189,7 @@ class MixxxCore(Feature):
# Say where to find resources on Unix. TODO(XXX) replace this with a
# RESOURCE_PATH that covers Win and OSX too:
if build.platform_is_linux or build.platform_is_bsd:
- prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')
+ prefix = SCons.ARGUMENTS.get('prefix', '%%PREFIX%%')
share_path = os.path.join(prefix, 'share/mixxx')
build.env.Append(CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path))
lib_path = os.path.join(prefix, 'lib/mixxx')
build.env.Append(CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
share_path = os.path.join (prefix, build.env.get(
'SHAREDIR', default='share'), 'mixxx')
build.env.Append(
@@ -1199,7 +1200,7 @@ class MixxxCore(Feature):
CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
def depends(self, build):
- return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt,
+ return [SoundTouch, ReplayGain, PortAudio, Qt,
FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf]
- return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, TestHeaders,
+ return [SoundTouch, ReplayGain, PortAudio, Qt, TestHeaders,
FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
Chromaprint, RubberBand, SecurityFramework, CoreServices, FpClassify]
def post_dependency_check_configure(self, build, conf):

View File

@ -1,25 +1,25 @@
--- build/features.py.orig 2013-05-08 23:20:26 UTC
--- build/features.py.orig 2015-12-29 16:10:41 UTC
+++ build/features.py
@@ -83,6 +83,9 @@ class HID(Feature):
@@ -87,6 +87,9 @@ class HID(Feature):
raise Exception('Did not find the setupapi library, exiting.')
elif build.platform_is_osx:
build.env.Append(LINKFLAGS='-framework IOKit')
build.env.Append(LINKFLAGS='-framework CoreFoundation')
build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
+ elif build.platform_is_bsd:
+ conf.CheckLib(['usb', 'libusb'])
+ conf.CheckLib(['usbhid', 'libusbhid'])
build.env.Append(CPPDEFINES = '__HID__')
build.env.Append(CPPDEFINES='__HID__')
@@ -95,7 +98,7 @@ class HID(Feature):
# Requires setupapi.lib which is included by the above check for
@@ -100,7 +103,7 @@ class HID(Feature):
# setupapi.
sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
sources.append(
os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
- elif build.platform_is_linux:
+ elif build.platform_is_linux or build.platform_is_bsd:
sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
elif build.platform_is_osx:
sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
@@ -108,24 +111,27 @@ class Bulk(Feature):
# hidapi compiles the libusb implementation by default on Linux
sources.append(
os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
@@ -117,14 +120,14 @@ class Bulk(Feature):
def enabled(self, build):
# For now only make Bulk default on Linux only. Turn on for all
# platforms after the 1.11.0 release.
@ -33,23 +33,28 @@
def add_options(self, build, vars):
- is_default = 1 if build.platform_is_linux else 0
+ is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
vars.Add('bulk', 'Set to 1 to enable USB Bulk controller support.', is_default)
vars.Add('bulk',
'Set to 1 to enable USB Bulk controller support.', is_default)
def configure(self, build, conf):
@@ -132,12 +135,15 @@ class Bulk(Feature):
if not self.enabled(build):
return
- build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
- build.env.ParseConfig(
- 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
- if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
- not conf.CheckHeader('libusb-1.0/libusb.h')):
- raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')
- not conf.CheckHeader('libusb-1.0/libusb.h')):
- raise Exception(
- 'Did not find the libusb 1.0 development library or its header file, exiting!')
+ if build.platform_is_linux:
+ build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
+ build.env.ParseConfig(
+ 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
+ if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
+ not conf.CheckHeader('libusb-1.0/libusb.h')):
+ raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')
+ not conf.CheckHeader('libusb-1.0/libusb.h')):
+ raise Exception(
+ 'Did not find the libusb 1.0 development library or its header file, exiting!')
+ elif build.platform_is_bsd:
+ conf.CheckLib(['usb', 'libusb'])
build.env.Append(CPPDEFINES = '__BULK__')
build.env.Append(CPPDEFINES='__BULK__')

View File

@ -0,0 +1,14 @@
--- build/mixxx.py.orig 2015-12-29 16:10:41 UTC
+++ build/mixxx.py
@@ -380,9 +380,9 @@ class MixxxBuild(object):
self.env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
# Allow installation directories to be specified.
- prefix = Script.ARGUMENTS.get('prefix', '/usr/local')
+ prefix = Script.ARGUMENTS.get('prefix', '%%PREFIX%%')
if os.environ.has_key('LIBDIR'):
- self.env['LIBDIR'] = os.path.relpath(os.environ['LIBDIR'], prefix)
+ self.env['LIBDIR'] = 'lib' # os.path.relpath(os.environ['LIBDIR'], prefix)
if os.environ.has_key('BINDIR'):
self.env['BINDIR'] = os.path.relpath(os.environ['BINDIR'], prefix)
if os.environ.has_key('SHAREDIR'):

View File

@ -1,13 +0,0 @@
--- build/qt4.py.orig 2013-05-08 23:20:26 UTC
+++ build/qt4.py
@@ -246,8 +246,8 @@ def generate(env):
env.Replace(
# QTDIR = _detect(env),
QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
- QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
- QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
+ QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4', 'Qt'),
+ QT4_LIBPATH = os.path.join('$QTDIR', 'lib', 'qt4'),
# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),

View File

@ -1,42 +0,0 @@
--- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig 2013-05-08 23:20:26 UTC
+++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c
@@ -48,6 +48,12 @@
#include "hidapi.h"
+#ifdef __FreeBSD__
+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor_ascii(h,i,d,n)
+#else
+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor(h,i,l,d,n)
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus
int len;
/* Get the string from libusb. */
- len = libusb_get_string_descriptor(dev,
+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
0x0, /* String ID */
0x0, /* Language */
(unsigned char*)buf,
@@ -282,7 +288,7 @@ static int is_language_supported(libusb_
int i;
/* Get the string from libusb. */
- len = libusb_get_string_descriptor(dev,
+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
0x0, /* String ID */
0x0, /* Language */
(unsigned char*)buf,
@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de
lang = get_first_language(dev);
/* Get the string from libusb. */
- len = libusb_get_string_descriptor(dev,
+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
idx,
lang,
(unsigned char*)buf,

View File

@ -0,0 +1,11 @@
--- lib/hidapi-0.8.0-rc1/libusb/hid.c.orig 2015-12-29 16:10:41 UTC
+++ lib/hidapi-0.8.0-rc1/libusb/hid.c
@@ -258,7 +258,7 @@ static int get_usage(uint8_t *report_des
Note that the data parameter is Unicode in UTF-16LE encoding.
Return value is the number of bytes in data, or LIBUSB_ERROR_*.
*/
-static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
+inline int libusb_get_string_descriptor(libusb_device_handle *dev,
uint8_t descriptor_index, uint16_t lang_id,
unsigned char *data, int length)
{

View File

@ -1,18 +1,7 @@
--- src/controllers/controllermanager.cpp.orig 2013-05-08 23:20:26 UTC
--- src/controllers/controllermanager.cpp.orig 2015-12-29 16:10:41 UTC
+++ src/controllers/controllermanager.cpp
@@ -12,7 +12,10 @@
#include "controllers/defs_controllers.h"
#include "controllers/controllerlearningeventfilter.h"
+#ifdef __PORTMIDI__
#include "controllers/midi/portmidienumerator.h"
+#endif
+
#ifdef __HSS1394__
#include "controllers/midi/hss1394enumerator.h"
#endif
@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con
m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
@@ -83,7 +83,9 @@ ControllerManager::ControllerManager(Con
m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths);
// Instantiate all enumerators
+#ifdef __PORTMIDI__

View File

@ -0,0 +1,14 @@
--- src/controllers/controllerpresetfilehandler.cpp.orig 2015-12-29 16:10:41 UTC
+++ src/controllers/controllerpresetfilehandler.cpp
@@ -43,7 +43,11 @@ ControllerPresetPointer ControllerPreset
pHandler = new MidiControllerPresetFileHandler();
} else if (scriptPath.endsWith(HID_PRESET_EXTENSION, Qt::CaseInsensitive) ||
scriptPath.endsWith(BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
+#if __HID__
pHandler = new HidControllerPresetFileHandler();
+#else
+ return ControllerPresetPointer();
+#endif
}
if (pHandler == NULL) {

View File

@ -1,17 +0,0 @@
--- src/defs.h.orig 2013-05-08 23:20:26 UTC
+++ src/defs.h
@@ -87,6 +87,8 @@ inline double zap_denormal(double x)
#define math_min(a,b) (((a) < (b)) ? (a) : (b))
#endif
+#if !defined(__GNUC__)
+
// MSVC 2005/2008 needs these
#ifndef fmax
#define fmax math_max
@@ -98,3 +100,5 @@ inline double zap_denormal(double x)
#endif
+#endif
+

View File

@ -0,0 +1,17 @@
--- src/musicbrainz/chromaprinter.cpp.orig 2015-12-29 16:10:41 UTC
+++ src/musicbrainz/chromaprinter.cpp
@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c
}
chromaprint_finish(ctx);
- void* fprint = NULL;
+ unsigned int* fprint = NULL;
int size = 0;
int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
QByteArray fingerprint;
if (ret == 1) {
- void* encoded = NULL;
+ char* encoded = NULL;
int encoded_size = 0;
chromaprint_encode_fingerprint(fprint, size,
CHROMAPRINT_ALGORITHM_DEFAULT,

View File

@ -1,20 +0,0 @@
--- src/recording/encodermp3.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/recording/encodermp3.cpp
@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
*/
QStringList libnames;
QString libname = "";
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
libnames << "mp3lame";
#elif __WINDOWS__
libnames << "lame_enc.dll";
@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
props->setType(DLG_WARNING);
props->setTitle(tr("Encoder"));
QString key = "";
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
key = tr("<html>Mixxx cannot record or stream in MP3 without the MP3 encoder &quot;lame&quot;. Due to licensing issues, we cannot include this with Mixxx. To record or stream in MP3, you must download <b>libmp3lame</b> and install it on your system. <p>See <a href='http://mixxx.org/wiki/doku.php/internet_broadcasting#linux'>Mixxx Wiki</a> for more information. </html>");
props->setText(key);
#elif __WINDOWS__

View File

@ -1,15 +0,0 @@
--- src/sounddeviceportaudio.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/sounddeviceportaudio.cpp
@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open()
qDebug() << "Opened PortAudio stream successfully... starting";
}
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
//Attempt to dynamically load and resolve stuff in the PortAudio library
//in order to enable RT priority with ALSA.
- QLibrary portaudio("libportaudio.so.2");
+ QLibrary portaudio("libportaudio.so");
if (!portaudio.load())
qWarning() << "Failed to dynamically load PortAudio library";
else

View File

@ -1,23 +0,0 @@
--- src/soundmanager.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/soundmanager.cpp
@@ -234,7 +234,7 @@ void SoundManager::queryDevices() {
#ifdef __PORTAUDIO__
PaError err = paNoError;
if (!m_paInitialized) {
-#ifdef Q_OS_LINUX
+#if defined(__BSD__) || defined(Q_OS_LINUX)
setJACKName();
#endif
err = Pa_Initialize();
@@ -626,9 +626,9 @@ QList<AudioInput> SoundManager::register
void SoundManager::setJACKName() const {
#ifdef __PORTAUDIO__
-#ifdef Q_OS_LINUX
+#if defined(__BSD__) || defined(Q_OS_LINUX)
typedef PaError (*SetJackClientName)(const char *name);
- QLibrary portaudio("libportaudio.so.2");
+ QLibrary portaudio("libportaudio.so");
if (portaudio.load()) {
SetJackClientName func(
reinterpret_cast<SetJackClientName>(

View File

@ -1,11 +0,0 @@
--- src/soundmanagerconfig.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/soundmanagerconfig.cpp
@@ -290,7 +290,7 @@ void SoundManagerConfig::loadDefaults(So
if (flags & SoundManagerConfig::API) {
QList<QString> apiList = soundManager->getHostAPIList();
if (!apiList.isEmpty()) {
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
//Check for JACK and use that if it's available, otherwise use ALSA
if (apiList.contains(MIXXX_PORTAUDIO_JACK_STRING)) {
m_api = MIXXX_PORTAUDIO_JACK_STRING;

View File

@ -1,18 +0,0 @@
--- src/soundsourceoggvorbis.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/soundsourceoggvorbis.cpp
@@ -32,6 +32,15 @@
#endif
#endif
+#ifdef __BSD__
+#include <sys/endian.h>
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#define OV_ENDIAN_ARG 0
+#else
+#define OV_ENDIAN_ARG 1
+#endif
+#endif
+
#ifdef __LINUX__
#include <endian.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN

View File

@ -1,11 +0,0 @@
--- src/soundsourceproxy.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/soundsourceproxy.cpp
@@ -84,7 +84,7 @@ void SoundSourceProxy::loadPlugins()
qDebug() << "Adding plugin path from commandline arg:" << pluginPath;
pluginDirs.append(QDir(pluginPath));
}
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
QDir libPath(UNIX_LIB_PATH);
if (libPath.cd("plugins") && libPath.cd("soundsource")) {
pluginDirs.append(libPath.absolutePath());

View File

@ -0,0 +1,11 @@
--- src/upgrade.cpp.orig 2015-12-29 16:10:41 UTC
+++ src/upgrade.cpp
@@ -43,7 +43,7 @@ Upgrade::~Upgrade() {
// static
QString Upgrade::mixxx17HomePath() {
-#ifdef __LINUX__
+#if defined(__LINUX__) || defined(__BSD__)
return QDir::homePath().append("/").append(".mixxx/");
#elif __WINDOWS__
return QDir::homePath().append("/").append("Local Settings/Application Data/Mixxx/");

View File

@ -1,13 +0,0 @@
Fix bogus pointer comparison.
--- src/widget/wdisplay.cpp.orig 2013-05-08 23:20:26 UTC
+++ src/widget/wdisplay.cpp
@@ -86,7 +86,7 @@ void WDisplay::setPixmap(int iPos, const
void WDisplay::paintEvent(QPaintEvent *)
{
- if (m_pPixmaps>0)
+ if (m_pPixmaps)
{
int idx = (int)(m_fValue*(float)(m_iNoPos)/128.);
// Range check

View File

@ -2,5 +2,7 @@ bin/mixxx
%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
lib/mixxx/plugins/vamp/libmixxxminimal.so
share/appdata/mixxx.appdata.xml
share/applications/mixxx.desktop
share/pixmaps/mixxx-icon.png
@dir lib/mixxx/plugins/soundsource

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bombardier
PORTVERSION= 1.0.1
PORTVERSION= 1.0.2
DISTVERSIONPREFIX= v
CATEGORIES= benchmarks

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1488384668
SHA256 (codesenberg-bombardier-v1.0.1_GH0.tar.gz) = 83837649a8e5fe5cba219fbae5f88e384b9282877d33b82235db3f032a22aea6
SIZE (codesenberg-bombardier-v1.0.1_GH0.tar.gz) = 467942
TIMESTAMP = 1488742985
SHA256 (codesenberg-bombardier-v1.0.2_GH0.tar.gz) = 5fc8a34e355c1273888b750e0bc599a6edf6d974d4bd90d23cbdd36fa91e8757
SIZE (codesenberg-bombardier-v1.0.2_GH0.tar.gz) = 468114

View File

@ -68,6 +68,7 @@ post-patch:
${WRKSRC}/scripts/utf8-edit
@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
@${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile
post-patch-DOCS-off:
@${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile

View File

@ -1,5 +1,5 @@
--- Makefile.orig 2014-01-26 06:41:39 UTC
+++ Makefile
--- Makefile.orig 2014-01-26 14:41:39.000000000 +0800
+++ Makefile 2014-04-12 10:55:35.584554559 +0800
@@ -4,8 +4,11 @@ include config.mak
include suffixes-rule
@ -38,13 +38,13 @@
gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
- $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
rm -f core.* vgcore.*
ln -sf $@ $@.test
gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
- $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
rm -f core.*
-tslearn: $(OBJS_TSLEARN)
@ -86,7 +86,7 @@
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
pin-juyin: $(OBJS_pin_juyin)
@@ -223,22 +231,18 @@ install:
@@ -223,12 +231,12 @@ install:
$(MAKE) -C data install
$(MAKE) -C im-client install
$(MAKE) -C gtk-im install
@ -97,22 +97,12 @@
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
- if [ $(prefix) = /usr/local ]; then \
- install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \
- install -d $(DOC_DIR); \
- install -m 644 README.html Changelog.html $(DOC_DIR); \
+ if [ $(prefix) = /nonstaged ]; then \
+ install -m 644 gcin.png $(prefix)/share/icons/hicolor/64x64/apps; \
install -d $(DOC_DIR); \
install -m 644 README.html Changelog.html $(DOC_DIR); \
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit $(bindir)/ts-contribute-en; \
rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
else \
- install -d $(DOC_DIR_i); \
- install -m 644 README.html Changelog.html $(DOC_DIR_i); \
install -s $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
@@ -246,6 +250,7 @@ install:
@@ -246,6 +254,7 @@ install:
rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
fi
$(MAKE) -C scripts install
@ -120,7 +110,7 @@
$(MAKE) -C menu install
if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi
@@ -279,4 +284,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE
@@ -279,4 +288,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE
rm -f $@
sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@

View File

@ -11,7 +11,8 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_TUPLE= mieko:wy60:8e082bf
GH_ACCOUNT= mieko
GH_TAGNAME= 8e082bf
USES= ncurses
GNU_CONFIGURE= yes

View File

@ -965,6 +965,7 @@
SUBDIR += sqlite3
SUBDIR += sqlitebrowser
SUBDIR += sqlitebrowser-qt5
SUBDIR += sqliteconvert
SUBDIR += sqliteman
SUBDIR += sqlitemanager
SUBDIR += sqliteodbc

View File

@ -13,6 +13,8 @@ COMMENT= Open source distributed database management system
LICENSE= APACHE20
BROKEN= crash with current OpenJDK
JAVA_VERSION= 1.7
JAVA_VENDOR= openjdk
REINPLACE_ARGS= -i ''

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cego
PORTVERSION= 2.32.8
PORTVERSION= 2.32.11
CATEGORIES= databases
MASTER_SITES= http://www.lemke-it.com/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1485681108
SHA256 (cego-2.32.8.tar.gz) = c59a6d4cbaa7a060ad85a83c71e2edb82146d0e8e73935ac550c9a123e0b03d1
SIZE (cego-2.32.8.tar.gz) = 1396470
TIMESTAMP = 1488708824
SHA256 (cego-2.32.11.tar.gz) = 684fa8c239bc6fbe61b575c59aa4ea0f3a2a130c8fc0498b7d7238ffbc3e2e6c
SIZE (cego-2.32.11.tar.gz) = 1394544

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cegobridge
PORTVERSION= 1.1.2
PORTVERSION= 1.1.3
CATEGORIES= databases
MASTER_SITES= http://www.lemke-it.com/

View File

@ -1,2 +1,3 @@
SHA256 (cegobridge-1.1.2.tar.gz) = 117922e147fca49ee498e558c7f88182448a6dc7b5a2023c3c718bfb1be8ea8d
SIZE (cegobridge-1.1.2.tar.gz) = 962307
TIMESTAMP = 1488709322
SHA256 (cegobridge-1.1.3.tar.gz) = 53352ba3c8e2abc725612084eac628367ddec39747150bfe6bcad2c4a672ff4a
SIZE (cegobridge-1.1.3.tar.gz) = 551872

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mysql-connector-c++
PORTVERSION= 1.1.7
PORTREVISION= 5
PORTVERSION= 1.1.8
CATEGORIES= databases
MASTER_SITES= MYSQL/Connector-C++
@ -15,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_regex.so:devel/boost-libs
USES= cmake:outsource mysql
USES= cmake:outsource mysql ssl
USE_LDCONFIG= yes
CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}"

View File

@ -1,2 +1,3 @@
SHA256 (mysql-connector-c++-1.1.7.tar.gz) = 5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763
SIZE (mysql-connector-c++-1.1.7.tar.gz) = 518469
TIMESTAMP = 1488666014
SHA256 (mysql-connector-c++-1.1.8.tar.gz) = 85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963
SIZE (mysql-connector-c++-1.1.8.tar.gz) = 528954

View File

@ -1,12 +0,0 @@
--- driver/mysql_resultbind.cpp.orig 2016-01-12 18:42:38 UTC
+++ driver/mysql_resultbind.cpp
@@ -86,7 +86,9 @@ static struct st_buffer_size_type
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
+#ifdef MYSQL_TYPE_JSON
case MYSQL_TYPE_JSON:
+#endif
return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
case MYSQL_TYPE_DECIMAL:

View File

@ -1,24 +0,0 @@
--- driver/mysql_util.cpp.orig 2016-01-12 18:42:38 UTC
+++ driver/mysql_util.cpp
@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD
return sql::DataType::SET;
case MYSQL_TYPE_GEOMETRY:
return sql::DataType::GEOMETRY;
+#ifdef MYSQL_TYPE_JSON
case MYSQL_TYPE_JSON:
return sql::DataType::JSON;
+#endif
default:
return sql::DataType::UNKNOWN;
}
@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD *
return "SET";
case MYSQL_TYPE_GEOMETRY:
return "GEOMETRY";
+#ifdef MYSQL_TYPE_JSON
case MYSQL_TYPE_JSON:
return "JSON";
+#endif
default:
return "UNKNOWN";
}

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= postgresql
PORTVERSION= 09.05.0400
PORTVERSION= 09.06.0100
CATEGORIES= databases
MASTER_SITES= PGSQL/odbc/versions/src
PKGNAMESUFFIX= -odbc

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1470771983
SHA256 (postgresql/psqlodbc-09.05.0400.tar.gz) = c9fde1c104065e81813d79eb29bb7e715d64697bdda031ff01e40e3ad59e3ad3
SIZE (postgresql/psqlodbc-09.05.0400.tar.gz) = 812613
TIMESTAMP = 1488673839
SHA256 (postgresql/psqlodbc-09.06.0100.tar.gz) = 050c80b25eb6553a718b9ab4ac00dcbadf7a13ee5ae637c30f7dcde8f4a6c962
SIZE (postgresql/psqlodbc-09.06.0100.tar.gz) = 886110

View File

@ -1,10 +1,10 @@
--- odbcapi.c.orig 2016-01-10 13:25:14 UTC
--- odbcapi.c.orig 2017-02-03 13:05:10 UTC
+++ odbcapi.c
@@ -913,11 +913,7 @@ RETCODE SQL_API
SQLExtendedFetch(HSTMT hstmt,
SQLUSMALLINT fFetchType,
SQLLEN irow,
-#if defined(WITH_UNIXODBC) && (SIZEOF_LONG != 8)
-#if defined(WITH_UNIXODBC) && (SIZEOF_LONG_INT != 8)
- SQLROWSETSIZE *pcrow,
-#else
SQLULEN *pcrow,

View File

@ -1,16 +1,16 @@
--- psqlodbc.h.orig 2016-01-10 13:25:14 UTC
--- psqlodbc.h.orig 2017-02-03 13:05:10 UTC
+++ psqlodbc.h
@@ -175,13 +175,8 @@ typedef unsigned long long ULONG_PTR;
#if (SIZEOF_LONG == 8)
#define FORMAT_INTEGER "%d" /* SQLINTEGER */
@@ -174,13 +174,8 @@ typedef unsigned long long ULONG_PTR;
#define FORMAT_UINTEGER "%u" /* SQLUINTEGER */
#define FORMATI64 "%ld" /* SQLBIGINT */
#define FORMATI64U "%lu" /* SQLUBIGINT */
-#if defined(WITH_UNIXODBC) && defined(BUILD_LEGACY_64_BIT_MODE)
-#define FORMAT_LEN "%d" /* SQLLEN */
-#define FORMAT_ULEN "%u" /* SQLULEN */
-#else
-#else /* WITH_UNIXODBC */
#define FORMAT_LEN "%ld" /* SQLLEN */
#define FORMAT_ULEN "%lu" /* SQLULEN */
-#endif /* WITH_UNIXODBC */
#else
#define FORMAT_LEN "%ld" /* SQLLEN */
#define FORMAT_ULEN "%lu" /* SQLULEN */
#else /* SIZEOF_LONG */
#define FORMAT_INTEGER "%ld" /* SQLINTEGER */
#define FORMAT_UINTEGER "%lu" /* SQLUINTEGER */

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql-repmgr
PORTVERSION= 3.1.5
PORTVERSION= 3.3
CATEGORIES= databases
MASTER_SITES= http://www.repmgr.org/download/
DISTNAME= repmgr-${PORTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1471377483
SHA256 (repmgr-3.1.5.tar.gz) = d821fdd427d82a89e455553967f1bc205d73b2daf0899c74a5be1f22aab65b4f
SIZE (repmgr-3.1.5.tar.gz) = 129541
TIMESTAMP = 1488675286
SHA256 (repmgr-3.3.tar.gz) = d96bf300c84eff3cefcc8f6b97cddd607971b4c6841426cb1cfcbd7f9c45604b
SIZE (repmgr-3.3.tar.gz) = 159039

View File

@ -22,12 +22,13 @@ rcvar=repmgrd_enable
load_rc_config $name
: ${repmgrd_enable:="NO"}
: ${repmgrd_user:="pgsql"}
: ${repmgrd_config="%%PREFIX%%/etc/repmgr.conf"}
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
command_args="-p $pidfile -f $repmgrd_config"
command_args="-m -d -p $pidfile -f $repmgrd_config"
run_rc_command "$1"

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bsddb3
PORTVERSION= 6.2.1
PORTVERSION= 6.2.4
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1464481552
SHA256 (bsddb3-6.2.1.tar.gz) = 319a599236b0843a36c17749c0041c18a07ef28dbe9539064fd7c0fff972567c
SIZE (bsddb3-6.2.1.tar.gz) = 228558
TIMESTAMP = 1488710574
SHA256 (bsddb3-6.2.4.tar.gz) = 4866aa32ad6ec6d5ff401d9aec8da07c4e84502298dc27f7c758545e243550e6
SIZE (bsddb3-6.2.4.tar.gz) = 242397

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql-connector-python
PORTVERSION= 2.2.0
PORTVERSION= 2.2.2
CATEGORIES= databases python
MASTER_SITES= MYSQL/Connector-Python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1471036814
SHA256 (mysql-connector-python-2.2.0.tar.gz) = 4f86db62cc064159e6f691995b314537a008e5b7624797d9b2988e9250e39abf
SIZE (mysql-connector-python-2.2.0.tar.gz) = 11825908
TIMESTAMP = 1488711732
SHA256 (mysql-connector-python-2.2.2.tar.gz) = 768cfe8c9a16159b9ba6c44db88220110987916439375a288e3761f49d1c3624
SIZE (mysql-connector-python-2.2.2.tar.gz) = 11842859

View File

@ -14,6 +14,9 @@ COMMENT= Python SQL toolkit and Object Relational Mapper 0.8.x
LICENSE= MIT
DEPRECATED= Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
EXPIRATION_DATE= 2017-04-01
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock

View File

@ -0,0 +1,23 @@
# $FreeBSD$
PORTNAME= sqliteconvert
DISTVERSIONPREFIX= VERSION_
DISTVERSION= 0_1_2
CATEGORIES= databases
MAINTAINER= tobik@FreeBSD.org
COMMENT= Tools to convert SQLite3 schema files into documentation
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= dot:graphics/graphviz
USE_GITHUB= yes
GH_ACCOUNT= kristapsdz
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sqlite2html \
${STAGEDIR}${PREFIX}/bin/sqlite2dot
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1488713412
SHA256 (kristapsdz-sqliteconvert-VERSION_0_1_2_GH0.tar.gz) = df89d3e858dcd0aa4e16fce28ce6075df0e6594932b1dcca238d34c5d3a044e0
SIZE (kristapsdz-sqliteconvert-VERSION_0_1_2_GH0.tar.gz) = 26833

View File

@ -0,0 +1,7 @@
Sqliteconvert is a set of tools to convert SQLite3 schema files into
documentation. It includes sqlite2dot(1), which converts into a
graphviz file; sqlite2html(1), which converts into an HTML5 fragment;
and sqliteconvert(1), which pulls these tools together with some sane
default templates.
WWW: https://kristaps.bsd.lv/sqliteconvert/

View File

@ -0,0 +1,7 @@
bin/sqlite2dot
bin/sqlite2html
bin/sqliteconvert
man/man1/sqlite2dot.1.gz
man/man1/sqlite2html.1.gz
man/man1/sqliteconvert.1.gz
%%DATADIR%%/schema.xml

View File

@ -12,7 +12,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_TUPLE= lafrech:gbirthday:7b431aa
GH_ACCOUNT= lafrech
GH_TAGNAME= 7b431aa
OPTIONS_DEFINE= MYSQL NLS NOTIFY THUNDERBIRD
OPTIONS_SUB= yes

View File

@ -320,6 +320,7 @@
SUBDIR += covtool
SUBDIR += cpan-upload
SUBDIR += cpan-upload-http
SUBDIR += cpp-hocon
SUBDIR += cpp-netlib
SUBDIR += cppcheck
SUBDIR += cppi
@ -403,6 +404,7 @@
SUBDIR += devtodo
SUBDIR += dfuife-curses
SUBDIR += dia2code
SUBDIR += dia2code+
SUBDIR += diffuse
SUBDIR += ding-libs
SUBDIR += directfb
@ -1199,6 +1201,7 @@
SUBDIR += kickassembler
SUBDIR += kimwitu
SUBDIR += kore
SUBDIR += ksql
SUBDIR += kyra
SUBDIR += kyua
SUBDIR += lasi

View File

@ -15,7 +15,7 @@ BUILD_DEPENDS= go:lang/go
USE_GITHUB= yes
GH_ACCOUNT= arduino
GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME}
GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
GH_TUPLE= go-errors:errors:a418503:goerrors/src/github.com/go-errors/errors \
stretchr:testify:v1.1.3:stretchr/src/github.com/stretchr/testify \
jstemmer:go-junit-report:833f8ea:jstemmer/src/github.com/jstemmer/go-junit-report

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= artifactory
PORTVERSION= 4.16.0
PORTVERSION= 5.1.0
CATEGORIES= devel java
MASTER_SITES= https://bintray.com/artifact/download/jfrog/artifactory/
DISTNAME= jfrog-${PORTNAME}-oss-${PORTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1484640740
SHA256 (jfrog-artifactory-oss-4.16.0.zip) = f5711536cdf0a597799e01c570bbd38e6f5f3ffb6935cde21d38119be6592f16
SIZE (jfrog-artifactory-oss-4.16.0.zip) = 41455447
TIMESTAMP = 1488721092
SHA256 (jfrog-artifactory-oss-5.1.0.zip) = 16b15b1a0f983c4dc1acb04425d7e6f77185276ab7e4fc2fa562e75278896e03
SIZE (jfrog-artifactory-oss-5.1.0.zip) = 44833503

View File

@ -32,6 +32,7 @@
%%APP_HOME%%/misc/tomcat/logging.properties
%%APP_HOME%%/misc/tomcat/server.xml
%%APP_HOME%%/misc/tomcat/web.xml
%%APP_HOME%%/misc/%%APP_HOME%%.config.template.yml
%%APP_HOME%%/tomcat/LICENSE
%%APP_HOME%%/tomcat/NOTICE
%%APP_HOME%%/tomcat/RELEASE-NOTES
@ -78,6 +79,7 @@
%%VARDIR%%/tomcat/webapps/ROOT/index.html
%%VARDIR%%/etc/artifactory.config.xml
%%VARDIR%%/etc/artifactory.system.properties
%%VARDIR%%/etc/binarystore.xml
%%VARDIR%%/etc/mimetypes.xml
%%VARDIR%%/etc/logback.xml
@dir %%VARDIR%%/tomcat/work

View File

@ -3,6 +3,7 @@
PORTNAME= ccache
PORTVERSION= 3.3.4
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.samba.org/ftp/ccache/ \
LOCAL/bdrewery

View File

@ -29,6 +29,22 @@ in
;;
esac
strip_path() {
local IFS=":"
local path
set -- ${PATH}
while [ $# -gt 0 ]; do
if ! [ "${1}" = "${PREFIX}/libexec/ccache" ]; then
path="${path}${path:+:}${1}"
fi
shift
done
echo "${path}"
}
# Remove ccache wrappers from PATH
PATH=$(strip_path)
# create compiler links
for comp in ${CCACHE_COMPILERS}
do

View File

@ -5,8 +5,6 @@ PORTNAME= cityhash
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= devel
USE_GITHUB= yes
GH_TUPLE= google:cityhash:8af9b8c
MAINTAINER= vg@FreeBSD.org
COMMENT= Family of hash functions
@ -19,4 +17,8 @@ CPE_VENDOR= google
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= google
GH_TAGNAME= 8af9b8c
.include <bsd.port.mk>

21
devel/cpp-hocon/Makefile Normal file
View File

@ -0,0 +1,21 @@
# $FreeBSD$
PORTNAME= cpp-hocon
PORTVERSION= 0.1.4
CATEGORIES= devel
MAINTAINER= jslagle@gmail.com
COMMENT= C++ configuration library
LICENSE= APACHE20
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libleatherman_util.so:devel/leatherman
USE_GITHUB= yes
GH_ACCOUNT= puppetlabs
USES= cmake
CMAKE_ARGS= -DCPP_HOCON_SHARED:BOOL=ON
.include <bsd.port.mk>

3
devel/cpp-hocon/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1477237793
SHA256 (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 2274b99dc098122b6e3d2c8d23173d21893555190c5a008e5a9a7d84875c7275
SIZE (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 157988

View File

@ -0,0 +1,32 @@
--- lib/CMakeLists.txt.orig 2016-09-23 20:45:10 UTC
+++ lib/CMakeLists.txt
@@ -75,20 +75,23 @@ set(PROJECT_SOURCES
## Without the intermediate target, unexported symbols can't be tested.
add_library(libprojectsrc OBJECT ${PROJECT_SOURCES})
set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true)
-
-add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
-set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-target_link_libraries(lib${PROJECT_NAME}
+if(CPP_HOCON_SHARED)
+ add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:libprojectsrc>)
+else()
+ add_library(${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
+endif()
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+target_link_libraries(${PROJECT_NAME}
${LEATHERMAN_LIBRARIES}
${Boost_LIBRARIES}
)
# Generate the export header for restricting symbols exported from the library.
# Restricting symbols has several advantages, noted at https://gcc.gnu.org/wiki/Visibility.
-symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
+symbol_exports(${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
# This correctly handles DLL installation on Windows.
-leatherman_install(lib${PROJECT_NAME})
+leatherman_install(${PROJECT_NAME})
install(DIRECTORY inc/hocon DESTINATION include)
add_subdirectory(tests)

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config.hpp
@@ -169,7 +169,7 @@ namespace hocon {
* interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this<config> {
+ class CPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this<config> {
friend class config_object;
friend class config_value;
friend class config_parseable;

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_include_context.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_include_context.hpp
@@ -18,7 +18,7 @@ namespace hocon {
* interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config_include_context {
+ class CPP_HOCON_EXPORT config_include_context {
public:
/**
* Tries to find a name relative to whatever is doing the including, for

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_includer.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_includer.hpp
@@ -12,7 +12,7 @@ namespace hocon {
* customize handling of {@code include} statements in config files. You may
* also want to implement {@link config_includer_file} and {@link config_includer_URL}, or not.
*/
- class LIBCPP_HOCON_EXPORT config_includer {
+ class CPP_HOCON_EXPORT config_includer {
public:
/**
* Returns a new includer that falls back to the given includer. This is how

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_includer_file.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_includer_file.hpp
@@ -11,7 +11,7 @@ namespace hocon {
* If you do not implement this but do implement {@link config_includer},
* attempts to load files will use the default includer.
*/
- class LIBCPP_HOCON_EXPORT config_includer_file {
+ class CPP_HOCON_EXPORT config_includer_file {
public:
/**
* Parses another item to be included. The returned object typically would

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_list.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_list.hpp
@@ -34,7 +34,7 @@ namespace hocon {
*
*/
- class LIBCPP_HOCON_EXPORT config_list : public config_value {
+ class CPP_HOCON_EXPORT config_list : public config_value {
public:
config_list(shared_origin origin) : config_value(move(origin)) {}

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_mergeable.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_mergeable.hpp
@@ -5,7 +5,7 @@
namespace hocon {
- class LIBCPP_HOCON_EXPORT config_mergeable {
+ class CPP_HOCON_EXPORT config_mergeable {
friend class config_value;
public:
/**

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_object.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_object.hpp
@@ -8,7 +8,7 @@
namespace hocon {
- class LIBCPP_HOCON_EXPORT config_object : public config_value {
+ class CPP_HOCON_EXPORT config_object : public config_value {
friend class config;
friend class config_value;
friend class simple_config_object;

View File

@ -0,0 +1,47 @@
--- lib/inc/hocon/config_origin.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_origin.hpp
@@ -36,7 +36,7 @@ namespace hocon {
*
* @return string describing the origin
*/
- LIBCPP_HOCON_EXPORT virtual std::string const& description() const = 0;
+ CPP_HOCON_EXPORT virtual std::string const& description() const = 0;
/**
* Returns a {@code ConfigOrigin} based on this one, but with the given
@@ -55,7 +55,7 @@ namespace hocon {
* @param lineNumber the new line number
* @return the created ConfigOrigin
*/
- LIBCPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0;
+ CPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0;
/**
* Returns a line number where the value or exception originated. This will
@@ -63,7 +63,7 @@ namespace hocon {
*
* @return line number or -1 if none is available
*/
- LIBCPP_HOCON_EXPORT virtual int line_number() const = 0;
+ CPP_HOCON_EXPORT virtual int line_number() const = 0;
/**
* Returns any comments that appeared to "go with" this place in the file.
@@ -75,7 +75,7 @@ namespace hocon {
* @return any comments that seemed to "go with" this origin, empty list if
* none
*/
- LIBCPP_HOCON_EXPORT virtual std::vector<std::string> const& comments() const = 0;
+ CPP_HOCON_EXPORT virtual std::vector<std::string> const& comments() const = 0;
/**
* Returns a {@code config_origin} based on this one, but with the given
@@ -92,7 +92,7 @@ namespace hocon {
* @param comments the comments used on the returned origin
* @return the config_origin with the given comments
*/
- LIBCPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector<std::string> comments) const = 0;
+ CPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector<std::string> comments) const = 0;
};
} // namespace hocon

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_parse_options.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_parse_options.hpp
@@ -22,7 +22,7 @@ namespace hocon {
*
* ClassLoader is Java-specific, so it was not ported to C++.
*/
- class LIBCPP_HOCON_EXPORT config_parse_options {
+ class CPP_HOCON_EXPORT config_parse_options {
public:
/**
* Gets an instance of <code>config_parse_options</code> with all fields

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_parseable.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_parseable.hpp
@@ -16,7 +16,7 @@ namespace hocon {
* interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config_parseable {
+ class CPP_HOCON_EXPORT config_parseable {
public:
/**
* Parse whatever it is. The options should come from

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_render_options.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_render_options.hpp
@@ -17,7 +17,7 @@ namespace hocon {
* config_render_options().set_comments(false)
* </pre>
*/
- class LIBCPP_HOCON_EXPORT config_render_options {
+ class CPP_HOCON_EXPORT config_render_options {
public:
/** Leaving the default arguments will result in a verbose rendering,
* which contains comments and therefore is not valid JSON.

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_resolve_options.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_resolve_options.hpp
@@ -27,7 +27,7 @@ namespace hocon {
* environment variables or other external system information. (Right now,
* environment variables are the only example.)
*/
- class LIBCPP_HOCON_EXPORT config_resolve_options {
+ class CPP_HOCON_EXPORT config_resolve_options {
public:
/**
* Returns the default resolve options. By default the system environment

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/config_value.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_value.hpp
@@ -36,7 +36,7 @@ namespace hocon {
* Also, this interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this<config_value> {
+ class CPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this<config_value> {
friend class token;
friend class value;
friend class default_transformer;

View File

@ -0,0 +1,14 @@
--- lib/inc/hocon/config_value_factory.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/config_value_factory.hpp
@@ -2,9 +2,10 @@
#include "types.hpp"
#include "export.h"
+#include <string>
namespace hocon {
- class LIBCPP_HOCON_EXPORT config_value_factory {
+ class CPP_HOCON_EXPORT config_value_factory {
public:
/**
* Creates a {@link ConfigValue} from a plain value, which may be

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/parser/config_document.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/parser/config_document.hpp
@@ -23,7 +23,7 @@ namespace hocon {
* Also, this interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config_document {
+ class CPP_HOCON_EXPORT config_document {
public:
/**
* Returns a new config_document that is a copy of the current config_document,

View File

@ -0,0 +1,28 @@
--- lib/inc/hocon/parser/config_document_factory.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/parser/config_document_factory.hpp
@@ -18,11 +18,11 @@ namespace hocon { namespace config_docum
* parse options to control how the file is interpreted
* @return the parsed configuration
*/
- LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path,
+ CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path,
config_parse_options options);
/** Parses a file into a config_document instance using default options. */
- LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path);
+ CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path);
/**
* Parses a string which should be valid HOCON or JSON.
@@ -31,9 +31,9 @@ namespace hocon { namespace config_docum
* @param options parse options
* @return the parsed configuration
*/
- LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s, config_parse_options options);
+ CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s, config_parse_options options);
/** Parses a string into a config_document instance using default options. */
- LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s);
+ CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s);
}} // namespace hocon::config_document_factory

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/parser/config_node.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/parser/config_node.hpp
@@ -18,7 +18,7 @@ namespace hocon {
* Also, this interface is likely to grow new methods over time, so third-party
* implementations will break.
*/
- class LIBCPP_HOCON_EXPORT config_node {
+ class CPP_HOCON_EXPORT config_node {
public:
/**
* The original text of the input which was used to form this particular

View File

@ -0,0 +1,11 @@
--- lib/inc/hocon/path.hpp.orig 2016-09-23 20:45:10 UTC
+++ lib/inc/hocon/path.hpp
@@ -10,7 +10,7 @@
namespace hocon {
- class LIBCPP_HOCON_EXPORT path {
+ class CPP_HOCON_EXPORT path {
public:
path();
explicit path(std::string first, path const& remainder);

View File

@ -0,0 +1,63 @@
--- lib/src/config_value_factory.cc.orig 2016-09-23 20:45:10 UTC
+++ lib/src/config_value_factory.cc
@@ -17,27 +17,27 @@ namespace hocon {
// TODO: If use cases of from_any_ref require other types to produce config_nulls,
// we can revise this behavior
shared_value operator()(boost::blank null_value) const {
- return make_shared<const config_null>(nullptr);
+ return make_shared<config_null>(nullptr);
}
shared_value operator()(string str) const {
- return make_shared<const config_string>(nullptr, str, config_string_type::QUOTED);
+ return make_shared<config_string>(nullptr, str, config_string_type::QUOTED);
}
shared_value operator()(int64_t num) const {
- return make_shared<const config_long>(nullptr, num, "");
+ return make_shared<config_long>(nullptr, num, "");
}
shared_value operator()(double num) const {
- return make_shared<const config_double>(nullptr, num, "");
+ return make_shared<config_double>(nullptr, num, "");
}
shared_value operator()(int num) const {
- return make_shared<const config_int>(nullptr, num, "");
+ return make_shared<config_int>(nullptr, num, "");
}
shared_value operator()(bool boolean) const {
- return make_shared<const config_boolean>(nullptr, boolean);
+ return make_shared<config_boolean>(nullptr, boolean);
}
shared_value operator()(vector<unwrapped_value> value_list) const {
@@ -45,7 +45,7 @@ namespace hocon {
for (unwrapped_value v : value_list) {
config_values.emplace_back(boost::apply_visitor(config_value_visitor(), v));
}
- return make_shared<const simple_config_list>(nullptr, config_values);
+ return make_shared<simple_config_list>(nullptr, config_values);
}
shared_value operator()(unordered_map<string, unwrapped_value> value_map) const {
@@ -53,7 +53,7 @@ namespace hocon {
for (auto pair : value_map) {
config_map[pair.first] = boost::apply_visitor(config_value_visitor(), pair.second);
}
- return make_shared<const simple_config_object>(nullptr, config_map);
+ return make_shared<simple_config_object>(nullptr, config_map);
}
};
@@ -62,7 +62,7 @@ namespace hocon {
if (origin.empty()) {
origin = "hardcoded value";
}
- auto conf_origin = make_shared<const simple_config_origin>(origin);
+ auto conf_origin = make_shared<simple_config_origin>(origin);
return boost::apply_visitor(config_value_visitor(), value)->with_origin(conf_origin);
}
} // namespace hocon

View File

@ -0,0 +1,31 @@
--- lib/tests/CMakeLists.txt.orig 2016-09-23 20:45:10 UTC
+++ lib/tests/CMakeLists.txt
@@ -18,23 +18,23 @@ set(TEST_CASES
program_options.cc
)
-add_executable(lib${PROJECT_NAME}_test $<TARGET_OBJECTS:libprojectsrc> ${TEST_CASES} main.cc)
+add_executable(${PROJECT_NAME}_test $<TARGET_OBJECTS:libprojectsrc> ${TEST_CASES} main.cc)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
- target_link_libraries(lib${PROJECT_NAME}_test rt)
+ target_link_libraries(${PROJECT_NAME}_test rt)
endif()
-target_link_libraries(lib${PROJECT_NAME}_test
+target_link_libraries(${PROJECT_NAME}_test
${Boost_LIBRARIES}
${LEATHERMAN_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC AND LEATHERMAN_USE_LOCALES)
- target_link_libraries(lib${PROJECT_NAME}_test iconv)
+ target_link_libraries(${PROJECT_NAME}_test iconv)
endif()
-add_test(NAME "unit_tests" COMMAND lib${PROJECT_NAME}_test)
+add_test(NAME "unit_tests" COMMAND ${PROJECT_NAME}_test)
configure_file (
"${CMAKE_CURRENT_LIST_DIR}/fixtures.hpp.in"

View File

@ -0,0 +1,20 @@
--- lib/tests/config_value_test.cc.orig 2016-09-23 20:45:10 UTC
+++ lib/tests/config_value_test.cc
@@ -91,7 +91,7 @@ TEST_CASE("config object unwraps") {
auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2");
auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3");
unordered_map<string, shared_value> org {{"a", value1}, {"b", value2}, {"c", value3}};
- auto obj = make_shared<const simple_config_object>(fake_origin(), org);
+ auto obj = make_shared<simple_config_object>(fake_origin(), org);
unordered_map<string, unwrapped_value> map {{"a", 1}, {"b", 2}, {"c", 3}};
unwrapped_value expected(map);
bool test = expected == obj->unwrapped();
@@ -103,7 +103,7 @@ TEST_CASE("config list unwraps") {
auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2");
auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3");
vector<shared_value> data { value1, value2, value3 };
- auto list = make_shared<const simple_config_list>(fake_origin(), data);
+ auto list = make_shared<simple_config_list>(fake_origin(), data);
vector<unwrapped_value> v { 1,2,3 };
unwrapped_value expected(v);
bool test = expected == list->unwrapped();

View File

@ -0,0 +1,3 @@
A C++ implementation of the HOCON configuration file format.
WWW: https://github.com/puppetlabs/cpp-hocon

28
devel/cpp-hocon/pkg-plist Normal file
View File

@ -0,0 +1,28 @@
include/hocon/config.hpp
include/hocon/config_exception.hpp
include/hocon/config_include_context.hpp
include/hocon/config_includer.hpp
include/hocon/config_includer_file.hpp
include/hocon/config_list.hpp
include/hocon/config_mergeable.hpp
include/hocon/config_object.hpp
include/hocon/config_origin.hpp
include/hocon/config_parse_options.hpp
include/hocon/config_parseable.hpp
include/hocon/config_render_options.hpp
include/hocon/config_resolve_options.hpp
include/hocon/config_syntax.hpp
include/hocon/config_value.hpp
include/hocon/config_value_factory.hpp
include/hocon/config_value_factory.hpp.orig
include/hocon/export.h
include/hocon/functional_list.hpp
include/hocon/parser/config_document.hpp
include/hocon/parser/config_document_factory.hpp
include/hocon/parser/config_node.hpp
include/hocon/path.hpp
include/hocon/program_options.hpp
include/hocon/types.hpp
include/hocon/version.h
lib/libcpp-hocon.so
lib/libcpp-hocon.so.0.1.2

29
devel/dia2code+/Makefile Normal file
View File

@ -0,0 +1,29 @@
# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
# $FreeBSD$
PORTNAME= dia2code+
PORTVERSION= 1.0.0
CATEGORIES= devel
MASTER_SITES= SF/dia2code/dia2code+/${PORTVERSION}
DISTNAME= dia2code-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
COMMENT= Complete rewrite of dia2code in C++
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf:build compiler:gcc-c++11-lib iconv
USE_GNOME= libxml2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/dia2code \
man/man1/dia2code.1.gz
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/dia2code.1 ${STAGEDIR}${MANPREFIX}/man/man1
.include <bsd.port.mk>

3
devel/dia2code+/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1488715576
SHA256 (dia2code-1.0.0.tar.gz) = c7746379cd15267fc3f600af16f77490e28f3becd260b7440f53776239ad491d
SIZE (dia2code-1.0.0.tar.gz) = 946967

17
devel/dia2code+/pkg-descr Normal file
View File

@ -0,0 +1,17 @@
Dia2Code is a small utility used to generate code from a Dia diagram.
Dia is a program to make diagrams (ports/graphics/dia)
- Reads UML diagrams.
- Can handle UML - Generalization, UML - Realization and UML - Implements.
- Selective code generation.
- User-defined output directory.
- Stereotype handling: interfaces, abstract classes.
- "Import" and "include" based on the parent classes, the type of
attributes and return type of methods if they're declared in the same
diagram.
- Support for JavaBeans(tm): will create automagically methods to access
and modify each attribute.
This is a complete rewrite of dia2code in C++ contributed by Vincent Le Garrec.
WWW: http://dia2code.sourceforge.net/

View File

@ -12,6 +12,8 @@ COMMENT= Small utility used to generate code from a Dia diagram
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limit:^0\.
USES= iconv
USE_GNOME= libxml2
GNU_CONFIGURE= yes

View File

@ -14,7 +14,8 @@ LICENSE= APACHE20
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
USE_GITHUB= yes
GH_TUPLE= google:google-gdata:edcd096379
GH_ACCOUNT= google
GH_TAGNAME= edcd096379
USES= dos2unix gmake mono pathfix
PATHFIX_MAKEFILEIN= Makefile

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gsoap
PORTVERSION= 2.8.43
PORTVERSION= 2.8.44
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8
DISTNAME= ${PORTNAME}_${PORTVERSION}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1486809614
SHA256 (gsoap_2.8.43.zip) = 75e898933432968cabfe1173278956a978d10152d51755a91e2c7578ca3ab66f
SIZE (gsoap_2.8.43.zip) = 36710317
TIMESTAMP = 1488717745
SHA256 (gsoap_2.8.44.zip) = c61dd4d228e55177b6251bcde6d37c834eeedae434c43ad3af07e38e4b84f94e
SIZE (gsoap_2.8.44.zip) = 36197714

View File

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

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1487568234
SHA256 (jenkins/2.47/jenkins.war) = df8203812375f9ba6cfc4d5a3ef278836fe00973f5e02a8326b8141ece56cc24
SIZE (jenkins/2.47/jenkins.war) = 68676619
TIMESTAMP = 1488863542
SHA256 (jenkins/2.49/jenkins.war) = 2329d5cce5a57fc9778179a61074d670e04eb13631d448e0eb2ff3837ab6f830
SIZE (jenkins/2.49/jenkins.war) = 68682753

19
devel/ksql/Makefile Normal file
View File

@ -0,0 +1,19 @@
# $FreeBSD$
PORTNAME= ksql
PORTVERSION= 0.0.9
CATEGORIES= devel databases
MASTER_SITES= http://kristaps.bsd.lv/ksql/snapshots/
MAINTAINER= tobik@FreeBSD.org
COMMENT= Lazy man's wrapper for the SQLite C API
LICENSE= ISCL
LIB_DEPENDS= libsqlite3.so:databases/sqlite3
USES= localbase
MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}"
ALL_TARGET= libksql.a
.include <bsd.port.mk>

3
devel/ksql/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1488715533
SHA256 (ksql-0.0.9.tar.gz) = 052706ece35ca780be87ec2b645d91e62366d3bc8ee7acad50ddb12a35b2da08
SIZE (ksql-0.0.9.tar.gz) = 11669

8
devel/ksql/pkg-descr Normal file
View File

@ -0,0 +1,8 @@
Ksql is a "lazy man's" wrapper for the SQLite C API. It is written to
make sure sloppy programming won't cause your SQLite database to be
inconsistent (transactions and statements open on exit and certain
signals). Specifically, it exits on any database errors; and upon
exit (or signal), cleans up open statements, transactions, and
databases.
WWW: https://kristaps.bsd.lv/ksql/

Some files were not shown because too many files have changed in this diff Show More