1 files changed, 14 insertions, 21 deletions

diff --git a/lang/hla/Makefile b/lang/hla/Makefile
index 66c0ab47c660..78405882e8c7 100644
--- a/lang/hla/Makefile
+++ b/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>