- Update to 0.8.6.2

- Install pkgconf file in correct location
- Trim Makefile header
- Sort pkg-plist

PR:		ports/173302 (based on)
Submitted by:	Brett Estrade <estrabd@gmail.com> (maintainer)

3 files changed, 95 insertions, 76 deletions

diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index 53f93b82ad21..4647e92fa3f8 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -1,12 +1,7 @@
-# Ports collection makefile for:	qore
-# Date created:				12 November 2009
-# Whom:					B. Estrade <estrabd@gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qore
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.6.2
 CATEGORIES=	lang
 MASTER_SITES=	SF/qore/qore/${PORTVERSION}/
 
@@ -16,25 +11,38 @@ COMMENT=	The Qore Programming Language
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
-		xml2:${PORTSDIR}/textproc/libxml2
+		mpfr:${PORTSDIR}/math/mpfr
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
 
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack
+USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	"LEX=${LOCALBASE}/bin/flex"
-CONFIGURE_ARGS=	--disable-debug --disable-static
+MAKE_JOBS_SAFE=	yes
+
+CONFIGURE_ENV=	LEX="${LOCALBASE}/bin/flex" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_CFLAGS="${PTRHEAD_CFLAGS}"
+CONFIGURE_ARGS=	--disable-debug --disable-static --with-doxygen=no
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		qore.1
 
+# VERSION sub should always be the first three components of
+# PORTVERSION (x.y.z).  Adjust with :R accordingly.
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not compile on powerpc
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's|; make|; $${MAKE}|g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/lang/qore/distinfo b/lang/qore/distinfo
index bce9e8a7fb74..693991fd80fa 100644
--- a/lang/qore/distinfo
+++ b/lang/qore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qore-0.8.3.tar.bz2) = 40f8f140107ca67c751a419bf3372ec34e539dea9e1720df7aebd2cd0ea34b9e
-SIZE (qore-0.8.3.tar.bz2) = 3476315
+SHA256 (qore-0.8.6.2.tar.bz2) = c4e00ff8d4a2d41cd9e3cc193d4e49649ea0eccb0fb4ed398ca81dee04e77a3f
+SIZE (qore-0.8.6.2.tar.bz2) = 8554218
diff --git a/lang/qore/pkg-plist b/lang/qore/pkg-plist
index 44a813cd4a8a..7ccc64bbf55f 100644
--- a/lang/qore/pkg-plist
+++ b/lang/qore/pkg-plist
@@ -1,77 +1,88 @@
+bin/qdx
 bin/qore
-lib/libqore.la
-lib/libqore.so
-lib/libqore.so.11
-lib/pkgconfig/qore.pc
-include/qore/QoreTypeSafeReferenceHelper.h
-include/qore/SQLStatement.h
-include/qore/ReferenceArgumentHelper.h
-include/qore/qore_thread.h
-include/qore/AbstractThreadResource.h
-include/qore/QoreProgram.h
-include/qore/QoreReferenceCounter.h
+bin/qpp
 include/qore/AbstractPrivateData.h
-include/qore/QoreType.h
-include/qore/QoreListNode.h
+include/qore/AbstractQoreNode.h
+include/qore/AbstractThreadResource.h
+include/qore/AutoVLock.h
+include/qore/BinaryNode.h
+include/qore/BuiltinFunctionList.h
+include/qore/CallReferenceNode.h
+include/qore/DBI.h
+include/qore/Datasource.h
+include/qore/DateTime.h
+include/qore/DateTimeNode.h
+include/qore/ExceptionSink.h
+include/qore/ModuleManager.h
+include/qore/ParseOptionMap.h
+include/qore/Qore.h
 include/qore/QoreBigIntNode.h
 include/qore/QoreBoolNode.h
-include/qore/QoreFloatNode.h
-include/qore/QoreNothingNode.h
-include/qore/QoreNullNode.h
-include/qore/params.h
-include/qore/node_types.h
-include/qore/BuiltinFunctionList.h
-include/qore/QoreThreadLock.h
-include/qore/QoreThreadLocalStorage.h
 include/qore/QoreClass.h
-include/qore/QoreString.h
-include/qore/qore-version.h
-include/qore/common.h
+include/qore/QoreCondition.h
+include/qore/QoreCounter.h
 include/qore/QoreEncoding.h
-include/qore/DateTime.h
-include/qore/support.h
-include/qore/ExceptionSink.h
-include/qore/AbstractQoreNode.h
-include/qore/QoreNodeEvalOptionalRefHolder.h
-include/qore/QoreStringNode.h
-include/qore/DateTimeNode.h
+include/qore/QoreEvents.h
+include/qore/QoreFile.h
+include/qore/QoreFloatNode.h
+include/qore/QoreFtpClient.h
+include/qore/QoreHTTPClient.h
 include/qore/QoreHashNode.h
-include/qore/ModuleManager.h
+include/qore/QoreLib.h
+include/qore/QoreListNode.h
 include/qore/QoreNamespace.h
+include/qore/QoreNet.h
+include/qore/QoreNodeEvalOptionalRefHolder.h
+include/qore/QoreNothingNode.h
+include/qore/QoreNullNode.h
+include/qore/QoreNumberNode.h
 include/qore/QoreObject.h
-include/qore/macros.h
-include/qore/macros-i386.h
-include/qore/macros-x86_64.h
-include/qore/DBI.h
-include/qore/macros-powerpc.h
-include/qore/macros-sparc.h
-include/qore/macros-ia64.h
+include/qore/QoreProgram.h
+include/qore/QoreRWLock.h
+include/qore/QoreReferenceCounter.h
+include/qore/QoreSSLBase.h
+include/qore/QoreSSLCertificate.h
+include/qore/QoreSSLPrivateKey.h
 include/qore/QoreSocket.h
-include/qore/QoreNet.h
+include/qore/QoreString.h
+include/qore/QoreStringNode.h
+include/qore/QoreThreadLocalStorage.h
+include/qore/QoreThreadLock.h
+include/qore/QoreType.h
+include/qore/QoreTypeSafeReferenceHelper.h
 include/qore/QoreURL.h
-include/qore/Restrictions.h
-include/qore/QoreLib.h
-include/qore/QoreCondition.h
-include/qore/QoreCounter.h
-include/qore/BinaryNode.h
+include/qore/ReferenceArgumentHelper.h
+include/qore/ReferenceHolder.h
 include/qore/ReferenceNode.h
-include/qore/CallReferenceNode.h
-include/qore/QoreFtpClient.h
-include/qore/safe_dslist
-include/qore/qore_bitopts.h
-include/qore/QoreSSLBase.h
-include/qore/Datasource.h
-include/qore/SystemEnvironment.h
-include/qore/ParseOptionMap.h
-include/qore/QoreHTTPClient.h
+include/qore/Restrictions.h
+include/qore/SQLStatement.h
 include/qore/ScopeGuard.h
-include/qore/ReferenceHolder.h
-include/qore/QoreSSLCertificate.h
-include/qore/QoreSSLPrivateKey.h
-include/qore/AutoVLock.h
-include/qore/QoreFile.h
-include/qore/Qore.h
-include/qore/QoreEvents.h
-include/qore/QoreRWLock.h
+include/qore/SystemEnvironment.h
+include/qore/common.h
+include/qore/macros-i386.h
+include/qore/macros-ia64.h
+include/qore/macros-powerpc.h
+include/qore/macros-sparc.h
+include/qore/macros-x86_64.h
+include/qore/macros.h
+include/qore/node_types.h
+include/qore/params.h
+include/qore/qore-version.h
+include/qore/qore_bitopts.h
+include/qore/qore_thread.h
+include/qore/safe_dslist
+include/qore/support.h
+lib/libqore.la
+lib/libqore.so
+lib/libqore.so.14
+lib/qore-modules/%%VERSION%%/CsvUtil.qm
+lib/qore-modules/%%VERSION%%/HttpServer.qm
+lib/qore-modules/%%VERSION%%/MailMessage.qm
+lib/qore-modules/%%VERSION%%/Mime.qm
+lib/qore-modules/%%VERSION%%/Pop3Client.qm
+lib/qore-modules/%%VERSION%%/SmtpClient.qm
+lib/qore-modules/%%VERSION%%/TelnetClient.qm
+libdata/pkgconfig/qore.pc
+@dirrm lib/qore-modules/%%VERSION%%
+@dirrmtry lib/qore-modules
 @dirrm include/qore
-@dirrmtry lib/pkgconfig