remove ports-tree-gcc4 workarounds, use REVISION, etc. ok jsg@

devel/llvm/Makefile

@@ -1,20 +1,17 @@
-# $OpenBSD: Makefile,v 1.22 2010/07/09 08:45:11 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/21 22:19:01 sthen Exp $
 
 COMMENT =	Low Level Virtual Machine (LLVM) compiler infrastructure
 
 LLVM_V =	2.7
 DISTNAME =	llvm-${LLVM_V}
-PKGNAME =	${DISTNAME}p1
+REVISION =	2
 
 CATEGORIES =	devel
 
 HOMEPAGE =	http://www.llvm.org/
 
 VMEM_WARNING =	Yes
-# has built ok on these, at least at one point
-ONLY_FOR_ARCHS =i386 amd64 powerpc hppa
-# didn't work when tested
-NOT_FOR_ARCHS =	sparc64
+ONLY_FOR_ARCHS =${GCC4_ARCHS}
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
@@ -22,7 +19,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	c m pthread
+WANTLIB =	c elf m pthread stdc++
 
 MASTER_SITES =	http://llvm.org/releases/${LLVM_V}/
 
@@ -31,11 +28,9 @@ DISTFILES= ${DISTNAME}.tgz clang-${LLVM_V}.tgz
 post-extract:
 	@mv ${WRKDIR}/clang-${LLVM_V} ${WRKDIST}/tools/clang
 
-MODULES =	gcc4 lang/python
-MODGCC4_LANGS =	c c++
-MODGCC4_ARCHES =*
+MODULES =	lang/python
 
-LIB_DEPENDS =	elf::devel/libelf
+LIB_DEPENDS =	::devel/libelf
 
 # graphviz can be optionally used to draw graphs, but adds heavy build and
 # run dependencies, and this feature is often not needed. lie to autoconf
@@ -57,7 +52,7 @@ SEPARATE_BUILD =	simple
 USE_GMAKE =		Yes
 USE_LIBTOOL =		Yes
 
-# also supports cmake, but requires v2.6.1
+# also supports cmake
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--enable-bindings=no \
 			--enable-libffi=no \
@@ -67,21 +62,10 @@ MODGNU_CONFIG_GUESS_DIRS =  ${WRKSRC}/autoconf
 
 .include <bsd.own.mk>
 
-.if ${COMPILER_VERSION} == "gcc3"
-PATCH_LIST +=		patch-* gcc3-*
-.endif
-
 pre-configure:
 	@perl -pi -e s,-lpthread,-pthread,g ${WRKSRC}/configure
 	@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
 	@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
-.if ${COMPILER_VERSION:L} == "gcc3"
-	@perl -pi -e 's,-L/usr/lib/gcc-lib/,-L${LOCALBASE}/lib/gcc/,;' \
-	    -e 's,  "/4.2.1,  "/4.2.4,;' \
-	    ${WRKSRC}/tools/clang/lib/Driver/Tools.cpp
-	@perl -pi -e 's,/usr/include/g\+\+,${LOCALBASE}/include/c++/4.2.4,' \
-	    ${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
-.endif
 
 post-install:
 	@ln -s ${TRUEPREFIX}/libexec/clang-cc ${PREFIX}/bin

devel/llvm/patches/gcc3-tools_clang_lib_Driver_Tools_cpp

@@ -1,16 +0,0 @@
-$OpenBSD: gcc3-tools_clang_lib_Driver_Tools_cpp,v 1.1 2010/06/12 12:15:08 sthen Exp $
---- tools/clang/lib/Driver/Tools.cpp.orig	Sun Mar  7 05:46:18 2010
-+++ tools/clang/lib/Driver/Tools.cpp	Wed Apr 28 21:14:33 2010
-@@ -2581,6 +2586,12 @@ void openbsd::Link::ConstructJob(Compilation &C, const
- 
-   if (!Args.hasArg(options::OPT_nostdlib) &&
-       !Args.hasArg(options::OPT_nodefaultlibs)) {
-+    if (D.CCCIsCXX) {
-+      CmdArgs.push_back("-L/usr/local/lib");
-+      CmdArgs.push_back("-lestdc++");
-+      CmdArgs.push_back("-lm");
-+    }
-+
-     // FIXME: For some reason GCC passes -lgcc before adding
-     // the default system libraries. Just mimic this for now.
-     CmdArgs.push_back("-lgcc");