From 5ff29dc57e2877a14e705d09b7042cddf4165d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 6 Mar 2013 15:27:23 -0300
Subject: Remove everything to start from scratch

---
 pkg/osx/README.rst | 60 ------------------------------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 pkg/osx/README.rst

(limited to 'pkg/osx/README.rst')

diff --git a/pkg/osx/README.rst b/pkg/osx/README.rst
deleted file mode 100644
index 48d96ffb..00000000
--- a/pkg/osx/README.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-environment setup in osx
-========================
-(I rm'd my README by mistake at some point. Re-do).
-
-basically you need this to setup your environment:
-
-# check and consolidate
-
-# install xcode and macports 
-# port -v selfupdate
-# port install python26
-# port install python_select  # unneeded?
-# port install py26-pyqt4
-# port install py26-twisted
-# port install py26-pip
-# port install py26-virtualenv
-# port install git-core
-# port install gnutls
-# port install platypus
-
-Requirements
-============
-pyinstaller (in ~/pyinstaller)
-platypus (tested with latest macports)
-
-... + install environment as usual,
-      inside virtualenv.
-
-.. note:: there is something missing here, about troubles building gnutls extension,
-          I think I ended by symlinking global install via macports.
-
-Pyinstaller fix for sip api
----------------------------
-We need a workaround for setting the right sip api.
-Paste this in the top of pyinstaller/support/rthooks/pyi_rth_qt4plugins.py::
-
-    import sip
-    sip.setapi('QString', 2)
-    sip.setapi('QVariant', 2)
-
-See www.pyinstaller.org/wiki/Recipe/PyQtChangeApiVersion.
-
-Building the package
-====================
-
-Building the binary
--------------------
-We use the scripts in openvpn/build.zsh
-The packaging Makefile is expecting the final binary in the location::
-
-    ../../openvpn/build/openvpn.leap
-
-Running the build
------------------
-IMPORTANT: activate the VIRTUALENV FIRST!
-(you will get an import error otherwise)
-
-For running all steps at once::
-
-    make pkg
-- 
cgit v1.2.3


From b6de685a52c2715adfc639925a9ddac364cd4f00 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 20 Mar 2013 21:05:01 +0900
Subject: re-add osx pyinstaller build scripts

---
 pkg/osx/README.rst | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkg/osx/README.rst

(limited to 'pkg/osx/README.rst')

diff --git a/pkg/osx/README.rst b/pkg/osx/README.rst
new file mode 100644
index 00000000..af5f7668
--- /dev/null
+++ b/pkg/osx/README.rst
@@ -0,0 +1,45 @@
+environment setup in osx
+========================
+(I rm'd my README by mistake at some point. Re-do).
+
+basically you need this to setup your environment:
+
+# check and consolidate
+
+# install xcode and macports 
+# port -v selfupdate
+# port install python26
+# port install python_select
+# port select python python26
+# port install py26-pyqt4
+# port install py26-pip
+# port install py26-virtualenv
+# port install git-core
+# port install platypus
+
+Requirements
+============
+pyinstaller (in ~/pyinstaller)
+platypus (tested with latest macports)
+
+... + install environment as usual,
+      inside virtualenv.
+
+Building the package
+====================
+
+Building the binary
+-------------------
+We use the scripts in openvpn/build.zsh
+The packaging Makefile is expecting the final binary in the location::
+
+    ../../openvpn/build/openvpn.leap
+
+Running the build
+-----------------
+IMPORTANT: activate the VIRTUALENV FIRST!
+(you will get an import error otherwise)
+
+For running all steps at once::
+
+    make pkg
-- 
cgit v1.2.3


From abe441f6f0e48d0dd20d5e8f60dd7cbeba647102 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 21 Mar 2013 21:14:33 +0900
Subject: update pyinstaller install

---
 pkg/osx/README.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'pkg/osx/README.rst')

diff --git a/pkg/osx/README.rst b/pkg/osx/README.rst
index af5f7668..03aac4f2 100644
--- a/pkg/osx/README.rst
+++ b/pkg/osx/README.rst
@@ -16,10 +16,17 @@ basically you need this to setup your environment:
 # port install py26-virtualenv
 # port install git-core
 # port install platypus
+# port install upx
 
 Requirements
 ============
-pyinstaller (in ~/pyinstaller)
+pyinstaller
+-----------
+Expected in ~/pyinstaller
+
+You need the development version.
+Tested with: 2.0.373
+
 platypus (tested with latest macports)
 
 ... + install environment as usual,
-- 
cgit v1.2.3