Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Mar 2019 08:04:42 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495690 - head/lang/harbour
Message-ID:  <201903140804.x2E84gRu006285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Thu Mar 14 08:04:41 2019
New Revision: 495690
URL: https://svnweb.freebsd.org/changeset/ports/495690

Log:
  lang/harbour: Restore options after r494667
  
  PR:		236224

Modified:
  head/lang/harbour/Makefile
  head/lang/harbour/pkg-plist

Modified: head/lang/harbour/Makefile
==============================================================================
--- head/lang/harbour/Makefile	Thu Mar 14 06:45:54 2019	(r495689)
+++ head/lang/harbour/Makefile	Thu Mar 14 08:04:41 2019	(r495690)
@@ -3,7 +3,7 @@
 
 PORTNAME=	harbour
 PORTVERSION=	3.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-project/source/${PORTVERSION}
 
@@ -35,12 +35,6 @@ 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
@@ -116,6 +110,12 @@ 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} \

Modified: head/lang/harbour/pkg-plist
==============================================================================
--- head/lang/harbour/pkg-plist	Thu Mar 14 06:45:54 2019	(r495689)
+++ head/lang/harbour/pkg-plist	Thu Mar 14 08:04:41 2019	(r495690)
@@ -273,7 +273,6 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903140804.x2E84gRu006285>