Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: FreeBSD
  • Loading branch information
fichtner committed Dec 6, 2016
1 parent e4120b3 commit cf5730d
Show file tree
Hide file tree
Showing 291 changed files with 4,888 additions and 1,653 deletions.
8 changes: 5 additions & 3 deletions astro/R-cran-maptools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= maptools
DISTVERSION= 0.8-39
DISTVERSION= 0.8-40
CATEGORIES= astro
DISTNAME= ${PORTNAME}_${DISTVERSION}

Expand All @@ -11,8 +11,10 @@ COMMENT= Tools for reading and handling spatial objects

LICENSE= GPLv2+

RUN_DEPENDS= R-cran-sp>=1.0.11:math/R-cran-sp
CRAN_DEPENDS= R-cran-sp>=1.0.11:math/R-cran-sp
BUILD_DEPENDS= ${CRAN_DEPENDS}
RUN_DEPENDS= ${CRAN_DEPENDS}

USES= cran:auto-plist
USES= cran:auto-plist,compiles

.include <bsd.port.mk>
5 changes: 3 additions & 2 deletions astro/R-cran-maptools/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SHA256 (maptools_0.8-39.tar.gz) = 4b81e313e45dbb75e0fbb180b02985d1c34aaa5669e483283b632788e6a67dd2
SIZE (maptools_0.8-39.tar.gz) = 1582435
TIMESTAMP = 1481025150
SHA256 (maptools_0.8-40.tar.gz) = 7875a45886f72cdd4d1601c89717c3d2868b5379183f618d753a3f7a25b6e713
SIZE (maptools_0.8-40.tar.gz) = 1576590
22 changes: 14 additions & 8 deletions audio/amarok-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= amarok
PORTVERSION= 2.8.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= audio kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src

Expand All @@ -22,14 +22,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:dev
RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \
${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms

USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2
USE_KDE= kdelibs libkcddb libkcompactdisc \
nepomuk-core runtime automoc4 strigi
USE_MYSQL= embedded
USES= cmake:outsource kde:4 mysql pkgconfig \
shared-mime-info shebangfix tar:bzip2
USE_GL= gl
USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \
nepomuk-core runtime soprano strigi
USE_QT4= corelib dbus designer gui network opengl \
phonon script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11
USE_XORG= ice sm x11 xau xdmcp xext xft xpm
SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
USE_LDCONFIG= yes

Expand All @@ -43,15 +44,20 @@ AMAZON_DESC= Amazon MP3 store support via clamz
AMAZON_RUN_DEPENDS= clamz:net/clamz

IPOD_DESC= Apple iPod support
IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod
IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \
libimobiledevice.so:comms/libimobiledevice \
libplist.so:devel/libplist
IPOD_USE= GNOME=gdkpixbuf2,glib20
IPOD_CMAKE_OFF= -DWITH_IPOD:BOOL=Off

MP3TUNES_DESC= MP3tunes support
MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \
libcurl.so:ftp/curl
MP3TUNES_USE= GNOME=glib20,libxml2
MP3TUNES_CMAKE_OFF= -DWITH_MP3tunes:BOOL=Off
MP3TUNES_USES= ssl
MP3TUNES_CMAKE_ON= -DWITH_MP3Tunes:BOOL=ON \
-DWITH_Libgcrypt:BOOL=OFF
MP3TUNES_CMAKE_OFF= -DWITH_MP3Tunes:BOOL=Off

MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp
MTP_CMAKE_OFF= -DWITH_Mtp:BOOL=Off
Expand Down
85 changes: 85 additions & 0 deletions audio/amarok-kde4/files/patch-kde_rb-126682
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
# Fix build with FFmpeg 3.x; obtained from https://git.reviewboard.kde.org/r/126682
#
--- src/musicbrainz/MusicDNSAudioDecoder.cpp
+++ src/musicbrainz/MusicDNSAudioDecoder.cpp
@@ -243,7 +243,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -251,7 +251,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}

decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -287,7 +287,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c

avcodec_close( pCodecCtx );
avformat_close_input( &pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );

return data->duration();
}
@@ -361,7 +361,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -369,7 +369,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}

decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -405,7 +405,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c

avcodec_close( pCodecCtx );
avformat_close_input( &pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );

return data->duration();
}
@@ -479,7 +479,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
{
if( !decodedFrame )
{
- decodedFrame = avcodec_alloc_frame();
+ decodedFrame = av_frame_alloc();
if( !decodedFrame )
{
warning() << "Unable to allocate enough memory to decode file.";
@@ -487,7 +487,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c
break;
}
else
- avcodec_get_frame_defaults( decodedFrame );
+ av_frame_unref( decodedFrame );
}

decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
@@ -523,7 +523,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c

avcodec_close( pCodecCtx );
av_close_input_file( pFormatCtx );
- av_free( decodedFrame );
+ av_frame_free( &decodedFrame );

return data->duration();
}
19 changes: 8 additions & 11 deletions benchmarks/flowgrind/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,26 @@
# $FreeBSD$

PORTNAME= flowgrind
PORTVERSION= 0.7.5
PORTREVISION= 1
PORTVERSION= 0.8.0
DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= benchmarks

MAINTAINER= [email protected]
MAINTAINER= [email protected]
COMMENT= Measure throughput and other metrics for TCP

LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libgsl.so:math/gsl \
libxmlrpc.so:net/xmlrpc-c
libxmlrpc.so:net/xmlrpc-c \
libcurl.so:ftp/curl \
libwwwxml.so:www/libwww \
libuuid.so:misc/e2fsprogs-libuuid

USE_GITHUB= yes

USES= autoreconf
USES= autoreconf ssl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-pcap --enable-gsl
CONFIGURE_ENV= LIBS="${LIBS} -lpcap"

post-patch:
@${RM} -r ${WRKSRC}/build-aux
@${REINPLACE_CMD} -e 's|AC_LIB_RPATH||g' ${WRKSRC}/configure.ac
CONFIGURE_ENV= LIBS="${LIBS} -lpcap"

.include <bsd.port.mk>
5 changes: 3 additions & 2 deletions benchmarks/flowgrind/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SHA256 (flowgrind-flowgrind-flowgrind-0.7.5_GH0.tar.gz) = 714d958340ac89339404fd0b2acd42dcb67277c7e9e4443903a9f85ab6c6342b
SIZE (flowgrind-flowgrind-flowgrind-0.7.5_GH0.tar.gz) = 146499
TIMESTAMP = 1478561627
SHA256 (flowgrind-flowgrind-flowgrind-0.8.0_GH0.tar.gz) = 1b0c6c571f11430e170ee5d654ff10ba095f627f50509b6c678681566ead8cb6
SIZE (flowgrind-flowgrind-flowgrind-0.8.0_GH0.tar.gz) = 152977
3 changes: 2 additions & 1 deletion databases/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,9 @@
SUBDIR += percona56-server
SUBDIR += pg_activity
SUBDIR += pg_citus
SUBDIR += pg_qualstats
SUBDIR += pg_reorg
SUBDIR += pg_rman
SUBDIR += pg_qualstats
SUBDIR += pg_stat_kcache
SUBDIR += pg_statsinfo
SUBDIR += pgaccess
Expand Down Expand Up @@ -795,6 +795,7 @@
SUBDIR += py34-gdbm
SUBDIR += py34-sqlite3
SUBDIR += py35-gdbm
SUBDIR += py35-mysqlclient
SUBDIR += py35-sqlite3
SUBDIR += pydbx
SUBDIR += pymongo
Expand Down
13 changes: 7 additions & 6 deletions databases/influxdb/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= influxdb
PORTVERSION= 1.0.2
PORTVERSION= 1.1.0
DISTVERSIONPREFIX= v
CATEGORIES= databases net-mgmt

Expand All @@ -22,13 +22,13 @@ GH_TUPLE= BurntSushi:toml:9906417:toml \
bmizerany:pat:c068ca2:pat \
boltdb:bolt:5cc10bb:bolt \
davecgh:go-spew:5215b55:go_spew \
dgrijalva:jwt-go:9b486c8:jwt_go \
dgrijalva:jwt-go:63734ea:jwt_go \
dgryski:go-bits:2ad8d70:go_bits \
dgryski:go-bitstream:7d46cd2:go_bitstream \
gogo:protobuf:6abcf94:protobuf \
gogo:protobuf:0394392:protobuf \
golang:snappy:d9eb7a3:snappy \
influxdata:usage-client:475977e:usage_client \
jwilder:encoding:ac74639:encoding \
influxdata:usage-client:6d38953:usage_client \
jwilder:encoding:4dada27:encoding \
kimor79:gollectd:61d0dee:gollectd \
paulbellamy:ratecounter:5a11f58:ratecounter \
peterh:liner:8975875:liner \
Expand Down Expand Up @@ -112,7 +112,8 @@ post-patch:
@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto

do-build:
@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${SETENV} GOPATH=${WRKSRC} go install ./...
@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && \
${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./...

do-install:
${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
Expand Down
22 changes: 11 additions & 11 deletions databases/influxdb/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TIMESTAMP = 1476392334
SHA256 (influxdata-influxdb-v1.0.2_GH0.tar.gz) = 440899edccbcbe66a6919c7c1fbbde7a6f3b3c2917abb454597f37dd80bb1163
SIZE (influxdata-influxdb-v1.0.2_GH0.tar.gz) = 1386268
TIMESTAMP = 1479812634
SHA256 (influxdata-influxdb-v1.1.0_GH0.tar.gz) = 080d602d272cae3a3836dc73f5f433863a8445894d2c53fa89e1254b5a4da200
SIZE (influxdata-influxdb-v1.1.0_GH0.tar.gz) = 1428498
SHA256 (BurntSushi-toml-9906417_GH0.tar.gz) = a980407edcf8275d58651f9af3c74dc802f0aaf702936c78b36059289421de8c
SIZE (BurntSushi-toml-9906417_GH0.tar.gz) = 39914
SHA256 (bmizerany-pat-c068ca2_GH0.tar.gz) = 1bff463e4313717c5561a97020e5b6ae8095560fa834aa565c488b85b5549433
Expand All @@ -9,20 +9,20 @@ SHA256 (boltdb-bolt-5cc10bb_GH0.tar.gz) = a992db35390fcf540ebbf8685f03a8165a6814
SIZE (boltdb-bolt-5cc10bb_GH0.tar.gz) = 80285
SHA256 (davecgh-go-spew-5215b55_GH0.tar.gz) = a73d6352d8172dfb648e6aa25a8b81ed5c1895295090c876bef01d017264cbac
SIZE (davecgh-go-spew-5215b55_GH0.tar.gz) = 41794
SHA256 (dgrijalva-jwt-go-9b486c8_GH0.tar.gz) = 623546acbfac2febde330b3db969a0e15645bac9c257bf5c02301de753d4d84c
SIZE (dgrijalva-jwt-go-9b486c8_GH0.tar.gz) = 23530
SHA256 (dgrijalva-jwt-go-63734ea_GH0.tar.gz) = 524a2760e20997b803c8604d6cfc117632816ed2741ff9e772ceab9bf7dedd47
SIZE (dgrijalva-jwt-go-63734ea_GH0.tar.gz) = 33501
SHA256 (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 732ddc81419cd7fa5e43394c384bff3708c47206982c87975b6adc7b428e90db
SIZE (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 2193
SHA256 (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = ba7a2b22ea94d4541da4fce08e7c58fdbcde6feec1a652c3174a89907567667f
SIZE (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = 3006
SHA256 (gogo-protobuf-6abcf94_GH0.tar.gz) = eab44866a2b216acc42798ab6240e2f45f290694b52e3dc3dfc9f93854aa0e03
SIZE (gogo-protobuf-6abcf94_GH0.tar.gz) = 2094783
SHA256 (gogo-protobuf-0394392_GH0.tar.gz) = f53d1d7c21ec6a9bf6c58360d5fc3bb2aa4ff194d6b2ea6bbdd55f7566cf370c
SIZE (gogo-protobuf-0394392_GH0.tar.gz) = 2228267
SHA256 (golang-snappy-d9eb7a3_GH0.tar.gz) = 857fd1a142bc62ed05610c9daec12c6f6e4ff68b6cd5594311496b96bd8cbc2d
SIZE (golang-snappy-d9eb7a3_GH0.tar.gz) = 62041
SHA256 (influxdata-usage-client-475977e_GH0.tar.gz) = b62bc789b1e508b3904a9514705d0d5c362e9788028eeab97c588927a94d59f7
SIZE (influxdata-usage-client-475977e_GH0.tar.gz) = 6620
SHA256 (jwilder-encoding-ac74639_GH0.tar.gz) = 4ffaca6579bd79f7989047552eac79158219eb979677652e2dd05fba54b18bc8
SIZE (jwilder-encoding-ac74639_GH0.tar.gz) = 9454
SHA256 (influxdata-usage-client-6d38953_GH0.tar.gz) = aa828fc1f3fb5fa7c68eee58b4b5a7886e664cbdcac853d6a32945c2f0dd9024
SIZE (influxdata-usage-client-6d38953_GH0.tar.gz) = 6578
SHA256 (jwilder-encoding-4dada27_GH0.tar.gz) = 96d48ce4f2d88056216f88e22758d2f9142e86eda11793d9683be8a55a959228
SIZE (jwilder-encoding-4dada27_GH0.tar.gz) = 9479
SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498
SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508
SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba
Expand Down
2 changes: 1 addition & 1 deletion databases/influxdb/files/influxd.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ start_precmd="influxd_precmd"

influxd_precmd()
{
install -o ${influxd_user} /dev/null ${influxd_pidfile}
install -d -o ${influxd_user} %%INFLUXD_PIDDIR%%
}

run_rc_command "$1"
2 changes: 1 addition & 1 deletion databases/phpmyadmin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= phpMyAdmin
DISTVERSION= 4.6.5.1
DISTVERSION= 4.6.5.2
CATEGORIES= databases www
MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages
Expand Down
6 changes: 3 additions & 3 deletions databases/phpmyadmin/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1480362125
SHA256 (phpMyAdmin-4.6.5.1-all-languages.tar.xz) = e163b08b6d1137fd7c48ea97e8e53be415b1937f5e5f7e070936a60c3b9a3df0
SIZE (phpMyAdmin-4.6.5.1-all-languages.tar.xz) = 6162164
TIMESTAMP = 1481008881
SHA256 (phpMyAdmin-4.6.5.2-all-languages.tar.xz) = 8cb549c0cd04ecaa3b2a8d9315e7c88528603fa6fe91057b13173f6afba80894
SIZE (phpMyAdmin-4.6.5.2-all-languages.tar.xz) = 6136880
7 changes: 7 additions & 0 deletions databases/py35-mysqlclient/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# $FreeBSD$

MASTERDIR= ${.CURDIR}/../py-mysqlclient

PYTHON_VERSION= python3.5

.include "${MASTERDIR}/Makefile"
8 changes: 6 additions & 2 deletions databases/redis-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
# $FreeBSD$

PORTNAME= redis
DISTVERSION= 3.2.5
DISTVERSION= 4.0-rc1
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
MASTER_SITES= https://github.com/antirez/redis/archive/
PKGNAMESUFFIX= -devel
DISTNAME= ${DISTVERSION}
DIST_SUBDIR= ${PORTNAME}

MAINTAINER= [email protected]
COMMENT= Persistent key-value database with built-in net interface
Expand All @@ -23,6 +25,8 @@ LUAJIT_DESC= Use lang/luajit instead of builtin lua
TESTS_DESC= Install lang/tcl for redis unit tests
TRIB_DESC= Install redis-trib.rb (lang/ruby req.)

WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MTRIB}
Expand Down
6 changes: 3 additions & 3 deletions databases/redis-devel/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1480441490
SHA256 (redis-3.2.5.tar.gz) = 8509ceb1efd849d6b2346a72a8e926b5a4f6ed3cc7c3cd8d9f36b2e9ba085315
SIZE (redis-3.2.5.tar.gz) = 1544040
TIMESTAMP = 1480898940
SHA256 (redis/4.0-rc1.tar.gz) = 4a7f8daafd5ca6d65a077d0bb8d4b6cc4ba5a2e6da2281fd45acebd327db941c
SIZE (redis/4.0-rc1.tar.gz) = 1683841
Loading

0 comments on commit cf5730d

Please sign in to comment.