From d1164b8b6ddd65404819299fb77e56682ed7af7d Mon Sep 17 00:00:00 2001
From: Anthony Martin <ality@pbrane.org>
Date: Mon, 21 Feb 2011 12:12:28 -0800
Subject: [PATCH] Fix build: encoding/line fork removal; new Go release.

---
 build.pl          | 5 +----
 website/Makefile  | 2 --
 website/camweb.go | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/build.pl b/build.pl
index 22b75c95a..ca168d372 100755
--- a/build.pl
+++ b/build.pl
@@ -242,7 +242,7 @@ TARGET: server/go/sigserver
     - lib/go/ext/openpgp/armor
 
 TARGET: website
-    - lib/go/line
+    # (no deps)
 
 TARGET: clients/go/camput
     - lib/go/client
@@ -258,9 +258,6 @@ TARGET: clients/go/camget
 TARGET: lib/go/http
     # (no deps, fork of Go's http library)
 
-TARGET: lib/go/line
-    # (no deps, fork of Go's encoding/line library)
-
 TARGET: lib/go/ext/openpgp/error
     # (no deps)
 
diff --git a/website/Makefile b/website/Makefile
index b290818cb..68ac434a3 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -1,7 +1,5 @@
 include $(GOROOT)/src/Make.inc
 
-PREREQ=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)/camli/encoding/line.a
-
 TARG=camweb
 GOFILES=\
 	camweb.go\
diff --git a/website/camweb.go b/website/camweb.go
index 21739a143..eac9ad0b0 100644
--- a/website/camweb.go
+++ b/website/camweb.go
@@ -100,7 +100,7 @@ func writeText(w io.Writer, text []byte, html bool) {
 
 func applyTemplate(t *template.Template, name string, data interface{}) []byte {
 	var buf bytes.Buffer
-	if err := t.Execute(data, &buf); err != nil {
+	if err := t.Execute(&buf, data); err != nil {
 		log.Printf("%s.Execute: %s", name, err)
 	}
 	return buf.Bytes()
@@ -117,7 +117,7 @@ func servePage(w http.ResponseWriter, title, subtitle string, content []byte) {
 		content,
 	}
 
-	if err := pageHtml.Execute(&d, w); err != nil {
+	if err := pageHtml.Execute(w, &d); err != nil {
 		log.Printf("godocHTML.Execute: %s", err)
 	}
 }