- MASSIVE update to 1.0.1

- Unbreak, (reported by erwin via pointyhat)
- Use SF Macro
- Requires BASH not SH to build
- Now works on amd64 and i386
- Remove NO_INSTALL_MANPAGES and NOPRECIOUSMAKEVARS

3 files changed, 142 insertions, 218 deletions

diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 6a2e713b16e1..a3a13f600d98 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -6,63 +6,50 @@
 #
 
 PORTNAME=	harbour
-PORTVERSION=	0.44.0
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.jsd0.com/public/harbour/dgh/
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME}-project
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	An open source Clipper-compatible compiler
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-BROKEN=		does not build
-
-# Not 64-bit clean
-ONLY_FOR_ARCHS=	i386
-WRKSRC=		${WRKDIR}
 USE_BISON=	build
 USE_GMAKE=	yes
-NO_INSTALL_MANPAGES=yes
-NOPRECIOUSMAKEVARS=yes
 
-HB_DIR=		${WRKDIR}/${PORTNAME}
+HB_WITHOUT_X11=	yes
+HB_ARCHITECTURE=	bsd
+HB_COMPILER=		gcc
+HB_GT_LIB=			gtsln
+
+HB_BIN_INSTALL=	${LOCALBASE}/bin
+HB_DOC_INSTALL=	${DOCSDIR}
+HB_LIB_INSTALL=	${LOCALBASE}/lib
+HB_INC_INSTALL= ${LOCALBASE}/include
+
+MAKE_ENV+=	HB_ARCHITECTURE=${HB_ARCHITECTURE} \
+			HB_COMPILER=${HB_COMPILER} \
+			HB_GT_LIB=${HB_GT_LIB} \
+			HB_BIN_INSTALL=${HB_BIN_INSTALL} \
+			HB_LIB_INSTALL=${HB_LIB_INSTALL} \
+			HB_INC_INSTALL=${HB_INC_INSTALL} \
+			HB_WITHOUT_X11=${HB_WITHOUT_X11}
 
-post-install:
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/harbour ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbdoc ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbmake ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbpp ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbrun ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbtest ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${HB_DIR}/bin/hbverfix ${PREFIX}/bin
-	${INSTALL_DATA} ${HB_DIR}/include/hb* ${PREFIX}/include
-	${INSTALL_DATA} ${HB_DIR}/lib/*.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${HB_DIR}/doc/*.txt ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/en
-	${INSTALL_MAN} ${HB_DIR}/doc/en/*.txt ${DOCSDIR}/en
-	${MKDIR} ${DOCSDIR}/es
-	${INSTALL_MAN} ${HB_DIR}/doc/es/*.txt ${DOCSDIR}/es
+MAKE_ENV+= HB_DOC_INSTALL=${HB_DOC_INSTALL} 
 .endif
-	-@${ECHO}
-	-@${ECHO} @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	-@${ECHO} @
-	-@${ECHO} @ Executable files are installed in ${PREFIX}/bin.
-	-@${ECHO} @
-	-@${ECHO} @ Header files are installed in ${PREFIX}/include.
-	-@${ECHO} @
-	-@${ECHO} @ Library files are installed in ${PREFIX}/lib.
-	-@${ECHO} @
+
+PORTDOCS= *.txt genhtm.bat genhtm.lnk genhtm.rsp
+
+do-build:
+	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SH} ./make_gnu.sh)
+
+pre-install:
 .if !defined(NOPORTDOCS)
-	-@${ECHO} @ Documentation files are installed in ${DOCSDIR},
-	-@${ECHO} @ ${DOCSDIR}/en, and ${DOCSDIR}/es.
-	-@${ECHO} @
+	${MKDIR} ${DOCSDIR}/
 .endif
-	-@${ECHO} @ See pkg-plist for a list of all installed files.
-	-@${ECHO} @
-	-@${ECHO} @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	-@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/lang/harbour/distinfo b/lang/harbour/distinfo
index 41bfdffbf815..f056e5c06306 100644
--- a/lang/harbour/distinfo
+++ b/lang/harbour/distinfo
@@ -1,3 +1,3 @@
-MD5 (harbour-0.44.0.tar.gz) = a4619cc9d89a84110497dfbf949f6b77
-SHA256 (harbour-0.44.0.tar.gz) = 5bff928f0804d1802497d47e48f69d6ef6e0f9adc0f29a14a57af33b42789c0e
-SIZE (harbour-0.44.0.tar.gz) = 3993814
+MD5 (harbour-1.0.1.tar.gz) = 2ce3f9293b3464ce8cc84585ccb18f21
+SHA256 (harbour-1.0.1.tar.gz) = ba10a0d9a91e12e70eafb09d7e45e7acac4b05c0d5f13ab3d7bedc7ee8d7e156
+SIZE (harbour-1.0.1.tar.gz) = 6448536
diff --git a/lang/harbour/pkg-plist b/lang/harbour/pkg-plist
index 61cc952b2420..86e080bc4bc5 100644
--- a/lang/harbour/pkg-plist
+++ b/lang/harbour/pkg-plist
@@ -4,19 +4,54 @@ bin/hbmake
 bin/hbpp
 bin/hbrun
 bin/hbtest
-bin/hbverfix
+include/achoice.ch
+include/adordd.ch
+include/assert.ch
+include/blob.ch
+include/box.ch
+include/button.ch
+include/clipdefs.h
+include/color.ch
+include/common.ch
+include/ct.ch
+include/ctdisk.ch
+include/cterror.ch
+include/ctextern.ch
+include/ctvideo.ch
+include/dbedit.ch
+include/dbinfo.ch
+include/dbstruct.ch
+include/directry.ch
+include/error.api
+include/error.ch
+include/extend.api
+include/extend.h
+include/fileio.ch
+include/filesys.api
+include/fm.api
+include/ftmenuto.ch
+include/getexit.ch
+include/gt.api
+include/hb_btree.api
+include/hb_btree.ch
 include/hb_io.h
 include/hbapi.h
 include/hbapicdp.h
+include/hbapicls.h
+include/hbapidbg.h
 include/hbapierr.h
 include/hbapifs.h
 include/hbapigt.h
 include/hbapiitm.h
 include/hbapilng.h
 include/hbapirdd.h
+include/hbassert.h
+include/hbchksum.h
 include/hbclass.ch
-include/hbcommon.ch
 include/hbcomp.h
+include/hbcompat.ch
+include/hbcompat.h
+include/hbcompdf.h
 include/hbdate.h
 include/hbdbf.h
 include/hbdbferr.h
@@ -24,21 +59,25 @@ include/hbdbsort.h
 include/hbdebug.ch
 include/hbdefs.h
 include/hberrors.h
-include/hbexpra.c
-include/hbexprb.c
-include/hbexprc.c
 include/hbexprop.h
 include/hbextern.ch
+include/hbfixdj.h
 include/hbgetcmt.ch
+include/hbgfx.ch
+include/hbgfxdef.ch
+include/hbgtcore.h
+include/hbgtinfo.ch
 include/hbhash.h
 include/hbinit.h
 include/hbinkey.ch
 include/hblang.ch
 include/hbmacro.ch
 include/hbmacro.h
+include/hbmath.ch
 include/hbmath.h
 include/hbmemory.ch
 include/hbmemvar.ch
+include/hbmzip.ch
 include/hboo.ch
 include/hbpcode.h
 include/hbpers.ch
@@ -50,185 +89,83 @@ include/hbrdddel.h
 include/hbrddfpt.h
 include/hbrddntx.h
 include/hbrddsdf.h
-include/hbrddwrk.h
+include/hbregex.h
 include/hbset.h
 include/hbsetup.ch
 include/hbsetup.h
+include/hbsix.ch
 include/hbstack.h
+include/hbstdgen.ch
+include/hbsxdef.ch
+include/hbsxfunc.h
 include/hbtrace.h
 include/hbtypes.h
 include/hbundoc.api
+include/hbusrrdd.ch
 include/hbver.h
 include/hbvm.h
+include/hbvmopt.h
 include/hbvmpub.h
-lib/libcodepage.a
-lib/libcommon.a
-lib/libct.a
-lib/libdbfcdx.a
-lib/libdbfdbt.a
-lib/libdbffpt.a
-lib/libdbfntx.a
-lib/libdebug.a
-lib/libgt.a
+include/hbvpdf.ch
+include/hbwince.h
+include/hbxvm.h
+include/hbzlib.ch
+include/hbzlib.h
+include/inkey.ch
+include/item.api
+include/memoedit.ch
+include/msql.ch
+include/ord.ch
+include/rdd.api
+include/rddsys.ch
+include/reserved.ch
+include/set.ch
+include/setcurs.ch
+include/simpleio.ch
+include/std.ch
+include/tbrowse.ch
+include/thtml.ch
+include/time87.ch
+include/tip.ch
+include/vm.api
+include/xhb.ch
 lib/libgtcgi.a
 lib/libgtcrs.a
 lib/libgtpca.a
 lib/libgtsln.a
 lib/libgtstd.a
-lib/libhtml.a
-lib/liblang.a
-lib/libmacro.a
-lib/libmisc.a
-lib/libnulsys.a
-lib/libpp.a
-lib/librdd.a
-lib/librtl.a
-lib/libsamples.a
-lib/libvm.a
-%%PORTDOCS%%%%DOCSDIR%%/c_std.txt
-%%PORTDOCS%%%%DOCSDIR%%/class_tp.txt
-%%PORTDOCS%%%%DOCSDIR%%/cmdline.txt
-%%PORTDOCS%%%%DOCSDIR%%/codebloc.txt
-%%PORTDOCS%%%%DOCSDIR%%/codestyl.txt
-%%PORTDOCS%%%%DOCSDIR%%/dirstruc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/array.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/binnum.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/browse.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/clipper.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/cmdline.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/command.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/compiler.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/datetime.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/dbdelim.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/dbsdf.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/dbstrux.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/dir.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/diskspac.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/error.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/eval.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/file.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/garbage.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/gnulice.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/gtslang.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/harbext.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_api.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apier.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apifs.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apigt.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apiit.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apiln.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_apird.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_compa.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_date.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_macro.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_set.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hb_vm.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/hvm.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/idle.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/input.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/lang.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/macro.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/math.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/memo.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/memvar2.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/menu.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/nation.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/objfunc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/rdd.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/rdddb.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/rddmisc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/rddord.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/sayget.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/set.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/setmode.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/string.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/strotype.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/subcodes.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/tbrowse.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/tclass.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/terminal.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/tgetlist.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/tlabel.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/treport.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/var.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/array.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/binnum.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/browse.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/clipper.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/cmdline.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/codebloc.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/command.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/compiler.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/datetime.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/dbdelim.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/dbsdf.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/dbstrux.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/dir.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/dirstruc.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/diskspac.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/error.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/eval.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/garbage.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/gnulice.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/harbext.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/hb_set.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/hbpplib.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/hvm.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/howtobsd.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/idle.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/input.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/lang.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/macro.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/math.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/memo.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/memvar2.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/misc.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/nation.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/objfunc.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/pcode.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/pragma.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/rdd.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/sayget.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/setmode.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/simplex.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/statics.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/subcodes.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/strotype.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/tbrowse.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/tclass.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/tgetlist.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/tlabel.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/tracing.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/treport.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/var.txt
-%%PORTDOCS%%%%DOCSDIR%%/es/vm.txt
-%%PORTDOCS%%%%DOCSDIR%%/funclist.txt
-%%PORTDOCS%%%%DOCSDIR%%/gmake.txt
-%%PORTDOCS%%%%DOCSDIR%%/gtapi.txt
-%%PORTDOCS%%%%DOCSDIR%%/hbmake.txt
-%%PORTDOCS%%%%DOCSDIR%%/hbpplib.txt
-%%PORTDOCS%%%%DOCSDIR%%/hdr_tpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/howtobsd.txt
-%%PORTDOCS%%%%DOCSDIR%%/howtocvs.txt
-%%PORTDOCS%%%%DOCSDIR%%/howtomak.txt
-%%PORTDOCS%%%%DOCSDIR%%/hrb_faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/lang_id.txt
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/pcode.txt
-%%PORTDOCS%%%%DOCSDIR%%/pragma.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/simplex.txt
-%%PORTDOCS%%%%DOCSDIR%%/statics.txt
-%%PORTDOCS%%%%DOCSDIR%%/tracing.txt
-%%PORTDOCS%%%%DOCSDIR%%/transfrm.txt
-%%PORTDOCS%%%%DOCSDIR%%/vm.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/windll.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/libgttrm.a
+lib/libhbbmcdx.a
+lib/libhbbtree.a
+lib/libhbclipsm.a
+lib/libhbcommon.a
+lib/libhbcpage.a
+lib/libhbcplr.a
+lib/libhbct.a
+lib/libhbdebug.a
+lib/libhbextern.a
+lib/libhbgt.a
+lib/libhbhsx.a
+lib/libhblang.a
+lib/libhbmacro.a
+lib/libhbmisc.a
+lib/libhbmsql.a
+lib/libhbmzip.a
+lib/libhbnf.a
+lib/libhbnulrdd.a
+lib/libhbpcre.a
+lib/libhbpp.a
+lib/libhbrdd.a
+lib/libhbrtl.a
+lib/libhbsix.a
+lib/libhbtip.a
+lib/libhbusrrdd.a
+lib/libhbvm.a
+lib/libhbvpdf.a
+lib/libhbziparc.a
+lib/libhbzlib.a
+lib/librddado.a
+lib/librddcdx.a
+lib/librddfpt.a
+lib/librddntx.a
+lib/libxhb.a