D20725.id58915.diff
No OneTemporary
Actions

Size

50 KB

Referenced Files

None

Subscribers

None

D20725.id58915.diff
View Options

	Index: MOVED
	===================================================================
	--- MOVED
	+++ MOVED
	@@ -12808,3 +12808,4 @@
	www/rubygem-lograge-rails50\|www/rubygem-lograge-rails5\|2019-06-21\|Obsolete by gitlab-ce upgrade, use www/rubygem-lograge-rails5 instead
	devel/rubygem-batch-loader12\|devel/rubygem-batch-loader\|2019-06-21\|Obsolete by gitlab-ce upgrade, use devel/rubygem-batch-loader instead
	security/easy-rsa2\|security/easy-rsa\|2019-06-23\|Has expired: Use easy-rsa 3 instead.
	+net-p2p/zetacoin-nox11\|net-p2p/zetacoin\|2019-MM-DD\|Slave port folded back into now text-only master port.
	Index: Mk/Uses/qmake.mk
	===================================================================
	--- Mk/Uses/qmake.mk
	+++ Mk/Uses/qmake.mk
	@@ -3,7 +3,7 @@
	# There are three Qt related USES files with different access to Qt.
	# - qmake: The port requires Qt's qmake to build -- creates the configure target
	# - auto includes qt.mk
	-# - qt-dist: The port is a port for an part of Qt4 or Qt5
	+# - qt-dist: The port is a port for an part of Qt5
	# - auto inclues qt.mk
	# - qt.mk - Dependency handling. USE_QT=foo bar
	#
	Index: Mk/Uses/qt.mk
	===================================================================
	--- Mk/Uses/qt.mk
	+++ Mk/Uses/qt.mk
	@@ -3,14 +3,14 @@
	# There are three Qt related USES files with different access to Qt.
	# - qmake: The port requires Qt's qmake to build -- creates the configure target
	# - auto includes qt.mk
	-# - qt-dist: The port is a port for an part of Qt4 or Qt5
	+# - qt-dist: The port is a port for an part of Qt5
	# - auto includes qt.mk and qmake.mk
	# - qt.mk - Dependency handling. USE_QT=foo bar
	#
	# Usage:
	# USES=qt:<version>[,no_env]
	#
	-# Versions: 4 5
	+# Versions: 5
	#
	# Port variables:
	# USE_QT - List of Qt modules to depend on, with optional '_build'
	Index: Mk/bsd.options.desc.mk
	===================================================================
	--- Mk/bsd.options.desc.mk
	+++ Mk/bsd.options.desc.mk
	@@ -415,7 +415,6 @@
	PYTHON_DESC?= Python bindings or support
	PYTHON2_DESC?= Python 2.x bindings or support
	PYTHON3_DESC?= Python 3.x bindings or support
	-QT4_DESC?= Qt 4 toolkit support
	QT5_DESC?= Qt 5 toolkit support
	QUICKTIME_DESC?= QuickTime media support
	RADIUS_DESC?= RADIUS protocol support
	Index: Mk/bsd.sanity.mk
	===================================================================
	--- Mk/bsd.sanity.mk
	+++ Mk/bsd.sanity.mk
	@@ -195,7 +195,7 @@
	USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
	INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
	USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
	- USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
	+ USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT5 QT_NONSTANDARD
	SANITY_DEPRECATED= MLINKS \
	USE_MYSQL WANT_MYSQL_VER \
	PYDISTUTILS_INSTALLNOSINGLE \
	@@ -279,7 +279,6 @@
	USE_FPC_RUN_ALT= USES=fpc:run
	WANT_FPC_BASE_ALT= USES=fpc:base
	WANT_FPC_ALL_ALT= USES=fpc:all
	-USE_QT4_ALT= USES=qt:4 and USE_QT=${USE_QT4}
	USE_QT5_ALT= USES=qt:5 and USE_QT=${USE_QT5}
	QT_NONSTANDARD_ALT= USES=qmake:no_env

	Index: Tools/scripts/mfh
	===================================================================
	--- Tools/scripts/mfh
	+++ Tools/scripts/mfh
	@@ -135,7 +135,11 @@
	done
	"${svn}" up --quiet "${branch}"
	"${svn}" status "${branch}"
	-"${svn}" diff "${branch}"
	+if [ -n "$(command -v colordiff 2>/dev/null)" ]; then
	+ "${svn}" diff "${branch}" \| colordiff
	+else
	+ "${svn}" diff "${branch}"
	+fi
	echo "All the merge work was done in ${dir}/${branch}"
	ask "Do you want to commit? (no = start a shell)" \|\| (
	echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script."
	Index: archivers/peazip/Makefile
	===================================================================
	--- archivers/peazip/Makefile
	+++ archivers/peazip/Makefile
	@@ -24,9 +24,8 @@
	LAZBUILD_ARGS= -d
	LLD_UNSAFE= yes

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	ARCHIVER_FILES= #

	Index: comms/cqrlog/Makefile
	===================================================================
	--- comms/cqrlog/Makefile
	+++ comms/cqrlog/Makefile
	@@ -40,9 +40,6 @@
	INSTALLS_ICONS= yes
	DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
	-
	post-extract:
	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas

	Index: deskutils/xpostit/files/patch-note.c
	===================================================================
	--- deskutils/xpostit/files/patch-note.c
	+++ deskutils/xpostit/files/patch-note.c
	@@ -0,0 +1,20 @@
	+--- note.c.orig 1992-12-11 13:04:16 UTC
	++++ note.c
	+@@ -100,7 +100,7 @@ static char *RCSid = "$Header: /home/harbor/davy/stuff
	+ #include <X11/Xaw/Form.h>
	+ #include <X11/Shell.h>
	+ #include <sys/param.h>
	+-#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4)
	++#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4) \|\| defined(BSD)
	+ #include <dirent.h>
	+ #else
	+ #include <sys/dir.h>
	+@@ -240,7 +240,7 @@ LoadSavedNotes()
	+ FILE *fp;
	+ char *realloc();
	+ register PostItNote *pn;
	+-#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4)
	++#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4) \|\| defined(BSD)
	+ register struct dirent *d;
	+ #else
	+ register struct direct *d;
	Index: devel/py-sip/Makefile
	===================================================================
	--- devel/py-sip/Makefile
	+++ devel/py-sip/Makefile
	@@ -32,7 +32,6 @@
	# When building PyQt5 v5.11 or later you must configure SIP to create a
	# private copy of the sip module using a command line similar to the following:
	# > python configure.py --sip-module PyQt5.sip --no-tools
	-# As this port is already flavored we cannot add further Qt4/Qt5 flavoring.
	CONFIGURE_WRKSRC= ${WRKSRC}/default
	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
	INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
	Index: editors/cudatext/Makefile
	===================================================================
	--- editors/cudatext/Makefile
	+++ editors/cudatext/Makefile
	@@ -38,9 +38,8 @@
	LAZBUILD_ARGS= -d
	LLD_UNSAFE= yes

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	USE_FPC_gtk2= cairo
	USE_GNOME_gtk2= cairo
	Index: editors/dexed/Makefile
	===================================================================
	--- editors/dexed/Makefile
	+++ editors/dexed/Makefile
	@@ -50,9 +50,8 @@

	LDMD2_CMD= ${LOCALBASE}/bin/ldmd2

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	.if ${FLAVOR:Ugtk2:Mgtk2}
	USE_FPC+= cairo
	Index: editors/lazarus-qt5/Makefile
	===================================================================
	--- editors/lazarus-qt5/Makefile
	+++ editors/lazarus-qt5/Makefile
	@@ -4,7 +4,7 @@

	COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5)

	-CONFLICTS= ${PORTNAME}-gtk2-* ${PORTNAME}-qt4-*
	+CONFLICTS= ${PORTNAME}-gtk2-*

	LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas

	Index: editors/lazarus/Makefile
	===================================================================
	--- editors/lazarus/Makefile
	+++ editors/lazarus/Makefile
	@@ -12,7 +12,7 @@
	MAINTAINER?= acm@FreeBSD.org
	COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2)

	-CONFLICTS?= ${PORTNAME}-qt4-* ${PORTNAME}-qt5-*
	+CONFLICTS?= ${PORTNAME}-qt5-*

	BUILD_DEPENDS?= fpcres:lang/fpc-utils
	RUN_DEPENDS?= fpcres:lang/fpc-utils
	Index: editors/picpas/Makefile
	===================================================================
	--- editors/picpas/Makefile
	+++ editors/picpas/Makefile
	@@ -12,9 +12,8 @@

	LICENSE= GPLv2

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	USES= dos2unix fpc lazarus:flavors
	USE_FPC= chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
	Index: games/egoboo/Makefile
	===================================================================
	--- games/egoboo/Makefile
	+++ games/egoboo/Makefile
	@@ -13,9 +13,9 @@
	MAINTAINER= amdmi3@FreeBSD.org
	COMMENT= 3D dungeon crawling adventure in the spirit of NetHack

	-USES= gmake dos2unix
	+USES= dos2unix gl gmake sdl
	USE_SDL= sdl ttf mixer image
	-USE_GL= yes
	+USE_GL= glu
	DOS2UNIX_GLOB= *.c

	WRKSRC= ${WRKDIR}/${DISTNAME}/game
	Index: games/egoboo/files/patch-game-lin-file.c
	===================================================================
	--- games/egoboo/files/patch-game-lin-file.c
	+++ games/egoboo/files/patch-game-lin-file.c
	@@ -1,9 +1,11 @@
	---- lin-file.c.orig 2007-11-16 22:36:58.000000000 +0300
	-+++ lin-file.c 2008-02-07 04:09:32.000000000 +0300
	-@@ -9,6 +9,7 @@
	+--- lin-file.c.orig 2019-06-15 14:41:01 UTC
	++++ lin-file.c
	+@@ -8,7 +8,8 @@
	+ #include <glob.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	- #include <sys/dir.h>
	+-#include <sys/dir.h>
	++#include <sys/dirent.h>
	+#include <sys/syslimits.h>

	//File Routines-----------------------------------------------------------
	Index: graphics/lazpaint/Makefile
	===================================================================
	--- graphics/lazpaint/Makefile
	+++ graphics/lazpaint/Makefile
	@@ -12,9 +12,8 @@

	LICENSE= GPLv3

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	USES= dos2unix fpc lazarus:flavors
	USE_FPC= chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \
	Index: graphics/photivo/Makefile
	===================================================================
	--- graphics/photivo/Makefile
	+++ graphics/photivo/Makefile
	@@ -31,8 +31,6 @@

	WRKSRC= ${WRKDIR}/${PORTNAME}

	-CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-
	post-patch:
	@${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \
	${WRKSRC}/Sources/ptCimg.cpp \
	Index: graphics/xpaint/files/patch-fileBrowser.c
	===================================================================
	--- graphics/xpaint/files/patch-fileBrowser.c
	+++ graphics/xpaint/files/patch-fileBrowser.c
	@@ -0,0 +1,20 @@
	+--- fileBrowser.c.orig 2014-05-08 13:50:48 UTC
	++++ fileBrowser.c
	+@@ -47,7 +47,7 @@ extern Xaw3dXftData *xaw3dxft_data;
	+ #include <stdio.h>
	+ #include <sys/types.h>
	+ #include <sys/stat.h>
	+-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS )
	++#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__CYGWIN__) \|\| defined(__VMS ) \|\| defined(BSD)
	+ #include <dirent.h>
	+ #else
	+ #include <sys/dir.h>
	+@@ -562,7 +562,7 @@ static void
	+ setCWD(arg_t * arg, char *dir)
	+ {
	+ DIR *dirp;
	+-#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__)
	++#if defined(SYSV) \|\| defined(SVR4) \|\| defined(__alpha) \|\| defined(__CYGWIN__) \|\| defined(BSD)
	+ struct dirent *e;
	+ #else
	+ struct direct *e;
	Index: lang/gprolog/Makefile
	===================================================================
	--- lang/gprolog/Makefile
	+++ lang/gprolog/Makefile
	@@ -2,8 +2,7 @@
	# $FreeBSD$

	PORTNAME= gprolog
	-PORTVERSION= 1.4.4
	-PORTREVISION= 8
	+PORTVERSION= 1.4.5
	CATEGORIES= lang
	MASTER_SITES= http://www.gprolog.org/

	@@ -18,16 +17,14 @@
	# and efforts to get it in: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231393
	EXPIRATION_DATE= 2019-08-31

	-ONLY_FOR_ARCHS= i386 amd64
	-
	-USES= gmake
	-USE_GCC= any
	-CFLAGS+= -O3 # gcc5/gcc6 + -O2 = pl2wam hangs
	+ONLY_FOR_ARCHS= amd64 i386
	+CFLAGS+= -Ofast
	PLIST_SUB= GPROLOG_VER=${PORTVERSION}
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-c-flags="${CFLAGS}" \
	--with-doc-dir="${DOCSDIR}" \
	- --with-examples-dir="${EXAMPLESDIR}"
	+ --with-examples-dir="${EXAMPLESDIR}" \
	+ --disable-regs
	CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
	MAKE_JOBS_UNSAFE= yes
	WRKSRC_SUBDIR= src
	@@ -35,21 +32,18 @@
	OPTIONS_DEFINE= FD DOCS EXAMPLES
	OPTIONS_DEFAULT= FD
	OPTIONS_SUB= yes
	-
	FD_DESC= Enable finite domain constraint solver
	FD_CONFIGURE_OFF= --disable-fd-solver

	-.include <bsd.port.options.mk>
	-
	-# Disable registers on i386. This fixes build with gcc6.
	-# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852008
	-.if ${ARCH} == i386
	-CONFIGURE_ARGS+= --disable-regs
	-.endif
	-
	post-patch:
	@${REINPLACE_CMD} \
	'/LINKS_DIR/s\|$$(INSTALL_DIR)\|../${PORTNAME}-${PORTVERSION}\|' \
	${WRKSRC}/Makefile.in
	+
	+post-install-EXAMPLES-off:
	+ ${RM} -r ${STAGEDIR}${EXAMPLESDIR}
	+
	+post-install-DOCS-off:
	+ ${RM} -r ${STAGEDIR}${DOCSDIR}

	.include <bsd.port.mk>
	Index: lang/gprolog/distinfo
	===================================================================
	--- lang/gprolog/distinfo
	+++ lang/gprolog/distinfo
	@@ -1,2 +1,3 @@
	-SHA256 (gprolog-1.4.4.tar.gz) = 18c0e9644b33afd4dd3cdf29f94c099ad820d65e0c99da5495b1ae43b4f2b18e
	-SIZE (gprolog-1.4.4.tar.gz) = 3538152
	+TIMESTAMP = 1545408598
	+SHA256 (gprolog-1.4.5.tar.gz) = bfdcf00e051e0628b4f9af9d6638d4fde6ad793401e58a5619d1cc6105618c7c
	+SIZE (gprolog-1.4.5.tar.gz) = 3587361
	Index: lang/gprolog/pkg-plist
	===================================================================
	--- lang/gprolog/pkg-plist
	+++ lang/gprolog/pkg-plist
	@@ -29,6 +29,7 @@
	gprolog-%%GPROLOG_VER%%/lib/libengine_pl.a
	gprolog-%%GPROLOG_VER%%/lib/liblinedit.a
	gprolog-%%GPROLOG_VER%%/lib/top_level.o
	+gprolog-%%GPROLOG_VER%%/lib/top_level_main.o
	%%PORTDOCS%%%%DOCSDIR%%/compil-scheme.eps
	%%PORTDOCS%%%%DOCSDIR%%/compil-scheme.pdf
	%%PORTDOCS%%%%DOCSDIR%%/contents_motif.gif
	@@ -126,6 +127,7 @@
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/examp_c.c
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/new_main.pl
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesC/new_main_c.c
	+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/BUILD_HOUSE.pl
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/Makefile
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/alpha.pl
	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ExamplesFD/array.pl
	Index: mail/trojita/Makefile
	===================================================================
	--- mail/trojita/Makefile
	+++ mail/trojita/Makefile
	@@ -15,7 +15,6 @@

	LIB_DEPENDS= libqt5keychain.so:security/qtkeychain

	-CONFLICTS_INSTALL= trojita-qt4-[0-9]*
	INSTALLS_ICONS= yes
	USE_LDCONFIG= yes

	Index: multimedia/libquicktime/Makefile
	===================================================================
	--- multimedia/libquicktime/Makefile
	+++ multimedia/libquicktime/Makefile
	@@ -3,12 +3,12 @@

	PORTNAME= libquicktime
	PORTVERSION= 1.2.4
	-PORTREVISION?= 25
	+PORTREVISION?= 26
	CATEGORIES= multimedia
	MASTER_SITES= SF

	MAINTAINER= ports@FreeBSD.org
	-COMMENT= library for reading and writing quicktime files
	+COMMENT= Library for reading and writing quicktime files

	.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
	LIB_DEPENDS= libvorbis.so:audio/libvorbis
	@@ -33,10 +33,7 @@
	OPTIONS_DEFAULT= FFMPEG JPEG OPENGL PNG SCHROEDINGER X264
	OPTIONS_SUB= yes

	-PORTDOCS= api_usage.html codecs.html qt4l_building.html \
	- qt4l_codecs.html qt4l_index.html \
	- qt4l_license.html qt4l_opening.html qt4l_positioning.html \
	- qt4l_reading.html qt4l_util.html qt4l_writing.html
	+PORTDOCS= api_usage.html codecs.html

	.else
	CONFIGURE_ARGS+= --without-x --enable-gpl --without-doxygen
	Index: multimedia/mlt-qt5/Makefile
	===================================================================
	--- multimedia/mlt-qt5/Makefile
	+++ multimedia/mlt-qt5/Makefile
	@@ -2,8 +2,6 @@

	PORTREVISION= 0

	-CONFLICTS_INSTALL= ${PORTNAME}-qt4-*
	-
	USES= qt:5
	USE_CXXSTD= c++11
	USE_QT= core gui svg widgets xml
	Index: multimedia/winff/Makefile
	===================================================================
	--- multimedia/winff/Makefile
	+++ multimedia/winff/Makefile
	@@ -37,9 +37,6 @@
	LAZARUS_PROJECT_FILES= winff.lpr
	LAZBUILD_ARGS= -d

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
	-
	BUILD_WRKSRC= ${WRKDIR}/${PKGNAME}/${_PORTNAME}

	.if ${FLAVOR:Ugtk2:Mgtk2}
	Index: net-p2p/Makefile
	===================================================================
	--- net-p2p/Makefile
	+++ net-p2p/Makefile
	@@ -92,6 +92,5 @@
	SUBDIR += vuze
	SUBDIR += xmrig
	SUBDIR += zetacoin
	- SUBDIR += zetacoin-nox11

	.include <bsd.port.subdir.mk>
	Index: net-p2p/awgg/Makefile
	===================================================================
	--- net-p2p/awgg/Makefile
	+++ net-p2p/awgg/Makefile
	@@ -17,9 +17,8 @@
	youtube-dl:www/youtube_dl \
	axel:ftp/axel

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	USES= fpc lazarus:flavors
	USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-xml \
	Index: net-p2p/qbittorrent/Makefile
	===================================================================
	--- net-p2p/qbittorrent/Makefile
	+++ net-p2p/qbittorrent/Makefile
	@@ -7,7 +7,7 @@
	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

	MAINTAINER= yuri@FreeBSD.org
	-COMMENT= Bittorrent client using Qt4/5 and libtorrent-rasterbar
	+COMMENT= Bittorrent client using Qt5 and libtorrent-rasterbar

	LICENSE= GPLv2+
	LICENSE_FILE= ${WRKSRC}/COPYING
	Index: net-p2p/transmission-qt/Makefile
	===================================================================
	--- net-p2p/transmission-qt/Makefile
	+++ net-p2p/transmission-qt/Makefile
	@@ -6,8 +6,6 @@
	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
	libfreetype.so:print/freetype2

	-CONFLICTS_INSTALL= transmission-qt4
	-
	USES= compiler:c++11-lang qt:5
	NLS_USES= gettext-runtime:run qt:5
	USE_QT= buildtools_build linguisttools_build qmake_build \
	Index: net-p2p/transmission-remote-gui/Makefile
	===================================================================
	--- net-p2p/transmission-remote-gui/Makefile
	+++ net-p2p/transmission-remote-gui/Makefile
	@@ -30,9 +30,8 @@
	LAZBUILD_ARGS= -d
	PROJECT_NAME= transgui

	-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2

	do-install:
	@cd ${WRKSRC}/units && \
	Index: net-p2p/zetacoin-nox11/Makefile
	===================================================================
	--- net-p2p/zetacoin-nox11/Makefile
	+++ net-p2p/zetacoin-nox11/Makefile
	@@ -1,14 +0,0 @@
	-# Created by: Daniel Morante <daniel@morante.net>
	-# $FreeBSD$
	-
	-MASTERDIR= ${.CURDIR}/../zetacoin
	-PKGNAMESUFFIX= -nox11
	-
	-OPTIONS_EXCLUDE= X11 QRCODES
	-
	-SLAVE_PORT= yes
	-
	-BROKEN_armv6= AtomicPointer not implemented
	-BROKEN_powerpc64= Does not configure: error: No working boost sleep implementation found
	-
	-.include "${MASTERDIR}/Makefile"
	Index: net-p2p/zetacoin/Makefile
	===================================================================
	--- net-p2p/zetacoin/Makefile
	+++ net-p2p/zetacoin/Makefile
	@@ -26,46 +26,31 @@

	USE_GITHUB= yes

	-OPTIONS_DEFINE= X11 UPNP WALLET CLI TEST
	+OPTIONS_DEFINE= UPNP WALLET CLI TEST
	OPTIONS_SUB= yes

	WALLET_DESC= Build wallet or P2P server node only
	-QRCODES_DESC= Enable QR code display when building graphical interface
	CLI_DESC= Build command line RPC client

	OPTIONS_DEFAULT= WALLET
	-OPTIONS_GROUP= X11
	-OPTIONS_GROUP_X11= QRCODES

	UPNP_CONFIGURE_WITH= miniupnpc
	UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc
	UPNP_CPPFLAGS= -I${LOCALBASE}/include
	UPNP_LIBS= -L${LOCALBASE}/lib

	-X11_CONFIGURE_WITH= gui
	-X11_CONFIGURE_ON= --without-daemon
	-X11_CONFIGURE_OFF= --with-daemon
	-X11_BUILD_DEPENDS= protoc:devel/protobuf
	-X11_LIB_DEPENDS= libprotobuf.so:devel/protobuf
	-X11_USE= qt=corelib,network,gui,qmake_build,linguisttools_build \
	- qt=uic_build,moc_build,rcc_build,qtestlib_build
	-X11_USES= desktop-file-utils qmake:no_env qt:4
	-
	WALLET_CONFIGURE_ENABLE=wallet
	WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR}
	WALLET_LIBS= -L${BDB_LIB_DIR}
	WALLET_USES= bdb:48

	-QRCODES_IMPLIES= X11
	-QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode
	-QRCODES_CONFIGURE_WITH= qrencode
	-
	CLI_CONFIGURE_WITH= cli

	TEST_CONFIGURE_ENABLE= tests
	TEST_ALL_TARGET= check

	GNU_CONFIGURE= yes
	+CONFIGURE_ARGS= --with-daemon
	CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
	SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
	OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
	@@ -86,16 +71,11 @@
	BROKEN= automated testing fails
	.endif

	-.if ! ${PORT_OPTIONS:MX11}
	USE_RC_SUBR= ${PORTNAME}
	SUB_LIST+= PORTNAME=${PORTNAME}
	SUB_FILES= pkg-message
	USERS= ${PORTNAME}
	GROUPS= ${PORTNAME}
	-.else
	-DEPRECATED= Qt4 has been EOL since december 2015
	-EXPIRATION_DATE= 2019-03-15
	-.endif

	.include <bsd.port.pre.mk>

	@@ -113,22 +93,10 @@
	${MKDIR} ${WRKSRC}/src/build-aux

	do-install:
	- @${DO_NADA}
	+ ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON}
	+ ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample

	do-install-CLI-on:
	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${CLI_BINARY} ${STAGEDIR}${PREFIX}/bin/${CLI_BINARY}
	-
	-do-install-X11-on:
	- ${INSTALL_PROGRAM} -s ${WRKSRC}/src/qt/${QT_BINARY} ${STAGEDIR}${PREFIX}/bin/${QT_BINARY}
	- ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
	- -e 's,bitcoin,zetacoin,g' \
	- -e 's,Bitcoin,Zetacoin,g' \
	- -e 's,128,,g' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop
	- ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-qt.desktop
	- ${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
	-
	-do-install-X11-off:
	- ${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON}
	- ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample

	.include <bsd.port.post.mk>
	Index: net-p2p/zetacoin/pkg-plist
	===================================================================
	--- net-p2p/zetacoin/pkg-plist
	+++ net-p2p/zetacoin/pkg-plist
	@@ -1,6 +1,3 @@
	-%%NO_X11%%%%EXECUTABLE_DAEMON%%
	-%%NO_X11%%@sample etc/%%PORTNAME%%.conf.sample
	+%%EXECUTABLE_DAEMON%%
	+@sample etc/%%PORTNAME%%.conf.sample
	%%CLI%%%%EXECUTABLE_CLI%%
	-%%X11%%%%EXECUTABLE_QT%%
	-%%X11%%share/applications/%%PORTNAME%%-qt.desktop
	-%%X11%%share/pixmaps/%%PORTNAME%%.png
	Index: print/hplip/Makefile
	===================================================================
	--- print/hplip/Makefile
	+++ print/hplip/Makefile
	@@ -78,7 +78,7 @@
	.endif

	.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT5}
	-BROKEN= The X11 option requires one of the QT4 or QT5 options
	+BROKEN= The X11 option requires the QT5 option
	.endif

	post-patch:
	Index: russian/emkatic/Makefile
	===================================================================
	--- russian/emkatic/Makefile
	+++ russian/emkatic/Makefile
	@@ -28,9 +28,8 @@
	PORTDATA= *
	PORTDOCS= CHANGELOG..txt README..txt

	-gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt4 ru-${PORTNAME}-qt5
	-qt4_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5
	-qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt4
	+gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt5
	+qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2

	OPTIONS_DEFINE= DOCS PORTAUDIO
	OPTIONS_DEFAULT= PORTAUDIO
	Index: sysutils/android-file-transfer-qt5/Makefile
	===================================================================
	--- sysutils/android-file-transfer-qt5/Makefile
	+++ sysutils/android-file-transfer-qt5/Makefile
	@@ -5,8 +5,6 @@

	MASTERDIR= ${.CURDIR}/../android-file-transfer

	-CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-
	OPTIONS_SLAVE= QT5
	OPTIONS_EXCLUDE=CLI FUSE

	Index: sysutils/grub2/Makefile
	===================================================================
	--- sysutils/grub2/Makefile
	+++ sysutils/grub2/Makefile
	@@ -1,14 +1,13 @@
	# Created by: sem@FreeBSD.org
	# $FreeBSD$

	-PORTNAME= grub2
	-PORTVERSION= 2.00
	-PORTREVISION= 14
	+PORTNAME= grub
	+PORTVERSION= 2.03
	CATEGORIES= sysutils
	-MASTER_SITES= GNU/grub
	-DISTNAME= grub-${PORTVERSION}
	+MASTER_SITES= SAVANNAH/grub
	+DISTNAME= grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a

	-MAINTAINER= ports@FreeBSD.org
	+MAINTAINER= bergerkos@yahoo.co.uk
	COMMENT= Multiboot boot loader

	LICENSE= GPLv3
	@@ -24,20 +23,29 @@
	help2man:misc/help2man
	RUN_DEPENDS= gsed:textproc/gsed

	-USES= autoreconf bison cpe gettext gmake tar:xz
	-USE_GCC= 7 # Fails to build with GCC 8, cf. PR 232961, or clang
	+USES= autoreconf:build bison cpe gettext-runtime gmake iconv python
	+USE_GCC= yes

	+CC?= gcc #XXX
	+CXX?= g++ #XXX
	+RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*}
	+
	GNU_CONFIGURE= yes
	-INFO= grub grub-dev
	MAKE_JOBS_UNSAFE= yes
	SSP_UNSAFE= yes

	CPE_PRODUCT= grub
	CPE_VENDOR= gnu

	+OPTIONS_DEFINE= NLS
	+OPTIONS_SUB= yes
	+
	+NLS_USES= gettext
	+NLS_CONFIGURE_ENABLE= nls
	+
	CONFIGURE_ARGS= --disable-werror --localedir=${PREFIX}/share/locale
	-CONFIGURE_ENV= CPP="${CC} -E" \
	- LEX=${LOCALBASE}/bin/flex
	+CONFIGURE_ENV= CC="${LOCALBASE}/bin/gcc8" \
	+ CPP="${CC} -E"

	OPTIONS_DEFINE= MKFONT FUSE
	OPTIONS_SUB= yes
	@@ -59,15 +67,11 @@
	PLIST_SUB+= EFIEMU=""
	.endif

	-post-patch:
	- @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
	- @${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
	- @${REINPLACE_CMD} -e '/[^auU]sed/ s,sed,gsed,g' ${WRKSRC}/util/grub.d/*.in \
	- ${WRKSRC}/util/*.in ${WRKSRC}/util/i386/efi/grub-dumpdevtree \
	- ${WRKSRC}/util/bash-completion.d/grub-completion.bash.in
	+pre-configure:
	+ @cd ${WRKSRC} && ${SH} autogen.sh

	-post-configure:
	- @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
	- ${WRKSRC}/grub-core
	+post-install:
	+ ${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
	+ ${RM} -Rf ${STAGEDIR}${PREFIX}/info

	.include <bsd.port.post.mk>
	Index: sysutils/grub2/distinfo
	===================================================================
	--- sysutils/grub2/distinfo
	+++ sysutils/grub2/distinfo
	@@ -1,2 +1,3 @@
	-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
	-SIZE (grub-2.00.tar.xz) = 5136412
	+TIMESTAMP = 1546104165
	+SHA256 (grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a.tar.gz) = 5d63e50fd352b8fa5a4155f8e5827c78b3fdb695e9a601b1c2ba59bc3df457f1
	+SIZE (grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a.tar.gz) = 5681123
	Index: sysutils/grub2/pkg-plist
	===================================================================
	--- sysutils/grub2/pkg-plist
	+++ sysutils/grub2/pkg-plist
	@@ -1,56 +1,27 @@
	-%%FUSE%%bin/grub-mount
	-%%FUSE%%man/man1/grub-mount.1.gz
	-%%MKFONT%%bin/grub-mkfont
	-%%MKFONT%%man/man1/grub-mkfont.1.gz
	-%%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
	-%%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
	-%%MKFONT%%share/grub/themes/starfield/dejavu_bold_14.pf2
	-%%MKFONT%%share/grub/themes/starfield/dejavu_14.pf2
	-%%MKFONT%%share/grub/themes/starfield/dejavu_16.pf2
	-%%MKFONT%%share/grub/themes/starfield/blob_w.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_c.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_e.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_ne.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_n.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_nw.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_se.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_s.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_sw.png
	-%%MKFONT%%share/grub/themes/starfield/boot_menu_w.png
	-%%MKFONT%%share/grub/themes/starfield/slider_c.png
	-%%MKFONT%%share/grub/themes/starfield/slider_n.png
	-%%MKFONT%%share/grub/themes/starfield/slider_s.png
	-%%MKFONT%%share/grub/themes/starfield/starfield.png
	-%%MKFONT%%share/grub/themes/starfield/README
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_c.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_e.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_ne.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_n.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_nw.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_se.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_s.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_sw.png
	-%%MKFONT%%share/grub/themes/starfield/terminal_box_w.png
	-%%MKFONT%%share/grub/themes/starfield/theme.txt
	-%%MKFONT%%share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
	bin/grub-editenv
	+bin/grub-file
	bin/grub-fstest
	+bin/grub-glue-efi
	bin/grub-kbdcomp
	bin/grub-menulst2cfg
	+bin/grub-mkfont
	bin/grub-mkimage
	bin/grub-mklayout
	+bin/grub-mknetdir
	bin/grub-mkpasswd-pbkdf2
	bin/grub-mkrelpath
	-bin/grub-mkstandalone
	bin/grub-mkrescue
	+bin/grub-mkstandalone
	+bin/grub-render-label
	bin/grub-script-check
	-etc/grub.d/00_header
	-etc/grub.d/30_os-prober
	-etc/grub.d/40_custom
	-etc/grub.d/41_custom
	-etc/grub.d/10_kfreebsd
	-etc/grub.d/README
	+bin/grub-syslinux2cfg
	etc/bash_completion.d/grub
	+%%ETCDIR%%.d/00_header
	+%%ETCDIR%%.d/10_kfreebsd
	+%%ETCDIR%%.d/30_os-prober
	+%%ETCDIR%%.d/40_custom
	+%%ETCDIR%%.d/41_custom
	+%%ETCDIR%%.d/README
	lib/grub/i386-pc/acpi.mod
	lib/grub/i386-pc/acpi.module
	lib/grub/i386-pc/adler32.mod
	@@ -65,6 +36,8 @@
	lib/grub/i386-pc/all_video.module
	lib/grub/i386-pc/aout.mod
	lib/grub/i386-pc/aout.module
	+lib/grub/i386-pc/archelp.mod
	+lib/grub/i386-pc/archelp.module
	lib/grub/i386-pc/at_keyboard.mod
	lib/grub/i386-pc/at_keyboard.module
	lib/grub/i386-pc/ata.mod
	@@ -85,22 +58,42 @@
	lib/grub/i386-pc/boot.img
	lib/grub/i386-pc/boot.mod
	lib/grub/i386-pc/boot.module
	+lib/grub/i386-pc/boot_hybrid.image
	+lib/grub/i386-pc/boot_hybrid.img
	lib/grub/i386-pc/bsd.mod
	lib/grub/i386-pc/bsd.module
	+lib/grub/i386-pc/bswap_test.mod
	+lib/grub/i386-pc/bswap_test.module
	lib/grub/i386-pc/btrfs.mod
	lib/grub/i386-pc/btrfs.module
	lib/grub/i386-pc/bufio.mod
	lib/grub/i386-pc/bufio.module
	lib/grub/i386-pc/cat.mod
	lib/grub/i386-pc/cat.module
	+lib/grub/i386-pc/cbfs.mod
	+lib/grub/i386-pc/cbfs.module
	+lib/grub/i386-pc/cbls.mod
	+lib/grub/i386-pc/cbls.module
	+lib/grub/i386-pc/cbmemc.mod
	+lib/grub/i386-pc/cbmemc.module
	+lib/grub/i386-pc/cbtable.mod
	+lib/grub/i386-pc/cbtable.module
	+lib/grub/i386-pc/cbtime.mod
	+lib/grub/i386-pc/cbtime.module
	lib/grub/i386-pc/cdboot.image
	lib/grub/i386-pc/cdboot.img
	lib/grub/i386-pc/chain.mod
	lib/grub/i386-pc/chain.module
	+lib/grub/i386-pc/cmdline_cat_test.mod
	+lib/grub/i386-pc/cmdline_cat_test.module
	+lib/grub/i386-pc/cmosdump.mod
	+lib/grub/i386-pc/cmosdump.module
	lib/grub/i386-pc/cmostest.mod
	lib/grub/i386-pc/cmostest.module
	lib/grub/i386-pc/cmp.mod
	lib/grub/i386-pc/cmp.module
	+lib/grub/i386-pc/cmp_test.mod
	+lib/grub/i386-pc/cmp_test.module
	lib/grub/i386-pc/command.lst
	lib/grub/i386-pc/config.h
	lib/grub/i386-pc/configfile.mod
	@@ -120,16 +113,24 @@
	lib/grub/i386-pc/cryptodisk.module
	lib/grub/i386-pc/cs5536.mod
	lib/grub/i386-pc/cs5536.module
	+lib/grub/i386-pc/ctz_test.mod
	+lib/grub/i386-pc/ctz_test.module
	lib/grub/i386-pc/date.mod
	lib/grub/i386-pc/date.module
	lib/grub/i386-pc/datehook.mod
	lib/grub/i386-pc/datehook.module
	lib/grub/i386-pc/datetime.mod
	lib/grub/i386-pc/datetime.module
	+lib/grub/i386-pc/disk.mod
	+lib/grub/i386-pc/disk.module
	lib/grub/i386-pc/diskboot.image
	lib/grub/i386-pc/diskboot.img
	lib/grub/i386-pc/diskfilter.mod
	lib/grub/i386-pc/diskfilter.module
	+lib/grub/i386-pc/div.mod
	+lib/grub/i386-pc/div.module
	+lib/grub/i386-pc/div_test.mod
	+lib/grub/i386-pc/div_test.module
	lib/grub/i386-pc/dm_nv.mod
	lib/grub/i386-pc/dm_nv.module
	lib/grub/i386-pc/drivemap.mod
	@@ -138,12 +139,14 @@
	lib/grub/i386-pc/echo.module
	lib/grub/i386-pc/efiemu.mod
	lib/grub/i386-pc/efiemu.module
	-%%EFIEMU%%lib/grub/i386-pc/efiemu32.o
	-%%EFIEMU%%lib/grub/i386-pc/efiemu64.o
	+lib/grub/i386-pc/efiemu32.o
	+lib/grub/i386-pc/efiemu64.o
	lib/grub/i386-pc/ehci.mod
	lib/grub/i386-pc/ehci.module
	lib/grub/i386-pc/elf.mod
	lib/grub/i386-pc/elf.module
	+lib/grub/i386-pc/eval.mod
	+lib/grub/i386-pc/eval.module
	lib/grub/i386-pc/exfat.mod
	lib/grub/i386-pc/exfat.module
	lib/grub/i386-pc/exfctest.mod
	@@ -154,6 +157,9 @@
	lib/grub/i386-pc/extcmd.module
	lib/grub/i386-pc/fat.mod
	lib/grub/i386-pc/fat.module
	+lib/grub/i386-pc/fdt.lst
	+lib/grub/i386-pc/file.mod
	+lib/grub/i386-pc/file.module
	lib/grub/i386-pc/font.mod
	lib/grub/i386-pc/font.module
	lib/grub/i386-pc/freedos.mod
	@@ -175,6 +181,10 @@
	lib/grub/i386-pc/gcry_crc.module
	lib/grub/i386-pc/gcry_des.mod
	lib/grub/i386-pc/gcry_des.module
	+lib/grub/i386-pc/gcry_dsa.mod
	+lib/grub/i386-pc/gcry_dsa.module
	+lib/grub/i386-pc/gcry_idea.mod
	+lib/grub/i386-pc/gcry_idea.module
	lib/grub/i386-pc/gcry_md4.mod
	lib/grub/i386-pc/gcry_md4.module
	lib/grub/i386-pc/gcry_md5.mod
	@@ -185,6 +195,8 @@
	lib/grub/i386-pc/gcry_rijndael.module
	lib/grub/i386-pc/gcry_rmd160.mod
	lib/grub/i386-pc/gcry_rmd160.module
	+lib/grub/i386-pc/gcry_rsa.mod
	+lib/grub/i386-pc/gcry_rsa.module
	lib/grub/i386-pc/gcry_seed.mod
	lib/grub/i386-pc/gcry_seed.module
	lib/grub/i386-pc/gcry_serpent.mod
	@@ -212,6 +224,10 @@
	lib/grub/i386-pc/gfxmenu.module
	lib/grub/i386-pc/gfxterm.mod
	lib/grub/i386-pc/gfxterm.module
	+lib/grub/i386-pc/gfxterm_background.mod
	+lib/grub/i386-pc/gfxterm_background.module
	+lib/grub/i386-pc/gfxterm_menu.mod
	+lib/grub/i386-pc/gfxterm_menu.module
	lib/grub/i386-pc/gmodule.pl
	lib/grub/i386-pc/gptsync.mod
	lib/grub/i386-pc/gptsync.module
	@@ -233,6 +249,8 @@
	lib/grub/i386-pc/hfs.module
	lib/grub/i386-pc/hfsplus.mod
	lib/grub/i386-pc/hfsplus.module
	+lib/grub/i386-pc/hfspluscomp.mod
	+lib/grub/i386-pc/hfspluscomp.module
	lib/grub/i386-pc/http.mod
	lib/grub/i386-pc/http.module
	lib/grub/i386-pc/iorw.mod
	@@ -251,6 +269,8 @@
	lib/grub/i386-pc/keystatus.module
	lib/grub/i386-pc/ldm.mod
	lib/grub/i386-pc/ldm.module
	+lib/grub/i386-pc/legacy_password_test.mod
	+lib/grub/i386-pc/legacy_password_test.module
	lib/grub/i386-pc/legacycfg.mod
	lib/grub/i386-pc/legacycfg.module
	lib/grub/i386-pc/linux.mod
	@@ -281,6 +301,12 @@
	lib/grub/i386-pc/lzma_decompress.img
	lib/grub/i386-pc/lzopio.mod
	lib/grub/i386-pc/lzopio.module
	+lib/grub/i386-pc/macbless.mod
	+lib/grub/i386-pc/macbless.module
	+lib/grub/i386-pc/macho.mod
	+lib/grub/i386-pc/macho.module
	+lib/grub/i386-pc/mda_text.mod
	+lib/grub/i386-pc/mda_text.module
	lib/grub/i386-pc/mdraid09.mod
	lib/grub/i386-pc/mdraid09.module
	lib/grub/i386-pc/mdraid09_be.mod
	@@ -309,12 +335,20 @@
	lib/grub/i386-pc/mmap.module
	lib/grub/i386-pc/moddep.lst
	lib/grub/i386-pc/modinfo.sh
	+lib/grub/i386-pc/morse.mod
	+lib/grub/i386-pc/morse.module
	+lib/grub/i386-pc/mpi.mod
	+lib/grub/i386-pc/mpi.module
	lib/grub/i386-pc/msdospart.mod
	lib/grub/i386-pc/msdospart.module
	+lib/grub/i386-pc/mul_test.mod
	+lib/grub/i386-pc/mul_test.module
	lib/grub/i386-pc/multiboot.mod
	lib/grub/i386-pc/multiboot.module
	lib/grub/i386-pc/multiboot2.mod
	lib/grub/i386-pc/multiboot2.module
	+lib/grub/i386-pc/nativedisk.mod
	+lib/grub/i386-pc/nativedisk.module
	lib/grub/i386-pc/net.mod
	lib/grub/i386-pc/net.module
	lib/grub/i386-pc/newc.mod
	@@ -331,6 +365,8 @@
	lib/grub/i386-pc/ntldr.module
	lib/grub/i386-pc/odc.mod
	lib/grub/i386-pc/odc.module
	+lib/grub/i386-pc/offsetio.mod
	+lib/grub/i386-pc/offsetio.module
	lib/grub/i386-pc/ohci.mod
	lib/grub/i386-pc/ohci.module
	lib/grub/i386-pc/part_acorn.mod
	@@ -341,6 +377,8 @@
	lib/grub/i386-pc/part_apple.module
	lib/grub/i386-pc/part_bsd.mod
	lib/grub/i386-pc/part_bsd.module
	+lib/grub/i386-pc/part_dfly.mod
	+lib/grub/i386-pc/part_dfly.module
	lib/grub/i386-pc/part_dvh.mod
	lib/grub/i386-pc/part_dvh.module
	lib/grub/i386-pc/part_gpt.mod
	@@ -365,8 +403,12 @@
	lib/grub/i386-pc/pata.module
	lib/grub/i386-pc/pbkdf2.mod
	lib/grub/i386-pc/pbkdf2.module
	+lib/grub/i386-pc/pbkdf2_test.mod
	+lib/grub/i386-pc/pbkdf2_test.module
	lib/grub/i386-pc/pci.mod
	lib/grub/i386-pc/pci.module
	+lib/grub/i386-pc/pcidump.mod
	+lib/grub/i386-pc/pcidump.module
	lib/grub/i386-pc/plan9.mod
	lib/grub/i386-pc/plan9.module
	lib/grub/i386-pc/play.mod
	@@ -377,6 +419,10 @@
	lib/grub/i386-pc/priority_queue.module
	lib/grub/i386-pc/probe.mod
	lib/grub/i386-pc/probe.module
	+lib/grub/i386-pc/procfs.mod
	+lib/grub/i386-pc/procfs.module
	+lib/grub/i386-pc/progress.mod
	+lib/grub/i386-pc/progress.module
	lib/grub/i386-pc/pxe.mod
	lib/grub/i386-pc/pxe.module
	lib/grub/i386-pc/pxeboot.image
	@@ -387,6 +433,8 @@
	lib/grub/i386-pc/raid5rec.module
	lib/grub/i386-pc/raid6rec.mod
	lib/grub/i386-pc/raid6rec.module
	+lib/grub/i386-pc/random.mod
	+lib/grub/i386-pc/random.module
	lib/grub/i386-pc/read.mod
	lib/grub/i386-pc/read.module
	lib/grub/i386-pc/reboot.mod
	@@ -415,14 +463,28 @@
	lib/grub/i386-pc/serial.module
	lib/grub/i386-pc/setjmp.mod
	lib/grub/i386-pc/setjmp.module
	+lib/grub/i386-pc/setjmp_test.mod
	+lib/grub/i386-pc/setjmp_test.module
	lib/grub/i386-pc/setpci.mod
	lib/grub/i386-pc/setpci.module
	lib/grub/i386-pc/sfs.mod
	lib/grub/i386-pc/sfs.module
	+lib/grub/i386-pc/shift_test.mod
	+lib/grub/i386-pc/shift_test.module
	+lib/grub/i386-pc/signature_test.mod
	+lib/grub/i386-pc/signature_test.module
	lib/grub/i386-pc/sleep.mod
	lib/grub/i386-pc/sleep.module
	+lib/grub/i386-pc/sleep_test.mod
	+lib/grub/i386-pc/sleep_test.module
	+lib/grub/i386-pc/spkmodem.mod
	+lib/grub/i386-pc/spkmodem.module
	lib/grub/i386-pc/squash4.mod
	lib/grub/i386-pc/squash4.module
	+lib/grub/i386-pc/strtoull_test.mod
	+lib/grub/i386-pc/strtoull_test.module
	+lib/grub/i386-pc/syslinuxcfg.mod
	+lib/grub/i386-pc/syslinuxcfg.module
	lib/grub/i386-pc/tar.mod
	lib/grub/i386-pc/tar.module
	lib/grub/i386-pc/terminal.lst
	@@ -436,20 +498,28 @@
	lib/grub/i386-pc/test_blockarg.module
	lib/grub/i386-pc/testload.mod
	lib/grub/i386-pc/testload.module
	+lib/grub/i386-pc/testspeed.mod
	+lib/grub/i386-pc/testspeed.module
	lib/grub/i386-pc/tftp.mod
	lib/grub/i386-pc/tftp.module
	lib/grub/i386-pc/tga.mod
	lib/grub/i386-pc/tga.module
	lib/grub/i386-pc/time.mod
	lib/grub/i386-pc/time.module
	+lib/grub/i386-pc/tr.mod
	+lib/grub/i386-pc/tr.module
	lib/grub/i386-pc/trig.mod
	lib/grub/i386-pc/trig.module
	lib/grub/i386-pc/true.mod
	lib/grub/i386-pc/true.module
	+lib/grub/i386-pc/truecrypt.mod
	+lib/grub/i386-pc/truecrypt.module
	lib/grub/i386-pc/udf.mod
	lib/grub/i386-pc/udf.module
	lib/grub/i386-pc/ufs1.mod
	lib/grub/i386-pc/ufs1.module
	+lib/grub/i386-pc/ufs1_be.mod
	+lib/grub/i386-pc/ufs1_be.module
	lib/grub/i386-pc/ufs2.mod
	lib/grub/i386-pc/ufs2.module
	lib/grub/i386-pc/uhci.mod
	@@ -466,10 +536,14 @@
	lib/grub/i386-pc/usbserial_ftdi.module
	lib/grub/i386-pc/usbserial_pl2303.mod
	lib/grub/i386-pc/usbserial_pl2303.module
	+lib/grub/i386-pc/usbserial_usbdebug.mod
	+lib/grub/i386-pc/usbserial_usbdebug.module
	lib/grub/i386-pc/usbtest.mod
	lib/grub/i386-pc/usbtest.module
	lib/grub/i386-pc/vbe.mod
	lib/grub/i386-pc/vbe.module
	+lib/grub/i386-pc/verify.mod
	+lib/grub/i386-pc/verify.module
	lib/grub/i386-pc/vga.mod
	lib/grub/i386-pc/vga.module
	lib/grub/i386-pc/vga_text.mod
	@@ -481,18 +555,24 @@
	lib/grub/i386-pc/video_bochs.module
	lib/grub/i386-pc/video_cirrus.mod
	lib/grub/i386-pc/video_cirrus.module
	+lib/grub/i386-pc/video_colors.mod
	+lib/grub/i386-pc/video_colors.module
	lib/grub/i386-pc/video_fb.mod
	lib/grub/i386-pc/video_fb.module
	lib/grub/i386-pc/videoinfo.mod
	lib/grub/i386-pc/videoinfo.module
	lib/grub/i386-pc/videotest.mod
	lib/grub/i386-pc/videotest.module
	+lib/grub/i386-pc/videotest_checksum.mod
	+lib/grub/i386-pc/videotest_checksum.module
	lib/grub/i386-pc/xfs.mod
	lib/grub/i386-pc/xfs.module
	lib/grub/i386-pc/xnu.mod
	lib/grub/i386-pc/xnu.module
	lib/grub/i386-pc/xnu_uuid.mod
	lib/grub/i386-pc/xnu_uuid.module
	+lib/grub/i386-pc/xnu_uuid_test.mod
	+lib/grub/i386-pc/xnu_uuid_test.module
	lib/grub/i386-pc/xzio.mod
	lib/grub/i386-pc/xzio.module
	lib/grub/i386-pc/zfs.mod
	@@ -501,61 +581,39 @@
	lib/grub/i386-pc/zfscrypt.module
	lib/grub/i386-pc/zfsinfo.mod
	lib/grub/i386-pc/zfsinfo.module
	-sbin/grub-bios-setup
	-sbin/grub-probe
	-sbin/grub-install
	-sbin/grub-mkconfig
	-sbin/grub-mknetdir
	-sbin/grub-ofpathname
	-sbin/grub-set-default
	-sbin/grub-sparc64-setup
	-sbin/grub-reboot
	-share/grub/grub-mkconfig_lib
	-share/locale/ast/LC_MESSAGES/grub.mo
	-share/locale/ca/LC_MESSAGES/grub.mo
	-share/locale/da/LC_MESSAGES/grub.mo
	-share/locale/de/LC_MESSAGES/grub.mo
	-share/locale/de@hebrew/LC_MESSAGES/grub.mo
	-share/locale/de_CH/LC_MESSAGES/grub.mo
	-share/locale/en@arabic/LC_MESSAGES/grub.mo
	-share/locale/en@cyrillic/LC_MESSAGES/grub.mo
	-share/locale/en@greek/LC_MESSAGES/grub.mo
	-share/locale/en@hebrew/LC_MESSAGES/grub.mo
	-share/locale/en@piglatin/LC_MESSAGES/grub.mo
	-share/locale/en@quot/LC_MESSAGES/grub.mo
	-share/locale/eo/LC_MESSAGES/grub.mo
	-share/locale/fi/LC_MESSAGES/grub.mo
	-share/locale/fr/LC_MESSAGES/grub.mo
	-share/locale/hu/LC_MESSAGES/grub.mo
	-share/locale/id/LC_MESSAGES/grub.mo
	-share/locale/it/LC_MESSAGES/grub.mo
	-share/locale/ja/LC_MESSAGES/grub.mo
	-share/locale/nl/LC_MESSAGES/grub.mo
	-share/locale/pa/LC_MESSAGES/grub.mo
	-share/locale/pl/LC_MESSAGES/grub.mo
	-share/locale/ru/LC_MESSAGES/grub.mo
	-share/locale/sv/LC_MESSAGES/grub.mo
	-share/locale/uk/LC_MESSAGES/grub.mo
	-share/locale/vi/LC_MESSAGES/grub.mo
	-share/locale/zh_CN/LC_MESSAGES/grub.mo
	-share/locale/zh_TW/LC_MESSAGES/grub.mo
	man/man1/grub-editenv.1.gz
	+man/man1/grub-file.1.gz
	man/man1/grub-fstest.1.gz
	+man/man1/grub-glue-efi.1.gz
	man/man1/grub-kbdcomp.1.gz
	man/man1/grub-menulst2cfg.1.gz
	+man/man1/grub-mkfont.1.gz
	man/man1/grub-mkimage.1.gz
	man/man1/grub-mklayout.1.gz
	+man/man1/grub-mknetdir.1.gz
	man/man1/grub-mkpasswd-pbkdf2.1.gz
	man/man1/grub-mkrelpath.1.gz
	man/man1/grub-mkrescue.1.gz
	man/man1/grub-mkstandalone.1.gz
	+man/man1/grub-render-label.1.gz
	man/man1/grub-script-check.1.gz
	+man/man1/grub-syslinux2cfg.1.gz
	man/man8/grub-bios-setup.8.gz
	man/man8/grub-install.8.gz
	+man/man8/grub-macbless.8.gz
	man/man8/grub-mkconfig.8.gz
	-man/man8/grub-mknetdir.8.gz
	man/man8/grub-ofpathname.8.gz
	man/man8/grub-probe.8.gz
	man/man8/grub-reboot.8.gz
	man/man8/grub-set-default.8.gz
	man/man8/grub-sparc64-setup.8.gz
	+sbin/grub-bios-setup
	+sbin/grub-install
	+sbin/grub-macbless
	+sbin/grub-mkconfig
	+sbin/grub-ofpathname
	+sbin/grub-probe
	+sbin/grub-reboot
	+sbin/grub-set-default
	+sbin/grub-sparc64-setup
	+%%DATADIR%%/grub-mkconfig_lib
	Index: sysutils/openhpi/Makefile
	===================================================================
	--- sysutils/openhpi/Makefile
	+++ sysutils/openhpi/Makefile
	@@ -1,8 +1,7 @@
	# $FreeBSD$

	PORTNAME= openhpi
	-PORTVERSION= 3.6.1
	-PORTREVISION= 1
	+PORTVERSION= 3.8.0
	CATEGORIES= sysutils
	MASTER_SITES= SF/openhpi/openhpi-stable/${PORTVERSION}/

	@@ -14,34 +13,34 @@
	LICENSE_FILE= ${WRKSRC}/COPYING
	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

	-BROKEN= fails to build
	-DEPRECATED= Broken for more than 6 months
	-EXPIRATION_DATE= 2019-05-08
	-
	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
	libnetsnmp.so:net-mgmt/net-snmp \
	+ librabbitmq.so:net/rabbitmq-c \
	+ libcurl.so:ftp/curl \
	+ libjson-c.so:devel/json-c \
	libgcrypt.so:security/libgcrypt

	-GNU_CONFIGURE= yes
	-CPPFLAGS+= -I${LOCALBASE}/include
	-LIBS+= -L${LOCALBASE}/lib
	-INSTALL_TARGET= install-strip
	USES= gmake gnome libtool pathfix perl5 pkgconfig shebangfix ssl
	-SHEBANG_FILES= plugins/snmp_bc/eventmap2code.pl scripts/text2cstr.pl
	USE_GNOME= glib20 libxml2
	USE_LDCONFIG= yes
	USE_PERL5= build
	USE_RC_SUBR= openhpid
	+SHEBANG_FILES= plugins/snmp_bc/eventmap2code.pl scripts/text2cstr.pl

	+CPPFLAGS+= -I${LOCALBASE}/include
	+LIBS+= -L${LOCALBASE}/lib
	+INSTALL_TARGET= install-strip
	+GNU_CONFIGURE= yes
	+
	OPTIONS_DEFINE= DOCS

	post-patch:
	- @${REINPLACE_CMD} 's/-lstdc++//' \
	+ ${REINPLACE_CMD} 's/-lstdc++//' \
	${WRKSRC}/baselib/Makefile.in \
	${WRKSRC}/openhpid/Makefile.in \
	${WRKSRC}/plugins/dynamic_simulator/Makefile.in \
	${WRKSRC}/plugins/ipmidirect/Makefile.in
	- @${REINPLACE_CMD} '/XML2_INCLUDE=/s\|=.*\|=-I${LOCALBASE}/include/libxml2\|' \
	+ ${REINPLACE_CMD} '/XML2_INCLUDE=/s\|=.*\|=-I${LOCALBASE}/include/libxml2\|' \
	${WRKSRC}/configure

	post-install:
	Index: sysutils/openhpi/distinfo
	===================================================================
	--- sysutils/openhpi/distinfo
	+++ sysutils/openhpi/distinfo
	@@ -1,2 +1,3 @@
	-SHA256 (openhpi-3.6.1.tar.gz) = e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc
	-SIZE (openhpi-3.6.1.tar.gz) = 7718590
	+TIMESTAMP = 1535846596
	+SHA256 (openhpi-3.8.0.tar.gz) = c94332a29160dd75cb799c027e614690c00263b0fabed87417707bec04c38723
	+SIZE (openhpi-3.8.0.tar.gz) = 8441481
	Index: sysutils/openhpi/files/patch-new__sim__file.cpp
	===================================================================
	--- sysutils/openhpi/files/patch-new__sim__file.cpp
	+++ sysutils/openhpi/files/patch-new__sim__file.cpp
	@@ -0,0 +1,14 @@
	+--- plugins/dynamic_simulator/new_sim_file.cpp.orig 2018-09-02 00:24:02 UTC
	++++ plugins/dynamic_simulator/new_sim_file.cpp
	+@@ -44,9 +44,9 @@
	+ ///< Global skip characters for oh_scanner_config
	+ static gchar skip_characters[] = " \t\n";
	+ ///< Global identifier_first for oh_scanner_config
	+-static gchar identifier_first[] = G_CSET_a_2_z"_/."G_CSET_A_2_Z;
	++static gchar identifier_first[] = G_CSET_a_2_z"_/." G_CSET_A_2_Z;
	+ ///< Global identifier_nth for oh_scanner_config
	+-static gchar identifier_nth[] = G_CSET_a_2_z"_-0123456789/."G_CSET_A_2_Z;
	++static gchar identifier_nth[] = G_CSET_a_2_z"_-0123456789/." G_CSET_A_2_Z;
	+ ///< Global comment signs for oh_scanner_config
	+ static gchar comment_single[] = "#\n";
	+
	Index: sysutils/openhpi/files/patch-openhpid-Makefile.in
	===================================================================
	--- sysutils/openhpi/files/patch-openhpid-Makefile.in
	+++ sysutils/openhpi/files/patch-openhpid-Makefile.in
	@@ -0,0 +1,15 @@
	+--- openhpid/Makefile.in.orig 2018-09-03 22:08:46.366880000 +0200
	++++ openhpid/Makefile.in 2018-09-03 22:08:58.462763000 +0200
	+@@ -944,9 +944,9 @@
	+
	+ .NOTPARALLEL:
	+
	+-install-data-local:
	+- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
	+- $(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
	++#install-data-local:
	++# $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
	++# $(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
	+
	+ uninstall-local:
	+ rm -f $(DESTDIR)$(sysconfdir)/init.d/openhpid
	Index: sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi_auth.cpp
	===================================================================
	--- sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi_auth.cpp
	+++ sysutils/openhpi/files/patch-plugins-ipmidirect-ipmi_auth.cpp
	@@ -0,0 +1,28 @@
	+--- plugins/ipmidirect/ipmi_auth.cpp.orig 2019-03-06 22:52:05.357697000 +0100
	++++ plugins/ipmidirect/ipmi_auth.cpp 2019-03-06 22:56:14.660567000 +0100
	+@@ -33,7 +33,9 @@
	+
	+ case eIpmiAuthTypeMd2:
	+ #ifdef HAVE_OPENSSL_MD2_H
	++#ifndef OPENSSL_NO_MD2
	+ return new cIpmiAuthMd2;
	++#endif
	+ #else
	+ break;
	+ #endif
	+@@ -80,6 +82,7 @@
	+
	+ #ifdef HAVE_OPENSSL_MD2_H
	+ #include <openssl/md2.h>
	++#ifndef OPENSSL_NO_MD2
	+
	+
	+ int
	+@@ -131,6 +134,7 @@
	+
	+ return 0;
	+ }
	++#endif
	+ #endif
	+
	+
	Index: sysutils/openhpi/files/patch-thread.cpp
	===================================================================
	--- sysutils/openhpi/files/patch-thread.cpp
	+++ sysutils/openhpi/files/patch-thread.cpp
	@@ -0,0 +1,20 @@
	+--- plugins/dynamic_simulator/thread.cpp.orig 2018-09-02 00:17:02 UTC
	++++ plugins/dynamic_simulator/thread.cpp
	+@@ -30,7 +30,7 @@
	+ #include <sys/time.h>
	+ #include <errno.h>
	+
	+-
	++#include <iostream>
	+ //////////////////////////////////////////////////
	+ // cThread
	+ //////////////////////////////////////////////////
	+@@ -238,7 +238,7 @@ cThreadLock::cThreadLock()
	+ pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE );
	+ pthread_mutex_init( &m_lock, &attr );
	+ pthread_mutexattr_destroy( &attr );
	+- cout<<"PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is Defined"
	++ std::cout<<"PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is Defined";
	+ }
	+ #else
	+ static pthread_mutex_t lock_tmpl = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
	Index: sysutils/openhpi/pkg-plist
	===================================================================
	--- sysutils/openhpi/pkg-plist
	+++ sysutils/openhpi/pkg-plist
	@@ -20,7 +20,6 @@
	bin/ohdomainlist
	bin/ohhandler
	bin/ohparam
	-@comment etc/init.d/openhpid
	@sample %%ETCDIR%%/openhpi.conf.sample
	@sample %%ETCDIR%%/openhpiclient.conf.sample
	@sample %%ETCDIR%%/simulation.data.sample
	@@ -48,59 +47,63 @@
	lib/libopenhpi.a
	lib/libopenhpi.so
	lib/libopenhpi.so.3
	-lib/libopenhpi.so.3.6.1
	+lib/libopenhpi.so.3.8.0
	lib/libopenhpi_snmp.a
	lib/libopenhpi_snmp.so
	lib/libopenhpi_snmp.so.3
	-lib/libopenhpi_snmp.so.3.6.1
	+lib/libopenhpi_snmp.so.3.8.0
	lib/libopenhpi_ssl.a
	lib/libopenhpi_ssl.so
	lib/libopenhpi_ssl.so.3
	-lib/libopenhpi_ssl.so.3.6.1
	+lib/libopenhpi_ssl.so.3.8.0
	lib/libopenhpimarshal.a
	lib/libopenhpimarshal.so
	lib/libopenhpimarshal.so.3
	-lib/libopenhpimarshal.so.3.6.1
	+lib/libopenhpimarshal.so.3.8.0
	lib/libopenhpitransport.a
	lib/libopenhpitransport.so
	lib/libopenhpitransport.so.3
	-lib/libopenhpitransport.so.3.6.1
	+lib/libopenhpitransport.so.3.8.0
	lib/libopenhpiutils.a
	lib/libopenhpiutils.so
	lib/libopenhpiutils.so.3
	-lib/libopenhpiutils.so.3.6.1
	+lib/libopenhpiutils.so.3.8.0
	lib/openhpi/libdyn_simulator.a
	lib/openhpi/libdyn_simulator.so
	lib/openhpi/libdyn_simulator.so.3
	-lib/openhpi/libdyn_simulator.so.3.6.1
	+lib/openhpi/libdyn_simulator.so.3.8.0
	lib/openhpi/libilo2_ribcl.a
	lib/openhpi/libilo2_ribcl.so
	lib/openhpi/libilo2_ribcl.so.3
	-lib/openhpi/libilo2_ribcl.so.3.6.1
	+lib/openhpi/libilo2_ribcl.so.3.8.0
	lib/openhpi/libipmidirect.a
	lib/openhpi/libipmidirect.so
	lib/openhpi/libipmidirect.so.3
	-lib/openhpi/libipmidirect.so.3.6.1
	+lib/openhpi/libipmidirect.so.3.8.0
	lib/openhpi/liboa_soap.a
	lib/openhpi/liboa_soap.so
	lib/openhpi/liboa_soap.so.3
	-lib/openhpi/liboa_soap.so.3.6.1
	+lib/openhpi/liboa_soap.so.3.8.0
	+lib/openhpi/libov_rest.a
	+lib/openhpi/libov_rest.so
	+lib/openhpi/libov_rest.so.3
	+lib/openhpi/libov_rest.so.3.8.0
	lib/openhpi/libsimulator.a
	lib/openhpi/libsimulator.so
	lib/openhpi/libsimulator.so.3
	-lib/openhpi/libsimulator.so.3.6.1
	+lib/openhpi/libsimulator.so.3.8.0
	lib/openhpi/libslave.a
	lib/openhpi/libslave.so
	lib/openhpi/libslave.so.3
	-lib/openhpi/libslave.so.3.6.1
	+lib/openhpi/libslave.so.3.8.0
	lib/openhpi/libsnmp_bc.a
	lib/openhpi/libsnmp_bc.so
	lib/openhpi/libsnmp_bc.so.3
	-lib/openhpi/libsnmp_bc.so.3.6.1
	+lib/openhpi/libsnmp_bc.so.3.8.0
	lib/openhpi/libtest_agent.a
	lib/openhpi/libtest_agent.so
	lib/openhpi/libtest_agent.so.3
	-lib/openhpi/libtest_agent.so.3.6.1
	+lib/openhpi/libtest_agent.so.3.8.0
	libdata/pkgconfig/openhpi.pc
	libdata/pkgconfig/openhpiutils.pc
	man/man1/hpi_shell.1.gz
	@@ -128,7 +131,7 @@
	man/man7/openhpi.7.gz
	man/man8/openhpid.8.gz
	sbin/openhpid
	-@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
	+%%PORTDOCS%%%%DOCSDIR%%/COPYING
	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
	%%PORTDOCS%%%%DOCSDIR%%/README
	%%PORTDOCS%%%%DOCSDIR%%/README.daemon
	Index: sysutils/pcbsd-utils-qt5/Makefile
	===================================================================
	--- sysutils/pcbsd-utils-qt5/Makefile
	+++ sysutils/pcbsd-utils-qt5/Makefile
	@@ -27,8 +27,6 @@
	LIB_DEPENDS= libcurl.so:ftp/curl \
	libpoppler-qt5.so:graphics/poppler-qt5

	-CONFLICTS?= pcbsd-utils-qt4-[0-9]*
	-
	MAKE_JOBS_UNSAFE=yes
	ONLY_FOR_ARCHS= amd64
	USE_LDCONFIG= yes
	Index: x11-themes/xfce-evolution/Makefile
	===================================================================
	--- x11-themes/xfce-evolution/Makefile
	+++ x11-themes/xfce-evolution/Makefile
	@@ -7,7 +7,7 @@
	MASTER_SITES= SF/${PORTNAME}

	MAINTAINER= fbsd@opal.com
	-COMMENT= Complete Xfce Evolution Gtk2, Gtk3, Qt4, Qt5, wxWidgets, Xfce themes
	+COMMENT= Complete Xfce Evolution Gtk2, Gtk3, Qt5, wxWidgets, Xfce themes

	LICENSE= GPLv2
	LICENSE_FILE= ${WRKSRC}/GPL-v2

File Metadata

Mime Type: text/plain
Expires: Mon, Mar 2, 11:46 PM (15 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29158131
Default Alt Text: D20725.id58915.diff (50 KB)

D20725.id58915.diffNo OneTemporaryActions

D20725.id58915.diffView Options

File Metadata

Event Timeline

D20725.id58915.diff
No OneTemporary
Actions

D20725.id58915.diff
View Options