Update to 6.4.9.005.1.

This is hairy as Compaq is now putting out dynamic binary rather than static
ones.  This makes my job harder with faking out this Linux compiler.

Submitted by:	gallatin

3 files changed, 20 insertions, 11 deletions

diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile
index 6510af2f858..c31cf974ddc 100644
--- a/lang/compaq-cc/Makefile
+++ b/lang/compaq-cc/Makefile
@@ -7,15 +7,15 @@
 #
 
 PORTNAME=	compaq-cc
-PORTVERSION=	6.2.9.506.1
+PORTVERSION=	6.4.9.005.1
 PORTREVISION=	2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.compaq.com/pub/products/C-CXX/linux/compaq_c_v62/
-DISTFILES=	ccc-6.2.9.506-1.alpha.rpm libots-2.2.7-2.alpha.rpm
+MASTER_SITES=	ftp://ftp.compaq.com/pub/products/C-CXX/linux/compaq_c/
+DISTFILES=	ccc-6.4.9.005-1.alpha.rpm libots-2.2.7-2.alpha.rpm
 .if defined(WANT_EV6)
-DISTFILES+=	cpml_ev6-5.1.0-2.alpha.rpm
+DISTFILES+=	cpml_ev6-5.1.0-4.alpha.rpm
 .else
-DISTFILES+=	cpml_ev5-5.1.0-2.alpha.rpm
+DISTFILES+=	cpml_ev5-5.1.0-4.alpha.rpm
 .endif
 
 MAINTAINER=	obrien@FreeBSD.org
@@ -29,7 +29,7 @@ ONLY_FOR_ARCHS=	alpha
 PREFIX=		/
 LIBOTS_REV=	libots-2.2.7
 CPML_REV=	cpml-5.1.0
-CCC_REV=	ccc-6.2.9.506-1
+CCC_REV=	ccc-6.4.9.005-1
 CCC_DIR=	usr/lib/compaq/${CCC_REV}
 CCC_ROOT=	${PREFIX}/${CCC_DIR}
 PLIST_SUB=	CCC_REV=${CCC_REV} CPML_REV=${CPML_REV} LIBOTS_REV=${LIBOTS_REV}
@@ -67,12 +67,12 @@ do-install:
 	cd ${CCC_ROOT}/alpha-linux/bin	\
 	    ; ${MV} lnxcc_driver lnxcc_driver.Linux			\
 	    ; ${SED} -e 's/-dynamic-linker/-g             /g'		\
-		     -e 's|/lib/ld-linux.so.2|-g                |g'	\
 		     -e 's|-D__linux__|-D__FreeBSD|g'			\
 		     -e 's|-D__linux....|-D__FreeBSD__|g'		\
 		     -e 's|-Dlinux|-D_____|g'				\
 		lnxcc_driver.Linux >lnxcc_driver			\
 		; ${CHMOD} 555 lnxcc_driver
+
 # the shared libs gives us trouble right now, so only offer .a's
 	${RM} ${PREFIX}/usr/lib/libots.so
 	${RM} ${PREFIX}/usr/lib/libcpml.so
@@ -80,6 +80,12 @@ do-install:
 	cd ${WRKSRC}							\
 	    ; ccc -c ${FILESDIR}/*.c					\
 	    ; ar vq /usr/lib/compaq/cpml-5.1.0/libcpml_ev5.a *.o
+# create /lib/ld-linux.so.2 becausing nulling it out in the (dynamic)
+# compiler binary prevents it from running
+	cd ${WRKSRC}							\
+	    ; cp  /dev/null ld-linux.c					\
+	    ; mkdir -p ${PREFIX}/lib					\
+	    ; cc -c ld-linux.c -o ${PREFIX}/lib/ld-linux.so.2		\
 # cpio creates directories with stupid permissions
 	find ${PREFIX}/usr/lib/compaq -type d | xargs ${CHMOD} 755
 # tweaks to compile FreeBSD bits better
@@ -116,6 +122,8 @@ post-install:
 	cd ${PREFIX} ;\
 	    find ${CCC_DIR}/alpha-linux -type f -o -type l \
 	    					>${WRKDIR}/PLIST.alphalinux
+	${ECHO} "lib/ld-linux.so.2"		>>${WRKDIR}/PLIST.alphalinux
+	${ECHO} "@dirrm lib"		>>${WRKDIR}/PLIST.alphalinux
 	cd ${PREFIX} ;\
 	    find ${CCC_DIR}/alpha-linux -type d \
 	    | sed -e 's/^/@dirrm /g' \
diff --git a/lang/compaq-cc/distinfo b/lang/compaq-cc/distinfo
index 41af9d830b9..ca34335f6eb 100644
--- a/lang/compaq-cc/distinfo
+++ b/lang/compaq-cc/distinfo
@@ -1,5 +1,4 @@
-MD5 (ccc-6.2.9.506-1.alpha.rpm) = 500b1e51f6a22573b5db7be3b1f88ec6
-MD5 (cxx-6.3.9.7-1.alpha.rpm) = b7a38b079033199c77caed8111751643
+MD5 (ccc-6.4.9.005-1.alpha.rpm) = 2bbbe8f9682e337b6ba8e2b6b093246d
+MD5 (cpml_ev5-5.1.0-4.alpha.rpm) = 0e0f6b8e233d2114174be21e7c8cf581
+MD5 (cpml_ev6-5.1.0-4.alpha.rpm) = 8ccc4d30cfa8d9e048339446ac3de433
 MD5 (libots-2.2.7-2.alpha.rpm) = 4b6337865c798f821850e20502964ae0
-MD5 (cpml_ev5-5.1.0-2.alpha.rpm) = cd73ae438798748ebfb351d34014078c
-MD5 (cpml_ev6-5.1.0-2.alpha.rpm) = 561375e82f5c8c542bd6e426564dfb31
diff --git a/lang/compaq-cc/files/include/stdio.h b/lang/compaq-cc/files/include/stdio.h
index c18700deed8..e2fa9853eb2 100644
--- a/lang/compaq-cc/files/include/stdio.h
+++ b/lang/compaq-cc/files/include/stdio.h
@@ -20,7 +20,9 @@
  * *                                                               *
  * *****************************************************************
  */
+#define __attribute__(x)
 #include_next <stdio.h>
+#undef __attribute__
 #undef NULL
 #ifdef __cplusplus
 #define NULL 0