*/*: sync with upstream

Taken from: FreeBSD
opnsense2 · Nov 2, 2015 · 91355df · 91355df
1 parent e61cbea
commit 91355df
Show file tree

Hide file tree

Showing 200 changed files with 306 additions and 6,948 deletions.
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Ultimate outdoor aficionado's tool
 
 LICENSE=	GPLv3
 
+BROKEN=		unfetchable
+
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
 		libroutino.so:${PORTSDIR}/astro/routino
 

diff --git a/audio/Makefile b/audio/Makefile
@@ -77,7 +77,6 @@
     SUBDIR += cmp3
     SUBDIR += cmt
     SUBDIR += cmus
-    SUBDIR += cmus-post.fm
     SUBDIR += cpige
     SUBDIR += cplay
     SUBDIR += cpp-xmms2

diff --git a/audio/cmus-post.fm/Makefile b/audio/cmus-post.fm/Makefile
diff --git a/audio/cmus-post.fm/distinfo b/audio/cmus-post.fm/distinfo
diff --git a/audio/cmus-post.fm/files/pkg-message.in b/audio/cmus-post.fm/files/pkg-message.in
diff --git a/audio/cmus-post.fm/pkg-descr b/audio/cmus-post.fm/pkg-descr
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
@@ -12,6 +12,8 @@ COMMENT=	PDO driver for Apache Cassandra
 
 LICENSE=	APACHE20
 
+BROKEN=		fails to compile
+
 LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
 
 USE_GITHUB=	yes

diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
@@ -47,14 +47,15 @@ PLIST_SUB+=	TT_USER=${USERS} \
 OPTIONS_DEFINE=	DEBUG
 DEBUG_DESC=	Enable debug
 
-.if defined(USE_GCC) && ${USE_GCC:S/+//} == 4.8
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
-.endif
-
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	not yet ported to this architecture
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+# XXX we rely on USES=perl5 to load bsd.default-versions.mk
+.if defined(USE_GCC) && ${USE_GCC} == yes && ${GCC_DEFAULT} == 4.8
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_trivia_config.h.cmake
+.endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_BUILD_TYPE=	RelWithDebugInfo
@@ -70,4 +71,4 @@ post-install:
 		${STAGEDIR}${TT_RUNDIR} \
 		${STAGEDIR}${ETCDIR}/instances.enabled
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/Makefile b/devel/Makefile
@@ -1265,7 +1265,6 @@
     SUBDIR += libpeak
     SUBDIR += libpeas
     SUBDIR += libpff
-    SUBDIR += libphish
     SUBDIR += libphk
     SUBDIR += libphutil
     SUBDIR += libplist
@@ -1488,6 +1487,7 @@
     SUBDIR += msgpack
     SUBDIR += msgpuck
     SUBDIR += msp430-binutils
+    SUBDIR += msp430-debug-stack
     SUBDIR += msp430-gcc
     SUBDIR += msp430-gdb
     SUBDIR += msp430-libc
@@ -4569,7 +4569,6 @@
     SUBDIR += roboctl
     SUBDIR += robodoc
     SUBDIR += root-doc
-    SUBDIR += ros
     SUBDIR += rote
     SUBDIR += rpc2
     SUBDIR += rpm-spec-mode.el
@@ -4701,7 +4700,6 @@
     SUBDIR += rubygem-daemon_controller
     SUBDIR += rubygem-daemons
     SUBDIR += rubygem-debug_inspector
-    SUBDIR += rubygem-debugger
     SUBDIR += rubygem-debugger-linecache
     SUBDIR += rubygem-debugger-xml
     SUBDIR += rubygem-deep_merge

diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
@@ -10,6 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	[email protected]
 COMMENT=	C++ Library Absolutely Wonderful
 
+LICENSE=	LGPL21 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
 

diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile
diff --git a/devel/libphish/distinfo b/devel/libphish/distinfo
diff --git a/devel/libphish/files/patch-src-phish_opdb_server.c b/devel/libphish/files/patch-src-phish_opdb_server.c
diff --git a/devel/libphish/files/patch-src-phish_util_net.c b/devel/libphish/files/patch-src-phish_util_net.c
diff --git a/devel/libphish/pkg-descr b/devel/libphish/pkg-descr
diff --git a/devel/libphish/pkg-plist b/devel/libphish/pkg-plist
diff --git a/devel/libserver/Makefile b/devel/libserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libserver
-PORTVERSION=	3.5
+PORTVERSION=	3.8
 CATEGORIES=	devel
 MASTER_SITES=	http://www.mammothcheese.ca/
 

diff --git a/devel/libserver/distinfo b/devel/libserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libserver-3.5.tar.gz) = da404af148e7ffa5bc5c37fdba48f42bb7add9f1859ff77aabb0ed62db5181e9
-SIZE (libserver-3.5.tar.gz) = 25323
+SHA256 (libserver-3.8.tar.gz) = 56b6e8527742650134a155ff8b821ec5cf69bd22e04e044b1dda4d9e1758ae60
+SIZE (libserver-3.8.tar.gz) = 25301
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.2.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -86,6 +87,8 @@ PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.options.mk>
 
 .if (exists(/usr/sbin/bhyve) && ${OSVERSION} >= 100051)
@@ -107,11 +110,20 @@ post-patch:
 	@${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample
 	@${REINPLACE_CMD} -e 's|libvirtd\.conf|libvirtd.conf.sample|' \
 		${WRKSRC}/daemon/Makefile.in
+
+	@${REINPLACE_CMD} -e 's|ln -s ../default.xml|true|' \
+			  -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \
+			  ${WRKSRC}/src/Makefile.in
 
 	@${MV} ${WRKSRC}/src/libvirt.conf ${WRKSRC}/src/libvirt.conf.sample
 	@${REINPLACE_CMD} -e 's|conf_DATA = libvirt.conf|conf_DATA = libvirt.conf.sample|' \
 		${WRKSRC}/src/Makefile.in
 
+	@${MV} ${WRKSRC}/src/locking/virtlockd.conf ${WRKSRC}/src/locking/virtlockd.conf.sample
+	@${REINPLACE_CMD} -e 's|virtlockd.conf |virtlockd.conf.sample |' \
+			  -e 's|virtlockd.conf$$|virtlockd.conf.sample|' \
+		${WRKSRC}/src/Makefile.in
+
 	@${MV} ${WRKSRC}/src/qemu/qemu.conf ${WRKSRC}/src/qemu/qemu.conf.sample
 	@${REINPLACE_CMD} -e 's|qemu.conf |qemu.conf.sample |' \
 		${WRKSRC}/src/Makefile.in
@@ -128,6 +140,8 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 
 post-install:
+	@${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}

diff --git a/devel/libvirt/files/pkg-message.in b/devel/libvirt/files/pkg-message.in
@@ -0,0 +1,21 @@
+
+To enable libvirtd please add libvirtd_enable="YES" to
+/etc/rc.conf.
+
+NOTE ON CONFIGURATION:
+
+The libvirt port does not come with networking configuration enabled.
+The 'default' network definition is available at:
+
+  %%EXAMPLESDIR%%/networks/default.xml
+
+To enable this network please do the following:
+
+  cp %%EXAMPLESDIR%%/networks/default.xml %%ETCDIR%%/qemu/networks
+
+To configure this network for autostart, execute the following:
+
+  ln -s ../default.xml %%ETCDIR%%/qemu/networks/autostart/default.xml
+
+If you have libvirtd already running you'll need to restart it for changes
+to take effect.
diff --git a/devel/libvirt/pkg-message b/devel/libvirt/pkg-message
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
@@ -10,11 +10,10 @@ man/man8/libvirtd.8.gz
 man/man8/virtlockd.8.gz
 @sample %%ETCDIR%%/libvirt.conf.sample
 @sample %%ETCDIR%%/libvirtd.conf.sample
+@sample %%ETCDIR%%/virtlockd.conf.sample
+%%EXAMPLESDIR%%/networks/default.xml
 %%QEMU%%@sample %%ETCDIR%%/qemu.conf.sample
 %%XEN%%@sample %%ETCDIR%%/libxl.conf.sample
-%%ETCDIR%%/virtlockd.conf
-%%ETCDIR%%/qemu/networks/default.xml
-%%ETCDIR%%/qemu/networks/autostart/default.xml
 %%QEMU%%%%ETCDIR%%/qemu-lockd.conf
 %%XEN%%%%ETCDIR%%/libxl-lockd.conf
 etc/logrotate.d/libvirtd
@@ -300,6 +299,7 @@ lib/libvirt/connection-driver/libvirt_driver_vbox.so
 %%XEN%%@dir /var/lib/libvirt/libxl
 %%XEN%%@dir /var/log/libvirt/libxl
 %%XEN%%@dir /var/run/libvirt/libxl
+@dir %%ETCDIR%%/qemu/networks/autostart
 @dir /var/cache/libvirt
 @dir /var/lib/libvirt/boot
 @dir /var/lib/libvirt/dnsmasq

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 

diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.5.2.tar.gz) = 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d
-SIZE (mercurial-3.5.2.tar.gz) = 4415307
+SHA256 (mercurial-3.6.tar.gz) = 85b5574f3694373e981926374a758dab2128d6f3c593a72a7c9d2cb371054f39
+SIZE (mercurial-3.6.tar.gz) = 4516703