Proper build without any dependencies

1 files changed, 56 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 417e887d5c89..047da48fdb95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,52 @@
 pkgname=golded-plus-git
 pkgver=r1548.9b28fa8
-pkgrel=2
+_ncurses_pkgver=6.2
+_ncurses="ncurses"
+pkgrel=4
 pkgdesc="golded-plus Fidonet Mail Reader/Editor"
 arch=('i686' 'x86_64')
 url="http://bbconf.sourceforge.net/"
 license=('GPL2')
-source=("${pkgname}::git+https://github.com/golded-plus/golded-plus.git" 
- "ncurses.patch" "addline.patch" "widescreen.patch")
+source=(
+    "${pkgname}::git+https://github.com/golded-plus/golded-plus.git"
+     "https://ftp.gnu.org/pub/gnu/ncurses/${_ncurses}-${_ncurses_pkgver}.tar.gz"
+     "ncurses.patch" "addline.patch" "widescreen.patch" "golded"
+)
 makedepends=('git' 'gcc' 'make' 'glibc' 'groff' 'patchelf')
-depends=('screen' 'luit' 'ncurses-nonwide')
+depends=('luit')
 provides=('golded-plus')
 
 build() {
-    cd "${pkgname}"
-    make USE_NCURSES=1 KOI8=1 WIDE_NCURSES=0
+    rm -rf ncurses
+    mkdir ncurses
+    pushd "${_ncurses}-${_ncurses_pkgver}"
+    ./configure --prefix=/usr/lib/ncurses-golded \
+    --mandir=/usr/lib/golded-ncurses/usr/share/man \
+    --with-pkg-config-libdir=/usr/lib/ncurses-golded/usr/lib/pkgconfig \
+    --with-shared --with-normal --without-debug --without-ada \
+    --disable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared \
+    --without-manpages --without-tests --without-pkg-config \
+    --with-static --with-cxx-static --with-abi-version=5
+    make clean
+    make -j8
+    make DESTDIR="${srcdir}/ncurses" install
+    popd
+    pushd "${pkgname}"
+    make WIDE_NCURSES=0 USE_NCURSES=1 KOI8=1
     pushd docs
     make tokentpl.txt
     make tokencfg.txt
     popd
     make docs
+    popd
 }
 
 prepare() {
-    cp "${pkgname}/golded3/mygolded.__h" "${pkgname}/golded3/mygolded.h"
     cd "${pkgname}"
-    patch -p1 -i "${srcdir}/ncurses.patch"
-    patch -p1 -i "${srcdir}/addline.patch"
-    patch -p1 -i "${srcdir}/widescreen.patch"
-
+    cp "golded3/mygolded.__h" "golded3/mygolded.h"
+    patch -p1 -i "../ncurses.patch"
+    patch -p1 -i "../addline.patch"
+    patch -p1 -i "../widescreen.patch"
     iconv -c -f cp866 -t utf8 docs/rusfaq.txt |  sed 2s/cp866/utf-8/ >docs/rusfaq.utf8
     iconv -c -f cp866 -t utf8 docs/notework.rus |  sed 2s/cp866/utf-8/ >docs/notework_rus.utf8
     iconv -c -f cp866 -t koi8-r docs/rusfaq.txt |  sed 2s/cp866/koi8/ >docs/rusfaq.koi8
@@ -52,28 +71,33 @@ pkgver() {
 }
 
 package() {
-    cd "$pkgname"
-    mkdir -m 755 -p ${pkgdir}/usr/share/goldedplus/{docs,charset,colorset,config,template}
-    install -d ${pkgdir}/usr/bin
-    install bin/*lnx bin/golded ${pkgdir}/usr/bin/
-    patchelf --set-rpath /opt/ncurses-nonwide/lib ${pkgdir}/usr/bin/gedlnx
-    chmod 755 ${pkgdir}/usr/bin/gedlnx
-    install -d ${pkgdir}/usr/man/man1
-    install -m 644 docs/*.1 ${pkgdir}/usr/man/man1/
-    install -m 644 ${pkgdir}/usr/man/man1/golded.1 ${pkgdir}/usr/man/man1/gedlnx.1
-    install -m 644 ${pkgdir}/usr/man/man1/goldnode.1 ${pkgdir}/usr/man/man1/gnlnx.1
-    install -m 644 ${pkgdir}/usr/man/man1/rddt.1 ${pkgdir}/usr/man/man1/rddtlnx.1
-    install -m 644 etc/gecolor.conf ${pkgdir}/usr/share/goldedplus/colorset/gedcolor.cfg
-    install -m 644 cfgs/config/* ${pkgdir}/usr/share/goldedplus/config
-    install -m 644 cfgs/template/* ${pkgdir}/usr/share/goldedplus/template
-    install -m 644 cfgs/charset/* ${pkgdir}/usr/share/goldedplus/charset
-    install -m 644 cfgs/colorset/* ${pkgdir}/usr/share/goldedplus/colorset
-    install -m 644 docs/*.utf8 ${pkgdir}/usr/share/goldedplus/docs
-    install -m 644 docs/*.koi8 ${pkgdir}/usr/share/goldedplus/docs
-    install -m 644 docs/{tips,linux,notework,tokencfg,tokentpl}.txt ${pkgdir}/usr/share/goldedplus/docs
+    pushd "${_ncurses}-${_ncurses_pkgver}"
+    make DESTDIR="${pkgdir}" install
+    popd
+    
+    pushd "${pkgname}"
+    mkdir -m 755 -p "${pkgdir}/usr/share/goldedplus"/{docs,charset,colorset,config,template}
+    install -d "${pkgdir}/usr/bin"
+    install -m 755 bin/rddtlnx "${pkgdir}/usr/bin/rddt"
+    install -m 755 bin/gnlnx "${pkgdir}/usr/bin/goldnode"
+    install -m 755 bin/gedlnx "${pkgdir}/usr/bin/gedlnx"
+    install -m 755 ../golded "${pkgdir}/usr/bin/golded"
+    patchelf --set-rpath /usr/lib/ncurses-golded/lib "${pkgdir}/usr/bin/gedlnx"
+    install -d "${pkgdir}/usr/man/man1"
+    install -m 644 docs/*.1 "${pkgdir}/usr/man/man1/"
+    install -m 644 etc/gecolor.conf "${pkgdir}/usr/share/goldedplus/colorset/gedcolor.cfg"
+    install -m 644 cfgs/config/* "${pkgdir}/usr/share/goldedplus/config"
+    install -m 644 cfgs/template/* "${pkgdir}/usr/share/goldedplus/template"
+    install -m 644 cfgs/charset/* "${pkgdir}/usr/share/goldedplus/charset"
+    install -m 644 cfgs/colorset/* "${pkgdir}/usr/share/goldedplus/colorset"
+    install -m 644 docs/*.utf8 "${pkgdir}/usr/share/goldedplus/docs"
+    install -m 644 docs/*.koi8 "${pkgdir}/usr/share/goldedplus/docs"
+    install -m 644 docs/{tips,linux,notework,tokencfg,tokentpl}.txt "${pkgdir}/usr/share/goldedplus/docs"
 }
 
 md5sums=('SKIP'
-         '101d41109a4d32a562142971de846219'
+         'e812da327b1c2214ac1aed440ea3ae8d'
+         'ab59c44a926a1d5f699cc6fe9bea87b2'
          '5af9e7339bcfa4eb12736599b6ee266a'
-         '5c05574fdfa982acfefc1ca45f830d05')
+         '5c05574fdfa982acfefc1ca45f830d05'
+         '46c9bbd1d4aacda4f8f0874ee15d298b')