Updated to git version

3 files changed, 35 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d757a93a02e..d75f2d40c5ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun 16 02:42:48 UTC 2017
 pkgbase = mingw-w64-pdcurses-win32a
 	pkgdesc = Curses library on the Win32 API for MinGW-w64
-	pkgver = 3.4
-	pkgrel = 1508
+	pkgver = 4.0
+	pkgrel = 1
 	url = http://www.projectpluto.com/win32a.htm
 	arch = any
 	license = public domain
@@ -13,8 +15,8 @@ pkgbase = mingw-w64-pdcurses-win32a
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = http://www.projectpluto.com/win32a.zip
-	md5sums = e7613a470362920309245354f7e7a25d
+	source = git+https://github.com/Bill-Gray/PDCurses.git#commit=f3170bb6090a3b33603449246228d92261a2f87d
+	md5sums = SKIP
 
 pkgname = mingw-w64-pdcurses-win32a
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..97589fb4de69
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.diff
diff --git a/PKGBUILD b/PKGBUILD
index 659d49f59812..e3040154a7e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,11 @@
-# Maintainer: Jens Staal <staal1978@gmail.com>
+# Maintainer: pingplug <pingplug@foxmail.com>
+# Contributor: Jens Staal <staal1978@gmail.com>
 # adopted from mingw-w64-pdcurses package:
 # Contributor: Filip Brcic <brcha@gna.org>
 pkgname=mingw-w64-pdcurses-win32a
-pkgver=3.4
-pkgrel=1508 #yymm
+pkgver=4.0
+pkgrel=1
+_commit=f3170bb6090a3b33603449246228d92261a2f87d
 pkgdesc="Curses library on the Win32 API for MinGW-w64"
 arch=(any)
 depends=(mingw-w64-crt)
@@ -14,44 +16,40 @@ replaces=('mingw-w64-pdcurses')
 conflicts=('mingw-w64-pdcurses')
 license=("public domain")
 url="http://www.projectpluto.com/win32a.htm"
-source=("http://www.projectpluto.com/win32a.zip")
-md5sums=('e7613a470362920309245354f7e7a25d')
+source=(#"http://www.projectpluto.com/win32a.zip"
+        "git+https://github.com/Bill-Gray/PDCurses.git#commit=$_commit")
+md5sums=('SKIP')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "${srcdir}"
-  sed 's|SRCDIR)\\exp|SRCDIR)\/exp|g' -i win32a/mingwin32.mak
-  sed 's|CAT = type|CAT = cat|g' -i win32a/mingwin32.mak
-  sed 's|CP  = -copy|CP  = -cp|g' -i win32a/mingwin32.mak
-  sed 's|DELETE = -del|DELETE = -rm|g' -i win32a/mingwin32.mak
+  cd "${srcdir}/PDCurses"
 }
 
 build() {
-  cd "${srcdir}"
-  export PDCURSES_SRCDIR="${srcdir}"
-  export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+  cd "${srcdir}/PDCurses"
   for _arch in ${_architectures}; do
-    cp -a win32a build-${_arch} && pushd build-${_arch}
+    cp -a win32a build-${_arch}-static && pushd build-${_arch}-static
     make -f mingwin32.mak \
-      PREFIX=${_arch} \
-      LIBEXE=${_arch}-gcc \
-      CC=${_arch}-gcc \
-      LINK=${_arch}-gcc \
-      LD=${_arch}-ld \
-      STRIP=${_arch}-strip \
+      PREFIX="${_arch}-" \
+      WIDE=Y UTF8=Y
+    popd
+    cp -a win32a build-${_arch}-shared && pushd build-${_arch}-shared
+    make -f mingwin32.mak \
+      PREFIX="${_arch}-" \
       WIDE=Y UTF8=Y DLL=Y
     popd
   done
 }
 
 package() {
-  cd "${srcdir}"
+  cd "${srcdir}/PDCurses"
   for _arch in ${_architectures} ; do
     install -d "${pkgdir}"/usr/${_arch}/{bin,lib,include}
-    install build-${_arch}/pdcurses.dll "${pkgdir}"/usr/${_arch}/bin/
-    install build-${_arch}/pdcurses.a "${pkgdir}"/usr/${_arch}/lib/libpdcurses.dll.a
-    install -m 0644 curses.h panel.h term.h "${pkgdir}"/usr/${_arch}/include/
+    install build-${_arch}-shared/pdcurses.dll "${pkgdir}"/usr/${_arch}/bin/
+    install build-${_arch}-shared/pdcurses.a "${pkgdir}"/usr/${_arch}/lib/libpdcurses.dll.a
+    install build-${_arch}-static/pdcurses.a "${pkgdir}"/usr/${_arch}/lib/libpdcurses.a
+    install -m 0644 curses.h panel.h term.h acs_defs.h "${pkgdir}"/usr/${_arch}/include/
     find "$pkgdir/usr/${_arch}" -name '*.exe' -exec rm {} \;
     find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g