svn commit: r333768 - head/lang/harbour

[Steve Wills]

Author: swills
Date: Thu Nov 14 16:13:38 2013
New Revision: 333768
URL: http://svnweb.freebsd.org/changeset/ports/333768

Log:
  - Drop clang option and use gcc on 8.x and clang on 9.x and later. Fix build on 10.x
  - Fix SQLITE option handling
  - Support STAGING
  - Pet portlint
  
  PR:		ports/183784
  Submitted by:	"Mikhail T." <m.tsatsenko at gmail.com> (maintainer)

Modified:
  head/lang/harbour/Makefile
  head/lang/harbour/pkg-plist   (contents, props changed)

Modified: head/lang/harbour/Makefile
==============================================================================
--- head/lang/harbour/Makefile	Thu Nov 14 15:57:50 2013	(r333767)
+++ head/lang/harbour/Makefile	Thu Nov 14 16:13:38 2013	(r333768)
@@ -10,20 +10,18 @@ MASTER_SITES=	SF/${PORTNAME}-project/sou
 MAINTAINER=	m.tsatsenko at gmail.com
 COMMENT=	An open source Clipper-compatible compiler
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2\
+LIB_DEPENDS=	slang:${PORTSDIR}/devel/libslang2\
 		pcre:${PORTSDIR}/devel/pcre
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS_DEFINE=	MYSQL SQLITE FIREBIRD PGSQL CLANG
-CLANG_DESC=	Build harbour with Clang (gcc if disabled)
+OPTIONS_DEFINE=	MYSQL SQLITE FIREBIRD PGSQL
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	does not compile on sparc64: assertion failed
 
 PORTDOCS=	*.txt *.hbd NEWS INSTALL TODO COPYING ChangeLog
 
-
 USES=		bison
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
@@ -50,10 +48,11 @@ HB_WITH_X11=	no
 HB_ARCH=	bsd
 HB_GT_LIB=	gtsln
 
-HB_INSTALL_PREFIX=	${LOCALBASE}
-HB_BIN_INSTALL=	${LOCALBASE}/bin
-HB_LIB_INSTALL=	${LOCALBASE}/lib
-HB_INC_INSTALL=	${LOCALBASE}/include
+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=	-fPIC
 HB_USER_LDFLAGS=	-L${LOCALBASE}/lib
 
@@ -61,6 +60,9 @@ MAKE_ENV=	HB_ARCHITECTURE=${HB_ARCH} \
 		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} \
@@ -80,23 +82,18 @@ MAKE_ENV=	HB_ARCHITECTURE=${HB_ARCH} \
 		HB_USER_CFLAGS=${HB_USER_CFLAGS} \
 		HB_USER_LDFLAGS=${HB_USER_LDFLAGS}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ENV+=	HB_INSTALL_DOC=${DOCSDIR}
+.if ${OSVERSION} < 900033
+HB_COMPILER=	gcc
 .else
-MAKE_ENV+=	HB_INSTALL_DOC=no
-.endif
-
-.if ${PORT_OPTIONS:MCLANG}
 HB_COMPILER=	clang
-.if ${OSVERSION} < 900033
-BUILD_DEPENDS+=	clang:${PORTSDIR}/lang/clang
 .endif
+
+.if ${PORT_OPTIONS:MDOCS}
+MAKE_ENV+=	HB_INSTALL_DOC=${HB_INSTALL_DOC}
 .else
-HB_COMPILER=	gcc
-USE_GCC=	4.2+
+MAKE_ENV+=	HB_INSTALL_DOC=no
 .endif
 
 .if ${PORT_OPTIONS:MFIREBIRD}
@@ -106,13 +103,13 @@ MAKE_ENV+=	HB_WITH_FIREBIRD=nolocal
 MAKE_ENV+=	HB_WITH_FIREBIRD=no
 .endif
 
-.if ${PORT_OPTIONS:MSQLITE3}
+.if ${PORT_OPTIONS:MSQLITE}
 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 MAKE_ENV+=	HB_WITH_SQLITE3=nolocal
-PLIST_SUB+=	WITH_SQLITE3=""
+PLIST_SUB+=	SQLITE=""
 .else
 MAKE_ENV+=	HB_WITH_SQLITE3=no
-PLIST_SUB+=	WITH_SQLITE3="@comment "
+PLIST_SUB+=	SQLITE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}

Modified: head/lang/harbour/pkg-plist
==============================================================================
--- head/lang/harbour/pkg-plist	Thu Nov 14 15:57:50 2013	(r333767)
+++ head/lang/harbour/pkg-plist	Thu Nov 14 16:13:38 2013	(r333768)
@@ -30,8 +30,8 @@ include/harbour/hbapicom.h
 include/harbour/hbdebug.ch
 include/harbour/hbtrace.h
 include/harbour/hbset.h
-%%WITH_SQLITE3%%include/harbour/hbsqlit3.ch
-%%WITH_SQLITE3%%include/harbour/hbsqlit3.hbx
+%%SQLITE%%include/harbour/hbsqlit3.ch
+%%SQLITE%%include/harbour/hbsqlit3.hbx
 include/harbour/hbgfx.ch
 include/harbour/hbmisc.hbx
 include/harbour/hbgtinfo.ch
@@ -290,8 +290,8 @@ lib/harbour/libhbexpat.a
 lib/harbour/libhbfship.a
 lib/harbour/libhbcomm.a
 lib/harbour/libhbrdd.a
-%%WITH_SQLITE3%%lib/harbour/libsddsqlt3.a
-%%WITH_SQLITE3%%lib/harbour/libhbsqlit3.a
+%%SQLITE%%lib/harbour/libsddsqlt3.a
+%%SQLITE%%lib/harbour/libhbsqlit3.a
 lib/libharbour.so
 lib/libharbour.so.3.0
 lib/libharbour.so.3.0.0