Remove the patch for bindir normalization

2 files changed, 10 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5f339d864a6..5f1298367260 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Dec 30 02:18:51 UTC 2016
 pkgbase = chocolate-doom-git
 	pkgdesc = Historically-accurate Doom, Heretic, Hexen, and Strife ports.
-	pkgver = 2.2.0.r114.ea37ca0
+	pkgver = 2.3.0.r0.939cbfeb
 	pkgrel = 1
 	url = http://www.chocolate-doom.org/
 	arch = i686
@@ -8,17 +10,17 @@ pkgbase = chocolate-doom-git
 	license = GPL2
 	makedepends = git
 	makedepends = python
+	depends = libpng
 	depends = libsamplerate
 	depends = sdl_mixer
-	depends = sdl_net
 	source = git+https://github.com/chocolate-doom/chocolate-doom.git
 	sha256sums = SKIP
 
 pkgname = chocolate-doom-git
 	pkgdesc = Doom port accurately reproducing the original DOS EXEs.
+	depends = libpng
 	depends = libsamplerate
 	depends = sdl_mixer
-	depends = sdl_net
 	depends = chocolate-common-git
 	optdepends = freedm: Free deathmatch game
 	optdepends = freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods)
@@ -27,26 +29,26 @@ pkgname = chocolate-doom-git
 
 pkgname = chocolate-heretic-git
 	pkgdesc = Heretic port accurately reproducing the original DOS EXEs.
+	depends = libpng
 	depends = libsamplerate
 	depends = sdl_mixer
-	depends = sdl_net
 	depends = chocolate-common-git
 	optdepends = blasphemer: Free Heretic-compatible game
 	conflicts = chocolate-heretic
 
 pkgname = chocolate-hexen-git
 	pkgdesc = Hexen port accurately reproducing the original DOS EXEs.
+	depends = libpng
 	depends = libsamplerate
 	depends = sdl_mixer
-	depends = sdl_net
 	depends = chocolate-common-git
 	conflicts = chocolate-hexen
 
 pkgname = chocolate-strife-git
 	pkgdesc = Strife port accurately reproducing the original DOS EXEs.
+	depends = libpng
 	depends = libsamplerate
 	depends = sdl_mixer
-	depends = sdl_net
 	depends = chocolate-common-git
 	conflicts = chocolate-strife
 
diff --git a/PKGBUILD b/PKGBUILD
index 570875347d5f..721ed426ea57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=(chocolate-{doom,heretic,hexen,strife,common}-git)
 _pkgname=${pkgname[0]/-git/}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
-pkgver=2.2.0.r114.ea37ca0
+pkgver=2.3.0.r0.939cbfeb
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
-depends=('libsamplerate' 'sdl_mixer' 'sdl_net')
+depends=('libpng' 'libsamplerate' 'sdl_mixer')
 makedepends=('git' 'python')
 source=(git+https://github.com/chocolate-doom/chocolate-doom.git)
 sha256sums=('SKIP')
@@ -19,13 +19,6 @@ pkgver() {
   printf %s "${version##chocolate.doom.}"
 }
 
-prepare() {
-  cd "${_pkgname}"
-
-  # Change binary dir from /usr/games to /usr/bin
-  sed 's|/games|/bin|g' -i src{,/setup}/Makefile.am
-}
-
 build() {
   cd "${_pkgname}"