diff --git a/astro/libosmium/files/patch-include_osmium_util_endian.hpp b/astro/libosmium/files/patch-include_osmium_util_endian.hpp index 52e8a08a7f14..6608d29bcbf1 100644 --- a/astro/libosmium/files/patch-include_osmium_util_endian.hpp +++ b/astro/libosmium/files/patch-include_osmium_util_endian.hpp @@ -5,7 +5,7 @@ // Windows is only available for little endian architectures // http://stackoverflow.com/questions/6449468/can-i-safely-assume-that-windows-installations-will-always-be-little-endian -#if !defined(_WIN32) && !defined(__APPLE__) -+#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) +# include +#elif !defined(_WIN32) && !defined(__APPLE__) # include diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers index 5564838744f8..9cd7eee825d9 100644 --- a/astro/xearth/files/freebsd.committers.markers +++ b/astro/xearth/files/freebsd.committers.markers @@ -217,6 +217,7 @@ 52.188649, -2.2341, "crees" # Worcester, West Midlands, United Kingdom 42.8474, -2.66976, "carvay" # Araba, Vitoria-Gasteiz, Spain 51.49, -3.16, "ceri" # Cardiff, UK + 37.1876, -3.6149, "cpm" # Granada, Spain 53.20, -6.15, "dwmalone" align=left # Dublin, Ireland 53.286499, -6.196429, "flz" # Stillorgan, Co. Dublin, Ireland 53.65, -6.67, "peadar" align=above # Navan, Co. Meath, Ireland diff --git a/audio/ardour5/Makefile b/audio/ardour5/Makefile index bd9a94bd5aea..4b889b0da976 100644 --- a/audio/ardour5/Makefile +++ b/audio/ardour5/Makefile @@ -4,8 +4,7 @@ PORTNAME= ardour5 PORTVERSION= 5.5.0 CATEGORIES= audio -MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ \ - http://github.com/beerml/ardour_releases/raw/master/ +MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ # The original master side points to the latest release only: # MASTER_SITES= https://community.ardour.org/srctar/ DISTNAME= Ardour-${PORTVERSION} diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 8dc3aedcfcd1..371f709c82a3 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flac -PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTVERSION= 1.3.2 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/flac/ @@ -22,7 +21,7 @@ USES= iconv libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static \ - --enable-sse \ + --disable-sse \ --with-ogg="${LOCALBASE}" \ --disable-doxygen-docs \ --disable-thorough-tests \ diff --git a/audio/flac/distinfo b/audio/flac/distinfo index 55be70352a62..dd1b35fcbe4c 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,2 +1,3 @@ -SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c -SIZE (flac-1.3.1.tar.xz) = 941848 +TIMESTAMP = 1484327981 +SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f +SIZE (flac-1.3.2.tar.xz) = 776192 diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure index e83412207e15..e1ba89b793f4 100644 --- a/audio/flac/files/patch-configure +++ b/audio/flac/files/patch-configure @@ -1,31 +1,13 @@ ---- configure.orig 2014-11-27 02:46:58 UTC +--- configure.orig 2017-01-01 03:46:48 UTC +++ configure -@@ -17885,7 +17885,7 @@ _ACEOF - - asm_optimisation=no - case "$host_cpu" in -- x86_64) -+ amd64|x86_64) - if test $ac_cv_sizeof_voidp = 4 ; then - # This must be a 32 bit user space running on 64 bit kernel so treat - # this as ia32. -@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then +@@ -20547,8 +20547,8 @@ if test "x$debug" = xtrue; then CFLAGS="-g $CFLAGS" else CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') - CFLAGS="-O3 -funroll-loops $CFLAGS" -+ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') ++ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') + #CFLAGS="-O3 -funroll-loops $CFLAGS" fi -@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj - - fi - -- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then -+ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5 - $as_echo_n "checking if $CC accepts -msse2... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" diff --git a/audio/flac/files/patch-doc_html_Makefile.in b/audio/flac/files/patch-doc_html_Makefile.in deleted file mode 100644 index 9ffac585eaba..000000000000 --- a/audio/flac/files/patch-doc_html_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- doc/html/Makefile.in.orig 2014-11-27 02:46:59 UTC -+++ doc/html/Makefile.in -@@ -739,9 +739,9 @@ uninstall-am: uninstall-docDATA uninstal - - # The install targets don't copy whole directories so we have to - # handle 'api/' specially: --@FLaC__HAS_DOXYGEN_TRUE@install-data-local: --@FLaC__HAS_DOXYGEN_TRUE@ $(mkinstalldirs) $(DESTDIR)$(docdir)/api --@FLaC__HAS_DOXYGEN_TRUE@ (cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api) -+install-data-local: -+ $(mkinstalldirs) $(DESTDIR)$(docdir)/api -+ (cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api) - @FLaC__HAS_DOXYGEN_TRUE@uninstall-local: - @FLaC__HAS_DOXYGEN_TRUE@ rm -rf $(DESTDIR)$(docdir)/api - @FLaC__HAS_DOXYGEN_TRUE@distclean-local: diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist index 5e27967b83c2..4b7f0e4a55b1 100644 --- a/audio/flac/pkg-plist +++ b/audio/flac/pkg-plist @@ -29,255 +29,6 @@ man/man1/metaflac.1.gz share/aclocal/libFLAC++.m4 share/aclocal/libFLAC.m4 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag -%%PORTDOCS%%%%DOCSDIR%%/html/api/_09_2all_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/_09_2export_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/_09_2export_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/_09_2metadata_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/_09_2metadata_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/all_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/bc_s.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/bdwn.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/closed.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_1982b5890de532b4beef7221dae776e2.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_527642952c2881b3e5b36abb4a29ebef.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_d44c64559bbebec7f509842c48db8b23.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/dynsections.js -%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/files.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2blank.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2doc.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2folderclosed.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2folderopen.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2lastnode.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2link.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2mlastnode.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2mnode.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2node.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2plastnode.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2pnode.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2splitbar.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ftv2vertline.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_b.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_c.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_d.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_e.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_f.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_c.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_d.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_e.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_f.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_g.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_i.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_l.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_m.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_n.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_o.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_p.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_r.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_s.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_t.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_u.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_v.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_w.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func_~.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_g.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_i.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_l.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_m.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_n.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_o.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_p.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_q.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_r.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_s.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_t.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_u.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_v.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_w.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_~.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__export.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__export.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__2__to__1__1__3.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__3__to__1__1__4.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__4__to__1__2__0.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/nav_f.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/nav_g.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/nav_h.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/open.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html -%%PORTDOCS%%%%DOCSDIR%%/html/api/sync_off.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/sync_on.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_a.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_b.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_h.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_s.png -%%PORTDOCS%%%%DOCSDIR%%/html/api/tabs.css %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html %%PORTDOCS%%%%DOCSDIR%%/html/developers.html %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html diff --git a/audio/opencore-amr/Makefile b/audio/opencore-amr/Makefile index 4914110f99f5..0bbe659e7ed8 100644 --- a/audio/opencore-amr/Makefile +++ b/audio/opencore-amr/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= opencore-amr -PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTVERSION= 0.1.4 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/audio/opencore-amr/distinfo b/audio/opencore-amr/distinfo index 5a9c5e4a2193..e132dbf0469d 100644 --- a/audio/opencore-amr/distinfo +++ b/audio/opencore-amr/distinfo @@ -1,2 +1,3 @@ -SHA256 (opencore-amr-0.1.3.tar.gz) = 106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385 -SIZE (opencore-amr-0.1.3.tar.gz) = 881105 +TIMESTAMP = 1484314752 +SHA256 (opencore-amr-0.1.4.tar.gz) = 029918505e6a357b2b09432c7892a192d740d8b82f8a44c2e0805ba45643a95b +SIZE (opencore-amr-0.1.4.tar.gz) = 929807 diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index e23883c7ec4e..2434a43079a6 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -17,8 +17,6 @@ LICENSE_NAME= TeamSpeak 3.x End User License Agreement LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell -BROKEN_FreeBSD_11=Will not start on 11, Bug 212493 - USES= tar:bz2 NO_BUILD= yes USE_LDCONFIG= ${LIBDIR} @@ -46,6 +44,10 @@ OPTIONS_DEFINE= DOCS .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100507 +BROKEN= Will not start on FreeBSD 11, Bug 212493 +.endif + .if ${ARCH} == "i386" TEAMSPEAK_ARCH= x86 WRKSRC= ${WRKDIR}/${PORTNAME}_freebsd_${TEAMSPEAK_ARCH} diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index cb6ce6fca0d5..60a8d3fabbc3 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xmms-flac -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/flac/ DISTNAME= flac-${PORTVERSION} @@ -16,8 +16,11 @@ LIB_DEPENDS= libxmms.so:multimedia/xmms \ libFLAC.so:audio/flac \ libogg.so:audio/libogg -USES= iconv libtool tar:xz +USES= gettext-runtime iconv libtool tar:xz +USE_GNOME= gtk12 +USE_XORG= xi xext x11 GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip MAKEFILE= ${FILESDIR}/Makefile diff --git a/audio/xmms-flac/distinfo b/audio/xmms-flac/distinfo index 55be70352a62..0b0fa80d3c21 100644 --- a/audio/xmms-flac/distinfo +++ b/audio/xmms-flac/distinfo @@ -1,2 +1,3 @@ -SHA256 (flac-1.3.1.tar.xz) = 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c -SIZE (flac-1.3.1.tar.xz) = 941848 +TIMESTAMP = 1484341501 +SHA256 (flac-1.3.2.tar.xz) = 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f +SIZE (flac-1.3.2.tar.xz) = 776192 diff --git a/audio/xmms-flac/files/Makefile b/audio/xmms-flac/files/Makefile index 070ccdf5cdec..c13a1f6df105 100644 --- a/audio/xmms-flac/files/Makefile +++ b/audio/xmms-flac/files/Makefile @@ -2,7 +2,7 @@ SUBDIRS= src/share src/plugin_common src/plugin_xmms -all install: +all install install-strip: @for d in ${SUBDIRS}; do \ (cd $$d; ${MAKE} $@); \ done diff --git a/audio/xmms-flac/files/patch-configure b/audio/xmms-flac/files/patch-configure index e83412207e15..e1ba89b793f4 100644 --- a/audio/xmms-flac/files/patch-configure +++ b/audio/xmms-flac/files/patch-configure @@ -1,31 +1,13 @@ ---- configure.orig 2014-11-27 02:46:58 UTC +--- configure.orig 2017-01-01 03:46:48 UTC +++ configure -@@ -17885,7 +17885,7 @@ _ACEOF - - asm_optimisation=no - case "$host_cpu" in -- x86_64) -+ amd64|x86_64) - if test $ac_cv_sizeof_voidp = 4 ; then - # This must be a 32 bit user space running on 64 bit kernel so treat - # this as ia32. -@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then +@@ -20547,8 +20547,8 @@ if test "x$debug" = xtrue; then CFLAGS="-g $CFLAGS" else CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') - CFLAGS="-O3 -funroll-loops $CFLAGS" -+ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') ++ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') + #CFLAGS="-O3 -funroll-loops $CFLAGS" fi -@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj - - fi - -- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then -+ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5 - $as_echo_n "checking if $CC accepts -msse2... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in index 67ab48074c75..5250db7678b7 100644 --- a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in +++ b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in @@ -1,6 +1,6 @@ ---- src/plugin_xmms/Makefile.in.orig 2014-11-27 02:47:01 UTC +--- src/plugin_xmms/Makefile.in.orig 2017-01-01 03:46:49 UTC +++ src/plugin_xmms/Makefile.in -@@ -156,8 +156,7 @@ libxmms_flac_la_DEPENDENCIES = \ +@@ -166,8 +166,7 @@ libxmms_flac_la_DEPENDENCIES = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ @@ -10,7 +10,7 @@ am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \ tag.lo am_libxmms_flac_la_OBJECTS = $(am__objects_1) -@@ -413,8 +412,7 @@ libxmms_flac_la_LIBADD = \ +@@ -429,8 +428,7 @@ libxmms_flac_la_LIBADD = \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ $(top_builddir)/src/share/utf8/libutf8.la \ diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile index ee0fb1bfdd9c..d0e3f1fa296a 100644 --- a/benchmarks/sipp/Makefile +++ b/benchmarks/sipp/Makefile @@ -3,6 +3,7 @@ PORTNAME= sipp PORTVERSION= 3.5.1 +PORTREVISION= 1 CATEGORIES= benchmarks net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/ @@ -29,7 +30,7 @@ SCTP_CONFIGURE_WITH= sctp RTPSTREAM_CONFIGURE_WITH= rtpstream OPENSSL_CONFIGURE_WITH= openssl -OPENSSL_USE= openssl=yes +OPENSSL_USES= ssl GSL_LIB_DEPENDS= libgsl.so:math/gsl PCAP_FILES= dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \ @@ -41,7 +42,7 @@ PCAP_FILES= dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \ PCAP_PLIST_FILES= ${PCAP_FILES:S|^|${DATADIR}/pcap/|} post-patch: - ${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[[:<:]]curses|ncurses|' ${WRKSRC}/configure.ac post-patch-PCAP-on: @${REINPLACE_CMD} \ @@ -50,7 +51,7 @@ post-patch-PCAP-on: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sipp.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/include/sipp.1 ${STAGEDIR}${PREFIX}/man/man1 do-install-PCAP-on: ${MKDIR} ${STAGEDIR}${DATADIR}/pcap diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 37f368d1df7e..039ab955239f 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= 20140622%2Bbzr4027 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= https://launchpadlibrarian.net/179199115/ @@ -19,14 +19,8 @@ RUN_DEPENDS= xpdf:graphics/xpdf CONFLICTS= kicad-devel* -USES= cmake desktop-file-utils dos2unix shared-mime-info tar:xz - -# Does not compile with Gcc48 -USE_GCC= 4.7 -#USES+= compiler:gcc-c++11-lib -LDFLAGS+= -L${LOCALBASE}/lib/c++ -CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ +USES= cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix \ + shared-mime-info tar:xz DOS2UNIX_GLOB= *.cmake sch_bus_entry.h sch_line.h sch_no_connect.h USE_XORG= ice x11 xext diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile index 2da341a08f30..f6ed9c367f87 100644 --- a/cad/librecad/Makefile +++ b/cad/librecad/Makefile @@ -1,34 +1,40 @@ # $FreeBSD$ PORTNAME= librecad -DISTVERSION= 2.0.8 -PORTREVISION= 2 +PORTVERSION= 2.1.3 CATEGORIES= cad -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= 2D CAD system +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/gpl-2.0.txt + BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs -LIB_DEPENDS= libmuparser.so:math/muparser +LIB_DEPENDS= libmuparser.so:math/muparser \ + libfreetype.so:print/freetype2 USE_GITHUB= yes GH_ACCOUNT= LibreCAD GH_PROJECT= LibreCAD -USE_QT4= gui help network sql svg help-tools_build \ - linguisttools_build moc_build rcc_build uic_build USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake +USE_GL= gl +USE_QT5= core gui printsupport sql svg widgets \ + buildtools_build linguisttools_build +QMAKE_ARGS+= BOOST_DIR="${LOCALBASE}" # Unhide std::to_string() to fix build with GCC (ports/193528) CFLAGS+= -D_GLIBCXX_USE_C99 post-patch: - @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ + @${REINPLACE_CMD} -e 's|QMAKE_CXXFLAGS += -g||' \ + ${WRKSRC}/common.pri + @${REINPLACE_CMD} -e 's|lrelease|${LRELEASE}|' \ + ${WRKSRC}/scripts/postprocess-unix.sh + @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/librecad/src/lib/engine/rs_settings.cpp \ ${WRKSRC}/librecad/src/lib/engine/rs_system.cpp - @${REINPLACE_CMD} -e \ - '/^Icon/s,librecad,${PREFIX}/share/pixmaps/librecad.png,' \ - ${WRKSRC}/desktop/librecad.desktop pre-install: @${CHMOD} +w ${WRKSRC}/unix/resources/plugins/*.so diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo index 1750873b2473..3fac1c195f92 100644 --- a/cad/librecad/distinfo +++ b/cad/librecad/distinfo @@ -1,2 +1,3 @@ -SHA256 (LibreCAD-LibreCAD-2.0.8_GH0.tar.gz) = ddf654a29369d0b6e275584eb769c5d682957cb34babd004d1c71206cd080f34 -SIZE (LibreCAD-LibreCAD-2.0.8_GH0.tar.gz) = 19965985 +TIMESTAMP = 1484384119 +SHA256 (LibreCAD-LibreCAD-2.1.3_GH0.tar.gz) = 74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06 +SIZE (LibreCAD-LibreCAD-2.1.3_GH0.tar.gz) = 22415288 diff --git a/cad/librecad/pkg-plist b/cad/librecad/pkg-plist index e41f0e276947..f63d4535c4f3 100644 --- a/cad/librecad/pkg-plist +++ b/cad/librecad/pkg-plist @@ -2,11 +2,11 @@ bin/librecad bin/ttf2lff share/appdata/librecad.appdata.xml share/applications/librecad.desktop -%%DATADIR%%/doc/LibreCADdoc.qch -%%DATADIR%%/doc/LibreCADdoc.qhc %%DATADIR%%/fonts/OpenGostTypeA-Regular.lff %%DATADIR%%/fonts/OpenGostTypeB-Regular.lff %%DATADIR%%/fonts/amiri-regular.lff +%%DATADIR%%/fonts/azomix.lff +%%DATADIR%%/fonts/azomix_i.lff %%DATADIR%%/fonts/cursive.lff %%DATADIR%%/fonts/cyrillic_ii.lff %%DATADIR%%/fonts/gothgbt.lff @@ -18,6 +18,8 @@ share/applications/librecad.desktop %%DATADIR%%/fonts/greekp.lff %%DATADIR%%/fonts/greeks.lff %%DATADIR%%/fonts/iso.lff +%%DATADIR%%/fonts/iso3098.lff +%%DATADIR%%/fonts/iso3098_i.lff %%DATADIR%%/fonts/italicc.lff %%DATADIR%%/fonts/italiccs.lff %%DATADIR%%/fonts/italict.lff @@ -1418,6 +1420,7 @@ share/applications/librecad.desktop %%DATADIR%%/qm/librecad_es_uy.qm %%DATADIR%%/qm/librecad_es_ve.qm %%DATADIR%%/qm/librecad_et.qm +%%DATADIR%%/qm/librecad_eu.qm %%DATADIR%%/qm/librecad_fi.qm %%DATADIR%%/qm/librecad_fr.qm %%DATADIR%%/qm/librecad_gl.qm @@ -1474,6 +1477,7 @@ share/applications/librecad.desktop %%DATADIR%%/qm/plugins_es_uy.qm %%DATADIR%%/qm/plugins_es_ve.qm %%DATADIR%%/qm/plugins_et.qm +%%DATADIR%%/qm/plugins_eu.qm %%DATADIR%%/qm/plugins_fi.qm %%DATADIR%%/qm/plugins_fr.qm %%DATADIR%%/qm/plugins_gl.qm diff --git a/chinese/pyzy/pkg-descr b/chinese/pyzy/pkg-descr index e74c190abf71..c26b84286379 100644 --- a/chinese/pyzy/pkg-descr +++ b/chinese/pyzy/pkg-descr @@ -3,4 +3,4 @@ The Chinese PinYin and Bopomofo conversion library This is the Chinese PinYin / Bopomofo conversion library. You can easily write an application which handles the Chinese with it. -WWW: http://github.com/pyzy/pyzy +WWW: https://github.com/pyzy/pyzy diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile index 12ae29e8878e..6e08c1dad13b 100644 --- a/chinese/wordpress-zh_CN/Makefile +++ b/chinese/wordpress-zh_CN/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ diff --git a/chinese/wordpress-zh_CN/distinfo b/chinese/wordpress-zh_CN/distinfo index 29394664c45c..4f7a1e30e578 100644 --- a/chinese/wordpress-zh_CN/distinfo +++ b/chinese/wordpress-zh_CN/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481647381 -SHA256 (wordpress-4.7-zh_CN.tar.gz) = 3ef69eebc9a5c7ce5658ea75842d2b41e61fee0a016fe1e970fad73fdf7c976e -SIZE (wordpress-4.7-zh_CN.tar.gz) = 8479240 +TIMESTAMP = 1484377056 +SHA256 (wordpress-4.7.1-zh_CN.tar.gz) = 99805d8099b34a4abb9cea66fe93418cf5b98f40e2f3284b84886ed75d2d3aea +SIZE (wordpress-4.7.1-zh_CN.tar.gz) = 8489566 diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile index d9d082d48758..09a95e2bcdc0 100644 --- a/chinese/wordpress-zh_TW/Makefile +++ b/chinese/wordpress-zh_TW/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ diff --git a/chinese/wordpress-zh_TW/distinfo b/chinese/wordpress-zh_TW/distinfo index ca8ccefa02d9..c4d081b546ff 100644 --- a/chinese/wordpress-zh_TW/distinfo +++ b/chinese/wordpress-zh_TW/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118620 -SHA256 (wordpress-4.7-zh_TW.tar.gz) = 528ae59bf9ed9b7688cd4673e47e7242692fb567434d226c7afdb963a7e5e1de -SIZE (wordpress-4.7-zh_TW.tar.gz) = 8452109 +TIMESTAMP = 1484390635 +SHA256 (wordpress-4.7.1-zh_TW.tar.gz) = 1f4ae5f6a8bbc6007b2b9d53d6942f9fe6c160a67689073de25ec259cf196cb0 +SIZE (wordpress-4.7.1-zh_TW.tar.gz) = 8466467 diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile index 5740fa80d90c..b5451299d085 100644 --- a/comms/deforaos-phone/Makefile +++ b/comms/deforaos-phone/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= phone -PORTVERSION= 0.3.12 -PORTREVISION= 3 +PORTVERSION= 0.5.1 CATEGORIES= comms -MASTER_SITES= http://www.defora.org/os/download/download/4296/ +MASTER_SITES= http://www.defora.org/os/download/download/4455/ PKGNAMEPREFIX= deforaos- DISTNAME= Phone-${PORTVERSION} @@ -18,20 +17,48 @@ LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ libDesktop.so:x11/deforaos-libdesktop \ libpulse.so:audio/pulseaudio \ libpurple.so:net-im/libpurple \ - libsofia-sip-ua.so:net/sofia-sip + libsofia-sip-ua.so:net/sofia-sip \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 BUILD_DEPENDS= locker:x11/deforaos-locker \ - ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ - xsltproc:textproc/libxslt \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -USES= desktop-file-utils gettext pkgconfig -USE_GNOME= gtk20 +USES= desktop-file-utils pkgconfig +USE_GNOME= gtk20 cairo INSTALLS_ICONS= yes MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc include|data include|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|include po src|include src|' \ + ${WRKSRC}/Makefile + post-patch: @${REINPLACE_CMD} -e 's,/dev/modem,/dev/cuaU0,g' \ ${WRKSRC}/src/modems/hayes.c + @${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ + ${WRKSRC}/data/pkgconfig.sh + @${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile \ + ${WRKSRC}/tests/Makefile + @${REINPLACE_CMD} 's|-lossaudio||' \ + ${WRKSRC}/src/plugins/Makefile \ + ${WRKSRC}/tests/Makefile + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Phone/plugins/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Phone/modem/* .include diff --git a/comms/deforaos-phone/distinfo b/comms/deforaos-phone/distinfo index 89a3fb7145d1..72942936a458 100644 --- a/comms/deforaos-phone/distinfo +++ b/comms/deforaos-phone/distinfo @@ -1,2 +1,3 @@ -SHA256 (Phone-0.3.12.tar.gz) = 53c6d2484a3c11d6bdcd980254cfa41c5f5c8fbc811892e61bf0425a3bde416d -SIZE (Phone-0.3.12.tar.gz) = 175768 +TIMESTAMP = 1484259053 +SHA256 (Phone-0.5.1.tar.gz) = 8762b78893725fdc8d2ec31ce2e69e5f0e77dbebc2f3b076f92db64042647e91 +SIZE (Phone-0.5.1.tar.gz) = 327180 diff --git a/comms/deforaos-phone/files/patch-doc_Makefile b/comms/deforaos-phone/files/patch-doc_Makefile new file mode 100644 index 000000000000..0cf5656ac1af --- /dev/null +++ b/comms/deforaos-phone/files/patch-doc_Makefile @@ -0,0 +1,47 @@ +--- doc/Makefile.orig 2017-01-12 16:11:40 UTC ++++ doc/Makefile +@@ -1,7 +1,7 @@ + MKDIR = mkdir -m 0755 -p + INSTALL = install + RM = rm -f +-TARGETS = $(OBJDIR)gprs.1 $(OBJDIR)gprs.html $(OBJDIR)index.html $(OBJDIR)phone.1 $(OBJDIR)phone.html $(OBJDIR)phonectl.1 $(OBJDIR)phonectl.html ++TARGETS = $(OBJDIR)gprs.1 $(OBJDIR)phone.1 $(OBJDIR)phonectl.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -37,23 +37,16 @@ $(OBJDIR)phonectl.html: manual.css.xml p + clean: + $(RM) -- $(gprs.1_OBJS) $(gprs.html_OBJS) $(index.html_OBJS) $(phone.1_OBJS) $(phone.html_OBJS) $(phonectl.1_OBJS) $(phonectl.html_OBJS) + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gprs.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gprs.html" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phone.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phone.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phonectl.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phonectl.html" + + distclean: clean + $(RM) -- $(TARGETS) + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gprs.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gprs.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phone.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phone.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phonectl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phonectl.html" + $(MKDIR) $(DESTDIR)$(PREFIX)/share/doc/Phone + $(INSTALL) -m 0644 phone.conf $(DESTDIR)$(PREFIX)/share/doc/Phone/phone.conf + $(MKDIR) $(DESTDIR)$(PREFIX)/share/doc/Phone +@@ -65,11 +58,8 @@ install: $(TARGETS) + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gprs.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gprs.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.html" + $(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/phone.conf + $(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/pppd-chat_gprs + $(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/pppd-peers_gprs diff --git a/comms/deforaos-phone/files/patch-doc__Makefile b/comms/deforaos-phone/files/patch-doc__Makefile deleted file mode 100644 index f1feeda08d81..000000000000 --- a/comms/deforaos-phone/files/patch-doc__Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- doc/Makefile.orig 2013-11-04 12:16:46.534030500 +0100 -+++ doc/Makefile 2013-11-04 12:17:20.050448106 +0100 -@@ -1,4 +1,4 @@ --TARGETS = index.html phone.1 phone.html phonectl.1 phonectl.html -+TARGETS = phone.1 phonectl.1 - PREFIX = /usr/local - DESTDIR = - RM = rm -f -@@ -33,14 +33,10 @@ - - install: $(TARGETS) - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phone.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phone.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phonectl.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phonectl.html" - - uninstall: - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.html" - - .PHONY: all clean distclean install uninstall diff --git a/comms/deforaos-phone/files/patch-src-plugins-Makefile b/comms/deforaos-phone/files/patch-src-plugins-Makefile deleted file mode 100644 index 2cb4f3240ea4..000000000000 --- a/comms/deforaos-phone/files/patch-src-plugins-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/Makefile.orig 2012-06-24 15:48:33.000000000 +0200 -+++ src/plugins/Makefile 2012-06-24 15:48:43.000000000 +0200 -@@ -73,7 +73,7 @@ - - oss_OBJS = oss.o - oss_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) --oss_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lossaudio -+oss_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) - - oss.so: $(oss_OBJS) - $(CCSHARED) -o oss.so $(oss_OBJS) $(oss_LDFLAGS) diff --git a/comms/deforaos-phone/pkg-plist b/comms/deforaos-phone/pkg-plist index f93dc3dfaded..1ca58f72a1ad 100644 --- a/comms/deforaos-phone/pkg-plist +++ b/comms/deforaos-phone/pkg-plist @@ -1,3 +1,4 @@ +bin/gprs bin/phone bin/phonectl include/Desktop/Phone.h @@ -7,60 +8,86 @@ include/Desktop/Phone/phone.h include/Desktop/Phone/plugin.h lib/Phone/modem/debug.so lib/Phone/modem/hayes.so -lib/Phone/modem/purple.so -lib/Phone/modem/sofia.so lib/Phone/plugins/blacklist.so +lib/Phone/plugins/console.so lib/Phone/plugins/debug.so lib/Phone/plugins/engineering.so lib/Phone/plugins/gprs.so lib/Phone/plugins/gps.so -lib/Phone/plugins/locker.so lib/Phone/plugins/n900.so -lib/Phone/plugins/notify.so lib/Phone/plugins/openmoko.so lib/Phone/plugins/oss.so lib/Phone/plugins/panel.so lib/Phone/plugins/password.so lib/Phone/plugins/profiles.so -lib/Phone/plugins/pulseaudio.so lib/Phone/plugins/smscrypt.so lib/Phone/plugins/systray.so lib/Phone/plugins/ussd.so -man/man1/phone.1.gz -man/man1/phonectl.1.gz -share/applications/phone-contacts.desktop -share/applications/phone-dialer.desktop -share/applications/phone-log.desktop -share/applications/phone-messages.desktop -share/applications/phone-settings.desktop -share/icons/hicolor/16x16/apps/phone-dialer.png +libdata/pkgconfig/Phone.pc +%%PORTDOCS%%man/man1/gprs.1.gz +%%PORTDOCS%%man/man1/phone.1.gz +%%PORTDOCS%%man/man1/phonectl.1.gz +share/applications/deforaos-phone-contacts.desktop +share/applications/deforaos-phone-dialer.desktop +share/applications/deforaos-phone-log.desktop +share/applications/deforaos-phone-messages.desktop +share/applications/deforaos-phone-settings.desktop +share/applications/deforaos-phone-sofia.desktop +share/icons/hicolor/16x16/apps/phone-gprs.png share/icons/hicolor/16x16/apps/phone-drafts.png share/icons/hicolor/16x16/apps/phone-inbox.png share/icons/hicolor/16x16/apps/phone-n900.png share/icons/hicolor/16x16/apps/phone-openmoko.png share/icons/hicolor/16x16/apps/phone-roaming.png share/icons/hicolor/16x16/apps/phone-sent.png -share/icons/hicolor/22x22/apps/phone-dialer.png +share/icons/hicolor/22x22/apps/phone-gprs.png share/icons/hicolor/22x22/apps/phone-signal-00.png share/icons/hicolor/22x22/apps/phone-signal-100.png share/icons/hicolor/22x22/apps/phone-signal-25.png share/icons/hicolor/22x22/apps/phone-signal-50.png share/icons/hicolor/22x22/apps/phone-signal-75.png -share/icons/hicolor/24x24/apps/phone-dialer.png +share/icons/hicolor/24x24/apps/phone-gprs.png share/icons/hicolor/24x24/apps/phone-drafts.png share/icons/hicolor/24x24/apps/phone-inbox.png share/icons/hicolor/24x24/apps/phone-n900.png share/icons/hicolor/24x24/apps/phone-openmoko.png share/icons/hicolor/24x24/apps/phone-roaming.png share/icons/hicolor/24x24/apps/phone-sent.png -share/icons/hicolor/32x32/apps/phone-dialer.png +share/icons/hicolor/32x32/apps/phone-gprs.png share/icons/hicolor/32x32/apps/phone-n900.png share/icons/hicolor/32x32/apps/phone-openmoko.png share/icons/hicolor/32x32/apps/phone-roaming.png -share/icons/hicolor/48x48/apps/phone-dialer.png +share/icons/hicolor/48x48/apps/phone-gprs.png share/icons/hicolor/48x48/apps/phone-inbox.png share/icons/hicolor/48x48/apps/phone-n900.png share/icons/hicolor/48x48/apps/phone-openmoko.png share/icons/hicolor/48x48/apps/phone-roaming.png share/icons/hicolor/48x48/apps/phone-sent.png -share/locale/fr/LC_MESSAGES/Phone.mo +share/sounds/Phone/0.wav +share/sounds/Phone/1.wav +share/sounds/Phone/2.wav +share/sounds/Phone/3.wav +share/sounds/Phone/4.wav +share/sounds/Phone/5.wav +share/sounds/Phone/6.wav +share/sounds/Phone/7.wav +share/sounds/Phone/8.wav +share/sounds/Phone/9.wav +share/sounds/Phone/a.wav +share/sounds/Phone/b.wav +share/sounds/Phone/busy.wav +share/sounds/Phone/c.wav +share/sounds/Phone/d.wav +share/sounds/Phone/hash.wav +share/sounds/Phone/keytone.wav +share/sounds/Phone/ringback.wav +share/sounds/Phone/ringtone.wav +share/sounds/Phone/star.wav +%%NLS%%share/locale/fr/LC_MESSAGES/Phone.mo +%%NLS%%share/locale/es/LC_MESSAGES/Phone.mo +%%PORTDOCS%%share/doc/Phone/gprs.conf +%%PORTDOCS%%share/doc/Phone/phone.conf +%%PORTDOCS%%share/doc/Phone/pppd-chat_gprs +%%PORTDOCS%%share/doc/Phone/pppd-peers_gprs +%%PORTDOCS%%share/doc/Phone/pppd-peers_phone +%%PORTDOCS%%share/doc/Phone/ussd.conf diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile index 787a93510e9f..494ed999d7f1 100644 --- a/databases/fortytwo-bdb/Makefile +++ b/databases/fortytwo-bdb/Makefile @@ -12,7 +12,8 @@ DISTFILES= BDB-${PORTVERSION}-src.tgz \ MAINTAINER= ports@FreeBSD.org COMMENT= Interface to Berkeley DB for GNUstep -LICENSE= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/LICENSE USES= bdb gnustep USE_GNUSTEP= back build @@ -29,7 +30,9 @@ ADDITIONAL_LDFLAGS+= -L${BDB_LIB_DIR} OPTIONS_DEFINE= DOCS post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/BDB.framework/Versions/0/libBDB.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/BDB.framework/Versions/0/libBDB.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKDIR}/BDB-0.2.0-api-ref && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} diff --git a/databases/fortytwo-bdb/pkg-descr b/databases/fortytwo-bdb/pkg-descr index 3301bbf06fb2..a06069ea3e18 100644 --- a/databases/fortytwo-bdb/pkg-descr +++ b/databases/fortytwo-bdb/pkg-descr @@ -7,6 +7,4 @@ classes and mechanisms offered by the Foundation library. In its present state BDB just offers a reduced set of functionality of Berkeley DB. -LICENSE: LGPL2 or later - WWW: http://fortytwo.sourceforge.net/ diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile index 8079a67385e0..5ac1be3a46ac 100644 --- a/databases/jasperreports/Makefile +++ b/databases/jasperreports/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/itext.jar:devel/itext \ ${JAVALIBDIR}/crimson.jar:textproc/crimson \ ${JAVALIBDIR}/poi.jar:textproc/apache-poi \ ${JAVALIBDIR}/jfreechart.jar:java/jfreechart \ - ${JAVASHAREDIR}/batik/batik.jar:graphics/batik \ + ${JAVALIBDIR}/../batik/batik.jar:graphics/batik \ ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils\ ${JAVALIBDIR}/commons-digester.jar:textproc/jakarta-commons-digester diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile index 092cee6f586b..8243894f69a1 100644 --- a/databases/mariadb100-client/Makefile +++ b/databases/mariadb100-client/Makefile @@ -21,6 +21,7 @@ CLIENT_ONLY= yes post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private .include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb100-client/files/patch-CMakeLists.txt b/databases/mariadb100-client/files/patch-CMakeLists.txt index c8b7b286c938..ddd1ce8f2441 100644 --- a/databases/mariadb100-client/files/patch-CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200 -+++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200 +--- CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ CMakeLists.txt @@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) @@ -11,7 +11,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) -@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER) +@@ -425,6 +425,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(internal) ENDIF() ENDIF() @@ -19,7 +19,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -480,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -27,7 +27,7 @@ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP +@@ -490,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() diff --git a/databases/mariadb100-client/files/patch-client_CMakeLists.txt b/databases/mariadb100-client/files/patch-client_CMakeLists.txt index 7acc3e306f79..86778daa8d9f 100644 --- a/databases/mariadb100-client/files/patch-client_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 -+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 -@@ -38,11 +38,12 @@ +--- client/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ client/CMakeLists.txt +@@ -38,11 +38,12 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -14,8 +14,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -53,21 +54,25 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -41,7 +41,7 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -79,10 +84,12 @@ +@@ -80,10 +85,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. diff --git a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt index 3f34a7d1dba1..63e2e96f9bb6 100644 --- a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2015-01-25 16:21:40.000000000 +0100 -+++ extra/CMakeLists.txt 2015-01-29 20:20:56.846047266 +0100 -@@ -54,6 +54,7 @@ +--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ extra/CMakeLists.txt +@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -74,9 +75,12 @@ +@@ -74,9 +75,12 @@ ENDIF() MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) TARGET_LINK_LIBRARIES(replace mysys) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -@@ -97,7 +101,9 @@ +@@ -100,7 +104,9 @@ ENDIF() ../storage/innobase/page/page0zip.cc ) diff --git a/databases/mariadb100-client/files/patch-include_CMakeLists.txt b/databases/mariadb100-client/files/patch-include_CMakeLists.txt index e4c1761275ca..db795a5a93ce 100644 --- a/databases/mariadb100-client/files/patch-include_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-include_CMakeLists.txt @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 -@@ -58,13 +58,18 @@ +--- include/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ include/CMakeLists.txt +@@ -66,16 +66,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I FOREACH(f ${HEADERS_GEN_CONFIGURE}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ENDFOREACH(f) @@ -20,3 +20,6 @@ PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb100-client/files/patch-include_my_compare.h b/databases/mariadb100-client/files/patch-include_my__compare.h similarity index 72% rename from databases/mariadb100-client/files/patch-include_my_compare.h rename to databases/mariadb100-client/files/patch-include_my__compare.h index ad948aa1b5db..788176ec99c7 100644 --- a/databases/mariadb100-client/files/patch-include_my_compare.h +++ b/databases/mariadb100-client/files/patch-include_my__compare.h @@ -1,6 +1,6 @@ ---- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200 -+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200 -@@ -40,7 +40,7 @@ +--- include/my_compare.h.orig 2017-01-12 01:45:16 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ diff --git a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt index 5b7f086a93ae..69c35e1aecc6 100644 --- a/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC +--- libmysql/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC +++ libmysql/CMakeLists.txt -@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED) +@@ -479,6 +479,8 @@ IF(NOT DISABLE_SHARED) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") diff --git a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt index beb30eb10a81..3d519797d81f 100644 --- a/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 -+++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200 -@@ -29,4 +29,6 @@ +--- libservices/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ libservices/CMakeLists.txt +@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) diff --git a/databases/mariadb100-client/files/patch-man_CMakeLists.txt b/databases/mariadb100-client/files/patch-man_CMakeLists.txt index 09dd6e3b0f7d..32274e8bf45a 100644 --- a/databases/mariadb100-client/files/patch-man_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-man_CMakeLists.txt @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 -+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 -@@ -30,9 +30,13 @@ +--- man/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC ++++ man/CMakeLists.txt +@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 mysqltest_embedded.1 mysql_client_test_embedded.1) diff --git a/databases/mariadb100-client/files/patch-mysys_my_default.c b/databases/mariadb100-client/files/patch-mysys_my__default.c similarity index 66% rename from databases/mariadb100-client/files/patch-mysys_my_default.c rename to databases/mariadb100-client/files/patch-mysys_my__default.c index fef69528a070..70ab3073cf64 100644 --- a/databases/mariadb100-client/files/patch-mysys_my_default.c +++ b/databases/mariadb100-client/files/patch-mysys_my__default.c @@ -1,15 +1,6 @@ ---- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 -+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 -@@ -90,7 +90,7 @@ - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -785,7 +785,7 @@ +--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC ++++ mysys/my_default.c +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,22 +9,22 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ + if (strstr(name, "/etc") == name) + { + fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); + goto err; + } + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1075,8 @@ +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +34,7 @@ } } } -@@ -1223,13 +1232,10 @@ +@@ -1229,13 +1238,10 @@ static const char **init_default_directo #else diff --git a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt index 2c46f7484de7..1c7f87d89399 100644 --- a/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt @@ -1,6 +1,6 @@ ---- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 -+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 -@@ -513,6 +513,8 @@ +--- pcre/CMakeLists.txt.orig 2017-01-12 01:45:18 UTC ++++ pcre/CMakeLists.txt +@@ -509,6 +509,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) diff --git a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt index 729f635ef36e..1464eba1f8e2 100644 --- a/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 -@@ -72,6 +72,7 @@ +--- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC ++++ scripts/CMakeLists.txt +@@ -73,6 +73,7 @@ IF(UNIX) ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -81,6 +82,7 @@ +@@ -82,6 +83,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -140,6 +142,7 @@ +@@ -134,6 +136,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -180,6 +183,7 @@ +@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -204,6 +208,7 @@ +@@ -192,6 +196,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -219,6 +224,7 @@ +@@ -207,6 +212,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -281,6 +287,8 @@ +@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -57,7 +57,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -339,18 +347,8 @@ +@@ -327,18 +335,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config diff --git a/databases/mariadb100-client/files/patch-scripts_mysql_config.sh b/databases/mariadb100-client/files/patch-scripts_mysql__config.sh similarity index 82% rename from databases/mariadb100-client/files/patch-scripts_mysql_config.sh rename to databases/mariadb100-client/files/patch-scripts_mysql__config.sh index 5271d5256b8f..4254a0cf9b24 100644 --- a/databases/mariadb100-client/files/patch-scripts_mysql_config.sh +++ b/databases/mariadb100-client/files/patch-scripts_mysql__config.sh @@ -1,6 +1,6 @@ ---- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 -+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 -@@ -108,8 +108,11 @@ +--- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " diff --git a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt index 4c14473d5e2d..5e9fa44d640d 100644 --- a/databases/mariadb100-client/files/patch-sql_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-sql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200 -+++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200 -@@ -226,9 +226,9 @@ +--- sql/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC ++++ sql/CMakeLists.txt +@@ -247,9 +247,9 @@ RUN_BISON( ) # Gen_lex_hash diff --git a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt index 314bf0b121fe..a001da40a730 100644 --- a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 -+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 -@@ -41,15 +41,18 @@ +--- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -19,9 +19,9 @@ FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -67,8 +70,10 @@ +@@ -69,8 +72,10 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) + ADD_SUBDIRECTORY(SELinux) ENDIF() + ENDIF() @@ -30,7 +30,7 @@ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -92,6 +97,7 @@ +@@ -94,6 +99,7 @@ IF(UNIX) DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) @@ -38,7 +38,7 @@ IF (INSTALL_SYSCONFDIR) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -101,6 +107,7 @@ +@@ -103,6 +109,7 @@ IF(UNIX) RENAME mysql COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 67f59030b5a1..01b60786621f 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.27 -PORTREVISION= 3 +PORTVERSION= 10.0.29 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -18,6 +17,7 @@ MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 +#LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept @@ -117,6 +117,7 @@ ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 +MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy # Currently OQGraph does not build using clang. @@ -132,9 +133,10 @@ post-install: # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now . for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ - bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 + bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4 ${RM} ${STAGEDIR}${PREFIX}/${f} . endfor + ${RM} -r ${STAGEDIR}${DATADIR}/SELinux .endif .include @@ -146,8 +148,8 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MTOKUDB} -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ https://github.com/percona/PerconaFT/blob/master/README.md .endif @@ -169,4 +171,8 @@ post-patch: ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif +post-configure-MROONGA-on: + ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ + ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt + .include diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo index 7e9ad89c13d3..7bbc5dd5d7d3 100644 --- a/databases/mariadb100-server/distinfo +++ b/databases/mariadb100-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472465827 -SHA256 (mariadb-10.0.27.tar.gz) = bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd -SIZE (mariadb-10.0.27.tar.gz) = 63258508 +TIMESTAMP = 1484413888 +SHA256 (mariadb-10.0.29.tar.gz) = f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 +SIZE (mariadb-10.0.29.tar.gz) = 63385696 diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt index cd7c4a947240..aa0a7143e460 100644 --- a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt +++ b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt @@ -1,14 +1,13 @@ ---- extra/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC +++ extra/CMakeLists.txt -@@ -78,9 +78,11 @@ IF(UNIX) +@@ -78,8 +78,10 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - ENDIF() +ENDIF() - - # Add path to the InnoDB headers + MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) diff --git a/databases/mariadb100-server/files/patch-mysys_my__default.c b/databases/mariadb100-server/files/patch-mysys_my__default.c index fbce62ffde68..70ab3073cf64 100644 --- a/databases/mariadb100-server/files/patch-mysys_my__default.c +++ b/databases/mariadb100-server/files/patch-mysys_my__default.c @@ -1,15 +1,6 @@ ---- mysys/my_default.c.orig 2015-06-17 14:54:12 UTC +--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC +++ mysys/my_default.c -@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -785,7 +785,7 @@ static int search_default_file_with_ext( +@@ -786,7 +786,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,22 +9,22 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ static int search_default_file_with_ext( +@@ -804,6 +804,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ + if (strstr(name, "/etc") == name) + { + fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); + goto err; + } + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * +@@ -1068,7 +1076,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +34,7 @@ } } } -@@ -1223,13 +1232,10 @@ static const char **init_default_directo +@@ -1229,13 +1238,10 @@ static const char **init_default_directo #else diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh index 85ed88461ead..d6f1dcede44d 100644 --- a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh +++ b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh @@ -1,6 +1,6 @@ ---- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC +--- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC +++ scripts/mysqld_safe.sh -@@ -445,10 +445,10 @@ fi +@@ -469,10 +469,10 @@ fi if test -z "$MYSQL_HOME" then @@ -13,12 +13,12 @@ $DATADIR/my.cnf IGNORING $DATADIR/my.cnf" -@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf" +@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf" then log_error "WARNING: Found $DATADIR/my.cnf The data directory is a deprecated location for my.cnf, please move it to -$MY_BASEDIR_VERSION/my.cnf" +$MY_BASEDIR_VERSION/etc/my.cnf" + unsafe_my_cnf=1 MYSQL_HOME=$DATADIR else - MYSQL_HOME=$MY_BASEDIR_VERSION diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt index 640ccd2263f9..d0a809928ae0 100644 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt +++ b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt @@ -1,6 +1,6 @@ ---- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2016-02-17 21:59:56.000000000 +0100 -+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt 2016-02-21 20:51:12.317052693 +0100 -@@ -84,8 +84,8 @@ set_target_properties(ft_static PROPERTI +--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2017-01-12 01:45:22 UTC ++++ storage/tokudb/PerconaFT/ft/CMakeLists.txt +@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI maybe_add_gcov_to_libraries(ft ft_static) ## depend on other generated targets diff --git a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 36eadd4a4413..000000000000 --- a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2015-06-17 14:54:14 UTC -+++ support-files/CMakeLists.txt -@@ -67,10 +67,11 @@ IF(UNIX) - ENDFOREACH() - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) -- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) - ENDIF() - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist index 2ceaa37b9723..ba5342b9769e 100644 --- a/databases/mariadb100-server/pkg-plist +++ b/databases/mariadb100-server/pkg-plist @@ -24,6 +24,7 @@ bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe +bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest diff --git a/databases/monetdb/files/patch-monetdb5-extras-jaql-parser-jaql.y b/databases/monetdb/files/patch-monetdb5-extras-jaql-parser-jaql.y new file mode 100644 index 000000000000..380c0d874c34 --- /dev/null +++ b/databases/monetdb/files/patch-monetdb5-extras-jaql-parser-jaql.y @@ -0,0 +1,25 @@ +--- monetdb5/extras/jaql/parser/jaql.y.orig 2013-01-14 21:06:06.000000000 +0800 ++++ monetdb5/extras/jaql/parser/jaql.y 2017-01-09 04:57:50.801797000 +0800 +@@ -81,12 +81,10 @@ + + + %{ +-#define YYLEX_PARAM j->scanner +- + int jaqllex(YYSTYPE* lvalp, void *scanner); + + void +-jaqlerror(struct _jc* j, char const *msg) ++jaqlerror(struct _jc* j, char const *msg, char const *yy_) + { + if (j->err[0] == '\0') { + char around[32]; +@@ -114,6 +112,8 @@ + + %} + ++%parse-param {void *scanner} ++ + %% + + stmt: jaql ';' diff --git a/databases/opentsdb/Makefile b/databases/opentsdb/Makefile index 54cb1375e307..323523f5166a 100644 --- a/databases/opentsdb/Makefile +++ b/databases/opentsdb/Makefile @@ -10,7 +10,8 @@ MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERS MAINTAINER= johannes@perceivon.net COMMENT= OpenTSDB is the Scalable Timeseries Database -LICENSE= LGPL3 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LESSER BUILD_DEPENDS= bash:shells/bash \ curl:ftp/curl \ @@ -23,6 +24,7 @@ USE_JAVA= yes JAVA_VERSION= 1.8+ SHEBANG_FILES= tools/check_tsd tools/opentsdb_restart.py \ tools/tsddrain.py +NO_ARCH= yes OPTIONS_DEFINE= GNUPLOT OPTIONS_DEFAULT= GNUPLOT diff --git a/databases/opentsdb/pkg-descr b/databases/opentsdb/pkg-descr index cf696c5e1fb3..82a5f7879273 100644 --- a/databases/opentsdb/pkg-descr +++ b/databases/opentsdb/pkg-descr @@ -4,4 +4,4 @@ index and serve metrics collected from computer systems (network gear, operating systems, applications) at a large scale, and make this data easily accessible and graphable. -WWW: http://www.opentsdb.net +WWW: http://www.opentsdb.net/ diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile index 05f3b93d6e48..b07ac07eaa8d 100644 --- a/databases/p5-Memcached-libmemcached/Makefile +++ b/databases/p5-Memcached-libmemcached/Makefile @@ -23,10 +23,4 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile.PL -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL -.endif - -.include +.include diff --git a/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL b/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL deleted file mode 100644 index c9685df3280b..000000000000 --- a/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.PL.orig 2015-05-07 17:56:22 UTC -+++ Makefile.PL -@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} - $opts{DEFINE} .= ' -Wmissing-prototypes'; - } - } --$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 -+$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 - $opts{OPTIMIZE} = "-g" if $opt_g; - $opts{CCFLAGS} = "-pg" if $opt_pg; - my $coverage_flags = ""; diff --git a/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL b/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL index c00cc1dfcc13..a9e52265d80c 100644 --- a/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL +++ b/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL @@ -11,6 +11,15 @@ my $is_developer = (-d ".svn" || -d ".git"); my ($lmcd_h) = eval { build_libmemcached() }; +@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} + $opts{DEFINE} .= ' -Wmissing-prototypes'; + } + } +-$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 ++$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 + $opts{OPTIMIZE} = "-g" if $opt_g; + $opts{CCFLAGS} = "-pg" if $opt_pg; + my $coverage_flags = ""; @@ -76,7 +76,7 @@ WriteMakefile( AUTHOR => 'Tim Bunce ', VERSION_FROM => 'libmemcached.pm', diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile index 053f2dabd413..6a336a42d846 100644 --- a/databases/postgresql-plruby/Makefile +++ b/databases/postgresql-plruby/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= CraigCottingham GH_TAGNAME= f8d9ced -USES+= uidfix tar:bzip2 pgsql +USES= uidfix pgsql WANT_PGSQL= server USE_RUBY= yes USE_RUBY_EXTCONF= yes @@ -36,32 +36,28 @@ OPTIONS_DEFINE= DOCS PKGMESSAGE= ${WRKDIR}/createlang.sql -.include - post-fetch: cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch post-build: ${SED} 's,!!PLRUBY_SO!!,${RUBY_SITEARCHLIBDIR}/plruby.so,' \ ${FILESDIR}/createlang.sql > ${WRKDIR}/createlang.sql -.if ${PORT_OPTIONS:MDOCS} + +post-build-DOCS-on: cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc -.endif post-install: @${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ ${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${STAGEDIR}${RUBY_MODDOCDIR}/ README.markdown && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/ ${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} -.endif - -.include -.if ${RUBY_VER} >= 2.2 -BROKEN= Does not build -.endif +BROKEN_RUBY22= yes +BROKEN_RUBY23= yes +BROKEN_RUBY24= yes -.include +.include diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index df28996612d3..9f85d96501b1 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -57,10 +57,6 @@ SHEBANG_FILES= examples/record.rb \ .include -.if ${RUBY_VER} >= 2.1 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bdbxml2-bdbxml.h -.endif - .if ${RUBY_VER} == 2.1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-21 .endif @@ -76,9 +72,13 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/bdb.so + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/doc (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc) + +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -empty") diff --git a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc index bbbcc43a5269..af02e55faea8 100644 --- a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc +++ b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc @@ -1,5 +1,5 @@ ---- ./bdbxml1/bdbxml.cc.orig 2011-04-06 19:35:39.000000000 +0000 -+++ ./bdbxml1/bdbxml.cc 2014-01-03 01:47:58.535201285 +0000 +--- bdbxml1/bdbxml.cc.orig 2011-04-06 19:35:39 UTC ++++ bdbxml1/bdbxml.cc @@ -2340,18 +2340,16 @@ major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR"))); minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR"))); diff --git a/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h similarity index 63% rename from databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h rename to databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h index e29227fac701..ba92db94b87c 100644 --- a/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h +++ b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h @@ -1,5 +1,5 @@ ---- bdbxml2/bdbxml.h.orig 2011-04-06 19:35:39.000000000 +0000 -+++ bdbxml2/bdbxml.h 2015-01-22 17:03:07.000000000 +0000 +--- bdbxml2/bdbxml.h.orig 2011-04-06 19:35:39 UTC ++++ bdbxml2/bdbxml.h @@ -377,7 +377,7 @@ static inline void rset_obj(VALUE obj) diff --git a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc index acbf44827f1a..548c50770388 100644 --- a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc +++ b/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc @@ -1,5 +1,5 @@ ---- ./bdbxml2/bdbxml.cc.orig 2011-04-06 19:35:39.000000000 +0000 -+++ ./bdbxml2/bdbxml.cc 2014-01-03 01:49:02.080197786 +0000 +--- bdbxml2/bdbxml.cc.orig 2011-04-06 19:35:39 UTC ++++ bdbxml2/bdbxml.cc @@ -5536,18 +5536,16 @@ major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR"))); minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR"))); diff --git a/databases/ruby-bdb/files/patch-extconf.rb b/databases/ruby-bdb/files/patch-extconf.rb index c294839dbaed..4edd71af924f 100644 --- a/databases/ruby-bdb/files/patch-extconf.rb +++ b/databases/ruby-bdb/files/patch-extconf.rb @@ -1,5 +1,5 @@ ---- extconf.rb.orig 2011-04-06 19:35:39.000000000 +0000 -+++ extconf.rb 2015-01-22 14:56:21.000000000 +0000 +--- extconf.rb.orig 2011-04-06 19:35:39 UTC ++++ extconf.rb @@ -50,7 +50,7 @@ rdoc: docs/doc/index.html diff --git a/databases/ruby-bdb/files/patch-src-extconf.rb b/databases/ruby-bdb/files/patch-src-extconf.rb index edafdee39408..e81cca6269ce 100644 --- a/databases/ruby-bdb/files/patch-src-extconf.rb +++ b/databases/ruby-bdb/files/patch-src-extconf.rb @@ -1,5 +1,5 @@ ---- src/extconf.rb.orig 2015-01-22 16:09:31.000000000 +0000 -+++ src/extconf.rb 2015-01-22 16:09:34.000000000 +0000 +--- src/extconf.rb.orig 2015-01-22 16:09:31 UTC ++++ src/extconf.rb @@ -36,16 +36,16 @@ if unknown = enable_config("unknown") diff --git a/databases/ruby-bdb/files/patch-src-features.rb b/databases/ruby-bdb/files/patch-src-features.rb index 6d894c93f8a4..4511f83dd129 100644 --- a/databases/ruby-bdb/files/patch-src-features.rb +++ b/databases/ruby-bdb/files/patch-src-features.rb @@ -1,5 +1,5 @@ ---- src/features.rb.orig 2011-04-06 19:35:39.000000000 +0000 -+++ src/features.rb 2015-01-22 16:40:53.000000000 +0000 +--- src/features.rb.orig 2011-04-06 19:35:39 UTC ++++ src/features.rb @@ -813,7 +813,6 @@ begin conftest = CONFTEST_C.dup diff --git a/databases/ruby-bdb/files/patch-src__bdb.c b/databases/ruby-bdb/files/patch-src__bdb.c index 723f1f36507f..3ad6c0cb8163 100644 --- a/databases/ruby-bdb/files/patch-src__bdb.c +++ b/databases/ruby-bdb/files/patch-src__bdb.c @@ -1,5 +1,5 @@ ---- ./src/bdb.c.orig 2011-04-06 19:35:39.000000000 +0000 -+++ ./src/bdb.c 2014-01-03 01:45:56.336210315 +0000 +--- src/bdb.c.orig 2011-04-06 19:35:39 UTC ++++ src/bdb.c @@ -166,11 +166,10 @@ rb_raise(rb_eNameError, "module already defined"); } diff --git a/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile index 3a81afd3e2cf..a45d147cd32b 100644 --- a/databases/rubygem-dm-serializer/Makefile +++ b/databases/rubygem-dm-serializer/Makefile @@ -2,7 +2,7 @@ PORTNAME= dm-serializer PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \ rubygem-fastercsv>=1.5:devel/rubygem-fastercsv \ rubygem-json1>=1.6:devel/rubygem-json1 \ - rubygem-json_pure>=1.6:devel/rubygem-json_pure \ + rubygem-json_pure1>=1.6:devel/rubygem-json_pure1 \ rubygem-multi_json>=1.0:devel/rubygem-multi_json NO_ARCH= yes diff --git a/databases/rubygem-her/Makefile b/databases/rubygem-her/Makefile index 01fe036cbc4a..63cb04aa4132 100644 --- a/databases/rubygem-her/Makefile +++ b/databases/rubygem-her/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= her -PORTVERSION= 0.7.6 +PORTVERSION= 0.8.4 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-her/distinfo b/databases/rubygem-her/distinfo index fbd3ae7b6ed5..0038c9a56f64 100644 --- a/databases/rubygem-her/distinfo +++ b/databases/rubygem-her/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/her-0.7.6.gem) = cd4440ca3951f54b2597c974840843874286f285ecc4db08eba7643904674b6d -SIZE (rubygem/her-0.7.6.gem) = 47104 +TIMESTAMP = 1484440961 +SHA256 (rubygem/her-0.8.4.gem) = 0c530decb1f3e42a9d216324420c3f31c80bf71dfbf422db2297f39bb2523888 +SIZE (rubygem/her-0.8.4.gem) = 60416 diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index a55ecaf8d818..faf6d21b20df 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -56,7 +56,7 @@ CHECK_PORT= nc -z localhost $$\1 2>\&1 OPTIONS_DEFINE= IMAGEMAGICK KERBEROS LDAP IODBC post-patch: - ${REINPLACE_CMD} -e 's,-lruby,-lruby${RUBY_VER:S,.,,},g'\ + ${REINPLACE_CMD} -e 's,-lruby,-lruby${RUBY_SUFFIX},g'\ ${WRKSRC}/configure ${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${GREP} -l 'netstat -an.*grep LISTEN' |\ ${XARGS} ${REINPLACE_CMD}\ diff --git a/devel/Makefile b/devel/Makefile index ec79b104a21f..c7d80bfd2f21 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -50,6 +50,7 @@ SUBDIR += R-cran-sourcetools SUBDIR += R-cran-tibble SUBDIR += R-cran-tidyr + SUBDIR += spdlog SUBDIR += SpecTcl SUBDIR += aap SUBDIR += aarch64-binutils @@ -5235,6 +5236,7 @@ SUBDIR += rubygem-json SUBDIR += rubygem-json1 SUBDIR += rubygem-json_pure + SUBDIR += rubygem-json_pure1 SUBDIR += rubygem-kafo SUBDIR += rubygem-kafo_parsers SUBDIR += rubygem-kafo_wizards diff --git a/devel/bpython/pkg-descr b/devel/bpython/pkg-descr index 765dbecabc39..7f185cedc450 100644 --- a/devel/bpython/pkg-descr +++ b/devel/bpython/pkg-descr @@ -8,4 +8,4 @@ systems. It has the following features: - Save the code you've entered to a file. - Auto-indentation. -WWW: http://bpython-interpreter.org/ +WWW: https://bpython-interpreter.org/ diff --git a/devel/charva/Makefile b/devel/charva/Makefile index b16566b689cc..12742b6f589a 100644 --- a/devel/charva/Makefile +++ b/devel/charva/Makefile @@ -12,7 +12,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= Java Windowing Toolkit for Text Terminals BUILD_DEPENDS= gmake:devel/gmake -RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging OPTIONS_DEFINE= DOCS diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index d9b8e854ef79..c3add21962c6 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -3,7 +3,7 @@ PORTNAME= dbus PORTVERSION= 1.10.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in index 85eb64cbc7c6..7fde66377fb7 100644 --- a/devel/dbus/files/dbus.in +++ b/devel/dbus/files/dbus.in @@ -26,6 +26,7 @@ stop_postcmd="dbus_poststop" dbus_prestart() { %%PREFIX%%/bin/dbus-uuidgen --ensure + mkdir -p /var/run/dbus } dbus_poststop() diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc index a62a4d51657e..220cef980512 100644 --- a/devel/eric6/Makefile.inc +++ b/devel/eric6/Makefile.inc @@ -16,7 +16,7 @@ COMMENT= Full featured Python and Ruby editor and IDE based on Qt LICENSE= GPLv3 -RUN_DEPENDS?= ${PREFIX}/bin/eric6:devel/eric6 +RUN_DEPENDS?= ${LOCALBASE}/bin/eric6:devel/eric6 I18N_LANG?= ru INSTALL_CMD?= install-i18n.py -p ${STAGEDIR} diff --git a/devel/gdb/files/commit-387360daf9 b/devel/gdb/files/commit-387360daf9 index e0a03ad2d786..692e650e2560 100644 --- a/devel/gdb/files/commit-387360daf9 +++ b/devel/gdb/files/commit-387360daf9 @@ -678,683 +678,3 @@ index 0000000000..8a197e6325 +void mips_fbsd_collect_gregs (const struct regcache *, int, void *, size_t); + +#endif /* MIPS_FBSD_TDEP_H */ -commit 9978d70207d8a6bc7ff3c570814053c68e78b913 -Author: John Baldwin -Date: Wed Jan 4 09:41:58 2017 -0800 - - Add FreeBSD/mips architecture. - - This has been tested for the n64 and o32 ABIs. Signal frame unwinders for - both ABIs are provided. FreeBSD/mips requires custom linkmap offsets since - it contains an additional l_off member in 'struct link_map' that other - FreeBSD platforms do not have. Support for collecting and supplying - general purpose and floating point register sets are provided. Common - routines for working with native format register sets are exported for - use by the native target. - - gdb/ChangeLog: - - * Makefile.in (ALL_TARGET_OBS): Add mips-fbsd-tdep.o. - (ALLDEPFILES): Add mips-fbsd-tdep.c. - * NEWS: Mention new FreeBSD/mips target. - * configure.tgt: Add mips*-*-freebsd*. - * mips-fbsd-tdep.c: New file. - * mips-fbsd-tdep.h: New file. - - gdb/doc/ChangeLog: - - * gdb.texinfo (Contributors): Add SRI International and University - of Cambridge for FreeBSD/mips. - -diff --git gdb/Makefile.in gdb/Makefile.in -index 7b2df86878..300c2cb702 100644 ---- gdb/Makefile.in -+++ gdb/Makefile.in -@@ -685,6 +685,7 @@ ALL_TARGET_OBS = \ - m88k-tdep.o \ - mep-tdep.o \ - microblaze-tdep.o microblaze-linux-tdep.o \ -+ mips-fbsd-tdep.o \ - mips-linux-tdep.o mips-sde-tdep.o \ - mipsnbsd-tdep.o mips-tdep.o \ - mn10300-linux-tdep.o mn10300-tdep.o \ -@@ -1724,6 +1725,7 @@ ALLDEPFILES = \ - m88k-tdep.c m88kbsd-nat.c \ - microblaze-tdep.c microblaze-linux-tdep.c \ - mingw-hdep.c common/mingw-strerror.c \ -+ mips-fbsd-tdep.c \ - mips-linux-nat.c mips-linux-tdep.c \ - mips-sde-tdep.c \ - mips-tdep.c \ -diff --git gdb/configure.tgt gdb/configure.tgt -index 7f1aac3742..9ee9f7a799 100644 ---- gdb/configure.tgt -+++ gdb/configure.tgt -@@ -358,6 +358,11 @@ mips*-*-netbsd* | mips*-*-knetbsd*-gnu) - gdb_target_obs="mips-tdep.o mipsnbsd-tdep.o solib-svr4.o nbsd-tdep.o" - gdb_sim=../sim/mips/libsim.a - ;; -+mips*-*-freebsd*) -+ # Target: MIPS running FreeBSD -+ gdb_target_obs="mips-tdep.o mips-fbsd-tdep.o solib-svr4.o fbsd-tdep.o" -+ gdb_sim=../sim/mips/libsim.a -+ ;; - mips64*-*-openbsd*) - # Target: OpenBSD/mips64 - gdb_target_obs="mips-tdep.o mips64obsd-tdep.o obsd-tdep.o solib-svr4.o" -diff --git gdb/doc/gdb.texinfo gdb/doc/gdb.texinfo -index 067a45b2de..179da5cdb3 100644 ---- gdb/doc/gdb.texinfo -+++ gdb/doc/gdb.texinfo -@@ -541,6 +541,11 @@ Steve Tjiang, John Newlin, and Scott Foehner. - Michael Eager and staff of Xilinx, Inc., contributed support for the - Xilinx MicroBlaze architecture. - -+Initial support for the FreeBSD/mips target and native configuration -+was developed by SRI International and the University of Cambridge -+Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 -+("CTSRD"), as part of the DARPA CRASH research programme. -+ - @node Sample Session - @chapter A Sample @value{GDBN} Session - -diff --git gdb/mips-fbsd-tdep.c gdb/mips-fbsd-tdep.c -new file mode 100644 -index 0000000000..733534ddac ---- /dev/null -+++ gdb/mips-fbsd-tdep.c -@@ -0,0 +1,560 @@ -+/* Target-dependent code for FreeBSD/mips. -+ -+ Copyright (C) 2017 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#include "defs.h" -+#include "osabi.h" -+#include "regset.h" -+#include "trad-frame.h" -+#include "tramp-frame.h" -+ -+#include "fbsd-tdep.h" -+#include "mips-tdep.h" -+#include "mips-fbsd-tdep.h" -+ -+#include "solib-svr4.h" -+ -+/* Shorthand for some register numbers used below. */ -+#define MIPS_PC_REGNUM MIPS_EMBED_PC_REGNUM -+#define MIPS_FP0_REGNUM MIPS_EMBED_FP0_REGNUM -+#define MIPS_FSR_REGNUM MIPS_EMBED_FP0_REGNUM + 32 -+ -+/* Core file support. */ -+ -+/* Number of registers in `struct reg' from . The -+ first 38 follow the standard MIPS layout. The 39th holds -+ IC_INT_REG on RM7K and RM9K processors. The 40th is a dummy for -+ padding. */ -+#define MIPS_FBSD_NUM_GREGS 40 -+ -+/* Number of registers in `struct fpreg' from . The -+ first 32 hold floating point registers. 33 holds the FSR. The -+ 34th is a dummy for padding. */ -+#define MIPS_FBSD_NUM_FPREGS 34 -+ -+/* Supply a single register. If the source register size matches the -+ size the regcache expects, this can use regcache_raw_supply(). If -+ they are different, this copies the source register into a buffer -+ that can be passed to regcache_raw_supply(). */ -+ -+static void -+mips_fbsd_supply_reg (struct regcache *regcache, int regnum, const void *addr, -+ size_t len) -+{ -+ struct gdbarch *gdbarch = get_regcache_arch (regcache); -+ -+ if (register_size (gdbarch, regnum) == len) -+ regcache_raw_supply (regcache, regnum, addr); -+ else -+ { -+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); -+ gdb_byte buf[MAX_REGISTER_SIZE]; -+ LONGEST val; -+ -+ val = extract_signed_integer ((const gdb_byte *) addr, len, byte_order); -+ store_signed_integer (buf, register_size (gdbarch, regnum), byte_order, -+ val); -+ regcache_raw_supply (regcache, regnum, buf); -+ } -+} -+ -+/* Collect a single register. If the destination register size -+ matches the size the regcache expects, this can use -+ regcache_raw_supply(). If they are different, this fetches the -+ register via regcache_raw_supply() into a buffer and then copies it -+ into the final destination. */ -+ -+static void -+mips_fbsd_collect_reg (const struct regcache *regcache, int regnum, void *addr, -+ size_t len) -+{ -+ struct gdbarch *gdbarch = get_regcache_arch (regcache); -+ -+ if (register_size (gdbarch, regnum) == len) -+ regcache_raw_collect (regcache, regnum, addr); -+ else -+ { -+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); -+ gdb_byte buf[MAX_REGISTER_SIZE]; -+ LONGEST val; -+ -+ regcache_raw_collect (regcache, regnum, buf); -+ val = extract_signed_integer (buf, register_size (gdbarch, regnum), -+ byte_order); -+ store_signed_integer ((gdb_byte *) addr, len, byte_order, val); -+ } -+} -+ -+/* Supply the floating-point registers stored in FPREGS to REGCACHE. -+ Each floating-point register in FPREGS is REGSIZE bytes in -+ length. */ -+ -+void -+mips_fbsd_supply_fpregs (struct regcache *regcache, int regnum, -+ const void *fpregs, size_t regsize) -+{ -+ const gdb_byte *regs = (const gdb_byte *) fpregs; -+ int i; -+ -+ for (i = MIPS_FP0_REGNUM; i <= MIPS_FSR_REGNUM; i++) -+ if (regnum == i || regnum == -1) -+ mips_fbsd_supply_reg (regcache, i, -+ regs + (i - MIPS_FP0_REGNUM) * regsize, regsize); -+} -+ -+/* Supply the general-purpose registers stored in GREGS to REGCACHE. -+ Each general-purpose register in GREGS is REGSIZE bytes in -+ length. */ -+ -+void -+mips_fbsd_supply_gregs (struct regcache *regcache, int regnum, -+ const void *gregs, size_t regsize) -+{ -+ const gdb_byte *regs = (const gdb_byte *) gregs; -+ int i; -+ -+ for (i = 0; i <= MIPS_PC_REGNUM; i++) -+ if (regnum == i || regnum == -1) -+ mips_fbsd_supply_reg (regcache, i, regs + i * regsize, regsize); -+} -+ -+/* Collect the floating-point registers from REGCACHE and store them -+ in FPREGS. Each floating-point register in FPREGS is REGSIZE bytes -+ in length. */ -+ -+void -+mips_fbsd_collect_fpregs (const struct regcache *regcache, int regnum, -+ void *fpregs, size_t regsize) -+{ -+ gdb_byte *regs = (gdb_byte *) fpregs; -+ int i; -+ -+ for (i = MIPS_FP0_REGNUM; i <= MIPS_FSR_REGNUM; i++) -+ if (regnum == i || regnum == -1) -+ mips_fbsd_collect_reg (regcache, i, -+ regs + (i - MIPS_FP0_REGNUM) * regsize, regsize); -+} -+ -+/* Collect the general-purpose registers from REGCACHE and store them -+ in GREGS. Each general-purpose register in GREGS is REGSIZE bytes -+ in length. */ -+ -+void -+mips_fbsd_collect_gregs (const struct regcache *regcache, int regnum, -+ void *gregs, size_t regsize) -+{ -+ gdb_byte *regs = (gdb_byte *) gregs; -+ int i; -+ -+ for (i = 0; i <= MIPS_PC_REGNUM; i++) -+ if (regnum == i || regnum == -1) -+ mips_fbsd_collect_reg (regcache, i, regs + i * regsize, regsize); -+} -+ -+/* Supply register REGNUM from the buffer specified by FPREGS and LEN -+ in the floating-point register set REGSET to register cache -+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ -+ -+static void -+mips_fbsd_supply_fpregset (const struct regset *regset, -+ struct regcache *regcache, -+ int regnum, const void *fpregs, size_t len) -+{ -+ size_t regsize = mips_abi_regsize (get_regcache_arch (regcache)); -+ -+ gdb_assert (len >= MIPS_FBSD_NUM_FPREGS * regsize); -+ -+ mips_fbsd_supply_fpregs (regcache, regnum, fpregs, regsize); -+} -+ -+/* Collect register REGNUM from the register cache REGCACHE and store -+ it in the buffer specified by FPREGS and LEN in the floating-point -+ register set REGSET. If REGNUM is -1, do this for all registers in -+ REGSET. */ -+ -+static void -+mips_fbsd_collect_fpregset (const struct regset *regset, -+ const struct regcache *regcache, -+ int regnum, void *fpregs, size_t len) -+{ -+ size_t regsize = mips_abi_regsize (get_regcache_arch (regcache)); -+ -+ gdb_assert (len >= MIPS_FBSD_NUM_FPREGS * regsize); -+ -+ mips_fbsd_collect_fpregs (regcache, regnum, fpregs, regsize); -+} -+ -+/* Supply register REGNUM from the buffer specified by GREGS and LEN -+ in the general-purpose register set REGSET to register cache -+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ -+ -+static void -+mips_fbsd_supply_gregset (const struct regset *regset, -+ struct regcache *regcache, int regnum, -+ const void *gregs, size_t len) -+{ -+ size_t regsize = mips_abi_regsize (get_regcache_arch (regcache)); -+ -+ gdb_assert (len >= MIPS_FBSD_NUM_GREGS * regsize); -+ -+ mips_fbsd_supply_gregs (regcache, regnum, gregs, regsize); -+} -+ -+/* Collect register REGNUM from the register cache REGCACHE and store -+ it in the buffer specified by GREGS and LEN in the general-purpose -+ register set REGSET. If REGNUM is -1, do this for all registers in -+ REGSET. */ -+ -+static void -+mips_fbsd_collect_gregset (const struct regset *regset, -+ const struct regcache *regcache, -+ int regnum, void *gregs, size_t len) -+{ -+ size_t regsize = mips_abi_regsize (get_regcache_arch (regcache)); -+ -+ gdb_assert (len >= MIPS_FBSD_NUM_GREGS * regsize); -+ -+ mips_fbsd_collect_gregs (regcache, regnum, gregs, regsize); -+} -+ -+/* FreeBSD/mips register sets. */ -+ -+static const struct regset mips_fbsd_gregset = -+{ -+ NULL, -+ mips_fbsd_supply_gregset, -+ mips_fbsd_collect_gregset, -+}; -+ -+static const struct regset mips_fbsd_fpregset = -+{ -+ NULL, -+ mips_fbsd_supply_fpregset, -+ mips_fbsd_collect_fpregset, -+}; -+ -+/* Iterate over core file register note sections. */ -+ -+static void -+mips_fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, -+ iterate_over_regset_sections_cb *cb, -+ void *cb_data, -+ const struct regcache *regcache) -+{ -+ size_t regsize = mips_abi_regsize (gdbarch); -+ -+ cb (".reg", MIPS_FBSD_NUM_GREGS * regsize, &mips_fbsd_gregset, -+ NULL, cb_data); -+ cb (".reg2", MIPS_FBSD_NUM_FPREGS * regsize, &mips_fbsd_fpregset, -+ NULL, cb_data); -+} -+ -+/* Signal trampoline support. */ -+ -+#define FBSD_SYS_sigreturn 417 -+ -+#define MIPS_INST_LI_V0_SIGRETURN 0x24020000 + FBSD_SYS_sigreturn -+#define MIPS_INST_SYSCALL 0x0000000c -+#define MIPS_INST_BREAK 0x0000000d -+ -+#define O32_SIGFRAME_UCONTEXT_OFFSET (16) -+#define O32_SIGSET_T_SIZE (16) -+ -+#define O32_UCONTEXT_ONSTACK (O32_SIGSET_T_SIZE) -+#define O32_UCONTEXT_PC (O32_UCONTEXT_ONSTACK + 4) -+#define O32_UCONTEXT_REGS (O32_UCONTEXT_PC + 4) -+#define O32_UCONTEXT_SR (O32_UCONTEXT_REGS + 4 * 32) -+#define O32_UCONTEXT_LO (O32_UCONTEXT_SR + 4) -+#define O32_UCONTEXT_HI (O32_UCONTEXT_LO + 4) -+#define O32_UCONTEXT_FPUSED (O32_UCONTEXT_HI + 4) -+#define O32_UCONTEXT_FPREGS (O32_UCONTEXT_FPUSED + 4) -+ -+#define O32_UCONTEXT_REG_SIZE 4 -+ -+static void -+mips_fbsd_sigframe_init (const struct tramp_frame *self, -+ struct frame_info *this_frame, -+ struct trad_frame_cache *cache, -+ CORE_ADDR func) -+{ -+ struct gdbarch *gdbarch = get_frame_arch (this_frame); -+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); -+ CORE_ADDR sp, ucontext_addr, addr; -+ int regnum; -+ gdb_byte buf[4]; -+ -+ /* We find the appropriate instance of `ucontext_t' at a -+ fixed offset in the signal frame. */ -+ sp = get_frame_register_signed (this_frame, -+ MIPS_SP_REGNUM + gdbarch_num_regs (gdbarch)); -+ ucontext_addr = sp + O32_SIGFRAME_UCONTEXT_OFFSET; -+ -+ /* PC. */ -+ regnum = mips_regnum (gdbarch)->pc; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + O32_UCONTEXT_PC); -+ -+ /* GPRs. */ -+ for (regnum = MIPS_ZERO_REGNUM, addr = ucontext_addr + O32_UCONTEXT_REGS; -+ regnum <= MIPS_RA_REGNUM; regnum++, addr += O32_UCONTEXT_REG_SIZE) -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ addr); -+ -+ regnum = MIPS_PS_REGNUM; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + O32_UCONTEXT_SR); -+ -+ /* HI and LO. */ -+ regnum = mips_regnum (gdbarch)->lo; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + O32_UCONTEXT_LO); -+ regnum = mips_regnum (gdbarch)->hi; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + O32_UCONTEXT_HI); -+ -+ if (target_read_memory (ucontext_addr + O32_UCONTEXT_FPUSED, buf, 4) == 0 && -+ extract_unsigned_integer (buf, 4, byte_order) != 0) -+ { -+ for (regnum = 0, addr = ucontext_addr + O32_UCONTEXT_FPREGS; -+ regnum < 32; regnum++, addr += O32_UCONTEXT_REG_SIZE) -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_fp0_regnum (gdbarch), -+ addr); -+ trad_frame_set_reg_addr (cache, mips_regnum (gdbarch)->fp_control_status, -+ addr); -+ } -+ -+ trad_frame_set_id (cache, frame_id_build (sp, func)); -+} -+ -+#define MIPS_INST_ADDIU_A0_SP_O32 (0x27a40000 \ -+ + O32_SIGFRAME_UCONTEXT_OFFSET) -+ -+static const struct tramp_frame mips_fbsd_sigframe = -+{ -+ SIGTRAMP_FRAME, -+ MIPS_INSN32_SIZE, -+ { -+ { MIPS_INST_ADDIU_A0_SP_O32, -1 }, /* addiu a0, sp, SIGF_UC */ -+ { MIPS_INST_LI_V0_SIGRETURN, -1 }, /* li v0, SYS_sigreturn */ -+ { MIPS_INST_SYSCALL, -1 }, /* syscall */ -+ { MIPS_INST_BREAK, -1 }, /* break */ -+ { TRAMP_SENTINEL_INSN, -1 } -+ }, -+ mips_fbsd_sigframe_init -+}; -+ -+#define N64_SIGFRAME_UCONTEXT_OFFSET (32) -+#define N64_SIGSET_T_SIZE (16) -+ -+#define N64_UCONTEXT_ONSTACK (N64_SIGSET_T_SIZE) -+#define N64_UCONTEXT_PC (N64_UCONTEXT_ONSTACK + 8) -+#define N64_UCONTEXT_REGS (N64_UCONTEXT_PC + 8) -+#define N64_UCONTEXT_SR (N64_UCONTEXT_REGS + 8 * 32) -+#define N64_UCONTEXT_LO (N64_UCONTEXT_SR + 8) -+#define N64_UCONTEXT_HI (N64_UCONTEXT_LO + 8) -+#define N64_UCONTEXT_FPUSED (N64_UCONTEXT_HI + 8) -+#define N64_UCONTEXT_FPREGS (N64_UCONTEXT_FPUSED + 8) -+ -+#define N64_UCONTEXT_REG_SIZE 8 -+ -+static void -+mips64_fbsd_sigframe_init (const struct tramp_frame *self, -+ struct frame_info *this_frame, -+ struct trad_frame_cache *cache, -+ CORE_ADDR func) -+{ -+ struct gdbarch *gdbarch = get_frame_arch (this_frame); -+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); -+ CORE_ADDR sp, ucontext_addr, addr; -+ int regnum; -+ gdb_byte buf[4]; -+ -+ /* We find the appropriate instance of `ucontext_t' at a -+ fixed offset in the signal frame. */ -+ sp = get_frame_register_signed (this_frame, -+ MIPS_SP_REGNUM + gdbarch_num_regs (gdbarch)); -+ ucontext_addr = sp + N64_SIGFRAME_UCONTEXT_OFFSET; -+ -+ /* PC. */ -+ regnum = mips_regnum (gdbarch)->pc; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + N64_UCONTEXT_PC); -+ -+ /* GPRs. */ -+ for (regnum = MIPS_ZERO_REGNUM, addr = ucontext_addr + N64_UCONTEXT_REGS; -+ regnum <= MIPS_RA_REGNUM; regnum++, addr += N64_UCONTEXT_REG_SIZE) -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ addr); -+ -+ regnum = MIPS_PS_REGNUM; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + N64_UCONTEXT_SR); -+ -+ /* HI and LO. */ -+ regnum = mips_regnum (gdbarch)->lo; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + N64_UCONTEXT_LO); -+ regnum = mips_regnum (gdbarch)->hi; -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_num_regs (gdbarch), -+ ucontext_addr + N64_UCONTEXT_HI); -+ -+ if (target_read_memory (ucontext_addr + N64_UCONTEXT_FPUSED, buf, 4) == 0 && -+ extract_unsigned_integer (buf, 4, byte_order) != 0) -+ { -+ for (regnum = 0, addr = ucontext_addr + N64_UCONTEXT_FPREGS; -+ regnum < 32; regnum++, addr += N64_UCONTEXT_REG_SIZE) -+ trad_frame_set_reg_addr (cache, -+ regnum + gdbarch_fp0_regnum (gdbarch), -+ addr); -+ trad_frame_set_reg_addr (cache, mips_regnum (gdbarch)->fp_control_status, -+ addr); -+ } -+ -+ trad_frame_set_id (cache, frame_id_build (sp, func)); -+} -+ -+#define MIPS_INST_DADDIU_A0_SP_N64 (0x67a40000 \ -+ + N64_SIGFRAME_UCONTEXT_OFFSET) -+ -+static const struct tramp_frame mips64_fbsd_sigframe = -+{ -+ SIGTRAMP_FRAME, -+ MIPS_INSN32_SIZE, -+ { -+ { MIPS_INST_DADDIU_A0_SP_N64, -1 }, /* daddiu a0, sp, SIGF_UC */ -+ { MIPS_INST_LI_V0_SIGRETURN, -1 }, /* li v0, SYS_sigreturn */ -+ { MIPS_INST_SYSCALL, -1 }, /* syscall */ -+ { MIPS_INST_BREAK, -1 }, /* break */ -+ { TRAMP_SENTINEL_INSN, -1 } -+ }, -+ mips64_fbsd_sigframe_init -+}; -+ -+/* Shared library support. */ -+ -+/* FreeBSD/mips uses a slightly different `struct link_map' than the -+ other FreeBSD platforms as it includes an additional `l_off' -+ member. */ -+ -+static struct link_map_offsets * -+mips_fbsd_ilp32_fetch_link_map_offsets (void) -+{ -+ static struct link_map_offsets lmo; -+ static struct link_map_offsets *lmp = NULL; -+ -+ if (lmp == NULL) -+ { -+ lmp = &lmo; -+ -+ lmo.r_version_offset = 0; -+ lmo.r_version_size = 4; -+ lmo.r_map_offset = 4; -+ lmo.r_brk_offset = 8; -+ lmo.r_ldsomap_offset = -1; -+ -+ lmo.link_map_size = 24; -+ lmo.l_addr_offset = 0; -+ lmo.l_name_offset = 8; -+ lmo.l_ld_offset = 12; -+ lmo.l_next_offset = 16; -+ lmo.l_prev_offset = 20; -+ } -+ -+ return lmp; -+} -+ -+static struct link_map_offsets * -+mips_fbsd_lp64_fetch_link_map_offsets (void) -+{ -+ static struct link_map_offsets lmo; -+ static struct link_map_offsets *lmp = NULL; -+ -+ if (lmp == NULL) -+ { -+ lmp = &lmo; -+ -+ lmo.r_version_offset = 0; -+ lmo.r_version_size = 4; -+ lmo.r_map_offset = 8; -+ lmo.r_brk_offset = 16; -+ lmo.r_ldsomap_offset = -1; -+ -+ lmo.link_map_size = 48; -+ lmo.l_addr_offset = 0; -+ lmo.l_name_offset = 16; -+ lmo.l_ld_offset = 24; -+ lmo.l_next_offset = 32; -+ lmo.l_prev_offset = 40; -+ } -+ -+ return lmp; -+} -+ -+static void -+mips_fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -+{ -+ enum mips_abi abi = mips_abi (gdbarch); -+ -+ /* Generic FreeBSD support. */ -+ fbsd_init_abi (info, gdbarch); -+ -+ set_gdbarch_software_single_step (gdbarch, mips_software_single_step); -+ -+ switch (abi) -+ { -+ case MIPS_ABI_O32: -+ tramp_frame_prepend_unwinder (gdbarch, &mips_fbsd_sigframe); -+ break; -+ case MIPS_ABI_N32: -+ break; -+ case MIPS_ABI_N64: -+ tramp_frame_prepend_unwinder (gdbarch, &mips64_fbsd_sigframe); -+ break; -+ } -+ -+ set_gdbarch_iterate_over_regset_sections -+ (gdbarch, mips_fbsd_iterate_over_regset_sections); -+ -+ /* FreeBSD/mips has SVR4-style shared libraries. */ -+ set_solib_svr4_fetch_link_map_offsets -+ (gdbarch, (gdbarch_ptr_bit (gdbarch) == 32 ? -+ mips_fbsd_ilp32_fetch_link_map_offsets : -+ mips_fbsd_lp64_fetch_link_map_offsets)); -+} -+ -+ -+/* Provide a prototype to silence -Wmissing-prototypes. */ -+void _initialize_mips_fbsd_tdep (void); -+ -+void -+_initialize_mips_fbsd_tdep (void) -+{ -+ gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_FREEBSD_ELF, -+ mips_fbsd_init_abi); -+} -diff --git gdb/mips-fbsd-tdep.h gdb/mips-fbsd-tdep.h -new file mode 100644 -index 0000000000..8a197e6325 ---- /dev/null -+++ gdb/mips-fbsd-tdep.h -@@ -0,0 +1,28 @@ -+/* Common target dependent code for GDB on MIPS systems running FreeBSD. -+ -+ Copyright (C) 2017 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef MIPS_FBSD_TDEP_H -+#define MIPS_FBSD_TDEP_H -+ -+void mips_fbsd_supply_fpregs (struct regcache *, int, const void *, size_t); -+void mips_fbsd_supply_gregs (struct regcache *, int, const void *, size_t); -+void mips_fbsd_collect_fpregs (const struct regcache *, int, void *, size_t); -+void mips_fbsd_collect_gregs (const struct regcache *, int, void *, size_t); -+ -+#endif /* MIPS_FBSD_TDEP_H */ diff --git a/devel/gdb/files/commit-b268007c68 b/devel/gdb/files/commit-b268007c68 index ea8891cf3b2b..86eb3c8971a8 100644 --- a/devel/gdb/files/commit-b268007c68 +++ b/devel/gdb/files/commit-b268007c68 @@ -189,194 +189,3 @@ index 0000000000..0472df88f4 + t->to_store_registers = mips_fbsd_store_inferior_registers; + fbsd_nat_add_target (t); +} -commit acde9e8dc95a053909e137c1fcda94c719eb8cc1 -Author: John Baldwin -Date: Wed Jan 4 09:41:58 2017 -0800 - - Add native target for FreeBSD/mips. - - This supports the o32 and n64 ABIs. - - gdb/ChangeLog: - - * Makefile.in (ALLDEPFILES): Add mips-fbsd-nat.c. - * NEWS: Mention new FreeBSD/mips native configuration. - * config/mips/fbsd.mh: New file. - * configure.host: Add mips*-*-freebsd*. - * mips-fbsd-nat.c: New file. - -diff --git gdb/Makefile.in gdb/Makefile.in -index 300c2cb702..433dd1203a 100644 ---- gdb/Makefile.in -+++ gdb/Makefile.in -@@ -1725,6 +1725,7 @@ ALLDEPFILES = \ - m88k-tdep.c m88kbsd-nat.c \ - microblaze-tdep.c microblaze-linux-tdep.c \ - mingw-hdep.c common/mingw-strerror.c \ -+ mips-fbsd-nat.c \ - mips-fbsd-tdep.c \ - mips-linux-nat.c mips-linux-tdep.c \ - mips-sde-tdep.c \ -diff --git gdb/config/mips/fbsd.mh gdb/config/mips/fbsd.mh -new file mode 100644 -index 0000000000..f433347a20 ---- /dev/null -+++ gdb/config/mips/fbsd.mh -@@ -0,0 +1,3 @@ -+# Host: FreeBSD/mips -+NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o -+HAVE_NATIVE_GCORE_HOST = 1 -diff --git gdb/configure.host gdb/configure.host -index ef265ebe29..c45f61dbba 100644 ---- gdb/configure.host -+++ gdb/configure.host -@@ -129,6 +129,7 @@ m88*-*-openbsd*) gdb_host=obsd ;; - mips*-*-linux*) gdb_host=linux ;; - mips*-*-netbsd* | mips*-*-knetbsd*-gnu) - gdb_host=nbsd ;; -+mips*-*-freebsd*) gdb_host=fbsd ;; - mips64*-*-openbsd*) gdb_host=obsd64 ;; - - powerpc-*-aix* | rs6000-*-* | powerpc64-*-aix*) -diff --git gdb/mips-fbsd-nat.c gdb/mips-fbsd-nat.c -new file mode 100644 -index 0000000000..0472df88f4 ---- /dev/null -+++ gdb/mips-fbsd-nat.c -@@ -0,0 +1,136 @@ -+/* Native-dependent code for FreeBSD/mips. -+ -+ Copyright (C) 2017 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#include "defs.h" -+#include "inferior.h" -+#include "regcache.h" -+#include "target.h" -+ -+#include -+#include -+#include -+ -+#include "fbsd-nat.h" -+#include "mips-tdep.h" -+#include "mips-fbsd-tdep.h" -+#include "inf-ptrace.h" -+ -+/* Determine if PT_GETREGS fetches this register. */ -+ -+static bool -+getregs_supplies (struct gdbarch *gdbarch, int regnum) -+{ -+ return (regnum >= MIPS_ZERO_REGNUM -+ && regnum <= gdbarch_pc_regnum (gdbarch)); -+} -+ -+/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this -+ for all registers. */ -+ -+static void -+mips_fbsd_fetch_inferior_registers (struct target_ops *ops, -+ struct regcache *regcache, int regnum) -+{ -+ struct gdbarch *gdbarch = get_regcache_arch (regcache); -+ if (regnum == -1 || getregs_supplies (gdbarch, regnum)) -+ { -+ struct reg regs; -+ -+ if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) ®s, 0) == -1) -+ perror_with_name (_("Couldn't get registers")); -+ -+ mips_fbsd_supply_gregs (regcache, regnum, ®s, sizeof (register_t)); -+ if (regnum != -1) -+ return; -+ } -+ -+ if (regnum == -1 -+ || regnum >= gdbarch_fp0_regnum (get_regcache_arch (regcache))) -+ { -+ struct fpreg fpregs; -+ -+ if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) -+ perror_with_name (_("Couldn't get floating point status")); -+ -+ mips_fbsd_supply_fpregs (regcache, regnum, &fpregs, -+ sizeof (f_register_t)); -+ } -+} -+ -+/* Store register REGNUM back into the inferior. If REGNUM is -1, do -+ this for all registers. */ -+ -+static void -+mips_fbsd_store_inferior_registers (struct target_ops *ops, -+ struct regcache *regcache, int regnum) -+{ -+ struct gdbarch *gdbarch = get_regcache_arch (regcache); -+ if (regnum == -1 || getregs_supplies (gdbarch, regnum)) -+ { -+ struct reg regs; -+ -+ if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) ®s, 0) == -1) -+ perror_with_name (_("Couldn't get registers")); -+ -+ mips_fbsd_collect_gregs (regcache, regnum, (char *) ®s, -+ sizeof (register_t)); -+ -+ if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) ®s, 0) == -1) -+ perror_with_name (_("Couldn't write registers")); -+ -+ if (regnum != -1) -+ return; -+ } -+ -+ if (regnum == -1 -+ || regnum >= gdbarch_fp0_regnum (get_regcache_arch (regcache))) -+ { -+ struct fpreg fpregs; -+ -+ if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) -+ perror_with_name (_("Couldn't get floating point status")); -+ -+ mips_fbsd_collect_fpregs (regcache, regnum, (char *) &fpregs, -+ sizeof (f_register_t)); -+ -+ if (ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid), -+ (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) -+ perror_with_name (_("Couldn't write floating point status")); -+ } -+} -+ -+ -+/* Provide a prototype to silence -Wmissing-prototypes. */ -+void _initialize_mips_fbsd_nat (void); -+ -+void -+_initialize_mips_fbsd_nat (void) -+{ -+ struct target_ops *t; -+ -+ t = inf_ptrace_target (); -+ t->to_fetch_registers = mips_fbsd_fetch_inferior_registers; -+ t->to_store_registers = mips_fbsd_store_inferior_registers; -+ fbsd_nat_add_target (t); -+} diff --git a/devel/gdb/files/kgdb/mipsfbsd-kern.c b/devel/gdb/files/kgdb/mipsfbsd-kern.c index 9f438000c43c..dafa93227d8b 100644 --- a/devel/gdb/files/kgdb/mipsfbsd-kern.c +++ b/devel/gdb/files/kgdb/mipsfbsd-kern.c @@ -303,308 +303,3 @@ _initialize_mips_kgdb_tdep (void) gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_FREEBSD_ELF_KERNEL, mipsfbsd_kernel_init_abi); } -/* - * Copyright (c) 2007 Juniper Networks, Inc. - * Copyright (c) 2004 Marcel Moolenaar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * from: src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c,v 1.2.2.1 2005/09/15 05:32:10 marcel - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#ifdef __mips__ -#include -#include -#include -#endif -#include - -#include -#include -//#include -//#include -//#include -#include "osabi.h" -#include -#include "solib.h" -#include "trad-frame.h" -#include - -#include "kgdb.h" - -/* Size of struct trapframe in registers. */ -#define TRAPFRAME_WORDS 74 - -/* From sys/mips/include/pcb.h. Offsets in the pcb_context[] array. */ -#define FBSD_PCB_REG_S0 0 -#define FBSD_PCB_REG_S1 1 -#define FBSD_PCB_REG_S2 2 -#define FBSD_PCB_REG_S3 3 -#define FBSD_PCB_REG_S4 4 -#define FBSD_PCB_REG_S5 5 -#define FBSD_PCB_REG_S6 6 -#define FBSD_PCB_REG_S7 7 -#define FBSD_PCB_REG_SP 8 -#define FBSD_PCB_REG_S8 9 -#define FBSD_PCB_REG_RA 10 -#define FBSD_PCB_REG_SR 11 -#define FBSD_PCB_REG_GP 12 -#define FBSD_PCB_REG_PC 13 - -#ifdef __mips__ -_Static_assert(TRAPFRAME_WORDS * sizeof(register_t) == - sizeof(struct trapframe), "TRAPFRAME_WORDS mismatch"); -_Static_assert(FBSD_PCB_REG_S0 == PCB_REG_S0, "PCB_REG_S0 mismatch"); -_Static_assert(FBSD_PCB_REG_S1 == PCB_REG_S1, "PCB_REG_S1 mismatch"); -_Static_assert(FBSD_PCB_REG_S2 == PCB_REG_S2, "PCB_REG_S2 mismatch"); -_Static_assert(FBSD_PCB_REG_S3 == PCB_REG_S3, "PCB_REG_S3 mismatch"); -_Static_assert(FBSD_PCB_REG_S4 == PCB_REG_S4, "PCB_REG_S4 mismatch"); -_Static_assert(FBSD_PCB_REG_S5 == PCB_REG_S5, "PCB_REG_S5 mismatch"); -_Static_assert(FBSD_PCB_REG_S6 == PCB_REG_S6, "PCB_REG_S6 mismatch"); -_Static_assert(FBSD_PCB_REG_S7 == PCB_REG_S7, "PCB_REG_S7 mismatch"); -_Static_assert(FBSD_PCB_REG_SP == PCB_REG_SP, "PCB_REG_SP mismatch"); -_Static_assert(FBSD_PCB_REG_S8 == PCB_REG_S8, "PCB_REG_S8 mismatch"); -_Static_assert(FBSD_PCB_REG_RA == PCB_REG_RA, "PCB_REG_RA mismatch"); -_Static_assert(FBSD_PCB_REG_SR == PCB_REG_SR, "PCB_REG_SR mismatch"); -_Static_assert(FBSD_PCB_REG_GP == PCB_REG_GP, "PCB_REG_GP mismatch"); -_Static_assert(FBSD_PCB_REG_PC == PCB_REG_PC, "PCB_REG_PC mismatch"); -#endif - -static void -mipsfbsd_supply_pcb(struct regcache *regcache, CORE_ADDR pcb_addr) -{ - struct gdbarch *gdbarch = get_regcache_arch (regcache); - size_t regsize = mips_isa_regsize (gdbarch); - gdb_byte buf[regsize * (FBSD_PCB_REG_PC + 1)]; - - /* Read the entire pcb_context[] array in one go. The pcb_context[] - array is after the pcb_regs member which is a trapframe. */ - if (target_read_memory (pcb_addr + TRAPFRAME_WORDS * regsize, buf, - sizeof(buf)) != 0) - return; - - regcache_raw_supply_unsigned (regcache, MIPS_ZERO_REGNUM, 0); - regcache_raw_supply (regcache, MIPS_S2_REGNUM - 2, - buf + (regsize * FBSD_PCB_REG_S0)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM - 1, - buf + (regsize * FBSD_PCB_REG_S1)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM, - buf + (regsize * FBSD_PCB_REG_S2)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 1, - buf + (regsize * FBSD_PCB_REG_S3)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 2, - buf + (regsize * FBSD_PCB_REG_S4)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 3, - buf + (regsize * FBSD_PCB_REG_S5)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 4, - buf + (regsize * FBSD_PCB_REG_S6)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 5, - buf + (regsize * FBSD_PCB_REG_S7)); - regcache_raw_supply (regcache, MIPS_SP_REGNUM, - buf + (regsize * FBSD_PCB_REG_SP)); - regcache_raw_supply (regcache, MIPS_S2_REGNUM + 6, - buf + (regsize * FBSD_PCB_REG_S8)); - regcache_raw_supply (regcache, MIPS_RA_REGNUM, - buf + (regsize * FBSD_PCB_REG_RA)); - regcache_raw_supply (regcache, MIPS_PS_REGNUM, - buf + (regsize * FBSD_PCB_REG_SR)); - regcache_raw_supply (regcache, MIPS_GP_REGNUM, - buf + (regsize * FBSD_PCB_REG_GP)); - regcache_raw_supply (regcache, MIPS_EMBED_PC_REGNUM, - buf + (regsize * FBSD_PCB_REG_PC)); -} - -static struct trad_frame_cache * -mipsfbsd_trapframe_cache (struct frame_info *this_frame, void **this_cache) -{ - struct gdbarch *gdbarch = get_frame_arch (this_frame); - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - size_t regsize = mips_isa_regsize (gdbarch); - struct trad_frame_cache *cache; - CORE_ADDR addr, func, pc, sp; - int regnum; - - if (*this_cache != NULL) - return ((struct trad_frame_cache *)*this_cache); - - cache = trad_frame_cache_zalloc (this_frame); - *this_cache = cache; - - func = get_frame_func (this_frame); - sp = get_frame_register_signed (this_frame, - MIPS_SP_REGNUM + gdbarch_num_regs (gdbarch)); - - /* Skip over CALLFRAME_SIZ. */ - addr = sp; - if (regsize == 8) - addr += regsize * 4; - else - addr += regsize * (4 + 2); - - /* GPRs. Skip zero. */ - addr += regsize; - for (regnum = MIPS_AT_REGNUM; regnum <= MIPS_RA_REGNUM; regnum++) - { - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - } - - regnum = MIPS_PS_REGNUM; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - - /* HI and LO. */ - regnum = mips_regnum (gdbarch)->lo; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - regnum = mips_regnum (gdbarch)->hi; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - - /* BADVADDR. */ - regnum = mips_regnum (gdbarch)->badvaddr; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - - /* CAUSE. */ - regnum = mips_regnum (gdbarch)->cause; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - addr += regsize; - - /* PC. */ - regnum = mips_regnum (gdbarch)->pc; - trad_frame_set_reg_addr (cache, - regnum + gdbarch_num_regs (gdbarch), - addr); - - trad_frame_set_id (cache, frame_id_build (sp + TRAPFRAME_WORDS * regsize, - func)); - return cache; -} - -static void -mipsfbsd_trapframe_this_id (struct frame_info *this_frame, - void **this_cache, struct frame_id *this_id) -{ - struct trad_frame_cache *cache = - mipsfbsd_trapframe_cache (this_frame, this_cache); - - trad_frame_get_id (cache, this_id); -} - -static struct value * -mipsfbsd_trapframe_prev_register (struct frame_info *this_frame, - void **this_cache, int regnum) -{ - struct trad_frame_cache *cache = - mipsfbsd_trapframe_cache (this_frame, this_cache); - - return trad_frame_get_register (cache, this_frame, regnum); -} - -static int -mipsfbsd_trapframe_sniffer (const struct frame_unwind *self, - struct frame_info *this_frame, - void **this_prologue_cache) -{ - const char *name; - - find_pc_partial_function (get_frame_func (this_frame), &name, NULL, NULL); - return (name && ((strcmp(name, "MipsKernIntr") == 0) || - (strcmp(name, "MipsKernGenException") == 0) || - (strcmp(name, "MipsTLBInvalidException") == 0))); -} - -static const struct frame_unwind mipsfbsd_trapframe_unwind = { - SIGTRAMP_FRAME, - default_frame_unwind_stop_reason, - mipsfbsd_trapframe_this_id, - mipsfbsd_trapframe_prev_register, - NULL, - mipsfbsd_trapframe_sniffer -}; - -static void -mipsfbsd_kernel_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -{ - enum mips_abi abi = mips_abi (gdbarch); - - set_gdbarch_software_single_step (gdbarch, mips_software_single_step); - - switch (abi) - { - case MIPS_ABI_O32: - break; - case MIPS_ABI_N32: - set_gdbarch_long_double_bit (gdbarch, 128); - /* These floatformats should probably be renamed. MIPS uses - the same 128-bit IEEE floating point format that IA-64 uses, - except that the quiet/signalling NaN bit is reversed (GDB - does not distinguish between quiet and signalling NaNs). */ - set_gdbarch_long_double_format (gdbarch, floatformats_ia64_quad); - break; - case MIPS_ABI_N64: - set_gdbarch_long_double_bit (gdbarch, 128); - /* These floatformats should probably be renamed. MIPS uses - the same 128-bit IEEE floating point format that IA-64 uses, - except that the quiet/signalling NaN bit is reversed (GDB - does not distinguish between quiet and signalling NaNs). */ - set_gdbarch_long_double_format (gdbarch, floatformats_ia64_quad); - break; - } - - frame_unwind_prepend_unwinder (gdbarch, &mipsfbsd_trapframe_unwind); - - set_solib_ops (gdbarch, &kld_so_ops); - - fbsd_vmcore_set_supply_pcb (gdbarch, mipsfbsd_supply_pcb); - fbsd_vmcore_set_cpu_pcb_addr (gdbarch, kgdb_trgt_stop_pcb); -} - -void _initialize_mips_kgdb_tdep (void); - -void -_initialize_mips_kgdb_tdep (void) -{ - gdbarch_register_osabi_sniffer(bfd_arch_mips, - bfd_target_elf_flavour, - fbsd_kernel_osabi_sniffer); - gdbarch_register_osabi (bfd_arch_mips, 0, GDB_OSABI_FREEBSD_ELF_KERNEL, - mipsfbsd_kernel_init_abi); -} diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile index bc8c225b025f..de9f24cc23d3 100644 --- a/devel/gitblit/Makefile +++ b/devel/gitblit/Makefile @@ -55,13 +55,13 @@ RUN_DEPENDS+= nginx:www/nginx .if ${PORT_OPTIONS:MTOMCAT6} GB_HOME= ${PREFIX}/apache-tomcat-6.0/webapps/${PORTNAME} -RUN_DEPENDS+= ${PREFIX}/etc/rc.d/tomcat6:www/tomcat6 +RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6 .elif ${PORT_OPTIONS:MTOMCAT7} GB_HOME= ${PREFIX}/apache-tomcat-7.0/webapps/${PORTNAME} -RUN_DEPENDS+= ${PREFIX}/etc/rc.d/tomcat7:www/tomcat7 +RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat7:www/tomcat7 .elif ${PORT_OPTIONS:MTOMCAT8} GB_HOME= ${PREFIX}/apache-tomcat-8.0/webapps/${PORTNAME} -RUN_DEPENDS+= ${PREFIX}/etc/rc.d/tomcat8:www/tomcat8 +RUN_DEPENDS+= ${LOCALBASE}/etc/rc.d/tomcat8:www/tomcat8 .endif do-extract: diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile index f42e1639de60..5b56d9c3a457 100644 --- a/devel/linux_kdump/Makefile +++ b/devel/linux_kdump/Makefile @@ -12,6 +12,8 @@ COMMENT= Linux-compatibility ktrace.out processor BUILD_DEPENDS= ${RUN_DEPENDS} # USE_LINUX only sets RUN_DEPENDS +BROKEN= does not build, try base system kdump(1) instead + USES= linux uidfix USE_LINUX= devtools diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 2280f7362900..5f21cbae4dd8 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -80,7 +80,7 @@ LLD_DESC= Install lld, the LLVM linker LLD_GH_PROJECT= lld:lld LLD_GH_SUBDIR= tools/lld:lld LLD_GH_TAGNAME= ${LLD_COMMIT}:lld -LLDB_DESC= Install lldb, the LLVM debugger (ignored on 9.x) +LLDB_DESC= Install lldb, the LLVM debugger LLDB_BUILD_DEPENDS= swig:devel/swig13 LLDB_GH_PROJECT= lldb:lldb LLDB_GH_SUBDIR= tools/lldb:lldb @@ -100,7 +100,9 @@ OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} LLVM_RELEASE=${LLVM_RELEASE} +PLIST_SUB+= LLVM_LIB_VER=${LLVM_MAJOR:C/\.//} \ + LLVM_MAJOR=${LLVM_MAJOR} \ + LLVM_RELEASE=${LLVM_RELEASE} COMMANDS= bugpoint \ llc \ @@ -178,6 +180,7 @@ COMMANDS+= c-index-test \ clang-check \ clang-cpp \ clang-format \ + clang-import-test \ clang-offload-bundler \ scan-build \ scan-view @@ -390,7 +393,8 @@ build-plist: -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ - -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \ + -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \ + -e 's|${LLVM_MAJOR:C/\.//}|%%LLVM_LIB_VER%%|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot index 070e677398da..ea38d8e771c7 100644 --- a/devel/llvm-devel/Makefile.snapshot +++ b/devel/llvm-devel/Makefile.snapshot @@ -4,14 +4,14 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -LLVM_MAJOR= 4.0 +LLVM_MAJOR= 5.0 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20161207 +SNAPDATE= 20170114 -LLVM_COMMIT= 8b90b13aa1cf9449806891a621ef43b6a48bb389 -CLANG_COMMIT= ac2fcb858ce82642df45888381118a0bf1d30c8d -COMPILER_RT_COMMIT= 86a022aea9d00a64edb897b0662b8cdd3beb8f34 -EXTRAS_COMMIT= 792be7aa398e135cab648a1118f4513a1f7c547c -LLD_COMMIT= af286de2f32c959d99974c7ee7cf92ca6d85ee0b -LLDB_COMMIT= 3fa7592646e26a6a1ab0e4175874b750cad78b8c -OPENMP_COMMIT= 0fee15bb8f679dbf52db0e386ee840795d2e964a +LLVM_COMMIT= 669e297a93a12a9de7c452fd4323dd814afd5395 +CLANG_COMMIT= 3afc8a364ef241d20e839698fa852202f7b1cb2f +COMPILER_RT_COMMIT= 191ecf3d0ba86203d5585f3361a7daa226b20c2d +EXTRAS_COMMIT= 4ff6e02336e157e59c3474177884efa5df4aa907 +LLD_COMMIT= 962d6dab080fd20c6ea2d9ecd54c6da1d807ac9f +LLDB_COMMIT= 32cbbf6b6bdae5423841d4a506c93c09c53279c9 +OPENMP_COMMIT= 0c93c1078cded297df89f1dedaa711a5bb57d481 diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo index e12af35c66ea..e6e4ed4e1371 100644 --- a/devel/llvm-devel/distinfo +++ b/devel/llvm-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1481138888 -SHA256 (llvm-mirror-llvm-4.0.d20161207-8b90b13aa1cf9449806891a621ef43b6a48bb389_GH0.tar.gz) = fae728ef087b750720ff0dc6f8fddcdbfdd5bfde260abda220ccc103797889db -SIZE (llvm-mirror-llvm-4.0.d20161207-8b90b13aa1cf9449806891a621ef43b6a48bb389_GH0.tar.gz) = 29878822 -SHA256 (llvm-mirror-clang-ac2fcb858ce82642df45888381118a0bf1d30c8d_GH0.tar.gz) = e25df93612571af1d98acf0aed8c67b35e9959a2650f6b27aa627efb99a39302 -SIZE (llvm-mirror-clang-ac2fcb858ce82642df45888381118a0bf1d30c8d_GH0.tar.gz) = 14918287 -SHA256 (llvm-mirror-compiler-rt-86a022aea9d00a64edb897b0662b8cdd3beb8f34_GH0.tar.gz) = ac466ca7933e7b279a1f8957d6190fb63fdcfa002eb4483469ea21a0171790c7 -SIZE (llvm-mirror-compiler-rt-86a022aea9d00a64edb897b0662b8cdd3beb8f34_GH0.tar.gz) = 2449759 -SHA256 (llvm-mirror-clang-tools-extra-792be7aa398e135cab648a1118f4513a1f7c547c_GH0.tar.gz) = 496d7139b6e03963fb19e935fabcfbde8b59b8ecadb8f3f128f1acd5fee393fc -SIZE (llvm-mirror-clang-tools-extra-792be7aa398e135cab648a1118f4513a1f7c547c_GH0.tar.gz) = 756087 -SHA256 (llvm-mirror-lld-af286de2f32c959d99974c7ee7cf92ca6d85ee0b_GH0.tar.gz) = 6a27844bcfeadb20d71d1ca6e2f779f0add7d7de093ba9d061d78d83912da951 -SIZE (llvm-mirror-lld-af286de2f32c959d99974c7ee7cf92ca6d85ee0b_GH0.tar.gz) = 765965 -SHA256 (llvm-mirror-lldb-3fa7592646e26a6a1ab0e4175874b750cad78b8c_GH0.tar.gz) = e583b7f0fe9aead0f45199fe7b453e477bfa419b2fabf18e4b229c60c1eab70e -SIZE (llvm-mirror-lldb-3fa7592646e26a6a1ab0e4175874b750cad78b8c_GH0.tar.gz) = 24050506 -SHA256 (llvm-mirror-openmp-0fee15bb8f679dbf52db0e386ee840795d2e964a_GH0.tar.gz) = 75d303a743ba502a9c71c78d224f5814bd32849f3e89e2e910d780343b82779d -SIZE (llvm-mirror-openmp-0fee15bb8f679dbf52db0e386ee840795d2e964a_GH0.tar.gz) = 2838030 +TIMESTAMP = 1484356745 +SHA256 (llvm-mirror-llvm-5.0.d20170114-669e297a93a12a9de7c452fd4323dd814afd5395_GH0.tar.gz) = 7753e889aae5cb4d808b1329f3db2f596dd8d2334f18c3b8f5e520403229cd5c +SIZE (llvm-mirror-llvm-5.0.d20170114-669e297a93a12a9de7c452fd4323dd814afd5395_GH0.tar.gz) = 30756864 +SHA256 (llvm-mirror-clang-3afc8a364ef241d20e839698fa852202f7b1cb2f_GH0.tar.gz) = c02300c3eacda5f32033235bd7f466e4eaed8b09f9e97c97ec406e519a8d57f7 +SIZE (llvm-mirror-clang-3afc8a364ef241d20e839698fa852202f7b1cb2f_GH0.tar.gz) = 15174161 +SHA256 (llvm-mirror-compiler-rt-191ecf3d0ba86203d5585f3361a7daa226b20c2d_GH0.tar.gz) = 1b28f237cded7d0ee95b5a797e73f225430b7905986d6806440b9bbbfe62c5ae +SIZE (llvm-mirror-compiler-rt-191ecf3d0ba86203d5585f3361a7daa226b20c2d_GH0.tar.gz) = 2465068 +SHA256 (llvm-mirror-clang-tools-extra-4ff6e02336e157e59c3474177884efa5df4aa907_GH0.tar.gz) = ce14c82c5453ffcd8dbadac59736da9d50c664bbb37804a67bfb1fda423445a9 +SIZE (llvm-mirror-clang-tools-extra-4ff6e02336e157e59c3474177884efa5df4aa907_GH0.tar.gz) = 783833 +SHA256 (llvm-mirror-lld-962d6dab080fd20c6ea2d9ecd54c6da1d807ac9f_GH0.tar.gz) = bc1798439339db0a8aca2036a9be974da09c50ac0c042e94752e26359bb099f3 +SIZE (llvm-mirror-lld-962d6dab080fd20c6ea2d9ecd54c6da1d807ac9f_GH0.tar.gz) = 784747 +SHA256 (llvm-mirror-lldb-32cbbf6b6bdae5423841d4a506c93c09c53279c9_GH0.tar.gz) = 3743861fe5d01bdcc0aede632b370dfb398c28dd1b1e0a9cba558aff822ea4d0 +SIZE (llvm-mirror-lldb-32cbbf6b6bdae5423841d4a506c93c09c53279c9_GH0.tar.gz) = 24055084 +SHA256 (llvm-mirror-openmp-0c93c1078cded297df89f1dedaa711a5bb57d481_GH0.tar.gz) = 842477f94194b667389d13e60ff35f87fa87131825b38cb6ee7e4ecd8c9e1fd2 +SIZE (llvm-mirror-openmp-0c93c1078cded297df89f1dedaa711a5bb57d481_GH0.tar.gz) = 2838543 diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index e70b9bb5dc1d..2284033c56f5 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -38,6 +38,7 @@ bin/sancov-devel %%CLANG%%bin/clang-check-devel %%CLANG%%bin/clang-cpp-devel %%CLANG%%bin/clang-format-devel +%%CLANG%%bin/clang-import-test-devel %%CLANG%%bin/clang-offload-bundler-devel %%CLANG%%bin/scan-build-devel %%CLANG%%bin/scan-view-devel @@ -76,6 +77,7 @@ llvm-devel/bin/bugpoint %%CLANG%%llvm-devel/bin/clang-cl %%CLANG%%llvm-devel/bin/clang-cpp %%CLANG%%llvm-devel/bin/clang-format +%%CLANG%%llvm-devel/bin/clang-import-test %%EXTRAS%%llvm-devel/bin/clang-include-fixer %%CLANG%%llvm-devel/bin/clang-offload-bundler %%EXTRAS%%llvm-devel/bin/clang-query @@ -598,9 +600,11 @@ llvm-devel/bin/yaml2obj %%CLANG%%llvm-devel/include/clang/Tooling/CommonOptionsParser.h %%CLANG%%llvm-devel/include/clang/Tooling/CompilationDatabase.h %%CLANG%%llvm-devel/include/clang/Tooling/CompilationDatabasePluginRegistry.h +%%CLANG%%llvm-devel/include/clang/Tooling/Core/Diagnostic.h %%CLANG%%llvm-devel/include/clang/Tooling/Core/Lookup.h %%CLANG%%llvm-devel/include/clang/Tooling/Core/QualTypeNames.h %%CLANG%%llvm-devel/include/clang/Tooling/Core/Replacement.h +%%CLANG%%llvm-devel/include/clang/Tooling/DiagnosticsYaml.h %%CLANG%%llvm-devel/include/clang/Tooling/FileMatchTrie.h %%CLANG%%llvm-devel/include/clang/Tooling/FixIt.h %%CLANG%%llvm-devel/include/clang/Tooling/JSONCompilationDatabase.h @@ -635,6 +639,7 @@ llvm-devel/bin/yaml2obj %%LLD%%llvm-devel/include/lld/Driver/Driver.h %%LLD%%llvm-devel/include/lld/ReaderWriter/MachOLinkingContext.h %%LLD%%llvm-devel/include/lld/ReaderWriter/YamlContext.h +%%LLD%%llvm-devel/include/lld/Support/Memory.h %%LLDB%%llvm-devel/include/lldb/API/LLDB.h %%LLDB%%llvm-devel/include/lldb/API/SBAddress.h %%LLDB%%llvm-devel/include/lldb/API/SBAttachInfo.h @@ -906,7 +911,6 @@ llvm-devel/bin/yaml2obj %%LLDB%%llvm-devel/include/lldb/Host/linux/Config.h %%LLDB%%llvm-devel/include/lldb/Host/linux/HostInfoLinux.h %%LLDB%%llvm-devel/include/lldb/Host/linux/HostThreadLinux.h -%%LLDB%%llvm-devel/include/lldb/Host/linux/Personality.h %%LLDB%%llvm-devel/include/lldb/Host/linux/ProcessLauncherLinux.h %%LLDB%%llvm-devel/include/lldb/Host/linux/Ptrace.h %%LLDB%%llvm-devel/include/lldb/Host/linux/Uio.h @@ -1264,11 +1268,11 @@ llvm-devel/include/llvm/Analysis/LazyValueInfo.h llvm-devel/include/llvm/Analysis/Lint.h llvm-devel/include/llvm/Analysis/Loads.h llvm-devel/include/llvm/Analysis/LoopAccessAnalysis.h +llvm-devel/include/llvm/Analysis/LoopAnalysisManager.h llvm-devel/include/llvm/Analysis/LoopInfo.h llvm-devel/include/llvm/Analysis/LoopInfoImpl.h llvm-devel/include/llvm/Analysis/LoopIterator.h llvm-devel/include/llvm/Analysis/LoopPass.h -llvm-devel/include/llvm/Analysis/LoopPassManager.h llvm-devel/include/llvm/Analysis/LoopUnrollAnalyzer.h llvm-devel/include/llvm/Analysis/MemoryBuiltins.h llvm-devel/include/llvm/Analysis/MemoryDependenceAnalysis.h @@ -1348,6 +1352,7 @@ llvm-devel/include/llvm/CodeGen/GlobalISel/RegBankSelect.h llvm-devel/include/llvm/CodeGen/GlobalISel/RegisterBank.h llvm-devel/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h llvm-devel/include/llvm/CodeGen/GlobalISel/Types.h +llvm-devel/include/llvm/CodeGen/GlobalISel/Utils.h llvm-devel/include/llvm/CodeGen/ISDOpcodes.h llvm-devel/include/llvm/CodeGen/IntrinsicLowering.h llvm-devel/include/llvm/CodeGen/LatencyPriorityQueue.h @@ -1446,6 +1451,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/CVDebugRecord.h llvm-devel/include/llvm/DebugInfo/CodeView/CVRecord.h llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolTypes.def llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h +llvm-devel/include/llvm/DebugInfo/CodeView/CVTypeDumper.h llvm-devel/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h llvm-devel/include/llvm/DebugInfo/CodeView/CodeView.h llvm-devel/include/llvm/DebugInfo/CodeView/CodeViewError.h @@ -1460,11 +1466,16 @@ llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDumpDelegate.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDumper.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolRecord.h +llvm-devel/include/llvm/DebugInfo/CodeView/SymbolRecordMapping.h +llvm-devel/include/llvm/DebugInfo/CodeView/SymbolSerializer.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h +llvm-devel/include/llvm/DebugInfo/CodeView/TypeDatabase.h +llvm-devel/include/llvm/DebugInfo/CodeView/TypeDatabaseVisitor.h llvm-devel/include/llvm/DebugInfo/CodeView/TypeDeserializer.h -llvm-devel/include/llvm/DebugInfo/CodeView/TypeDumper.h +llvm-devel/include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h +llvm-devel/include/llvm/DebugInfo/CodeView/TypeDumperBase.h llvm-devel/include/llvm/DebugInfo/CodeView/TypeIndex.h llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecord.h llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecordBuilder.h @@ -1479,6 +1490,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h llvm-devel/include/llvm/DebugInfo/DIContext.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h +llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAttribute.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFContext.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h @@ -1489,7 +1501,9 @@ llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h +llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h +llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDie.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFFormValue.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h @@ -1698,6 +1712,7 @@ llvm-devel/include/llvm/IR/Metadata.h llvm-devel/include/llvm/IR/Module.h llvm-devel/include/llvm/IR/ModuleSlotTracker.h llvm-devel/include/llvm/IR/ModuleSummaryIndex.h +llvm-devel/include/llvm/IR/ModuleSummaryIndexYAML.h llvm-devel/include/llvm/IR/NoFolder.h llvm-devel/include/llvm/IR/OperandTraits.h llvm-devel/include/llvm/IR/Operator.h @@ -1739,6 +1754,7 @@ llvm-devel/include/llvm/LinkAllPasses.h llvm-devel/include/llvm/Linker/IRMover.h llvm-devel/include/llvm/Linker/Linker.h llvm-devel/include/llvm/MC/ConstantPools.h +llvm-devel/include/llvm/MC/LaneBitmask.h llvm-devel/include/llvm/MC/MCAsmBackend.h llvm-devel/include/llvm/MC/MCAsmInfo.h llvm-devel/include/llvm/MC/MCAsmInfoCOFF.h @@ -1811,6 +1827,7 @@ llvm-devel/include/llvm/Object/ArchiveWriter.h llvm-devel/include/llvm/Object/Binary.h llvm-devel/include/llvm/Object/COFF.h llvm-devel/include/llvm/Object/COFFImportFile.h +llvm-devel/include/llvm/Object/Decompressor.h llvm-devel/include/llvm/Object/ELF.h llvm-devel/include/llvm/Object/ELFObjectFile.h llvm-devel/include/llvm/Object/ELFTypes.h @@ -1827,6 +1844,8 @@ llvm-devel/include/llvm/Object/SymbolSize.h llvm-devel/include/llvm/Object/SymbolicFile.h llvm-devel/include/llvm/Object/Wasm.h llvm-devel/include/llvm/ObjectYAML/COFFYAML.h +llvm-devel/include/llvm/ObjectYAML/DWARFEmitter.h +llvm-devel/include/llvm/ObjectYAML/DWARFYAML.h llvm-devel/include/llvm/ObjectYAML/ELFYAML.h llvm-devel/include/llvm/ObjectYAML/MachOYAML.h llvm-devel/include/llvm/ObjectYAML/ObjectYAML.h @@ -1855,6 +1874,7 @@ llvm-devel/include/llvm/ProfileData/SampleProf.h llvm-devel/include/llvm/ProfileData/SampleProfReader.h llvm-devel/include/llvm/ProfileData/SampleProfWriter.h llvm-devel/include/llvm/Support/AArch64TargetParser.def +llvm-devel/include/llvm/Support/ARMAttributeParser.h llvm-devel/include/llvm/Support/ARMBuildAttributes.h llvm-devel/include/llvm/Support/ARMEHABI.h llvm-devel/include/llvm/Support/ARMTargetParser.def @@ -1924,6 +1944,7 @@ llvm-devel/include/llvm/Support/FormattedStream.h llvm-devel/include/llvm/Support/GCOV.h llvm-devel/include/llvm/Support/GenericDomTree.h llvm-devel/include/llvm/Support/GenericDomTreeConstruction.h +llvm-devel/include/llvm/Support/GlobPattern.h llvm-devel/include/llvm/Support/GraphWriter.h llvm-devel/include/llvm/Support/Host.h llvm-devel/include/llvm/Support/JamCRC.h @@ -1971,6 +1992,7 @@ llvm-devel/include/llvm/Support/StringPool.h llvm-devel/include/llvm/Support/StringSaver.h llvm-devel/include/llvm/Support/SwapByteOrder.h llvm-devel/include/llvm/Support/SystemUtils.h +llvm-devel/include/llvm/Support/TarWriter.h llvm-devel/include/llvm/Support/TargetParser.h llvm-devel/include/llvm/Support/TargetRegistry.h llvm-devel/include/llvm/Support/TargetSelect.h @@ -2013,6 +2035,7 @@ llvm-devel/include/llvm/Target/Target.td llvm-devel/include/llvm/Target/TargetCallingConv.h llvm-devel/include/llvm/Target/TargetCallingConv.td llvm-devel/include/llvm/Target/TargetFrameLowering.h +llvm-devel/include/llvm/Target/TargetGlobalISel.td llvm-devel/include/llvm/Target/TargetInstrInfo.h llvm-devel/include/llvm/Target/TargetIntrinsicInfo.h llvm-devel/include/llvm/Target/TargetItinerary.td @@ -2041,7 +2064,7 @@ llvm-devel/include/llvm/Transforms/IPO/GlobalDCE.h llvm-devel/include/llvm/Transforms/IPO/GlobalOpt.h llvm-devel/include/llvm/Transforms/IPO/GlobalSplit.h llvm-devel/include/llvm/Transforms/IPO/InferFunctionAttrs.h -llvm-devel/include/llvm/Transforms/IPO/InlinerPass.h +llvm-devel/include/llvm/Transforms/IPO/Inliner.h llvm-devel/include/llvm/Transforms/IPO/Internalize.h llvm-devel/include/llvm/Transforms/IPO/LowerTypeTests.h llvm-devel/include/llvm/Transforms/IPO/PartialInlining.h @@ -2067,15 +2090,19 @@ llvm-devel/include/llvm/Transforms/Scalar/DeadStoreElimination.h llvm-devel/include/llvm/Transforms/Scalar/EarlyCSE.h llvm-devel/include/llvm/Transforms/Scalar/Float2Int.h llvm-devel/include/llvm/Transforms/Scalar/GVN.h +llvm-devel/include/llvm/Transforms/Scalar/GVNExpression.h llvm-devel/include/llvm/Transforms/Scalar/GuardWidening.h +llvm-devel/include/llvm/Transforms/Scalar/IVUsersPrinter.h llvm-devel/include/llvm/Transforms/Scalar/IndVarSimplify.h llvm-devel/include/llvm/Transforms/Scalar/JumpThreading.h llvm-devel/include/llvm/Transforms/Scalar/LICM.h +llvm-devel/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h llvm-devel/include/llvm/Transforms/Scalar/LoopDataPrefetch.h llvm-devel/include/llvm/Transforms/Scalar/LoopDeletion.h llvm-devel/include/llvm/Transforms/Scalar/LoopDistribute.h llvm-devel/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h llvm-devel/include/llvm/Transforms/Scalar/LoopInstSimplify.h +llvm-devel/include/llvm/Transforms/Scalar/LoopPassManager.h llvm-devel/include/llvm/Transforms/Scalar/LoopRotation.h llvm-devel/include/llvm/Transforms/Scalar/LoopSimplifyCFG.h llvm-devel/include/llvm/Transforms/Scalar/LoopStrengthReduce.h @@ -2086,6 +2113,7 @@ llvm-devel/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h llvm-devel/include/llvm/Transforms/Scalar/MemCpyOptimizer.h llvm-devel/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h llvm-devel/include/llvm/Transforms/Scalar/NaryReassociate.h +llvm-devel/include/llvm/Transforms/Scalar/NewGVN.h llvm-devel/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h llvm-devel/include/llvm/Transforms/Scalar/Reassociate.h llvm-devel/include/llvm/Transforms/Scalar/SCCP.h @@ -2137,6 +2165,9 @@ llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h llvm-devel/include/llvm/Transforms/Vectorize.h llvm-devel/include/llvm/Transforms/Vectorize/LoopVectorize.h llvm-devel/include/llvm/Transforms/Vectorize/SLPVectorizer.h +llvm-devel/include/llvm/XRay/Trace.h +llvm-devel/include/llvm/XRay/XRayRecord.h +llvm-devel/include/llvm/XRay/YAMLXRayRecord.h %%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h %%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.h %%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h @@ -2245,6 +2276,7 @@ llvm-devel/lib/cmake/llvm/AddOCaml.cmake llvm-devel/lib/cmake/llvm/AddSphinxTarget.cmake llvm-devel/lib/cmake/llvm/CheckAtomic.cmake %%OPENMP%%llvm-devel/lib/cmake/llvm/CheckCompilerVersion.cmake +llvm-devel/lib/cmake/llvm/CheckLinkerFlag.cmake llvm-devel/lib/cmake/llvm/ChooseMSVCCRT.cmake %%OPENMP%%llvm-devel/lib/cmake/llvm/CrossCompile.cmake %%OPENMP%%llvm-devel/lib/cmake/llvm/DetermineGCCCompatible.cmake @@ -2395,13 +2427,14 @@ llvm-devel/lib/libLLVMXCoreCodeGen.a llvm-devel/lib/libLLVMXCoreDesc.a llvm-devel/lib/libLLVMXCoreDisassembler.a llvm-devel/lib/libLLVMXCoreInfo.a +llvm-devel/lib/libLLVMXRay.a llvm-devel/lib/libLLVMipo.a llvm-devel/lib/libLTO.so -llvm-devel/lib/libLTO.so.40 -llvm-devel/lib/libLTO.so.40.0svn +llvm-devel/lib/libLTO.so.%%LLVM_LIB_VER%% +llvm-devel/lib/libLTO.so.%%LLVM_LIB_VER%%.0svn %%CLANG%%llvm-devel/lib/libclang.so +%%CLANG%%llvm-devel/lib/libclang.so.%%LLVM_LIB_VER%% %%CLANG%%llvm-devel/lib/libclang.so.%%LLVM_MAJOR%% -%%CLANG%%llvm-devel/lib/libclang.so.40 %%CLANG%%llvm-devel/lib/libclangARCMigrate.a %%CLANG%%llvm-devel/lib/libclangAST.a %%CLANG%%llvm-devel/lib/libclangASTMatchers.a @@ -2450,17 +2483,9 @@ llvm-devel/lib/libLTO.so.40.0svn %%EXTRAS%%llvm-devel/lib/libfindAllSymbols.a %%OPENMP%%llvm-devel/lib/libgomp.so %%OPENMP%%llvm-devel/lib/libiomp5.so -%%LLD%%llvm-devel/lib/liblldCOFF.a -%%LLD%%llvm-devel/lib/liblldConfig.a -%%LLD%%llvm-devel/lib/liblldCore.a -%%LLD%%llvm-devel/lib/liblldDriver.a -%%LLD%%llvm-devel/lib/liblldELF.a -%%LLD%%llvm-devel/lib/liblldMachO.a -%%LLD%%llvm-devel/lib/liblldReaderWriter.a -%%LLD%%llvm-devel/lib/liblldYAML.a %%LLDB%%llvm-devel/lib/liblldb.so +%%LLDB%%llvm-devel/lib/liblldb.so.%%LLVM_LIB_VER%% %%LLDB%%llvm-devel/lib/liblldb.so.%%LLVM_RELEASE%% -%%LLDB%%llvm-devel/lib/liblldb.so.40 %%LLDB%%llvm-devel/lib/liblldbBase.a %%LLDB%%llvm-devel/lib/liblldbBreakpoint.a %%LLDB%%llvm-devel/lib/liblldbCommands.a diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile index 2fc4252aaf61..e860a8b48c9f 100644 --- a/devel/ocaml-annexlib/Makefile +++ b/devel/ocaml-annexlib/Makefile @@ -3,12 +3,12 @@ PORTNAME= annexlib PORTVERSION= 0.13.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://raevnos.pennmush.org/code/extlib/ PKGNAMEPREFIX= ocaml- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= OCaml subroutines collection LICENSE= LGPL21 @@ -21,18 +21,23 @@ USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes -OPTIONS_DEFINE= DOCS - GNU_CONFIGURE= yes - ALL_TARGET= all opt SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +PORTDOCS= * + +OPTIONS_DEFINE= DOCS MAKE_JOBS_UNSAFE= yes +post-install: + cd ${STAGEDIR}${PREFIX} && \ + ${STRIP_CMD} lib/ocaml/site-lib/annexlib/dllannexlib_stubs.so + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/html/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/html/* \ + ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/ocaml-annexlib/pkg-plist b/devel/ocaml-annexlib/pkg-plist deleted file mode 100644 index f94ce5d80297..000000000000 --- a/devel/ocaml-annexlib/pkg-plist +++ /dev/null @@ -1,49 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/ArrayExtras.html -%%PORTDOCS%%%%DOCSDIR%%/CharExtras.html -%%PORTDOCS%%%%DOCSDIR%%/Find.html -%%PORTDOCS%%%%DOCSDIR%%/Glob.html -%%PORTDOCS%%%%DOCSDIR%%/IOExtras.html -%%PORTDOCS%%%%DOCSDIR%%/ListExtras.ComparableType.html -%%PORTDOCS%%%%DOCSDIR%%/ListExtras.Make.html -%%PORTDOCS%%%%DOCSDIR%%/ListExtras.S.html -%%PORTDOCS%%%%DOCSDIR%%/ListExtras.html -%%PORTDOCS%%%%DOCSDIR%%/Locale.html -%%PORTDOCS%%%%DOCSDIR%%/Option.html -%%PORTDOCS%%%%DOCSDIR%%/StrExtras.CaseInsensitive.html -%%PORTDOCS%%%%DOCSDIR%%/StrExtras.Collate.html -%%PORTDOCS%%%%DOCSDIR%%/StrExtras.FastSearch.html -%%PORTDOCS%%%%DOCSDIR%%/StrExtras.html -%%PORTDOCS%%%%DOCSDIR%%/Syslog.html -%%PORTDOCS%%%%DOCSDIR%%/Time.html -%%PORTDOCS%%%%DOCSDIR%%/UnixExtras.html -%%PORTDOCS%%%%DOCSDIR%%/Variant.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index_attributes.html -%%PORTDOCS%%%%DOCSDIR%%/index_class_types.html -%%PORTDOCS%%%%DOCSDIR%%/index_classes.html -%%PORTDOCS%%%%DOCSDIR%%/index_exceptions.html -%%PORTDOCS%%%%DOCSDIR%%/index_methods.html -%%PORTDOCS%%%%DOCSDIR%%/index_module_types.html -%%PORTDOCS%%%%DOCSDIR%%/index_modules.html -%%PORTDOCS%%%%DOCSDIR%%/index_types.html -%%PORTDOCS%%%%DOCSDIR%%/index_values.html -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/type_ArrayExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_CharExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_Find.html -%%PORTDOCS%%%%DOCSDIR%%/type_Glob.html -%%PORTDOCS%%%%DOCSDIR%%/type_IOExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.ComparableType.html -%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.Make.html -%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.S.html -%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_Locale.html -%%PORTDOCS%%%%DOCSDIR%%/type_Option.html -%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.CaseInsensitive.html -%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.Collate.html -%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.FastSearch.html -%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_Syslog.html -%%PORTDOCS%%%%DOCSDIR%%/type_Time.html -%%PORTDOCS%%%%DOCSDIR%%/type_UnixExtras.html -%%PORTDOCS%%%%DOCSDIR%%/type_Variant.html diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index f91fa05aa7f5..9e89e1ccf7a0 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -10,9 +10,7 @@ MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \ PKGNAMEPREFIX= ocaml- DIST_SUBDIR= ${PKGBASE} -PATCH_SITES= ${MASTER_SITES} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Preprocessor-pretty-printer of OCaml LICENSE= INRIA @@ -20,12 +18,12 @@ LICENSE_NAME= INRIA permissive license with copyright notice requirements LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= tar:tgz +USE_OCAML= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix ${PREFIX} ALL_TARGET= world.opt -MAKE_JOBS_UNSAFE= yes -USES= tar:tgz -USE_OCAML= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix ${PREFIX} +MAKE_JOBS_UNSAFE=yes OPTIONS_SINGLE= MODE OPTIONS_SINGLE_MODE= TRANSITIONAL STRICT @@ -42,8 +40,10 @@ STRICT_CONFIGURE_ON= --strict TRANSITIONAL_CONFIGURE_ON= --transitional post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/META ${STAGEDIR}${PREFIX}/lib/ocaml/camlp5 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/camlp5*.opt ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/camlp5/*.o + ${INSTALL_DATA} ${WRKSRC}/etc/META \ + ${STAGEDIR}${PREFIX}/lib/ocaml/camlp5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/camlp5*.opt \ + ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/camlp5/*.o post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index ab2be7333134..8f21a5c712ee 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -2,25 +2,31 @@ # $FreeBSD$ PORTNAME= findlib -PORTVERSION= 1.6.2 +PORTVERSION= 1.7.1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= OCaml package manager +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gmake USE_OCAML= yes +USE_OCAML_CAMLP4=yes +USE_OCAML_FINDLIB=yes +OCAMLFIND_DEPEND= # Avoid dependency loop HAS_CONFIGURE= yes -USES= gmake -ALL_TARGET= all opt - CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \ -sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \ -config "${PREFIX}/etc/findlib.conf" -USE_OCAML_CAMLP4=yes -USE_OCAML_FINDLIB=yes -OCAMLFIND_DEPEND= # Avoid dependency loop +MAKE_ENV= OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" +ALL_TARGET= all opt +MAKE_JOBS_UNSAFE= yes +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +PORTDOCS= * OPTIONS_DEFINE= TOOLBOX DOCS OPTIONS_DEFAULT=TOOLBOX @@ -30,21 +36,18 @@ TOOLBOX_CONFIGURE_ON= -with-toolbox TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} -MAKE_JOBS_UNSAFE= yes - -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} -PORTDOCS= * - -post-patch: - @${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \ - ${WRKSRC}/findlib.conf.in - post-install: - @-${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ - ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard + ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard + cd ${STAGEDIR}${PREFIX} && \ + ${STRIP_CMD} bin/ocamlfind \ + ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ + ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ + ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ - "! -regex .*ref-man.*" - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocamlfind + "! -regex .*ref-man.*" .include diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index 03f5196a9557..bf3555519a1e 100644 --- a/devel/ocaml-findlib/distinfo +++ b/devel/ocaml-findlib/distinfo @@ -1,2 +1,3 @@ -SHA256 (findlib-1.6.2.tar.gz) = 3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946 -SIZE (findlib-1.6.2.tar.gz) = 253764 +TIMESTAMP = 1484407844 +SHA256 (findlib-1.7.1.tar.gz) = 5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef +SIZE (findlib-1.7.1.tar.gz) = 256883 diff --git a/devel/ocaml-findlib/files/patch-Makefile b/devel/ocaml-findlib/files/patch-Makefile index 22c44012e7b8..95459974581b 100644 --- a/devel/ocaml-findlib/files/patch-Makefile +++ b/devel/ocaml-findlib/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2016-03-07 14:46:34.000000000 +0100 -+++ Makefile 2016-03-10 22:51:25.356292000 +0100 +--- Makefile.orig 2016-11-18 13:04:45 UTC ++++ Makefile @@ -17,14 +17,14 @@ opt: for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done @@ -18,11 +18,20 @@ fi $(MAKE) install-doc +@@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in + USE_CYGPATH="$(USE_CYGPATH)"; \ + export USE_CYGPATH; \ + cat findlib.conf.in | \ +- tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf ++ tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ + echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ + fi @@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in .PHONY: install-doc install-doc: -- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" +- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5" - -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" - -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" + mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5" diff --git a/devel/ocaml-findlib/files/patch-src__bytes__Makefile b/devel/ocaml-findlib/files/patch-src__bytes__Makefile index 848d4563a2a2..4758def89193 100644 --- a/devel/ocaml-findlib/files/patch-src__bytes__Makefile +++ b/devel/ocaml-findlib/files/patch-src__bytes__Makefile @@ -1,5 +1,5 @@ ---- src/bytes/Makefile.orig 2016-03-07 14:46:34.000000000 +0100 -+++ src/bytes/Makefile 2016-03-10 22:51:25.358157000 +0100 +--- src/bytes/Makefile.orig 2016-11-18 13:04:46 UTC ++++ src/bytes/Makefile @@ -19,9 +19,9 @@ opt: $(OCAMLBUILD) $$files diff --git a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile index d057d48471d2..c3458e3b3a86 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile @@ -1,5 +1,5 @@ ---- src/findlib-toolbox/Makefile.orig 2016-03-07 14:46:34.000000000 +0100 -+++ src/findlib-toolbox/Makefile 2016-03-10 22:51:25.360014000 +0100 +--- src/findlib-toolbox/Makefile.orig 2016-11-18 13:04:46 UTC ++++ src/findlib-toolbox/Makefile @@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m findlib.cma make_wizard.ml diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile index d5b4d2dc7f50..1f91a4d5ba77 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile @@ -1,5 +1,5 @@ ---- src/findlib/Makefile.orig 2016-03-07 14:46:34.000000000 +0100 -+++ src/findlib/Makefile 2016-03-10 22:51:25.362057000 +0100 +--- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC ++++ src/findlib/Makefile @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep OCAMLLEX = ocamllex #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- @@ -8,7 +8,7 @@ OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \ -@@ -112,23 +113,23 @@ clean: +@@ -119,23 +120,23 @@ clean: ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) install: all @@ -18,25 +18,24 @@ + mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" + mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" -+ ${BSD_INSTALL_DATA} $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" ++ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ - cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" -+ ${BSD_INSTALL_DATA} $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" ++ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" # the following "if" block is only needed for 4.00beta2 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ - cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ -+ ${BSD_INSTALL_DATA} topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ ++ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ fi install-num-top: - mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top" -- cp num_top.cma num_top.cmi num_top_printers.cmi \ -- "$(prefix)$(OCAML_SITELIB)/num-top" + mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" -+ ${BSD_INSTALL_DATA} num_top.cma num_top.cmi num_top_printers.cmi \ + cp num_top.cma num_top.cmi num_top_printers.cmi \ +- "$(prefix)$(OCAML_SITELIB)/num-top" + "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" # Note: uninstall-num-top is part of the removal of the META files. diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index 5aa30b97d983..7ccae20246da 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -18,7 +18,10 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxs +%%OCAML_SITELIBDIR%%/findlib/findlib_top.a %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma +%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa +%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs %%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi %%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 838ef48d476d..4e10ef16d410 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --destdir "${STAGEDIR}" \ --disable-glib DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} -SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR} +SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} OPTIONS_DEFINE= DOCS @@ -61,7 +61,7 @@ do-build: cd ${WRKSRC}; ocaml setup.ml -build do-install: - ${MKDIR} ${STAGEDIR}${SA_DIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR} cd ${WRKSRC}; ocaml setup.ml -install .include diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index 7958bba5f3ff..91c5232f5727 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -4,35 +4,44 @@ PORTNAME= pcre PORTVERSION= 7.2.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Perl compatible regular expressions for Objective Caml +LICENSE= LGPL21 + LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes GH_ACCOUNT= mmottl GH_PROJECT= ${PORTNAME}-ocaml - USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes - EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} +PORTEXAMPLES= cloc count_hash pcregrep subst DOCSDIR= ${PREFIX}/share/doc/pcre-ocaml +PORTDOCS= api OPTIONS_DEFINE= DOCS EXAMPLES +DOCS_CONFIGURE_OFF= --disable-docs post-patch: - @${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \ - -e '/datarootdir/s|$$pkg_name|&-ocaml|' \ - ${WRKSRC}/setup.ml - @${REINPLACE_CMD} -e 's| safe_string,||' ${WRKSRC}/_tags + ${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \ + -e '/datarootdir/s|$$pkg_name|&-ocaml|' \ + ${WRKSRC}/setup.ml + ${REINPLACE_CMD} -e 's| safe_string,||' ${WRKSRC}/_tags + +post-install: + cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ + lib/ocaml/site-lib/pcre/dllpcre_stubs.so \ + lib/ocaml/site-lib/pcre/pcre.cmxs post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/devel/ocaml-pcre/pkg-descr b/devel/ocaml-pcre/pkg-descr index 991380f7d47e..6d4f93d3ac8b 100644 --- a/devel/ocaml-pcre/pkg-descr +++ b/devel/ocaml-pcre/pkg-descr @@ -1,3 +1,4 @@ Perl compatible regular expressions for Objective Caml. WWW: http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml +WWW: https://github.com/mmottl/pcre-ocaml diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist index fe2af13a78f9..a76b354b4580 100644 --- a/devel/ocaml-pcre/pkg-plist +++ b/devel/ocaml-pcre/pkg-plist @@ -12,25 +12,3 @@ %%OCAML_SITELIBDIR%%/pcre/pcre.cmxs %%OCAML_SITELIBDIR%%/pcre/pcre.mli %%OCAML_SITELIBDIR%%/pcre/pcre_compat.cmx -%%PORTDOCS%%%%DOCSDIR%%/api/Pcre.html -%%PORTDOCS%%%%DOCSDIR%%/api/index.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_attributes.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_class_types.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_classes.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_exceptions.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_extensions.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_methods.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_module_types.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_modules.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_types.html -%%PORTDOCS%%%%DOCSDIR%%/api/index_values.html -%%PORTDOCS%%%%DOCSDIR%%/api/style.css -%%PORTDOCS%%%%DOCSDIR%%/api/type_Pcre.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/cloc.ml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/count_hash.ml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/pcregrep.ml -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/subst.ml diff --git a/devel/p5-Module-Extract-Use/pkg-descr b/devel/p5-Module-Extract-Use/pkg-descr index 5e002870de0c..519242045896 100644 --- a/devel/p5-Module-Extract-Use/pkg-descr +++ b/devel/p5-Module-Extract-Use/pkg-descr @@ -5,4 +5,4 @@ file loads directly. Modules loaded with parent or base, for instance, will will be in the import list for those pragmas but won't have separate entries in the data this module returns. -WWW: http://github.com/briandfoy/module-extract-use/tree/master +WWW: https://github.com/briandfoy/module-extract-use/tree/master diff --git a/devel/p5-MooseX-Attribute-Chained/Makefile b/devel/p5-MooseX-Attribute-Chained/Makefile index cb688b0ea1b2..2ac9ec543245 100644 --- a/devel/p5-MooseX-Attribute-Chained/Makefile +++ b/devel/p5-MooseX-Attribute-Chained/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Attribute-Chained -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,8 +18,6 @@ BUILD_DEPENDS= p5-Moose>=0:devel/p5-Moose \ p5-Try-Tiny>=0:lang/p5-Try-Tiny RUN_DEPENDS:= ${BUILD_DEPENDS} -CONFLICTS_INSTALL= p5-MooseX-ChainedAccessors-[0-9]* - NO_ARCH= yes USE_PERL5= modbuild USES= perl5 diff --git a/devel/p5-MooseX-Attribute-Chained/distinfo b/devel/p5-MooseX-Attribute-Chained/distinfo index 4fde46a31208..9d9083eeaae8 100644 --- a/devel/p5-MooseX-Attribute-Chained/distinfo +++ b/devel/p5-MooseX-Attribute-Chained/distinfo @@ -1,2 +1,3 @@ -SHA256 (MooseX-Attribute-Chained-1.0.2.tar.gz) = c8a1304a31ffbe4f7ffbdc14793b72f4206fd8ecb46d565409789700ae1d7452 -SIZE (MooseX-Attribute-Chained-1.0.2.tar.gz) = 18714 +TIMESTAMP = 1484406583 +SHA256 (MooseX-Attribute-Chained-1.0.3.tar.gz) = e7e38aa7c3b78b5734e9d43cf76832fce00767e6a53d5dd79a1722d8676d5e4e +SIZE (MooseX-Attribute-Chained-1.0.3.tar.gz) = 19982 diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile index 7325fc144f5c..45c8ef2803a2 100644 --- a/devel/p5-Mouse/Makefile +++ b/devel/p5-Mouse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mouse -PORTVERSION= 2.4.6 +PORTVERSION= 2.4.7 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= devel perl5 diff --git a/devel/p5-Mouse/distinfo b/devel/p5-Mouse/distinfo index ea143389ffc9..6bf89461407f 100644 --- a/devel/p5-Mouse/distinfo +++ b/devel/p5-Mouse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483786894 -SHA256 (Mouse-v2.4.6.tar.gz) = a15a836354365df5446c730edb6af404891ec162e985058fee441c5124c8c44a -SIZE (Mouse-v2.4.6.tar.gz) = 221675 +TIMESTAMP = 1484441826 +SHA256 (Mouse-v2.4.7.tar.gz) = 80eb9f68df7eb0eb32e355ab32705256c8b3c65de73ed462f942fe8a722ed763 +SIZE (Mouse-v2.4.7.tar.gz) = 222151 diff --git a/devel/p5-Specio/Makefile b/devel/p5-Specio/Makefile index a7873a3b8d35..d4b053a471f5 100644 --- a/devel/p5-Specio/Makefile +++ b/devel/p5-Specio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Specio -PORTVERSION= 0.31 +PORTVERSION= 0.32 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DROLSKY diff --git a/devel/p5-Specio/distinfo b/devel/p5-Specio/distinfo index 7281fa104964..f946fdebd2db 100644 --- a/devel/p5-Specio/distinfo +++ b/devel/p5-Specio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479403381 -SHA256 (Specio-0.31.tar.gz) = ef4a7c4856032cb1d725f96c06de2a25d1edaef8812c1f86d13e55ecee0183f9 -SIZE (Specio-0.31.tar.gz) = 82791 +TIMESTAMP = 1484304081 +SHA256 (Specio-0.32.tar.gz) = 07544e0e52c252d480714edd8256447e7ec5762c99571c305ca2895e58d8f949 +SIZE (Specio-0.32.tar.gz) = 83679 diff --git a/devel/p5-Specio/pkg-plist b/devel/p5-Specio/pkg-plist index 9c2ef0318429..12fb9fb86cc4 100644 --- a/devel/p5-Specio/pkg-plist +++ b/devel/p5-Specio/pkg-plist @@ -30,7 +30,6 @@ %%SITE_PERL%%/Specio/Registry.pm %%SITE_PERL%%/Specio/Role/Inlinable.pm %%SITE_PERL%%/Specio/TypeChecks.pm -%%SITE_PERL%%/TODO.pod %%SITE_PERL%%/Test/Specio.pm %%PERL5_MAN3%%/Specio.3.gz %%PERL5_MAN3%%/Specio::Coercion.3.gz @@ -64,5 +63,4 @@ %%PERL5_MAN3%%/Specio::Registry.3.gz %%PERL5_MAN3%%/Specio::Role::Inlinable.3.gz %%PERL5_MAN3%%/Specio::TypeChecks.3.gz -%%PERL5_MAN3%%/TODO.3.gz %%PERL5_MAN3%%/Test::Specio.3.gz diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile index 1da3121de1c6..1d6d697b7410 100644 --- a/devel/py-gevent/Makefile +++ b/devel/py-gevent/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gevent -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-gevent/distinfo b/devel/py-gevent/distinfo index de62480820cc..c169d05ebef4 100644 --- a/devel/py-gevent/distinfo +++ b/devel/py-gevent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482569157 -SHA256 (gevent-1.2.0.tar.gz) = fec7aaa513bec624634a67eb3c85baffa7e1781b1b76680493224a6a5aed6edf -SIZE (gevent-1.2.0.tar.gz) = 2842490 +TIMESTAMP = 1484304090 +SHA256 (gevent-1.2.1.tar.gz) = 3de300d0e32c31311e426e4d5d73b36777ed99c2bac3f8fbad939eeb2c29fa7c +SIZE (gevent-1.2.1.tar.gz) = 2808619 diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile index 5ea977b2e149..0c7fff83c72e 100644 --- a/devel/py-grab/Makefile +++ b/devel/py-grab/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= grab -PORTVERSION= 0.6.30 +PORTVERSION= 0.6.32 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-grab/distinfo b/devel/py-grab/distinfo index 99f1c3cc82c0..a8f24759c345 100644 --- a/devel/py-grab/distinfo +++ b/devel/py-grab/distinfo @@ -1,2 +1,3 @@ -SHA256 (grab-0.6.30.tar.gz) = 29ebb1e8b26cf15adb2381f01ba6c4eaad3dbd509e1218245a4534b2b94b33a3 -SIZE (grab-0.6.30.tar.gz) = 96246 +TIMESTAMP = 1484335416 +SHA256 (grab-0.6.32.tar.gz) = cbd5cd148fade4d6f2ffa463bb983cb65416f06ec1490365869f758f029c8ed8 +SIZE (grab-0.6.32.tar.gz) = 61467 diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile index 15b5d13004ed..9a54230f9a61 100644 --- a/devel/py-jep/Makefile +++ b/devel/py-jep/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jep -PORTVERSION= 3.6.2 +PORTVERSION= 3.6.3 CATEGORIES= devel java python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jep/distinfo b/devel/py-jep/distinfo index d03e93b2e5a4..cf1f38ad443c 100644 --- a/devel/py-jep/distinfo +++ b/devel/py-jep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484055165 -SHA256 (jep-3.6.2.tar.gz) = 7d8fa5a1424dc91d6ea408718a7a5b8e90d7c0ebe53b5b2a1c38dc6c7979db48 -SIZE (jep-3.6.2.tar.gz) = 258756 +TIMESTAMP = 1484296302 +SHA256 (jep-3.6.3.tar.gz) = 4b0b8af3d4601ed056a9509c4f5d6d0c9f8a422009fa143b00c2c037644c39f0 +SIZE (jep-3.6.3.tar.gz) = 258858 diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile index 0978e476a09c..0089b3fd5068 100644 --- a/devel/py-pyro/Makefile +++ b/devel/py-pyro/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pyro -PORTVERSION= 4.52 +PORTVERSION= 4.53 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ COMMENT= Distributed Object Middleware for Python(IPC/RPC) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.15:devel/py-serpent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.16:devel/py-serpent NO_ARCH= yes USES= dos2unix python:2.7+ diff --git a/devel/py-pyro/distinfo b/devel/py-pyro/distinfo index 932892e46745..4c2b57b785b1 100644 --- a/devel/py-pyro/distinfo +++ b/devel/py-pyro/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481748694 -SHA256 (Pyro4-4.52.tar.gz) = 449f4bdf8dcbaca90e6436eb40c4e860b0de47346e2c7735d0584496d28451e5 -SIZE (Pyro4-4.52.tar.gz) = 451807 +TIMESTAMP = 1484336369 +SHA256 (Pyro4-4.53.tar.gz) = c6ca6461472a74a7608a2247413b66e951889351fcf8e9eed5d7232ae844b702 +SIZE (Pyro4-4.53.tar.gz) = 451928 diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile index c3818c21b912..655506d1dfa6 100644 --- a/devel/py-robotframework-pabot/Makefile +++ b/devel/py-robotframework-pabot/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= robotframework-pabot -PORTVERSION= 0.31 +PORTVERSION= 0.34 CATEGORIES= devel www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-robotframework-pabot/distinfo b/devel/py-robotframework-pabot/distinfo index be649a1d65ae..3339517367a7 100644 --- a/devel/py-robotframework-pabot/distinfo +++ b/devel/py-robotframework-pabot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470131804 -SHA256 (robotframework-pabot-0.31.tar.gz) = 8b8085ec11d1123217c789752847ed308f966ee366eeb05dec10645837784127 -SIZE (robotframework-pabot-0.31.tar.gz) = 10453 +TIMESTAMP = 1483517662 +SHA256 (robotframework-pabot-0.34.tar.gz) = a36efd61de17d63e8696efd8363bb5e2528151d44916e970eeeb146cdefbf005 +SIZE (robotframework-pabot-0.34.tar.gz) = 10831 diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile index 80d135ab9b94..f334c3924c7e 100644 --- a/devel/py-selection/Makefile +++ b/devel/py-selection/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= selection -PORTVERSION= 0.0.11 +PORTVERSION= 0.0.12 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-selection/distinfo b/devel/py-selection/distinfo index 14748301aedd..dd2a774f3612 100644 --- a/devel/py-selection/distinfo +++ b/devel/py-selection/distinfo @@ -1,2 +1,3 @@ -SHA256 (selection-0.0.11.tar.gz) = 3e2f5b21bda0c6a877ca42f23f017cb2e95873155fa10ae3ae44520280a9e819 -SIZE (selection-0.0.11.tar.gz) = 3679 +TIMESTAMP = 1484334839 +SHA256 (selection-0.0.12.tar.gz) = 982fa22c3f3c767ecf8b6a782b47eff546a212830abdca25c89222cf18590a9f +SIZE (selection-0.0.12.tar.gz) = 3664 diff --git a/devel/py-serpent/Makefile b/devel/py-serpent/Makefile index 1310a89dbaa7..8beeab59ea75 100644 --- a/devel/py-serpent/Makefile +++ b/devel/py-serpent/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= serpent -PORTVERSION= 1.15 +PORTVERSION= 1.16 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-serpent/distinfo b/devel/py-serpent/distinfo index c16492b0ccab..d9f8045c2020 100644 --- a/devel/py-serpent/distinfo +++ b/devel/py-serpent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476184142 -SHA256 (serpent-1.15.tar.gz) = f5bc2cd19b79e7ac0821cc8278c4be7a69b2eef07d96f3c6f7977e14b2098c79 -SIZE (serpent-1.15.tar.gz) = 11590 +TIMESTAMP = 1484336237 +SHA256 (serpent-1.16.tar.gz) = c26e98c2155228a69eb0dc14ba7b888cb70099b6c4ca47fd9d1f099f7d561c3e +SIZE (serpent-1.16.tar.gz) = 11699 diff --git a/devel/py-typing/Makefile b/devel/py-typing/Makefile index ed1022c83670..577c304625a9 100644 --- a/devel/py-typing/Makefile +++ b/devel/py-typing/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= typing -PORTVERSION= 3.5.2.2 +PORTVERSION= 3.5.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-typing/distinfo b/devel/py-typing/distinfo index d35e12abffc7..229dd14e37da 100644 --- a/devel/py-typing/distinfo +++ b/devel/py-typing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1469629456 -SHA256 (typing-3.5.2.2.tar.gz) = 2bce34292653af712963c877f3085250a336738e64f99048d1b8509bebc4772f -SIZE (typing-3.5.2.2.tar.gz) = 51101 +TIMESTAMP = 1484335738 +SHA256 (typing-3.5.3.0.tar.gz) = ca2daac7e393e8ee86e9140cd0cf0172ff6bb50ebdf0b06281770f98f31bff21 +SIZE (typing-3.5.3.0.tar.gz) = 60350 diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile index 5086a8232794..e2dd0bba93c9 100644 --- a/devel/py-weblib/Makefile +++ b/devel/py-weblib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= weblib -PORTVERSION= 0.1.20 +PORTVERSION= 0.1.23 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-weblib/distinfo b/devel/py-weblib/distinfo index ae28fcd48a6a..7475794acbf4 100644 --- a/devel/py-weblib/distinfo +++ b/devel/py-weblib/distinfo @@ -1,2 +1,3 @@ -SHA256 (weblib-0.1.20.tar.gz) = d49687b97ecb61cb7ab4df947f1f0b084a3514476fa910a9d3b554876e05bdbb -SIZE (weblib-0.1.20.tar.gz) = 36969 +TIMESTAMP = 1484335313 +SHA256 (weblib-0.1.23.tar.gz) = ad49067d4bed1f5571e34b165ee8e90d2b8022e206f57b49f60908bd5b19bda4 +SIZE (weblib-0.1.23.tar.gz) = 30280 diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile index 15d0550727cc..accf32356fb1 100644 --- a/devel/rbtools/Makefile +++ b/devel/rbtools/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ${ORIGNAME:tl} -DISTVERSION= 0.7.7 +DISTVERSION= 0.7.8 CATEGORIES= devel MASTER_SITES= http://downloads.reviewboard.org/releases/${ORIGNAME}/${DISTVERSION:R}/ DISTNAME= ${ORIGNAME}-${DISTVERSION} diff --git a/devel/rbtools/distinfo b/devel/rbtools/distinfo index 4e190ec31aad..f3affa5d3e6d 100644 --- a/devel/rbtools/distinfo +++ b/devel/rbtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479903323 -SHA256 (RBTools-0.7.7.tar.gz) = 98d74c8947bc02d313e34ebee6c7cfd171a818539ea66c104974df984cd2c98a -SIZE (RBTools-0.7.7.tar.gz) = 169305 +TIMESTAMP = 1484324703 +SHA256 (RBTools-0.7.8.tar.gz) = e6fc5d451a8f33aa959d448948a01a7a588b0b20392e4d14a3bae378ce12ab95 +SIZE (RBTools-0.7.8.tar.gz) = 169541 diff --git a/devel/rubygem-algebrick/Makefile b/devel/rubygem-algebrick/Makefile index c1a5b70416d8..32af8c47bcff 100644 --- a/devel/rubygem-algebrick/Makefile +++ b/devel/rubygem-algebrick/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= algebrick -PORTVERSION= 0.7.3 +PORTVERSION= 0.7.4 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-algebrick/distinfo b/devel/rubygem-algebrick/distinfo index f31fc31a014d..ae163717dad8 100644 --- a/devel/rubygem-algebrick/distinfo +++ b/devel/rubygem-algebrick/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/algebrick-0.7.3.gem) = 83d67eff094ed2ca896c44680585d6c8689e73fe3673d6e7fe7e9accabf5c019 -SIZE (rubygem/algebrick-0.7.3.gem) = 26624 +TIMESTAMP = 1484304118 +SHA256 (rubygem/algebrick-0.7.4.gem) = 02e30765f0fa4d832cb802e4a5928041f70756250bee9fa39291b47b2bc6e9d7 +SIZE (rubygem/algebrick-0.7.4.gem) = 24576 diff --git a/devel/rubygem-builder32/Makefile b/devel/rubygem-builder32/Makefile index f7d94ba20d88..a467f6e3f64d 100644 --- a/devel/rubygem-builder32/Makefile +++ b/devel/rubygem-builder32/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= builder -PORTVERSION= 3.2.2 +PORTVERSION= 3.2.3 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 32 @@ -11,9 +11,9 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Facilitate programmatic generation of XML markup LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/MIT-LICENSE NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/devel/rubygem-builder32/distinfo b/devel/rubygem-builder32/distinfo index 3ec1cc245f58..4ad420700011 100644 --- a/devel/rubygem-builder32/distinfo +++ b/devel/rubygem-builder32/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/builder-3.2.2.gem) = 62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191 -SIZE (rubygem/builder-3.2.2.gem) = 31744 +TIMESTAMP = 1484432554 +SHA256 (rubygem/builder-3.2.3.gem) = 21f3026ba615d87488329aff4aa4c10464563de3c648f678d8edd26374892b62 +SIZE (rubygem/builder-3.2.3.gem) = 31744 diff --git a/devel/rubygem-ffi/Makefile b/devel/rubygem-ffi/Makefile index d7f64051cf27..81f8f63254f9 100644 --- a/devel/rubygem-ffi/Makefile +++ b/devel/rubygem-ffi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ffi -PORTVERSION= 1.9.14 +PORTVERSION= 1.9.17 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-ffi/distinfo b/devel/rubygem-ffi/distinfo index 641fbcc3d217..68e277d0dba8 100644 --- a/devel/rubygem-ffi/distinfo +++ b/devel/rubygem-ffi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475145619 -SHA256 (rubygem/ffi-1.9.14.gem) = d77d1ccb9cab032fff7ea2b7db1a895a2a2129a72c529e890f6b838c7bcd6cda -SIZE (rubygem/ffi-1.9.14.gem) = 884736 +TIMESTAMP = 1484435920 +SHA256 (rubygem/ffi-1.9.17.gem) = 479ff46dcfd8eda62f1bab5564ba4d5d76372a4764c06f9593bad97a48f6161e +SIZE (rubygem/ffi-1.9.17.gem) = 885760 diff --git a/devel/rubygem-github_api/Makefile b/devel/rubygem-github_api/Makefile index c2272d95aba8..cbd2f9d1f80b 100644 --- a/devel/rubygem-github_api/Makefile +++ b/devel/rubygem-github_api/Makefile @@ -3,6 +3,7 @@ PORTNAME= github_api PORTVERSION= 0.14.5 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-github_api/files/patch-gemspec b/devel/rubygem-github_api/files/patch-gemspec new file mode 100644 index 000000000000..2cf54bbd701d --- /dev/null +++ b/devel/rubygem-github_api/files/patch-gemspec @@ -0,0 +1,11 @@ +--- github_api.gemspec.orig 2017-01-15 03:51:29 UTC ++++ github_api.gemspec +@@ -25,7 +25,7 @@ Gem::Specification.new do |s| + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q.freeze, ["~> 2.4.0"]) + s.add_runtime_dependency(%q.freeze, [">= 3.4"]) +- s.add_runtime_dependency(%q.freeze, ["< 0.10", "~> 0.8"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.8"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.0.4"]) + s.add_development_dependency(%q.freeze, [">= 0"]) diff --git a/devel/rubygem-json/Makefile b/devel/rubygem-json/Makefile index 448b628b7904..b5221e80d92a 100644 --- a/devel/rubygem-json/Makefile +++ b/devel/rubygem-json/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= json -PORTVERSION= 2.0.2 +PORTVERSION= 2.0.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-json/distinfo b/devel/rubygem-json/distinfo index 0a52de417eca..392afb8f422b 100644 --- a/devel/rubygem-json/distinfo +++ b/devel/rubygem-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483141363 -SHA256 (rubygem/json-2.0.2.gem) = 400f60ac8282da80764c5d6fbb04c096390a85950bb488652abc1eb993b411d2 -SIZE (rubygem/json-2.0.2.gem) = 138752 +TIMESTAMP = 1484304123 +SHA256 (rubygem/json-2.0.3.gem) = 14e75b0de38ca662ef6a8f86ffb30fdf3516ba5cdae60c04369c181a4909fc32 +SIZE (rubygem/json-2.0.3.gem) = 138752 diff --git a/devel/rubygem-json1/Makefile b/devel/rubygem-json1/Makefile index 776872430545..fac904573f51 100644 --- a/devel/rubygem-json1/Makefile +++ b/devel/rubygem-json1/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= json -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.6 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 1 @@ -10,10 +10,8 @@ PKGNAMESUFFIX= 1 MAINTAINER= ruby@FreeBSD.org COMMENT= Parse JSON texts and generate them from ruby data structures -LICENSE= GPLv2 RUBY +LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual -LICENSE_FILE_GPLv2= ${WRKSRC}/GPL -LICENSE_FILE_RUBY= ${WRKSRC}/COPYING USE_RUBY= yes USES= gem diff --git a/devel/rubygem-json1/distinfo b/devel/rubygem-json1/distinfo index 4d09b59bee2c..ad7e4306ef9b 100644 --- a/devel/rubygem-json1/distinfo +++ b/devel/rubygem-json1/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/json-1.8.3.gem) = 8ca2091e26678fb989d66cdb9f0104f1307bc584b429c2fd783d51e4b3f14bdb -SIZE (rubygem/json-1.8.3.gem) = 152064 +TIMESTAMP = 1484309239 +SHA256 (rubygem/json-1.8.6.gem) = 65af27ca985f70eb0d083aab0f75712c771871222af021ce533bad77bd3bb262 +SIZE (rubygem/json-1.8.6.gem) = 144384 diff --git a/devel/rubygem-json_pure/Makefile b/devel/rubygem-json_pure/Makefile index d33b2dbab44a..d1cbe05852d0 100644 --- a/devel/rubygem-json_pure/Makefile +++ b/devel/rubygem-json_pure/Makefile @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= json_pure -PORTVERSION= 2.0.2 +PORTVERSION= 2.0.3 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Parse JSON texts and generate them from ruby data structures in Ruby -LICENSE= GPLv2 RUBY +LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual USE_RUBY= yes diff --git a/devel/rubygem-json_pure/distinfo b/devel/rubygem-json_pure/distinfo index 74f211761230..59708a5fcac2 100644 --- a/devel/rubygem-json_pure/distinfo +++ b/devel/rubygem-json_pure/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483146107 -SHA256 (rubygem/json_pure-2.0.2.gem) = def9c4d3da29b3d36033d4b019b045520b1ee4968161630f4b422c7e18b6c83b -SIZE (rubygem/json_pure-2.0.2.gem) = 138752 +TIMESTAMP = 1484304128 +SHA256 (rubygem/json_pure-2.0.3.gem) = 3af4187a03a37cadc93c81fd7333ea8aac5d92d22609af448aa4fb060dd73850 +SIZE (rubygem/json_pure-2.0.3.gem) = 138752 diff --git a/devel/rubygem-json_pure/pkg-descr b/devel/rubygem-json_pure/pkg-descr index 2deb170f986a..bd83720b7491 100644 --- a/devel/rubygem-json_pure/pkg-descr +++ b/devel/rubygem-json_pure/pkg-descr @@ -2,4 +2,4 @@ This library can parse JSON texts and generate them from ruby data structures. This port implemented in pure Ruby and comes with its own unicode conversion functions and a parser generated by the Ragel State Machine Compiler. -WWW: http://flori.github.com/json +WWW: http://flori.github.io/json/ diff --git a/devel/rubygem-json_pure1/Makefile b/devel/rubygem-json_pure1/Makefile new file mode 100644 index 000000000000..f02ba12fd1c1 --- /dev/null +++ b/devel/rubygem-json_pure1/Makefile @@ -0,0 +1,20 @@ +# Created by: Cheng-Lung Sung +# $FreeBSD$ + +PORTNAME= json_pure +PORTVERSION= 1.8.6 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 1 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= Parse JSON texts and generate them from ruby data structures in Ruby + +LICENSE= BSD2CLAUSE RUBY +LICENSE_COMB= dual + +NO_ARCH= yes +USE_RUBY= yes +USES= gem + +.include diff --git a/devel/rubygem-json_pure1/distinfo b/devel/rubygem-json_pure1/distinfo new file mode 100644 index 000000000000..2b9b7a0b9b22 --- /dev/null +++ b/devel/rubygem-json_pure1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1484306884 +SHA256 (rubygem/json_pure-1.8.6.gem) = 55d575c4aec98249473811a256b3f3a7c12a94ad008093032f5e5f28eacd94ee +SIZE (rubygem/json_pure-1.8.6.gem) = 144384 diff --git a/devel/rubygem-json_pure1/pkg-descr b/devel/rubygem-json_pure1/pkg-descr new file mode 100644 index 000000000000..bd83720b7491 --- /dev/null +++ b/devel/rubygem-json_pure1/pkg-descr @@ -0,0 +1,5 @@ +This library can parse JSON texts and generate them from ruby data structures. +This port implemented in pure Ruby and comes with its own unicode conversion +functions and a parser generated by the Ragel State Machine Compiler. + +WWW: http://flori.github.io/json/ diff --git a/devel/rubygem-sequel/Makefile b/devel/rubygem-sequel/Makefile index 053b1392c04d..78971599f737 100644 --- a/devel/rubygem-sequel/Makefile +++ b/devel/rubygem-sequel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sequel -PORTVERSION= 4.42.0 +PORTVERSION= 4.42.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-sequel/distinfo b/devel/rubygem-sequel/distinfo index 147fabdcc079..d708deafae30 100644 --- a/devel/rubygem-sequel/distinfo +++ b/devel/rubygem-sequel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483348499 -SHA256 (rubygem/sequel-4.42.0.gem) = 985c63b082ee5290c55bda647b949be53b04338a2b48d707c6a2b09322c5d469 -SIZE (rubygem/sequel-4.42.0.gem) = 1401856 +TIMESTAMP = 1484304133 +SHA256 (rubygem/sequel-4.42.1.gem) = d6ad6fc72e2df9e88534cb88c33599dd7a583de6b90060f5bc6d145dca305465 +SIZE (rubygem/sequel-4.42.1.gem) = 1402368 diff --git a/devel/rubygem-sidekiq/Makefile b/devel/rubygem-sidekiq/Makefile index c9cbf2a0aefd..7f24f0c8442c 100644 --- a/devel/rubygem-sidekiq/Makefile +++ b/devel/rubygem-sidekiq/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sidekiq -PORTVERSION= 4.2.8 +PORTVERSION= 4.2.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-sidekiq/distinfo b/devel/rubygem-sidekiq/distinfo index 61fab707ec45..f16423228b70 100644 --- a/devel/rubygem-sidekiq/distinfo +++ b/devel/rubygem-sidekiq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484062650 -SHA256 (rubygem/sidekiq-4.2.8.gem) = 8aae69e6b6ca4e3322da9e1ff302880723d390f23dc28d3df96efa9cd013d838 -SIZE (rubygem/sidekiq-4.2.8.gem) = 293888 +TIMESTAMP = 1484432566 +SHA256 (rubygem/sidekiq-4.2.9.gem) = 0662c3682ef29c7c5662012ad51747f689856fe52d51d0bfb9ac14f8163317aa +SIZE (rubygem/sidekiq-4.2.9.gem) = 294400 diff --git a/devel/rubygem-unicode-display_width/Makefile b/devel/rubygem-unicode-display_width/Makefile index 750b156585c9..2712dd7e487c 100644 --- a/devel/rubygem-unicode-display_width/Makefile +++ b/devel/rubygem-unicode-display_width/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unicode-display_width -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-unicode-display_width/distinfo b/devel/rubygem-unicode-display_width/distinfo index 1082ab62aedf..9efe3d1986fb 100644 --- a/devel/rubygem-unicode-display_width/distinfo +++ b/devel/rubygem-unicode-display_width/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481467089 -SHA256 (rubygem/unicode-display_width-1.1.2.gem) = d966add501d3c35fc5ba2cba50d78bf58567fa187e73b4a549de5bc3c6f6d351 -SIZE (rubygem/unicode-display_width-1.1.2.gem) = 11776 +TIMESTAMP = 1484406589 +SHA256 (rubygem/unicode-display_width-1.1.3.gem) = 1d6247805b2431fd3d27614f6e0c38665b068bfc3a58cf89f08b7f107daf48e4 +SIZE (rubygem/unicode-display_width-1.1.3.gem) = 11776 diff --git a/devel/sfml/files/patch-cmake_Config.cmake b/devel/sfml/files/patch-cmake_Config.cmake new file mode 100644 index 000000000000..8a04339c8066 --- /dev/null +++ b/devel/sfml/files/patch-cmake_Config.cmake @@ -0,0 +1,11 @@ +--- cmake/Config.cmake.orig 2016-11-03 06:50:51 UTC ++++ cmake/Config.cmake +@@ -27,7 +27,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Li + # don't use the OpenGL ES implementation on Linux + set(OPENGL_ES 0) + endif() +-elseif(CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$") ++elseif(CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly") + set(SFML_OS_FREEBSD 1) + # don't use the OpenGL ES implementation on FreeBSD + set(OPENGL_ES 0) diff --git a/devel/spdlog/Makefile b/devel/spdlog/Makefile new file mode 100644 index 000000000000..d04a13b17b46 --- /dev/null +++ b/devel/spdlog/Makefile @@ -0,0 +1,20 @@ +# Created by: vanilla@ +# $FreeBSD$ + +PORTNAME= spdlog +PORTVERSION= 0.11.0 +DISTVERSIONPREFIX= v +CATEGORIES= devel + +MAINTAINER= vanilla@FreeBSD.org +COMMENT= Super fast C++ logging library + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= gabime + +USES= cmake dos2unix pathfix + +.include diff --git a/devel/spdlog/distinfo b/devel/spdlog/distinfo new file mode 100644 index 000000000000..545c20ebd294 --- /dev/null +++ b/devel/spdlog/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1483448051 +SHA256 (gabime-spdlog-v0.11.0_GH0.tar.gz) = 8c0f1810fb6b7d23fef70c2ea8b6fa6768ac8d18d6e0de39be1f48865e22916e +SIZE (gabime-spdlog-v0.11.0_GH0.tar.gz) = 146346 diff --git a/devel/spdlog/files/patch-CMakeLists.txt b/devel/spdlog/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..d13e52968c69 --- /dev/null +++ b/devel/spdlog/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2017-01-14 03:31:12 UTC ++++ CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + # * https://github.com/forexample/package-example + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") ++set(config_install_dir "share/cmake/Modules/${PROJECT_NAME}") + set(include_install_dir "include") + set(pkgconfig_install_dir "libdata/pkgconfig") + diff --git a/devel/spdlog/pkg-descr b/devel/spdlog/pkg-descr new file mode 100644 index 000000000000..864511b0bd0d --- /dev/null +++ b/devel/spdlog/pkg-descr @@ -0,0 +1,3 @@ +Super fast C++ logging library. + +WWW: https://github.com/gabime/spdlog diff --git a/devel/spdlog/pkg-plist b/devel/spdlog/pkg-plist new file mode 100644 index 000000000000..9d5530972a88 --- /dev/null +++ b/devel/spdlog/pkg-plist @@ -0,0 +1,39 @@ +include/spdlog/async_logger.h +include/spdlog/common.h +include/spdlog/details/async_log_helper.h +include/spdlog/details/async_logger_impl.h +include/spdlog/details/file_helper.h +include/spdlog/details/log_msg.h +include/spdlog/details/logger_impl.h +include/spdlog/details/mpmc_bounded_q.h +include/spdlog/details/null_mutex.h +include/spdlog/details/os.h +include/spdlog/details/pattern_formatter_impl.h +include/spdlog/details/registry.h +include/spdlog/details/spdlog_impl.h +include/spdlog/fmt/bundled/format.cc +include/spdlog/fmt/bundled/format.h +include/spdlog/fmt/bundled/ostream.cc +include/spdlog/fmt/bundled/ostream.h +include/spdlog/fmt/bundled/printf.h +include/spdlog/fmt/fmt.h +include/spdlog/fmt/ostr.h +include/spdlog/formatter.h +include/spdlog/logger.h +include/spdlog/sinks/android_sink.h +include/spdlog/sinks/ansicolor_sink.h +include/spdlog/sinks/base_sink.h +include/spdlog/sinks/dist_sink.h +include/spdlog/sinks/file_sinks.h +include/spdlog/sinks/msvc_sink.h +include/spdlog/sinks/null_sink.h +include/spdlog/sinks/ostream_sink.h +include/spdlog/sinks/sink.h +include/spdlog/sinks/stdout_sinks.h +include/spdlog/sinks/syslog_sink.h +include/spdlog/spdlog.h +include/spdlog/tweakme.h +libdata/pkgconfig/spdlog.pc +share/cmake/Modules/spdlog/spdlogConfig.cmake +share/cmake/Modules/spdlog/spdlogConfigVersion.cmake +share/cmake/Modules/spdlog/spdlogTargets.cmake diff --git a/devel/tcllibc/Makefile b/devel/tcllibc/Makefile index 1a4e331dcac5..22a720578b0d 100644 --- a/devel/tcllibc/Makefile +++ b/devel/tcllibc/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= c COMMENT= Compiled implementations of some of the modules of Tcllib BUILD_DEPENDS= critcl:devel/critcl -RUN_DEPENDS= ${PREFIX}/lib/tcllib/pkgIndex.tcl:${MASTERDIR} # PREFIX, not LOCALBASE +RUN_DEPENDS= ${LOCALBASE}/lib/tcllib/pkgIndex.tcl:${MASTERDIR} # PREFIX, not LOCALBASE MASTERDIR= ${.CURDIR:H}/tcllib TMPPLIST= ${WRKDIR}/PLIST diff --git a/devel/unittest-cpp/Makefile b/devel/unittest-cpp/Makefile index 4463504238a6..2344f1bd1c08 100644 --- a/devel/unittest-cpp/Makefile +++ b/devel/unittest-cpp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= unittest-cpp -PORTVERSION= 1.6.1 +PORTVERSION= 2.0.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/unittest-cpp/distinfo b/devel/unittest-cpp/distinfo index e2ffa64d2611..1fd5ec813149 100644 --- a/devel/unittest-cpp/distinfo +++ b/devel/unittest-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483277010 -SHA256 (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 1cc9071be01db190f26868fefb6a7af49ee56a339fc3b08d1a1e9eeca5376c45 -SIZE (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 52536 +TIMESTAMP = 1484404298 +SHA256 (unittest-cpp-unittest-cpp-v2.0.0_GH0.tar.gz) = 74852198877dc2fdebdc4e5e9bd074018bf8ee03a13de139bfe41f4585b2f5b9 +SIZE (unittest-cpp-unittest-cpp-v2.0.0_GH0.tar.gz) = 54100 diff --git a/devel/unittest-cpp/files/patch-CMakeLists.txt b/devel/unittest-cpp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2582038e8003 --- /dev/null +++ b/devel/unittest-cpp/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2017-01-14 14:55:56 UTC ++++ CMakeLists.txt +@@ -106,5 +106,10 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/ + set(libdir ${CMAKE_INSTALL_PREFIX}/lib) + set(includedir ${CMAKE_INSTALL_PREFIX}/include/UnitTest++) + configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig) ++else() ++ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++endif() + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ DESTINATION "${pkgconfdir}") diff --git a/devel/unittest-cpp/pkg-plist b/devel/unittest-cpp/pkg-plist index 1c296ffbd6df..df69a8b2475c 100644 --- a/devel/unittest-cpp/pkg-plist +++ b/devel/unittest-cpp/pkg-plist @@ -37,3 +37,4 @@ lib/cmake/UnitTest++/UnitTest++Config.cmake lib/cmake/UnitTest++/UnitTest++Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/UnitTest++/UnitTest++Targets.cmake lib/libUnitTest++.a +libdata/pkgconfig/UnitTest++.pc diff --git a/editors/deforaos-editor/Makefile b/editors/deforaos-editor/Makefile index 97db7062381b..ab99499de7df 100644 --- a/editors/deforaos-editor/Makefile +++ b/editors/deforaos-editor/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= editor -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.4.0 CATEGORIES= editors -MASTER_SITES= http://www.defora.org/os/download/download/4326/ +MASTER_SITES= http://www.defora.org/os/download/download/4398/ PKGNAMEPREFIX= deforaos- DISTNAME= Editor-${PORTVERSION} @@ -14,17 +13,35 @@ COMMENT= DeforaOS desktop text editor LICENSE= GPLv3 -BUILD_DEPENDS= xsltproc:textproc/libxslt \ - docbook-xsl>=0:textproc/docbook-xsl - LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ - libDesktop.so:x11/deforaos-libdesktop - -MAKE_ARGS= PREFIX=${PREFIX} -USES= desktop-file-utils gettext pkgconfig -USE_GNOME= gtk20 - -MANDIRS= ${PREFIX}/share/man/man1 + libDesktop.so:x11/deforaos-libdesktop \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +MAKE_ARGS+= PREFIX=${PREFIX} +MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man + +USES= desktop-file-utils pkgconfig +USE_GNOME= gtk20 cairo gdkpixbuf2 + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc po|data po|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|po src tools|src tools|' \ + ${WRKSRC}/Makefile + +post-patch: + @${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/editor \ diff --git a/editors/deforaos-editor/distinfo b/editors/deforaos-editor/distinfo index 89681a5ead8d..faace885bbc6 100644 --- a/editors/deforaos-editor/distinfo +++ b/editors/deforaos-editor/distinfo @@ -1,2 +1,3 @@ -SHA256 (Editor-0.3.0.tar.gz) = f08f3c7dacc416849eb9ce33b8d14ae0db90e8efc799b99ddb39fabcc7f98dd9 -SIZE (Editor-0.3.0.tar.gz) = 33801 +TIMESTAMP = 1484322291 +SHA256 (Editor-0.4.0.tar.gz) = 6d74ef9880c3dacd9beb25c622db23f1814d7f629ddd0ca15abac2db49e0536c +SIZE (Editor-0.4.0.tar.gz) = 25363 diff --git a/editors/deforaos-editor/files/patch-doc_Makefile b/editors/deforaos-editor/files/patch-doc_Makefile new file mode 100644 index 000000000000..bce0ae3c984d --- /dev/null +++ b/editors/deforaos-editor/files/patch-doc_Makefile @@ -0,0 +1,32 @@ +--- doc/Makefile.orig 2017-01-13 15:29:31 UTC ++++ doc/Makefile +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)editor.1 $(OBJDIR)editor.html $(OBJDIR)filter.1 $(OBJDIR)filter.html ++TARGETS = $(OBJDIR)editor.1 $(OBJDIR)filter.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -25,23 +25,17 @@ $(OBJDIR)filter.html: filter.css.xml fil + clean: + $(RM) -- $(editor.1_OBJS) $(editor.html_OBJS) $(filter.1_OBJS) $(filter.html_OBJS) + ./docbook.sh -c -P "$(PREFIX)" -- "editor.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "editor.html" + ./docbook.sh -c -P "$(PREFIX)" -- "filter.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "filter.html" + + distclean: clean + $(RM) -- $(TARGETS) + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.html" + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.html" + + .PHONY: all clean distclean install uninstall diff --git a/editors/deforaos-editor/pkg-plist b/editors/deforaos-editor/pkg-plist index e9f880257588..0a435ceaa85a 100644 --- a/editors/deforaos-editor/pkg-plist +++ b/editors/deforaos-editor/pkg-plist @@ -1,11 +1,9 @@ bin/editor bin/filter share/applications/deforaos-editor.desktop -share/doc/html/Editor/editor.html -share/doc/html/Editor/filter.html -share/locale/de/LC_MESSAGES/Editor.mo -share/locale/es/LC_MESSAGES/Editor.mo -share/locale/fr/LC_MESSAGES/Editor.mo -share/locale/it/LC_MESSAGES/Editor.mo -share/man/man1/editor.1.gz -share/man/man1/filter.1.gz +%%PORTDOCS%%man/man1/editor.1.gz +%%PORTDOCS%%man/man1/filter.1.gz +%%NLS%%share/locale/de/LC_MESSAGES/Editor.mo +%%NLS%%share/locale/es/LC_MESSAGES/Editor.mo +%%NLS%%share/locale/fr/LC_MESSAGES/Editor.mo +%%NLS%%share/locale/it/LC_MESSAGES/Editor.mo diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile index 9511deffeb63..77bd8f9f4fe9 100644 --- a/editors/libreoffice-i18n/Makefile +++ b/editors/libreoffice-i18n/Makefile @@ -38,7 +38,7 @@ OPTIONS_MULTI_LANG= ${LO_LANG_ALL:tu} OPTIONS_DEFAULT= ${LO_LANG_ALL:tu} .for lang in ${LO_LANG_ALL} -${lang}_DETECT?= ${PREFIX}/lib/${PORTNAME}/readmes/README_${lang:S/_/-/} +${lang}_DETECT?= ${LOCALBASE}/lib/${PORTNAME}/readmes/README_${lang:S/_/-/} ${lang}_NAME?= ${lang} ${lang:tu}_PORT?= editors/${PORTNAME}-${lang} ${lang:tu}_DESC= ${${lang}_NAME} localization data diff --git a/editors/xcoral/files/patch-BR_Parser.c b/editors/xcoral/files/patch-BR_Parser.c new file mode 100644 index 000000000000..5ebeb6122a78 --- /dev/null +++ b/editors/xcoral/files/patch-BR_Parser.c @@ -0,0 +1,35 @@ +--- BR_Parser.c.orig 2002-12-18 07:22:09 UTC ++++ BR_Parser.c +@@ -116,7 +116,7 @@ + + #define YYDEBUG 1 + +-#define BR_YYERROR YYFAIL ++#define BR_YYERROR YYERROR + + + /*-----------------------------------------------------------------------*/ +@@ -960,12 +960,7 @@ static const short yycheck[] = { 1, + #define YYEOF 0 + #define YYACCEPT goto yyacceptlab + #define YYABORT goto yyabortlab +-#define YYERROR goto yyerrlab1 +-/* Like YYERROR except do call yyerror. +- This remains here temporarily to ease the +- transition to the new meaning of YYERROR, for GCC. +- Once GCC version 2 has supplanted version 1, this can go. */ +-#define YYFAIL goto yyerrlab ++#define YYERROR goto yyerrlab + #define YYRECOVERING() (!!yyerrstatus) + #define YYBACKUP(token, value) \ + do \ +@@ -2465,9 +2460,6 @@ yyerrlab: /* here on detecting error * + yyerror("parse error"); + } + +- goto yyerrlab1; +-yyerrlab1: /* here on error raised explicitly by an action */ +- + if (yyerrstatus == 3) + { + /* if just tried and failed to reuse lookahead token after an error, discard it. */ diff --git a/editors/xcoral/files/patch-BR_Parser.y b/editors/xcoral/files/patch-BR_Parser.y new file mode 100644 index 000000000000..7dc0d5642935 --- /dev/null +++ b/editors/xcoral/files/patch-BR_Parser.y @@ -0,0 +1,11 @@ +--- BR_Parser.y.orig 2002-12-18 07:21:52 UTC ++++ BR_Parser.y +@@ -79,7 +79,7 @@ + + #define YYDEBUG 1 + +-#define BR_YYERROR YYFAIL ++#define BR_YYERROR YYERROR + + + /*-----------------------------------------------------------------------*/ diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 0a2743faa20e..42785a1b19b3 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- diff --git a/emulators/linux_base-c6/pkg-plist.i386 b/emulators/linux_base-c6/pkg-plist.i386 index 9ad75b864a43..67e6c99dfb3e 100644 --- a/emulators/linux_base-c6/pkg-plist.i386 +++ b/emulators/linux_base-c6/pkg-plist.i386 @@ -2345,7 +2345,7 @@ usr/share/man/man8/wipefs.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid @@ -2363,10 +2363,8 @@ var/mail @dir lib/tls @dir mnt @dir opt -@dir(,,555) proc @dir selinux @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/X11 @@ -2904,4 +2902,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig diff --git a/emulators/linux_base-c6/pkg-plist.x86_64 b/emulators/linux_base-c6/pkg-plist.x86_64 index 4a282f348a54..3a431df55dd3 100644 --- a/emulators/linux_base-c6/pkg-plist.x86_64 +++ b/emulators/linux_base-c6/pkg-plist.x86_64 @@ -2772,7 +2772,7 @@ usr/share/man/man8/x86_64.8.gz usr/tmp @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/blkid @@ -2792,10 +2792,8 @@ var/mail @dir lib64/tls @dir mnt @dir opt -@dir(,,555) proc @dir selinux @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/lib/games @@ -3343,4 +3341,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/sbin/ldconfig diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile index c718bbe36e29..3572af5ecfdf 100644 --- a/emulators/linux_base-c7/Makefile +++ b/emulators/linux_base-c7/Makefile @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*.src.rpm*:Nfilesystem-*} diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386 index c55282341a76..b159f2a37c3c 100644 --- a/emulators/linux_base-c7/pkg-plist.i386 +++ b/emulators/linux_base-c7/pkg-plist.i386 @@ -2572,7 +2572,7 @@ usr/tmp @rmtry var/cache/ldconfig/aux-cache var/db/Makefile var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/bash_completion.d @@ -2589,9 +2589,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir(,,555) proc @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include @@ -3135,4 +3133,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig diff --git a/emulators/linux_base-c7/pkg-plist.x86_64 b/emulators/linux_base-c7/pkg-plist.x86_64 index 049761611dec..59681f1f72f9 100644 --- a/emulators/linux_base-c7/pkg-plist.x86_64 +++ b/emulators/linux_base-c7/pkg-plist.x86_64 @@ -3022,7 +3022,7 @@ usr/tmp var/db/Makefile @rmtry var/cache/ldconfig/aux-cache var/mail -@dir dev/shm +@dir dev @dir etc/X11/applnk @dir etc/X11/fontpath.d @dir etc/bash_completion.d @@ -3039,9 +3039,7 @@ var/mail @dir etc/xinetd.d @dir mnt @dir opt -@dir(,,555) proc @dir srv -@dir(,,555) sys @dir usr/etc @dir usr/games @dir usr/include @@ -3591,4 +3589,12 @@ var/mail @dir var/spool/mail @dir var/yp @dir %%LINUXBASE%% +@comment These directories may have filesystems mounted and then it may not be +@comment possible to change their mode and timestamp like @dir tries to do. +@postexec mkdir -p %D/dev/shm +@postunexec rmdir %D/dev/shm 2>/dev/null || true +@postexec mkdir -p %D/proc +@postunexec rmdir %D/proc 2>/dev/null || true +@postexec mkdir -p %D/sys +@postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 69f4fe399344..79dc7684c0de 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= vice -PORTVERSION= 2.4 -PORTREVISION= 10 +PORTVERSION= 3.0 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ -PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II @@ -19,28 +18,31 @@ BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \ mkfontscale:x11-fonts/mkfontscale LIB_DEPENDS= libpng.so:graphics/png \ libgif.so:graphics/giflib \ + libportaudio.so:audio/portaudio \ libmp3lame.so:audio/lame \ - libavcodec.so:multimedia/ffmpeg + libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis \ + libavcodec.so:multimedia/ffmpeg \ + libFLAC.so:audio/flac \ + libpci.so:devel/libpci \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 RESTRICTED= ROMs are copyrighted by Commodore Business Machines -USES= iconv:patch gmake pkgconfig makeinfo -USE_XORG= xpm ice sm xext xv xt x11 xmu +USES= dos2unix pkgconfig makeinfo gmake iconv jpeg +USE_XORG= xpm ice sm xext xv xt x11 xmu xxf86vm USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes +DOS2UNIX_FILES= doc/vice.texi src/arch/unix/io-access.c GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 \ + --enable-external-ffmpeg \ + --with-uithreads \ --disable-dependency-tracking -#CONFIGURE_ARGS+= --enable-ethernet -# libpcap or libnet -#CONFIGURE_ARGS+= --enable-sdlui -#CONFIGURE_ARGS+= --enable-gp2x -#CONFIGURE_ARGS+= --enable-wiz -#CONFIGURE_ARGS+= --enable-parsid -#CONFIGURE_ARGS+= --enable-memmap LMLINKS= vice.1 x64.1 \ vice.1 x128.1 \ @@ -49,39 +51,23 @@ LMLINKS= vice.1 x64.1 \ vice.1 xplus4.1 \ vice.1 xcbm2.1 -FIX_XAW= src/arch/unix/x11/xaw/about.c \ - src/arch/unix/x11/xaw/uicartridge.c \ - src/arch/unix/x11/xaw/uiedisk.c \ - src/arch/unix/x11/xaw/uimenu.c \ - src/arch/unix/x11/xaw/uipalcontrol.c \ - src/arch/unix/x11/xaw/uiscreenshot.c \ - src/arch/unix/x11/xaw/uisnapshot.c \ - src/arch/unix/x11/xaw/uivsidcontrol.c \ - src/arch/unix/x11/xaw/x11ui.c \ - src/arch/unix/x11/xaw/widgets/FileSel.c \ - src/arch/unix/x11/xaw/widgets/FileSelP.h \ - src/arch/unix/x11/xaw/widgets/MultiList.h \ - src/arch/unix/x11/xaw/widgets/MultiListP.h \ - src/arch/unix/x11/xaw/widgets/ScrList.c \ - OPTIONS_DEFINE= SDL ASOUND PULSE DOCS -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GNOMEUI XAW3D XAW -OPTIONS_DEFAULT?= GNOMEUI SDL +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= GNOMEUI3 GNOMEUI2 XAW +OPTIONS_DEFAULT?= GNOMEUI3 SDL ASOUND NO_OPTIONS_SORT=yes -GNOMEUI_DESC= use gnomeui toolkit -XAW3D_DESC= use Xaw3d library +OPTIONS_SUB= yes +GNOMEUI3_DESC= use gnome3 user interface +GNOMEUI2_DESC= use gnome2 user interface XAW_DESC= use plain Xaw library -SDL_DESC= build with SDL sound system support +SDL_DESC= build with SDL2 sound system support ASOUND_DESC= build with asound support PULSE_DESC= build with pulseaudio support -GNOMEUI_CONFIGURE_ENABLE= gnomeui -XAW3D_CONFIGURE_WITH= xaw3d -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d -SDL_USE= SDL=sdl +GNOMEUI2_CONFIGURE_ENABLE= gnomeui +GNOMEUI3_CONFIGURE_ENABLE= gnomeui3 +SDL_USE= SDL=sdl2 SDL_CONFIGURE_ON= --with-sdlsound -SDL_CPPFLAGS= -I${LOCALBASE}/include/SDL ASOUND_CONFIGURE_OFF= --without-alsa ASOUND_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSE_CONFIGURE_OFF= --without-pulse @@ -90,7 +76,7 @@ PULSE_LIB_DEPENDS= libpulse.so:audio/pulseaudio .include .if !defined(BUILDING_INDEX) -__pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/ / /}' | ${AWK} \ +__pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/ / /}' | ${AWK} \ '{ if (NF % 2 != 0) { print "broken"; exit; } \ for (i=1; i<=NF; i++) { \ if ( i % 2 == 0) { print " " $$i " ;"; } \ @@ -98,36 +84,27 @@ __pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/ / /}' | ${AWK} \ } }' .endif -.if ${PORT_OPTIONS:MXAW3D} -GNOME_SUFFIX= -xaw3d -CONFLICTS?= vice-gnome-1.* vice-1.* -USES+= perl5 +.if ${PORT_OPTIONS:MGNOMEUI2} +USE_GNOME+= gtk20 vte cairo gdkpixbuf2 pangox-compat +USE_GL+= glu gl +LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext .endif -.if ${PORT_OPTIONS:MGNOMEUI} -GNOME_SUFFIX= -gnome -USE_GNOME= gtk20 vte -CONFLICTS?= vice-1.* vice-xaw3d-1.* +.if ${PORT_OPTIONS:MGNOMEUI3} +.if ${PORT_OPTIONS:MNLS} +USES+= gettext-runtime .endif - -.if ${PORT_OPTIONS:MXAW} -CONFLICTS?= vice-xaw3d-1.* vice-gnome-1.* -USE_XORG+= xaw +USE_GNOME+= gtk30 vte3 cairo gdkpixbuf2 +USE_GL+= glu gl .endif -.if exists(${LOCALBASE}/bin/fc-cache) -PLIST_SUB+= FCCACHE="" -PLIST_SUB+= NOFCCACHE="@comment " -.else -PLIST_SUB+= FCCACHE="@comment " -PLIST_SUB+= NOFCCACHE="" +.if ${PORT_OPTIONS:MXAW} +USE_XORG+= xaw .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+= --enable-nls --localedir=${LOCALBASE}/share/locale -# causes vice to crash: -#LDFLAGS+= -lgettextlib PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls @@ -139,54 +116,39 @@ INFO+= vice .endif .if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl +USE_SDL= sdl2 .endif -post-extract: - @${RM} ${WRKSRC}/doc/vice.info* - post-patch: - ${CHMOD} +x "${WRKSRC}/doc/html/texi2html" - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - ${WRKSRC}/man/vice.1 - ${REINPLACE_CMD} -e 's|^localedir.*|localedir = $$(DESTDIR)${LOCALBASE}/share/locale|' \ - ${WRKSRC}/po/Makefile.in.in - ${REINPLACE_CMD} -e 's|lungif|lgif|g' -e 's|== "x|= "x|' \ - -e 's|"DATADIRNAME"/locale|share/locale|' \ - ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \ - -e 's|PIX_FMT_|AV_PIX_FMT_|' \ - ${WRKSRC}/src/gfxoutputdrv/ffmpegdrv.c ${REINPLACE_CMD} \ -e 's|enum PixelFormat|enum AVPixelFormat|g' \ ${WRKSRC}/src/gfxoutputdrv/ffmpeglib.h -.for i in da.po de.po fr.po hu.po it.po nl.po pl.po sv.po tr.po +.for i in da.po de.po es.po fr.po hu.po it.po nl.po pl.po sv.po tr.po ${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin" ${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}" .endfor + +pre-configure: + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ + ${WRKSRC}/man/vice.1 + ${REINPLACE_CMD} -e 's|^localedir.*|localedir = $$(DESTDIR)${LOCALBASE}/share/locale|' \ + ${WRKSRC}/po/Makefile.in.in .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in .endif -.if ${PORT_OPTIONS:MXAW3D} -.for i in ${FIX_XAW} - ${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i} -.endfor -.endif pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vice/fonts -.if exists(${LOCALBASE}/bin/fc-cache) ${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \ ${STAGEDIR}${PREFIX}/lib/vice/fonts/ -.endif -.if ${PORT_OPTIONS:MDOCS} + +pre-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} -.endif post-install: ( cd ${STAGEDIR}${PREFIX}/man/man1 && ${__pmlinks1} ) -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${LN} -sf vice_toc.html ${STAGEDIR}${DOCSDIR}/index.html -.endif .include diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index b080b96bbcf6..e0422fa857ef 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,2 +1,3 @@ -SHA256 (vice-2.4.tar.gz) = ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 -SIZE (vice-2.4.tar.gz) = 13656511 +TIMESTAMP = 1484124124 +SHA256 (vice-3.0.tar.gz) = bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b +SIZE (vice-3.0.tar.gz) = 26513197 diff --git a/emulators/vice/files/patch-c1541.1 b/emulators/vice/files/patch-c1541.1 deleted file mode 100644 index eb5758f67d6a..000000000000 --- a/emulators/vice/files/patch-c1541.1 +++ /dev/null @@ -1,12 +0,0 @@ ---- ./man/c1541.1.orig Sat May 29 11:34:58 1999 -+++ ./man/c1541.1 Sat May 29 11:35:16 1999 -@@ -77,7 +77,8 @@ - .B \- - as a file name, it stands for \fIstdin\fR or \fIstdout\fR. - .SH SEE ALSO --.BR VICE (1), -+.BR vice (1), -+.BR c1541 (1), - .BR petcat (1) - .SH AUTHORS - Teemu Rantanen diff --git a/emulators/vice/files/patch-configure b/emulators/vice/files/patch-configure new file mode 100644 index 000000000000..10af1cf1137b --- /dev/null +++ b/emulators/vice/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig 2016-12-15 03:47:11 UTC ++++ configure +@@ -15857,6 +15857,7 @@ if test "x$ac_cv_lib_SDL2_SDL_OpenAudio" + SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o"; + use_sdl_prefix=no; + use_sdl2_prefix=yes; ++ SOUND_LIBS="$SOUND_LIBS -lSDL2"; + USE_SDL_AUDIO_SUPPORT="yes"; + + $as_echo "#define USE_SDL2_PREFIX /**/" >>confdefs.h diff --git a/emulators/vice/files/patch-doc_html_texi2html b/emulators/vice/files/patch-doc_html_texi2html deleted file mode 100644 index 3400bb8ea306..000000000000 --- a/emulators/vice/files/patch-doc_html_texi2html +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/html/texi2html.orig 2008-03-30 15:04:15 UTC -+++ doc/html/texi2html -@@ -1557,7 +1557,7 @@ sub update_sec_num { - $level--; # here we start at 0 - if ($name =~ /^appendix/) { - # appendix style -- if (defined(@appendix_sec_num)) { -+ if (@appendix_sec_num) { - &incr_sec_num($level, @appendix_sec_num); - } else { - @appendix_sec_num = ('A', 0, 0, 0); -@@ -1565,7 +1565,7 @@ sub update_sec_num { - return(join('.', @appendix_sec_num[0..$level])); - } else { - # normal style -- if (defined(@normal_sec_num)) { -+ if (@normal_sec_num) { - &incr_sec_num($level, @normal_sec_num); - } else { - @normal_sec_num = (1, 0, 0, 0); diff --git a/emulators/vice/files/patch-doc_vice.texi b/emulators/vice/files/patch-doc_vice.texi new file mode 100644 index 000000000000..b744f79222c9 --- /dev/null +++ b/emulators/vice/files/patch-doc_vice.texi @@ -0,0 +1,48 @@ +--- doc/vice.texi.orig 2016-12-15 21:30:13 UTC ++++ doc/vice.texi +@@ -1555,8 +1555,8 @@ System files can still be installed in a + specify a complete path instead of just a file name. For example, if + you specify @file{./kernal} as the kernal image name, the kernal image + will be loaded from the current directory. This can be done by using +-command-line options or by modifying resource values (@pxref{Resource +-files}). ++command-line options or by modifying ++resource values (@pxref{Resource files}). + + @menu + * ROM files:: Files containing dumps of the original ROMs. +@@ -11013,8 +11013,9 @@ character cell, the 8 colour bits are us + @subsection Changing screen colors + + It is also possible to choose what color set is used for the emulation +-window. This is done by specifying a palette file name (@pxref{Palette +-files}) in the @code{PaletteName} resource. The menu provides the ++window. This is done by specifying a palette file ++name (@pxref{Palette files}) in the @code{PaletteName} ++resource. The menu provides the + following values: + + @itemize @bullet +@@ -11442,8 +11443,9 @@ xcbm5x0: (510) + @subsection Changing screen colors + + It is also possible to choose what color set is used for the emulation +-window. This is done by specifying a palette file name (@pxref{Palette +-files}) in the @code{PaletteName} resource. The menu provides the ++window. This is done by specifying a palette file name ++(@pxref{Palette files}) in the @code{PaletteName} ++resource. The menu provides the + following values: + + @itemize @bullet +@@ -27895,8 +27897,8 @@ the VICE FAQ (it is available on the Int + VICE home page: + @uref{http://vice-emu.sourceforge.net}); + @item +-the @code{comp.emulators.cbm} and @code{comp.sys.cbm} FAQs (@pxref{FAQs +-you should read}). ++the @code{comp.emulators.cbm} and @code{comp.sys.cbm} ++FAQs (@pxref{FAQs you should read}). + @end itemize + + @item diff --git a/emulators/vice/files/patch-dynlib.c b/emulators/vice/files/patch-dynlib.c deleted file mode 100644 index d315ed7ddcfe..000000000000 --- a/emulators/vice/files/patch-dynlib.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/arch/unix/dynlib.c.orig 2009-10-21 18:46:46.000000000 +0200 -+++ src/arch/unix/dynlib.c 2009-12-25 19:00:10.000000000 +0100 -@@ -51,6 +51,8 @@ - - #else - -+#include -+ - void *vice_dynlib_open(const char *name) - { - return NULL; diff --git a/emulators/vice/files/patch-ffmpegdrv.c b/emulators/vice/files/patch-ffmpegdrv.c deleted file mode 100644 index 675986934f95..000000000000 --- a/emulators/vice/files/patch-ffmpegdrv.c +++ /dev/null @@ -1,52 +0,0 @@ ---- src/gfxoutputdrv/ffmpegdrv.c.orig 2012-02-13 20:31:44.000000000 +0100 -+++ src/gfxoutputdrv/ffmpegdrv.c 2012-11-25 13:10:46.712199998 +0100 -@@ -343,7 +343,7 @@ static int ffmpegmovie_init_audio(int sp - c = st->codec; - c->codec_id = ffmpegdrv_fmt->audio_codec; - c->codec_type = AVMEDIA_TYPE_AUDIO; -- c->sample_fmt = SAMPLE_FMT_S16; -+ c->sample_fmt = AV_SAMPLE_FMT_S16; - - /* put sample parameters */ - c->bit_rate = audio_bitrate; -@@ -613,11 +613,6 @@ static int ffmpegdrv_init_file(void) - if (!video_init_done || !audio_init_done) - return 0; - -- if ((*ffmpeglib.p_av_set_parameters)(ffmpegdrv_oc, NULL) < 0) { -- log_debug("ffmpegdrv: Invalid output format parameters"); -- return -1; -- } -- - (*ffmpeglib.p_dump_format)(ffmpegdrv_oc, 0, ffmpegdrv_oc->filename, 1); - - if (video_st && (ffmpegdrv_open_video(ffmpegdrv_oc, video_st) < 0)) { -@@ -632,8 +627,8 @@ static int ffmpegdrv_init_file(void) - } - - if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) { -- if ((*ffmpeglib.p_url_fopen)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename, -- URL_WRONLY) < 0) -+ if ((*ffmpeglib.p_avio_open)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename, -+ AVIO_FLAG_WRITE) < 0) - { - ui_error(translate_text(IDGS_FFMPEG_CANNOT_OPEN_S), ffmpegdrv_oc->filename); - screenshot_stop_recording(); -@@ -642,7 +637,7 @@ static int ffmpegdrv_init_file(void) - - } - -- (*ffmpeglib.p_av_write_header)(ffmpegdrv_oc); -+ (*ffmpeglib.p_avformat_write_header)(ffmpegdrv_oc, NULL); - - log_debug("ffmpegdrv: Initialized file successfully"); - -@@ -724,7 +719,7 @@ static int ffmpegdrv_close(screenshot_t - (*ffmpeglib.p_av_write_trailer)(ffmpegdrv_oc); - if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) { - /* close the output file */ -- (*ffmpeglib.p_url_fclose)(ffmpegdrv_oc->pb); -+ (*ffmpeglib.p_avio_close)(ffmpegdrv_oc->pb); - } - } - diff --git a/emulators/vice/files/patch-ffmpeglib.c b/emulators/vice/files/patch-ffmpeglib.c deleted file mode 100644 index 28183e79ec01..000000000000 --- a/emulators/vice/files/patch-ffmpeglib.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/gfxoutputdrv/ffmpeglib.c.orig 2011-09-18 15:09:45.000000000 +0200 -+++ src/gfxoutputdrv/ffmpeglib.c 2012-11-25 13:11:58.342198505 +0100 -@@ -208,12 +208,11 @@ static int load_avformat(ffmpeglib_t *li - GET_SYMBOL_AND_TEST_AVFORMAT(av_init_packet); - GET_SYMBOL_AND_TEST_AVFORMAT(av_register_all); - GET_SYMBOL_AND_TEST_AVFORMAT(av_new_stream); -- GET_SYMBOL_AND_TEST_AVFORMAT(av_set_parameters); -- GET_SYMBOL_AND_TEST_AVFORMAT(av_write_header); -+ GET_SYMBOL_AND_TEST_AVFORMAT(avformat_write_header); - GET_SYMBOL_AND_TEST_AVFORMAT(av_write_frame); - GET_SYMBOL_AND_TEST_AVFORMAT(av_write_trailer); -- GET_SYMBOL_AND_TEST_AVFORMAT(url_fopen); -- GET_SYMBOL_AND_TEST_AVFORMAT(url_fclose); -+ GET_SYMBOL_AND_TEST_AVFORMAT(avio_open); -+ GET_SYMBOL_AND_TEST_AVFORMAT(avio_close); - GET_SYMBOL_AND_TEST_AVFORMAT(dump_format); - GET_SYMBOL_AND_TEST_AVFORMAT(av_guess_format); - #ifndef HAVE_FFMPEG_SWSCALE -@@ -240,12 +239,11 @@ static void free_avformat(ffmpeglib_t *l - lib->p_av_init_packet = NULL; - lib->p_av_register_all = NULL; - lib->p_av_new_stream = NULL; -- lib->p_av_set_parameters = NULL; -- lib->p_av_write_header = NULL; -+ lib->p_avformat_write_header = NULL; - lib->p_av_write_frame = NULL; - lib->p_av_write_trailer = NULL; -- lib->p_url_fopen = NULL; -- lib->p_url_fclose = NULL; -+ lib->p_avio_open = NULL; -+ lib->p_avio_close = NULL; - lib->p_dump_format = NULL; - lib->p_av_guess_format = NULL; - #ifndef HAVE_FFMPEG_SWSCALE diff --git a/emulators/vice/files/patch-ffmpeglib.h b/emulators/vice/files/patch-ffmpeglib.h deleted file mode 100644 index b3f3f8a079e2..000000000000 --- a/emulators/vice/files/patch-ffmpeglib.h +++ /dev/null @@ -1,43 +0,0 @@ ---- src/gfxoutputdrv/ffmpeglib.h.orig 2011-10-24 21:06:48.000000000 +0200 -+++ src/gfxoutputdrv/ffmpeglib.h 2012-11-25 13:09:18.518868503 +0100 -@@ -70,7 +70,7 @@ - /* avcodec fucntions */ - typedef int (*avcodec_open_t) (AVCodecContext*, AVCodec*); - typedef int (*avcodec_close_t) (AVCodecContext*); --typedef AVCodec* (*avcodec_find_encoder_t) (enum CodecID); -+typedef AVCodec* (*avcodec_find_encoder_t) (enum AVCodecID); - typedef int (*avcodec_encode_audio_t) (AVCodecContext*, uint8_t*, int, const short*); - typedef int (*avcodec_encode_video_t) (AVCodecContext*, uint8_t*, int, const AVFrame*); - typedef int (*avpicture_fill_t) (AVPicture*, uint8_t*, int, int, int); -@@ -80,12 +80,11 @@ typedef int (*avpicture_get_size_t) (int - typedef void (*av_init_packet_t) (AVPacket *pkt); - typedef void (*av_register_all_t) (void); - typedef AVStream* (*av_new_stream_t) (AVFormatContext*, int); --typedef int (*av_set_parameters_t) (AVFormatContext*, AVFormatParameters*); --typedef int (*av_write_header_t) (AVFormatContext*); -+typedef int (*avformat_write_header_t) (AVFormatContext*, AVDictionary **); - typedef int (*av_write_frame_t) (AVFormatContext*, AVPacket*); - typedef int (*av_write_trailer_t) (AVFormatContext*); --typedef int (*url_fopen_t) (ByteIOContext**, const char*, int); --typedef int (*url_fclose_t) (ByteIOContext*); -+typedef int (*avio_open_t) (AVIOContext**, const char*, int); -+typedef int (*avio_close_t) (AVIOContext*); - typedef void (*dump_format_t) (AVFormatContext *, int, const char*, int); - typedef AVOutputFormat* (*av_guess_format_t) (const char*, const char*, const char*); - typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int); -@@ -118,12 +117,11 @@ struct ffmpeglib_s { - av_init_packet_t p_av_init_packet; - av_register_all_t p_av_register_all; - av_new_stream_t p_av_new_stream; -- av_set_parameters_t p_av_set_parameters; -- av_write_header_t p_av_write_header; -+ avformat_write_header_t p_avformat_write_header; - av_write_frame_t p_av_write_frame; - av_write_trailer_t p_av_write_trailer; -- url_fopen_t p_url_fopen; -- url_fclose_t p_url_fclose; -+ avio_open_t p_avio_open; -+ avio_close_t p_avio_close; - dump_format_t p_dump_format; - av_guess_format_t p_av_guess_format; - #ifndef HAVE_FFMPEG_SWSCALE diff --git a/emulators/vice/files/patch-vice.1 b/emulators/vice/files/patch-man_vice.1 similarity index 61% rename from emulators/vice/files/patch-vice.1 rename to emulators/vice/files/patch-man_vice.1 index d107826f8370..e2669d96fc43 100644 --- a/emulators/vice/files/patch-vice.1 +++ b/emulators/vice/files/patch-man_vice.1 @@ -1,10 +1,10 @@ ---- man/vice.1.orig Mon Nov 22 06:25:55 1999 -+++ man/vice.1 Fri Nov 23 02:01:16 2001 -@@ -31,7 +31,7 @@ +--- man/vice.1.orig 2016-12-09 03:46:53 UTC ++++ man/vice.1 +@@ -55,7 +55,7 @@ a cartridge file (bin<--->crt) converter .PP The whole documentation for these programs is available in HTML format; the main file should be installed on your system as --/usr/local/lib/VICE/doc/vice_toc.html. +-/usr/local/lib/vice/doc/vice_toc.html. +%%PREFIX%%/share/doc/vice/vice_toc.html. .P For up to date news about VICE, have a look at the official home page diff --git a/emulators/vice/files/patch-sound.c b/emulators/vice/files/patch-sound.c deleted file mode 100644 index b442cc7ee74a..000000000000 --- a/emulators/vice/files/patch-sound.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sound.c.orig Wed Sep 14 22:27:31 2005 -+++ src/sound.c Sat Dec 3 18:54:20 2005 -@@ -1233,7 +1233,7 @@ - - /* don't use uss for FreeBSD or BSDI */ - --#if !defined(__FreeBSD__) && !defined(__bsdi__) -+#if !defined(__bsdi__) - sound_init_uss_device(); - #endif - #endif diff --git a/emulators/vice/files/patch-sounduss.c b/emulators/vice/files/patch-sounduss.c deleted file mode 100644 index 52103b07cc1a..000000000000 --- a/emulators/vice/files/patch-sounduss.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sounddrv/sounduss.c.orig Sun May 29 19:05:49 2005 -+++ src/sounddrv/sounduss.c Sat Dec 3 19:09:24 2005 -@@ -30,7 +30,7 @@ - sound driver. For BSDI this uss sound driver should - not be used either. */ - --#if !defined(__FreeBSD__) && !defined(__bsdi__) -+#if !defined(__bsdi__) - - #include "vice.h" - diff --git a/emulators/vice/files/patch-src_arch_unix_io-access.c b/emulators/vice/files/patch-src_arch_unix_io-access.c new file mode 100644 index 000000000000..d82199a186b4 --- /dev/null +++ b/emulators/vice/files/patch-src_arch_unix_io-access.c @@ -0,0 +1,20 @@ +--- src/arch/unix/io-access.c.orig 2016-11-17 19:06:26 UTC ++++ src/arch/unix/io-access.c +@@ -77,7 +77,7 @@ + #include "log.h" + #include "types.h" + +-#if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) ++#if defined(__linux) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))) + + #define IO_PORT_ACCESS + +@@ -162,7 +162,7 @@ static void device_io_outb(WORD addr, BY + } + #endif + +-#ifdef __FreeBSD__ ++#if 0 + static int device_io_open(void) + { + io_fd = open("/dev/io", O_RDWR); diff --git a/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c b/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c deleted file mode 100644 index c7552a809fe3..000000000000 --- a/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c +++ /dev/null @@ -1,50 +0,0 @@ ---- src/gfxoutputdrv/gifdrv.c.orig 2012-07-25 23:46:05 UTC -+++ src/gfxoutputdrv/gifdrv.c -@@ -114,7 +114,11 @@ static int gifdrv_open(screenshot_t *scr - if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR || - EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR) - { -+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 -+ EGifCloseFile(sdata->fd, NULL); -+#else - EGifCloseFile(sdata->fd); -+#endif - VICE_FreeMapObject(gif_colors); - lib_free(sdata->data); - lib_free(sdata->ext_filename); -@@ -145,7 +149,11 @@ static int gifdrv_close(screenshot_t *sc - - sdata = screenshot->gfxoutputdrv_data; - -+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 -+ EGifCloseFile(sdata->fd, NULL); -+#else - EGifCloseFile(sdata->fd); -+#endif - VICE_FreeMapObject(gif_colors); - - /* for some reason giflib will create a file with unexpected -@@ -184,7 +192,11 @@ static char *gifdrv_memmap_ext_filename; - - static int gifdrv_close_memmap(void) - { -+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 -+ EGifCloseFile(gifdrv_memmap_fd, NULL); -+#else - EGifCloseFile(gifdrv_memmap_fd); -+#endif - VICE_FreeMapObject(gif_colors); - lib_free(gifdrv_memmap_ext_filename); - -@@ -231,7 +243,11 @@ static int gifdrv_open_memmap(const char - if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR || - EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR) - { -+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 -+ EGifCloseFile(gifdrv_memmap_fd, NULL); -+#else - EGifCloseFile(gifdrv_memmap_fd); -+#endif - VICE_FreeMapObject(gif_colors); - lib_free(gifdrv_memmap_ext_filename); - return -1; diff --git a/emulators/vice/files/patch-vice.texi b/emulators/vice/files/patch-vice.texi deleted file mode 100644 index f39583eb3dc6..000000000000 --- a/emulators/vice/files/patch-vice.texi +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/vice.texi.orig 2012-11-02 21:50:13 UTC -+++ doc/vice.texi -@@ -8243,7 +8243,7 @@ Use an internal calculated palette - @item -Crtcextpal - Use an external palette (file) - @cindex -Crtcpalette --@itemx -Crtcpalette NAME -+@item -Crtcpalette NAME - Specify @code{NAME} as the palette file (@code{CrtcPaletteFile}). - @cindex -Crtcfulldevice - @item -Crtcfulldevice diff --git a/emulators/vice/files/patch-x11video.c b/emulators/vice/files/patch-x11video.c deleted file mode 100644 index 6cf649a97996..000000000000 --- a/emulators/vice/files/patch-x11video.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/arch/unix/x11/xaw/x11video.c.orig 2009-10-21 18:46:45.000000000 +0200 -+++ src/arch/unix/x11/xaw/x11video.c 2010-08-03 06:00:50.000000000 +0200 -@@ -342,6 +342,9 @@ - int mitshm_failed = 0; /* will be set to true if XShmAttach() failed */ - int shmmajor; /* major number of MITSHM error codes */ - -+#include -+#include -+ - /* Catch XShmAttach()-failure. */ - int shmhandler(Display *display, XErrorEvent *err) - { diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist index 7d7f91d39e04..48835d9ca8ea 100644 --- a/emulators/vice/pkg-plist +++ b/emulators/vice/pkg-plist @@ -10,6 +10,7 @@ bin/xcbm2 bin/xcbm5x0 bin/xpet bin/xplus4 +bin/xscpu64 bin/xvic %%PORTDOCS%%info/vice.txt %%NLS%%share/locale/da/LC_MESSAGES/vice.mo @@ -30,16 +31,19 @@ lib/vice/C128/basiclo lib/vice/C128/c64hq.vpl lib/vice/C128/c64s.vpl lib/vice/C128/ccs64.vpl +lib/vice/C128/chargch lib/vice/C128/chargde lib/vice/C128/chargen lib/vice/C128/chargfr lib/vice/C128/chargse -lib/vice/C128/default.vpl +lib/vice/C128/community-colors.vpl +lib/vice/C128/deekay.vpl lib/vice/C128/default.vrs lib/vice/C128/frodo.vpl lib/vice/C128/godot.vpl lib/vice/C128/kernal lib/vice/C128/kernal64 +lib/vice/C128/kernalch lib/vice/C128/kernalde lib/vice/C128/kernalfi lib/vice/C128/kernalfr @@ -47,6 +51,12 @@ lib/vice/C128/kernalit lib/vice/C128/kernalno lib/vice/C128/kernalse lib/vice/C128/pc64.vpl +lib/vice/C128/pepto-ntsc-sony.vpl +lib/vice/C128/pepto-ntsc.vpl +lib/vice/C128/pepto-pal.vpl +lib/vice/C128/pepto-palold.vpl +lib/vice/C128/ptoing.vpl +lib/vice/C128/rgb.vpl lib/vice/C128/vdc_comp.vpl lib/vice/C128/vdc_deft.vpl lib/vice/C128/vice.vpl @@ -58,25 +68,44 @@ lib/vice/C64/c64mem.sym lib/vice/C64/c64s.vpl lib/vice/C64/ccs64.vpl lib/vice/C64/chargen -lib/vice/C64/default.vpl +lib/vice/C64/community-colors.vpl +lib/vice/C64/deekay.vpl lib/vice/C64/default.vrs +lib/vice/C64/edkernal lib/vice/C64/frodo.vpl lib/vice/C64/godot.vpl +lib/vice/C64/gskernal +lib/vice/C64/jpchrgen +lib/vice/C64/jpkernal lib/vice/C64/kernal lib/vice/C64/pc64.vpl +lib/vice/C64/pepto-ntsc-sony.vpl +lib/vice/C64/pepto-ntsc.vpl +lib/vice/C64/pepto-pal.vpl +lib/vice/C64/pepto-palold.vpl +lib/vice/C64/ptoing.vpl +lib/vice/C64/rgb.vpl +lib/vice/C64/sxkernal lib/vice/C64/vice.vpl +lib/vice/C64/x11_keyrah.vkm +lib/vice/C64/x11_keyrah_de.vkm lib/vice/C64/x11_pos.vkm -lib/vice/C64/x11_posger.vkm +lib/vice/C64/x11_pos_de.vkm lib/vice/C64/x11_sym.vkm -lib/vice/C64/x11_symger.vkm +lib/vice/C64/x11_sym_de.vkm lib/vice/C64DTV/basic lib/vice/C64DTV/c64mem.sym lib/vice/C64DTV/chargen lib/vice/C64DTV/default.vrs lib/vice/C64DTV/dtvrom.bin lib/vice/C64DTV/kernal +lib/vice/C64DTV/spiff.vpl +lib/vice/C64DTV/x11_keyrah.vkm +lib/vice/C64DTV/x11_keyrah_de.vkm lib/vice/C64DTV/x11_pos.vkm +lib/vice/C64DTV/x11_pos_de.vkm lib/vice/C64DTV/x11_sym.vkm +lib/vice/C64DTV/x11_sym_de.vkm lib/vice/CBM-II/amber.vpl lib/vice/CBM-II/basic.128 lib/vice/CBM-II/basic.256 @@ -87,34 +116,41 @@ lib/vice/CBM-II/ccs64.vpl lib/vice/CBM-II/chargen.500 lib/vice/CBM-II/chargen.600 lib/vice/CBM-II/chargen.700 -lib/vice/CBM-II/default.vpl +lib/vice/CBM-II/community-colors.vpl +lib/vice/CBM-II/deekay.vpl lib/vice/CBM-II/frodo.vpl lib/vice/CBM-II/godot.vpl lib/vice/CBM-II/green.vpl lib/vice/CBM-II/kernal lib/vice/CBM-II/kernal.500 lib/vice/CBM-II/pc64.vpl +lib/vice/CBM-II/pepto-ntsc-sony.vpl +lib/vice/CBM-II/pepto-ntsc.vpl +lib/vice/CBM-II/pepto-pal.vpl +lib/vice/CBM-II/pepto-palold.vpl +lib/vice/CBM-II/ptoing.vpl +lib/vice/CBM-II/rgb.vpl lib/vice/CBM-II/rom128h.vrs lib/vice/CBM-II/rom128l.vrs lib/vice/CBM-II/rom256h.vrs lib/vice/CBM-II/rom256l.vrs lib/vice/CBM-II/rom500.vrs +lib/vice/CBM-II/vice.vpl lib/vice/CBM-II/white.vpl -lib/vice/CBM-II/x11_buks.vkm -lib/vice/CBM-II/x11_buks_de.vkm +lib/vice/CBM-II/x11_sym.vkm +lib/vice/CBM-II/x11_sym_de.vkm lib/vice/DRIVES/d1541II lib/vice/DRIVES/d1571cr lib/vice/DRIVES/dos1001 +lib/vice/DRIVES/dos1540 lib/vice/DRIVES/dos1541 lib/vice/DRIVES/dos1551 lib/vice/DRIVES/dos1570 lib/vice/DRIVES/dos1571 lib/vice/DRIVES/dos1581 -lib/vice/DRIVES/dos2000 lib/vice/DRIVES/dos2031 lib/vice/DRIVES/dos2040 lib/vice/DRIVES/dos3040 -lib/vice/DRIVES/dos4000 lib/vice/DRIVES/dos4040 lib/vice/PET/amber.vpl lib/vice/PET/basic1 @@ -130,6 +166,9 @@ lib/vice/PET/edit4b40 lib/vice/PET/edit4b80 lib/vice/PET/edit4g40 lib/vice/PET/green.vpl +lib/vice/PET/hre-9000.324992-02.bin +lib/vice/PET/hre-a000.324993-02.bin +lib/vice/PET/hre.vrs lib/vice/PET/kernal1 lib/vice/PET/kernal2 lib/vice/PET/kernal4 @@ -147,45 +186,76 @@ lib/vice/PET/waterloo-d000.901898-04.bin lib/vice/PET/waterloo-e000.901897-01.bin lib/vice/PET/waterloo-f000.901898-05.bin lib/vice/PET/white.vpl -lib/vice/PET/x11_bdep.vkm -lib/vice/PET/x11_bdep_de.vkm -lib/vice/PET/x11_bdes.vkm -lib/vice/PET/x11_bdes_de.vkm -lib/vice/PET/x11_bgrs.vkm -lib/vice/PET/x11_bgrs_de.vkm -lib/vice/PET/x11_buks.vkm -lib/vice/PET/x11_buks_de.vkm -lib/vice/PET/x11_bgrp.vkm -lib/vice/PET/x11_bgrp_de.vkm -lib/vice/PET/x11_bukp.vkm -lib/vice/PET/x11_bukp_de.vkm +lib/vice/PET/x11_bude_pos.vkm +lib/vice/PET/x11_bude_pos_de.vkm +lib/vice/PET/x11_bude_sym.vkm +lib/vice/PET/x11_bude_sym_de.vkm +lib/vice/PET/x11_buuk_pos.vkm +lib/vice/PET/x11_buuk_pos_de.vkm +lib/vice/PET/x11_buuk_sym.vkm +lib/vice/PET/x11_buuk_sym_de.vkm +lib/vice/PET/x11_grus_pos.vkm +lib/vice/PET/x11_grus_pos_de.vkm +lib/vice/PET/x11_grus_sym.vkm +lib/vice/PET/x11_grus_sym_de.vkm +lib/vice/PET/x11_sym.vkm lib/vice/PLUS4/3plus1hi lib/vice/PLUS4/3plus1lo lib/vice/PLUS4/basic lib/vice/PLUS4/c2lo.364 -lib/vice/PLUS4/default.vpl lib/vice/PLUS4/default.vrs lib/vice/PLUS4/kernal +lib/vice/PLUS4/kernal.005 lib/vice/PLUS4/kernal.232 lib/vice/PLUS4/kernal.364 -lib/vice/PLUS4/vice.vpl +lib/vice/PLUS4/yape-ntsc.vpl +lib/vice/PLUS4/yape-pal.vpl lib/vice/PLUS4/x11_pos.vkm lib/vice/PLUS4/x11_sym.vkm lib/vice/PLUS4/x11_sym_de.vkm +lib/vice/PRINTER/1520.vpl lib/vice/PRINTER/cbm1526 lib/vice/PRINTER/mps801 lib/vice/PRINTER/mps803 lib/vice/PRINTER/mps803.vpl +lib/vice/PRINTER/nl10.vpl lib/vice/PRINTER/nl10-cbm +lib/vice/SCPU64/c64hq.vpl +lib/vice/SCPU64/c64s.vpl +lib/vice/SCPU64/ccs64.vpl +lib/vice/SCPU64/chargen +lib/vice/SCPU64/community-colors.vpl +lib/vice/SCPU64/deekay.vpl +lib/vice/SCPU64/default.vrs +lib/vice/SCPU64/frodo.vpl +lib/vice/SCPU64/godot.vpl +lib/vice/SCPU64/jpchrgen +lib/vice/SCPU64/pc64.vpl +lib/vice/SCPU64/pepto-ntsc-sony.vpl +lib/vice/SCPU64/pepto-ntsc.vpl +lib/vice/SCPU64/pepto-pal.vpl +lib/vice/SCPU64/pepto-palold.vpl +lib/vice/SCPU64/ptoing.vpl +lib/vice/SCPU64/rgb.vpl +lib/vice/SCPU64/scpu64 +lib/vice/SCPU64/scpu64mem.sym +lib/vice/SCPU64/vice.vpl +lib/vice/SCPU64/x11_pos.vkm +lib/vice/SCPU64/x11_pos_de.vkm +lib/vice/SCPU64/x11_sym.vkm +lib/vice/SCPU64/x11_sym_de.vkm lib/vice/VIC20/basic lib/vice/VIC20/chargen -lib/vice/VIC20/default.vpl lib/vice/VIC20/default.vrs lib/vice/VIC20/kernal +lib/vice/VIC20/mike-ntsc.vpl +lib/vice/VIC20/mike-pal.vpl +lib/vice/VIC20/vice.vpl lib/vice/VIC20/x11_pos.vkm lib/vice/VIC20/x11_sym.vkm lib/vice/fonts/CBM.ttf man/man1/c1541.1.gz +man/man1/cartconv.1.gz man/man1/petcat.1.gz man/man1/vice.1.gz man/man1/x128.1.gz @@ -194,19 +264,17 @@ man/man1/xcbm2.1.gz man/man1/xpet.1.gz man/man1/xplus4.1.gz man/man1/xvic.1.gz -%%FCCACHE%%lib/vice/fonts/vice-cbm.bdf -%%NOFCCACHE%%lib/vice/fonts/vice-cbm.pcf -%%NOFCCACHE%%lib/vice/fonts/fonts.dir -%%PORTDOCS%%%%DOCSDIR%%/64doc.txt -%%PORTDOCS%%%%DOCSDIR%%/65C02.txt -%%PORTDOCS%%%%DOCSDIR%%/BUGS +lib/vice/fonts/vice-cbm.bdf +lib/vice/fonts/fonts.dir +lib/vice/fonts/vice-cbm.pcf +%%PORTDOCS%%%%DOCSDIR%%/Android-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt +%%PORTDOCS%%%%DOCSDIR%%/CIPS2008.png %%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CommodoreInnovationPriceSoftware2008.jpg %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt -%%PORTDOCS%%%%DOCSDIR%%/GP2X-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Linux-Mingw32-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/Linux-Native-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MacOSX-Howto.txt @@ -215,35 +283,38 @@ man/man1/xvic.1.gz %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt -%%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt +%%PORTDOCS%%%%DOCSDIR%%/OpenWatcom-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-OS2.txt %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt +%%PORTDOCS%%%%DOCSDIR%%/Readme-SDL2.txt +%%PORTDOCS%%%%DOCSDIR%%/Readme-Unix.txt %%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/VIC-Addendum.txt -%%PORTDOCS%%%%DOCSDIR%%/VIC-Article.txt -%%PORTDOCS%%%%DOCSDIR%%/VIC-Artikel.txt %%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/Win32-MSVC-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Win32-Mingw32-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/WinNT-Unicode.txt %%PORTDOCS%%%%DOCSDIR%%/amigaos.html +%%PORTDOCS%%%%DOCSDIR%%/android.html %%PORTDOCS%%%%DOCSDIR%%/beos.html -%%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt %%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.txt -%%PORTDOCS%%%%DOCSDIR%%/drive_info.txt +%%PORTDOCS%%%%DOCSDIR%%/darwin.html +%%PORTDOCS%%%%DOCSDIR%%/hardware-sids.txt %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/macosx.html %%PORTDOCS%%%%DOCSDIR%%/new.gif -%%PORTDOCS%%%%DOCSDIR%%/pixel_aspect.txt +%%PORTDOCS%%%%DOCSDIR%%/nsosrh.html +%%PORTDOCS%%%%DOCSDIR%%/ports-status.txt %%PORTDOCS%%%%DOCSDIR%%/qnx.html +%%PORTDOCS%%%%DOCSDIR%%/robots.txt %%PORTDOCS%%%%DOCSDIR%%/sco.html -%%PORTDOCS%%%%DOCSDIR%%/serial.txt +%%PORTDOCS%%%%DOCSDIR%%/sitemap.xml %%PORTDOCS%%%%DOCSDIR%%/solaris.html -%%PORTDOCS%%%%DOCSDIR%%/vice-logo-small.png +%%PORTDOCS%%%%DOCSDIR%%/vice-logo.svg %%PORTDOCS%%%%DOCSDIR%%/vice.chm %%PORTDOCS%%%%DOCSDIR%%/vice.css %%PORTDOCS%%%%DOCSDIR%%/vice.guide @@ -264,6 +335,8 @@ man/man1/xvic.1.gz %%PORTDOCS%%%%DOCSDIR%%/vice_18.html %%PORTDOCS%%%%DOCSDIR%%/vice_19.html %%PORTDOCS%%%%DOCSDIR%%/vice_20.html +%%PORTDOCS%%%%DOCSDIR%%/vice_21.html +%%PORTDOCS%%%%DOCSDIR%%/vice_22.html %%PORTDOCS%%%%DOCSDIR%%/vice_2.html %%PORTDOCS%%%%DOCSDIR%%/vice_3.html %%PORTDOCS%%%%DOCSDIR%%/vice_4.html @@ -273,4 +346,3 @@ man/man1/xvic.1.gz %%PORTDOCS%%%%DOCSDIR%%/vice_8.html %%PORTDOCS%%%%DOCSDIR%%/vice_9.html %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html -%%PORTDOCS%%%%DOCSDIR%%/vice-logo.jpg diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c01431f4226b..e27afd77f614 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -123,10 +123,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" -# On FreeBSD 9.x, even when CHOSEN_COMPILER_TYPE from Mk/Uses/compiler.mk -# is set to clang, COMPILER_VERSION is still at 42 from the system compiler -# that is GCC 4.2. Hack around this a bit. -.if ${CHOSEN_COMPILER_TYPE} == clang && ( ${COMPILER_VERSION} < 38 || ${COMPILER_VERSION} == 42 ) +.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 38 CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \ -D__builtin_ms_va_start=__builtin_va_start \ -D__builtin_ms_va_end=__builtin_va_end \ diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index e2d90dac5068..605326a8c5b5 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-7.66-linux20130827 MAINTAINER= acm@FreeBSD.org COMMENT= Alien Arena (native version) -RUN_DEPENDS= ${DATADIR}/data1/default.cfg:games/alienarena-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/data1/default.cfg:games/alienarena-data USES= compiler:c++11-lib dos2unix gmake USE_CXXSTD= c++11 diff --git a/games/glest/Makefile b/games/glest/Makefile index 9f3e17835f1a..abeeaf5c88a3 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -15,7 +15,7 @@ COMMENT= Free 3D real-time customizable strategy game LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \ libvorbis.so:audio/libvorbis BUILD_DEPENDS= jam:devel/jam -RUN_DEPENDS= ${DATADIR}/servers.ini:games/glest-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/servers.ini:games/glest-data USES= dos2unix openal:al,alut pkgconfig zip lua:51 USE_AUTOTOOLS= automake:env autoconf:env diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile index 0a0e8353e843..e2ec9dc48b55 100644 --- a/games/megaglest/Makefile +++ b/games/megaglest/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libminiupnpc.so:net/miniupnpc BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient \ ${LOCALBASE}/include/miniupnpc/miniupnpc.h:net/miniupnpc -RUN_DEPENDS= ${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data USE_GITHUB= yes GH_ACCOUNT= MegaGlest diff --git a/games/naev/Makefile b/games/naev/Makefile index d76938b80f34..41cde72822c5 100644 --- a/games/naev/Makefile +++ b/games/naev/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libvorbisfile.so:audio/libvorbis \ libzip.so:archivers/libzip \ libcsparse.so:math/suitesparse -RUN_DEPENDS= ${DATADIR}/ndata-${PORTVERSION}.zip:games/naev-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/ndata-${PORTVERSION}.zip:games/naev-data USES= autoreconf:build compiler:features gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes diff --git a/games/openarena/Makefile b/games/openarena/Makefile index e5c84918ab02..f29953656e6d 100644 --- a/games/openarena/Makefile +++ b/games/openarena/Makefile @@ -16,7 +16,7 @@ COMMENT= Quake3 total conversion based on the ioquake3 engine LICENSE?= GPLv2 -RUN_DEPENDS= ${DATADIR}/${Q3BASE}/pak0.pk3:games/openarena-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/${Q3BASE}/pak0.pk3:games/openarena-data MASTERDIR= ${.CURDIR}/../ioquake3 DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/games/scourge/Makefile b/games/scourge/Makefile index 248475e98ec7..fc86c43a3242 100644 --- a/games/scourge/Makefile +++ b/games/scourge/Makefile @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Rogue-like game LIB_DEPENDS= libfreetype.so:print/freetype2 -RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:games/scourge-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data USES= autoreconf gettext gmake USE_GL= gl diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile index 051aba5c1321..d5fb0e099136 100644 --- a/games/trigger-rally/Makefile +++ b/games/trigger-rally/Makefile @@ -12,7 +12,7 @@ COMMENT= Rally car racing game BUILD_DEPENDS= jam:devel/jam LIB_DEPENDS= libphysfs.so:devel/physfs -RUN_DEPENDS= ${DATADIR}/trigger.config.defs:games/trigger-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/trigger.config.defs:games/trigger-data USES= openal:al,alut tar:bzip2 USE_SDL= sdl image diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index a3dab36c33af..5acdf4ba7ae1 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -14,7 +14,7 @@ COMMENT= Open source 3D space simulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${DATADIR}/vegastrike.ico:games/vegastrike-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/vegastrike.ico:games/vegastrike-data LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ libexpat.so:textproc/expat2 \ libvorbis.so:audio/libvorbis \ diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 3e788305caea..6ba2d0261dc3 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -15,7 +15,7 @@ COMMENT= Futuristic, fast-paced first person shooter LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:ftp/curl -RUN_DEPENDS= ${DATADIR}/basewsw/data1_15.pk3:games/warsow-data +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/basewsw/data1_15.pk3:games/warsow-data ONLY_FOR_ARCHS= i386 amd64 diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile index c087c76d23b0..3e97abfb0450 100644 --- a/german/wordpress/Makefile +++ b/german/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo index 6a14d97b18c5..e289b0e1dc5a 100644 --- a/german/wordpress/distinfo +++ b/german/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118419 -SHA256 (wordpress-4.7-de_DE.tar.gz) = 39949e90a24427535a1cb256d05ee6df7669826243f01dde996f1cebb33a64ff -SIZE (wordpress-4.7-de_DE.tar.gz) = 8471043 +TIMESTAMP = 1484377441 +SHA256 (wordpress-4.7.1-de_DE.tar.gz) = 00b19e8900385546eed0e7c53eaa3f728dec60570e5c51fa520c7dced14058d5 +SIZE (wordpress-4.7.1-de_DE.tar.gz) = 8478219 diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile index b7267d33b5fb..c44875c3e828 100644 --- a/graphics/blender-doc/Makefile +++ b/graphics/blender-doc/Makefile @@ -19,7 +19,7 @@ SUB_FILES= pkg-message .include -.if ${OSVERSION} < 1100077 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 post-extract: # chmod -R bug. # Do not use "-exec ... +", because of the same bug, it will not work. diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index d3b903f77839..70f55b0b336b 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -8,40 +8,27 @@ CATEGORIES= graphics MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \ ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Implementation of the codec specified in the JPEG-2000 standard LICENSE= MIT -USES= zip libtool:keepla jpeg -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --enable-shared --enable-static -USE_LDCONFIG= yes - OPTIONS_DEFINE= OPENGL UUID DOCS OPTIONS_DEFAULT=UUID +OPTIONS_SUB= yes UUID_DESC= UUID support (required by GDAL) -.include - -.if ${PORT_OPTIONS:MOPENGL} -USE_XORG= x11 xmu xi xext -USE_GL= glut -CONFIGURE_ARGS+=--enable-opengl -PLIST_SUB+= OPENGL="" -.else -CONFIGURE_ARGS+=--disable-opengl -PLIST_SUB+= OPENGL="@comment " -.endif +CONFIGURE_ARGS= --enable-shared --enable-static +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +USES= jpeg libtool:keepla localbase zip -.if ${PORT_OPTIONS:MUUID} -EXTRA_PATCHES+= ${FILESDIR}/uuid.patch -.endif +OPENGL_CONFIGURE_ENABLE=opengl +OPENGL_USE= GL=glut XORG=x11,xext,xi,xmu +UUID_EXTRA_PATCHES= ${PATCHDIR}/uuid.patch post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}/ .include diff --git a/graphics/jasper/pkg-descr b/graphics/jasper/pkg-descr index f70e0effe539..65e66fd07623 100644 --- a/graphics/jasper/pkg-descr +++ b/graphics/jasper/pkg-descr @@ -2,6 +2,5 @@ JasPer is a software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1). The JasPer software is written in the C programming language. -LICENSE: MIT - -WWW: http://www.ece.uvic.ca/~mdadams/jasper/ +WWW: http://www.ece.uvic.ca/~frodo/jasper/ +WWW: https://github.com/mdadams/jasper diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile index 0c2cc1f911be..f61bfc5c01e8 100644 --- a/graphics/jdraw/Makefile +++ b/graphics/jdraw/Makefile @@ -35,7 +35,7 @@ do-install: .if ${PORT_OPTIONS:MPLASTIC3D} PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\"" -RUN_DEPENDS+= ${JAVAJARDIR}/looks.jar:devel/looks +RUN_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks .endif JAVA_VERSION= 1.6+ diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index a5d6fe96e8f5..7bebc8fefaa7 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdrm -PORTVERSION= 2.4.66 +PORTVERSION= 2.4.74 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ @@ -10,6 +10,8 @@ MASTER_SITES= http://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services +LICENSE= MIT + LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libpthread-stubs.so:devel/libpthread-stubs diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 28745f22c10e..65e5ae526c9f 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,2 +1,3 @@ -SHA256 (libdrm-2.4.66.tar.bz2) = 79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76 -SIZE (libdrm-2.4.66.tar.bz2) = 694574 +TIMESTAMP = 1484389267 +SHA256 (libdrm-2.4.74.tar.bz2) = d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b +SIZE (libdrm-2.4.74.tar.bz2) = 781730 diff --git a/graphics/libdrm/files/extra-xf86drm.c b/graphics/libdrm/files/extra-xf86drm.c index 382a32da2acb..459ae5a8bbc3 100644 --- a/graphics/libdrm/files/extra-xf86drm.c +++ b/graphics/libdrm/files/extra-xf86drm.c @@ -6,12 +6,12 @@ dragonfly fixed this issue in, http://gitweb.dragonflybsd.org/dragonfly.git/commit/b922632f623ee2cc2c1346bb3a6894a7756676aa which will be included in the 4.4 release when it is released. ---- xf86drm.c.orig 2015-11-02 12:26:19.910518000 +0100 -+++ xf86drm.c 2015-11-02 12:27:10.575894000 +0100 -@@ -174,7 +174,7 @@ +--- xf86drm.c.orig 2016-11-29 11:15:10 UTC ++++ xf86drm.c +@@ -173,7 +173,7 @@ drmIoctl(int fd, unsigned long request, do { - ret = ioctl(fd, request, arg); + ret = ioctl(fd, request, arg); - } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); + } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == 512)); return ret; diff --git a/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c b/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c deleted file mode 100644 index 24a5402ff43f..000000000000 --- a/graphics/libdrm/files/patch-tests_kms_kms-universal-planes.c +++ /dev/null @@ -1,10 +0,0 @@ ---- tests/kms/kms-universal-planes.c.orig 2016-02-15 12:05:56.305353000 +0100 -+++ tests/kms/kms-universal-planes.c 2016-02-15 12:06:11.194126000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include "xf86drm.h" diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index f3db18231729..c770ca3661fa 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -34,6 +34,9 @@ include/libdrm/savage_drm.h include/libdrm/sis_drm.h include/libdrm/tegra_drm.h include/libdrm/via_drm.h +include/libdrm/vc4_drm.h +include/libdrm/virtgpu_drm.h +include/libsync.h %%KMS%%include/libkms/libkms.h include/xf86drm.h include/xf86drmMode.h diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index c5c4f5fc2ef4..17244ea77bd1 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mupdf -PORTVERSION= 1.9a -PORTREVISION= 1 +PORTVERSION= 1.10a DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= graphics @@ -27,21 +26,19 @@ LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes USES= cpe compiler:c++11-lang gmake jpeg pkgconfig USE_XORG= x11 xcursor xext xinerama xrandr -USE_GL= gl +USE_GL= gl CPE_VENDOR= artifex -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source - -OPTIONS_DEFINE= SCROLL JS +OPTIONS_DEFINE= JS SCROLL OPTIONS_DEFAULT=SCROLL -SCROLL_DESC= Build with scroll hacks JS_DESC= JavaScript support (V8 engine) +SCROLL_DESC= Build with scroll hacks +JS_LIB_DEPENDS= libv8.so:lang/v8 +JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c -JS_LIB_DEPENDS= libv8.so:lang/v8 -JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ @@ -49,12 +46,12 @@ post-patch: -e 's/Linux/FreeBSD/' \ ${WRKSRC}/Makerules @${RM} -r ${WRKSRC}/thirdparty/curl \ - ${WRKSRC}/thirdparty/jbig2dec \ ${WRKSRC}/thirdparty/freetype \ ${WRKSRC}/thirdparty/harfbuzz \ - ${WRKSRC}/thirdparty/jpeg \ - ${WRKSRC}/thirdparty/openjpeg \ - ${WRKSRC}/thirdparty/zlib + ${WRKSRC}/thirdparty/jbig2dec \ + ${WRKSRC}/thirdparty/jpeg \ + ${WRKSRC}/thirdparty/openjpeg \ + ${WRKSRC}/thirdparty/zlib post-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ @@ -66,8 +63,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdfthird.a \ ${STAGEDIR}${PREFIX}/lib/libmupdfthird_pic.a ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf -.for binary in mutool mujstest mupdf mupdf-gl mupdf-x11-curl - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary} -.endfor .include diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo index b69d3375bdfc..eb94e11e0884 100644 --- a/graphics/mupdf/distinfo +++ b/graphics/mupdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466328793 -SHA256 (mupdf-1.9a-source.tar.gz) = 8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc -SIZE (mupdf-1.9a-source.tar.gz) = 20493793 +TIMESTAMP = 1484401133 +SHA256 (mupdf-1.10a-source.tar.gz) = aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 +SIZE (mupdf-1.10a-source.tar.gz) = 42264707 diff --git a/graphics/mupdf/files/patch-scripts_fontdump.c b/graphics/mupdf/files/patch-scripts_fontdump.c index 15fa9454d1c1..f07944a471e4 100644 --- a/graphics/mupdf/files/patch-scripts_fontdump.c +++ b/graphics/mupdf/files/patch-scripts_fontdump.c @@ -1,4 +1,4 @@ ---- scripts/fontdump.c.orig 2016-04-21 11:14:32 UTC +--- scripts/fontdump.c.orig 2016-11-28 13:34:04 UTC +++ scripts/fontdump.c @@ -50,7 +50,6 @@ main(int argc, char **argv) fprintf(fo, "#ifndef __STRICT_ANSI__\n"); diff --git a/graphics/mupdf/files/patch-source__fitz__load-jpx.c b/graphics/mupdf/files/patch-source__fitz__load-jpx.c index 83291ca0561c..ef42f75f4922 100644 --- a/graphics/mupdf/files/patch-source__fitz__load-jpx.c +++ b/graphics/mupdf/files/patch-source__fitz__load-jpx.c @@ -1,7 +1,8 @@ ---- source/fitz/load-jpx.c.orig 2016-04-21 11:14:32 UTC +--- source/fitz/load-jpx.c.orig 2016-11-28 13:34:04 UTC +++ source/fitz/load-jpx.c -@@ -1,14 +1,6 @@ - #include "mupdf/fitz.h" +@@ -481,15 +481,7 @@ fz_load_jpx_info(fz_context *ctx, unsign + + #else /* HAVE_LURATECH */ -/* Without the definition of OPJ_STATIC, compilation fails on windows - * due to the use of __stdcall. We believe it is required on some @@ -14,14 +15,5 @@ -#include +#include - static void fz_opj_error_callback(const char *msg, void *client_data) - { -@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch - opj_stream_set_read_function(stream, fz_opj_stream_read); - opj_stream_set_skip_function(stream, fz_opj_stream_skip); - opj_stream_set_seek_function(stream, fz_opj_stream_seek); -- opj_stream_set_user_data(stream, &sb); -+ opj_stream_set_user_data(stream, &sb,NULL); - /* Set the length to avoid an assert */ - opj_stream_set_user_data_length(stream, size); - + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go diff --git a/graphics/mupdf/files/patch-source_pdf_pdf-shade.c b/graphics/mupdf/files/patch-source_pdf_pdf-shade.c deleted file mode 100644 index 38b3ca1b69a7..000000000000 --- a/graphics/mupdf/files/patch-source_pdf_pdf-shade.c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-source_pdf_pdf-shade_c,v 1.1 2016/08/27 20:58:48 jca Exp $ - - CVE-2016-6525 - - http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958 - ---- source/pdf/pdf-shade.c.orig 2016-04-21 11:14:32 UTC -+++ source/pdf/pdf-shade.c -@@ -206,7 +206,7 @@ pdf_load_mesh_params(fz_context *ctx, pd - obj = pdf_dict_get(ctx, dict, PDF_NAME_Decode); - if (pdf_array_len(ctx, obj) >= 6) - { -- n = (pdf_array_len(ctx, obj) - 4) / 2; -+ n = fz_mini(FZ_MAX_COLORS, (pdf_array_len(ctx, obj) - 4) / 2); - shade->u.m.x0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 0)); - shade->u.m.x1 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 1)); - shade->u.m.y0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 2)); diff --git a/graphics/mupdf/files/patch-source_pdf_pdf-xref.c b/graphics/mupdf/files/patch-source_pdf_pdf-xref.c deleted file mode 100644 index 12cf04a7592c..000000000000 --- a/graphics/mupdf/files/patch-source_pdf_pdf-xref.c +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-source_pdf_pdf-xref_c,v 1.1 2016/08/27 20:58:48 jca Exp $ - - CVE-2016-6265 - - http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=fa1936405b6a84e5c9bb440912c23d532772f958 - ---- source/pdf/pdf-xref.c.orig 2016-04-21 11:14:32 UTC -+++ source/pdf/pdf-xref.c -@@ -1191,8 +1191,14 @@ pdf_load_xref(fz_context *ctx, pdf_docum - fz_throw(ctx, FZ_ERROR_GENERIC, "object offset out of range: %d (%d 0 R)", (int)entry->ofs, i); - } - if (entry->type == 'o') -- if (entry->ofs <= 0 || entry->ofs >= xref_len || pdf_get_xref_entry(ctx, doc, entry->ofs)->type != 'n') -- fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)entry->ofs, i); -+ { -+ /* Read this into a local variable here, because pdf_get_xref_entry -+ * may solidify the xref, hence invalidating "entry", meaning we -+ * need a stashed value for the throw. */ -+ fz_off_t ofs = entry->ofs; -+ if (ofs <= 0 || ofs >= xref_len || pdf_get_xref_entry(ctx, doc, ofs)->type != 'n') -+ fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)ofs, i); -+ } - } - } - diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist index c46b19c1fd88..dfb70a33cb69 100644 --- a/graphics/mupdf/pkg-plist +++ b/graphics/mupdf/pkg-plist @@ -2,14 +2,17 @@ bin/mujstest bin/mupdf bin/mupdf-gl bin/mupdf-x11-curl +bin/muraster bin/mutool include/mupdf/fitz.h include/mupdf/fitz/annotation.h +include/mupdf/fitz/archive.h include/mupdf/fitz/bidi.h include/mupdf/fitz/bitmap.h include/mupdf/fitz/buffer.h include/mupdf/fitz/colorspace.h include/mupdf/fitz/compressed-buffer.h +include/mupdf/fitz/config.h include/mupdf/fitz/context.h include/mupdf/fitz/crypt.h include/mupdf/fitz/device.h @@ -45,12 +48,13 @@ include/mupdf/fitz/string.h include/mupdf/fitz/structured-text.h include/mupdf/fitz/system.h include/mupdf/fitz/text.h +include/mupdf/fitz/track-usage.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h include/mupdf/fitz/ucdn.h -include/mupdf/fitz/unzip.h include/mupdf/fitz/util.h include/mupdf/fitz/version.h +include/mupdf/fitz/writer.h include/mupdf/fitz/xml.h include/mupdf/html.h include/mupdf/memento.h @@ -65,7 +69,6 @@ include/mupdf/pdf/document.h include/mupdf/pdf/event.h include/mupdf/pdf/field.h include/mupdf/pdf/font.h -include/mupdf/pdf/graft.h include/mupdf/pdf/interpret.h include/mupdf/pdf/javascript.h include/mupdf/pdf/name-table.h @@ -76,7 +79,7 @@ include/mupdf/pdf/parse.h include/mupdf/pdf/resource.h include/mupdf/pdf/widget.h include/mupdf/pdf/xref.h -include/mupdf/xps.h +include/mupdf/svg.h lib/libmupdf.a lib/libmupdfthird.a lib/libmupdfthird_pic.a @@ -91,3 +94,4 @@ man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/progressive.txt %%PORTDOCS%%%%DOCSDIR%%/refcount.txt %%PORTDOCS%%%%DOCSDIR%%/thirdparty.txt +%%PORTDOCS%%%%DOCSDIR%%/types.txt diff --git a/graphics/pixie/files/patch-src__ri__rib.l b/graphics/pixie/files/patch-src__ri__rib.l index 9ed7ff5b6e95..42a05961b2a7 100644 --- a/graphics/pixie/files/patch-src__ri__rib.l +++ b/graphics/pixie/files/patch-src__ri__rib.l @@ -1,6 +1,6 @@ ---- src/ri/rib.l.orig +--- src/ri/rib.l.orig 2008-11-12 07:00:24 UTC +++ src/ri/rib.l -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ static TRibFile *ribStack = NULL; // Overwrite the YYinput so that it uses libz #undef YY_INPUT @@ -9,7 +9,24 @@ YY_FATAL_ERROR( "input in flex scanner failed" ); #endif -@@ -223,7 +223,7 @@ +@@ -208,12 +208,12 @@ version return RIB_VERSION; + \[ return RIB_ARRAY_BEGIN; + \] return RIB_ARRAY_END; + +-\"[^\"]*\" { riblval->string = rstrdup(ribtext+1,CRenderer::globalMemory); riblval->string[strlen(riblval->string)-1] = '\0'; return RIB_TEXT;} +-[+-]?([0-9]+|([0-9]*(\.[0-9]+)?)([eE][+-]?[0-9]+)?) { /*sscanf(ribtext,"%f",&riblval->real);*/ riblval->real = (float) atof(ribtext); return RIB_FLOAT; } +-[+-]?([0-9]+|([0-9]+(\.[0-9]*)?)([eE][+-]?[0-9]+)?) { /*sscanf(ribtext,"%f",&riblval->real);*/ riblval->real = (float) atof(ribtext); return RIB_FLOAT; } ++\"[^\"]*\" { yylval->string = rstrdup(ribtext+1,CRenderer::globalMemory); yylval->string[strlen(yylval->string)-1] = '\0'; return RIB_TEXT;} ++[+-]?([0-9]+|([0-9]*(\.[0-9]+)?)([eE][+-]?[0-9]+)?) { /*sscanf(ribtext,"%f",&yylval->real);*/ yylval->real = (float) atof(ribtext); return RIB_FLOAT; } ++[+-]?([0-9]+|([0-9]+(\.[0-9]*)?)([eE][+-]?[0-9]+)?) { /*sscanf(ribtext,"%f",&yylval->real);*/ yylval->real = (float) atof(ribtext); return RIB_FLOAT; } + + [\t ] ; +-#\!.* { riblval->string = rstrdup(ribtext+2,CRenderer::globalMemory); return RIB_STRUCTURE_COMMENT; } ++#\!.* { yylval->string = rstrdup(ribtext+2,CRenderer::globalMemory); return RIB_STRUCTURE_COMMENT; } + #.* ; + \n { ribLineno++; } + <> { +@@ -223,7 +223,7 @@ version return RIB_VERSION; TRibFile *nextFile = ribStack->next; rib_delete_buffer( YY_CURRENT_BUFFER ); #ifdef HAVE_ZLIB @@ -18,7 +35,7 @@ #else fclose(ribin); #endif -@@ -243,7 +243,7 @@ +@@ -243,7 +243,7 @@ version return RIB_VERSION; rib_delete_buffer( YY_CURRENT_BUFFER ); #ifdef HAVE_ZLIB diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 01fb2b193d66..41e1bbf2bbe2 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 4.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ @@ -12,39 +12,43 @@ COMMENT= Powerful RAW image processing application LICENSE= GPLv3 -LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \ +LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ + libexpat.so:textproc/expat2 \ + libfftw3.so:math/fftw3 \ + libfftw3f.so:math/fftw3-float \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libiptcdata.so:graphics/libiptcdata \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ libsigc-2.0.so:devel/libsigc++20 \ - libfftw3.so:math/fftw3 \ - libfftw3f.so:math/fftw3-float \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 + libtiff.so:graphics/tiff -USES= cmake:outsource compiler:gcc-c++11-lib desktop-file-utils dos2unix \ - jpeg pkgconfig tar:xz +USES= cmake:outsource desktop-file-utils dos2unix \ + jpeg localbase:ldflags pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) -USE_GNOME= gtk20 glib20 +LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 +USE_GNOME= gtkmm24 USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -fPIC CXXFLAGS+= -I${LOCALBASE}/include -fPIC -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" +LDFLAGS+= -lpthread CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ -DLICENCEDIR="${DOCSDIR}" \ -DDESKTOPDIR="${DESKTOPDIR}" \ -DDATADIR="${DATADIR}" \ - -DCMAKE_C_FLAGS="${CFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \ - -DCACHE_NAME_SUFFIX="4.1" -SUB_FILES= rawtherapee -SUB_LIST= RTDIR="${RTDIR}" + -DCACHE_NAME_SUFFIX="4.1" \ + -Wno-dev \ + -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW +# 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default +# any more. The CMP0056 policy must be explicitly set to NEW to ensure +# linker flags are passed. Else -lomp is not found with clang. +# See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html + INSTALLS_ICONS= yes -.if defined(PACKAGE_BUILDING) +.if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif @@ -52,31 +56,41 @@ RTDIR= ${PREFIX}/libdata/${PORTNAME} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP -OPENMP_DESC= Enable multicore processing using OpenMP +OPENMP_DESC= Enable multicore processing using OpenMP (amd64) OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE2 support) OPENMP_CMAKE_BOOL= OPTION_OMP -.include +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops \ + ${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}} +OPTIMIZED_CFLAGS_CFLAGS_gcc= -fexpensive-optimizations -# ------------------------------------------------------------------- +.include -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -fexpensive-optimizations \ - -funroll-loops -msse2 -CXXFLAGS+= -O3 \ - -funroll-loops -msse2 +# ------------------------------------------------------------------- +# + +.if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64" +LIB_DEPENDS+= libomp.so.0:devel/openmp +OPENMP_FLAGS= -lm -lomp +LDFLAGS+= ${OPENMP_FLAGS} +.if ${OSVERSION} < 1100101 +# clang 3.4 doesn't support OpenMP, +# OTOH gcc 4.9 doesn't generate usable code on FreeBSD 11. +USES+= compiler:gcc-c++11-lib +.endif .endif + +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= .endif # ------------------------------------------------------------------- +.include + post-patch: - @${REINPLACE_CMD} -e 's###g' \ - ${WRKSRC}/rtgui/darkframe.h \ - ${WRKSRC}/rtgui/flatfield.h \ - ${WRKSRC}/rtgui/icmpanel.h @${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \ ${WRKSRC}/CMakeLists.txt ${RM} ${WRKSRC}/rtengine/dcraw.patch \ diff --git a/graphics/rawtherapee/files/patch-CMakeLists.txt b/graphics/rawtherapee/files/patch-CMakeLists.txt deleted file mode 100644 index 65b0f3627f70..000000000000 --- a/graphics/rawtherapee/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# This is required so that the RPATH information for libgcc/libgomp is -# not stripped during CMake's install phase: -- mandree - ---- ./CMakeLists.txt.orig 2013-06-15 19:16:41.000000000 +0200 -+++ ./CMakeLists.txt 2013-06-15 19:17:02.000000000 +0200 -@@ -6,6 +6,7 @@ - endif (WIN32) - - PROJECT(RawTherapee) -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - # the default target is 'Debug' - if (CMAKE_BUILD_TYPE STREQUAL "") diff --git a/graphics/rawtherapee/files/patch-rtengine_dcraw.cc b/graphics/rawtherapee/files/patch-rtengine_dcraw.cc new file mode 100644 index 000000000000..cf1eb897c31b --- /dev/null +++ b/graphics/rawtherapee/files/patch-rtengine_dcraw.cc @@ -0,0 +1,12 @@ +--- rtengine/dcraw.cc.orig 2017-01-14 17:35:19 UTC ++++ rtengine/dcraw.cc +@@ -8726,7 +8726,8 @@ static void decodeFPDeltaRow(Bytef * src + dst[col*3 + 2] = src[col + realTileWidth*2]; + } + } else { +- if (((union { uint32_t x; uint8_t c; }){1}).c) { ++ union X { uint32_t x; uint8_t c; }; ++ if (((union X){1}).c) { + for (size_t col = 0; col < tileWidth; ++col) { + for (size_t byte = 0; byte < bytesps; ++byte) + dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)]; // Little endian diff --git a/graphics/rawtherapee/files/patch-rtengine_improcfun.h b/graphics/rawtherapee/files/patch-rtengine_improcfun.h deleted file mode 100644 index 39275d147b3f..000000000000 --- a/graphics/rawtherapee/files/patch-rtengine_improcfun.h +++ /dev/null @@ -1,14 +0,0 @@ ---- ./rtengine/improcfun.h.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./rtengine/improcfun.h 2012-03-31 11:46:27.000000000 +0400 -@@ -19,6 +19,11 @@ - #ifndef _IMPROCFUN_H_ - #define _IMPROCFUN_H_ - -+#include -+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) -+#define log2(x) (log(x) / M_LN2) -+#endif -+ - #include "imagefloat.h" - #include "image16.h" - #include "image8.h" diff --git a/graphics/rawtherapee/files/patch-rtengine_safegtk.cc b/graphics/rawtherapee/files/patch-rtengine_safegtk.cc index 1e4826308aa7..10dc300ff935 100644 --- a/graphics/rawtherapee/files/patch-rtengine_safegtk.cc +++ b/graphics/rawtherapee/files/patch-rtengine_safegtk.cc @@ -1,6 +1,6 @@ ---- ./rtengine/safegtk.cc.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./rtengine/safegtk.cc 2012-03-29 19:31:25.000000000 +0400 -@@ -98,7 +98,7 @@ +--- rtengine/safegtk.cc.orig 2017-01-14 17:35:18 UTC ++++ rtengine/safegtk.cc +@@ -184,7 +184,7 @@ void safe_build_file_list (Glib::RefPtr< Glib::RefPtr dirList; if (dir) { SAFE_ENUMERATOR_CODE_START @@ -9,7 +9,7 @@ SAFE_ENUMERATOR_CODE_END; } } -@@ -113,7 +113,7 @@ +@@ -199,7 +199,7 @@ void safe_build_file_list (Glib::RefPtr< if (dir) { if (!extensions) { SAFE_ENUMERATOR_CODE_START @@ -18,25 +18,25 @@ SAFE_ENUMERATOR_CODE_END; } else { -@@ -124,7 +124,7 @@ +@@ -210,7 +210,7 @@ void safe_build_file_list (Glib::RefPtr< SAFE_ENUMERATOR_CODE_START // convert the current filename to lowercase in a new ustring - Glib::ustring fname = Glib::ustring(info->get_name()).lowercase(); + Glib::ustring fname = Glib::ustring(info->get_display_name()).lowercase(); - int pos = fname.find_last_of('.'); - if (pos > -1 && pos < (fname.length()-1)) { -@@ -135,7 +135,7 @@ + size_t pos = fname.find_last_of('.'); + if (pos < (fname.length()-1)) { +@@ -221,7 +221,7 @@ void safe_build_file_list (Glib::RefPtr< // look out if it has one of the retained extensions - for (unsigned int i=0; iget_name())); + names.push_back (Glib::build_filename (directory, info->get_display_name())); break; } } -@@ -156,7 +156,7 @@ +@@ -242,7 +242,7 @@ void safe_build_subdir_list (Glib::RefPt SAFE_ENUMERATOR_CODE_START if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden)) diff --git a/graphics/rawtherapee/files/patch-rtgui_soundman.cc b/graphics/rawtherapee/files/patch-rtgui_soundman.cc new file mode 100644 index 000000000000..db4ca89a1ed1 --- /dev/null +++ b/graphics/rawtherapee/files/patch-rtgui_soundman.cc @@ -0,0 +1,22 @@ +--- rtgui/soundman.cc.orig 2017-01-14 17:35:19 UTC ++++ rtgui/soundman.cc +@@ -24,9 +24,7 @@ + #ifdef WIN32 + #include + #include +-#endif +- +-#ifdef __linux__ ++#elif !defined(__APPLE__) + #include + #endif + +@@ -65,7 +63,7 @@ void SoundManager::playSoundAsync(const + wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL); + PlaySoundW(wfilename, NULL, sndParam); + g_free( wfilename ); +-#elif defined(__linux__) ++#elif !defined(__APPLE__) + ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL); + #endif + } diff --git a/graphics/rawtherapee/files/rawtherapee.in b/graphics/rawtherapee/files/rawtherapee.in deleted file mode 100644 index 3e625f01ab39..000000000000 --- a/graphics/rawtherapee/files/rawtherapee.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/csh -# -# $FreeBSD$ - -set RTH = "%%RTDIR%%/rth" -set CONFDIR = "%%RTDIR%%" - -exec "${RTH}" ${CONFDIR} diff --git a/graphics/rawtherapee/pkg-message b/graphics/rawtherapee/pkg-message index ccb1877aaf65..ac0e1ed156a7 100644 --- a/graphics/rawtherapee/pkg-message +++ b/graphics/rawtherapee/pkg-message @@ -10,4 +10,3 @@ remove older cache directories. Also, after configurations have been moved to the new version's directory, older $HOME/.config/RawTherapee* directories may be removed. ====================================================================== - diff --git a/graphics/tumble/files/patch-parser.y b/graphics/tumble/files/patch-parser.y new file mode 100644 index 000000000000..499b51c0e3a6 --- /dev/null +++ b/graphics/tumble/files/patch-parser.y @@ -0,0 +1,20 @@ +--- parser.y.orig 2003-12-09 16:45:41 UTC ++++ parser.y +@@ -110,7 +110,7 @@ image_ranges: + + + input_file_clause: +- FILE_KEYWORD STRING ';' { input_set_file ($2) } ; ++ FILE_KEYWORD STRING ';' { input_set_file ($2); } ; + + image_clause: + IMAGE INTEGER ';' { range_t range = { $2, $2 }; input_images (range); } ; +@@ -119,7 +119,7 @@ images_clause: + IMAGES image_ranges ';' ; + + rotate_clause: +- ROTATE INTEGER ';' { input_set_rotation ($2) } ; ++ ROTATE INTEGER ';' { input_set_rotation ($2); } ; + + unit: + /* empty */ /* default to INCH */ { $$ = 1.0; } diff --git a/irc/irssi-fish/Makefile b/irc/irssi-fish/Makefile index 3c2ee3f5a1c0..dc529c122529 100644 --- a/irc/irssi-fish/Makefile +++ b/irc/irssi-fish/Makefile @@ -3,6 +3,7 @@ PORTNAME= irssi-fish DISTVERSION= 1.4.20160122 +PORTREVISION= 1 CATEGORIES= irc security MAINTAINER= ashish@FreeBSD.org diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile index dedd95cd4ad3..46bb534f652b 100644 --- a/japanese/cmigemo/Makefile +++ b/japanese/cmigemo/Makefile @@ -17,7 +17,7 @@ COMMENT= C implementation of Migemo Japanese incremental search tool LICENSE= MIT LICENSE_FILE= ${WRKSRC}/doc/LICENSE_MIT.txt -RUN_DEPENDS= ${DATADIR}/cp932/migemo-dict:japanese/cmigemo-dict +RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/cp932/migemo-dict:japanese/cmigemo-dict USE_LDCONFIG= yes diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile index 1af4b87fc190..679724ac7860 100644 --- a/japanese/font-ricty/Makefile +++ b/japanese/font-ricty/Makefile @@ -47,7 +47,7 @@ SUB_LIST+= DISCORD="" RICTY=\# .endif .if ${PORT_OPTIONS:MDISCORD} -RUN_DEPENDS+= ${DATADIR}/RictyDiscord-Regular.ttf:japanese/font-ricty-discord +RUN_DEPENDS+= ${LOCALBASE}/${DATADIR_REL}/RictyDiscord-Regular.ttf:japanese/font-ricty-discord .endif do-extract: diff --git a/japanese/ming/files/patch-actioncompiler-compile.h b/japanese/ming/files/patch-actioncompiler-compile.h new file mode 100644 index 000000000000..c9910c38984b --- /dev/null +++ b/japanese/ming/files/patch-actioncompiler-compile.h @@ -0,0 +1,11 @@ +--- actioncompiler/compile.h.orig 2002-06-24 12:21:54 UTC ++++ actioncompiler/compile.h +@@ -10,7 +10,7 @@ typedef struct _buffer *Buffer; + #include "action.h" + + /* shut up bison.simple */ +-void yyerror(char *msg); ++void yyerror(char *msg, char *yy_); + int yylex(); + + #ifndef max diff --git a/japanese/ming/files/patch-src_actioncompiler_swf4compiler.flex b/japanese/ming/files/patch-src_actioncompiler_swf4compiler.flex deleted file mode 100644 index 4fc84a49fd9e..000000000000 --- a/japanese/ming/files/patch-src_actioncompiler_swf4compiler.flex +++ /dev/null @@ -1,10 +0,0 @@ ---- actioncompiler/swf4compiler.flex~ 2002-06-24 21:21:54.000000000 +0900 -+++ actioncompiler/swf4compiler.flex 2013-03-14 04:49:15.000000000 +0900 -@@ -5,6 +5,7 @@ - - #include "compile.h" - #include "action.h" -+#define YYPARSE_PARAM buffer - #include "swf4compiler.tab.h" /* defines token types */ - - int swf4debug; diff --git a/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y b/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y index ea4a943ab75e..9b0ae34fc0be 100644 --- a/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y +++ b/japanese/ming/files/patch-src_actioncompiler_swf4compiler.y @@ -1,5 +1,18 @@ ---- actioncompiler/swf4compiler.y.orig Mon Dec 2 11:10:00 2002 -+++ actioncompiler/swf4compiler.y Mon Dec 2 11:12:15 2002 +--- actioncompiler/swf4compiler.y.orig 2002-06-24 12:21:54 UTC ++++ actioncompiler/swf4compiler.y +@@ -6,10 +6,10 @@ + #include + #include "compile.h" + +-#define YYPARSE_PARAM buffer +- + %} + ++%parse-param {void *buffer} ++ + %union { + Buffer action; + char *str; @@ -119,7 +119,6 @@ %type expr_opt %type void_function_call @@ -16,7 +29,7 @@ elems : elem -@@ -277,6 +277,7 @@ +@@ -277,6 +277,7 @@ if_stmt bufferWriteS16($3, bufferLength($5)); bufferConcat($3, $5); $$ = $3; } diff --git a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.flex b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.flex deleted file mode 100644 index 4a633d31b440..000000000000 --- a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.flex +++ /dev/null @@ -1,10 +0,0 @@ ---- actioncompiler/swf5compiler.flex~ 2013-03-14 04:53:36.000000000 +0900 -+++ actioncompiler/swf5compiler.flex 2013-03-14 04:52:36.000000000 +0900 -@@ -5,6 +5,7 @@ - - #include "compile.h" - #include "action.h" -+#define YYPARSE_PARAM buffer - #include "swf5compiler.tab.h" /* defines token types */ - - int swf5debug; diff --git a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y index 256f310123ed..273b5cbd412e 100644 --- a/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y +++ b/japanese/ming/files/patch-src_actioncompiler_swf5compiler.y @@ -1,5 +1,20 @@ ---- actioncompiler/swf5compiler.y.orig 2009-03-06 11:34:48.000000000 +0100 -+++ actioncompiler/swf5compiler.y 2009-03-06 11:37:13.000000000 +0100 +--- actioncompiler/swf5compiler.y.orig 2002-06-24 12:21:54 UTC ++++ actioncompiler/swf5compiler.y +@@ -8,12 +8,12 @@ + #include "compile.h" + #include "assembler.h" + +-#define YYPARSE_PARAM buffer +- + Buffer bf, bc; + + %} + ++%parse-param {void *buffer} ++ + %union + { + Buffer action; @@ -239,7 +239,7 @@ expr_opt switch_stmt diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile index 8bae46044485..a0769d017e5d 100644 --- a/japanese/vftool/Makefile +++ b/japanese/vftool/Makefile @@ -15,7 +15,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Virtual font kit (n2a,a2n,a2bk,p2pn) -BUILD_DEPENDS= ${AFMDIR}/GothicBBB-Medium-H:japanese/japaneseAFM +BUILD_DEPENDS= ${LOCALBASE}/share/fonts/afm/GothicBBB-Medium-H:japanese/japaneseAFM ALL_TARGET= n2a a2n a2bk p2pn SCRIPTS_ENV= MV=${MV} SED=${SED} AFMDIR=${AFMDIR} JFMDIR=${JFMDIR} diff --git a/japanese/wordpress/Makefile b/japanese/wordpress/Makefile index fcef8a2d131f..ba1dd854e655 100644 --- a/japanese/wordpress/Makefile +++ b/japanese/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ diff --git a/japanese/wordpress/distinfo b/japanese/wordpress/distinfo index 7bdbcbb8ce8f..d8ef20c3f233 100644 --- a/japanese/wordpress/distinfo +++ b/japanese/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481118915 -SHA256 (wordpress-4.7-ja.tar.gz) = 5a1c873046e50b059705a7c7957d56a59077ef3a703c207abf1401052602aad8 -SIZE (wordpress-4.7-ja.tar.gz) = 8488132 +TIMESTAMP = 1484377339 +SHA256 (wordpress-4.7.1-ja.tar.gz) = ff3acaf550deb3cab7a134951d5faa6cb641bacfbba07d5ddffeb6d7cb42fc2a +SIZE (wordpress-4.7.1-ja.tar.gz) = 8480453 diff --git a/japanese/xgate/Makefile b/japanese/xgate/Makefile index b76a85f28e4a..b3e80da39944 100644 --- a/japanese/xgate/Makefile +++ b/japanese/xgate/Makefile @@ -46,7 +46,7 @@ RESTRICTED= Commercial license .include -APP_HOME!= ${MAKE} -C ${PORTSDIR}/www/tomcat6 -VAPP_HOME +APP_HOME!= ${MAKE} -C ${PORTSDIR}/www/tomcat6 -VAPP_HOME PREFIX=${LOCALBASE} CNFLSTS= account/admin.ndt \ account/license.dat \ diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile index 71a2c487e6f0..b8ed172b2d42 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/jakarta-commons-httpclient/Makefile @@ -14,10 +14,10 @@ COMMENT= Package implementing the client side of the HTTP standard LICENSE= APACHE20 -BUILD_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging -BUILD_DEPENDS+= ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec -RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging -RUN_DEPENDS+= ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec +BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +BUILD_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS+= ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec OPTIONS_DEFINE= DOCS diff --git a/java/junit/Makefile b/java/junit/Makefile index d330d3469de6..50a67a780d65 100644 --- a/java/junit/Makefile +++ b/java/junit/Makefile @@ -11,7 +11,7 @@ EXTRACT_ONLY= MAINTAINER= danilo@FreeBSD.org COMMENT= Regression testing utility for use with the Java(TM) Language -RUN_DEPENDS= ${JAVAJARDIR}/hamcrest.jar:java/hamcrest +RUN_DEPENDS= ${JAVALIBDIR}/hamcrest.jar:java/hamcrest USE_JAVA= yes NO_BUILD= yes diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile index 0ad8ac464f1b..6a7bf27ef2ff 100644 --- a/korean/ko.TeX/Makefile +++ b/korean/ko.TeX/Makefile @@ -21,7 +21,7 @@ CONFLICTS= hlatex-[0-9]* NO_WRKSUBDIR= yes TEXMF= ${PREFIX}/share/texmf-local -BASE_MAP= ${TEXMF}/fonts/map/dvips/kotex/base/kotex-base.map +BASE_MAP= ${LOCALBASE}/share/texmf-local/fonts/map/dvips/kotex/base/kotex-base.map KOTEX_BIBTEX= ${TEXMF}/bibtex/bst/kotex KOTEX_DOC= ${TEXMF}/doc/latex/kotex KOTEX_LATEX= ${TEXMF}/tex/latex/kotex diff --git a/lang/clang37/Makefile b/lang/clang37/Makefile index 8ee3252a5cca..788ada95ae1c 100644 --- a/lang/clang37/Makefile +++ b/lang/clang37/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and C++ compiler (use devel/llvm${LLVM_SUFFIX}) -RUN_DEPENDS+= ${PREFIX}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} +RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} LLVM_SUFFIX= 37 diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index bd9d1c37b545..0e3eecd754f8 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 6.3.1.s20170105 +PORTVERSION= 6.3.1.s20170112 CATEGORIES= lang java MASTER_SITES= GCC/snapshots/${DISTVERSION} PKGNAMESUFFIX= ${SUFFIX}-devel @@ -13,7 +13,7 @@ COMMENT= GNU Compiler Collection 6 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BROKEN_powerpc64= Does not build +#BROKEN_powerpc64= Does not build LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ @@ -35,7 +35,7 @@ CPE_VERSION= ${GCC_VERSION} DISTVERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64 sparc64 arm armv6 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build @@ -73,7 +73,7 @@ CONFIGURE_ENV+= UNAME_m="powerpc64" USE_GCC= yes .endif -.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" +.if ${ARCH} == "armv6" || ${ARCH} == "aarch64" . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo index f7ddc810c7db..d8e85256058e 100644 --- a/lang/gcc6-devel/distinfo +++ b/lang/gcc6-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483838095 -SHA256 (gcc-6-20170105.tar.bz2) = 882c66e395b0df324654b26b5822de61ad71be3b4ffe07ac879f5da950038e5b -SIZE (gcc-6-20170105.tar.bz2) = 95667907 +TIMESTAMP = 1484305143 +SHA256 (gcc-6-20170112.tar.bz2) = 172ec626795597515e166dbf3875bfb0604860f1b86b58603bb33e1f77e28f08 +SIZE (gcc-6-20170112.tar.bz2) = 95706180 diff --git a/lang/hla/Makefile b/lang/hla/Makefile index 4d1d39580ad9..b524c4ca399d 100644 --- a/lang/hla/Makefile +++ b/lang/hla/Makefile @@ -12,7 +12,7 @@ EXTRACT_ONLY= ${PORTNAME}src${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= High Level Assembly -USES= bison zip:infozip +USES= bison dos2unix zip:infozip WRKSRC= ${WRKDIR}/hlasrc/trunk/trunk MAKEFILE= makefile.bsd diff --git a/lang/hla/files/patch-hlaparse.bsn b/lang/hla/files/patch-hlaparse.bsn new file mode 100644 index 000000000000..da50d7d26cf0 --- /dev/null +++ b/lang/hla/files/patch-hlaparse.bsn @@ -0,0 +1,107 @@ +--- hlaparse.bsn.orig 2017-01-09 13:30:03 UTC ++++ hlaparse.bsn +@@ -1,4 +1,4 @@ +-%pure_parser ++%define api.pure + + + /*****************************/ +@@ -2749,7 +2749,7 @@ doTextBlock: + + _here; + doTextBlock7( $3, YYS &$6 ); +- YYACCEPT ++ YYACCEPT; + } + + +@@ -2763,7 +2763,7 @@ doTextBlock: + + _here; + doTextBlock7a( $3, YYS &$6 ); +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -2811,7 +2811,7 @@ doStringBlock: + + _here; + doStringBlock( $3, YYS &$6 ); +- YYACCEPT ++ YYACCEPT; + } + + +@@ -2825,7 +2825,7 @@ doStringBlock: + + _here; + doStringBlocka( $3, YYS &$6 ); +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -2865,7 +2865,7 @@ doMatchBlock: + + _here; + doMatchBlock( $3, YYS &$6 ); +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -2900,7 +2900,7 @@ doPrint: + fputs( "\n", PrintOut ); + + _endif +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -2961,7 +2961,7 @@ doParseObjID: + _here; + memcpy( &d1dnReturnVal, &$2, sizeof( union YYSTYPE )); + _here; +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -2972,7 +2972,7 @@ doParseClassID: + _here; + memcpy( &d1dnReturnVal, &$2, sizeof( union YYSTYPE )); + _here; +- YYACCEPT ++ YYACCEPT; + } + ; + +@@ -10577,7 +10577,7 @@ OptionalInherit: + + Empty + { +- $$ = NULL ++ $$ = NULL; + } + + +@@ -10657,7 +10657,7 @@ OptInherits: + + Empty + { +- $-1 = NULL ++ $-1 = NULL; + } + + /* +@@ -28209,7 +28209,7 @@ OneOrMoreParms: + varTkn /* $4 */ + { + ProcGlobal = $3; +- fastLookup = 1 ++ fastLookup = 1; + } + ';' /* $6 */ + { /* $7 */ diff --git a/lang/js_of_ocaml/Makefile b/lang/js_of_ocaml/Makefile index f350e61a2632..3f72a4455d52 100644 --- a/lang/js_of_ocaml/Makefile +++ b/lang/js_of_ocaml/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ocaml-lwt>=2.3.0:devel/ocaml-lwt \ ${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \ ${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner -SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR} +SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} USES= gmake USE_OCAML= yes diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index 5a862d6ccc31..aa5c5cec31b4 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -12,9 +12,9 @@ COMMENT= Fast, compliant implementation of the Python language LIB_DEPENDS= libexpat.so:textproc/expat2 \ libffi.so:devel/libffi -TEST_DEPENDS= ${PREFIX}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \ - ${PREFIX}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \ - ${PREFIX}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter +TEST_DEPENDS= ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \ + ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \ + ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64 ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile index 897aa592e83b..0413a7e67204 100644 --- a/lang/rhino/Makefile +++ b/lang/rhino/Makefile @@ -41,7 +41,7 @@ GH_ACCOUNT= mozilla .include .if ${PORT_OPTIONS:MLINEDIT} -JLINEJAR= ${JAVAJARDIR}/jline.jar +JLINEJAR= ${JAVALIBDIR}/jline.jar .else JLINEJAR="" .endif diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 69bd3a78466c..4de3522dc14b 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ PORTNAME= sbcl -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.13 +DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= lang lisp -MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries -DISTFILES= sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \ - sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX} +MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pavelivolkov@gmail.com COMMENT= Common Lisp development system derived from the CMU CL system LICENSE= sbcl @@ -16,210 +15,109 @@ LICENSE_NAME= public domain | FreeBSD LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror pkg-mirror auto-accept dist-sell pkg-sell -LIB_DEPENDS= libgmp.so:math/gmp +LIB_DEPENDS= libgmp.so:math/gmp \ + libmpfr.so:math/mpfr -USES= gmake tar:bzip2 +USES= gmake makeinfo tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 -SBCL_HOME= ${PREFIX}/lib/sbcl -MANUALS= asdf.html sbcl.html -MODULESDOCS= asdf/README.md \ - asdf/README.SBCL \ - sb-aclrepl/README \ - sb-bsd-sockets/FAQ \ - sb-bsd-sockets/NEWS \ - sb-gmp/README.md \ - sb-md5/README \ - sb-mpfr/README.md \ - sb-posix/README \ - sb-rotate-byte/README \ - sb-simple-streams/README -TEXTDOCS= BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO -CFLAGS+= -fno-omit-frame-pointer -CPPFLAGS+= -I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\" -CONMODULES= asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency \ - sb-cover sb-executable sb-gmp sb-grovel sb-introspect \ - sb-md5 sb-mpfr sb-posix sb-queue sb-rotate-byte sb-rt \ - sb-simple-streams sb-sprof - -MAKE_SH_ARGS?= --prefix=${PREFIX} \ - --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \ - --with-sb-core-compression \ - --with-sb-qshow -NM?= /usr/bin/nm -NMFLAGS?= -gp - -BOOT_ARCH_OS_LIST= 1.0.31-amd64-freebsd8 1.0.31-i386-freebsd8 \ - 1.2.9-x86_64-dragonfly4 - -OPTIONS_DEFINE= SBCL #THREADS (don't build, see PR 184425) -SBCL_DESC= Bootstrap with installed SBCL binary, if available -THREADS_DESC= Experimental threading support - -.include - -NEWBOOTNAME= sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R} -PATTERN= *-${ARCH}-${OPSYS:tl}* -# FreeBSD hack is to support legacy make, add unrelated core fix while here -. if ${OPSYS} == FreeBSD -CORE= sbcl.core -BOOT_DISTNAME= sbcl-1.0.31-${ARCH}-freebsd8 -. else # newer core format -CORE= sbcl_core -BOOT_DISTNAME= sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}} -. endif - -.if make(makesum) || defined(FETCH_ALL) -. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST} -DISTFILES:= ${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries -. endfor -.else -DISTFILES:= ${DISTFILES} ${BOOT_DISTNAME}-binary.tar.bz2:binaries -.endif -.if ${ARCH} == "i386" -DYNAMIC_SPACE_SIZE?= 512 -PLIST_SUB+= I386_ONLY="" AMD64_ONLY="@comment " -SBCLCONFIG= Config.x86-${OPSYS:tl} -.else -DYNAMIC_SPACE_SIZE?= 1024 -PLIST_SUB+= I386_ONLY="@comment " AMD64_ONLY="" -SBCLCONFIG= Config.x86-64-${OPSYS:tl} -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -# If the SBCL option is enabled, try to use existing "sbcl" first: -.if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl) -XC_HOST?= ${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl \ - --core ${WRKDIR}/${BOOT_DISTNAME}/output/${CORE} \ - --dynamic-space-size ${DYNAMIC_SPACE_SIZE} \ - --disable-debugger \ - --userinit /dev/null \ - --sysinit /dev/null -MAKE_SH_ARGS+= --xc-host='${XC_HOST}' -.endif # SBCL - -.if ${PORT_OPTIONS:MTHREADS} -MAKE_SH_ARGS+= --with-sb-thread -. if defined(WITH_FUTEX) -MAKE_SH_ARGS+= --with-sb-futex -. else -MAKE_SH_ARGS+= --without-sb-futex -. endif -. if defined(WITH_SAFEPOINT) || defined(WITH_STRICT_SAFEPOINT) -MAKE_SH_ARGS+= --with-sb-safepoint --with-sb-thruption --with-sb-wtimer -. if defined(WITH_STRICT_SAFEPOINT) -MAKE_SH_ARGS+= --with-sb-safepoint-strictly -. else -MAKE_SH_ARGS+= --without-sb-safepoint-strictly -. endif -. else -MAKE_SH_ARGS+= --without-sb-safepoint \ - --without-sb-safepoint-strictly \ - --without-sb-thruption \ - --without-sb-wtimer -. endif -.else -MAKE_SH_ARGS+= --without-sb-thread +MAKE_SH_ARGS?= --prefix="${PREFIX}" \ + --xc-host="${XC_HOST}" + +# You can use the DYNAMIC_SPACE_SIZE knob to change the size of SBCL dynamically-allocated memory. +# Default for arch: i386 = 512Mb, amd64 = 1Gb. +.if defined(DYNAMIC_SPACE_SIZE) +MAKE_SH_ARGS+= --dynamic-space-size=${DYNAMIC_SPACE_SIZE} .endif -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "---------------------------------------------------------" - @${ECHO_MSG} "You might need to adjust memory limits in order to" - @${ECHO_MSG} "build SBCL." - @${ECHO_MSG} - @${ECHO_MSG} "You can use the DYNAMIC_SPACE_SIZE knob to change the size" - @${ECHO_MSG} "of SBCL dynamically-allocated memory." - @${ECHO_MSG} "---------------------------------------------------------" - @${ECHO_MSG} - -post-patch: - @${ECHO_CMD} "CC=${CC}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "CFLAGS=${CFLAGS}" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "CPPFLAGS=${CPPFLAGS}" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "GREP=${GREP}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "LD=${LD}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "LINKFLAGS=${LDFLAGS} -dynamic -rdynamic" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${REINPLACE_CMD} -E -e 's,-lthr,-lpthread,g' \ - ${WRKSRC}/src/runtime/${SBCLCONFIG} - @${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ - -e 's|\.core|_core|g' - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ - ${WRKSRC}/doc/sbcl.1 - @${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \ - -e 's!\$$(TEST_FILESTEM|x|1)_core!$${\1}_core!g' \ - ${WRKSRC}/tests/core.test.sh \ - ${WRKSRC}/tests/foreign.test.sh - @${REINPLACE_CMD} -E -e 's!"-O3"!!' \ - -e 's!("-sbcl-(pic|shared)"[[:blank:]]*)+!& ${CFLAGS:C/.*/"&"/}!' \ - ${WRKSRC}/tests/foreign-stack-alignment.impure.lisp \ - ${WRKSRC}/tests/kill-non-lisp-thread.impure.lisp \ - ${WRKSRC}/tests/swap-lispobjs.impure.lisp \ - ${WRKSRC}/tests/threads.impure.lisp - @${REINPLACE_CMD} -e 's|( cd ./doc ; sh ./clean.sh )|#&|' \ - ${WRKSRC}/clean.sh - @case "`${CC} --version`" in \ - *clang*) \ - ${REINPLACE_CMD} -e '/#define END()/s/\.end//' \ - ${WRKSRC}/src/runtime/x86-assem.S \ - ${WRKSRC}/src/runtime/x86-64-assem.S ;; \ - esac - ${REINPLACE_CMD} -e 's!/bin/bash!${LOCALBASE}&!' \ - ${WRKSRC}/release.sh \ - ${WRKSRC}/src/code/run-program.lisp \ - ${WRKSRC}/tests/run-compiler.sh - @${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete +# All options explained into file: ${WRKSRC}/base-target-features.lisp-expr +OPTIONS_DEFINE= DOCS QSHOW RENAME SAFEPOINT THREADS UNICODE XREF ZLIB +OPTIONS_DEFAULT=CCL UNICODE + +QSHOW_DESC= C runtime with low-level debugging output +RENAME_DESC= Rename suffix .core to _core +SAFEPOINT_DESC= Using safepoints instead of signals +XREF_DESC= XREF data for SBCL internals + +OPTIONS_SINGLE= BOOTSTRAP +OPTIONS_SINGLE_BOOTSTRAP= ABCL CCL CMUCL SBCL + +ABCL_DESC= Armed Bear Common Lisp +BOOTSTRAP_DESC= Supported languages of the build host +CCL_DESC= Clozure Common Lisp +CMUCL_DESC= Carnegie Mellon University Common Lisp +SBCL_DESC= Steel Bank Common Lisp + +# On this moment CMUCL - don't builds sbcl correctly, ABCL - I don't tested. Welcome volunteers. +OPTIONS_EXCLUDE=ABCL CMUCL + +ABCL_VARS= XC_HOST="abcl" +ABCL_BUILD_DEPENDS= abcl:lang/abcl + +CCL_VARS= XC_HOST="ccl --no-init --batch --quiet" +CCL_BUILD_DEPENDS= ccl:lang/ccl + +CMUCL_VARS= XC_HOST="lisp -nositeinit -noinit -batch -quiet" +CMUCL_BUILD_DEPENDS= lisp:lang/cmucl + +DOCS_VARS= INFO="asdf sbcl" + +QSHOW_VARS= MAKE_SH_ARGS+="--with-sb-qshow" +QSHOW_VARS_OFF= MAKE_SH_ARGS+="--without-sb-qshow" + +RENAME_PLIST_SUB= RENAME_DLM="_" +RENAME_PLIST_SUB_OFF= RENAME_DLM="." +RENAME_VARS= RENAME_DLM="_" +RENAME_VARS_OFF=RENAME_DLM="." + +SAFEPOINT_VARS= MAKE_SH_ARGS+="--with-sb-safepoint --with-sb-thruption --with-sb-wtimer" +SAFEPOINT_VARS_OFF= MAKE_SH_ARGS+="--without-sb-safepoint --without-sb-thruption --without-sb-wtimer" +SAFEPOINT_IMPLIES= THREADS + +SBCL_VARS= XC_HOST="sbcl --noinform --disable-debugger --no-sysinit --no-userinit" + +THREADS_VARS= MAKE_SH_ARGS+="--with-sb-thread --with-restore-fs-segment-register-from-tls" +THREADS_VARS_OFF= MAKE_SH_ARGS+="--without-sb-thread --without-restore-fs-segment-register-from-tls" + +UNICODE_VARS= MAKE_SH_ARGS+="--with-sb-unicode" +UNICODE_VARS_OFF= MAKE_SH_ARGS+="--without-sb-unicode" + +XREF_VARS= MAKE_SH_ARGS+="--with-sb-xref-for-internals" +XREF_VARS_OFF= MAKE_SH_ARGS+="--without-sb-xref-for-internals" + +ZLIB_VARS= MAKE_SH_ARGS+="--with-sb-core-compression" +ZLIB_VARS_OFF= MAKE_SH_ARGS+="--without-sb-core-compression" + +PORTDOCS= * + +post-patch-RENAME-on: + ${GREP} -Frl '.core' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|\.core|_core|g' do-build: - (cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS}) - ${RM} -r ${WRKSRC}/contrib/sb-cover/test-output - ${REINPLACE_CMD} -E -e \ - 's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \ - ${WRKSRC}/doc/sbcl.1 + (cd ${WRKSRC} && ${SH} make.sh ${MAKE_SH_ARGS}) do-install: - ${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib \ - ${STAGEDIR}${SBCL_HOME}/site-systems - ${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME} - ${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl \ - ${STAGEDIR}${SBCL_HOME}/contrib/ - ${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd \ - ${STAGEDIR}${SBCL_HOME}/contrib/ -.for MOD in ${CONMODULES} - ${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD} - - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp \ - ${STAGEDIR}${SBCL_HOME}/${MOD} - - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl \ - ${STAGEDIR}${SBCL_HOME}/${MOD} - - ${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/${MOD}.asd \ - ${STAGEDIR}${SBCL_HOME}/${MOD} -.endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/ - ${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} \ - ${STAGEDIR}${DOCSDIR}/ - ${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/ - ${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g} -. for MODDOC in ${MODULESDOCS} - ${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} \ - ${STAGEDIR}${DOCSDIR}/${MODDOC} -. endfor -.endif - ${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + (cd ${WRKSRC} && ${SETENV} \ + INSTALL_ROOT="${STAGEDIR}${PREFIX}" \ + MAN_DIR="${STAGEDIR}${MANPREFIX}/man" \ + INFO_DIR="${STAGEDIR}${PREFIX}/${INFO_PATH}" \ + DOC_DIR="${STAGEDIR}${DOCSDIR}" \ + ${SH} install.sh) -check regression-test test: build - (cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh) +post-build-DOCS-on: + ${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html -bootstrap: - ${CP} -r ${WRKSRC} ${WRKDIR}/${NEWBOOTNAME} - (cd ${WRKDIR}/ && \ - ${WRKDIR}/${NEWBOOTNAME}/binary-distribution.sh ${NEWBOOTNAME}) - (cd ${WRKDIR}/ && ${BZIP2_CMD} ${NEWBOOTNAME}-binary.tar) +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sbcl + +post-install-DOCS-on: + ${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/dir # don't requered with INFO= + ${RM} -r ${STAGEDIR}${DOCSDIR}/html # empty directory created by install.sh + +check regression-test test: build + (cd ${WRKSRC}/tests && ${SH} run-tests.sh) .include diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo index 1d6cc33a4afd..fa13748a9b82 100644 --- a/lang/sbcl/distinfo +++ b/lang/sbcl/distinfo @@ -1,10 +1,3 @@ -SHA256 (sbcl-1.3.1-source.tar.bz2) = a2e547e471a368349a43b1feee78ca6139aae0c60b8fcaa6ab0fd0e5b8e0ed3d -SIZE (sbcl-1.3.1-source.tar.bz2) = 5725055 -SHA256 (sbcl-1.3.1-documentation-html.tar.bz2) = 2c1cb5cf404761e4705a83acfe9d495f9716b6d0fe14499ad314e1b78b3cf828 -SIZE (sbcl-1.3.1-documentation-html.tar.bz2) = 220952 -SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e -SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764 -SHA256 (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7 -SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244 -SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc -SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580 +TIMESTAMP = 1483706842 +SHA256 (sbcl-1.3.13-source.tar.bz2) = 4c6935e4a9022637da95f2aab04d08326762f55a35942b40cb6a4276838c76cc +SIZE (sbcl-1.3.13-source.tar.bz2) = 5783599 diff --git a/lang/sbcl/files/patch-src_runtime_thread.c b/lang/sbcl/files/patch-src_runtime_thread.c new file mode 100644 index 000000000000..258cf1f59427 --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_thread.c @@ -0,0 +1,11 @@ +--- src/runtime/thread.c.orig 2017-01-06 06:49:29 UTC ++++ src/runtime/thread.c +@@ -50,7 +50,7 @@ + + #ifdef LISP_FEATURE_SB_THREAD + +-#ifdef LISP_FEATURE_OPENBSD ++#if defined(LISP_FEATURE_OPENBSD) || defined(LISP_FEATURE_FREEBSD) + #include + #endif + diff --git a/lang/sbcl/files/patch-src_runtime_x86-64-bsd-os.c b/lang/sbcl/files/patch-src_runtime_x86-64-bsd-os.c new file mode 100644 index 000000000000..8020b5e9b0ef --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_x86-64-bsd-os.c @@ -0,0 +1,16 @@ +--- src/runtime/x86-64-bsd-os.c.orig 2016-12-31 08:38:30 UTC ++++ src/runtime/x86-64-bsd-os.c +@@ -142,6 +142,13 @@ os_flush_icache(os_vm_address_t address, + { + } + ++#ifdef LISP_FEATURE_SB_THREAD ++void ++arch_os_load_ldt(struct thread *thread) ++{ ++} ++#endif ++ + int arch_os_thread_init(struct thread *thread) { + stack_t sigstack; + #ifdef LISP_FEATURE_SB_THREAD diff --git a/lang/sbcl/files/patch-tools-for-build_grovel-headers.c b/lang/sbcl/files/patch-tools-for-build_grovel-headers.c new file mode 100644 index 000000000000..50969c683c62 --- /dev/null +++ b/lang/sbcl/files/patch-tools-for-build_grovel-headers.c @@ -0,0 +1,11 @@ +--- tools-for-build/grovel-headers.c.orig 2017-01-06 07:13:57 UTC ++++ tools-for-build/grovel-headers.c +@@ -42,7 +42,7 @@ + #ifdef LISP_FEATURE_ANDROID + #include + #else +- #include ++ #include + #include + #endif + #include diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist index 01fa5a7ee1ce..d4d2d610aa46 100644 --- a/lang/sbcl/pkg-plist +++ b/lang/sbcl/pkg-plist @@ -1,7 +1,8 @@ bin/sbcl -lib/sbcl/asdf/asdf.lisp -lib/sbcl/asdf/uiop.lisp +lib/sbcl/sbcl%%RENAME_DLM%%core +@comment BEGIN external modules lib/sbcl/contrib/asdf.fasl +lib/sbcl/contrib/uiop.fasl lib/sbcl/contrib/sb-aclrepl.asd lib/sbcl/contrib/sb-aclrepl.fasl lib/sbcl/contrib/sb-bsd-sockets.asd @@ -36,130 +37,5 @@ lib/sbcl/contrib/sb-simple-streams.asd lib/sbcl/contrib/sb-simple-streams.fasl lib/sbcl/contrib/sb-sprof.asd lib/sbcl/contrib/sb-sprof.fasl -lib/sbcl/contrib/uiop.fasl -lib/sbcl/sb-aclrepl/debug.lisp -lib/sbcl/sb-aclrepl/inspect.lisp -lib/sbcl/sb-aclrepl/repl.lisp -lib/sbcl/sb-aclrepl/sb-aclrepl.asd -lib/sbcl/sb-aclrepl/tests.lisp -lib/sbcl/sb-aclrepl/toplevel.lisp -lib/sbcl/sb-bsd-sockets/constants.lisp -lib/sbcl/sb-bsd-sockets/defpackage.lisp -lib/sbcl/sb-bsd-sockets/inet.lisp -lib/sbcl/sb-bsd-sockets/inet4.lisp -lib/sbcl/sb-bsd-sockets/inet6.lisp -lib/sbcl/sb-bsd-sockets/local.lisp -lib/sbcl/sb-bsd-sockets/misc.lisp -lib/sbcl/sb-bsd-sockets/name-service.lisp -lib/sbcl/sb-bsd-sockets/protocol.lisp -lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd -lib/sbcl/sb-bsd-sockets/sockets.lisp -lib/sbcl/sb-bsd-sockets/sockopt.lisp -lib/sbcl/sb-bsd-sockets/tests.lisp -lib/sbcl/sb-bsd-sockets/util.lisp -lib/sbcl/sb-bsd-sockets/win32-constants.lisp -lib/sbcl/sb-bsd-sockets/win32-lib.lisp -lib/sbcl/sb-bsd-sockets/win32-sockets.lisp -lib/sbcl/sb-cltl2/compiler-let.lisp -lib/sbcl/sb-cltl2/defpackage.lisp -lib/sbcl/sb-cltl2/env.lisp -lib/sbcl/sb-cltl2/macroexpand.lisp -lib/sbcl/sb-cltl2/sb-cltl2.asd -lib/sbcl/sb-cltl2/tests.lisp -lib/sbcl/sb-concurrency/frlock.lisp -lib/sbcl/sb-concurrency/gate.lisp -lib/sbcl/sb-concurrency/mailbox.lisp -lib/sbcl/sb-concurrency/package.lisp -lib/sbcl/sb-concurrency/queue.lisp -lib/sbcl/sb-concurrency/sb-concurrency.asd -lib/sbcl/sb-cover/cover.lisp -lib/sbcl/sb-cover/sb-cover.asd -lib/sbcl/sb-cover/test-data-1.lisp -lib/sbcl/sb-cover/test-data-2.lisp -lib/sbcl/sb-cover/test-data-3.lisp -lib/sbcl/sb-cover/tests.lisp -lib/sbcl/sb-executable/sb-executable.lisp -lib/sbcl/sb-gmp/bench.lisp -lib/sbcl/sb-gmp/gmp.lisp -lib/sbcl/sb-gmp/sb-gmp.asd -lib/sbcl/sb-gmp/tests-stress.lisp -lib/sbcl/sb-gmp/tests.lisp -lib/sbcl/sb-grovel/def-to-lisp.lisp -lib/sbcl/sb-grovel/defpackage.lisp -lib/sbcl/sb-grovel/example-constants.lisp -lib/sbcl/sb-grovel/foreign-glue.lisp -lib/sbcl/sb-grovel/sb-grovel.asd -lib/sbcl/sb-introspect/introspect.lisp -lib/sbcl/sb-introspect/load-test.lisp -lib/sbcl/sb-introspect/sb-introspect.asd -lib/sbcl/sb-introspect/test-driver.lisp -lib/sbcl/sb-introspect/test.lisp -lib/sbcl/sb-introspect/xref-test-data.lisp -lib/sbcl/sb-introspect/xref-test.lisp -lib/sbcl/sb-md5/md5-tests.lisp -lib/sbcl/sb-md5/md5.lisp -lib/sbcl/sb-md5/sb-md5.asd -lib/sbcl/sb-mpfr/mpfr.lisp -lib/sbcl/sb-mpfr/sb-mpfr.asd -lib/sbcl/sb-mpfr/tests.lisp -lib/sbcl/sb-posix/constants.lisp -lib/sbcl/sb-posix/defpackage.lisp -lib/sbcl/sb-posix/designator.lisp -lib/sbcl/sb-posix/interface.lisp -lib/sbcl/sb-posix/macros.lisp -lib/sbcl/sb-posix/posix-tests.lisp -lib/sbcl/sb-posix/sb-posix.asd -lib/sbcl/sb-queue/package.lisp -lib/sbcl/sb-queue/sb-queue.asd -lib/sbcl/sb-rotate-byte/arm-vm.lisp -lib/sbcl/sb-rotate-byte/arm64-vm.lisp -lib/sbcl/sb-rotate-byte/compiler.lisp -lib/sbcl/sb-rotate-byte/package.lisp -lib/sbcl/sb-rotate-byte/ppc-vm.lisp -lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp -lib/sbcl/sb-rotate-byte/rotate-byte.lisp -lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd -lib/sbcl/sb-rotate-byte/x86-64-vm.lisp -lib/sbcl/sb-rotate-byte/x86-vm.lisp -lib/sbcl/sb-rt/rt.lisp -lib/sbcl/sb-rt/sb-rt.asd -lib/sbcl/sb-simple-streams/classes.lisp -lib/sbcl/sb-simple-streams/direct.lisp -lib/sbcl/sb-simple-streams/file.lisp -lib/sbcl/sb-simple-streams/fndb.lisp -lib/sbcl/sb-simple-streams/impl.lisp -lib/sbcl/sb-simple-streams/internal.lisp -lib/sbcl/sb-simple-streams/iodefs.lisp -lib/sbcl/sb-simple-streams/null.lisp -lib/sbcl/sb-simple-streams/package.lisp -lib/sbcl/sb-simple-streams/sb-simple-streams.asd -lib/sbcl/sb-simple-streams/simple-stream-tests.lisp -lib/sbcl/sb-simple-streams/socket.lisp -lib/sbcl/sb-simple-streams/strategy.lisp -lib/sbcl/sb-simple-streams/string.lisp -lib/sbcl/sb-simple-streams/terminal.lisp -lib/sbcl/sb-sprof/sb-sprof.lisp -lib/sbcl/sb-sprof/test.lisp -lib/sbcl/sbcl_core +@comment END external modules man/man1/sbcl.1.gz -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/PRINCIPLES -%%PORTDOCS%%%%DOCSDIR%%/TLA -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/asdf.html -%%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL -%%PORTDOCS%%%%DOCSDIR%%/asdf/README.md -%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README -%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ -%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS -%%PORTDOCS%%%%DOCSDIR%%/sb-gmp/README.md -%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README -%%PORTDOCS%%%%DOCSDIR%%/sb-mpfr/README.md -%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README -%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README -%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README -%%PORTDOCS%%%%DOCSDIR%%/sbcl.html -@dir lib/sbcl/site-systems diff --git a/mail/dma/Makefile b/mail/dma/Makefile index 6a893eb0119d..07591710c106 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -40,7 +40,7 @@ CONFFILES+= dma.conf auth.conf .include # 11.x has dma imported into base and /var/spool/dma added to mtree -.if ${OSVERSION} < 1100009 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100009 PLIST_SUB+= VARDIR="" .else PLIST_SUB+= VARDIR="@comment " diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile index 83a49174ad05..815504996d55 100644 --- a/mail/dovecot2-pigeonhole/Makefile +++ b/mail/dovecot2-pigeonhole/Makefile @@ -3,7 +3,7 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} diff --git a/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c new file mode 100644 index 000000000000..8876f6f9cce0 --- /dev/null +++ b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c @@ -0,0 +1,87 @@ +--- src/lib-sieve/sieve-result.c.orig 2016-10-20 22:48:08 UTC ++++ src/lib-sieve/sieve-result.c +@@ -928,7 +928,7 @@ static int _sieve_result_implicit_keep + (struct sieve_result *result, bool rollback) + { + const struct sieve_action_exec_env *aenv = &result->action_env; +- struct sieve_result_action *rac; ++ struct sieve_result_action *rac, *kac; + int status = SIEVE_EXEC_OK; + struct sieve_result_side_effect *rsef, *rsef_first = NULL; + void *tr_context = NULL; +@@ -937,38 +937,54 @@ static int _sieve_result_implicit_keep + if ( (aenv->flags & SIEVE_EXECUTE_FLAG_DEFER_KEEP) != 0 ) + return SIEVE_EXEC_OK; + +- if ( rollback ) { ++ if ( rollback ) + act_keep = result->failure_action; +- act_keep.mail = NULL; +- } else { ++ else + act_keep = result->keep_action; +- act_keep.mail = sieve_message_get_mail(aenv->msgctx); +- } ++ act_keep.mail = NULL; + + /* If keep is a non-action, return right away */ + if ( act_keep.def == NULL ) + return SIEVE_EXEC_OK; + +- /* Scan for execution of keep-equal actions */ +- rac = result->first_action; +- while ( rac != NULL ) { +- if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && +- act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && +- rac->action.executed ) +- return SIEVE_EXEC_OK; +- +- rac = rac->next; ++ /* Scan for deferred keep */ ++ kac = result->last_action; ++ while ( kac != NULL && kac->action.executed ) { ++ if ( kac->keep && kac->action.def == NULL ) ++ break; ++ kac = kac->prev; + } + +- /* Apply any implicit side effects if applicable */ +- if ( !rollback && hash_table_is_created(result->action_contexts) ) { +- struct sieve_result_action_context *actctx; ++ if (kac == NULL) { ++ if ( !rollback ) ++ act_keep.mail = sieve_message_get_mail(aenv->msgctx); + +- /* Check for implicit side effects to keep action */ +- actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ /* Scan for execution of keep-equal actions */ ++ rac = result->first_action; ++ while ( rac != NULL ) { ++ if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && ++ act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && ++ rac->action.executed ) ++ return SIEVE_EXEC_OK; + +- if ( actctx != NULL && actctx->seffects != NULL ) +- rsef_first = actctx->seffects->first_effect; ++ rac = rac->next; ++ } ++ ++ /* Apply any implicit side effects if applicable */ ++ if ( !rollback && hash_table_is_created(result->action_contexts) ) { ++ struct sieve_result_action_context *actctx; ++ ++ /* Check for implicit side effects to keep action */ ++ actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ ++ if ( actctx != NULL && actctx->seffects != NULL ) ++ rsef_first = actctx->seffects->first_effect; ++ } ++ } else if ( !rollback ) { ++ act_keep.location = kac->action.location; ++ act_keep.mail = kac->action.mail; ++ if ( kac->seffects != NULL ) ++ rsef_first = kac->seffects->first_effect; + } + + /* Start keep action */ diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile index 3e672fa8cad1..87f554d87687 100644 --- a/mail/gotmail/Makefile +++ b/mail/gotmail/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOCS .include -.if ${OSVERSION} < 1100077 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 # chmod -R bug post-extract: @${CHMOD} 755 ${WRKSRC} diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile index 488ef7d8bd6e..c8e078208d44 100644 --- a/mail/mime4j/Makefile +++ b/mail/mime4j/Makefile @@ -12,7 +12,7 @@ COMMENT= Java parser for e-mail message streams LICENSE= APACHE20 -RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging OPTIONS_DEFINE= DOCS diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index 071dcb865eea..a7aba1b0c597 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -25,7 +25,7 @@ TEST_DEPENDS= bash:shells/bash \ gsed:sysutils/coreutils \ gsha256sum:sysutils/coreutils \ gpg:security/gnupg \ - ${PREFIX}/bin/gdb:devel/gdb + ${LOCALBASE}/bin/gdb:devel/gdb BROKEN_powerpc64= Does not build @@ -41,7 +41,7 @@ TEST_ENV+= NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \ message-property" \ V=1 \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ - BSD_GDB=${PREFIX}/bin/gdb + BSD_GDB=${LOCALBASE}/bin/gdb TEST_TARGET= test diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile index 07e38ece32e7..c9b3bab0b119 100644 --- a/mail/p5-Email-Simple/Makefile +++ b/mail/p5-Email-Simple/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Email-Simple -PORTVERSION= 2.211 +PORTVERSION= 2.213 CATEGORIES= mail perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/mail/p5-Email-Simple/distinfo b/mail/p5-Email-Simple/distinfo index dd90af3d71ac..ec003492c18f 100644 --- a/mail/p5-Email-Simple/distinfo +++ b/mail/p5-Email-Simple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479554275 -SHA256 (Email-Simple-2.211.tar.gz) = 1cb9527d093765c007818f1082cb69f55902fa844eb48c9967944702b950c4c5 -SIZE (Email-Simple-2.211.tar.gz) = 38920 +TIMESTAMP = 1484304106 +SHA256 (Email-Simple-2.213.tar.gz) = cdb97a9d647231cc0f7207a31ed6ec5ffde6b8ac6504910dc378bf619ed57cc5 +SIZE (Email-Simple-2.213.tar.gz) = 39302 diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile index dcaeadfbd7d8..436cb09ae68b 100644 --- a/mail/squirrelmail-decode/Makefile +++ b/mail/squirrelmail-decode/Makefile @@ -13,7 +13,7 @@ COMMENT= Decoders to display extra character sets in SquirrelMail LICENSE= GPLv2 -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:mail/squirrelmail +RUN_DEPENDS= ${SQUIRRELDIR:S,^${PREFIX}/,${LOCALBASE}/,}/index.php:mail/squirrelmail USES= tar:bzip2 NO_BUILD= yes diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile index 5772287622d4..1624a30f2510 100644 --- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile +++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4.3 MAINTAINER= ports@FreeBSD.org COMMENT= Using the QmailAdmin cgi interface from SquirrelMail -RUN_DEPENDS= ${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:mail/qmailadmin +RUN_DEPENDS= ${LOCALBASE}/www/cgi-bin.default/qmailadmin/qmailadmin:mail/qmailadmin USE_GENERIC_PKGMESSAGE= yes diff --git a/mail/squirrelmail-tmda-plugin/Makefile b/mail/squirrelmail-tmda-plugin/Makefile index f79adc3c910a..e26836fdddd5 100644 --- a/mail/squirrelmail-tmda-plugin/Makefile +++ b/mail/squirrelmail-tmda-plugin/Makefile @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Adds TMDA support to SquirrelMail RUN_DEPENDS= tmda-filter:mail/tmda \ - ${SQUIRRELDIR}/index.php:mail/squirrelmail + ${SQUIRRELDIR:S,^${PREFIX}/,${LOCALBASE}/,}/index.php:mail/squirrelmail USES= perl5 NO_BUILD= yes diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk index 8fb89e36e8f8..596592030e1b 100644 --- a/mail/squirrelmail/bsd.squirrelmail.mk +++ b/mail/squirrelmail/bsd.squirrelmail.mk @@ -33,7 +33,7 @@ PKGNAMEPREFIX?= squirrelmail- PKGNAMESUFFIX?= -plugin DIST_SUBDIR?= squirrelmail -RUN_DEPENDS+= ${SQUIRRELDIR}/index.php:mail/squirrelmail +RUN_DEPENDS+= ${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelmail .ifdef USE_SM_COMPAT RUN_DEPENDS+= squirrelmail-compatibility-plugin>0:mail/squirrelmail-compatibility-plugin diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index e97fc098cfd7..33215781dc9a 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/mail/thunderbird/files/patch-bug1153151 b/mail/thunderbird/files/patch-bug1153151 new file mode 100644 index 000000000000..c6065391b096 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1153151 @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ mozilla/media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); diff --git a/mail/thunderbird/files/patch-bug1153179 b/mail/thunderbird/files/patch-bug1153179 new file mode 100644 index 000000000000..5e84e76b20c2 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1153179 @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- mozilla/media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ mozilla/media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile index 6a2bee5c8443..de9d668c59ca 100644 --- a/math/jlatexmath/Makefile +++ b/math/jlatexmath/Makefile @@ -28,7 +28,7 @@ FOP_DESC= textproc/fop plugin (required for math/scilab) FOP_BUILD_DEPENDS= fop:textproc/fop \ ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons FOP_RUN_DEPENDS:= ${FOP_BUILD_DEPENDS} \ - ${JAVASHAREDIR}/batik/batik.jar:graphics/batik \ + ${JAVALIBDIR}/../batik/batik.jar:graphics/batik \ ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ diff --git a/misc/Makefile b/misc/Makefile index 78a4ea037ed8..9e135c90d2f2 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -371,6 +371,7 @@ SUBDIR += proxyper SUBDIR += pspresent SUBDIR += py-YABT + SUBDIR += py-cinder SUBDIR += py-crudini SUBDIR += py-fuzzy SUBDIR += py-glance diff --git a/misc/bsod/Makefile b/misc/bsod/Makefile index 89d5536e3a6b..e415509dfa7d 100644 --- a/misc/bsod/Makefile +++ b/misc/bsod/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= DOCS do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -I${NCURSESINC} -L${NCURSESLIB} -lcurses -o ${PORTNAME} ${PORTNAME}.c + cd ${WRKSRC} && ${CC} ${CFLAGS} -I${NCURSESINC} -L${NCURSESLIB} -lncurses -o ${PORTNAME} ${PORTNAME}.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile new file mode 100644 index 000000000000..568765343437 --- /dev/null +++ b/misc/py-cinder/Makefile @@ -0,0 +1,105 @@ +# Created by: Alexander Nusov +# $FreeBSD$ + +PORTNAME= cinder +PORTVERSION= 9.1.1 +CATEGORIES= misc python +MASTER_SITES= https://fossies.org/linux/misc/openstack/ +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= alexander.nusov@nfvexpress.com +COMMENT= OpenStack Storage Service (Cinder) + +LICENSE= APACHE20 + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ + ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ + ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.7:net/py-ipaddress \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ + ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \ + ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ + ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \ + ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ + ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ + ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \ + ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ + ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware \ + ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \ + ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \ + ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz \ + ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan + +EXTRA_PATCHES= ${FILESDIR}/01-remotefs.patch:-p1 \ + ${FILESDIR}/02-nfs.patch:-p1 + +NO_ARCH= yes + +USES= python +USE_PYTHON= autoplist distutils + +USE_RC_SUBR= cinder-api \ + cinder-scheduler \ + cinder-volume +USERS= cinder +GROUPS= cinder + +post-extract: + @(cd ${WRKSRC}/etc/cinder; ${MV} logging_sample.conf logging.conf.sample) + @(cd ${WRKSRC}/etc/cinder; for f in *.conf; \ + do ${MV} $${f} $${f}.sample; done) + # No need to ship this README becuase it tells how to generate sample config + # file using tox, but we ship FreeBSD-friendly sample config already + @${RM} ${WRKSRC}/etc/cinder/README-cinder.conf.sample + +post-patch: + ${CP} ${FILESDIR}/cinder.conf.sample \ + ${WRKSRC}/etc/cinder/cinder.conf.sample + +post-install: + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${CP} -R ${WRKSRC}/etc/cinder/ ${STAGEDIR}${ETCDIR} + +.include diff --git a/misc/py-cinder/distinfo b/misc/py-cinder/distinfo new file mode 100644 index 000000000000..106ffb3061d2 --- /dev/null +++ b/misc/py-cinder/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1483236622 +SHA256 (cinder-9.1.1.tar.gz) = 455831c90ac6eafde83bb7b57d0c8ee0caf19a419bf760b2451aa7164cc9627d +SIZE (cinder-9.1.1.tar.gz) = 4201222 diff --git a/misc/py-cinder/files/01-remotefs.patch b/misc/py-cinder/files/01-remotefs.patch new file mode 100644 index 000000000000..791c9b5ac5ac --- /dev/null +++ b/misc/py-cinder/files/01-remotefs.patch @@ -0,0 +1,45 @@ +From 6c320b98634aa4d3d7b1e9f58b6ca19073cd0b32 Mon Sep 17 00:00:00 2001 +From: Alexander Nusov +Date: Mon, 12 Dec 2016 13:49:04 +0300 +Subject: [PATCH] fix remotefs + +--- + cinder/volume/drivers/remotefs.py | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py +index 0160b0a..d263bf3 100644 +--- a/cinder/volume/drivers/remotefs.py ++++ b/cinder/volume/drivers/remotefs.py +@@ -208,9 +208,9 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD): + provisioned_size = 0.0 + for share in self.shares.keys(): + mount_path = self._get_mount_point_for_share(share) +- out, _ = self._execute('du', '--bytes', mount_path, ++ out, _ = self._execute('du', '-k', mount_path, + run_as_root=True) +- provisioned_size += int(out.split()[0]) ++ provisioned_size += int(out.split()[0]) * 1024 + return round(provisioned_size / units.Gi, 2) + + def _get_mount_point_base(self): +@@ -824,13 +824,12 @@ class RemoteFSSnapDriverBase(RemoteFSDriver, driver.SnapshotVD): + """ + mount_point = self._get_mount_point_for_share(share) + +- out, _ = self._execute('df', '--portability', '--block-size', '1', +- mount_point, ++ out, _ = self._execute('df', '-k', mount_point, + run_as_root=self._execute_as_root) + out = out.splitlines()[1] + +- size = int(out.split()[1]) +- available = int(out.split()[3]) ++ size = int(out.split()[1]) * 1024 ++ available = int(out.split()[3]) * 1024 + + return available, size + +-- +2.8.1 + diff --git a/misc/py-cinder/files/02-nfs.patch b/misc/py-cinder/files/02-nfs.patch new file mode 100644 index 000000000000..d80819746222 --- /dev/null +++ b/misc/py-cinder/files/02-nfs.patch @@ -0,0 +1,41 @@ +diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py +index d495b4a..0fb33c6 100644 +--- a/cinder/volume/drivers/nfs.py ++++ b/cinder/volume/drivers/nfs.py +@@ -139,10 +139,10 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver): + + self.shares = {} # address : options + +- # Check if mount.nfs is installed on this system; note that we ++ # Check if mount_nfs is installed on this system; note that we + # need to be root, to also find mount.nfs on distributions, where + # it is not located in an unprivileged users PATH (e.g. /sbin). +- package = 'mount.nfs' ++ package = 'mount_nfs' + try: + self._execute(package, check_exit_code=False, + run_as_root=True) +@@ -299,16 +299,16 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver): + + mount_point = self._get_mount_point_for_share(nfs_share) + +- df, _ = self._execute('stat', '-f', '-c', '%S %b %a', mount_point, ++ df, _ = self._execute('df', '-k', mount_point, + run_as_root=run_as_root) +- block_size, blocks_total, blocks_avail = map(float, df.split()) +- total_available = block_size * blocks_avail +- total_size = block_size * blocks_total ++ df = df.splitlines()[1] ++ block_size = 1024 ++ total_available = block_size * int(df.split()[3]) ++ total_size = block_size * int(df.split()[1]) + +- du, _ = self._execute('du', '-sb', '--apparent-size', '--exclude', +- '*snapshot*', mount_point, ++ du, _ = self._execute('du', '-Aks', mount_point, + run_as_root=run_as_root) +- total_allocated = float(du.split()[0]) ++ total_allocated = float(du.split()[0]) * 1024 + return total_size, total_available, total_allocated + + def _get_mount_point_base(self): diff --git a/misc/py-cinder/files/cinder-api.in b/misc/py-cinder/files/cinder-api.in new file mode 100644 index 000000000000..d3eacd51ab63 --- /dev/null +++ b/misc/py-cinder/files/cinder-api.in @@ -0,0 +1,53 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: cinder_api +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable cinder_api: +# +# cinder_api_enable="YES" +# +# cinder_api_enable (bool): +# Set it to "YES" to enable cinder_api. +# Default is "NO". +# +# cinder_api_logdir (str): +# Set it to chagge log directory +# Default is "/var/log/cinder" +# +# cinder_api_args (str): +# Set it to change command line arguments. +# Default is "--log-file ${cinder_api_logdir}/cinder-api.log" +# + +. /etc/rc.subr + +name=cinder_api +rcvar=cinder_api_enable + +PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH + +pidfile="/var/run/cinder-api.pid" +procname="%%PREFIX%%/bin/python2.7" + +start_precmd=cinder_precmd + +load_rc_config $name + +: ${cinder_api_enable:="NO"} +: ${cinder_api_logdir:="/var/log/cinder"} +: ${cinder_api_args:="--log-file ${cinder_api_logdir}/cinder-api.log"} + +command="/usr/sbin/daemon" +command_args="-f -p ${pidfile} cinder-api ${cinder_api_args}" + +cinder_precmd() { + mkdir -p ${cinder_api_logdir} +} + +run_rc_command "$1" diff --git a/misc/py-cinder/files/cinder-scheduler.in b/misc/py-cinder/files/cinder-scheduler.in new file mode 100644 index 000000000000..91c20baaf243 --- /dev/null +++ b/misc/py-cinder/files/cinder-scheduler.in @@ -0,0 +1,53 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: cinder_scheduler +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable cinder_scheduler: +# +# cinder_scheduler_enable="YES" +# +# cinder_scheduler_enable (bool): +# Set it to "YES" to enable cinder_scheduler. +# Default is "NO". +# +# cinder_scheduler_logdir (str): +# Set it to chagge log directory +# Default is "/var/log/cinder" +# +# cinder_scheduler_args (str): +# Set it to change command line arguments. +# Default is "--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log" +# + +. /etc/rc.subr + +name=cinder_scheduler +rcvar=cinder_scheduler_enable + +PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH + +pidfile="/var/run/cinder-scheduler.pid" +procname="%%PREFIX%%/bin/python2.7" + +start_precmd=cinder_precmd + +load_rc_config $name + +: ${cinder_scheduler_enable:="NO"} +: ${cinder_scheduler_logdir:="/var/log/cinder"} +: ${cinder_scheduler_args:="--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"} + +command="/usr/sbin/daemon" +command_args="-f -p ${pidfile} cinder-scheduler ${cinder_scheduler_args}" + +cinder_precmd() { + mkdir -p ${cinder_scheduler_logdir} +} + +run_rc_command "$1" diff --git a/misc/py-cinder/files/cinder-volume.in b/misc/py-cinder/files/cinder-volume.in new file mode 100644 index 000000000000..c588827f5244 --- /dev/null +++ b/misc/py-cinder/files/cinder-volume.in @@ -0,0 +1,53 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: cinder_volume +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable cinder_volume: +# +# cinder_volume_enable="YES" +# +# cinder_volume_enable (bool): +# Set it to "YES" to enable cinder_volume. +# Default is "NO". +# +# cinder_volume_logdir (str): +# Set it to chagge log directory +# Default is "/var/log/cinder" +# +# cinder_volume_args (str): +# Set it to change command line arguments. +# Default is "--log-file ${cinder_volume_logdir}/cinder-volume.log" +# + +. /etc/rc.subr + +name=cinder_volume +rcvar=cinder_volume_enable + +PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH + +pidfile="/var/run/cinder-volume.pid" +procname="%%PREFIX%%/bin/python2.7" + +start_precmd=cinder_precmd + +load_rc_config $name + +: ${cinder_volume_enable:="NO"} +: ${cinder_volume_logdir:="/var/log/cinder"} +: ${cinder_volume_args:="--log-file ${cinder_volume_logdir}/cinder-volume.log"} + +command="/usr/sbin/daemon" +command_args="-f -p ${pidfile} cinder-volume ${cinder_volume_args}" + +cinder_precmd() { + mkdir -p ${cinder_volume_logdir} +} + +run_rc_command "$1" diff --git a/misc/py-cinder/files/cinder.conf.sample b/misc/py-cinder/files/cinder.conf.sample new file mode 100644 index 000000000000..5e6a5f386220 --- /dev/null +++ b/misc/py-cinder/files/cinder.conf.sample @@ -0,0 +1,32 @@ +[DEFAULT] +rootwrap_config = /usr/local/etc/cinder/rootwrap.conf +api_paste_confg = /usr/local/etc/cinder/api-paste.ini +iscsi_helper = tgtadm +volume_name_template = volume-%s +volume_group = cinder-volumes +verbose = True +auth_strategy = keystone +state_path = /var/lib/cinder +lock_path = /var/lock/cinder +volumes_dir = /var/lib/cinder/volumes +transport_url = rabbit://openstack:RABBIT_PASS@controller +my_ip = 192.168.1.30 +nfs_shares_config = /usr/local/etc/cinder/nfsshares +volume_driver = cinder.volume.drivers.nfs.NfsDriver + +[database] +connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder + +[keystone_authtoken] +auth_uri = http://controller:5000 +auth_url = http://controller:35357 +memcached_servers = controller:11211 +auth_type = password +project_domain_name = default +user_domain_name = default +project_name = service +username = cinder +password = cinder + +[oslo_concurrency] +lock_path = /var/lib/cinder/tmp diff --git a/misc/py-cinder/pkg-descr b/misc/py-cinder/pkg-descr new file mode 100644 index 000000000000..d5f78cad6994 --- /dev/null +++ b/misc/py-cinder/pkg-descr @@ -0,0 +1,10 @@ +Cinder is a Block Storage service for OpenStack. It's designed to present +storage resources to end users that can be consumed by the OpenStack Compute +Project (Nova). This is done through the use of either a reference +implementation (LVM) or plugin drivers for other storage. The short +description of Cinder is that it virtualizes the management of block storage +devices and provides end users with a self service API to request and consume +those resources without requiring any knowledge of where their storage is +actually deployed or on what type of device. + +WWW: http://openstack.org/cinder diff --git a/misc/py-cinder/pkg-message b/misc/py-cinder/pkg-message new file mode 100644 index 000000000000..a99ff34ba30a --- /dev/null +++ b/misc/py-cinder/pkg-message @@ -0,0 +1,5 @@ +Please note that this is a development version. +Only initial NFS support was added. + +Enable NFS client in rc.conf +# sysrc nfs_client_enable="YES" diff --git a/misc/py-cinder/pkg-plist b/misc/py-cinder/pkg-plist new file mode 100644 index 000000000000..b28ecd573b14 --- /dev/null +++ b/misc/py-cinder/pkg-plist @@ -0,0 +1,11 @@ +@owner cinder +@dir %%ETCDIR%% +@sample %%ETCDIR%%/api-httpd.conf.sample +@sample %%ETCDIR%%/logging.conf.sample +@sample %%ETCDIR%%/cinder.conf.sample +%%ETCDIR%%/api-paste.ini +%%ETCDIR%%/policy.json +@owner root +@sample %%ETCDIR%%/rootwrap.conf.sample +@dir etc/cinder/rootwrap.d +%%ETCDIR%%/rootwrap.d/volume.filters diff --git a/multimedia/avinfo/Makefile b/multimedia/avinfo/Makefile index fe1ecf1d297a..3343ac78dc87 100644 --- a/multimedia/avinfo/Makefile +++ b/multimedia/avinfo/Makefile @@ -20,9 +20,6 @@ PLIST_FILES= bin/${PORTNAME} \ PORTDOCS= * - -.include - post-patch: @${REINPLACE_CMD} -e '/^CC=/ d; /^CFLAGS=/ d; /^PREFIX=/ d' \ ${WRKSRC}/config.mk diff --git a/multimedia/avinfo/files/patch-src-ass.y b/multimedia/avinfo/files/patch-src-ass.y new file mode 100644 index 000000000000..1397c1b79dca --- /dev/null +++ b/multimedia/avinfo/files/patch-src-ass.y @@ -0,0 +1,33 @@ +--- src/ass.y.orig 2005-04-22 05:31:53 UTC ++++ src/ass.y +@@ -25,17 +25,17 @@ + #include "ass.h" + #include "ass.tab.h" + +-#define YYLEX_PARAM lexer_ctl +-#define YYPARSE_PARAM lexer_ctl + #define line (((lexerctl_t*)lexer_ctl)->line) + #define pos (((lexerctl_t*)lexer_ctl)->c) + +-int yyerror( const char *s ); ++int yyerror(void *lexer_ctl, const char *s); + int yylex (YYSTYPE *lval, void* lexer_ctl); + + %} + +-%pure_parser ++%define api.pure ++%lex-param {void *lexer_ctl} ++%parse-param {void *lexer_ctl} + + %union{ + int letter; +@@ -258,7 +258,7 @@ var_t Op(var_t var1, var_t var2, int op_ + return res; + } + +-int yyerror (const char *s) /* ¢ë§ë¢ ¥âáï yyparse ¢ á«ãç ¥ ®è¨¡ª¨ */ ++int yyerror (void *lexer_ctl, const char *s) /* ¢ë§ë¢ ¥âáï yyparse ¢ á«ãç ¥ ®è¨¡ª¨ */ + { + printf ("\n(error in template)\n"); + return 1; diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index fddbd9a8523c..9653fa7796fb 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -46,8 +46,10 @@ CONFLICTS= mplayer2-2.* CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= iconv pkgconfig +OPTIONS_SUB= yes + .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars" -.include +.include CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ @@ -63,56 +65,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} -PLIST_SUB+= GMPLAYER="" -DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false -.if ${PORT_OPTIONS:MSKINS} -RUN_DEPENDS+= mplayer-skins>=0:multimedia/mplayer-skins -.endif - -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gui - -.else -PLIST_SUB+= GMPLAYER="@comment " -.endif #GUI && X11 - -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xext xproto xscrnsaver -.if ${PORT_OPTIONS:MXVIDEO} -USE_XORG+= xv -.else -CONFIGURE_ARGS+=--disable-xv -.endif -.if ${PORT_OPTIONS:MX11DGA} -USE_XORG+= xxf86dga -.else -CONFIGURE_ARGS+=--disable-dga1 --disable-dga2 -.endif -.if ${PORT_OPTIONS:MOPENGL} -USE_GL+= gl -.else -CONFIGURE_ARGS+=--disable-gl -.endif -.if ${PORT_OPTIONS:MXINERAMA} -USE_XORG+= xinerama xineramaproto -.else -CONFIGURE_ARGS+=--disable-xinerama -.endif -.if ${PORT_OPTIONS:MX11VM} -USE_XORG+= xxf86vm -.else -CONFIGURE_ARGS+=--disable-vm -.endif -.if ${PORT_OPTIONS:MXVMC} -USE_XORG+= xvmc -CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW -.endif -.else #X11 -CONFIGURE_ARGS+=--disable-x11 -.endif - -.include .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options" BROKEN_armv6= Fails to compile: Error: garbage following instruction -- vmov s16,SCALE diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 14ab14ec1869..1afd477c6f61 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -52,6 +52,11 @@ GNUTLS_CONFIGURE_OFF= --disable-gnutls GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm +GUI_CONFIGURE_ENABLE= gui +GUI_USE= GNOME=gtk20 +GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false +GUI_IMPLIES= ASS X11 + IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-inet6 @@ -76,6 +81,10 @@ NAS_CONFIGURE_OFF= --disable-nas OPENAL_USES= openal:soft OPENAL_CONFIGURE_OFF= --disable-openal +OPENGL_USE= GL=gl +OPENGL_CONFIGURE_OFF= --disable-gl +OPENGL_IMPLIES= X11 + OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg @@ -104,6 +113,9 @@ SDL_CONFIGURE_OFF= --disable-sdl SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_OFF= --disable-sndio +SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins +SKINS_IMPLIES= GUI + SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_OFF= --disable-smb @@ -130,8 +142,31 @@ VDPAU_CONFIGURE_OFF= --disable-vdpau VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_OFF= --disable-libvpx-lavc +X11_USE= XORG=x11,xext,xproto,xscrnsaver +X11_CONFIGURE_OFF= --disable-x11 + +X11DGA_USE= XORG=xxf86dga +X11DGA_CONFIGURE_OFF= --disable-dga1 --disable-dga2 +X11DGA_IMPLIES= X11 + +X11VM_USE= XORG=xxf86vm +X11VM_CONFIGURE_OFF= --disable-vm +X11VM_IMPLIES= X11 + X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_OFF= --disable-x264 +XINERAMA_USE= XORG=xinerama,xineramaproto +XINERAMA_CONFIGURE_OFF= --disable-xinerama +XINERAMA_IMPLIES= X11 + XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_OFF= --disable-xvid + +XVIDEO_USE= XORG=xv +XVIDEO_CONFIGURE_OFF= --disable-xv +XVIDEO_IMPLIES= X11 + +XVMC_USE= XORG=xvmc +XVMC_CONFIGURE_ON= --enable-xvmc --with-xvmclib=XvMCW +XVMC_IMPLIES= X11 diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist index bc6c353f2828..98ee19b68b51 100644 --- a/multimedia/mplayer/pkg-plist +++ b/multimedia/mplayer/pkg-plist @@ -1,8 +1,8 @@ bin/mplayer man/man1/mplayer.1.gz -%%GMPLAYER%%bin/gmplayer -%%GMPLAYER%%man/man1/gmplayer.1.gz -%%GMPLAYER%%share/pixmaps/mplayer.png +%%GUI%%bin/gmplayer +%%GUI%%man/man1/gmplayer.1.gz +%%GUI%%share/pixmaps/mplayer.png %%DATADIR%%/examples/etc/example.conf %%DATADIR%%/examples/etc/input.conf %%DATADIR%%/examples/etc/menu.conf diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile index 681bd1f79fbb..1cd745728249 100644 --- a/multimedia/oggvideotools/Makefile +++ b/multimedia/oggvideotools/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= oggvideotools -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 0.9.1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME} @@ -13,12 +12,13 @@ COMMENT= Toolbox for manipulating Ogg video files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/boost/circular_buffer.hpp:devel/boost-libs LIB_DEPENDS= libgd.so:graphics/gd \ libogg.so:audio/libogg \ libtheora.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis -USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig +USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig tar:bz2 USE_CXXSTD= c++11 USE_SDL= sdl USE_LDCONFIG= yes diff --git a/multimedia/oggvideotools/distinfo b/multimedia/oggvideotools/distinfo index 93e8a5d1e901..9eec8be10b7a 100644 --- a/multimedia/oggvideotools/distinfo +++ b/multimedia/oggvideotools/distinfo @@ -1,2 +1,3 @@ -SHA256 (oggvideotools-0.9.tar.gz) = 16589d6f4b888ec3ed2c7cc22c915899a8ff1358a8a56cdfd91432cb6223cb79 -SIZE (oggvideotools-0.9.tar.gz) = 289859 +TIMESTAMP = 1484296740 +SHA256 (oggvideotools-0.9.1.tar.bz2) = d9dbf7897b7cea98612209d80b9127473c97d6ee6cb0dccfc2b38fe3e8e29523 +SIZE (oggvideotools-0.9.1.tar.bz2) = 264535 diff --git a/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp b/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp deleted file mode 100644 index 472bf0b6ce8b..000000000000 --- a/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/base/oggPacket.cpp.orig 2016-01-11 07:51:37 UTC -+++ src/base/oggPacket.cpp -@@ -34,7 +34,7 @@ streamType(OggType::unknown), streamNo(2 - - OggPacketInternal::OggPacketInternal(uint8* data, uint32 length, - uint32 packetNo, int64 granulePos, PacketType packetType) -- : oggPacket {/*packet*/data,/*bytes*/length, /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/granulePos, /*packetno*/packetNo}, -+ : oggPacket {/*packet*/data,/*bytes*/static_cast(length), /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/granulePos, /*packetno*/packetNo}, - streamType(OggType::unknown), streamNo(255), streamHeader(false) - { - switch (packetType) { diff --git a/multimedia/omxplayer/Makefile b/multimedia/omxplayer/Makefile index ee8dd8a45c3b..8feb3662772b 100644 --- a/multimedia/omxplayer/Makefile +++ b/multimedia/omxplayer/Makefile @@ -2,16 +2,17 @@ # $FreeBSD$ PORTNAME= omxplayer -PORTVERSION= 20151109 -PORTREVISION= 4 +PORTVERSION= 20161004 CATEGORIES= multimedia MAINTAINER= mikael.urankar@gmail.com COMMENT= Raspberry Pi video player LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libboost_thread.so:devel/boost-libs \ libdbus-1.so:devel/dbus \ libpcre.so:devel/pcre \ libEGL.so:misc/raspberrypi-userland \ @@ -27,10 +28,9 @@ ALL_TARGET= omxplayer.bin USE_GITHUB= yes GH_ACCOUNT= popcornmix -GH_TAGNAME= 6f073c9 +GH_TAGNAME= 12b472e USES= gmake shebangfix -USE_GCC= yes SHEBANG_FILES= omxplayer PLIST_FILES= bin/omxplayer bin/omxplayer.bin diff --git a/multimedia/omxplayer/distinfo b/multimedia/omxplayer/distinfo index 5ad130f387f9..305704271d90 100644 --- a/multimedia/omxplayer/distinfo +++ b/multimedia/omxplayer/distinfo @@ -1,2 +1,3 @@ -SHA256 (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = a88723f7f854386b53fb601b4f57cbad33a702556de83122661cc6cd5d877ff2 -SIZE (popcornmix-omxplayer-20151109-6f073c9_GH0.tar.gz) = 1203829 +TIMESTAMP = 1483038468 +SHA256 (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 8aabcc8a1665686dfb72e74b30b6f755a72b5e5577e235dad6c1c6d28dc79637 +SIZE (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 1218679 diff --git a/multimedia/omxplayer/files/patch-Makefile b/multimedia/omxplayer/files/patch-Makefile index 193a6d108ed6..46eb1104e76c 100644 --- a/multimedia/omxplayer/files/patch-Makefile +++ b/multimedia/omxplayer/files/patch-Makefile @@ -1,26 +1,26 @@ ---- Makefile.orig 2015-10-24 12:09:14 UTC +--- Makefile.orig 2016-09-14 UTC +++ Makefile @@ -2,9 +2,9 @@ include Makefile.include CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST --LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -+LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz +-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound ++LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include +INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg DIST ?= omxplayer-dist -@@ -48,11 +48,10 @@ all: dist +@@ -49,11 +49,10 @@ all: dist omxplayer.o: help.h keys.h version: - bash gen_version.sh > version.h -+ sh gen_version.sh > version.h ++ sh gen_version.sh > version.h omxplayer.bin: version $(OBJS) -- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre +- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre - $(STRIP) omxplayer.bin + $(CXX) $(CFLAGS) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lthr -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre diff --git a/multimedia/omxplayer/files/patch-Makefile.include b/multimedia/omxplayer/files/patch-Makefile.include index 87b1eafd4ad6..161cf0337962 100644 --- a/multimedia/omxplayer/files/patch-Makefile.include +++ b/multimedia/omxplayer/files/patch-Makefile.include @@ -1,6 +1,6 @@ ---- Makefile.include.orig 2015-10-24 12:09:14 UTC +--- Makefile.include.orig 2017-01-03 14:55:21 UTC +++ Makefile.include -@@ -1,40 +1,7 @@ +@@ -1,40 +1,3 @@ -USE_BUILDROOT=0 -FLOAT=hard - @@ -34,14 +34,13 @@ -RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib -STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip -AR := $(TOOLCHAIN)/bin/$(HOST)-ar -+LDFLAGS := -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg - CXXCP := $(CXX) -E +-CXXCP := $(CXX) -E -PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -+STRIP := strip -+FLOAT := softfp - - CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog +- +-CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog -LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build -#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 -INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include ++CFLAGS += -fomit-frame-pointer ++LDFLAGS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg +INCLUDES += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include diff --git a/multimedia/omxplayer/files/patch-omxplayer.cpp b/multimedia/omxplayer/files/patch-omxplayer.cpp index 59f9d245f506..7970c3d1bb35 100644 --- a/multimedia/omxplayer/files/patch-omxplayer.cpp +++ b/multimedia/omxplayer/files/patch-omxplayer.cpp @@ -6,8 +6,8 @@ bool m_has_external_subtitles = false; -std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"; -std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf"; -+std::string m_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSans.ttf"; -+std::string m_italic_font_path = "/usr/local/share/fonts/freefont-ttf/FreeSansOblique.ttf"; ++std::string m_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSans.ttf"; ++std::string m_italic_font_path = "LOCALBASE/share/fonts/freefont-ttf/FreeSansOblique.ttf"; std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer"; bool m_asked_for_font = false; bool m_asked_for_italic_font = false; diff --git a/multimedia/omxplayer/files/patch-utils_variant-impl.hpp b/multimedia/omxplayer/files/patch-utils_variant-impl.hpp new file mode 100644 index 000000000000..f98dd32303f5 --- /dev/null +++ b/multimedia/omxplayer/files/patch-utils_variant-impl.hpp @@ -0,0 +1,27 @@ +--- utils/variant-impl.hpp.orig 2017-01-02 19:30:30 UTC ++++ utils/variant-impl.hpp +@@ -306,12 +306,12 @@ struct get_index(); + static const bool is_relaxed_match = relaxed_same(); +- static const bool is_variant = is_variant::value; ++ static const bool is_variant_match = is_variant::value; + static const bool is_ud_match = Checker::value; +- static const bool is_strict_ud_match = is_ud_match && !is_variant; ++ static const bool is_strict_ud_match = is_ud_match && !is_variant_match; + + typedef typename get_index_of_variant::type variant_indices; +- static const int var_quality = is_variant ? variant_indices::quality - 2 : 0; ++ static const int var_quality = is_variant_match ? variant_indices::quality - 2 : 0; + + // Match quality: + // exact > su > rel > strict_ud > ud +@@ -335,7 +335,7 @@ struct get_index=1.0:devel/rubygem-eventmachine \ - rubygem-faraday>=0.9.0:www/rubygem-faraday\ + rubygem-faraday>=0.9.0:www/rubygem-faraday \ rubygem-faraday_middleware>=0.9:www/rubygem-faraday_middleware \ rubygem-hashie>=1.0:devel/rubygem-hashie \ rubygem-json1>=1.8.0:devel/rubygem-json1 \ diff --git a/net-im/rubygem-tinder/files/patch-gemspec b/net-im/rubygem-tinder/files/patch-gemspec new file mode 100644 index 000000000000..242a4aa720b5 --- /dev/null +++ b/net-im/rubygem-tinder/files/patch-gemspec @@ -0,0 +1,11 @@ +--- tinder.gemspec.orig 2017-01-15 03:44:25 UTC ++++ tinder.gemspec +@@ -23,7 +23,7 @@ Gem::Specification.new do |s| + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 0.9"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.9"]) + s.add_runtime_dependency(%q.freeze, [">= 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.8.0"]) diff --git a/net-mgmt/bgpq3/pkg-descr b/net-mgmt/bgpq3/pkg-descr index 9d1456a07d36..ec9778f5cb10 100644 --- a/net-mgmt/bgpq3/pkg-descr +++ b/net-mgmt/bgpq3/pkg-descr @@ -13,4 +13,4 @@ However, bgpq3 can not be used as a full replacement of bgpq, because: - GateD prefix-filters generation is not implemented (and not planned). - Cisco standard access-lists generation is not implemented (and not planned). -WWW: http://github.com/snar/bgpq3 +WWW: https://github.com/snar/bgpq3 diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.l b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.l new file mode 100644 index 000000000000..e3409a5e00c2 --- /dev/null +++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.l @@ -0,0 +1,11 @@ +--- src/rpsl/rpsl.l.orig 2012-07-31 12:10:39 UTC ++++ src/rpsl/rpsl.l +@@ -713,7 +713,7 @@ void handle_object_error(const char *s, + current_object->errors += buffer; + } + +-void rpslerror(const char *, ...) { ++void rpslerror(void *, const char *, ...) { + if (current_attribute) { + current_attribute->errorLine = errorLine; + current_attribute->errorColon = errorColon - yyleng; diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.y b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.y new file mode 100644 index 000000000000..7fece1407165 --- /dev/null +++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl.y @@ -0,0 +1,31 @@ +--- src/rpsl/rpsl.y.orig 2012-07-31 12:10:39 UTC ++++ src/rpsl/rpsl.y +@@ -75,7 +75,7 @@ extern void handle_object_error(const ch + extern void handle_warning(const char *, ...); + extern int yylex(); + char *token_name(int token_id); +-void rpslerror(const char *s, ...); ++void rpslerror(void *, const char *s, ...); + Attr *changeCurrentAttr(Attr *b); + void handleArgumentTypeError(char *attr, const char *method, int position, + const RPType *correctType, +@@ -83,7 +83,6 @@ void handleArgumentTypeError(char *attr, + const AttrMethod *searchMethod(const AttrRPAttr *rp_attr, const char *method, ItemList *args); + + /* argument to yyparse result of parsing should be stored here */ +-#define YYPARSE_PARAM object + #define yyschema schema + #define enable_yy_parser_debugging enable_rpsl_parser_debugging + +@@ -91,8 +90,9 @@ extern Object *current_object; + + %} + +-%name-prefix="rpsl" +-%output="rpsl.y.cc" ++%name-prefix "rpsl" ++%output "rpsl.y.cc" ++%parse-param {void *object} + + %expect 1 + diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile index e33ddc2e1b50..dd47385c66d0 100644 --- a/net-mgmt/rancid3/Makefile +++ b/net-mgmt/rancid3/Makefile @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 3.6.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -67,6 +67,7 @@ post-patch: .endif ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 + ${REINPLACE_CMD} 's|uid=`perl|uid=`${PERL}|' ${WRKSRC}/etc/rancid.conf.sample.in post-install: ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/hourly diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile index b37c8d3465a5..0e525faec177 100644 --- a/net-p2p/go-ethereum/Makefile +++ b/net-p2p/go-ethereum/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= go-ethereum -PORTVERSION= 1.5.4 +PORTVERSION= 1.5.6 DISTVERSIONPREFIX= v CATEGORIES= net-p2p diff --git a/net-p2p/go-ethereum/distinfo b/net-p2p/go-ethereum/distinfo index 3b747f54f617..61fc4543e5e0 100644 --- a/net-p2p/go-ethereum/distinfo +++ b/net-p2p/go-ethereum/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480864544 -SHA256 (ethereum-go-ethereum-v1.5.4_GH0.tar.gz) = 8dcf5e511b6255d20e00ba421d9c71cdb7204b63ff31f0202a51723501539038 -SIZE (ethereum-go-ethereum-v1.5.4_GH0.tar.gz) = 14950138 +TIMESTAMP = 1484341496 +SHA256 (ethereum-go-ethereum-v1.5.6_GH0.tar.gz) = c920db2fc93af73b998f6626b0a93c843de4bf05a6ec0cfbbecb0310426c5eac +SIZE (ethereum-go-ethereum-v1.5.6_GH0.tar.gz) = 14950086 diff --git a/net/Makefile b/net/Makefile index 460665846069..1db3a399ba28 100644 --- a/net/Makefile +++ b/net/Makefile @@ -119,6 +119,7 @@ SUBDIR += dshell SUBDIR += dtcp SUBDIR += dtcpclient + SUBDIR += dual-dhclient SUBDIR += e169-stats SUBDIR += easysoap SUBDIR += echoping diff --git a/net/dual-dhclient/Makefile b/net/dual-dhclient/Makefile new file mode 100644 index 000000000000..4e6cd1719e91 --- /dev/null +++ b/net/dual-dhclient/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= dual-dhclient +PORTVERSION= 1.0 +CATEGORIES= net +MASTER_SITES= # none +DISTFILES= # none +EXTRACT_ONLY= # none + +MAINTAINER= cperciva@FreeBSD.org +COMMENT= Spawns dhclients for a dual-stack network + +LICENSE= PD + +RUN_DEPENDS= ${LOCALBASE}/sbin/dhclient:net/isc-dhcp43-client + +NO_WRKSUBDIR= yes +NO_BUILD= yes + +PLIST_FILES= sbin/dual-dhclient + +do-install: + ${INSTALL_SCRIPT} ${FILESDIR}/dual-dhclient ${STAGEDIR}${PREFIX}/sbin + +.include diff --git a/net/dual-dhclient/files/dual-dhclient b/net/dual-dhclient/files/dual-dhclient new file mode 100644 index 000000000000..a3f619cc3fce --- /dev/null +++ b/net/dual-dhclient/files/dual-dhclient @@ -0,0 +1,8 @@ +#!/bin/sh + +# $FreeBSD$ + +# Public domain + +/sbin/dhclient "$@" +/usr/local/sbin/dhclient -6 -nw -cf /dev/null "$@" diff --git a/net/dual-dhclient/pkg-descr b/net/dual-dhclient/pkg-descr new file mode 100644 index 000000000000..37eac0c1eadc --- /dev/null +++ b/net/dual-dhclient/pkg-descr @@ -0,0 +1,3 @@ +This port provides a script which spawns both /sbin/dhclient and +/usr/local/sbin/dhclient -6; this simplifies the configuration needed to +run DHCP on both protocols of a dual-stack network. diff --git a/net/dual-dhclient/pkg-message b/net/dual-dhclient/pkg-message new file mode 100644 index 000000000000..612d137b1328 --- /dev/null +++ b/net/dual-dhclient/pkg-message @@ -0,0 +1,4 @@ +To enable dual-stack DHCP, set + dhclient_program="/usr/local/sbin/dual-dhclient" +in /etc/rc.conf (and make sure the appropriate ifconfig_* lines include +DHCP or SYNCDHCP). diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 5ba50f0916a6..866b9016d173 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mDNSResponder -PORTVERSION= 765.20.4 +PORTVERSION= 765.30.11 CATEGORIES= net dns MASTER_SITES= http://opensource.apple.com/tarballs/${PORTNAME}/ diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo index cd713da52bc0..1f808734f146 100644 --- a/net/mDNSResponder/distinfo +++ b/net/mDNSResponder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480794450 -SHA256 (mDNSResponder-765.20.4.tar.gz) = 1759d0fb52f6382b9d9fc43f53b8b4fd9a61da6aed96eddd86a05419825afdff -SIZE (mDNSResponder-765.20.4.tar.gz) = 2307562 +TIMESTAMP = 1484406576 +SHA256 (mDNSResponder-765.30.11.tar.gz) = e7a98aaa3a4327c65f19a2d656aa9e3ff0208c71773e9c2aecee48cf76e1e7a7 +SIZE (mDNSResponder-765.30.11.tar.gz) = 2315692 diff --git a/net/mtr-nox11/Makefile b/net/mtr-nox11/Makefile index 5d78217f7486..11fccc5c18f0 100644 --- a/net/mtr-nox11/Makefile +++ b/net/mtr-nox11/Makefile @@ -5,6 +5,8 @@ PKGNAMESUFFIX= -nox11 MASTERDIR= ${.CURDIR}/../mtr +CONFLICTS_INSTALL= mtr-[0-9]* + OPTIONS_EXCLUDE=X11 OPTIONS_FILE_UNSET= X11 diff --git a/net/multicat/files/patch-multicat.c b/net/multicat/files/patch-multicat.c new file mode 100644 index 000000000000..e5db18ba7e4d --- /dev/null +++ b/net/multicat/files/patch-multicat.c @@ -0,0 +1,28 @@ +--- multicat.c.orig 2016-10-07 14:32:44 UTC ++++ multicat.c +@@ -44,7 +44,7 @@ + #include + #include + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + # include + #endif + +@@ -280,14 +280,14 @@ static ssize_t raw_Write( const void *p_ + ssize_t i_ret; + struct iovec iov[2]; + +- #if defined(__FreeBSD__) ++ #if defined(__FreeBSD__) || defined(__DragonFly__) + pktheader.udph.uh_ulen + #else + pktheader.udph.len + #endif + = htons(sizeof(struct udphdr) + i_len); + +- #if defined(__FreeBSD__) ++ #if defined(__FreeBSD__) || defined(__DragonFly__) + pktheader.iph.ip_len = htons(sizeof(struct udprawpkt) + i_len); + #endif + diff --git a/net/multicat/files/patch-util.c b/net/multicat/files/patch-util.c new file mode 100644 index 000000000000..4374d3e96059 --- /dev/null +++ b/net/multicat/files/patch-util.c @@ -0,0 +1,56 @@ +--- util.c.orig 2016-10-07 14:32:44 UTC ++++ util.c +@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char + + close( i_fd ); + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + return ifr.ifr_index; + #else + return ifr.ifr_ifindex; +@@ -451,7 +451,7 @@ static void RawFillHeaders(struct udpraw + uint8_t ttl, uint8_t tos, uint16_t len) + { + #ifndef __APPLE__ +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + struct ip *iph = &(dgram->iph); + #else + struct iphdr *iph = &(dgram->iph); +@@ -468,7 +468,7 @@ static void RawFillHeaders(struct udpraw + printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst); + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + // Fill ip header + iph->ip_hl = 5; // ip header with no specific option + iph->ip_v = 4; +@@ -710,7 +710,7 @@ int OpenSocket( const char *_psz_arg, in + i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport, + ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0); + i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ); +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 ) + { + msg_Err( NULL, "unable to set socket (%s)", strerror(errno) ); +@@ -747,7 +747,7 @@ int OpenSocket( const char *_psz_arg, in + + if ( bind_addr.ss.ss_family != AF_UNSPEC ) + { +- #if !defined(__APPLE__) && !defined(__FreeBSD__) ++ #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) ) + { + struct ipv6_mreq imr; +@@ -827,7 +827,7 @@ normal_bind: + } + else + #endif +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) + if ( i_bind_if_index ) + { + /* Linux-specific interface-bound multicast */ diff --git a/net/multicat/files/patch-util.h b/net/multicat/files/patch-util.h new file mode 100644 index 000000000000..d54b9af6b63f --- /dev/null +++ b/net/multicat/files/patch-util.h @@ -0,0 +1,20 @@ +--- util.h.orig 2016-10-07 14:32:44 UTC ++++ util.h +@@ -24,7 +24,7 @@ + #include + #include + +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + #define POLLRDHUP 0 + /* uClibc may does not have clock_nanosleep() */ + #elif !defined (__UCLIBC__) || \ +@@ -59,7 +59,7 @@ typedef union + *****************************************************************************/ + struct udprawpkt { + #if !defined(__APPLE__) +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + struct ip iph; + #else + struct iphdr iph; diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile index 3c4450cb3561..ee9a4eb5e564 100644 --- a/net/py-maxminddb/Makefile +++ b/net/py-maxminddb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= maxminddb -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.3 DISTVERSIONPREFIX= v CATEGORIES= net python geography PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-maxminddb/distinfo b/net/py-maxminddb/distinfo index a0adcf5c589f..b8813c9a14d7 100644 --- a/net/py-maxminddb/distinfo +++ b/net/py-maxminddb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465846655 -SHA256 (maxmind-MaxMind-DB-Reader-python-v1.2.1_GH0.tar.gz) = 03941e0deca7d98b33cbf9e2ea26f50f22d85cbdbed0150cea3a78c374775753 -SIZE (maxmind-MaxMind-DB-Reader-python-v1.2.1_GH0.tar.gz) = 29118 +TIMESTAMP = 1484322587 +SHA256 (maxmind-MaxMind-DB-Reader-python-v1.2.3_GH0.tar.gz) = 44cbc7999cf2877cc960d3160d6d6b030c0c69895b659a3db005ead3303fa8a6 +SIZE (maxmind-MaxMind-DB-Reader-python-v1.2.3_GH0.tar.gz) = 29807 diff --git a/net/rubygem-dogapi/Makefile b/net/rubygem-dogapi/Makefile index 85cc5ab29fa9..48a9bc02b17b 100644 --- a/net/rubygem-dogapi/Makefile +++ b/net/rubygem-dogapi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dogapi -PORTVERSION= 1.23.0 +PORTVERSION= 1.24.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-dogapi/distinfo b/net/rubygem-dogapi/distinfo index 7804faab0275..2ddbd6a5a67c 100644 --- a/net/rubygem-dogapi/distinfo +++ b/net/rubygem-dogapi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480754893 -SHA256 (rubygem/dogapi-1.23.0.gem) = 51b1daf2fafa62adc54fdad7827fc1daed4bb952c06b5ef301966db3df86616a -SIZE (rubygem/dogapi-1.23.0.gem) = 29696 +TIMESTAMP = 1484304094 +SHA256 (rubygem/dogapi-1.24.0.gem) = 4e38a09e64fc2fe5f3414347e86ad5f557d4791ad548eece01a7810f3b8fbc29 +SIZE (rubygem/dogapi-1.24.0.gem) = 30208 diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile index e2e5175c2357..884439eda4d7 100644 --- a/net/rubygem-fog-google/Makefile +++ b/net/rubygem-fog-google/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fog-google -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.2 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-fog-google/distinfo b/net/rubygem-fog-google/distinfo index 3521d7dc06a6..dde6e15eb374 100644 --- a/net/rubygem-fog-google/distinfo +++ b/net/rubygem-fog-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482747901 -SHA256 (rubygem/fog-google-0.5.0.gem) = 2e15d5c745bb84a60ee2decb737316883e93238734e2a2148f6897c75e72391a -SIZE (rubygem/fog-google-0.5.0.gem) = 135168 +TIMESTAMP = 1484304902 +SHA256 (rubygem/fog-google-0.5.2.gem) = 36e4f91033dccac50be4155cd24fdd631fda88fbeb39f02dba10863fc84b9a8d +SIZE (rubygem/fog-google-0.5.2.gem) = 137216 diff --git a/net/rubygem-oauth2/Makefile b/net/rubygem-oauth2/Makefile index 12b4ecd85444..de402866bc9b 100644 --- a/net/rubygem-oauth2/Makefile +++ b/net/rubygem-oauth2/Makefile @@ -3,7 +3,7 @@ PORTNAME= oauth2 PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net rubygems MASTER_SITES= RG @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-faraday>=0.8:www/rubygem-faraday \ - rubygem-jwt>=1:www/rubygem-jwt \ + rubygem-jwt>=1.0:www/rubygem-jwt \ rubygem-multi_json>=1.3:devel/rubygem-multi_json \ rubygem-multi_xml>=0.5:textproc/rubygem-multi_xml \ rubygem-rack>=1.2:www/rubygem-rack diff --git a/net/rubygem-oauth2/files/patch-gemspec b/net/rubygem-oauth2/files/patch-gemspec new file mode 100644 index 000000000000..d1a55bf9223c --- /dev/null +++ b/net/rubygem-oauth2/files/patch-gemspec @@ -0,0 +1,11 @@ +--- oauth2.gemspec.orig 2017-01-15 03:55:34 UTC ++++ oauth2.gemspec +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["< 0.10", ">= 0.8"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.8"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.3"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.5"]) diff --git a/net/rubygem-omniauth-twitter/Makefile b/net/rubygem-omniauth-twitter/Makefile index 2df9a739b835..f710c0d395d6 100644 --- a/net/rubygem-omniauth-twitter/Makefile +++ b/net/rubygem-omniauth-twitter/Makefile @@ -2,6 +2,7 @@ PORTNAME= omniauth-twitter PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -10,8 +11,8 @@ COMMENT= OmniAuth strategy for Twitter LICENSE= MIT -RUN_DEPENDS= rubygem-json1>=1.3:devel/rubygem-json1 \ - rubygem-omniauth-oauth>=1.1:net/rubygem-omniauth-oauth +RUN_DEPENDS= rubygem-omniauth-oauth>=1.1:net/rubygem-omniauth-oauth \ + rubygem-rack>=0:www/rubygem-rack NO_ARCH= yes USE_RUBY= yes diff --git a/net/rubygem-t/Makefile b/net/rubygem-t/Makefile index c1434f91af00..5688ef7f894f 100644 --- a/net/rubygem-t/Makefile +++ b/net/rubygem-t/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= t -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 3.1.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -16,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-geokit>=1.9:graphics/rubygem-geokit \ rubygem-htmlentities>=4.3:textproc/rubygem-htmlentities \ rubygem-launchy>=2.4:devel/rubygem-launchy \ - rubygem-oauth>=0.4.7:net/rubygem-oauth \ + rubygem-oauth>=0.5.1:net/rubygem-oauth \ rubygem-retryable>=2.0:devel/rubygem-retryable \ rubygem-thor>=0.19.1:devel/rubygem-thor \ - rubygem-twitter>=5.16:net/rubygem-twitter + rubygem-twitter>=6.0:net/rubygem-twitter NO_ARCH= yes USE_RUBY= yes diff --git a/net/rubygem-t/distinfo b/net/rubygem-t/distinfo index 721c9bc76474..87d12c71dad9 100644 --- a/net/rubygem-t/distinfo +++ b/net/rubygem-t/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/t-2.10.0.gem) = f8701e1baa3e23590c1708f654fb4e7ff2e0f29caacf0a47d66b0da517533b9f -SIZE (rubygem/t-2.10.0.gem) = 29696 +TIMESTAMP = 1484449535 +SHA256 (rubygem/t-3.1.0.gem) = 6d9dabfc9e8f3251f07f24e72d5589d4531a3b55232dbf30d3d1a78018fe4562 +SIZE (rubygem/t-3.1.0.gem) = 29696 diff --git a/net/rubygem-t/files/patch-gemspec b/net/rubygem-t/files/patch-gemspec deleted file mode 100644 index 08a65f15ed0d..000000000000 --- a/net/rubygem-t/files/patch-gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- t.gemspec.orig 2016-03-31 18:31:01 UTC -+++ t.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - s.add_runtime_dependency(%q.freeze, ["~> 2.4"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.9"]) - s.add_runtime_dependency(%q.freeze, ["~> 4.3"]) -- s.add_runtime_dependency(%q.freeze, ["~> 0.4.7"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.4.7"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) - s.add_runtime_dependency(%q.freeze, ["< 2", ">= 0.19.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 5.16"]) diff --git a/net/rubygem-tweetstream/Makefile b/net/rubygem-tweetstream/Makefile index 027d4b1f689c..320d8715300b 100644 --- a/net/rubygem-tweetstream/Makefile +++ b/net/rubygem-tweetstream/Makefile @@ -3,6 +3,7 @@ PORTNAME= tweetstream PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-tweetstream/files/patch-gemspec b/net/rubygem-tweetstream/files/patch-gemspec new file mode 100644 index 000000000000..21234a7d7f64 --- /dev/null +++ b/net/rubygem-tweetstream/files/patch-gemspec @@ -0,0 +1,11 @@ +--- tweetstream.gemspec.orig 2017-01-15 03:03:29 UTC ++++ tweetstream.gemspec +@@ -25,7 +25,7 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, ["~> 1.1"]) + s.add_runtime_dependency(%q.freeze, [">= 1.1.1"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.3"]) +- s.add_runtime_dependency(%q.freeze, ["~> 5.5"]) ++ s.add_runtime_dependency(%q.freeze, [">= 5.5"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.3"]) + s.add_development_dependency(%q.freeze, ["~> 1.0"]) + else diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile index 5e7fd660d23e..f2e4105a5f78 100644 --- a/net/rubygem-twitter/Makefile +++ b/net/rubygem-twitter/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= twitter -PORTVERSION= 5.17.0 -PORTREVISION= 1 +PORTVERSION= 6.1.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -13,16 +12,15 @@ COMMENT= Ruby interface to the Twitter API LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \ +RUN_DEPENDS= rubygem-addressable>=2.5:www/rubygem-addressable \ rubygem-buftok>=0.2.0:devel/rubygem-buftok \ - rubygem-equalizer>=0.0.10:devel/rubygem-equalizer \ - rubygem-faraday>=0.9.0:www/rubygem-faraday \ - rubygem-http>=1.0:www/rubygem-http \ + rubygem-equalizer>=0.0.11:devel/rubygem-equalizer \ + rubygem-faraday>=0.11.0:www/rubygem-faraday \ + rubygem-http>=2.1:www/rubygem-http \ rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb \ - rubygem-json1>=1.8:devel/rubygem-json1 \ - rubygem-memoizable>=0.4.0:devel/rubygem-memoizable \ - rubygem-naught>=1.0:devel/rubygem-naught \ - rubygem-simple_oauth>=0.3.0:net/rubygem-simple_oauth + rubygem-memoizable>=0.4.2:devel/rubygem-memoizable \ + rubygem-naught>=1.1:devel/rubygem-naught \ + rubygem-simple_oauth>=0.3.1:net/rubygem-simple_oauth NO_ARCH= yes USE_RUBY= yes diff --git a/net/rubygem-twitter/distinfo b/net/rubygem-twitter/distinfo index 78a3be92b74d..5f58539e687d 100644 --- a/net/rubygem-twitter/distinfo +++ b/net/rubygem-twitter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481279883 -SHA256 (rubygem/twitter-5.17.0.gem) = d33185d7ac0ad384156571bc1c98dafaae6505853663be9cd5a892ace542a1db -SIZE (rubygem/twitter-5.17.0.gem) = 76288 +TIMESTAMP = 1484453297 +SHA256 (rubygem/twitter-6.1.0.gem) = 1b5d5d6237d7320668caed65b5ea0149b3758a74627ee83b7b9560f02ed83fd1 +SIZE (rubygem/twitter-6.1.0.gem) = 76288 diff --git a/net/rubygem-twitter/files/patch-gemspec b/net/rubygem-twitter/files/patch-gemspec deleted file mode 100644 index 7b5f2e1a2ec6..000000000000 --- a/net/rubygem-twitter/files/patch-gemspec +++ /dev/null @@ -1,14 +0,0 @@ ---- twitter.gemspec.orig 2016-03-31 14:36:51 UTC -+++ twitter.gemspec -@@ -23,9 +23,9 @@ Gem::Specification.new do |s| - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, ["~> 2.3"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.2.0"]) -- s.add_runtime_dependency(%q.freeze, ["= 0.0.10"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.0.10"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.6.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.8"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.4.0"]) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index 01dc3854fd09..5aae796196fc 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sngrep -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/sngrep/distinfo b/net/sngrep/distinfo index ef4773f7c49d..8a5b33e41097 100644 --- a/net/sngrep/distinfo +++ b/net/sngrep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473012330 -SHA256 (irontec-sngrep-v1.4.0_GH0.tar.gz) = 0be686901773c2648b504137b9bae5e3c7c1373f07ae3f943753cabe3e1b3c51 -SIZE (irontec-sngrep-v1.4.0_GH0.tar.gz) = 220018 +TIMESTAMP = 1484303997 +SHA256 (irontec-sngrep-v1.4.2_GH0.tar.gz) = 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 +SIZE (irontec-sngrep-v1.4.2_GH0.tar.gz) = 226630 diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile index 0b1d2842800a..36dbb99b439d 100644 --- a/net/tn5250j/Makefile +++ b/net/tn5250j/Makefile @@ -11,16 +11,16 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= saper@saper.info COMMENT= 5250 terminal emulator for the AS/400 written in Java -BUILD_DEPENDS= ${JAVAJARDIR}/mail.jar:java/javamail \ +BUILD_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail \ ${JYTHON_JAR}:lang/jython \ - ${JAVAJARDIR}/jt400.jar:sysutils/jtopen \ - ${JAVAJARDIR}/itext.jar:devel/itext \ - ${JAVAJARDIR}/log4j.jar:devel/log4j -RUN_DEPENDS= ${JAVAJARDIR}/mail.jar:java/javamail \ + ${JAVALIBDIR}/jt400.jar:sysutils/jtopen \ + ${JAVALIBDIR}/itext.jar:devel/itext \ + ${JAVALIBDIR}/log4j.jar:devel/log4j +RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail \ ${JYTHON_JAR}:lang/jython \ - ${JAVAJARDIR}/jt400.jar:sysutils/jtopen \ - ${JAVAJARDIR}/itext.jar:devel/itext \ - ${JAVAJARDIR}/log4j.jar:devel/log4j + ${JAVALIBDIR}/jt400.jar:sysutils/jtopen \ + ${JAVALIBDIR}/itext.jar:devel/itext \ + ${JAVALIBDIR}/log4j.jar:devel/log4j USES= dos2unix zip USE_ANT= yes diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile index c3d6efe89d27..843607313e39 100644 --- a/print/deforaos-pdfviewer/Makefile +++ b/print/deforaos-pdfviewer/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= pdfviewer -PORTVERSION= 0.0.1 -PORTREVISION= 9 +PORTVERSION= 0.0.2 CATEGORIES= print -MASTER_SITES= http://www.defora.org/os/download/download/3686/ +MASTER_SITES= http://www.defora.org/os/download/download/4431/ PKGNAMEPREFIX= deforaos- DISTNAME= PDFViewer-${PORTVERSION} @@ -16,12 +15,35 @@ LICENSE= GPLv3 LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ libDesktop.so:x11/deforaos-libdesktop \ - libpoppler-glib.so:graphics/poppler-glib + libpoppler-glib.so:graphics/poppler-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 MAKE_ARGS+= PREFIX=${PREFIX} USES= desktop-file-utils pkgconfig -USE_GNOME= gtk20 -PLIST_FILES= bin/pdfviewer \ - share/applications/pdfviewer.desktop +USE_GNOME= gtk20 gdkpixbuf2 cairo +MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc po|data po|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|po src tools|src tools|' \ + ${WRKSRC}/Makefile + +post-patch: + @${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pdfviewer .include diff --git a/print/deforaos-pdfviewer/distinfo b/print/deforaos-pdfviewer/distinfo index 9adfdb135672..8787bc0ff1f9 100644 --- a/print/deforaos-pdfviewer/distinfo +++ b/print/deforaos-pdfviewer/distinfo @@ -1,2 +1,3 @@ -SHA256 (PDFViewer-0.0.1.tar.gz) = a2fcb65413d6ee9955792e27cc9f5a9e784b0ad19d68760fc9d8e9fa42bb77c5 -SIZE (PDFViewer-0.0.1.tar.gz) = 20405 +TIMESTAMP = 1484322430 +SHA256 (PDFViewer-0.0.2.tar.gz) = f02c587f0aefbd2d7f681543938b55dfa8a53728d59087407e664c827e50c004 +SIZE (PDFViewer-0.0.2.tar.gz) = 28788 diff --git a/print/deforaos-pdfviewer/files/patch-doc_Makefile b/print/deforaos-pdfviewer/files/patch-doc_Makefile new file mode 100644 index 000000000000..ed1ad9cea75f --- /dev/null +++ b/print/deforaos-pdfviewer/files/patch-doc_Makefile @@ -0,0 +1,27 @@ +--- doc/Makefile.orig 2017-01-13 17:04:41 UTC ++++ doc/Makefile +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)pdfviewer.1 $(OBJDIR)pdfviewer.html $(OBJDIR)pdfviewer.xml ++TARGETS = $(OBJDIR)pdfviewer.1 $(OBJDIR)pdfviewer.xml + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -22,7 +22,6 @@ $(OBJDIR)pdfviewer.xml: pdfviewer.xml.in + clean: + $(RM) -- $(pdfviewer.1_OBJS) $(pdfviewer.html_OBJS) $(pdfviewer.xml_OBJS) + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.html" + ../tools/subst.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.xml" + + distclean: clean +@@ -30,10 +29,8 @@ distclean: clean + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)pdfviewer.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)pdfviewer.html" + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "pdfviewer.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "pdfviewer.html" + + .PHONY: all clean distclean install uninstall diff --git a/print/deforaos-pdfviewer/pkg-plist b/print/deforaos-pdfviewer/pkg-plist new file mode 100644 index 000000000000..756c65bf0cd1 --- /dev/null +++ b/print/deforaos-pdfviewer/pkg-plist @@ -0,0 +1,5 @@ +bin/pdfviewer +share/applications/deforaos-pdfviewer.desktop +%%NLS%%share/locale/es/LC_MESSAGES/PDFViewer.mo +%%NLS%%share/locale/fr/LC_MESSAGES/PDFViewer.mo +%%PORTDOCS%%man/man1/pdfviewer.1.gz diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile index d479dfe3d9ac..27fd26a7f07c 100644 --- a/print/pdfbox/Makefile +++ b/print/pdfbox/Makefile @@ -13,7 +13,7 @@ COMMENT= Java tool for working with PDF documents LICENSE= APACHE20 -RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:java/bouncycastle \ +RUN_DEPENDS= ${JAVALIBDIR}/bcmail.jar:java/bouncycastle \ ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging JAR_NAMES= pdfbox fontbox jempbox preflight xmpbox diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile index 42df52a1838e..077cea25ccf8 100644 --- a/russian/wordpress/Makefile +++ b/russian/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ diff --git a/russian/wordpress/distinfo b/russian/wordpress/distinfo index 12fb7c53eb4f..7cf8e84459aa 100644 --- a/russian/wordpress/distinfo +++ b/russian/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481647350 -SHA256 (wordpress-4.7-ru_RU.tar.gz) = 70e89422e56b06f1cdecd50a30a8c1cf70d341e72057c3707fbdd182edaa1cb9 -SIZE (wordpress-4.7-ru_RU.tar.gz) = 8509085 +TIMESTAMP = 1484377818 +SHA256 (wordpress-4.7.1-ru_RU.tar.gz) = 8ef03e691e45e473c5b53bd0fa2c67a701ec4012a70d6b2b051c6afed061d409 +SIZE (wordpress-4.7.1-ru_RU.tar.gz) = 8514608 diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index b279ed54ddeb..1951678b7c02 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.1.16 -PORTREVISION= 2 +PORTVERSION= 2.1.17 CATEGORIES= security MASTER_SITES= GNUPG @@ -32,12 +31,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ntbtls --enable-symcryptrun --disable-wks-tools INFO= gnupg -OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG +OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON NLS DOCS SUID_GPG OPTIONS_DEFAULT=GNUTLS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes -KDNS_DESC= Use DNS CERT helper LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG with suid @@ -46,9 +44,6 @@ SUID_GPG_DESC= Install GPG with suid GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -KDNS_LIB_DEPENDS= libadns.so:dns/adns -KDNS_CONFIGURE_WITH= adns=${LOCALBASE} - LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index fc09aa17c5c0..7208063d63b0 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484015793 -SHA256 (gnupg-2.1.16.tar.bz2) = 49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844 -SIZE (gnupg-2.1.16.tar.bz2) = 5840687 +TIMESTAMP = 1484371610 +SHA256 (gnupg-2.1.17.tar.bz2) = c5dc54db432209fa8f9bdb071c8fb60a765ff28e363150e30bdd4543160243cb +SIZE (gnupg-2.1.17.tar.bz2) = 5970042 diff --git a/security/gnupg/files/patch-tools_Makefile.in b/security/gnupg/files/patch-tools_Makefile.in deleted file mode 100644 index 39909747c5e7..000000000000 --- a/security/gnupg/files/patch-tools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/Makefile.in.orig 2016-11-19 11:06:10 UTC -+++ tools/Makefile.in -@@ -669,7 +669,7 @@ gpg_wks_client_SOURCES = \ - gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) - gpg_wks_client_LDADD = $(libcommon) \ - $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ -- $(LIBICONV) -+ $(LIBICONV) $(LIBINTL) - - all: all-am - diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index af2eb77a8ddf..dc843680ebb0 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -52,6 +52,7 @@ sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket +%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-browser.socket %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service diff --git a/security/gnupg20/Makefile b/security/gnupg20/Makefile index 8224c93a068d..2abe40e5c046 100644 --- a/security/gnupg20/Makefile +++ b/security/gnupg20/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.0.29 -PORTREVISION= 2 +PORTVERSION= 2.0.30 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 20 diff --git a/security/gnupg20/distinfo b/security/gnupg20/distinfo index f4f34d2d1704..8ca6c0a77bb3 100644 --- a/security/gnupg20/distinfo +++ b/security/gnupg20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484015814 -SHA256 (gnupg-2.0.29.tar.bz2) = 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 -SIZE (gnupg-2.0.29.tar.bz2) = 4416251 +TIMESTAMP = 1484437262 +SHA256 (gnupg-2.0.30.tar.bz2) = e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 +SIZE (gnupg-2.0.30.tar.bz2) = 4414652 diff --git a/security/gnupg20/files/patch-doc-Makefile.in b/security/gnupg20/files/patch-doc-Makefile.in deleted file mode 100644 index e19e09b0ef7d..000000000000 --- a/security/gnupg20/files/patch-doc-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig 2015-09-08 14:12:05 UTC -+++ doc/Makefile.in -@@ -473,7 +473,7 @@ myman_sources = gnupg7.texi gpg.texi gpg - myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \ - watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ - gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \ -- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 -+ gpgsm-gencert.sh.1 applygnupgdefaults.8 - - man_MANS = $(myman_pages) - noinst_MANS = gnupg.7 diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile index c4e1bdc97150..f0151332cccf 100644 --- a/security/p5-Crypt-SaltedHash/Makefile +++ b/security/p5-Crypt-SaltedHash/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Crypt-SaltedHash -PORTVERSION= 0.06 -PORTREVISION= 1 +PORTVERSION= 0.09 CATEGORIES= security perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:ESSKAR @@ -12,7 +11,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= skreuzer@FreeBSD.org COMMENT= Perl extension to work with salted hashes +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + +NO_ARCH= yes USES= perl5 -USE_PERL5= modbuild +USE_PERL5= configure .include diff --git a/security/p5-Crypt-SaltedHash/distinfo b/security/p5-Crypt-SaltedHash/distinfo index 5cbe5ab09ea8..898ea1cd6b19 100644 --- a/security/p5-Crypt-SaltedHash/distinfo +++ b/security/p5-Crypt-SaltedHash/distinfo @@ -1,2 +1,3 @@ -SHA256 (Crypt-SaltedHash-0.06.tar.gz) = 5201bd735f920ac8a57454ddc3f8510191bd3a5ab939051efdf7034fde5aa428 -SIZE (Crypt-SaltedHash-0.06.tar.gz) = 9423 +TIMESTAMP = 1484254509 +SHA256 (Crypt-SaltedHash-0.09.tar.gz) = 1d1d2eb2bc2ee9bc4b9fde6909cb8b1abfeced7e75b16e8a23312ff354cc8438 +SIZE (Crypt-SaltedHash-0.09.tar.gz) = 14855 diff --git a/security/p5-Net-SSL-ExpireDate/Makefile b/security/p5-Net-SSL-ExpireDate/Makefile index ae8eaf0a35eb..1048591b9945 100644 --- a/security/p5-Net-SSL-ExpireDate/Makefile +++ b/security/p5-Net-SSL-ExpireDate/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-SSL-ExpireDate -PORTVERSION= 1.18 +PORTVERSION= 1.19 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/security/p5-Net-SSL-ExpireDate/distinfo b/security/p5-Net-SSL-ExpireDate/distinfo index f99ec826b5ce..af2276c38481 100644 --- a/security/p5-Net-SSL-ExpireDate/distinfo +++ b/security/p5-Net-SSL-ExpireDate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484155861 -SHA256 (Net-SSL-ExpireDate-1.18.tar.gz) = 8066ebc9893565c44e8514e32c8e15d85456aadf5bbf27244a79828b3debd1ff -SIZE (Net-SSL-ExpireDate-1.18.tar.gz) = 55001 +TIMESTAMP = 1484432548 +SHA256 (Net-SSL-ExpireDate-1.19.tar.gz) = f61a61bbd3d193c7b2e9776a11505d2e619ee08e82dc405f8b3c0a513b48b710 +SIZE (Net-SSL-ExpireDate-1.19.tar.gz) = 55282 diff --git a/security/sqlmap/Makefile b/security/sqlmap/Makefile index 01240c5778f9..ddc7e566817c 100644 --- a/security/sqlmap/Makefile +++ b/security/sqlmap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sqlmap -PORTVERSION= 1.0.12 +PORTVERSION= 1.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP diff --git a/security/sqlmap/distinfo b/security/sqlmap/distinfo index 961a6249f72b..edca24098305 100644 --- a/security/sqlmap/distinfo +++ b/security/sqlmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481319720 -SHA256 (sqlmap-1.0.12.tar.gz) = e69ac616bf75b336c07d57e645061fb2bdfebc9c040c1412ddbccb41449942a8 -SIZE (sqlmap-1.0.12.tar.gz) = 6736351 +TIMESTAMP = 1483434958 +SHA256 (sqlmap-1.1.tar.gz) = f1d90a6074428c73a20f4288fea8ceab3e35c19fc9446432f5cc1c2eca15a75f +SIZE (sqlmap-1.1.tar.gz) = 6736690 diff --git a/sysutils/Makefile b/sysutils/Makefile index 95c95b1f4007..afc76e9de297 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -754,6 +754,7 @@ SUBDIR += packetbeat SUBDIR += pacman SUBDIR += paicc + SUBDIR += paladin SUBDIR += pam_mount SUBDIR += panicmail SUBDIR += parafly @@ -856,6 +857,7 @@ SUBDIR += py-glances SUBDIR += py-halite SUBDIR += py-honcho + SUBDIR += py-iocage SUBDIR += py-iowait SUBDIR += py-nagiosplugin SUBDIR += py-pkginfo diff --git a/sysutils/filebeat/Makefile b/sysutils/filebeat/Makefile index 20baf3246e7c..e88115a40bae 100644 --- a/sysutils/filebeat/Makefile +++ b/sysutils/filebeat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= filebeat -PORTVERSION= 5.1.1 +PORTVERSION= 5.1.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/filebeat/distinfo b/sysutils/filebeat/distinfo index c5c8a807a872..9acd012806ba 100644 --- a/sysutils/filebeat/distinfo +++ b/sysutils/filebeat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481468225 -SHA256 (elastic-beats-v5.1.1_GH0.tar.gz) = f280b975afffd5c2e9ddb9aef2823aff065aec8c41325999c2721fa2770dafb0 -SIZE (elastic-beats-v5.1.1_GH0.tar.gz) = 16500866 +TIMESTAMP = 1484404106 +SHA256 (elastic-beats-v5.1.2_GH0.tar.gz) = 7cd554f8be6b02290ebbc17c9820acde3dc59108672ced7a0cf5486faa3e23ce +SIZE (elastic-beats-v5.1.2_GH0.tar.gz) = 16512836 diff --git a/sysutils/gpart/files/patch-src_l64seek.h b/sysutils/gpart/files/patch-src_l64seek.h new file mode 100644 index 000000000000..dce880f6f65d --- /dev/null +++ b/sysutils/gpart/files/patch-src_l64seek.h @@ -0,0 +1,11 @@ +--- src/l64seek.h.orig 2000-12-13 22:56:07 UTC ++++ src/l64seek.h +@@ -33,7 +33,7 @@ + #endif + + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + typedef off_t off64_t; + #endif + diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index afaea171d81b..40a7adcd7259 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -3,6 +3,7 @@ PORTNAME= lsof DISTVERSION= 4.90G +PORTREVISION= 1 PORTEPOCH= 8 CATEGORIES= sysutils MASTER_SITES= http://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \ diff --git a/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h b/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h new file mode 100644 index 000000000000..5e802cc96f93 --- /dev/null +++ b/sysutils/lsof/files/patch-dialects_freebsd_dlsof.h @@ -0,0 +1,10 @@ +--- dialects/freebsd/dlsof.h.orig 2016-09-22 20:02:53 UTC ++++ dialects/freebsd/dlsof.h +@@ -87,6 +87,7 @@ + #define boolean_t int + # endif /* defined(NEEDS_BOOLEAN_T) */ + ++#define KLD_MODULE + #include + + # if defined(HAS_VM_MEMATTR_T) diff --git a/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c b/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c new file mode 100644 index 000000000000..3b46e7607c77 --- /dev/null +++ b/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c @@ -0,0 +1,11 @@ +--- dialects/freebsd/dnode2.c.orig 2016-09-22 20:02:53 UTC ++++ dialects/freebsd/dnode2.c +@@ -51,7 +51,7 @@ static char *rcsid = "$Id: dnode2.c,v 1. + */ + #define VOP_UNLOCK(vp, f) ((void)0) + # endif /* defined(__clang__) */ +- ++#define KLD_MODULE + #include + #undef _KERNEL + diff --git a/sysutils/metricbeat/Makefile b/sysutils/metricbeat/Makefile index 7e162228001f..00cca15d0c50 100644 --- a/sysutils/metricbeat/Makefile +++ b/sysutils/metricbeat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= metricbeat -PORTVERSION= 5.1.1 +PORTVERSION= 5.1.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/metricbeat/distinfo b/sysutils/metricbeat/distinfo index c5c8a807a872..1402fc65ff55 100644 --- a/sysutils/metricbeat/distinfo +++ b/sysutils/metricbeat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481468225 -SHA256 (elastic-beats-v5.1.1_GH0.tar.gz) = f280b975afffd5c2e9ddb9aef2823aff065aec8c41325999c2721fa2770dafb0 -SIZE (elastic-beats-v5.1.1_GH0.tar.gz) = 16500866 +TIMESTAMP = 1484404107 +SHA256 (elastic-beats-v5.1.2_GH0.tar.gz) = 7cd554f8be6b02290ebbc17c9820acde3dc59108672ced7a0cf5486faa3e23ce +SIZE (elastic-beats-v5.1.2_GH0.tar.gz) = 16512836 diff --git a/sysutils/packetbeat/Makefile b/sysutils/packetbeat/Makefile index f2e11d06db76..0d0c7a618732 100644 --- a/sysutils/packetbeat/Makefile +++ b/sysutils/packetbeat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= packetbeat -PORTVERSION= 5.1.1 +PORTVERSION= 5.1.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/packetbeat/distinfo b/sysutils/packetbeat/distinfo index c5c8a807a872..97a6ea2eb5ab 100644 --- a/sysutils/packetbeat/distinfo +++ b/sysutils/packetbeat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481468225 -SHA256 (elastic-beats-v5.1.1_GH0.tar.gz) = f280b975afffd5c2e9ddb9aef2823aff065aec8c41325999c2721fa2770dafb0 -SIZE (elastic-beats-v5.1.1_GH0.tar.gz) = 16500866 +TIMESTAMP = 1484404108 +SHA256 (elastic-beats-v5.1.2_GH0.tar.gz) = 7cd554f8be6b02290ebbc17c9820acde3dc59108672ced7a0cf5486faa3e23ce +SIZE (elastic-beats-v5.1.2_GH0.tar.gz) = 16512836 diff --git a/sysutils/paladin/Makefile b/sysutils/paladin/Makefile new file mode 100644 index 000000000000..21cf503e2df7 --- /dev/null +++ b/sysutils/paladin/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= paladin +PORTVERSION= 1.0.0 +CATEGORIES= sysutils + +MAINTAINER= rwestlun@gmail.com +COMMENT= Simple process supervisor + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= go +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} + +USE_GITHUB= yes +GH_ACCOUNT= rwestlund + +# Override default build command to pass ldflags. +do-build: + @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install \ + -ldflags="-X main.localbase=/usr/local" -v ${GO_TARGET}) + +post-install: + @${CP} ${WRKSRC}/etc/paladin.conf.sample ${STAGEDIR}/${LOCALBASE}/etc/ + @${CP} ${WRKSRC}/etc/rc.d/paladin ${STAGEDIR}/${LOCALBASE}/etc/rc.d/ + +.include diff --git a/sysutils/paladin/distinfo b/sysutils/paladin/distinfo new file mode 100644 index 000000000000..7474071d3e5c --- /dev/null +++ b/sysutils/paladin/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1482315533 +SHA256 (rwestlund-paladin-1.0.0_GH0.tar.gz) = be39b3717818922a192886716e33e4a4fe6184264278ab6dece8f4d27127e873 +SIZE (rwestlund-paladin-1.0.0_GH0.tar.gz) = 615324 diff --git a/sysutils/paladin/pkg-descr b/sysutils/paladin/pkg-descr new file mode 100644 index 000000000000..bb8ffd93a381 --- /dev/null +++ b/sysutils/paladin/pkg-descr @@ -0,0 +1,3 @@ +Simple process supervisor. + +WWW: https://github.com/rwestlund/paladin diff --git a/sysutils/paladin/pkg-message b/sysutils/paladin/pkg-message new file mode 100644 index 000000000000..6746cc640917 --- /dev/null +++ b/sysutils/paladin/pkg-message @@ -0,0 +1,3 @@ +To run paladin: +- Edit /usr/local/etc/paladin.conf +- Add paladin_enable="YES" to /etc/rc.conf diff --git a/sysutils/paladin/pkg-plist b/sysutils/paladin/pkg-plist new file mode 100644 index 000000000000..82270b3af7bb --- /dev/null +++ b/sysutils/paladin/pkg-plist @@ -0,0 +1,3 @@ +bin/paladin +@sample etc/paladin.conf.sample +etc/rc.d/paladin diff --git a/sysutils/py-iocage/Makefile b/sysutils/py-iocage/Makefile new file mode 100644 index 000000000000..b036f999d05e --- /dev/null +++ b/sysutils/py-iocage/Makefile @@ -0,0 +1,29 @@ +# Created by: Bartlomiej Rutkowski +# $FreeBSD$ + +PORTNAME= iocage +PORTVERSION= 0.9 +CATEGORIES= sysutils python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= robak@FreeBSD.org +COMMENT= FreeBSD jail manager written in Python + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.lzma>=0.0.6:archivers/py-backports.lzma \ + ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ + ${PYTHON_PKGNAMEPREFIX}tabletext>=0.1:textproc/py-tabletext + +USE_GITHUB= yes +GH_ACCOUNT= iocage +GH_PROJECT= iocage +GH_TAGNAME= 6175e93 + +NO_ARCH= yes +USES= python +USE_PYTHON= autoplist distutils + +.include diff --git a/sysutils/py-iocage/distinfo b/sysutils/py-iocage/distinfo new file mode 100644 index 000000000000..c2a2d7c88ca6 --- /dev/null +++ b/sysutils/py-iocage/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1484431566 +SHA256 (iocage-iocage-0.9-6175e93_GH0.tar.gz) = a38794ee05ef7a71b76284c41f3a221bb9d2edb32bac03ee65cfb75b46557106 +SIZE (iocage-iocage-0.9-6175e93_GH0.tar.gz) = 27725 diff --git a/sysutils/py-iocage/pkg-descr b/sysutils/py-iocage/pkg-descr new file mode 100644 index 000000000000..bbd20fe4a985 --- /dev/null +++ b/sysutils/py-iocage/pkg-descr @@ -0,0 +1,6 @@ +iocage is a jail/container manager amalgamating some of the best +features and technologies the FreeBSD operating system has +to offer. It is geared for ease of use with a simple and easy +to understand command syntax. + +WWW: https://github.com/iocage/iocage diff --git a/sysutils/rubygem-puppet_forge/Makefile b/sysutils/rubygem-puppet_forge/Makefile index e3d5337ffac7..36c059759550 100644 --- a/sysutils/rubygem-puppet_forge/Makefile +++ b/sysutils/rubygem-puppet_forge/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppet_forge PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-puppet_forge/files/patch-gemspec b/sysutils/rubygem-puppet_forge/files/patch-gemspec new file mode 100644 index 000000000000..2c4d66cf3ca1 --- /dev/null +++ b/sysutils/rubygem-puppet_forge/files/patch-gemspec @@ -0,0 +1,13 @@ +--- puppet_forge.gemspec.orig 2017-01-15 00:58:04 UTC ++++ puppet_forge.gemspec +@@ -23,8 +23,8 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) +- s.add_runtime_dependency(%q.freeze, ["< 0.11.0", ">= 0.9.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.9.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.9.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.1.0"]) + s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 0.3"]) diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist index dfaa943887b5..ebc40b54f3e8 100644 --- a/sysutils/slurm-wlm/pkg-plist +++ b/sysutils/slurm-wlm/pkg-plist @@ -601,4 +601,3 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wiki.conf.html diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 4ce96a4d3854..0ac4d624cfe8 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -17,15 +17,15 @@ LICENSE= GPLv2 BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc \ gsed:textproc/gsed \ swig3.0:devel/swig30 \ - python:lang/python2 \ - ${PREFIX}/bin/dtc:sysutils/dtc + ${LOCALBASE}/bin/dtc:sysutils/dtc -USES= gmake +USES= gmake python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= bsdimp GH_PROJECT= u-boot +SHEBANG_FILES= tools/binman/binman.py SSP_UNSAFE= yes UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} @@ -37,28 +37,26 @@ NO_ARCH= yes # Sanity checks .if !defined(MODEL) -IGNORE+= "MODEL is not defined" +IGNORE+= MODEL is not defined .endif .if !defined(BOARD_CONFIG) -IGNORE+= "BOARD_CONFIG is not defined" +IGNORE+= BOARD_CONFIG is not defined .endif .if !defined(FAMILY) -IGNORE+= "FAMILY is not defined" +IGNORE+= FAMILY is not defined .endif -# Defines for OMAP family +# Overrides for OMAP family UBOOT_PLIST_OMAP=u-boot.img MLO -UBOOT_VERSION_OMAP=2017.01 -# Defines for ALLWINNER family +# Overrides for ALLWINNER family UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin -UBOOT_VERSION_ALLWINNER=2017.01 # Uboot variables .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2017.01 +UBOOT_VERSION?= 2017.01.00.1 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu}) UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}} diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index c7cc02840eb7..af3dc5a6ef98 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484005629 -SHA256 (bsdimp-u-boot-ports-v2017.01_GH0.tar.gz) = 016e65be71a9d3c4c3fca171ffe631f835868c6a248906770c42dcc2c4ef3161 -SIZE (bsdimp-u-boot-ports-v2017.01_GH0.tar.gz) = 15522828 +TIMESTAMP = 1484197628 +SHA256 (bsdimp-u-boot-ports-v2017.01.00.1_GH0.tar.gz) = bd88d48482f9db45b88e1bb487e784793b729307e5a8a7e4b048c92d419321d3 +SIZE (bsdimp-u-boot-ports-v2017.01.00.1_GH0.tar.gz) = 15521395 diff --git a/sysutils/usermatic/Makefile b/sysutils/usermatic/Makefile index eb76d2d66c41..40f5f43a6c9a 100644 --- a/sysutils/usermatic/Makefile +++ b/sysutils/usermatic/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= http://btw23.de/johannes/usermatic/\ MAINTAINER= fehlner@gmx.de COMMENT= Scripts to automate the maintenance of accounts -RUN_DEPENDS= ${PREFIX}/sbin/userneu.pl:sysutils/userneu +RUN_DEPENDS= ${LOCALBASE}/sbin/userneu.pl:sysutils/userneu NO_BUILD= yes NO_ARCH= yes diff --git a/textproc/Makefile b/textproc/Makefile index 834723d332c0..86601f7fbad6 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1409,6 +1409,7 @@ SUBDIR += ruby-xmlparser SUBDIR += ruby-xmlscan SUBDIR += rubygem-actionpack-xml_parser + SUBDIR += rubygem-actionpack-xml_parser1 SUBDIR += rubygem-albino SUBDIR += rubygem-amatch SUBDIR += rubygem-asciidoctor diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile index 34d661e4de7c..a9fe0260c1d7 100644 --- a/textproc/elasticsearch/Makefile +++ b/textproc/elasticsearch/Makefile @@ -67,17 +67,11 @@ GROUPS= ${SEARCHGROUP} ELASTIC_DBDIR= /var/db/elasticsearch ELASTIC_LOGDIR= /var/log/elasticsearch -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1000000 -PLATFORM_VER= 1 -. else -PLATFORM_VER= 9 -. endif -.else -BROKEN= ${OPSYS} platform is not supported +.if ${OPSYS} != FreeBSD +IGNORE= ${OPSYS} platform is not supported .endif -SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${PLATFORM_VER}.so +SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-9.so SUB_LIST= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index 76391f5c5ece..171839a0ceab 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -4,7 +4,7 @@ PORTNAME= libxml++ PORTVERSION= 2.34.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= textproc MASTER_SITES= GNOME diff --git a/textproc/libxml++26/files/patch-c++11 b/textproc/libxml++26/files/patch-c++11 new file mode 100644 index 000000000000..6374f9db386f --- /dev/null +++ b/textproc/libxml++26/files/patch-c++11 @@ -0,0 +1,46 @@ +From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001 +From: Mikhail Titov +Date: Thu, 30 Apr 2015 17:51:20 +0200 +Subject: Fix the build with C++11 compilers, such as MS Visual C++ 2013. + +Implicit conversions from streams to bool are no longer allowed. +--- + libxml++/io/istreamparserinputbuffer.cc | 2 +- + libxml++/io/ostreamoutputbuffer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libxml++/io/istreamparserinputbuffer.cc b/libxml++/io/istreamparserinputbuffer.cc +index b1d6e5b..7a7f283 100644 +--- libxml++/io/istreamparserinputbuffer.cc ++++ libxml++/io/istreamparserinputbuffer.cc +@@ -39,6 +39,6 @@ namespace xmlpp + + bool IStreamParserInputBuffer::do_close() + { +- return input_; ++ return input_.good(); + } + } +diff --git a/libxml++/io/ostreamoutputbuffer.cc b/libxml++/io/ostreamoutputbuffer.cc +index 0a3e6db..b23a8b6 100644 +--- libxml++/io/ostreamoutputbuffer.cc ++++ libxml++/io/ostreamoutputbuffer.cc +@@ -29,13 +29,13 @@ namespace xmlpp + // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded. + if(output_) + output_.write(buffer, len); +- return output_; ++ return output_.good(); + } + + bool OStreamOutputBuffer::do_close() + { + if(output_) + output_.flush(); +- return output_; ++ return output_.good(); + } + } +-- +cgit v0.12 + diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile index 596b33ed3542..74daed87b5f7 100644 --- a/textproc/linuxdoc/Makefile +++ b/textproc/linuxdoc/Makefile @@ -19,7 +19,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes INSTDIR= ${PREFIX}/share/sgml/linuxdoc -ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog +ISOCAT= ${LOCALBASE}/share/sgml/iso8879/catalog do-install: ${MKDIR} ${STAGEDIR}${INSTDIR} diff --git a/textproc/p5-XML-MyXML/Makefile b/textproc/p5-XML-MyXML/Makefile index 180853246806..7d566390243d 100644 --- a/textproc/p5-XML-MyXML/Makefile +++ b/textproc/p5-XML-MyXML/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-MyXML -PORTVERSION= 0.9405 +PORTVERSION= 0.9407 PORTEPOCH= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN diff --git a/textproc/p5-XML-MyXML/distinfo b/textproc/p5-XML-MyXML/distinfo index afed6d7aaa67..3d7a7832b93d 100644 --- a/textproc/p5-XML-MyXML/distinfo +++ b/textproc/p5-XML-MyXML/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484226447 -SHA256 (XML-MyXML-0.9405.tar.gz) = 874127950db1e19f4279d30839bc36adbf7227535fb70086e7778ba9f97a89df -SIZE (XML-MyXML-0.9405.tar.gz) = 22827 +TIMESTAMP = 1484304113 +SHA256 (XML-MyXML-0.9407.tar.gz) = 8c058dea9048eb46c8fff3a3c4dae4f7f01911718583a6be08384a1278d16d6b +SIZE (XML-MyXML-0.9407.tar.gz) = 23234 diff --git a/textproc/py-pandocfilters/pkg-descr b/textproc/py-pandocfilters/pkg-descr index 37019559de06..002d32656262 100644 --- a/textproc/py-pandocfilters/pkg-descr +++ b/textproc/py-pandocfilters/pkg-descr @@ -1,3 +1,3 @@ Utilities for writing pandoc filters in python. -WWW: http://github.com/jgm/pandocfilters +WWW: https://github.com/jgm/pandocfilters diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile index 1c58563184bd..2254cff3967e 100644 --- a/textproc/ruby-htree/Makefile +++ b/textproc/ruby-htree/Makefile @@ -26,7 +26,7 @@ PORTDOCS= * do-build: .if ${PORT_OPTIONS:MDOCS} - cd ${BUILD_WRKSRC}; ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//} ${LIB_FILES} + cd ${BUILD_WRKSRC}; ${LOCALBASE}/bin/rdoc${RUBY_SUFFIX} ${LIB_FILES} .endif do-install: diff --git a/textproc/rubygem-actionpack-xml_parser/Makefile b/textproc/rubygem-actionpack-xml_parser/Makefile index 8f82947b5919..c81011901dba 100644 --- a/textproc/rubygem-actionpack-xml_parser/Makefile +++ b/textproc/rubygem-actionpack-xml_parser/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= actionpack-xml_parser -PORTVERSION= 1.0.2 +PORTVERSION= 2.0.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-actionpack-xml_parser/distinfo b/textproc/rubygem-actionpack-xml_parser/distinfo index 2c1642e5704f..9d6d8ce40dfa 100644 --- a/textproc/rubygem-actionpack-xml_parser/distinfo +++ b/textproc/rubygem-actionpack-xml_parser/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/actionpack-xml_parser-1.0.2.gem) = 6a3e2441711e3885d2fb6f6530049bb4672cf6ffb98c88dce9e8997e9a25559d -SIZE (rubygem/actionpack-xml_parser-1.0.2.gem) = 6144 +TIMESTAMP = 1480754954 +SHA256 (rubygem/actionpack-xml_parser-2.0.0.gem) = 06111b35b279a54b1156bee13fae191377c84fe4f0207f01ddb13ac61168dad7 +SIZE (rubygem/actionpack-xml_parser-2.0.0.gem) = 6144 diff --git a/textproc/rubygem-actionpack-xml_parser1/Makefile b/textproc/rubygem-actionpack-xml_parser1/Makefile new file mode 100644 index 000000000000..18f6fd8c287b --- /dev/null +++ b/textproc/rubygem-actionpack-xml_parser1/Makefile @@ -0,0 +1,22 @@ +# Created by: Sunpoet Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= actionpack-xml_parser +PORTVERSION= 1.0.2 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 1 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= XML parameters parser for Action Pack + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 + +NO_ARCH= yes +USE_RUBY= yes +USES= gem + +.include diff --git a/textproc/rubygem-actionpack-xml_parser1/distinfo b/textproc/rubygem-actionpack-xml_parser1/distinfo new file mode 100644 index 000000000000..5c39bfa169f9 --- /dev/null +++ b/textproc/rubygem-actionpack-xml_parser1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1484405847 +SHA256 (rubygem/actionpack-xml_parser-1.0.2.gem) = 6a3e2441711e3885d2fb6f6530049bb4672cf6ffb98c88dce9e8997e9a25559d +SIZE (rubygem/actionpack-xml_parser-1.0.2.gem) = 6144 diff --git a/textproc/rubygem-actionpack-xml_parser1/pkg-descr b/textproc/rubygem-actionpack-xml_parser1/pkg-descr new file mode 100644 index 000000000000..08325bfbde70 --- /dev/null +++ b/textproc/rubygem-actionpack-xml_parser1/pkg-descr @@ -0,0 +1,5 @@ +actionpack-xml_parser is an XML parameters parser for Action Pack (removed from +core in Rails 4.0). + +WWW: http://rubyonrails.org/ +WWW: https://github.com/rails/actionpack-xml_parser diff --git a/textproc/rubygem-html-pipeline/Makefile b/textproc/rubygem-html-pipeline/Makefile index 5b617014861f..0de41cbcb477 100644 --- a/textproc/rubygem-html-pipeline/Makefile +++ b/textproc/rubygem-html-pipeline/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= html-pipeline -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-html-pipeline/distinfo b/textproc/rubygem-html-pipeline/distinfo index 135ea9de9115..b0635d20fc44 100644 --- a/textproc/rubygem-html-pipeline/distinfo +++ b/textproc/rubygem-html-pipeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482968779 -SHA256 (rubygem/html-pipeline-2.4.2.gem) = a603da7765fcefcc65f571e7e680e9752968d14faaec9838c28cbc9e23e2c5fc -SIZE (rubygem/html-pipeline-2.4.2.gem) = 28672 +TIMESTAMP = 1484432571 +SHA256 (rubygem/html-pipeline-2.5.0.gem) = c70a339b5a4bd806341106a4ecf32feb89ac3b6f7521dc0a5374462fc38cdfe6 +SIZE (rubygem/html-pipeline-2.5.0.gem) = 28672 diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile index 6884d696364a..18f95cabcd35 100644 --- a/textproc/rubygem-jekyll-redirect-from/Makefile +++ b/textproc/rubygem-jekyll-redirect-from/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jekyll-redirect-from -PORTVERSION= 0.12.0 +PORTVERSION= 0.12.1 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-jekyll-redirect-from/distinfo b/textproc/rubygem-jekyll-redirect-from/distinfo index b777ed6f96e4..8e67082ff6f3 100644 --- a/textproc/rubygem-jekyll-redirect-from/distinfo +++ b/textproc/rubygem-jekyll-redirect-from/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483463223 -SHA256 (rubygem/jekyll-redirect-from-0.12.0.gem) = 164b6c1d03097362b8882331ed0667f0d191ebc801fa3eab64c27e770137fd10 -SIZE (rubygem/jekyll-redirect-from-0.12.0.gem) = 14848 +TIMESTAMP = 1484304138 +SHA256 (rubygem/jekyll-redirect-from-0.12.1.gem) = c299b7592eba5cab4588cb98c01b4270c4c469a93255cfe8b14a3261dd27b80c +SIZE (rubygem/jekyll-redirect-from-0.12.1.gem) = 14848 diff --git a/textproc/rubygem-yard/Makefile b/textproc/rubygem-yard/Makefile index d4b19ea971ca..716f9368b80e 100644 --- a/textproc/rubygem-yard/Makefile +++ b/textproc/rubygem-yard/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= yard -PORTVERSION= 0.9.7 +PORTVERSION= 0.9.8 CATEGORIES= textproc devel rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-yard/distinfo b/textproc/rubygem-yard/distinfo index c9305f71fd8c..b1bf3b0520fa 100644 --- a/textproc/rubygem-yard/distinfo +++ b/textproc/rubygem-yard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484060105 -SHA256 (rubygem/yard-0.9.7.gem) = 3ee62984e80c6e9b88895ce41713dfc460429bf4f2171bcc6f6f659aec72f395 -SIZE (rubygem/yard-0.9.7.gem) = 616448 +TIMESTAMP = 1484406594 +SHA256 (rubygem/yard-0.9.8.gem) = 24f5d48afa50eaf587b4c28a62564dbf54d4f594631cad7904035ed5f38465cf +SIZE (rubygem/yard-0.9.8.gem) = 616448 diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index b8171cca3e59..ba7dd29dee13 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -10,11 +10,18 @@ MASTER_SITES= SF/sablotron/sablotron-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2 -LICENSE= MPL GPLv2 +LICENSE= MPL GPLv2+ LICENSE_COMB= dual LIB_DEPENDS= libexpat.so:textproc/expat2 +GNU_CONFIGURE= yes +USES= gmake iconv libtool localbase:ldflags +USE_LDCONFIG= yes +LDFLAGS+= ${ICONV_LIB} + +PORTDOCS= * + OPTIONS_DEFINE= DEBUGGER DISABLE_META DOCS DOCUMENT_ERRORS DOM DEBUGGER_DESC= Enable debugger @@ -33,20 +40,15 @@ DOCS_USE= PERL5=build DOM_CONFIGURE_ENABLE= dom DOCUMENT_ERRORS_CONFIGURE_ENABLE= document-errors -GNU_CONFIGURE= yes -USES= gmake iconv libtool -USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexpat ${ICONV_LIB} - -PORTDOCS= * - post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/apidoc//' ${WRKSRC}/doc/Makefile.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so - cd ${WRKSRC} && ${COPYTREE_SHARE} "README README_JS RELEASE \ - doc/misc/DEBUGGER doc/misc/NOTES" ${STAGEDIR}${DOCSDIR} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} README README_JS RELEASE \ + doc/misc/DEBUGGER doc/misc/NOTES ${STAGEDIR}${DOCSDIR} .include diff --git a/textproc/sablotron/files/patch-configure b/textproc/sablotron/files/patch-configure index 977789d1c5c8..87f303e6c2d8 100644 --- a/textproc/sablotron/files/patch-configure +++ b/textproc/sablotron/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig +--- configure.orig 2005-06-07 15:29:14 UTC +++ configure -@@ -22091,14 +22091,13 @@ +@@ -22091,14 +22091,13 @@ fi if test ! x$silent = xyes; then exec 6>&1 fi diff --git a/textproc/xerces-c3/pkg-descr b/textproc/xerces-c3/pkg-descr index 2b324423e488..1d6472c543ae 100644 --- a/textproc/xerces-c3/pkg-descr +++ b/textproc/xerces-c3/pkg-descr @@ -1,5 +1,14 @@ -Xerces-C++ is a validating XML parser from the Apache XML Project. -It provides a shared library to parse, generate, mainpulate and -validate XML documents from within your own application. +Xerces-C++ is a validating XML parser written in a portable subset of C++. +Xerces-C++ makes it easy to give your application the ability to read and write +XML data. A shared library is provided for parsing, generating, manipulating, +and validating XML documents using the DOM, SAX, and SAX2 APIs. -WWW: http://xml.apache.org/xerces-c/ +Xerces-C++ is faithful to the XML 1.0 recommendation and many associated +standards. + +The parser provides high performance, modularity, and scalability. Source code, +samples and API documentation are provided with the parser. For portability, +care has been taken to make minimal use of templates, no RTTI, and minimal use +of #ifdefs. + +WWW: https://xerces.apache.org/xerces-c/ diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile index e256ba2b711b..1dcea42ead18 100644 --- a/textproc/xsv/Makefile +++ b/textproc/xsv/Makefile @@ -11,26 +11,25 @@ MAINTAINER= ports@FreeBSD.org COMMENT= XML Schema Validator LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml USES= python USE_PYTHON= distutils autoplist -USE_LDCONFIG= yes +NO_ARCH= yes PORTDOCS= pc-shrinkwrap xsv-status.xml xsv-status.html PORTEXAMPLES= triv.xml triv.xsd tiny.xml tiny.xsd -OPTIONS_DEFINE= DOCS EXAMPLES - -.include -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CFLAGS+= -fPIC -.endif +OPTIONS_DEFINE= DOCS EXAMPLES -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/textproc/xsv/files/patch-setup.py b/textproc/xsv/files/patch-setup.py index c5e14c6d98ed..305ee3281674 100644 --- a/textproc/xsv/files/patch-setup.py +++ b/textproc/xsv/files/patch-setup.py @@ -1,6 +1,6 @@ ---- ./setup.py.orig 2008-01-18 13:17:40.000000000 +0100 -+++ ./setup.py 2014-03-23 02:06:18.690868591 +0100 -@@ -16,20 +16,10 @@ +--- setup.py.orig 2008-01-18 12:17:40 UTC ++++ setup.py +@@ -16,20 +16,10 @@ class smart_install_data(install_data): self.install_dir = getattr(install_cmd, 'install_lib') return install_data.run(self) diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 741139e80508..60512c75f183 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.6.0 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/files/patch-bug1153151 b/www/firefox-esr/files/patch-bug1153151 new file mode 100644 index 000000000000..855cdab89472 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1153151 @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); diff --git a/www/firefox-esr/files/patch-bug1153179 b/www/firefox-esr/files/patch-bug1153179 new file mode 100644 index 000000000000..f39c9bbdcd82 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1153179 @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + diff --git a/www/flot/Makefile b/www/flot/Makefile index c04f5916d9dd..07851f4c2151 100644 --- a/www/flot/Makefile +++ b/www/flot/Makefile @@ -9,29 +9,32 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript plotting library for jQuery LICENSE= MIT - -NO_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME} +LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= zip +WRKSRC= ${WRKDIR}/${PORTNAME} +NO_BUILD= yes +NO_ARCH= yes PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES JQUERY -JQUERY_DESC= Include provided JQuery 1.8.3 OPTIONS_DEFAULT= JQUERY OPTIONS_SUB= yes +JQUERY_DESC= Include provided JQuery 1.8.3 + do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} *.js \ - ${STAGEDIR}${WWWDIR}) + ${INSTALL_DATA} ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} *.md \ - ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "*" \ - ${STAGEDIR}${EXAMPLESDIR}) + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile index 2ad6c963980c..60682251ea9f 100644 --- a/www/httpasyncclient/Makefile +++ b/www/httpasyncclient/Makefile @@ -13,7 +13,7 @@ COMMENT= Java components implementing an asynchronous HTTP client LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${JAVAJARDIR}/httpclient.jar:www/httpclient +RUN_DEPENDS= ${JAVALIBDIR}/httpclient.jar:www/httpclient USES= cpe CPE_VENDOR= apache diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile index 1c19502f19bb..abfcb6c4407f 100644 --- a/www/httpclient/Makefile +++ b/www/httpclient/Makefile @@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES+= cpe CPE_PRODUCT= commons-httpclient CPE_VENDOR= apache -RUN_DEPENDS= ${JAVAJARDIR}/httpcore.jar:www/httpcore \ - ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec +RUN_DEPENDS= ${JAVALIBDIR}/httpcore.jar:www/httpcore \ + ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ + ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec OPTIONS_DEFINE= DOCS EXAMPLES USE_JAVA= yes diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile index 6349f88f3703..8333516888e5 100644 --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -14,31 +14,31 @@ LICENSE= APACHE20 # These are JAR-files installed by other ports. The list should keep # growing until all Java applications install just their own JARs -- not # the 3rd-party ones: -RUN_DEPENDS= ${JAVAJARDIR}/activation.jar:java/jaf \ - ${JAVAJARDIR}/avalon-framework.jar:devel/avalon-framework \ - ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec \ +RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \ + ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ + ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ ${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \ - ${JAVAJARDIR}/commons-net.jar:net/jakarta-commons-net \ - ${JAVAJARDIR}/httpclient.jar:www/httpclient \ - ${JAVAJARDIR}/httpcore.jar:www/httpcore \ - ${JAVAJARDIR}/httpmime.jar:www/httpclient \ - ${JAVAJARDIR}/jakarta-oro.jar:java/jakarta-oro \ - ${JAVAJARDIR}/jdom.jar:java/jdom \ - ${JAVAJARDIR}/junit.jar:java/junit \ - ${JAVAJARDIR}/mail.jar:java/javamail \ - ${JAVAJARDIR}/serializer.jar:textproc/xalan-j \ - ${JAVAJARDIR}/slf4j-api.jar:devel/slf4j \ + ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ + ${JAVALIBDIR}/commons-net.jar:net/jakarta-commons-net \ + ${JAVALIBDIR}/httpclient.jar:www/httpclient \ + ${JAVALIBDIR}/httpcore.jar:www/httpcore \ + ${JAVALIBDIR}/httpmime.jar:www/httpclient \ + ${JAVALIBDIR}/jakarta-oro.jar:java/jakarta-oro \ + ${JAVALIBDIR}/jdom.jar:java/jdom \ + ${JAVALIBDIR}/junit.jar:java/junit \ + ${JAVALIBDIR}/mail.jar:java/javamail \ + ${JAVALIBDIR}/serializer.jar:textproc/xalan-j \ + ${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \ ${LOCALBASE}/share/slf4j/slf4j-nop.jar:devel/slf4j \ - ${JAVAJARDIR}/xalan.jar:textproc/xalan-j \ - ${JAVAJARDIR}/xercesImpl.jar:textproc/xerces-j \ - ${JAVAJARDIR}/xml-apis.jar:textproc/xerces-j \ - ${JAVAJARDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons \ - ${JAVAJARDIR}/xstream.jar:textproc/xstream \ - ${JAVASHAREDIR}/rhino/rhino.jar:lang/rhino + ${JAVALIBDIR}/xalan.jar:textproc/xalan-j \ + ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j \ + ${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \ + ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons \ + ${JAVALIBDIR}/xstream.jar:textproc/xstream \ + ${JAVALIBDIR}/../rhino/rhino.jar:lang/rhino USES= tar:tgz USE_JAVA= yes diff --git a/www/kannel/Makefile b/www/kannel/Makefile index a19c9998dcf5..7df56117a16f 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -24,7 +24,7 @@ PORTSCOUT= skipv:1.5.0 USERS= kannel GROUPS= kannel -USES= bison gmake iconv ssl tar:bzip2 +USES= gmake iconv ssl tar:bzip2 USE_GCC= yes USE_GNOME= libxml2 USE_RC_SUBR= ${PORTNAME}_bearerbox ${PORTNAME}_smsbox ${PORTNAME}_wapbox @@ -44,6 +44,9 @@ MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql +post-patch: + @${RM} ${WRKSRC}/wmlscript/wsgram.y + post-install: .for filename in wapkannel.conf smskannel.conf ${INSTALL_DATA} ${WRKSRC}/gw/${filename} \ diff --git a/www/libxul/Makefile b/www/libxul/Makefile index b353282a69c5..175513256946 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source diff --git a/www/libxul/files/patch-bug1153151 b/www/libxul/files/patch-bug1153151 new file mode 100644 index 000000000000..855cdab89472 --- /dev/null +++ b/www/libxul/files/patch-bug1153151 @@ -0,0 +1,13 @@ +Bug 1153151 - make libcubeb sndio use non-blocking i/o + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -187,7 +187,7 @@ sndio_stream_init(cubeb *context, + if (s == NULL) + return CUBEB_ERROR; + s->context = context; +- s->hdl = sio_open(NULL, SIO_PLAY, 0); ++ s->hdl = sio_open(NULL, SIO_PLAY, 1); + if (s->hdl == NULL) { + free(s); + DPR("sndio_stream_init(), sio_open() failed\n"); diff --git a/www/libxul/files/patch-bug1153179 b/www/libxul/files/patch-bug1153179 new file mode 100644 index 000000000000..f39c9bbdcd82 --- /dev/null +++ b/www/libxul/files/patch-bug1153179 @@ -0,0 +1,40 @@ +Bug 1153179 - fix latency reporting in libcubeb sndio + +--- media/libcubeb/src/cubeb_sndio.c.orig 2017-01-12 17:53:15 UTC ++++ media/libcubeb/src/cubeb_sndio.c +@@ -67,7 +67,7 @@ sndio_onmove(void *arg, int delta) + { + cubeb_stream *s = (cubeb_stream *)arg; + +- s->rdpos += delta; ++ s->rdpos += delta * s->bpf; + } + + static void * +@@ -135,7 +135,7 @@ sndio_mainloop(void *arg) + state = CUBEB_STATE_ERROR; + break; + } +- s->wrpos = 0; ++ s->wrpos += n; + start += n; + } + } +@@ -326,7 +336,7 @@ sndio_stream_get_position(cubeb_stream * + { + pthread_mutex_lock(&s->mtx); + DPR("sndio_stream_get_position() %lld\n", s->rdpos); +- *p = s->rdpos; ++ *p = s->rdpos / s->bpf; + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } +@@ -346,7 +356,7 @@ sndio_stream_get_latency(cubeb_stream * + { + // http://www.openbsd.org/cgi-bin/man.cgi?query=sio_open + // in the "Measuring the latency and buffers usage" paragraph. +- *latency = stm->wrpos - stm->rdpos; ++ *latency = (stm->wrpos - stm->rdpos) / stm->bpf; + return CUBEB_OK; + } + diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile index e54a9eef46c0..a13fb68d9c70 100644 --- a/www/madsonic/Makefile +++ b/www/madsonic/Makefile @@ -39,7 +39,7 @@ APE_DESC= Depend on mac for Monkey's Audio transcoding #' OPTIONS_DEFAULT= FFMPEG JETTY OPTIONS_SUB= yes -RUN_DEPENDS+= ${JAVAJARDIR}/servlet-api.jar:www/servlet-api \ +RUN_DEPENDS+= ${JAVALIBDIR}/servlet-api.jar:www/servlet-api \ ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins TOMCAT8_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8 TOMCAT8_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8 diff --git a/www/mod_http2-devel/Makefile b/www/mod_http2-devel/Makefile index 0b264362b001..614fa9b30872 100644 --- a/www/mod_http2-devel/Makefile +++ b/www/mod_http2-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_http2-devel -PORTVERSION= 1.8.5 +PORTVERSION= 1.8.8 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/mod_http2-devel/distinfo b/www/mod_http2-devel/distinfo index 141420fd7368..869c6d56fe75 100644 --- a/www/mod_http2-devel/distinfo +++ b/www/mod_http2-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482575205 -SHA256 (icing-mod_h2-v1.8.5_GH0.tar.gz) = 03865e4784bd7226a2705cd67d4cedfb03c3fd5a04d7de04999aa6515f342582 -SIZE (icing-mod_h2-v1.8.5_GH0.tar.gz) = 194731 +TIMESTAMP = 1484330467 +SHA256 (icing-mod_h2-v1.8.8_GH0.tar.gz) = 03c2fce3e06aa435454fa3d0e6911d3cc08e8396e60299af9d3918ca6de60cf8 +SIZE (icing-mod_h2-v1.8.8_GH0.tar.gz) = 195927 diff --git a/www/npm/Makefile b/www/npm/Makefile index bb4e6d4d025f..bc7d10ec0fc9 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= npm -PORTVERSION= 4.0.5 +PORTVERSION= 4.1.1 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet @@ -71,10 +71,10 @@ genplist: do-clean stage maketar: do-clean @${MKDIR} ${MS_WRKSRC}/ - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_RELEASES} ${GITHUB_RELEASES} + @${FETCH_CMD} -o ${MS_RELEASES} ${GITHUB_RELEASES} @${GREP} -o '/${GITHUB_USER}/${GITHUB_PROJECT}/archive/[^"]*\.tar\.gz' ${MS_RELEASES} | ${HEAD} -1 | ${CUT} -d/ -f5 | ${SED} 's|^v||; s|\.tar\.gz$$||' > ${MS_VERSIONFILE} @${ECHO_MSG} "*** Updating from ${PORTVERSION} to ${MS_VERSION} ..." - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL} + @${FETCH_CMD} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL} @${MKDIR} ${MS_WRKSRC}/${MS_DISTNAME}/ @${TAR} -xf ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz -C ${MS_WRKSRC}/${MS_DISTNAME}/ --strip-components 1 @${REINPLACE_CMD} -e 's|${MAKE}|${GMAKE}|g; /^install: / s| docclean||' ${MS_WRKSRC}/${MS_DISTNAME}/Makefile diff --git a/www/npm/distinfo b/www/npm/distinfo index 5056e186fa42..25dd590eea4e 100644 --- a/www/npm/distinfo +++ b/www/npm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482001629 -SHA256 (npm-4.0.5.tar.xz) = bd23ed016843323c53a981647be01abf049586eff46901fda66b2cc4191cc310 -SIZE (npm-4.0.5.tar.xz) = 2676812 +TIMESTAMP = 1484417759 +SHA256 (npm-4.1.1.tar.xz) = c36980a991ae53b4dbf27e27531dff6ab04b061d36d02cd819b1d05a2f9f2989 +SIZE (npm-4.1.1.tar.xz) = 2736284 diff --git a/www/npm/pkg-plist b/www/npm/pkg-plist index 9e32ecb26fa0..b2500ac296ef 100644 --- a/www/npm/pkg-plist +++ b/www/npm/pkg-plist @@ -35,6 +35,7 @@ lib/node_modules/npm/doc/cli/npm-dedupe.md lib/node_modules/npm/doc/cli/npm-deprecate.md lib/node_modules/npm/doc/cli/npm-dist-tag.md lib/node_modules/npm/doc/cli/npm-docs.md +lib/node_modules/npm/doc/cli/npm-doctor.md lib/node_modules/npm/doc/cli/npm-edit.md lib/node_modules/npm/doc/cli/npm-explore.md lib/node_modules/npm/doc/cli/npm-help-search.md @@ -100,6 +101,7 @@ lib/node_modules/npm/html/doc/cli/npm-dedupe.html lib/node_modules/npm/html/doc/cli/npm-deprecate.html lib/node_modules/npm/html/doc/cli/npm-dist-tag.html lib/node_modules/npm/html/doc/cli/npm-docs.html +lib/node_modules/npm/html/doc/cli/npm-doctor.html lib/node_modules/npm/html/doc/cli/npm-edit.html lib/node_modules/npm/html/doc/cli/npm-explore.html lib/node_modules/npm/html/doc/cli/npm-help-search.html @@ -192,6 +194,13 @@ lib/node_modules/npm/lib/dedupe.js lib/node_modules/npm/lib/deprecate.js lib/node_modules/npm/lib/dist-tag.js lib/node_modules/npm/lib/docs.js +lib/node_modules/npm/lib/doctor.js +lib/node_modules/npm/lib/doctor/check-files-permission.js +lib/node_modules/npm/lib/doctor/check-ping.js +lib/node_modules/npm/lib/doctor/checksum-cached-files.js +lib/node_modules/npm/lib/doctor/get-git-path.js +lib/node_modules/npm/lib/doctor/get-latest-nodejs-version.js +lib/node_modules/npm/lib/doctor/get-latest-npm-version.js lib/node_modules/npm/lib/edit.js lib/node_modules/npm/lib/explore.js lib/node_modules/npm/lib/fetch-package-metadata.js @@ -281,6 +290,7 @@ lib/node_modules/npm/lib/unbuild.js lib/node_modules/npm/lib/uninstall.js lib/node_modules/npm/lib/unpublish.js lib/node_modules/npm/lib/update.js +lib/node_modules/npm/lib/utils/ansi-trim.js lib/node_modules/npm/lib/utils/child-path.js lib/node_modules/npm/lib/utils/completion.sh lib/node_modules/npm/lib/utils/completion/file-completion.js @@ -303,11 +313,14 @@ lib/node_modules/npm/lib/utils/lifecycle.js lib/node_modules/npm/lib/utils/link.js lib/node_modules/npm/lib/utils/locker.js lib/node_modules/npm/lib/utils/map-to-registry.js +lib/node_modules/npm/lib/utils/metrics-launch.js +lib/node_modules/npm/lib/utils/metrics.js lib/node_modules/npm/lib/utils/module-name.js lib/node_modules/npm/lib/utils/no-progress-while-running.js lib/node_modules/npm/lib/utils/output.js lib/node_modules/npm/lib/utils/package-id.js lib/node_modules/npm/lib/utils/parse-json.js +lib/node_modules/npm/lib/utils/pick-manifest-from-registry-metadata.js lib/node_modules/npm/lib/utils/pulse-till-done.js lib/node_modules/npm/lib/utils/read-local-package.js lib/node_modules/npm/lib/utils/rename.js @@ -339,6 +352,7 @@ lib/node_modules/npm/man/man1/npm-dedupe.1.gz lib/node_modules/npm/man/man1/npm-deprecate.1.gz lib/node_modules/npm/man/man1/npm-dist-tag.1.gz lib/node_modules/npm/man/man1/npm-docs.1.gz +lib/node_modules/npm/man/man1/npm-doctor.1.gz lib/node_modules/npm/man/man1/npm-edit.1.gz lib/node_modules/npm/man/man1/npm-explore.1.gz lib/node_modules/npm/man/man1/npm-help-search.1.gz @@ -399,6 +413,7 @@ lib/node_modules/npm/node_modules/.bin/nopt lib/node_modules/npm/node_modules/.bin/opener lib/node_modules/npm/node_modules/.bin/rimraf lib/node_modules/npm/node_modules/.bin/semver +lib/node_modules/npm/node_modules/.bin/uuid lib/node_modules/npm/node_modules/.bin/which lib/node_modules/npm/node_modules/JSONStream/.npmignore lib/node_modules/npm/node_modules/JSONStream/.travis.yml @@ -834,6 +849,7 @@ lib/node_modules/npm/node_modules/lockfile/test/fixtures/bad-child.js lib/node_modules/npm/node_modules/lockfile/test/fixtures/child.js lib/node_modules/npm/node_modules/lockfile/test/retry-time.js lib/node_modules/npm/node_modules/lockfile/test/stale-contention.js +lib/node_modules/npm/node_modules/lockfile/test/unlock-no-cb.js lib/node_modules/npm/node_modules/lodash._baseindexof/LICENSE.txt lib/node_modules/npm/node_modules/lodash._baseindexof/README.md lib/node_modules/npm/node_modules/lodash._baseindexof/index.js @@ -1215,6 +1231,7 @@ lib/node_modules/npm/node_modules/node-gyp/lib/node-gyp.js lib/node_modules/npm/node_modules/node-gyp/lib/process-release.js lib/node_modules/npm/node_modules/node-gyp/lib/rebuild.js lib/node_modules/npm/node_modules/node-gyp/lib/remove.js +lib/node_modules/npm/node_modules/node-gyp/node_modules/.bin/nopt lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/LICENSE lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/README.md lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/minimatch.js @@ -1234,6 +1251,15 @@ lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/b lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/brace-expansion/package.json lib/node_modules/npm/node_modules/node-gyp/node_modules/minimatch/package.json +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/.npmignore +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/.travis.yml +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/LICENSE +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/README.md +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/examples/my-program.js +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/lib/nopt.js +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/package.json +lib/node_modules/npm/node_modules/node-gyp/node_modules/nopt/test/basic.js lib/node_modules/npm/node_modules/node-gyp/node_modules/npmlog/CHANGELOG.md lib/node_modules/npm/node_modules/node-gyp/node_modules/npmlog/LICENSE lib/node_modules/npm/node_modules/node-gyp/node_modules/npmlog/README.md @@ -2191,11 +2217,29 @@ lib/node_modules/npm/node_modules/node-gyp/test/test-options.js lib/node_modules/npm/node_modules/node-gyp/test/test-process-release.js lib/node_modules/npm/node_modules/nopt/.npmignore lib/node_modules/npm/node_modules/nopt/.travis.yml +lib/node_modules/npm/node_modules/nopt/CHANGELOG.md lib/node_modules/npm/node_modules/nopt/LICENSE lib/node_modules/npm/node_modules/nopt/README.md lib/node_modules/npm/node_modules/nopt/bin/nopt.js lib/node_modules/npm/node_modules/nopt/examples/my-program.js lib/node_modules/npm/node_modules/nopt/lib/nopt.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/.npmignore +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/.travis.yml +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/LICENSE +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/README.md +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/index.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/license +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/package.json +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/readme.md +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/index.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/license +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/package.json +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/readme.md +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/osenv.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/package.json +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/test/unix.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/test/windows.js +lib/node_modules/npm/node_modules/nopt/node_modules/osenv/x.tap lib/node_modules/npm/node_modules/nopt/package.json lib/node_modules/npm/node_modules/nopt/test/basic.js lib/node_modules/npm/node_modules/normalize-git-url/.npmignore @@ -2298,6 +2342,7 @@ lib/node_modules/npm/node_modules/npm-registry-client/lib/logout.js lib/node_modules/npm/node_modules/npm-registry-client/lib/ping.js lib/node_modules/npm/node_modules/npm-registry-client/lib/publish.js lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js +lib/node_modules/npm/node_modules/npm-registry-client/lib/send-anonymous-CLI-metrics.js lib/node_modules/npm/node_modules/npm-registry-client/lib/star.js lib/node_modules/npm/node_modules/npm-registry-client/lib/stars.js lib/node_modules/npm/node_modules/npm-registry-client/lib/tag.js @@ -2365,100 +2410,6 @@ lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/tarray.js lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/CHANGELOG.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/LICENSE -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/log.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/CHANGES.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/LICENSE -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/License -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/test/lib/test-event.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-base.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-group.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-stream.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/LICENSE -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/CHANGELOG.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/LICENSE -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/base-theme.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/error.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/has-color.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/has-color/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/has-color/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/has-color/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/CHANGELOG.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/LICENSE.txt -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/signals.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/license -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/readme.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/.npmignore -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/LICENSE -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/align.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/test/align.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/plumbing.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/process.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/progress-bar.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/render-template.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/set-immediate.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/set-interval.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/spin.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/template-item.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/theme-set.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/themes.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/wide-truncate.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/CHANGELOG.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/LICENSE.txt -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/README.md -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/index.js -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/package.json -lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/package.json lib/node_modules/npm/node_modules/npm-registry-client/package.json lib/node_modules/npm/node_modules/npm-registry-client/test/00-setup.js lib/node_modules/npm/node_modules/npm-registry-client/test/access.js @@ -2473,6 +2424,7 @@ lib/node_modules/npm/node_modules/npm-registry-client/test/dist-tags-fetch.js lib/node_modules/npm/node_modules/npm-registry-client/test/dist-tags-rm.js lib/node_modules/npm/node_modules/npm-registry-client/test/dist-tags-set.js lib/node_modules/npm/node_modules/npm-registry-client/test/dist-tags-update.js +lib/node_modules/npm/node_modules/npm-registry-client/test/econnreset.js lib/node_modules/npm/node_modules/npm-registry-client/test/fetch-404.js lib/node_modules/npm/node_modules/npm-registry-client/test/fetch-408.js lib/node_modules/npm/node_modules/npm-registry-client/test/fetch-503.js @@ -2501,6 +2453,7 @@ lib/node_modules/npm/node_modules/npm-registry-client/test/redirects.js lib/node_modules/npm/node_modules/npm-registry-client/test/request-gzip-content.js lib/node_modules/npm/node_modules/npm-registry-client/test/request.js lib/node_modules/npm/node_modules/npm-registry-client/test/retries.js +lib/node_modules/npm/node_modules/npm-registry-client/test/send-anon-metrics.js lib/node_modules/npm/node_modules/npm-registry-client/test/star.js lib/node_modules/npm/node_modules/npm-registry-client/test/stars.js lib/node_modules/npm/node_modules/npm-registry-client/test/tag.js @@ -2555,9 +2508,7 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/base-theme.js lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/error.js lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/has-color.js lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/index.js -lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-color/index.js -lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-color/package.json -lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-color/readme.md +lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/.bin/supports-color lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/license lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/package.json @@ -2584,6 +2535,10 @@ lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string- lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/readme.md lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/package.json lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/readme.md +lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/cli.js +lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/index.js +lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/package.json +lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/supports-color/readme.md lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/.npmignore lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/LICENSE lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/README.md @@ -2847,7 +2802,6 @@ lib/node_modules/npm/node_modules/request/lib/querystring.js lib/node_modules/npm/node_modules/request/lib/redirect.js lib/node_modules/npm/node_modules/request/lib/tunnel.js lib/node_modules/npm/node_modules/request/node_modules/.bin/har-validator -lib/node_modules/npm/node_modules/request/node_modules/.bin/uuid lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/LICENSE lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/README.md lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/index.js @@ -3388,22 +3342,6 @@ lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/LICENSE lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/README.md lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/index.js lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/package.json -lib/node_modules/npm/node_modules/request/node_modules/uuid/.npmignore -lib/node_modules/npm/node_modules/request/node_modules/uuid/.travis.yml -lib/node_modules/npm/node_modules/request/node_modules/uuid/AUTHORS -lib/node_modules/npm/node_modules/request/node_modules/uuid/HISTORY.md -lib/node_modules/npm/node_modules/request/node_modules/uuid/LICENSE.md -lib/node_modules/npm/node_modules/request/node_modules/uuid/README.md -lib/node_modules/npm/node_modules/request/node_modules/uuid/bin/uuid -lib/node_modules/npm/node_modules/request/node_modules/uuid/index.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/lib/bytesToUuid.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/lib/rng-browser.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/lib/rng.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/package.json -lib/node_modules/npm/node_modules/request/node_modules/uuid/test/mocha.opts -lib/node_modules/npm/node_modules/request/node_modules/uuid/test/test.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/v1.js -lib/node_modules/npm/node_modules/request/node_modules/uuid/v4.js lib/node_modules/npm/node_modules/request/package.json lib/node_modules/npm/node_modules/request/request.js lib/node_modules/npm/node_modules/retry/.npmignore @@ -3598,6 +3536,22 @@ lib/node_modules/npm/node_modules/unpipe/LICENSE lib/node_modules/npm/node_modules/unpipe/README.md lib/node_modules/npm/node_modules/unpipe/index.js lib/node_modules/npm/node_modules/unpipe/package.json +lib/node_modules/npm/node_modules/uuid/.npmignore +lib/node_modules/npm/node_modules/uuid/.travis.yml +lib/node_modules/npm/node_modules/uuid/AUTHORS +lib/node_modules/npm/node_modules/uuid/HISTORY.md +lib/node_modules/npm/node_modules/uuid/LICENSE.md +lib/node_modules/npm/node_modules/uuid/README.md +lib/node_modules/npm/node_modules/uuid/bin/uuid +lib/node_modules/npm/node_modules/uuid/index.js +lib/node_modules/npm/node_modules/uuid/lib/bytesToUuid.js +lib/node_modules/npm/node_modules/uuid/lib/rng-browser.js +lib/node_modules/npm/node_modules/uuid/lib/rng.js +lib/node_modules/npm/node_modules/uuid/package.json +lib/node_modules/npm/node_modules/uuid/test/mocha.opts +lib/node_modules/npm/node_modules/uuid/test/test.js +lib/node_modules/npm/node_modules/uuid/v1.js +lib/node_modules/npm/node_modules/uuid/v4.js lib/node_modules/npm/node_modules/validate-npm-package-license/LICENSE lib/node_modules/npm/node_modules/validate-npm-package-license/README.md lib/node_modules/npm/node_modules/validate-npm-package-license/index.js @@ -3720,6 +3674,7 @@ lib/node_modules/npm/test/tap/all-package-metadata-entry-stream-unit.js lib/node_modules/npm/test/tap/all-package-metadata-update-stream-unit.js lib/node_modules/npm/test/tap/all-package-metadata-write-stream-unit.js lib/node_modules/npm/test/tap/all-package-metadata.js +lib/node_modules/npm/test/tap/anon-cli-metrics.js lib/node_modules/npm/test/tap/bearer-token-check.js lib/node_modules/npm/test/tap/bin.js lib/node_modules/npm/test/tap/bitbucket-https-url-with-creds-package.js @@ -3765,6 +3720,7 @@ lib/node_modules/npm/test/tap/dedupe.js lib/node_modules/npm/test/tap/deprecate.js lib/node_modules/npm/test/tap/dist-tag.js lib/node_modules/npm/test/tap/do-not-remove-other-bins.js +lib/node_modules/npm/test/tap/doctor.js lib/node_modules/npm/test/tap/extraneous-dep-cycle-ls-ok.js lib/node_modules/npm/test/tap/false-name.js lib/node_modules/npm/test/tap/fetch-package-metadata.js @@ -3889,6 +3845,7 @@ lib/node_modules/npm/test/tap/peer-deps-invalid.js lib/node_modules/npm/test/tap/peer-deps-toplevel.js lib/node_modules/npm/test/tap/peer-deps-without-package-json.js lib/node_modules/npm/test/tap/peer-deps.js +lib/node_modules/npm/test/tap/pick-manifest-from-registry-metadata.js lib/node_modules/npm/test/tap/ping.js lib/node_modules/npm/test/tap/prepare.js lib/node_modules/npm/test/tap/prepublish-only.js diff --git a/www/npm2/Makefile b/www/npm2/Makefile index 3e8f7a74ffe7..b0330419fc29 100644 --- a/www/npm2/Makefile +++ b/www/npm2/Makefile @@ -59,47 +59,4 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKDIR}/npm.conf ${STAGEDIR}${PREFIX}/etc/man.d/npm.conf -# maintainer section: -# require: bash, git, gmake, perl, node - -MS_DISTNAME= ${PORTNAME}-${MS_VERSION} -MS_PLIST= ${WRKDIR}/.ms-pkg-plist -MS_RELEASES= ${MS_WRKSRC}/releases -MS_VERSION= `${CAT} ${MS_VERSIONFILE}` -MS_VERSIONFILE= ${MS_WRKSRC}/.version -MS_WRKSRC= ${WRKSRC}/tmp - -GITHUB_PROJECT= ${PORTNAME} -GITHUB_RELEASES=https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/releases/latest -GITHUB_TARBALL= https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${GITHUB_VERSION}.tar.gz -GITHUB_USER= ${PORTNAME} -GITHUB_VERSION= v${MS_VERSION} - -genplist: do-clean stage - @${MAKE_CMD} makeplist > ${MS_PLIST} - @${SED} -i '' '1 d; /^lib\/node_modules\/npm\/bin\/node-gyp-bin\/node-gyp$$/ s|^|@(,,755) |' ${MS_PLIST} - @${INSTALL} -m 600 ${MS_PLIST} ${PLIST} - -maketar: do-clean - @${MKDIR} ${MS_WRKSRC}/ - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_RELEASES} ${GITHUB_RELEASES} - @${GREP} -o '/${GITHUB_USER}/${GITHUB_PROJECT}/archive/[^"]*\.tar\.gz' ${MS_RELEASES} | ${HEAD} -1 | ${CUT} -d/ -f5 | ${SED} 's|^v||; s|\.tar\.gz$$||' > ${MS_VERSIONFILE} - @${ECHO_MSG} "*** Updating from ${PORTVERSION} to ${MS_VERSION} ..." - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL} - @${MKDIR} ${MS_WRKSRC}/${MS_DISTNAME}/ - @${TAR} -xf ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz -C ${MS_WRKSRC}/${MS_DISTNAME}/ --strip-components 1 - @${REINPLACE_CMD} -e 's|${MAKE}|${GMAKE}|g; /^install: / s| docclean||' ${MS_WRKSRC}/${MS_DISTNAME}/Makefile - @${REINPLACE_CMD} -e 's| && ${MAKE} -j8 doc||' ${MS_WRKSRC}/${MS_DISTNAME}/package.json - @${REINPLACE_CMD} -e 's|linkBins, linkMans|linkBins|; /manRoot/ s|, "share"||' ${MS_WRKSRC}/${MS_DISTNAME}/lib/build.js ${MS_WRKSRC}/${MS_DISTNAME}/lib/unbuild.js - @${REINPLACE_CMD} -e '1 s|#!/bin/bash|#!${LOCALBASE}/bin/bash|; s|${MAKE}|${GMAKE}|g; s|perl -pi|perl -p|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh - @${GREP} -lr share/man ${MS_WRKSRC}/${MS_DISTNAME}/doc/ ${MS_WRKSRC}/${MS_DISTNAME}/scripts/ | ${XARGS} -I % ${REINPLACE_CMD} 's|share/man|man|g' % - @cd ${MS_WRKSRC}/${MS_DISTNAME}/ && ${GMAKE} docclean markedclean all html/doc/misc/npm-index.html - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 {} \; - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 {} \; - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -name '*.sh' -exec ${CHMOD} 755 {} \; - @cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${MS_DISTNAME}.tar.xz ${MS_DISTNAME}/ - @${REINPLACE_CMD} -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile - @sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/ - @cd ${.CURDIR}/ && ${MAKE_CMD} makesum - .include diff --git a/www/npm3/Makefile b/www/npm3/Makefile index 961e115cf852..85b9f6bce35b 100644 --- a/www/npm3/Makefile +++ b/www/npm3/Makefile @@ -58,47 +58,4 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKDIR}/npm.conf ${STAGEDIR}${PREFIX}/etc/man.d/npm.conf -# maintainer section: -# require: bash, git, gmake, perl, node - -MS_DISTNAME= ${PORTNAME}-${MS_VERSION} -MS_PLIST= ${WRKDIR}/.ms-pkg-plist -MS_RELEASES= ${MS_WRKSRC}/releases -MS_VERSION= `${CAT} ${MS_VERSIONFILE}` -MS_VERSIONFILE= ${MS_WRKSRC}/.version -MS_WRKSRC= ${WRKSRC}/tmp - -GITHUB_PROJECT= ${PORTNAME} -GITHUB_RELEASES=https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/releases/latest -GITHUB_TARBALL= https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${GITHUB_VERSION}.tar.gz -GITHUB_USER= ${PORTNAME} -GITHUB_VERSION= v${MS_VERSION} - -genplist: do-clean stage - @${MAKE_CMD} makeplist > ${MS_PLIST} - @${SED} -i '' '1 d; /^lib\/node_modules\/npm\/bin\/node-gyp-bin\/node-gyp$$/ s|^|@(,,755) |' ${MS_PLIST} - @${INSTALL} -m 600 ${MS_PLIST} ${PLIST} - -maketar: do-clean - @${MKDIR} ${MS_WRKSRC}/ - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_RELEASES} ${GITHUB_RELEASES} - @${GREP} -o '/${GITHUB_USER}/${GITHUB_PROJECT}/archive/[^"]*\.tar\.gz' ${MS_RELEASES} | ${HEAD} -1 | ${CUT} -d/ -f5 | ${SED} 's|^v||; s|\.tar\.gz$$||' > ${MS_VERSIONFILE} - @${ECHO_MSG} "*** Updating from ${PORTVERSION} to ${MS_VERSION} ..." - @${FETCH_BINARY} ${FETCH_ARGS:C/A//} -o ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz ${GITHUB_TARBALL} - @${MKDIR} ${MS_WRKSRC}/${MS_DISTNAME}/ - @${TAR} -xf ${MS_WRKSRC}/${MS_DISTNAME}.tar.gz -C ${MS_WRKSRC}/${MS_DISTNAME}/ --strip-components 1 - @${REINPLACE_CMD} -e 's|${MAKE}|${GMAKE}|g; /^install: / s| docclean||' ${MS_WRKSRC}/${MS_DISTNAME}/Makefile - @${REINPLACE_CMD} -e 's| && ${MAKE} -j8 doc||' ${MS_WRKSRC}/${MS_DISTNAME}/package.json - @${REINPLACE_CMD} -e 's|linkBins, linkMans|linkBins|; /manRoot/ s|, "share"||' ${MS_WRKSRC}/${MS_DISTNAME}/lib/build.js ${MS_WRKSRC}/${MS_DISTNAME}/lib/unbuild.js - @${REINPLACE_CMD} -e '1 s|#!/bin/bash|#!${LOCALBASE}/bin/bash|; s|${MAKE}|${GMAKE}|g; s|perl -pi|perl -p|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh - @${GREP} -lr share/man ${MS_WRKSRC}/${MS_DISTNAME}/doc/ ${MS_WRKSRC}/${MS_DISTNAME}/scripts/ | ${XARGS} -I % ${REINPLACE_CMD} 's|share/man|man|g' % - @cd ${MS_WRKSRC}/${MS_DISTNAME}/ && ${GMAKE} docclean markedclean all html/doc/misc/npm-index.html - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 {} \; - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 {} \; - @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -name '*.sh' -exec ${CHMOD} 755 {} \; - @cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${MS_DISTNAME}.tar.xz ${MS_DISTNAME}/ - @${REINPLACE_CMD} -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile - @sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/ - @cd ${.CURDIR}/ && ${MAKE_CMD} makesum - .include diff --git a/www/nuvolaplayer-all-services/Makefile b/www/nuvolaplayer-all-services/Makefile index a0ec797e5558..af1624e96852 100644 --- a/www/nuvolaplayer-all-services/Makefile +++ b/www/nuvolaplayer-all-services/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFAULT=${OPTIONS_DEFINE} . for o in ${OPTIONS_DEFINE} ${o}_DESC= ${NV_${o}_DESC} support -${o}_RUN_DEPENDS=${_DATADIR}/web_apps/${NV_${o}_NAME:S/-/_/g}/metadata.json:www/${PORTNAME}-${NV_${o}_NAME} +${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAME:S/-/_/g}/metadata.json:www/${PORTNAME}-${NV_${o}_NAME} . endfor .else NV_ID= ${${.CURDIR:T:S/${PORTNAME}-//}_ID} diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile index 5b79accc5187..47684e5e188d 100644 --- a/www/py-django-pipeline/Makefile +++ b/www/py-django-pipeline/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-pipeline -PORTVERSION= 1.6.9 +PORTVERSION= 1.6.10 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +13,6 @@ COMMENT= Asset (css/js) packaging library for Django LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 - NO_ARCH= yes USES= python:2.7+ USE_PYTHON= autoplist distutils diff --git a/www/py-django-pipeline/distinfo b/www/py-django-pipeline/distinfo index ff9b3e8a03d5..22b0d2413044 100644 --- a/www/py-django-pipeline/distinfo +++ b/www/py-django-pipeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475774731 -SHA256 (django-pipeline-1.6.9.tar.gz) = 3eb391e59525beedf0a45d4b6ef7e6a3e69f720b7560a1a305e115eb33d5fb6c -SIZE (django-pipeline-1.6.9.tar.gz) = 53903 +TIMESTAMP = 1484335873 +SHA256 (django-pipeline-1.6.10.tar.gz) = 43e1dc3ab937fef662d0e30dc3379037140885a498dbdf1b8b65e99e2a5a232a +SIZE (django-pipeline-1.6.10.tar.gz) = 53035 diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile index 194498655a9d..bd3940541f18 100644 --- a/www/py-flask-wtf/Makefile +++ b/www/py-flask-wtf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Flask-WTF -PORTVERSION= 0.13.1 +PORTVERSION= 0.14.2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \ ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel diff --git a/www/py-flask-wtf/distinfo b/www/py-flask-wtf/distinfo index 900632ff0f8a..d568ed7fa500 100644 --- a/www/py-flask-wtf/distinfo +++ b/www/py-flask-wtf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477589268 -SHA256 (Flask-WTF-0.13.1.tar.gz) = 20a5d72271677722ba6834e9e3327af777e0f6a758a3010c892c362107398512 -SIZE (Flask-WTF-0.13.1.tar.gz) = 253341 +TIMESTAMP = 1484336551 +SHA256 (Flask-WTF-0.14.2.tar.gz) = 5d14d55cfd35f613d99ee7cba0fc3fbbe63ba02f544d349158c14ca15561cc36 +SIZE (Flask-WTF-0.14.2.tar.gz) = 254903 diff --git a/www/redmine/Makefile b/www/redmine/Makefile index dbc07baa6c71..ea83a13cf3aa 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -23,7 +23,7 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ rubygem-mimemagic>=0:misc/rubygem-mimemagic \ rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \ rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \ - rubygem-actionpack-xml_parser>=0:textproc/rubygem-actionpack-xml_parser \ + rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \ rubygem-roadie-rails>=0:mail/rubygem-roadie-rails \ rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \ rubygem-rake>=0:devel/rubygem-rake \ diff --git a/www/roundup/Makefile b/www/roundup/Makefile index 2fb5d5ff15fe..0fcb52c32af5 100644 --- a/www/roundup/Makefile +++ b/www/roundup/Makefile @@ -10,33 +10,20 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Issue-Tracking System for Knowledge Workers LICENSE= PSFL +LICENSE_FILE= ${WRKSRC}/COPYING.txt USES= cpe gettext python CPE_VENDOR= roundup-tracker USE_PYTHON= distutils +NO_ARCH= yes OPTIONS_DEFINE= SQLITE PGSQL MYSQL NLS OPTIONS_DEFAULT=SQLITE +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb -.endif - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \ roundup-server roundup-xmlrpc-server @@ -44,10 +31,10 @@ SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \ post-install: ${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-${PYTHON_VER}/,} ${STAGEDIR}${PREFIX}/bin .for f in roundup-admin roundup-demo roundup-mailgw roundup-server - ${INSTALL_MAN} ${WRKSRC}/share/man/man1/${f}.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/share/man/man1/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endfor -.if ${PORT_OPTIONS:MNLS} + +post-install-NLS-on: @(cd ${WRKSRC}/build/share/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/) -.endif .include diff --git a/www/rubygem-faraday/Makefile b/www/rubygem-faraday/Makefile index a3856c8db0b3..472e3b5ca8a7 100644 --- a/www/rubygem-faraday/Makefile +++ b/www/rubygem-faraday/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= faraday -PORTVERSION= 0.9.2 +PORTVERSION= 0.11.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-faraday/distinfo b/www/rubygem-faraday/distinfo index b4af25d2c989..e623acb27d68 100644 --- a/www/rubygem-faraday/distinfo +++ b/www/rubygem-faraday/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/faraday-0.9.2.gem) = 0662e5caa257c256cff4b073deef5c73e3469d3ed0b8d6e9a05e6861efc4f4ce -SIZE (rubygem/faraday-0.9.2.gem) = 35840 +TIMESTAMP = 1484432532 +SHA256 (rubygem/faraday-0.11.0.gem) = 5986f49009d638d971997082f1a6cf1ed835144a66d5c11dd495bf1d9b66e1a2 +SIZE (rubygem/faraday-0.11.0.gem) = 37376 diff --git a/www/rubygem-faraday_middleware/Makefile b/www/rubygem-faraday_middleware/Makefile index 2c2e286cf7c7..325860e4dedc 100644 --- a/www/rubygem-faraday_middleware/Makefile +++ b/www/rubygem-faraday_middleware/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= faraday_middleware -PORTVERSION= 0.10.1 +PORTVERSION= 0.11.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-faraday_middleware/distinfo b/www/rubygem-faraday_middleware/distinfo index f831ae059be6..2a0d6ba93f4b 100644 --- a/www/rubygem-faraday_middleware/distinfo +++ b/www/rubygem-faraday_middleware/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483070001 -SHA256 (rubygem/faraday_middleware-0.10.1.gem) = 7910e325a2b4532c03d839fa67e5a4ffe45249c2ed4f9a4f8151194daf6d56a2 -SIZE (rubygem/faraday_middleware-0.10.1.gem) = 15360 +TIMESTAMP = 1484432575 +SHA256 (rubygem/faraday_middleware-0.11.0.gem) = ff2bdbb6bdd5b2293f8ce7cb93572318dd068506e12f987f04a65209a2bc69cb +SIZE (rubygem/faraday_middleware-0.11.0.gem) = 15872 diff --git a/www/rubygem-geminabox/Makefile b/www/rubygem-geminabox/Makefile index 088523eb2571..ebad1b61db0a 100644 --- a/www/rubygem-geminabox/Makefile +++ b/www/rubygem-geminabox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= geminabox -PORTVERSION= 0.13.4 +PORTVERSION= 0.13.5 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-geminabox/distinfo b/www/rubygem-geminabox/distinfo index e9b232ea952a..b3741886b8c8 100644 --- a/www/rubygem-geminabox/distinfo +++ b/www/rubygem-geminabox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483103561 -SHA256 (rubygem/geminabox-0.13.4.gem) = 75d4fb5f3561c3d321ddc932ef7daaa2257b48d52db9aa6cca1027f51aa00320 -SIZE (rubygem/geminabox-0.13.4.gem) = 50688 +TIMESTAMP = 1484441689 +SHA256 (rubygem/geminabox-0.13.5.gem) = c7ae26e5c1c6e7a87b2a70c02460a144d1fd43e56cb75e417f9dd40a0a4bee94 +SIZE (rubygem/geminabox-0.13.5.gem) = 50688 diff --git a/www/rubygem-tumblr_client/Makefile b/www/rubygem-tumblr_client/Makefile index 089207e8f79f..d9ccd0c7e58a 100644 --- a/www/rubygem-tumblr_client/Makefile +++ b/www/rubygem-tumblr_client/Makefile @@ -3,7 +3,7 @@ PORTNAME= tumblr_client PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-tumblr_client/files/patch-gemspec b/www/rubygem-tumblr_client/files/patch-gemspec index 99557940c668..33758b50c27c 100644 --- a/www/rubygem-tumblr_client/files/patch-gemspec +++ b/www/rubygem-tumblr_client/files/patch-gemspec @@ -1,10 +1,12 @@ ---- tumblr_client.gemspec.orig 2016-04-17 06:21:17 UTC +--- tumblr_client.gemspec.orig 2017-01-15 03:42:12 UTC +++ tumblr_client.gemspec -@@ -24,7 +24,7 @@ Gem::Specification.new do |s| +@@ -23,8 +23,8 @@ Gem::Specification.new do |s| + s.specification_version = 4 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.9.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.9.0"]) + s.add_runtime_dependency(%q.freeze, [">= 0.9.0"]) s.add_runtime_dependency(%q.freeze, [">= 0"]) s.add_runtime_dependency(%q.freeze, [">= 0"]) diff --git a/www/subsonic/Makefile b/www/subsonic/Makefile index a3e32a2a0fbc..82ff053091d7 100644 --- a/www/subsonic/Makefile +++ b/www/subsonic/Makefile @@ -38,7 +38,7 @@ APE_DESC= Depend on mac for Monkey's Audio transcoding #' OPTIONS_DEFAULT= FFMPEG JETTY OPTIONS_SUB= yes -RUN_DEPENDS+= ${JAVAJARDIR}/servlet-api.jar:www/servlet-api \ +RUN_DEPENDS+= ${JAVALIBDIR}/servlet-api.jar:www/servlet-api \ ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins TOMCAT8_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8 TOMCAT8_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8 diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 8e68960ca753..8b7b0baffb71 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.7 +PORTVERSION= 4.7.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo index 88db210abbe2..1e628b71d62b 100644 --- a/www/wordpress/distinfo +++ b/www/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481101948 -SHA256 (wordpress-4.7.tar.gz) = 7eae27ff70716dae2d2ba58280f2832fd70a208c9cdaf29ab36ac789c14d6977 -SIZE (wordpress-4.7.tar.gz) = 7993186 +TIMESTAMP = 1484374342 +SHA256 (wordpress-4.7.1.tar.gz) = 171252eed21e31becb5d52fa3d3ef7ba2b41f0fedd1a412afc5ad937da5317f6 +SIZE (wordpress-4.7.1.tar.gz) = 7998661 diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile index 6a2cf5de92b4..f401367535e5 100644 --- a/x11-drivers/xf86-input-evdev/Makefile +++ b/x11-drivers/xf86-input-evdev/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-evdev -PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTVERSION= 2.10.4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,7 +11,8 @@ LICENSE= MIT # various styles LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat -LIB_DEPENDS= libevdev.so:devel/libevdev +LIB_DEPENDS= libevdev.so:devel/libevdev \ + libmtdev.so:devel/libmtdev RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd XORG_CAT= driver @@ -20,15 +20,4 @@ USES= pathfix CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" " INSTALL_TARGET= install-strip -OPTIONS_DEFINE= MULTITOUCH - -MULTITOUCH_DESC= XInput 2.2 multitouch support -MULTITOUCH_LIB_DEPENDS= libmtdev.so:devel/libmtdev - -post-patch-MULTITOUCH-off: -# XXX Convert to CONFIGURE_ENV - @${REINPLACE_CMD} -i '.mtdev.bak' \ - -e '/PKG_CONFIG/s/mtdev/nonexistent/' \ - ${WRKSRC}/configure - .include diff --git a/x11-drivers/xf86-input-evdev/distinfo b/x11-drivers/xf86-input-evdev/distinfo index ffc30461e505..14c0fd3e220a 100644 --- a/x11-drivers/xf86-input-evdev/distinfo +++ b/x11-drivers/xf86-input-evdev/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec -SIZE (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 387095 +TIMESTAMP = 1479415100 +SHA256 (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2 +SIZE (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = 404465 diff --git a/x11-drivers/xf86-input-evdev/pkg-plist b/x11-drivers/xf86-input-evdev/pkg-plist index d1ee13f203a2..c9d6a12dcdd3 100644 --- a/x11-drivers/xf86-input-evdev/pkg-plist +++ b/x11-drivers/xf86-input-evdev/pkg-plist @@ -2,3 +2,4 @@ include/xorg/evdev-properties.h lib/xorg/modules/input/evdev_drv.so libdata/pkgconfig/xorg-evdev.pc man/man4/evdev.4x.gz +share/X11/xorg.conf.d/10-evdev.conf diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 1ac00b3aa1f9..7cc2f7de4c45 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -1,13 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-input-joystick -PORTVERSION= 1.6.2 -PORTREVISION= 4 +PORTVERSION= 1.6.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org joystick input driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + XORG_CAT= driver USES= pathfix diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index e1266a38c531..fdcd2da29ac5 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d -SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539 +TIMESTAMP = 1484349908 +SHA256 (xorg/driver/xf86-input-joystick-1.6.3.tar.bz2) = 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab +SIZE (xorg/driver/xf86-input-joystick-1.6.3.tar.bz2) = 351846 diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 4b9636d45b4e..19100462f852 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -1,12 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-input-keyboard -PORTVERSION= 1.8.1 +PORTVERSION= 1.9.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org keyboard input driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + XORG_CAT= driver USE_XORG= kbproto diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index 5179c5d1935a..adcb16cd1c25 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211 -SIZE (xorg/driver/xf86-input-keyboard-1.8.1.tar.bz2) = 319232 +TIMESTAMP = 1484349230 +SHA256 (xorg/driver/xf86-input-keyboard-1.9.0.tar.bz2) = f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 +SIZE (xorg/driver/xf86-input-keyboard-1.9.0.tar.bz2) = 341693 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index c883d3a0bc7e..aa0bb9b4b854 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -1,14 +1,17 @@ # $FreeBSD$ PORTNAME= xf86-input-mouse -PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTVERSION= 1.9.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mouse input driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + XORG_CAT= driver USES= pathfix +INSTALL_TARGET= install-strip .include diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index 900699e0397d..06655a5e93da 100644 --- a/x11-drivers/xf86-input-mouse/distinfo +++ b/x11-drivers/xf86-input-mouse/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce -SIZE (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 348244 +TIMESTAMP = 1479392438 +SHA256 (xorg/driver/xf86-input-mouse-1.9.2.tar.bz2) = f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f +SIZE (xorg/driver/xf86-input-mouse-1.9.2.tar.bz2) = 377685 diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c index f4d39fabf24b..997661eeb160 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c +++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c @@ -1,4 +1,4 @@ ---- src/bsd_mouse.c.orig 2014-08-12 06:36:34 UTC +--- src/bsd_mouse.c.orig 2015-04-20 01:07:33 UTC +++ src/bsd_mouse.c @@ -26,6 +26,24 @@ * authorization from the copyright holder(s) and author(s). @@ -476,12 +476,21 @@ + xf86FlushInput(pInfo->fd); + if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput, + pInfo)) -+ AddEnabledDevice(pInfo->fd); ++ xf86AddEnabledDevice(pInfo); + } + } } pMse->lastButtons = 0; pMse->lastMappedButtons = 0; +@@ -560,7 +737,7 @@ usbMouseProc(DeviceIntPtr pPointer, int + case DEVICE_OFF: + case DEVICE_CLOSE: + if (pInfo->fd != -1) { +- RemoveEnabledDevice(pInfo->fd); ++ xf86RemoveEnabledDevice(pInfo); + if (pUsbMse->packetSize > 8 && pUsbMse->buffer) { + free(pUsbMse->buffer); + } @@ -571,6 +748,7 @@ usbMouseProc(DeviceIntPtr pPointer, int xf86CloseSerial(pInfo->fd); pInfo->fd = -1; diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in index ba7c09e4fe00..68ee4657fb9e 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in +++ b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2015-03-03 05:17:45 UTC +--- src/Makefile.in.orig 2016-11-22 04:55:36 UTC +++ src/Makefile.in -@@ -344,7 +344,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $( +@@ -357,7 +357,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $( # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c index d4884b7ad585..14e1f75ca959 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c @@ -1,6 +1,6 @@ ---- src/mouse.c.orig 2014-08-12 06:36:34 UTC +--- src/mouse.c.orig 2016-09-06 03:53:31 UTC +++ src/mouse.c -@@ -293,13 +293,39 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -304,13 +304,39 @@ MouseCommonOptions(InputInfoPtr pInfo) pMse = pInfo->private; @@ -41,7 +41,7 @@ pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options, "Emulate3Buttons", FALSE); if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) { -@@ -311,6 +337,8 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -322,6 +348,8 @@ MouseCommonOptions(InputInfoPtr pInfo) "Emulate3Timeout", 50); if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) { MessageType from = X_CONFIG; @@ -50,7 +50,7 @@ if (pMse->emulate3ButtonsSoft) from = X_DEFAULT; xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n", -@@ -318,6 +346,8 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -329,6 +357,8 @@ MouseCommonOptions(InputInfoPtr pInfo) } pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE); @@ -59,7 +59,7 @@ pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE); if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) { pMse->invX = -1; -@@ -328,7 +358,7 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -339,7 +369,7 @@ MouseCommonOptions(InputInfoPtr pInfo) } else pMse->invY = 1; pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0); @@ -68,7 +68,7 @@ if (pMse->pDragLock) free(pMse->pDragLock); -@@ -438,14 +468,17 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -449,14 +479,17 @@ MouseCommonOptions(InputInfoPtr pInfo) free(s); } @@ -88,7 +88,7 @@ pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX; msg = xstrdup("X axis"); } else if (!xf86NameCmp(s, "y")) { -@@ -594,29 +627,6 @@ MouseCommonOptions(InputInfoPtr pInfo) +@@ -605,29 +638,6 @@ MouseCommonOptions(InputInfoPtr pInfo) pInfo->name, wheelButton, pMse->wheelInertia, pMse->wheelButtonTimeout); } @@ -118,7 +118,7 @@ if (origButtons != pMse->buttons) buttons_from = X_CONFIG; xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons); -@@ -698,7 +708,6 @@ MouseHWOptions(InputInfoPtr pInfo) +@@ -709,7 +719,6 @@ MouseHWOptions(InputInfoPtr pInfo) } pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0); pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0); @@ -126,7 +126,7 @@ } static void -@@ -986,6 +995,8 @@ MousePreInit(InputDriverPtr drv, InputIn +@@ -997,6 +1006,8 @@ MousePreInit(InputDriverPtr drv, InputIn /* Default Mapping: 1 2 3 8 9 10 11 ... */ for (i = 0; i < MSE_MAXBUTTONS; i++) pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i); @@ -135,7 +135,7 @@ protocol = MousePickProtocol(pInfo, device, protocol, &protocolID); -@@ -2181,7 +2192,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int +@@ -2198,7 +2209,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask = 0; else wheelButtonMask = 1 << (pMse->wheelButton - 1); -@@ -2271,6 +2282,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int +@@ -2288,6 +2299,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int } } } @@ -154,7 +154,7 @@ } /* Absorb the mouse movement while the wheel button is pressed. */ -@@ -2288,7 +2302,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int +@@ -2305,7 +2319,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy)) buttonTimer(pInfo); @@ -163,7 +163,7 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); if (change) { -@@ -2401,12 +2415,10 @@ MousePostEvent(InputInfoPtr pInfo, int t +@@ -2418,12 +2432,10 @@ MousePostEvent(InputInfoPtr pInfo, int t int dx, int dy, int dz, int dw) { MouseDevPtr pMse; @@ -176,7 +176,7 @@ if (pMse->protocolID == PROT_MMHIT) b = reverseBits(hitachMap, truebuttons); -@@ -2499,11 +2511,11 @@ MousePostEvent(InputInfoPtr pInfo, int t +@@ -2516,11 +2528,11 @@ MousePostEvent(InputInfoPtr pInfo, int t /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h index 2001c5b43698..7bd620564018 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h @@ -1,4 +1,4 @@ ---- src/mouse.h.orig 2014-08-12 06:36:34 UTC +--- src/mouse.h.orig 2012-10-08 01:40:07 UTC +++ src/mouse.h @@ -220,10 +220,13 @@ typedef struct _MouseDevRec { Bool emulate3ButtonsSoft; diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h index d53173133fa7..91e92858dbec 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h @@ -1,4 +1,4 @@ ---- src/mousePriv.h.orig 2014-08-12 06:36:34 UTC +--- src/mousePriv.h.orig 2012-05-28 00:01:45 UTC +++ src/mousePriv.h @@ -63,8 +63,6 @@ typedef struct { int acc; diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index af97c84ee183..0e7f646619e3 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -1,13 +1,18 @@ # $FreeBSD$ PORTNAME= xf86-video-ati -PORTVERSION= 7.5.0 -PORTREVISION= 3 +PORTVERSION= 7.8.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ati display driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ + libdrm_radeon.so:graphics/libdrm + USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto \ @@ -20,6 +25,5 @@ INSTALL_TARGET= install-strip ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS+=--disable-udev -CONFIGURE_ARGS+=--disable-glamor .include diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index c6949cd0ec9f..92256f81791d 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 -SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756 +TIMESTAMP = 1479393377 +SHA256 (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa +SIZE (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 845702 diff --git a/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c deleted file mode 100644 index 3de34a1b60ae..000000000000 --- a/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 -+++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 -@@ -578,7 +578,7 @@ - radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata) - { - DRI2ClientEventsPtr pClientEventsPriv; -- DRI2FrameEventPtr ref; -+ DRI2FrameEventPtr ref = NULL; - NewClientInfoRec *clientinfo = calldata; - ClientPtr pClient = clientinfo->client; - pClientEventsPriv = GetDRI2ClientEvents(pClient); diff --git a/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c index 9966ec93ec70..dab18adef9ba 100644 --- a/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c +++ b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c @@ -1,5 +1,5 @@ ---- src/radeon_kms.c.orig 2014-10-02 05:31:27.000000000 +0200 -+++ src/radeon_kms.c 2014-10-23 18:56:18.359108170 +0200 +--- src/radeon_kms.c.orig 2015-11-12 03:57:33.000000000 +0100 ++++ src/radeon_kms.c 2015-11-12 13:42:18.759377000 +0100 @@ -30,6 +30,8 @@ #include @@ -8,17 +8,8 @@ +#include /* Driver data structures */ #include "radeon.h" - #include "radeon_reg.h" -@@ -280,7 +282,7 @@ - radeon_dirty_update(ScreenPtr screen) - { - RegionPtr region; -- PixmapDirtyUpdatePtr ent; -+ PixmapDirtyUpdatePtr ent = NULL; - - if (xorg_list_is_empty(&screen->pixmap_dirty_list)) - return; -@@ -589,7 +591,7 @@ + #include "radeon_drm_queue.h" +@@ -829,7 +831,7 @@ static int radeon_get_drm_master_fd(Scrn #endif struct pci_device *dev = info->PciInfo; char *busid; @@ -27,7 +18,7 @@ #ifdef XF86_PDEV_SERVER_FD if (pRADEONEnt->platform_dev) { -@@ -608,6 +610,15 @@ +@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn dev->domain, dev->bus, dev->dev, dev->func); #endif diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 14de28233c40..d9abbd51522b 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -1,13 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-video-dummy -PORTVERSION= 0.3.7 -PORTREVISION= 6 +PORTVERSION= 0.3.8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org dummy display driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + XORG_CAT= driver USE_XORG= xf86dgaproto diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo index 6bd67113507d..b8e14654954c 100644 --- a/x11-drivers/xf86-video-dummy/distinfo +++ b/x11-drivers/xf86-video-dummy/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-dummy-0.3.7.tar.bz2) = 56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680 -SIZE (xorg/driver/xf86-video-dummy-0.3.7.tar.bz2) = 279806 +TIMESTAMP = 1484388618 +SHA256 (xorg/driver/xf86-video-dummy-0.3.8.tar.bz2) = 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 +SIZE (xorg/driver/xf86-video-dummy-0.3.8.tar.bz2) = 302353 diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index 4ab6773a781d..b5b74e25197b 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org openChrome display driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + USE_GL= gl XORG_CAT= driver diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_driver.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_driver.c new file mode 100644 index 000000000000..e7b63c200dc8 --- /dev/null +++ b/x11-drivers/xf86-video-openchrome/files/patch-src__via_driver.c @@ -0,0 +1,11 @@ +--- src/via_driver.c.orig 2015-11-19 15:49:03.658837000 +0100 ++++ src/via_driver.c 2015-11-19 15:51:11.689034000 +0100 +@@ -806,7 +806,7 @@ via_xf86crtc_resize(ScrnInfoPtr scrn, in + { + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + struct buffer_object *old_front = NULL, *new_front = NULL; +- int old_width, old_height, old_dwidth, format; ++ int old_width = 0, old_height = 0, old_dwidth = 0, format; + int cpp = (scrn->bitsPerPixel + 7) >> 3, i; + ScreenPtr screen = scrn->pScreen; + VIAPtr pVia = VIAPTR(scrn); diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index 15b2a4a3a8f2..ef1475181fec 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -1,12 +1,15 @@ # $FreeBSD$ PORTNAME= xf86-video-r128 -PORTVERSION= 6.10.0 +PORTVERSION= 6.10.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org r128 display driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + USE_GL= gl XORG_CAT= driver USE_XORG= glproto xf86driproto xf86miscproto xineramaproto diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo index d2e9f01814aa..ea6992af9102 100644 --- a/x11-drivers/xf86-video-r128/distinfo +++ b/x11-drivers/xf86-video-r128/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 80d531a07168230a408b88809a5440cfd48f9098666d12702d0012148a0d353d -SIZE (xorg/driver/xf86-video-r128-6.10.0.tar.bz2) = 494884 +TIMESTAMP = 1484351416 +SHA256 (xorg/driver/xf86-video-r128-6.10.1.tar.bz2) = 5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea +SIZE (xorg/driver/xf86-video-r128-6.10.1.tar.bz2) = 495306 diff --git a/x11-drivers/xf86-video-sis/files/patch-src_init301.c b/x11-drivers/xf86-video-sis/files/patch-src_init301.c new file mode 100644 index 000000000000..a0f65ade71cd --- /dev/null +++ b/x11-drivers/xf86-video-sis/files/patch-src_init301.c @@ -0,0 +1,11 @@ +--- src/init301.c.orig 2015-11-19 15:53:05.412011000 +0100 ++++ src/init301.c 2015-11-19 15:53:24.734403000 +0100 +@@ -446,7 +446,7 @@ SiS_CR36BIOSWord23d(struct SiS_Private * + void + SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime) + { +- unsigned int i, j; ++ unsigned int i, j = 0; + + for(i = 0; i < delaytime; i++) { + j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05); diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index f6384836f0ba..ec4908d4dac7 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -1,12 +1,16 @@ # $FreeBSD$ PORTNAME= xf86-video-vmware -PORTVERSION= 13.1.0 +PORTVERSION= 13.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmware display driver +LICENSE= MIT +LICENSE_FILES= ${WRKSRC}/COPYING + +INSTALL_TARGET= install-strip XORG_CAT= driver USE_XORG= xextproto xineramaproto videoproto diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index da0c9d176441..76fbfd3743c0 100644 --- a/x11-drivers/xf86-video-vmware/distinfo +++ b/x11-drivers/xf86-video-vmware/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-vmware-13.1.0.tar.bz2) = 3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc -SIZE (xorg/driver/xf86-video-vmware-13.1.0.tar.bz2) = 459255 +TIMESTAMP = 1484346479 +SHA256 (xorg/driver/xf86-video-vmware-13.2.1.tar.bz2) = e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b +SIZE (xorg/driver/xf86-video-vmware-13.2.1.tar.bz2) = 470601 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index d49dc239a199..85ec82fc0c17 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -8,8 +8,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.org drivers meta-port -VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers -INPUTDIR= ${PREFIX}/lib/xorg/modules/input +VIDEODIR= ${LOCALBASE}/lib/xorg/modules/drivers +INPUTDIR= ${LOCALBASE}/lib/xorg/modules/input USES= metaport diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile index 0c9e07ccfdba..e6236063aabf 100644 --- a/x11-fm/worker/Makefile +++ b/x11-fm/worker/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= worker -PORTVERSION= 3.8.4 +PORTVERSION= 3.8.5 CATEGORIES= x11-fm MASTER_SITES= http://www.boomerangsworld.de/cms/worker/downloads/ @@ -31,7 +31,11 @@ AVFS_DESC= Use AVFS library to access an archives AVFS_LIB_DEPENDS= libavfs.so:sysutils/avfs HAL_LIB_DEPENDS= libhal-storage.so:sysutils/hal \ - libdbus-glib-1.so:devel/dbus-glib + libdbus-glib-1.so:devel/dbus-glib \ + libdbus-1.so:devel/dbus +HAL_USE= gnome=glib20 xorg=sm,ice +HAL_USES= gettext-runtime + INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify INOTIFY_LDFLAGS= -L${LOCALBASE}/lib @@ -39,6 +43,6 @@ LUA_CONFIGURE_OFF= --disable-lua LUA_USES= lua:51 XFT_CONFIGURE_OFF= --disable-xft -XFT_USE= XORG=xft +XFT_USE= xorg=xft .include diff --git a/x11-fm/worker/distinfo b/x11-fm/worker/distinfo index 2c28be181c46..8fcfdeb8b8c0 100644 --- a/x11-fm/worker/distinfo +++ b/x11-fm/worker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1474652281 -SHA256 (worker-3.8.4.tar.bz2) = 3072e35481e56a9cf0f1bd6f1df97022ab47ebf2d84ef945a1d6af5f5fa9f762 -SIZE (worker-3.8.4.tar.bz2) = 1522576 +TIMESTAMP = 1483975945 +SHA256 (worker-3.8.5.tar.bz2) = 1447cb564f627728e24a23bff21110b2e7625905be10550ac418de5df550eb6f +SIZE (worker-3.8.5.tar.bz2) = 1533134 diff --git a/x11-fonts/emojione-color-font-ttf/Makefile b/x11-fonts/emojione-color-font-ttf/Makefile index 0e386ed640a7..79433fcb1152 100644 --- a/x11-fonts/emojione-color-font-ttf/Makefile +++ b/x11-fonts/emojione-color-font-ttf/Makefile @@ -4,7 +4,7 @@ PORTNAME= emojione-color-font-ttf PORTVERSION= 1.3 CATEGORIES= x11-fonts -MASTER_SITES= http://github.com/eosrei/emojione-color-font/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://github.com/eosrei/emojione-color-font/releases/download/v${PORTVERSION}/ DISTNAME= EmojiOneColor-SVGinOT-${PORTVERSION} MAINTAINER= ehaupt@FreeBSD.org diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index ae7e5ea3b097..9c7d55b93282 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= xorg-nestserver -PORTVERSION= 1.19.0 -PORTEPOCH= 1 +PORTVERSION= 1.19.1 +PORTEPOCH= 2 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver DISTNAME= xorg-server-${PORTVERSION} @@ -15,6 +15,7 @@ COMMENT= Nesting X server from X.Org LICENSE= MIT LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms +RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config USES= tar:bzip2 pkgconfig ssl INSTALL_WRKSRC= ${WRKSRC}/hw/xnest diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index 137601d8fc03..2083f2d9a628 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483749581 -SHA256 (xorg/xserver/xorg-server-1.19.0.tar.bz2) = 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3 -SIZE (xorg/xserver/xorg-server-1.19.0.tar.bz2) = 6051462 +TIMESTAMP = 1484388904 +SHA256 (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb +SIZE (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 6041792 diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 5379a29829a7..9d68fb3947bd 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xorg-vfbserver -PORTVERSION= 1.19.0 +PORTVERSION= 1.19.1 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -14,6 +14,8 @@ COMMENT= X virtual framebuffer server from X.Org LICENSE= MIT +RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config + USES= tar:bzip2 pkgconfig ssl INSTALL_WRKSRC= ${WRKSRC}/hw/vfb GNU_CONFIGURE= yes diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index d769e80804f2..655e32cde9b6 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483749630 -SHA256 (xorg/xserver/xorg-server-1.19.0.tar.bz2) = 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3 -SIZE (xorg/xserver/xorg-server-1.19.0.tar.bz2) = 6051462 +TIMESTAMP = 1484389062 +SHA256 (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb +SIZE (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 6041792 diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index fd9a08a6590a..3465026e2c72 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-desktop PORTVERSION= 4.12.3 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/xfdesktop/${PORTVERSION:R}/ DISTNAME= xfdesktop-${PORTVERSION} @@ -39,11 +40,11 @@ THUNAR_USE_OFF= xfce=libexo THUNAR_DESC= Thunar file manager support OPTIONS_SUB= yes -.include - post-patch: -.if !${PORT_OPTIONS:MNLS} + ${REINPLACE_CMD} -e 's|inode/directory|folder|' \ + ${WRKSRC}/src/xfdesktop-file-icon-manager.c + +post-patch-NLS-off: @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in -.endif -.include +.include diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile index 069016fbc4ff..13e5f624787e 100644 --- a/x11/lxrandr/Makefile +++ b/x11/lxrandr/Makefile @@ -2,38 +2,33 @@ # $FreeBSD$ PORTNAME= lxrandr -PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= x11 -MASTER_SITES= SF/lxde/LXRandR%20%28monitor%20config%20tool%29/LXRandR%20${PORTVERSION} +MASTER_SITES= SF/lxde/LXRandR%20%28monitor%20config%20tool%29/LXRandR%20${PORTVERSION:R}.x/ MAINTAINER= ericturgeon@ghostbsd.org -COMMENT= LXDE screen manager +COMMENT= Monitor configuration tool LICENSE= GPLv2 -USES= desktop-file-utils gmake pkgconfig -USE_GNOME= gtk20 intltool +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= desktop-file-utils gmake localbase pkgconfig tar:xz +USE_GNOME= gtk20 intltool cairo USE_XORG= xrandr GNU_CONFIGURE= yes INSTALLS_ICONS= yes -PORTDOCS= AUTHORS -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_USES_OFF= gettext-tools -NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LDFLAGS= -L${LOCALBASE}/lib post-patch-NLS-off: @${REINPLACE_CMD} -e 's|po man|man|' \ ${WRKSRC}/Makefile.in -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - .include diff --git a/x11/lxrandr/distinfo b/x11/lxrandr/distinfo index bd0d13794d25..0db35750654a 100644 --- a/x11/lxrandr/distinfo +++ b/x11/lxrandr/distinfo @@ -1,2 +1,3 @@ -SHA256 (lxrandr-0.1.2.tar.gz) = fb8139478f6cfeac6a2d8adb4e55e8cad099bfe2da7c82253c935ba719f9cf19 -SIZE (lxrandr-0.1.2.tar.gz) = 230394 +TIMESTAMP = 1483100143 +SHA256 (lxrandr-0.3.1.tar.xz) = 6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e +SIZE (lxrandr-0.3.1.tar.xz) = 132468 diff --git a/x11/lxrandr/pkg-plist b/x11/lxrandr/pkg-plist index 026cbafb2d72..7e89b1377c1a 100644 --- a/x11/lxrandr/pkg-plist +++ b/x11/lxrandr/pkg-plist @@ -15,7 +15,6 @@ share/applications/lxrandr.desktop %%NLS%%share/locale/el/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/es/LC_MESSAGES/lxrandr.mo -%%NLS%%share/locale/es_VE/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/et/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/eu/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/fa/LC_MESSAGES/lxrandr.mo @@ -28,8 +27,9 @@ share/applications/lxrandr.desktop %%NLS%%share/locale/hr/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/hu/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/id/LC_MESSAGES/lxrandr.mo -%%NLS%%share/locale/it/LC_MESSAGES/lxrandr.mo +%%NLS%%share/locale/is/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/ja/LC_MESSAGES/lxrandr.mo +%%NLS%%share/locale/kk/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/ko/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/lg/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/lt/LC_MESSAGES/lxrandr.mo @@ -38,6 +38,7 @@ share/applications/lxrandr.desktop %%NLS%%share/locale/nb/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/nl/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/nn/LC_MESSAGES/lxrandr.mo +%%NLS%%share/locale/pa/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/pl/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/ps/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/pt/LC_MESSAGES/lxrandr.mo @@ -53,6 +54,7 @@ share/applications/lxrandr.desktop %%NLS%%share/locale/th/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/tr/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/tt_RU/LC_MESSAGES/lxrandr.mo +%%NLS%%share/locale/ug/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/uk/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/ur/LC_MESSAGES/lxrandr.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/lxrandr.mo diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile index bff97b84d85b..14287b0b9a85 100644 --- a/x11/nvidia-driver-304/Makefile +++ b/x11/nvidia-driver-304/Makefile @@ -1,9 +1,9 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ -DISTVERSION= 304.131 +DISTVERSION= 304.134 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 4 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile index b9255f943254..19b7e9104092 100644 --- a/x11/nvidia-driver-340/Makefile +++ b/x11/nvidia-driver-340/Makefile @@ -1,9 +1,9 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ -DISTVERSION= 340.96 +DISTVERSION= 340.101 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 4 +PORTREVISION= 0 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index f790ce4c0b9d..749197af3145 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -10,9 +10,9 @@ # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 367.44 +DISTVERSION?= 375.26 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 3 +PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 92652baa0a83..5d77224ea964 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1468687296 -SHA256 (NVIDIA-FreeBSD-x86_64-367.44.tar.gz) = e07d21b0ad39a0a24cdc4840094fb2f2de2f52b704538f7ac60c019465de7137 -SIZE (NVIDIA-FreeBSD-x86_64-367.44.tar.gz) = 59577943 -SHA256 (NVIDIA-FreeBSD-x86-367.44.tar.gz) = 687a178cc0e63f79f38f6e71da904363579b833ab3dadac424bcb2264889d4ec -SIZE (NVIDIA-FreeBSD-x86-367.44.tar.gz) = 62815733 -SHA256 (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = b67962a4433dd1fa86cde038bb244a547f5ed6c242febc348d618886b7715d09 -SIZE (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = 60536275 -SHA256 (NVIDIA-FreeBSD-x86-340.96.tar.gz) = dda243ed9b36e29162b1c97b987b9ca82ef7fcff4635ac78443fdb06739ec22e -SIZE (NVIDIA-FreeBSD-x86-340.96.tar.gz) = 59678354 -SHA256 (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a -SIZE (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = 35812363 -SHA256 (NVIDIA-FreeBSD-x86-304.131.tar.gz) = d9d350de797d0db58ed82d73569766d8e914b0410f0f9fc78aac098fdcd31027 -SIZE (NVIDIA-FreeBSD-x86-304.131.tar.gz) = 34782985 +TIMESTAMP = 1482026038 +SHA256 (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = c7d32cb434f9a7e84903a1305d7577705f991fdb6eb4ab3ff79d41b2df82265d +SIZE (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = 58287080 +SHA256 (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 5249d01a21bb846a08975c4f3a90935b6dc8fd33ec8e5faa0d624ef15bcf2b88 +SIZE (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 59091851 +SHA256 (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = aa75da2de6656bf8c4b8cf73b9e330b21ebc5da6de509cf90aed8a571716b111 +SIZE (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = 60860185 +SHA256 (NVIDIA-FreeBSD-x86-340.101.tar.gz) = f62038819eb4ba074e92ce8d26b6330ed3bc32d1c07bcc95f4e2964fa667e03b +SIZE (NVIDIA-FreeBSD-x86-340.101.tar.gz) = 59992166 +SHA256 (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 3eafced8f8095c7f1135feaadbfcc709bd7ab96bf755da52ed5ca05a473604f8 +SIZE (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 36148973 +SHA256 (NVIDIA-FreeBSD-x86-304.134.tar.gz) = e7a164807c83ab0f1be98eb241e76db0ca481d24cd64563c44dfbd73b9067b0f +SIZE (NVIDIA-FreeBSD-x86-304.134.tar.gz) = 35095790 diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index b735197f993f..9c771ce5a7eb 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -1,14 +1,14 @@ bin/nvidia-bug-report.sh bin/nvidia-debugdump bin/nvidia-smi -lib/.nvidia/libGL.so -lib/.nvidia/libGL.so.1 lib/.nvidia/libEGL.so lib/.nvidia/libEGL.so.1 -lib/libGLESv1_CM.so -lib/libGLESv1_CM.so.1 +lib/.nvidia/libGL.so +lib/.nvidia/libGL.so.1 lib/.nvidia/libGLESv2.so lib/.nvidia/libGLESv2.so.2 +lib/libGLESv1_CM.so +lib/libGLESv1_CM.so.1 lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.so.1 diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile index cdfe43344480..8f7cd80ae0e0 100644 --- a/x11/rgb/Makefile +++ b/x11/rgb/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0.6 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org -COMMENT= Uncompile an rgb corl-name database +COMMENT= Uncompile an rgb color-name database CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 3fdaa15cc4f9..10e1af586d91 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -2,7 +2,7 @@ PORTNAME= xdm PORTVERSION= 1.1.11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +13,9 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw CONFIGURE_ARGS+= --with-xdmconfigdir=${PREFIX}/lib/X11/xdm \ - --with-xdmscriptdir=${PREFIX}/lib/X11/xdm + --with-xdmscriptdir=${PREFIX}/lib/X11/xdm \ + --with-authdir=/var/db/xdm + USES= cpe libtool CPE_PRODUCT= x_display_manager CPE_VENDOR= x @@ -23,11 +25,15 @@ CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \ OPTIONS_SUB= yes -OPTIONS_DEFINE= XDMSHELL +OPTIONS_DEFINE= XDMSHELL XFT +OPTIONS_DEFAULT= XFT XDMSHELL_DESC= Install xdmshell XDMSHELL_CONFIGURE_ENABLE= xdmshell +XFT_USE= xorg=xft +XFT_CONFIGURE_WITH= xft + INSTALL_TARGET= install-strip post-patch: @@ -44,7 +50,6 @@ post-install: .for f in ${CFFILES} @${MV} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f} ${STAGEDIR}${PREFIX}/lib/X11/xdm/${f}.sample .endfor - @${MKDIR} ${STAGEDIR}/var/lib/xdm/authdir - @${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir + @${MKDIR} ${STAGEDIR}/var/db/xdm .include diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist index ed92767ffc69..cb83a950d196 100644 --- a/x11/xdm/pkg-plist +++ b/x11/xdm/pkg-plist @@ -1,6 +1,5 @@ bin/xdm %%XDMSHELL%%bin/xdmshell -lib/X11/xdm/authdir lib/X11/xdm/chooser lib/X11/xdm/libXdmGreet.so lib/X11/xdm/pixmaps/xorg-bw.xpm @@ -19,7 +18,6 @@ share/X11/app-defaults/Chooser @sample lib/X11/xdm/Xstartup.sample @sample lib/X11/xdm/Xwilling.sample @sample lib/X11/xdm/xdm-config.sample -@unexec rm -rf /var/lib/xdm/authdir/* 2>/dev/null || true -@dir /var/lib/xdm/authdir -@dir /var/lib/xdm -@dir /var/lib +@postunexec rm -rf /var/db/xdm/* 2>/dev/null || true +@dir /var/db/xdm +@dir /var/db diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 44fcabc4fb6e..abde67982100 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -5,17 +5,10 @@ PORTNAME= xorg-libraries PORTVERSION= 7.7 PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org libraries meta-port -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes - RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc \ ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE \ @@ -58,4 +51,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc \ ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm +USES= metaport + .include