Fix missing X11BASE rpath. Bump revision.

4 files changed, 48 insertions, 6 deletions

diff --git a/math/snns/Makefile b/math/snns/Makefile
index c9b1dcb7495..051f7a40405 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2015/10/14 20:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2016/05/07 10:04:00 joerg Exp $
 
 DISTNAME=	SNNSv4.3
 PKGNAME=	snns-4.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/
 
diff --git a/math/snns/distinfo b/math/snns/distinfo
index 1233f79550b..814b8961468 100644
--- a/math/snns/distinfo
+++ b/math/snns/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:33:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/05/07 10:04:00 joerg Exp $
 
 SHA1 (SNNSv4.3.tar.gz) = a82ec6402a8c2d79740c71e1790743e351c54f81
 RMD160 (SNNSv4.3.tar.gz) = fe796c37b2220bac6ba8a2067c567a92ba2555c0
 SHA512 (SNNSv4.3.tar.gz) = a057dc946b581eee01334956c33d6870b8b994d1b835834d58c37ae3a8585dfb1206f3082b17a49ee97b22f4c07c0efb47e4e3ae5aeb37e97f69472da3e21f0b
 Size (SNNSv4.3.tar.gz) = 5076669 bytes
 SHA1 (patch-aa) = 805db03fe9d0a00d9d5318f17487a1d4607ac8a7
-SHA1 (patch-ac) = 78e4b3329fd91a6fb090b576451f2f6e1187aa37
+SHA1 (patch-ac) = 088e4f144709bade658d0ffdee9fc4bb20c0d37d
+SHA1 (patch-configure) = 11e19f7f0f57c49c4bca2564f89a2ec690c05be5
diff --git a/math/snns/patches/patch-ac b/math/snns/patches/patch-ac
index c660adaaacf..3d7d5e925b5 100644
--- a/math/snns/patches/patch-ac
+++ b/math/snns/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2014/12/10 23:25:15 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2016/05/07 10:04:00 joerg Exp $
 
 --- configuration/Makefile.din.orig	Thu Sep  3 15:44:26 1998
 +++ configuration/Makefile.din
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2014/12/10 23:25:15 joerg Exp $
  # libraries can not be found in standard places
  X_CFLAGS           = @X_CFLAGS@ # REPORT_IF_BUG
 -X_LIBS             = @X_LIBS@ # REPORT_IF_BUG
-+X_LIBS             = ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib @X_LIBS@ # REPORT_IF_BUG
++X_LIBS             = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib @X_LIBS@
  
  # Any extra libraries needed to be linked after all X libraries
  X_EXTRA_LIBS       = @X_EXTRA_LIBS@ # REPORT_IF_BUG
diff --git a/math/snns/patches/patch-configure b/math/snns/patches/patch-configure
new file mode 100644
index 00000000000..c4ad8643a5d
--- /dev/null
+++ b/math/snns/patches/patch-configure
@@ -0,0 +1,41 @@
+$NetBSD: patch-configure,v 1.1 2016/05/07 10:04:00 joerg Exp $
+
+--- configure.orig	2008-04-21 07:58:11.000000000 +0000
++++ configure
+@@ -3706,9 +3706,9 @@ else
+     X_LIBS="$X_LIBS -L$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+-    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++    { echo "$as_me:$LINENO: checking whether ${COMPILER_RPATH_FLAG} must be followed by a space" >&5
++echo $ECHO_N "checking whether ${COMPILER_RPATH_FLAG} must be followed by a space... $ECHO_C" >&6; }
++    ac_xsave_LIBS=$LIBS; LIBS="$LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+     ac_xsave_c_werror_flag=$ac_c_werror_flag
+     ac_c_werror_flag=yes
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -3746,12 +3746,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+        $as_test_x conftest$ac_exeext; then
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+-       X_LIBS="$X_LIBS -R$x_libraries"
++       X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	LIBS="$ac_xsave_LIBS -R $x_libraries"
++	LIBS="$ac_xsave_LIBS ${COMPILER_RPATH_FLAG} $x_libraries"
+        cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3787,7 +3787,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+        $as_test_x conftest$ac_exeext; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+-	  X_LIBS="$X_LIBS -R $x_libraries"
++	  X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG} $x_libraries"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5