Fixes

3 files changed, 21 insertions, 31 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index bfcec7dec161..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgbase = opencbm-git
-	pkgdesc = OpenCBM allows access to Commodore (C64) storage devices VIC 1540, 1541, 1570, 1571, or even 1581 floppy drive
-	pkgver = r1186.f1712e2
-	pkgrel = 1
-	epoch = 
-	url = http://sourceforge.net/projects/opencbm/
-	install = 
-	changelog = 
-	arch = i686,
-	arch = x86_64
-	license = GPL2
-	makedepends = cc65
-	depends = ncurses
-	depends = libusb-compat
-	source = git+http://git.code.sf.net/p/opencbm/code
-
-pkgname = opencbm-git
-
diff --git a/.SRCINFO b/.SRCINFO
index 3cf608d10967..320caf837293 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-# Generated by mksrcinfo v8
-# Sat May 19 23:27:03 UTC 2018
 pkgbase = opencbm-git
 	pkgdesc = OpenCBM allows access to Commodore (C64) storage devices VIC 1540, 1541, 1570, 1571, or even 1581 floppy drive
-	pkgver = r1252.9b57b1f
+	pkgver = r1436.7134118b
 	pkgrel = 1
 	url = http://sourceforge.net/projects/opencbm/
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = git
 	makedepends = cc65
-	depends = ncurses
 	depends = libusb
-	depends = libusb-compat
+	optdepends = ncurses: enable interactive mode for cbmlinetester
+	provides = opencbm
+	backup = etc/opencbm.conf
 	source = git+https://github.com/OpenCBM/OpenCBM.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 73b1d2cd4c80..5099b2f50cbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Uffe Jakobsen <microtop@starion.dk>
 #
 pkgname=opencbm-git
-pkgver=r1252.9b57b1f
+pkgver=r1436.7134118b
 pkgrel=1
 epoch=
 pkgdesc="OpenCBM allows access to Commodore (C64) storage devices VIC 1540, 1541, 1570, 1571, or even 1581 floppy drive"
@@ -13,14 +13,14 @@ arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/opencbm/"
 license=('GPL2')
 groups=()
-depends=('ncurses' 'libusb' 'libusb-compat')
-makedepends=('cc65')
+depends=('libusb')
+makedepends=('git' 'cc65')
 checkdepends=()
-optdepends=()
-provides=()
+optdepends=('ncurses: enable interactive mode for cbmlinetester')
+provides=('opencbm')
 conflicts=()
 replaces=()
-backup=()
+backup=('etc/opencbm.conf')
 options=()
 install=
 changelog=
@@ -32,6 +32,9 @@ md5sums=('SKIP')
 
 build_kernel_module=
 
+#
+#
+#
 
 pkgver()
 {
@@ -46,8 +49,6 @@ prepare()
   sed -i '\!#include <asm/uaccess.h>!s!.*!&\n#include <linux/uaccess.h>\n#include <linux/sched/signal.h>!' opencbm/sys/linux/cbm_module.c
   # kernel module: Makefile is needed later
   sed -i '\!-rm -f Makefile!d' opencbm/sys/linux/LINUX/Makefile
-  # HACK: testlines.1 does not exist
-  touch opencbm/sample/testlines/testlines.1
 }
 
 build()
@@ -76,6 +77,13 @@ package()
   make -f LINUX/Makefile PREFIX="/usr" MANDIR="/usr/share/man/man1" INFODIR="/usr/share/info" DESTDIR="${pkgdir}/" install install-plugin-xum1541 install-plugin-xu1541
   mv "${pkgdir}/etc/opencbm.conf" "${pkgdir}/etc/opencbm.conf.sample"
 
+  # Don't overwrite ld.so.conf
+  rm -f ${pkgdir}/etc/ld.so.conf
+
+  # Remove scary warning from /etc/opencbm.conf and don't install both /etc/opencbm.conf.d/ and opencbm_plugin_helper_tools at all
+  ##sed -i "/^;.*/d" ${pkgdir}/etc/opencbm.conf
+  ##rm -rf ${pkgdir}/etc/opencbm.conf.d/
+  ##rm ${pkgdir}/usr/bin/opencbm_plugin_helper_tools
 
   # kernel module: build (optional)
   if test "${build_kernel_module}" != ""; then