Better integration in Arch

3 files changed, 66 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5a7ad8d804f..90681315a846 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,9 +7,10 @@ pkgbase = qrouter
 	arch = x86_64
 	license = GPL
 	depends = tk
-	depends = libxt
 	source = http://opencircuitdesign.com/qrouter//archive/qrouter-1.2.35.tgz
+	source = qrouter.patch
 	sha512sums = 0f484ea3c19019730805beefbf9e97cceceaba8c662413a63f6d234c7f90853015504d4e456be77016d92325d1ffd1041d677519d6c2332ed5f6ab3ba2fdaeb7
+	sha512sums = 1b545556fb8d4f3153c63caf7142419d98d009faaacb0d354269eda10847d126140a872c12c4d19fc9bbb52c83c2fa1750837a9aacd8c9aa0a6fcdc5bbd94d97
 
 pkgname = qrouter
 
diff --git a/PKGBUILD b/PKGBUILD
index c8b0f33f32a6..728fbac983a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,22 @@ pkgdesc='Multi-level, over-the-cell maze router'
 arch=('i686' 'x86_64')
 url='http://opencircuitdesign.com/qrouter/'
 license=('GPL')
-depends=('tk' 'libxt')
-source=("${url}/archive/${pkgname}-${pkgver}.tgz")
-sha512sums=('0f484ea3c19019730805beefbf9e97cceceaba8c662413a63f6d234c7f90853015504d4e456be77016d92325d1ffd1041d677519d6c2332ed5f6ab3ba2fdaeb7')
+depends=('tk')
+source=("${url}/archive/${pkgname}-${pkgver}.tgz"
+        "${pkgname}.patch")
+sha512sums=('0f484ea3c19019730805beefbf9e97cceceaba8c662413a63f6d234c7f90853015504d4e456be77016d92325d1ffd1041d677519d6c2332ed5f6ab3ba2fdaeb7'
+            '1b545556fb8d4f3153c63caf7142419d98d009faaacb0d354269eda10847d126140a872c12c4d19fc9bbb52c83c2fa1750837a9aacd8c9aa0a6fcdc5bbd94d97')
+
+
+prepare() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    patch -Np1 -i "${srcdir}/${pkgname}.patch"
+}
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
+    autoconf -v
     ./configure --prefix=/usr
-    #sed -i 's@/usr/local/share/qrouter@/usr/bin/qrouter@g' Makefile
     make
 }
 
diff --git a/qrouter.patch b/qrouter.patch
new file mode 100644
index 000000000000..5ef3eb43505f
--- /dev/null
+++ b/qrouter.patch
@@ -0,0 +1,52 @@
+diff -aur qrouter-1.2.35.pristine/Makefile.in qrouter-1.2.35.new/Makefile.in
+--- qrouter-1.2.35.pristine/Makefile.in	2014-09-12 23:02:49.000000000 +0200
++++ qrouter-1.2.35.new/Makefile.in	2015-11-21 11:55:41.305239589 +0100
+@@ -93,7 +93,7 @@
+ 	$(INSTALL) -d $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) qrouter.sh $(DESTDIR)${BININSTALL}/qrouter
+ 	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
+-	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
++	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${BININSTALL}
+ 	$(INSTALL) console.tcl $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) qrouter.tcl $(DESTDIR)${LIBINSTALL}
+diff -aur qrouter-1.2.35.pristine/configure.in qrouter-1.2.35.new/configure.in
+--- qrouter-1.2.35.pristine/configure.in	2014-09-07 20:28:51.000000000 +0200
++++ qrouter-1.2.35.new/configure.in	2015-11-21 12:18:43.343178595 +0100
+@@ -162,11 +162,7 @@
+ # Options
+ # =========================================
+
+-QROUTER_LIB_DIR=${ac_default_prefix}/share/qrouter
+-AC_ARG_WITH(libdir,
+-[  --with-libdir=DIR           path to qrouter default config files], [
+-   QROUTER_LIB_DIR=$withval
+-], [])
++QROUTER_LIB_DIR=/usr/share/qrouter
+ AC_DEFINE_UNQUOTED(QROUTER_PATH, "$QROUTER_LIB_DIR")
+
+ # Interpreter Options
+diff -aur qrouter-1.2.35.pristine/qrouter.sh.in qrouter-1.2.35.new/qrouter.sh.in
+--- qrouter-1.2.35.pristine/qrouter.sh.in	2013-11-15 18:50:58.000000000 +0100
++++ qrouter-1.2.35.new/qrouter.sh.in	2015-11-21 19:07:26.769271486 +0100
+@@ -11,7 +11,7 @@
+ # Parse for the argument "-noc[onsole]".  If it exists, run qrouter
+ # without the TkCon console.  Strip this argument from the argument list.
+
+-loclibdir=${QROUTER_LIB_DIR:=LIBDIR}
++loclibdir=${QROUTER_LIB_DIR:=/usr/share/qrouter}
+ export QROUTER_LIB_DIR
+ QROUTER_WISH=WISH_EXE
+ export QROUTER_WISH
+diff -aur qrouter-1.2.35.pristine/qrouter.tcl.in qrouter-1.2.35.new/qrouter.tcl.in
+--- qrouter-1.2.35.pristine/qrouter.tcl.in	2013-11-27 01:20:57.000000000 +0100
++++ qrouter-1.2.35.new/qrouter.tcl.in	2015-11-21 19:07:58.675767949 +0100
+@@ -5,7 +5,7 @@
+
+ set tcllibdir [array get env "QROUTER_LIB_DIR"]
+ if {$tcllibdir == {}} {
+-   set QROUTER_LIB_DIR LIBDIR
++   set QROUTER_LIB_DIR /usr/share/qrouter
+ } else {
+    set QROUTER_LIB_DIR [lindex $tcllibdir 1]
+ }