patch removed, update

4 files changed, 41 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bfb61076457..e2e34b1bec29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
+# Generated by mksrcinfo v8
+# Wed Feb 10 18:44:43 UTC 2016
 pkgbase = artanis
 	pkgdesc = A fast monolithic web-framework of Scheme
-	pkgver = 0.1.0
-	pkgrel = 2
+	pkgver = 0.1.2
+	pkgrel = 1
 	url = http://web-artanis.com/
+	install = artanis.install
 	arch = any
 	license = GPL
 	depends = guile
-	source = http://alpha.gnu.org/gnu/artanis/artanis-0.1.0.tar.bz2
-	source = Makefile.in.patch
-	md5sums = 0ac17cdda340aa468cb9aa30956dcca2
-	md5sums = ec8451aa3912501be9d9c8ad48f68b38
+	source = http://alpha.gnu.org/gnu/artanis/artanis-0.1.2.tar.bz2
+	sha256sums = a08d66a7960093bf62a82a5f7b663f88b67650bd628b34c72967e6f7aa996839
 
 pkgname = artanis
 
diff --git a/Makefile.in.patch b/Makefile.in.patch
deleted file mode 100644
index 13be947f8446..000000000000
--- a/Makefile.in.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur artanis-0.1.0.orig/Makefile.in artanis-0.1.0.new/Makefile.in
---- artanis-0.1.0.orig/Makefile.in	2015-11-06 23:32:16.628173940 +0100
-+++ artanis-0.1.0.new/Makefile.in	2015-11-12 12:33:12.175634478 +0100
-@@ -1,5 +1,6 @@
- TOP := $(shell pwd)
- PREFIX := @prefix@
-+DESTDIR := @DESTDIR@
- SRC := @srcdir@
- CC := @CC@
- GUILE := @GUILE@
-@@ -21,7 +22,7 @@
- TEMP_LIB_PATH := $(OBJ)
- MOD_PATH := $(shell guile -c "(display (%site-dir))")
- MOD_COMPILED_PATH := $(shell guile -c "(display (%site-ccache-dir))")
--MOD_TARGET_PATH := $(MOD_COMPILED_PATH)
-+MOD_TARGET_PATH := $(DESTDIR)/$(MOD_COMPILED_PATH)
- GUILE_CFLAGS := -Wunsupported-warning -Wunbound-variable -Warity-mismatch -Wduplicate-case-datum -Wbad-case-datum -Wformat
- GUILEC := GUILE_LOAD_COMPILED_PATH=$(TEMP_LIB_PATH) guild compile $(GUILE_CFLAGS)
- ARTANIS_ETC := $(SRC)/etc/artanis
-@@ -124,15 +125,16 @@
- 	-rm -f config.{h,log}
- 
- install: $(ALL_TARGETS)
--	mkdir -p $(MOD_PATH)
--	$(CP) $(MOD) $(MOD_PATH)/
-+	mkdir -p $(DESTDIR)/$(MOD_PATH)
-+	$(CP) $(MOD) $(DESTDIR)/$(MOD_PATH)/
- 	mkdir -p $(MOD_TARGET_PATH)/
- 	$(CP) $(MOD_OBJ) $(MOD_TARGET_PATH)/
--	$(CP) $(ARTANIS_ETC) /etc/
--	$(CP) $(ARTANIS_PAGES) /etc/artanis/
--	$(CP) $(BIN)/art $(PREFIX)/bin/
--	mkdir -p /etc/bash_completion.d/
--	$(CP) $(CMDCOMP) /etc/bash_completion.d/
-+	$(CP) $(ARTANIS_ETC) $(DESTDIR)/etc/
-+	$(CP) $(ARTANIS_PAGES) $(DESTDIR)/etc/artanis/
-+	mkdir -p $(DESTDIR)/$(PREFIX)/bin/
-+	$(CP) $(BIN)/art $(DESTDIR)/$(PREFIX)/bin/
-+	mkdir -p $(DESTDIR)/etc/bash_completion.d/
-+	$(CP) $(CMDCOMP) $(DESTDIR)/etc/bash_completion.d/
- 	source /etc/bash.bashrc
- 	if [ -e artanis.info ]; then $(CP) artanis.info $(INFO_DIR)/; fi
- 
diff --git a/PKGBUILD b/PKGBUILD
index 2f8466d208f8..d22b59087ad2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,29 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=artanis
-pkgver=0.1.0
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="A fast monolithic web-framework of Scheme"
 url="http://web-artanis.com/"
 depends=('guile')
 arch=('any')
 license=('GPL')
-source=(http://alpha.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 Makefile.in.patch)
-md5sums=('0ac17cdda340aa468cb9aa30956dcca2'
-         'ec8451aa3912501be9d9c8ad48f68b38')
+install=$pkgname.install
+source=(http://alpha.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a08d66a7960093bf62a82a5f7b663f88b67650bd628b34c72967e6f7aa996839')
 
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 < $srcdir/Makefile.in.patch
-}
- 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./autogen.sh
   ./configure --prefix=/usr
-  make 
+  make
+  make docs
+}
+
+check() {
+  cd "$srcdir"/$pkgname-$pkgver
+  export GUILE_LOAD_PATH=$GUILE_LOAD_PATH:.
+  guile -c '(display (@ (artanis artanis) artanis-version))'
 }
 
 package() {
diff --git a/artanis.install b/artanis.install
new file mode 100644
index 000000000000..111da4caae18
--- /dev/null
+++ b/artanis.install
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+files=(artanis.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+