- Update to 1.103

- Switch to the native version of HLA's stdlib

lang/hla/Makefile

@@ -7,17 +7,17 @@
 #
 
 PORTNAME=	hla
-PORTVERSION=	1.102
+PORTVERSION=	1.103
 CATEGORIES=	lang
 MASTER_SITES=	http://webster.cs.ucr.edu/AsmTools/HLA/HLAv${PORTVERSION}/:src \
 		http://www.gahr.ch/FreeBSD/HLA/:extra
-PKGNAMEPREFIX=	linux-
 DISTFILES=	${PORTNAME}src${EXTRACT_SUFX}:src \
+		bsd.hla.tar.gz:src \
 		HLARef_html${EXTRACT_SUFX}:src \
-		HLAStdlib_html${EXTRACT_SUFX}:src \
-		linux.${PORTNAME}.tar.gz:src\
+		HLAstdlib_html${EXTRACT_SUFX}:src \
     		lex.yy.c:extra \
     		hello.hla:extra
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}src${EXTRACT_SUFX}
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -25,9 +25,8 @@ COMMENT=	High Level Assembly
 
 USE_ZIP=	yes
 USE_BISON=	build
-USE_LINUX=	yes
 
-WRKSRC=		${WRKDIR}/hlasrc/working
+WRKSRC=		${WRKDIR}/hlasrc/trunk/trunk
 MAKEFILE=	makefile.bsd
 ALL_TARGET=	hlaparse hla
 
@@ -35,15 +34,15 @@ ONLY_FOR_ARCHS=	i386
 
 post-extract:
 	${MKDIR} ${WRKDIR}/stdlib && \
-	    ${TAR} -zxf ${DISTDIR}/linux.${PORTNAME}.tar.gz -C ${WRKDIR}/stdlib
-	${CP} ${DISTDIR}/lex.yy.c ${WRKSRC}
-	${CP} ${DISTDIR}/hello.hla ${WRKSRC}
+	    ${TAR} -zxf ${_DISTDIR}/bsd.${PORTNAME}.tar.gz -C ${WRKDIR}/stdlib
+	${CP} ${_DISTDIR}/lex.yy.c ${WRKSRC}
+	${CP} ${_DISTDIR}/hello.hla ${WRKSRC}
 .if !defined(NOPORTDOCS)
-	(${MKDIR} ${WRKDIR}/HLAStdlib && \
-	    ${UNZIP_CMD} -q ${DISTDIR}/HLAStdlib_html${EXTRACT_SUFX} -d ${WRKDIR}/HLAStdlib \
+	(${MKDIR} ${WRKDIR}/HLAstdlib && \
+	    ${UNZIP_CMD} -q ${DISTDIR}/HLAstdlib_html${EXTRACT_SUFX} -d ${WRKDIR}/HLAstdlib \
 	)
 	(${MKDIR} ${WRKDIR}/HLAReference && \
-	    ${UNZIP_CMD} -q ${DISTDIR}/HLARef_html${EXTRACT_SUFX} -d ${WRKDIR}/HLAReference \
+	    ${UNZIP_CMD} -q ${_DISTDIR}/HLARef_html${EXTRACT_SUFX} -d ${WRKDIR}/HLAReference \
 	)
 .endif
 
@@ -58,21 +57,20 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hlaparse ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/stdlib/hla/hlalib/hlalib.a ${PREFIX}/lib
 	${INSTALL} -d ${PREFIX}/include/hla
-	(cd ${WRKDIR}/stdlib/hla/include && ${COPYTREE_SHARE} \* ${PREFIX}/include/hla)
+	(cd ${WRKDIR}/stdlib/hla/include/include && ${COPYTREE_SHARE} \* ${PREFIX}/include/hla)
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d ${DOCSDIR}/Reference
-	${INSTALL} -d ${DOCSDIR}/Stdlib
+	${INSTALL} -d ${DOCSDIR}/stdlib
 	(cd ${WRKDIR}/HLAReference && ${COPYTREE_SHARE} \* ${DOCSDIR}/Reference)
-	(cd ${WRKDIR}/HLAStdlib && ${COPYTREE_SHARE} \* ${DOCSDIR}/Stdlib)
+	(cd ${WRKDIR}/HLAstdlib && ${COPYTREE_SHARE} \* ${DOCSDIR}/stdlib)
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Testing HLA installation..."
 	@( \
 	    hlainc=${PREFIX}/include/hla hlalib=${PREFIX}/lib/hlalib.a \
 	    ${WRKSRC}/hla ${WRKSRC}/hello.hla && \
-	    ${BRANDELF} -t Linux ${WRKSRC}/hello && \
 	    ${WRKSRC}/hello \
 	)
 	@${ECHO_MSG} ""
@@ -80,10 +78,5 @@ post-install:
 	@${ECHO_MSG} "hlainc -> ${PREFIX}/include/hla"
 	@${ECHO_MSG} "hlalib -> ${PREFIX}/lib/hlalib.a"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Remember that your executables must be run under the Linux ABI:"
-	@${ECHO_MSG} "> hla hello.hla"
-	@${ECHO_MSG} "> brandelf -t Linux hello"
-	@${ECHO_MSG} "> ./hello"
-	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>

lang/hla/distinfo

@@ -1,18 +1,18 @@
-MD5 (hlasrc.zip) = 3db32046b0e5c060f5ff7fe9e8b3143e
-SHA256 (hlasrc.zip) = d3b5fc5cd528e6d6dfb9fa315fdf26ddf692dbdfd4ee53197a044a07ba714dab
-SIZE (hlasrc.zip) = 1593980
-MD5 (HLARef_html.zip) = 1662e40686b3b8ccaf36b37603dd8b0d
-SHA256 (HLARef_html.zip) = d316833db51a52b47ea3332dfe4e428e253ce33bcd4444a8ce6f5d5cac70af54
-SIZE (HLARef_html.zip) = 251672
-MD5 (HLAStdlib_html.zip) = 4a92b0645bccafcd3b224fbc335ea9bf
-SHA256 (HLAStdlib_html.zip) = bbe5300bb2a3543b4abdac19d5356ad235fb4136325025d20358024126cc3c11
-SIZE (HLAStdlib_html.zip) = 7399757
-MD5 (linux.hla.tar.gz) = abf7079dd2a60c6e115e7d6b51364859
-SHA256 (linux.hla.tar.gz) = d0db31a949b34791704af85082db3fbffe7f48d0a3d7cb9b293ea030b6560b5e
-SIZE (linux.hla.tar.gz) = 1361198
-MD5 (lex.yy.c) = f0003e5c88e1dda651b6d381a19a648d
-SHA256 (lex.yy.c) = bb18f933b161af0cd4d9dee79c84fe010cfa06cd9d34524bd3c8967a908d3a6a
-SIZE (lex.yy.c) = 842708
-MD5 (hello.hla) = 0d068d662e3201f743a4249d86b959f3
-SHA256 (hello.hla) = 661e6f88d870431a49db6ded8aaabf37cc4ab20e5f49f130615e6bb86ece8a4c
-SIZE (hello.hla) = 139
+MD5 (hla/hlasrc.zip) = 15fb8860f2a06253a0b95a98d2f55abb
+SHA256 (hla/hlasrc.zip) = 733c6a9c1ba5b1099e74d2d2b8a9c6582b9871e1ba8279e4df1dd3d302a3c59e
+SIZE (hla/hlasrc.zip) = 7387630
+MD5 (hla/bsd.hla.tar.gz) = e83d1b038bbeecd2984d253b84622c04
+SHA256 (hla/bsd.hla.tar.gz) = fedafa5551a483ee01c3a4f8a21dc71e2d055d3e86c21cc4317495faa769b472
+SIZE (hla/bsd.hla.tar.gz) = 8068509
+MD5 (hla/HLARef_html.zip) = 1662e40686b3b8ccaf36b37603dd8b0d
+SHA256 (hla/HLARef_html.zip) = d316833db51a52b47ea3332dfe4e428e253ce33bcd4444a8ce6f5d5cac70af54
+SIZE (hla/HLARef_html.zip) = 251672
+MD5 (hla/HLAstdlib_html.zip) = 968cee9d97c0f77bc28e502226959005
+SHA256 (hla/HLAstdlib_html.zip) = e9010a755acbcdc88d42d3c10c6e48455665d0fa45f8306defcb2f0eed71e31d
+SIZE (hla/HLAstdlib_html.zip) = 7399757
+MD5 (hla/lex.yy.c) = f0003e5c88e1dda651b6d381a19a648d
+SHA256 (hla/lex.yy.c) = bb18f933b161af0cd4d9dee79c84fe010cfa06cd9d34524bd3c8967a908d3a6a
+SIZE (hla/lex.yy.c) = 842708
+MD5 (hla/hello.hla) = 0d068d662e3201f743a4249d86b959f3
+SHA256 (hla/hello.hla) = 661e6f88d870431a49db6ded8aaabf37cc4ab20e5f49f130615e6bb86ece8a4c
+SIZE (hla/hello.hla) = 139

lang/hla/pkg-descr

@@ -1,6 +1,4 @@
 HLA, the High-Level Assembler lets you write true low-level code
 while enjoying the benefits of high-level language programming.
 
-This port uses the Linux version of the HLA Standard Library.
-
 WWW: http://webster.cs.ucr.edu/AsmTools/HLA/