From 3936e477116310f04cf39e43ffce930b06b64c29 Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Sat, 14 Jan 2012 04:39:49 -0500
Subject: OSX: Use static zlib library again

---
 ports.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports.mk')

diff --git a/ports.mk b/ports.mk
index 5f63d560ef..a2b03571e6 100644
--- a/ports.mk
+++ b/ports.mk
@@ -110,7 +110,7 @@ OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfaad.a
 endif
 
 ifdef USE_ZLIB
-OSX_ZLIB ?= -lz
+OSX_ZLIB ?= $(STATICLIBPATH)/lib/libz.a
 endif
 
 ifdef USE_SPARKLE
-- 
cgit v1.2.3


From c4d9f7beebff75fc88a2da198f585963d0e3ea46 Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Sat, 14 Jan 2012 10:47:27 -0500
Subject: OSX: Fixed some file paths when copying docs to the bundle, and
 updated DS_Store

---
 ports.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ports.mk')

diff --git a/ports.mk b/ports.mk
index a2b03571e6..82239f458d 100644
--- a/ports.mk
+++ b/ports.mk
@@ -165,10 +165,10 @@ osxsnap: bundle
 	mkdir ScummVM-snapshot/doc/it
 	cp $(srcdir)/doc/it/GuidaRapida ./ScummVM-snapshot/doc/it/GuidaRapida
 	mkdir ScummVM-snapshot/doc/no-nb
-	cp $(srcdir)doc/no-nb/HurtigStart ./ScummVM-snapshot/doc/no-nb/HurtigStart
+	cp $(srcdir)/doc/no-nb/HurtigStart ./ScummVM-snapshot/doc/no-nb/HurtigStart
 	mkdir ScummVM-snapshot/doc/se
-	cp $(srcdir)doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
-	cp $(srcdir)doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
+	cp $(srcdir)/doc/se/LasMig ./ScummVM-snapshot/doc/se/LasMig
+	cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart
 	/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/*
 	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/*
-- 
cgit v1.2.3


From 3ae9b947fde55a5ce0d0557b9633b61bb9a43f8b Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 24 Jan 2012 11:40:24 +1100
Subject: BUILD: Add batch script for migration of saved games location in
 Windows NT4 onwards.

---
 ports.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ports.mk')

diff --git a/ports.mk b/ports.mk
index 82239f458d..10b92bcc12 100644
--- a/ports.mk
+++ b/ports.mk
@@ -233,6 +233,8 @@ endif
 	cp /usr/local/bin/SDL.dll $(WIN32PATH)
 	cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
+	cp $(srcdir)/dists/win32/migration.bat $(WIN32PATH)
+	cp $(srcdir)/dists/win32/migration.txt $(WIN32PATH)
 	cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
 	unix2dos $(WIN32PATH)/*.txt
 	unix2dos $(WIN32PATH)/doc/*.txt
-- 
cgit v1.2.3


From 00cc48f83dc28295fb4fb449b5c6ad64219e300a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 28 Jan 2012 21:45:11 +0100
Subject: GUI: Add GNU FreeFont TTFs for use with our modern theme.

---
 ports.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ports.mk')

diff --git a/ports.mk b/ports.mk
index 10b92bcc12..419b91581a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -215,6 +215,7 @@ endif
 	cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
 	cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
 	cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
+	cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
 	cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
 	cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
 	cp $(srcdir)/doc/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt
-- 
cgit v1.2.3