package builds again

3 files changed, 55 insertions, 97 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bda1db9e2a7..94b99e1c0419 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 4.2.1
-# Mon Jun  8 19:31:06 UTC 2015
+# Generated by mksrcinfo v8
+# wto gru 22 12:56:30 UTC 2015
 pkgbase = drawxtl
 	pkgdesc = Crystal structure visualization tool
 	pkgver = 5.5
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.lwfinger.net/drawxtl/
 	arch = i686
 	arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = drawxtl
 	source = makefile.patch
 	source = drawxtl.desktop
 	md5sums = c8323695b152a1b5e58ddf8ccb324a06
-	md5sums = bad81010282ace325011ed0493160000
+	md5sums = 8319a2d2c520c1acec8e59b5e09b14b6
 	md5sums = 032e6a9a0926693fae487eded91b9c21
 
 pkgname = drawxtl
diff --git a/PKGBUILD b/PKGBUILD
index bf051e0d6133..d0bdc36b52be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: b00rt00s ( bomby dot zrzuc at gmail dot com )
 pkgname=drawxtl
 pkgver=5.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Crystal structure visualization tool"
 arch=('i686' 'x86_64')
 url="http://www.lwfinger.net/drawxtl/"
@@ -19,49 +19,52 @@ source=(
 	
 md5sums=(
 	'c8323695b152a1b5e58ddf8ccb324a06'
-	'bad81010282ace325011ed0493160000'
+	'8319a2d2c520c1acec8e59b5e09b14b6'
 	'032e6a9a0926693fae487eded91b9c21'
 )
 
-build() {
-cd  ${srcdir}/DRAWxtl/source/DRAWxtl55/
+prepare() {
+	cd  ${srcdir}/DRAWxtl/source/DRAWxtl55/
+	patch -p0 -i ${startdir}/makefile.patch
+}
 
-patch -p0 -i ../../../makefile.patch || return 1
-make || return 1
+build() {
+	cd  ${srcdir}/DRAWxtl/source/DRAWxtl55/
+	make
 }
 
 
 package() {
-#installing an executable
-mkdir -p ${pkgdir}/usr/bin
-install -D -m655 ${srcdir}/DRAWxtl/exe/DRAWxtl55 ${pkgdir}/usr/bin/DRAWxtl55
-cd ${pkgdir}/usr/bin
-ln -sf DRAWxtl55 drawxtl
-
-#installing COPYING file
-install -D -m644 ${srcdir}/DRAWxtl/source/DRAWxtl55/COPYING ${pkgdir}/usr/share/doc/drawxtl/COPYING
-
-#installing pixmap
-mkdir -p ${pkgdir}/usr/share/pixmaps
-install -D -m644 ${srcdir}/DRAWxtl/source/DRAWxtl55/DRAWxtl.xpm ${pkgdir}/usr/share/pixmaps/drawxtl.xpm
-
-#installing docs
-mkdir -p ${pkgdir}/usr/share/doc/drawxtl
-
-cd ${srcdir}/DRAWxtl/docs
-for i in *; do
-	install -D -m644 ${i} ${pkgdir}/usr/share/doc/drawxtl/${i}
-	gzip -9 ${pkgdir}/usr/share/doc/drawxtl/${i}
-done
-
-#installing examples
-mkdir -p ${pkgdir}/usr/share/doc/drawxtl/examples
-cd ${srcdir}/DRAWxtl/examples
-for i in *; do
-	install -D -m644 ${i} ${pkgdir}/usr/share/doc/drawxtl/examples/${i}
-done
-
-#installing drawxtl.desktop file
-install -D -m644 ${srcdir}/drawxtl.desktop ${pkgdir}/usr/share/applications/drawxtl.desktop
+	#installing an executable
+	mkdir -p ${pkgdir}/usr/bin
+	install -D -m655 ${srcdir}/DRAWxtl/exe/DRAWxtl55 ${pkgdir}/usr/bin/DRAWxtl55
+	cd ${pkgdir}/usr/bin
+	ln -sf DRAWxtl55 drawxtl
+	
+	#installing COPYING file
+	install -D -m644 ${srcdir}/DRAWxtl/source/DRAWxtl55/COPYING ${pkgdir}/usr/share/doc/drawxtl/COPYING
+	
+	#installing pixmap
+	mkdir -p ${pkgdir}/usr/share/pixmaps
+	install -D -m644 ${srcdir}/DRAWxtl/source/DRAWxtl55/DRAWxtl.xpm ${pkgdir}/usr/share/pixmaps/drawxtl.xpm
+	
+	#installing docs
+	mkdir -p ${pkgdir}/usr/share/doc/drawxtl
+	
+	cd ${srcdir}/DRAWxtl/docs
+	for i in *; do
+		install -D -m644 ${i} ${pkgdir}/usr/share/doc/drawxtl/${i}
+		gzip -9 ${pkgdir}/usr/share/doc/drawxtl/${i}
+	done
+	
+	#installing examples
+	mkdir -p ${pkgdir}/usr/share/doc/drawxtl/examples
+	cd ${srcdir}/DRAWxtl/examples
+	for i in *; do
+		install -D -m644 ${i} ${pkgdir}/usr/share/doc/drawxtl/examples/${i}
+	done
+	
+	#installing drawxtl.desktop file
+	install -D -m644 ${srcdir}/drawxtl.desktop ${pkgdir}/usr/share/applications/drawxtl.desktop
 }
 
diff --git a/makefile.patch b/makefile.patch
index 38f7787a2fea..7c97064b1a18 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,56 +1,11 @@
-*** origMakefile	2011-03-08 19:55:26.000000000 +0100
---- Makefile	2012-05-18 19:04:04.412722880 +0200
-***************
-*** 32,44 ****
-  
-  # section to define the various symbols needed to build DRAWxtl for Linux systems
-  
-!   prefix          = /usr/local
-    includedir      = ${prefix}/include
-    libdir          = /usr/lib/
-  
-    BUILD_CPU=$(shell uname -m)
-    ifneq (,$(findstring 64,$(BUILD_CPU)))
-!       libdir	  = /usr/lib64/
-    endif
-  
-  # compiler name:
---- 32,44 ----
-  
-  # section to define the various symbols needed to build DRAWxtl for Linux systems
-  
-!   prefix          = /usr/
-    includedir      = ${prefix}/include
-    libdir          = /usr/lib/
-  
-    BUILD_CPU=$(shell uname -m)
-    ifneq (,$(findstring 64,$(BUILD_CPU)))
-!       libdir	  = /usr/lib/
-    endif
-  
-  # compiler name:
-***************
-*** 49,59 ****
-  # work around a bug in freeglut 2.4 - only enable this if you have to use a version 
-  # of fltk before 1.1.8 AND exactly version 2.4 of freeglut
-  #  GLUT		  = -DFREEGLUT24
-!   CXXFLAGS        = $(OPTIM)  -I/usr/X11R6/include $(GLUT)
-  
-  # libraries to link with:
-!   GLDLIBS  =  -L/usr/X11R6/lib  -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11  -lXpm \
-! 		-lfltk \
-  # -lglut # only needed with old versions of fltk before 1.1.8
-  #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
-    LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a
---- 49,59 ----
-  # work around a bug in freeglut 2.4 - only enable this if you have to use a version 
-  # of fltk before 1.1.8 AND exactly version 2.4 of freeglut
-  #  GLUT		  = -DFREEGLUT24
-!   CXXFLAGS        = $(OPTIM)  $(GLUT)
-  
-  # libraries to link with:
-!   GLDLIBS  =  -lGLU -lGL -lXinerama -lXft -lpthread -lm  -lXext -lX11  -lXpm \
-! 		-lfltk -ldl -lfontconfig\
-  # -lglut # only needed with old versions of fltk before 1.1.8
-  #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
-    LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a
+--- Makefile.orig	2015-12-22 13:37:43.648724586 +0100
++++ Makefile	2015-12-22 13:38:53.932055490 +0100
+@@ -56,7 +56,7 @@
+ 		-lfltk \
+ # -lglut # only needed with old versions of fltk before 1.1.8
+ #       -lXi -lgdkglext-x11-1.0a  # Fedora Core 2 needs these libraries
+-  LINKFLTKGL  = $(libdir)libfltk.a $(libdir)libfltk_gl.a
++  LINKFLTKGL  = -lfltk_gl -lfltk
+ 
+ # The extension to use for executables...
+   EXEEXT          =