4 files changed, 6 insertions, 94 deletions

diff --git a/lang/clay/Makefile b/lang/clay/Makefile
index 9ada0ad525e1..3c191363e882 100644
--- a/lang/clay/Makefile
+++ b/lang/clay/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clay
-PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTVERSION=	0.1.2
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/jckarter/${PORTNAME}/tarball/v${PORTVERSION}/
 DISTNAME=	jckarter-${PORTNAME}-v${PORTVERSION}-0-g${GITVERSION}
@@ -23,7 +22,7 @@ OPTIONS_DEFINE=		BINDGEN
 BINDGEN_DESC=		Build with binding generator
 OPTIONS_DEFAULT=	BINDGEN
 
-GITVERSION=	850c5c9
+GITVERSION=	751ebe3
 FETCH_ARGS=	-pRr
 WRKSRC=		${WRKDIR}/jckarter-${PORTNAME}-${GITVERSION}
 
diff --git a/lang/clay/distinfo b/lang/clay/distinfo
index eac2ea65f560..aef9833e114e 100644
--- a/lang/clay/distinfo
+++ b/lang/clay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jckarter-clay-v0.1.1-0-g850c5c9.tar.gz) = 509108be0e703845cd8b48a99bf7723297c09c0faf75799a81f6103b9a523b97
-SIZE (jckarter-clay-v0.1.1-0-g850c5c9.tar.gz) = 2836566
+SHA256 (jckarter-clay-v0.1.2-0-g751ebe3.tar.gz) = fdb460383c3dbed14cbcd9b2687d6120215e539fa87840fd5247ba599903f857
+SIZE (jckarter-clay-v0.1.2-0-g751ebe3.tar.gz) = 2834720
diff --git a/lang/clay/files/patch-git9ee1902 b/lang/clay/files/patch-git9ee1902
deleted file mode 100644
index b1b9059b8134..000000000000
--- a/lang/clay/files/patch-git9ee1902
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git ./CMakeLists.txt ./CMakeLists.txt
-index fce24ac..dabedff 100644
---- ./CMakeLists.txt
-+++ ./CMakeLists.txt
-@@ -23,8 +23,8 @@ if(UNIX)
-         OUTPUT_VARIABLE LLVM_VERSION
-         OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
--    if(NOT ${LLVM_VERSION} STREQUAL "3.0")
--        message(FATAL_ERROR "Clay requires LLVM 3.0.")
-+    if(NOT ${LLVM_VERSION} STREQUAL "3.1")
-+        message(FATAL_ERROR "Clay requires LLVM 3.1.")
-     endif()
- 
-     execute_process(
-diff --git ./compiler/src/codegen.cpp ./compiler/src/codegen.cpp
-index fb66668..59055b9 100644
---- ./compiler/src/codegen.cpp
-+++ ./compiler/src/codegen.cpp
-@@ -956,9 +956,7 @@
-     case STRING_LITERAL : {
-         StringLiteral *x = (StringLiteral *)expr.ptr();
-         llvm::Constant *initializer =
--            llvm::ConstantArray::get(llvm::getGlobalContext(),
--                                     x->value,
--                                     true);
-+            llvm::ConstantDataArray::getString(llvm::getGlobalContext(), x->value, true);
-         TypePtr type = arrayType(int8Type, x->value.size() + 1);
-         ostringstream symbolName;
-         symbolName << "StringConstant " << x->value << " clay";
-@@ -2775,7 +2773,7 @@
- 
-     if(!llvm::ParseAssembly(buf, llvmModule, err,
-                 llvm::getGlobalContext())) {
--        err.Print("\n", out);
-+        err.print("\n", out);
-         std::cerr << out.str() << std::endl;
-         error("llvm assembly parse error");
-     }
-@@ -6151,7 +6149,7 @@
-                              llvm::getGlobalContext())) {
-         string errBuf;
-         llvm::raw_string_ostream errOut(errBuf);
--        err.Print("\n", errOut);
-+        err.print("\n", errOut);
-         std::cerr << errOut.str() << std::endl;
-         error("llvm assembly parse error");
-     }
-@@ -6459,7 +6457,7 @@
-     llvm::CodeModel::Model codeModel = llvm::CodeModel::Default;
- 
-     llvm::TargetMachine *targetMachine = target->createTargetMachine(
--        targetTriple, "", "", reloc, codeModel);
-+        targetTriple, "", "", llvm::TargetOptions(), reloc, codeModel);
- 
-     if (targetMachine != NULL) {
-         llvmTargetData = targetMachine->getTargetData();
-diff --git ./compiler/src/main.cpp ./compiler/src/main.cpp
-index 9e73160..85941b9 100644
---- ./compiler/src/main.cpp
-+++ ./compiler/src/main.cpp
-@@ -119,7 +119,7 @@ static void generateAssembly(llvm::Module *module,
-                              bool debug)
- {
-     if (optLevel < 2 || debug)
--        llvm::NoFramePointerElim = true;
-+        targetMachine->Options.NoFramePointerElim = 1;
- 
-     llvm::FunctionPassManager fpasses(module);
- 
-@@ -366,7 +366,7 @@ int main2(int argc, char **argv, char const* const* envp) {
- 
-     string clayFile;
-     string outputFile;
--    string targetTriple = llvm::sys::getHostTriple();
-+    string targetTriple = llvm::sys::getDefaultTargetTriple();
- 
-     string clayScriptImports;
-     string clayScript;
-@@ -553,7 +553,7 @@ int main2(int argc, char **argv, char const* const* envp) {
-                 llvm::errs() << "error: target name missing after -target\n";
-                 return 1;
-             }
--            crossCompiling = targetTriple != llvm::sys::getHostTriple();
-+            crossCompiling = targetTriple != llvm::sys::getDefaultTargetTriple();
-         }
-         else if (strstr(argv[i], "-Wl") == argv[i]) {
-             linkerFlags += argv[i] + strlen("-Wl");
diff --git a/lang/clay/pkg-plist b/lang/clay/pkg-plist
index ba033e13a1da..76097af07056 100644
--- a/lang/clay/pkg-plist
+++ b/lang/clay/pkg-plist
@@ -177,7 +177,8 @@ lib/lib-clay/libc/generated/generated_from_win32.h
 lib/lib-clay/libc/libc.freebsd.clay
 lib/lib-clay/libc/libc.linux.clay
 lib/lib-clay/libc/libc.macosx.clay
-lib/lib-clay/libc/libc.windows.clay
+lib/lib-clay/libc/libc.windows.32.clay
+lib/lib-clay/libc/libc.windows.64.clay
 lib/lib-clay/llvm/libclang/generated/Makefile
 lib/lib-clay/llvm/libclang/generated/generated.clay
 lib/lib-clay/llvm/libclang/generated/generated_from.h