remove patch, no longer needed

3 files changed, 7 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b29e6f13d140..546033b95a6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freelan-git
 	pkgdesc = Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software
-	pkgver = r3862.1cf517bf
-	pkgrel = 2
+	pkgver = r3864.512f6799
+	pkgrel = 1
 	url = https://github.com/freelan-developers/freelan
 	arch = any
 	license = GPL
@@ -13,8 +13,6 @@ pkgbase = freelan-git
 	depends = miniupnpc
 	depends = openssl
 	source = git+https://github.com/freelan-developers/freelan.git
-	source = fix-build.diff
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = freelan-git
diff --git a/PKGBUILD b/PKGBUILD
index d093cbb22f57..00e756287a4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,16 @@
 
 _pkgname=freelan
 pkgname="$_pkgname"-git
-pkgver=r3862.1cf517bf
-pkgrel=2
+pkgver=r3864.512f6799
+pkgrel=1
 pkgdesc="Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software"
 arch=('any')
 url="https://github.com/freelan-developers/freelan"
 license=('GPL')
 depends=('boost' 'curl' 'miniupnpc' 'openssl')
 makedepends=('git' 'help2man' 'scons')
-source=(git+https://github.com/freelan-developers/"$_pkgname".git
-        fix-build.diff)
-sha256sums=(SKIP SKIP)
+source=(git+https://github.com/freelan-developers/"$_pkgname".git)
+sha256sums=(SKIP)
 
 pkgver() {
     cd "$_pkgname"
@@ -22,14 +21,9 @@ pkgver() {
            "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-    cd "$srcdir/$_pkgname"
-    patch -p1 -i "$srcdir"/fix-build.diff
-}
-
 build() {
     cd "$srcdir/$_pkgname"
-    scons apps --mode=release prefix="$pkgdir" bin_prefix="$pkgdir"/usr
+    scons apps --mode=release
     # scons samples  # build fails currently
 }
 
diff --git a/fix-build.diff b/fix-build.diff
deleted file mode 100644
index bff7c5323a79..000000000000
--- a/fix-build.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 6797a04e..fcb32424 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -218,7 +218,7 @@ if mode in ('all', 'release'):
-     env = FreelanEnvironment(mode='release', prefix=prefix, bin_prefix=bin_prefix, mongoose=mongoose, upnp=upnp)
-     libraries, includes, apps, samples, configurations, help = SConscript('SConscript', exports='env', variant_dir=os.path.join('build', env.mode))
-     install = env.Install(os.path.join(env.bin_install_prefix, 'bin'), apps)
--    install = env.Install(os.path.join(env.bin_install_prefix, 'man', 'man1'), help)
-+    install.extend(env.Install(os.path.join(env.bin_install_prefix, 'share/man', 'man1'), help))
-     install.extend(env.Install(os.path.join(env.install_prefix, 'etc', 'freelan'), configurations))
- 
-     Alias('install', install)