3 files changed, 16 insertions, 24 deletions
diff --git a/development/spl/curses.patch b/development/spl/curses.patch
new file mode 100644
index 0000000000000..1c414f86851bb
--- /dev/null
+++ b/development/spl/curses.patch
@@ -0,0 +1,12 @@
+diff -Nur a/GNUmakefile b/GNUmakefile
+--- a/GNUmakefile	2008-09-18 07:34:23.000000000 -0700
++++ b/GNUmakefile	2012-05-21 20:30:28.369555445 -0700
+@@ -139,7 +139,7 @@
+ 
+ ifeq ($(BUILDING_FOR_BSD),0)
+   LDLIBS_DL = -ldl
+-  LDLIBS_CURSES = -lncurses
++  LDLIBS_CURSES = -lncursesw
+ else
+   LDLIBS_DL =
+   LDLIBS_CURSES = -lcurses
diff --git a/development/spl/fix-Makefile.patch b/development/spl/fix-Makefile.patch
deleted file mode 100644
index 37bc6c50108de..0000000000000
--- a/development/spl/fix-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur spl-1.0pre6.orig//GNUmakefile spl-1.0pre6/GNUmakefile
---- spl-1.0pre6.orig//GNUmakefile	2008-09-18 07:34:23.000000000 -0700
-+++ spl-1.0pre6/GNUmakefile	2012-05-18 19:04:38.769984565 -0700
-@@ -102,7 +102,7 @@
- # Set this to '1' if you want to build an unoptimized SPL
- # library with debug symbols.
- #
--BUILD_WITH_DEBUG = 1
-+BUILD_WITH_DEBUG = 0
- 
- # Set this to '1' if you are doing SPL core development
- #
-@@ -225,7 +225,7 @@
- ifeq ($(BUILD_WITH_DEBUG),1)
-   CFLAGS += -O1 -ggdb
- else
--  CFLAGS += -Os -fomit-frame-pointer
-+  CFLAGS += -fomit-frame-pointer $(SLCKFLAGS)
- endif
- 
- ifeq ($(BUILD_WITH_WERROR),1)
diff --git a/development/spl/spl.SlackBuild b/development/spl/spl.SlackBuild
index 27cf365050a35..c65ff4289b5e7 100644
--- a/development/spl/spl.SlackBuild
+++ b/development/spl/spl.SlackBuild
@@ -5,7 +5,7 @@
 
 PRGNAM=spl
 VERSION=${VERSION:-1.0pre6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,10 +51,11 @@ find . \
   -o -perm 400 \) -exec chmod 644 {} \;
 
 # Allow custom options in Makefile
-patch -p1 < $CWD/fix-Makefile.patch
+patch -p1 < $CWD/curses.patch
 
 make install \
-  OPTS="$SLKCFLAGS" \
+  USER_CFLAGS="$SLKCFLAGS" \
+  BUILD_WITH_DEBUG=0 \
   prefix=/usr \
   mandir=/usr/man \
   libdir=/usr/lib${LIBDIRSUFFIX} \