Index: head/lang/harbour/Makefile
===================================================================
--- head/lang/harbour/Makefile	(revision 495689)
+++ head/lang/harbour/Makefile	(revision 495690)
@@ -1,129 +1,129 @@
 # Created by: David G. Holm <harbour@netfang.net>
 # $FreeBSD$
 
 PORTNAME=	harbour
 PORTVERSION=	3.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-project/source/${PORTVERSION}
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Open source Clipper-compatible compiler
 
 LICENSE=	GPLv2
 
 BROKEN_mips=		does not build: clang: Command not found
 BROKEN_mips64=		does not build: clang: Command not found
 # XXX MCL 20181112
 #BROKEN_powerpc64=	does not build: clang: Command not found
 BROKEN_sparc64=		does not compile: assertion failed
 BROKEN_SSL=				libressl libressl-devel openssl111
 BROKEN_SSL_REASON_libressl=		Needs an old version of OpenSSL (older than 1.1)
 BROKEN_SSL_REASON_libressl-devel=	Needs an old version of OpenSSL (older than 1.1)
 BROKEN_SSL_REASON_openssl111=		Needs an older version of OpenSSL (older than 1.1)
 
 LIB_DEPENDS=	libslang.so:devel/libslang2\
 		libpcre.so:devel/pcre
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		bison gmake shebangfix ssl
 
 SHEBANG_FILES=	bin/hb3rdpat.hbs
 SHEBANG_LANG=	hbrun
 
 OPTIONS_DEFINE=	MYSQL SQLITE FIREBIRD PGSQL DOCS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
-BROKEN=	Needs an older version of OpenSSL (older than 1.1)
-.endif
-
 PORTDOCS=	*.txt *.hbd NEWS INSTALL TODO COPYING ChangeLog
 
 USE_LDCONFIG=	${LOCALBASE}/lib/harbour
 
 HB_WITH_ALLEGRO=	no
 HB_WITH_CAIRO=	no
 HB_WITH_CUPS=	no
 HB_WITH_CURL=	no
 HB_WITH_EXPAT=	local
 HB_WITH_FREEIMAGE=	no
 HB_WITH_GD=	no
 HB_WITH_GS=	no
 HB_WITH_JPEG=	no
 HB_WITH_LIBMAGIC=	no
 HB_WITH_MXML=	no
 HB_WITH_ODBC=	no
 HB_WITH_PCRE=	nolocal
 HB_WITH_PNG=	no
 HB_WITH_QT=	no
 HB_WITH_SLANG=	nolocal
 HB_WITH_X11=	no
 
 HB_ARCH=	bsd
 HB_GT_LIB=	gtsln
 HB_COMPILER=	clang
 
 HB_INSTALL_PREFIX=	${STAGEDIR}/${LOCALBASE}
 HB_INSTALL_BIN=	${STAGEDIR}${LOCALBASE}/bin
 HB_INSTALL_LIB=	${STAGEDIR}${LOCALBASE}/lib/harbour
 HB_INSTALL_INC=	${STAGEDIR}${LOCALBASE}/include/harbour
 HB_INSTALL_DOC=	${STAGEDIR}${DOCSDIR}
 HB_USER_CFLAGS=	"${CFLAGS} -fPIC"
 HB_USER_LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 MAKE_ENV=	HB_ARCHITECTURE=${HB_ARCH} \
 		HB_BUILD_OPTIM=no \
 		HB_COMPILER=${HB_COMPILER} \
 		HB_GT_LIB=${HB_GT_LIB} \
 		HB_INSTALL_PREFIX=${HB_INSTALL_PREFIX} \
 		HB_INSTALL_BIN=${HB_INSTALL_BIN} \
 		HB_INSTALL_LIB=${HB_INSTALL_LIB} \
 		HB_INSTALL_INC=${HB_INSTALL_INC} \
 		HB_WITH_ALLEGRO=${HB_WITH_ALLEGRO} \
 		HB_WITH_CAIRO=${HB_WITH_CAIRO} \
 		HB_WITH_CUPS=${HB_WITH_CUPS} \
 		HB_WITH_CURL=${HB_WITH_CURL} \
 		HB_WITH_EXPAT=${HB_WITH_EXPAT} \
 		HB_WITH_FREEIMAGE=${HB_WITH_FREEIMAGE} \
 		HB_WITH_GD=${HB_WITH_GD} \
 		HB_WITH_GS=${HB_WITH_GS} \
 		HB_WITH_JPEG=${HB_WITH_JPEG} \
 		HB_WITH_LIBMAGIC=${HB_WITH_LIBMAGIC} \
 		HB_WITH_MXML=${HB_WITH_MXML} \
 		HB_WITH_ODBC=${HB_WITH_ODBC} \
 		HB_WITH_PCRE=${HB_WITH_PCRE} \
 		HB_WITH_QT=${HB_WITH_QT} \
 		HB_WITH_SLANG=${HB_WITH_SLANG} \
 		HB_WITH_X11=${HB_WITH_X11} \
 		HB_USER_CFLAGS=${HB_USER_CFLAGS} \
 		HB_USER_LDFLAGS=${HB_USER_LDFLAGS}
 
 DOCS_MAKE_ENV=		HB_INSTALL_DOC=${HB_INSTALL_DOC}
 DOCS_MAKE_ENV_OFF=	HB_INSTALL_DOC=no
 PGSQL_USES=	pgsql
 PGSQL_MAKE_ENV=		HB_WITH_PGSQL=${LOCALBASE}/include
 PGSQL_MAKE_ENV_OFF=	HB_WITH_PGSQL=no
 FIREBIRD_USES=	firebird
 FIREBIRD_MAKE_ENV=	HB_WITH_FIREBIRD=${LOCALBASE}/include
 FIREBIRD_MAKE_ENV_OFF=	HB_WITH_FIREBIRD=no
 MYSQL_USES=	mysql
 MYSQL_MAKE_ENV=		HB_WITH_MYSQL=${LOCALBASE}/include/mysql
 MYSQL_MAKE_ENV_OFF=	HB_WITH_MYSQL=no
 SQLITE_USES=	sqlite
 SQLITE_MAKE_ENV=	HB_WITH_SQLITE3=${LOCALBASE}/include
 SQLITE_MAKE_ENV_OFF=	HB_WITH_SQLITE3=no
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
+BROKEN=	Needs an older version of OpenSSL (older than 1.1)
+.endif
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|utmp.h|utmpx.h|g' ${WRKSRC}/src/rtl/gtcrs/gtcrs.h
 
 # override default for gcc-based archs
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
 HB_COMPILER=	gcc
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/harbour/pkg-plist
===================================================================
--- head/lang/harbour/pkg-plist	(revision 495689)
+++ head/lang/harbour/pkg-plist	(revision 495690)
@@ -1,310 +1,309 @@
 bin/harbour
 bin/hb3rdpat.hbs
 bin/hbformat
 bin/hbi18n
 bin/hbmk2
 bin/hbmk2.es_PE.hbl
 bin/hbmk2.hu_HU.hbl
 bin/hbmk2.pt_BR.hbl
 bin/hbnetio
 bin/hbpp
 bin/hbrun
 bin/hbtest
 etc/harbour/hb-charmap.def
 include/harbour/achoice.ch
 include/harbour/assert.ch
 include/harbour/blob.ch
 include/harbour/box.ch
 include/harbour/button.ch
 include/harbour/clipdefs.h
 include/harbour/color.ch
 include/harbour/common.ch
 include/harbour/ct.ch
 include/harbour/ct.h
 include/harbour/ctcom.ch
 include/harbour/ctdisk.ch
 include/harbour/cterror.ch
 include/harbour/ctextern.ch
 include/harbour/ctmath.h
 include/harbour/ctset.h
 include/harbour/ctstr.h
 include/harbour/ctstrfil.h
 include/harbour/ctvideo.ch
 include/harbour/ctwin.h
 include/harbour/dbedit.ch
 include/harbour/dbinfo.ch
 include/harbour/dbstruct.ch
 include/harbour/directry.ch
 include/harbour/dll.ch
 include/harbour/dmlb.ch
 include/harbour/error.api
 include/harbour/error.ch
 include/harbour/extend.api
 include/harbour/extend.h
 include/harbour/fileio.ch
 include/harbour/filesys.api
 include/harbour/fm.api
 include/harbour/ftmenuto.ch
 include/harbour/getexit.ch
 include/harbour/gt.api
 include/harbour/harbour.hbx
 include/harbour/harupdf.ch
 include/harbour/hb.ch
 include/harbour/hb_io.h
 include/harbour/hbapi.h
 include/harbour/hbapicdp.h
 include/harbour/hbapicls.h
 include/harbour/hbapicom.h
 include/harbour/hbapidbg.h
 include/harbour/hbapierr.h
 include/harbour/hbapifs.h
 include/harbour/hbapigt.h
 include/harbour/hbapiitm.h
 include/harbour/hbapilng.h
 include/harbour/hbapirdd.h
 include/harbour/hbapistr.h
 include/harbour/hbassert.h
 include/harbour/hbatomic.h
 include/harbour/hbbfish.h
 include/harbour/hbblink.ch
 include/harbour/hbblink.hbx
 include/harbour/hbbz2.ch
 include/harbour/hbbz2.hbx
 include/harbour/hbcdpreg.h
 include/harbour/hbchksum.h
 include/harbour/hbclass.ch
 include/harbour/hbclipsm.hbx
 include/harbour/hbcom.ch
 include/harbour/hbcomm.hbx
 include/harbour/hbcomp.h
 include/harbour/hbcompat.ch
 include/harbour/hbcompat.h
 include/harbour/hbcompdf.h
 include/harbour/hbcpage.hbx
 include/harbour/hbct.hbx
 include/harbour/hbdate.h
 include/harbour/hbdbf.h
 include/harbour/hbdbferr.h
 include/harbour/hbdbsort.h
 include/harbour/hbdebug.ch
 include/harbour/hbdefs.h
 include/harbour/hbdyn.ch
 include/harbour/hberrors.h
 include/harbour/hbexpat.ch
 include/harbour/hbexpat.hbx
 include/harbour/hbexprop.h
 include/harbour/hbextcdp.ch
 include/harbour/hbextern.ch
 include/harbour/hbextlng.ch
 %%FIREBIRD%%include/harbour/hbfbird.hbx
 include/harbour/hbfloat.h
 include/harbour/hbformat.hbx
 include/harbour/hbfoxpro.ch
 include/harbour/hbfoxpro.hbx
 include/harbour/hbfship.hbx
 include/harbour/hbgfx.ch
 include/harbour/hbgfxdef.ch
 include/harbour/hbgt.hbx
 include/harbour/hbgtcore.h
 include/harbour/hbgtinfo.ch
 include/harbour/hbgtreg.h
 include/harbour/hbhash.h
 include/harbour/hbhpdf.hbx
 include/harbour/hbhrb.ch
 include/harbour/hbhttpd.hbx
 include/harbour/hbiniseg.h
 include/harbour/hbinit.h
 include/harbour/hbinkey.ch
 include/harbour/hbjson.h
 include/harbour/hblang.ch
 include/harbour/hblang.hbx
 include/harbour/hblpp.ch
 include/harbour/hblzf.ch
 include/harbour/hblzf.hbx
 include/harbour/hbmacro.ch
 include/harbour/hbmacro.h
 include/harbour/hbmath.ch
 include/harbour/hbmath.h
 include/harbour/hbmather.h
 include/harbour/hbmemio.hbx
 include/harbour/hbmemory.ch
 include/harbour/hbmemvar.ch
 include/harbour/hbmisc.hbx
 include/harbour/hbmlzo.ch
 include/harbour/hbmlzo.hbx
 include/harbour/hbmsgreg.h
 %%MYSQL%%include/harbour/hbmysql.hbx
 include/harbour/hbmzip.ch
 include/harbour/hbmzip.hbx
 include/harbour/hbnetio.hbx
 include/harbour/hbnf.hbx
 include/harbour/hboo.ch
 include/harbour/hboslib.hbx
 include/harbour/hbpcode.h
 include/harbour/hbpers.ch
 %%PGSQL%%include/harbour/hbpgsql.hbx
 include/harbour/hbpp.h
 include/harbour/hbrddcdx.h
 include/harbour/hbrdddbf.h
 include/harbour/hbrdddel.h
 include/harbour/hbrddfpt.h
 include/harbour/hbrddnsx.h
 include/harbour/hbrddntx.h
 include/harbour/hbrddsdf.h
 include/harbour/hbrddsql.ch
 include/harbour/hbregex.h
 include/harbour/hbscalar.hbx
 include/harbour/hbset.h
 include/harbour/hbsetup.ch
 include/harbour/hbsetup.h
 include/harbour/hbsix.ch
 include/harbour/hbsms.hbx
 include/harbour/hbsocket.ch
 include/harbour/hbsocket.h
 %%SQLITE%%include/harbour/hbsqlit3.ch
 %%SQLITE%%include/harbour/hbsqlit3.hbx
 include/harbour/hbssl.ch
 include/harbour/hbssl.hbx
 include/harbour/hbstack.h
 include/harbour/hbstdgen.ch
 include/harbour/hbstrict.ch
 include/harbour/hbsxdef.ch
 include/harbour/hbsxfunc.h
 include/harbour/hbtask.h
 include/harbour/hbthread.ch
 include/harbour/hbthread.h
 include/harbour/hbtip.hbx
 include/harbour/hbtpathy.hbx
 include/harbour/hbtrace.ch
 include/harbour/hbtrace.h
 include/harbour/hbtypes.h
 include/harbour/hbundoc.api
 include/harbour/hbusrrdd.ch
 include/harbour/hbusrrdd.hbx
 include/harbour/hbver.ch
 include/harbour/hbver.h
 include/harbour/hbvm.h
 include/harbour/hbvmint.h
 include/harbour/hbvmopt.h
 include/harbour/hbvmpub.h
 include/harbour/hbwince.h
 include/harbour/hbwinuni.h
 include/harbour/hbxdiff.ch
 include/harbour/hbxdiff.hbx
 include/harbour/hbxpp.ch
 include/harbour/hbxpp.hbx
 include/harbour/hbxppext.ch
 include/harbour/hbxvm.h
 include/harbour/hbzebra.ch
 include/harbour/hbzebra.hbx
 include/harbour/hbziparc.hbx
 include/harbour/hbzlib.ch
 include/harbour/hbznet.h
 include/harbour/inkey.ch
 include/harbour/item.api
 include/harbour/memoedit.ch
 %%MYSQL%%include/harbour/mysql.ch
 include/harbour/ord.ch
 %%PGSQL%%include/harbour/postgres.ch
 include/harbour/rdd.api
 include/harbour/rddsys.ch
 include/harbour/reserved.ch
 include/harbour/set.ch
 include/harbour/setcurs.ch
 include/harbour/simpleio.ch
 include/harbour/std.ch
 include/harbour/tbrowse.ch
 include/harbour/telepath.ch
 include/harbour/thread.ch
 include/harbour/thtml.ch
 include/harbour/time87.ch
 include/harbour/tip.ch
 include/harbour/vm.api
 include/harbour/xhb.ch
 include/harbour/xhb.h
 include/harbour/xhb.hbx
 include/harbour/xhbcls.ch
 include/harbour/xhbextrn.ch
 lib/harbour/libexpat.a
 lib/harbour/libgtcgi.a
 lib/harbour/libgtcrs.a
 lib/harbour/libgtpca.a
 lib/harbour/libgtsln.a
 lib/harbour/libgtstd.a
 lib/harbour/libgttrm.a
 lib/harbour/libharbour.so
 lib/harbour/libharbour.so.3.0
 lib/harbour/libharbour.so.3.0.0
 lib/harbour/libhbblink.a
 lib/harbour/libhbbz2.a
 lib/harbour/libhbclipsm.a
 lib/harbour/libhbcomm.a
 lib/harbour/libhbcommon.a
 lib/harbour/libhbcpage.a
 lib/harbour/libhbcplr.a
 lib/harbour/libhbct.a
 lib/harbour/libhbdebug.a
 lib/harbour/libhbexpat.a
 lib/harbour/libhbextern.a
 %%FIREBIRD%%lib/harbour/libhbfbird.a
 lib/harbour/libhbformat.a
 lib/harbour/libhbfoxpro.a
 lib/harbour/libhbfship.a
 lib/harbour/libhbgt.a
 lib/harbour/libhbhpdf.a
 lib/harbour/libhbhsx.a
 lib/harbour/libhbhttpd.a
 lib/harbour/libhblang.a
 lib/harbour/libhblzf.a
 lib/harbour/libhbmacro.a
 lib/harbour/libhbmemio.a
 lib/harbour/libhbmisc.a
 lib/harbour/libhbmlzo.a
 %%MYSQL%%lib/harbour/libhbmysql.a
 lib/harbour/libhbmzip.a
 lib/harbour/libhbnetio.a
 lib/harbour/libhbnf.a
 lib/harbour/libhbnortl.a
 lib/harbour/libhbnulrdd.a
 lib/harbour/libhboslib.a
 %%PGSQL%%lib/harbour/libhbpgsql.a
 lib/harbour/libhbpp.a
 lib/harbour/libhbrdd.a
 lib/harbour/libhbrtl.a
 lib/harbour/libhbsix.a
 lib/harbour/libhbsms.a
-lib/harbour/libsqlite3.a
 %%SQLITE%%lib/harbour/libhbsqlit3.a
 lib/harbour/libhbssl.a
 lib/harbour/libhbtip.a
 lib/harbour/libhbtipssl.a
 lib/harbour/libhbtpathy.a
 lib/harbour/libhbuddall.a
 lib/harbour/libhbunix.a
 lib/harbour/libhbusrrdd.a
 lib/harbour/libhbvm.a
 lib/harbour/libhbvmmt.a
 lib/harbour/libhbxdiff.a
 lib/harbour/libhbxpp.a
 lib/harbour/libhbzebra.a
 lib/harbour/libhbziparc.a
 lib/harbour/liblibhpdf.a
 lib/harbour/liblzf.a
 lib/harbour/libminilzo.a
 lib/harbour/libminizip.a
 lib/harbour/libpng.a
 lib/harbour/librddbm.a
 lib/harbour/librddcdx.a
 lib/harbour/librddfpt.a
 lib/harbour/librddnsx.a
 lib/harbour/librddntx.a
 lib/harbour/librddsql.a
 %%FIREBIRD%%lib/harbour/libsddfb.a
 %%MYSQL%%lib/harbour/libsddmy.a
 %%PGSQL%%lib/harbour/libsddpg.a
 %%SQLITE%%lib/harbour/libsddsqlt3.a
 lib/harbour/libxdiff.a
 lib/harbour/libxhb.a
 lib/libharbour.so
 lib/libharbour.so.3.0
 lib/libharbour.so.3.0.0