upstream location changed

2 files changed, 38 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58e491f937c4..dcea1eec0844 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,3 +26,22 @@ pkgbase = folie
 
 pkgname = folie
 
+pkgbase = folie
+	pkgdesc = Forth Live Explorer is a command-line utility to talk to a micro-controller via a serial port.
+	pkgver = 2.15
+	pkgrel = 3
+	url = https://github.com/jeelabs/folie
+	arch = i686
+	arch = x86_64
+	license = custom:UNLICENSE
+	makedepends = go
+	makedepends = git
+	depends = glibc
+	noextract = folie
+	options = !strip
+	options = !emptydirs
+	source = folie::git+https://git.jeelabs.org/jcw/folie#commit=d9b51c7fd7b750ceab710554dfbece3a080065ed
+	sha1sums = SKIP
+
+pkgname = folie
+
diff --git a/PKGBUILD b/PKGBUILD
index d38ced917b73..ad6b2134c0cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mirko Scholz <mirko dot scholz nine at gmail dot com>
 pkgname=folie
 pkgver=2.15
-pkgrel=2
+pkgrel=3
 pkgdesc="Forth Live Explorer is a command-line utility to talk to a micro-controller via a serial port."
 arch=('i686' 'x86_64')
 url="https://github.com/jeelabs/folie"
@@ -9,44 +9,33 @@ license=('custom:UNLICENSE')
 depends=('glibc')
 makedepends=('go' 'git')
 options=('!strip' '!emptydirs')
-_serial_ver=eae1344f9f90101f887b08d13391c34399f97873
-_readline_ver=f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f
-_select_ver=528c74964609a58f7c17471525659c9b71cd499b
+_folie_ver=d9b51c7fd7b750ceab710554dfbece3a080065ed
 source=(
-folie.tgz::https://git.jeelabs.org/jcw/folie/archive/v$pkgver.tar.gz
-serial.v1.tgz::https://github.com/bugst/go-serial/archive/$_serial_ver.tar.gz
-readline.tgz::https://github.com/chzyer/readline/archive/$_readline_ver.tar.gz
-goselect.tgz::https://github.com/creack/goselect/archive/$_select_ver.tar.gz
+folie::git+https://git.jeelabs.org/jcw/folie#commit=$_folie_ver
 )
 noextract=("${source[@]%%::*}")
-sha1sums=('b2c387a10edf9ff5db504190eed7d3958fc1372b'
-          '0aacc9a8c0d536776385216fe4a5e1f0a0e2a75b'
-          '5d962a13a4b15827c50f004ecc52e06be6d5d6a0'
-          'c5416088463b0f4bf7ceb7062bbd6bce50f4a8fa')
+sha1sums=('SKIP')
 
 prepare() {
-	cd "$srcdir"
-	[ -d src ] || mkdir src
-	for i in github.com/jeelabs/folie \
-		 go.bug.st/serial.v1 \
-                 github.com/chzyer/readline \
-	         github.com/creack/goselect 
-	do
-		cd "$srcdir/src"
-		rm -rf $i
-		mkdir -p $i
-		cd $i
-		bn=`basename $i`
-		tar xzf "$srcdir/$bn.tgz" --strip-components=1
-	done
-	GOPATH="$srcdir" go get -v golang.org/x/sys/unix
+	export GOPATH="$srcdir/.."
+
+	cd "folie"
+	go get -v
 }
 
 build() {
-	GOPATH="$srcdir" go build -v github.com/jeelabs/folie
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-v -buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+	export GOPATH="$srcdir/.."
+
+	cd "folie"
+	go build
 }
 
 package() {
-  install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$srcdir/src/github.com/jeelabs/folie/UNLICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm755 "$srcdir/../bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$srcdir/folie/UNLICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }