update to 1.6.2 and add gitignore

5 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bd0f8e076e3..39d8f2b1cbe6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = xcrysden
 	pkgdesc = crystalline and molecular structure visualisation program
-	pkgver = 1.5.60
-	pkgrel = 2
+	pkgver = 1.6.2
+	pkgrel = 1
 	url = http://www.xcrysden.org/
 	arch = x86_64
 	license = GPL2
 	depends = tk
 	depends = tcl
+	depends = tk-togl
 	depends = gl2ps
 	depends = fftw
 	depends = bwidget
@@ -15,12 +16,12 @@ pkgbase = xcrysden
 	depends = glu
 	depends = libxmu
 	replaces = xcrysden-bin
-	source = http://www.xcrysden.org/download/xcrysden-1.5.60.tar.gz
+	source = http://www.xcrysden.org/download/xcrysden-1.6.2.tar.gz
 	source = fix-xcrysden-install.patch
 	source = Make.sys
-	sha256sums = a695729f1bb3e486b86a74106c06a392c8aca048dc6b0f20785c3c311cfb2ef4
-	sha256sums = 61a0bbc7728beff05bcb7f1676053de468ebb926b638869174aa2bbcb5bc554c
-	sha256sums = 077ca35a6d7264c0b13489a3c06cb49041c6afaf394d136c303ba9b4a5614d66
+	sha256sums = 811736ee598bec1a5b427fd10e4e063a30dd7cadae96a43a50b36ce90a4f503f
+	sha256sums = 26be6f6d22bed326612f2b9c4b049a32bc9ebe57926254eac1d0e5ee46cb9ca5
+	sha256sums = 693422f9c625f51300778acd782d2ec3248b51c796cb08e917728d014fd7413f
 
 pkgname = xcrysden
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..326fe36b2bae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# source
+/xcrysden-*.tar.gz
+# makepkg
+/src
+/pkg
+*.pkg.tar.*
diff --git a/Make.sys b/Make.sys
index fd635ed0b207..eb58763130bf 100644
--- a/Make.sys
+++ b/Make.sys
@@ -1,7 +1,7 @@
 #########################################################################
 #
 #  System-dependent definitions suitable for compiling xcrysden using
-#  a system shared libraries (needs Tcl/Tk/GL/GLU/FFTW libraries)
+#  a system shared libraries (needs Tcl/Tk/Togl/GL/GLU/FFTW libraries)
 #
 ########################################################################
 
@@ -21,7 +21,7 @@ CC     = gcc -g
 #LDLIB  = -ldl
 MATH   = -lm -lc
 
-FFLAGS = 
+FFLAGS =
 FC     = gfortran -std=legacy -fdefault-double-8 -fdefault-real-8 -O2
 
 #-------------------------------------------
@@ -43,6 +43,7 @@ X_INCDIR  =
 
 TCL_LIB      = -ltcl
 TK_LIB       = -ltk
+TOGL_LIB     = -L/usr/lib/Togl2.0 -lTogl$(TOGL_VER) -Wl,-rpath=/usr/lib/Togl2.0
 GLU_LIB      = -lGLU
 GL_LIB       = -lGL
 FFTW3_LIB    = -lfftw3
@@ -54,8 +55,9 @@ EXT_LIB      = -lgl2ps
 # Include directories
 #
 
-TCL_INCDIR      = -I/usr/include
+TCL_INCDIR      =
 TK_INCDIR       =
+TOGL_INCDIR     =
 GL_INCDIR       =
 FFTW3_INCDIR    =
 # this is only used for some testing purposes
diff --git a/PKGBUILD b/PKGBUILD
index dddcdef0d944..f97fe8ab8166 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,21 @@
 # Contributor: Vit <vitruss@gmail.com>
 
 pkgname=xcrysden
-pkgver=1.5.60
-pkgrel=2
+pkgver=1.6.2
+pkgrel=1
 epoch=
 pkgdesc="crystalline and molecular structure visualisation program"
 arch=('x86_64')
 url="http://www.xcrysden.org/"
 license=('GPL2')
-depends=('tk' 'tcl' 'gl2ps' 'fftw' 'bwidget' 'imagemagick' 'gcc-fortran' 'glu' 'libxmu')
+depends=('tk' 'tcl' 'tk-togl' 'gl2ps' 'fftw' 'bwidget' 'imagemagick' 'gcc-fortran' 'glu' 'libxmu')
 replaces=('xcrysden-bin')
 source=("http://www.xcrysden.org/download/xcrysden-${pkgver}.tar.gz"
         "fix-xcrysden-install.patch"
-		"Make.sys")
-sha256sums=('a695729f1bb3e486b86a74106c06a392c8aca048dc6b0f20785c3c311cfb2ef4'
-	    	'61a0bbc7728beff05bcb7f1676053de468ebb926b638869174aa2bbcb5bc554c'  
-	    	'077ca35a6d7264c0b13489a3c06cb49041c6afaf394d136c303ba9b4a5614d66')
-
+        "Make.sys")
+sha256sums=('811736ee598bec1a5b427fd10e4e063a30dd7cadae96a43a50b36ce90a4f503f'
+            '26be6f6d22bed326612f2b9c4b049a32bc9ebe57926254eac1d0e5ee46cb9ca5'
+            '26d0dc9fc40d575f39d21c06220187d3b98cc4255f5d7ca7468c2aeea636a32a')
 
 prepare() {
 	mv Make.sys "$pkgname-$pkgver"
diff --git a/fix-xcrysden-install.patch b/fix-xcrysden-install.patch
index 9d3c3f252339..7dd0a7a8f7e1 100644
--- a/fix-xcrysden-install.patch
+++ b/fix-xcrysden-install.patch
@@ -12,16 +12,16 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -17,7 +17,7 @@
- # some varibales ...
+@@ -18,7 +18,7 @@
  
- all: tcl tk mesa fftw meschach xcrysden 
+ all: tcl tk mesa togl fftw xcrysden
+ #  meschach 
 -xcrysden: usage bwidget bindir src-C src-F src-Tcl
 +xcrysden: usage bindir src-C src-F src-Tcl
  
  usage: $(TOPDIR)/docs/xcrysden.1
  	man $(TOPDIR)/docs/xcrysden.1 | awk 'BEGIN {lprint=0; print "## do not edit changes will be lost (file automatically generated)\n"; } /SYNOPSIS/ { lprint=1; } /SEE ALSO/ { lprint=0; } /a*/ { if (lprint) print; }' > usage
-@@ -226,9 +226,9 @@
+@@ -234,9 +234,9 @@
  #
  # ------------------------------------------------------------------------
  
@@ -33,49 +33,37 @@ Forwarded: not-needed
  
  install: xcrysden
  	@echo
---- a/C/Makefile
-+++ b/C/Makefile
-@@ -29,7 +29,7 @@
- 
- xcrys: $(XC_OBJS) $(EXTERNAL_OBJS)
- 	$(CC)  $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
--	-o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB)
-+	-o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB)
- 
- xctclsh: xcTclsh.o
- 	$(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
 --- a/C/make-objects
 +++ b/C/make-objects
 @@ -1,6 +1,5 @@
+ # togl.o
  EXTERNAL_OBJS = \
- 	togl.o \
 -	gl2ps.o \
  	sgiRasterFont.o \
  	sgiAux.o
  
 --- a/C/gl2psPrintTogl.c
 +++ b/C/gl2psPrintTogl.c
-@@ -18,8 +18,8 @@
- 
+@@ -19,7 +19,7 @@
  #include <stdio.h>
  #include <string.h>
--#include "togl.h"
+ #include <togl.h>
 -#include "gl2ps.h"
-+#include "togl.h"
 +#include <gl2ps.h>
  #include "xcfunc.h"
  
- extern void (*xcDisplay)(struct Togl *togl); 
+ extern struct Togl *mesa_togl;
 --- a/sys_utils/wrappers.sh
 +++ b/sys_utils/wrappers.sh
 @@ -5,8 +5,8 @@
  #!/bin/sh -f
- 
+
  # simple wrapper to run $cmd
--XCRYSDEN_TOPDIR=$prefix/share/$xcrysden
--XCRYSDEN_LIB_BINDIR=$prefix/lib/$xcrysden
+-XCRYSDEN_TOPDIR="$prefix/share/$xcrysden"
+-XCRYSDEN_LIB_BINDIR="$prefix/lib/$xcrysden"
 +XCRYSDEN_TOPDIR=/usr/share/xcrysden
 +XCRYSDEN_LIB_BINDIR=/usr/lib/xcrysden
  export XCRYSDEN_TOPDIR
  export XCRYSDEN_LIB_BINDIR
+