ports/117011: [patch] update lang/llvm-gcc4 to 2.1

[Emil Mikulic]

>Number:         117011
>Category:       ports
>Synopsis:       [patch] update port lang/llvm-gcc4 to 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 08 10:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Emil Mikulic
>Release:        
>Organization:
>Environment:
>Description:
	This goes with the devel/llvm update to v2.1, which brooks@
	already committed.

>How-To-Repeat:
>Fix:

diff -Nur /usr/ports/lang/llvm-gcc4.orig/Makefile /usr/ports/lang/llvm-gcc4/Makefile
--- /usr/ports/lang/llvm-gcc4.orig/Makefile	Sat Sep 22 19:11:59 2007
+++ /usr/ports/lang/llvm-gcc4/Makefile	Fri Sep 28 12:39:27 2007
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gcc4
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMEPREFIX=	llvm-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}.source
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}.0-${PORTVERSION}.source
 
 MAINTAINER=	fjoe at FreeBSD.org
 COMMENT=	gcc4 frontend for LLVM
@@ -48,8 +47,10 @@
 		llvm-gcc/gccint
 MAN1=		llvm-cpp.1 llvm-g++.1 llvm-gcc.1 llvm-gcov.1
 
-post-patch:
+post-extract:
 	@${MKDIR} ${WRKSRC}
+
+post-patch:
 	@${REINPLACE_CMD} -e 's,LLVMBASEPATH/Release/bin/llc,LLVMBASEPATH/bin/llc,'\
 	   	 ${WRKSRC}/../gcc/configure\
 		 ${WRKSRC}/../libcpp/configure
diff -Nur /usr/ports/lang/llvm-gcc4.orig/distinfo /usr/ports/lang/llvm-gcc4/distinfo
--- /usr/ports/lang/llvm-gcc4.orig/distinfo	Thu Jul 26 04:56:38 2007
+++ /usr/ports/lang/llvm-gcc4/distinfo	Fri Sep 28 12:26:09 2007
@@ -1,3 +1,3 @@
-MD5 (llvm-gcc4-2.0.source.tar.gz) = 648b6e1e73d770bbef2712b16a993548
-SHA256 (llvm-gcc4-2.0.source.tar.gz) = 4aa3a4de67ce766bde8c206a8f65886a39e22d91f9b7f0df50456f1994942176
-SIZE (llvm-gcc4-2.0.source.tar.gz) = 36578916
+MD5 (llvm-gcc4.0-2.1.source.tar.gz) = b2592f6d4010f7128ff29eb8bffa3896
+SHA256 (llvm-gcc4.0-2.1.source.tar.gz) = 9bfe4ffb5d4db6564944381b58c65dfb1c38f1866d5a0cb1565721b3eb9de56f
+SIZE (llvm-gcc4.0-2.1.source.tar.gz) = 36597285
diff -Nur /usr/ports/lang/llvm-gcc4.orig/files/patch-gcc::config::freebsd.h /usr/ports/lang/llvm-gcc4/files/patch-gcc::config::freebsd.h
--- /usr/ports/lang/llvm-gcc4.orig/files/patch-gcc::config::freebsd.h	Thu Jan  1 10:00:00 1970
+++ /usr/ports/lang/llvm-gcc4/files/patch-gcc::config::freebsd.h	Fri Sep 28 12:42:41 2007
@@ -0,0 +1,18 @@
+Author: asl
+Date: Wed Sep 26 02:36:55 2007
+New Revision: 42351
+
+Log:
+FreeBSD really supports #pragma pack(push). This fixes PR1702
+
+==============================================================================
+--- ../gcc/config/freebsd.h (original)
++++ ../gcc/config/freebsd.h Wed Sep 26 02:36:55 2007
+@@ -85,3 +85,7 @@
+    This enables the test coverage code to use file locking when exiting a
+    program, which avoids race conditions if the program has forked.  */
+ #define TARGET_HAS_F_SETLKW
++
++/* LLVM LOCAL begin */
++#define HANDLE_PRAGMA_PACK_PUSH_POP
++/* LLVM LOCAL end */
>Release-Note:
>Audit-Trail:
>Unformatted: