3 files changed, 3 insertions, 72 deletions
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild
index b425e9aa0..5af568552 100755
--- a/source/d/oprofile/oprofile.SlackBuild
+++ b/source/d/oprofile/oprofile.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,14 @@
 
 
 VERSION=${VERSION:-$(echo oprofile-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -64,9 +64,6 @@ rm -rf oprofile-$VERSION
 tar xvf $CWD/oprofile-$VERSION.tar.?z* || exit 1
 cd oprofile-$VERSION
 
-zcat $CWD/oprofile.binutils.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/oprofile.config.h.diff.gz | patch -p1 --verbose || exit 1
-
 ./autogen.sh
 
 chown -R root:root .
diff --git a/source/d/oprofile/oprofile.binutils.diff b/source/d/oprofile/oprofile.binutils.diff
deleted file mode 100644
index 947ce5d55..000000000
--- a/source/d/oprofile/oprofile.binutils.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u -r --new-file oprofile-0.9.7.orig/libopagent/opagent.c oprofile-0.9.7/libopagent/opagent.c
---- oprofile-0.9.7.orig/libopagent/opagent.c	2011-07-04 21:25:04.000000000 -0500
-+++ oprofile-0.9.7/libopagent/opagent.c	2012-06-20 10:59:17.851896225 -0500
-@@ -60,6 +60,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <time.h>
-+#include "config.h"
- #include <bfd.h>
- 
- #include "opagent.h"
-diff -u -r --new-file oprofile-0.9.7.orig/libpp/symbol.h oprofile-0.9.7/libpp/symbol.h
---- oprofile-0.9.7.orig/libpp/symbol.h	2011-07-04 21:25:04.000000000 -0500
-+++ oprofile-0.9.7/libpp/symbol.h	2012-06-20 10:59:23.579895917 -0500
-@@ -18,6 +18,7 @@
- #include "format_flags.h"
- #include "op_types.h"
- 
-+#include "config.h"
- #include <bfd.h>
- #include <stdint.h>
- 
-diff -u -r --new-file oprofile-0.9.7.orig/opjitconv/debug_line.c oprofile-0.9.7/opjitconv/debug_line.c
---- oprofile-0.9.7.orig/opjitconv/debug_line.c	2011-07-04 21:25:04.000000000 -0500
-+++ oprofile-0.9.7/opjitconv/debug_line.c	2012-06-20 10:59:40.620895008 -0500
-@@ -13,6 +13,7 @@
- #include <string.h>
- #include <stddef.h>
- #include <stdio.h>
-+#include "config.h"
- #include <bfd.h>
- #include <limits.h>
- 
-diff -u -r --new-file oprofile-0.9.7.orig/opjitconv/opjitconv.h oprofile-0.9.7/opjitconv/opjitconv.h
---- oprofile-0.9.7.orig/opjitconv/opjitconv.h	2011-07-04 21:25:04.000000000 -0500
-+++ oprofile-0.9.7/opjitconv/opjitconv.h	2012-06-20 10:59:35.387895285 -0500
-@@ -26,6 +26,7 @@
- #define OP_JIT_CONV_ALREADY_DONE 5
- #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
- 
-+#include "config.h"
- #include <bfd.h>
- #include <stddef.h>
- #include <sys/stat.h>
diff --git a/source/d/oprofile/oprofile.config.h.diff b/source/d/oprofile/oprofile.config.h.diff
deleted file mode 100644
index 41c868572..000000000
--- a/source/d/oprofile/oprofile.config.h.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./libutil++/bfd_spu_support.cpp.orig	2011-07-04 21:25:04.000000000 -0500
-+++ ./libutil++/bfd_spu_support.cpp	2012-12-20 18:42:01.400977322 -0600
-@@ -9,6 +9,8 @@
-  * (C) Copyright IBM Corporation 2007
-  */
- 
-+#include "config.h"
-+
- #include "bfd_support.h"
- #include "op_bfd.h"
- #include "config.h"
---- ./libutil++/bfd_support.cpp.orig	2011-07-04 21:25:04.000000000 -0500
-+++ ./libutil++/bfd_support.cpp	2012-12-20 18:41:31.160978289 -0600
-@@ -8,6 +8,8 @@
-  * @author John Levon
-  */
- 
-+#include "config.h"
-+
- #include "bfd_support.h"
- 
- #include "op_bfd.h"