From a58ee04b43918ceacabfac4ddf22fe6f0b9fad16 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Thu, 14 Mar 2019 08:04:41 +0000 Subject: [PATCH] lang/harbour: Restore options after r494667 PR: 236224 --- lang/harbour/Makefile | 14 +++++++------- lang/harbour/pkg-plist | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile index c5d26ae3d13a..d016163ff162 100644 --- a/lang/harbour/Makefile +++ b/lang/harbour/Makefile @@ -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 - -.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 @@ -117,6 +111,12 @@ SQLITE_USES= sqlite SQLITE_MAKE_ENV= HB_WITH_SQLITE3=${LOCALBASE}/include SQLITE_MAKE_ENV_OFF= HB_WITH_SQLITE3=no +.include + +.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 diff --git a/lang/harbour/pkg-plist b/lang/harbour/pkg-plist index 359278f88a2b..4522d6f1f6c2 100644 --- a/lang/harbour/pkg-plist +++ b/lang/harbour/pkg-plist @@ -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