Mon May 23 04:59:24 2016 UTC ()
Pullup ticket #4994 - requested by joerg
math/snns: build fix

Revisions pulled up:
- math/snns/Makefile                                            1.26
- math/snns/distinfo                                            1.8
- math/snns/patches/patch-ac                                    1.3
- math/snns/patches/patch-configure                             1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 10:04:00 UTC 2016

   Modified Files:
   	pkgsrc/math/snns: Makefile distinfo
   	pkgsrc/math/snns/patches: patch-ac
   Added Files:
   	pkgsrc/math/snns/patches: patch-configure

   Log Message:
   Fix missing X11BASE rpath. Bump revision.


(bsiegert)
diff -r1.25 -r1.25.4.1 pkgsrc/math/snns/Makefile
diff -r1.7 -r1.7.4.1 pkgsrc/math/snns/distinfo
diff -r1.2 -r1.2.12.1 pkgsrc/math/snns/patches/patch-ac
diff -r0 -r1.1.2.2 pkgsrc/math/snns/patches/patch-configure
cvs diff -r1.25 -r1.25.4.1 pkgsrc/math/snns/Makefile (expand / switch to unified diff)

--- pkgsrc/math/snns/Makefile 2015/10/14 20:17:27 1.25
+++ pkgsrc/math/snns/Makefile 2016/05/23 04:59:24 1.25.4.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.25 2015/10/14 20:17:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.25.4.1 2016/05/23 04:59:24 bsiegert Exp $
2 2
3DISTNAME= SNNSv4.3 3DISTNAME= SNNSv4.3
4PKGNAME= snns-4.3 4PKGNAME= snns-4.3
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= misc 6CATEGORIES= misc
7MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/ 7MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www-ra.informatik.uni-tuebingen.de/SNNS/ 10HOMEPAGE= http://www-ra.informatik.uni-tuebingen.de/SNNS/
11COMMENT= Software simulator for neural networks 11COMMENT= Software simulator for neural networks
12 12
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14CONFIGURE_ARGS+= --enable-global 14CONFIGURE_ARGS+= --enable-global
15 15
16XGUILOADPATH= ${PREFIX}/share/snns 16XGUILOADPATH= ${PREFIX}/share/snns
17 17
18INSTALLATION_DIRS+= share/snns share/doc/snns \ 18INSTALLATION_DIRS+= share/snns share/doc/snns \
cvs diff -r1.7 -r1.7.4.1 pkgsrc/math/snns/distinfo (expand / switch to unified diff)

--- pkgsrc/math/snns/distinfo 2015/11/03 23:33:44 1.7
+++ pkgsrc/math/snns/distinfo 2016/05/23 04:59:24 1.7.4.1
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 23:33:44 agc Exp $ 1$NetBSD: distinfo,v 1.7.4.1 2016/05/23 04:59:24 bsiegert Exp $
2 2
3SHA1 (SNNSv4.3.tar.gz) = a82ec6402a8c2d79740c71e1790743e351c54f81 3SHA1 (SNNSv4.3.tar.gz) = a82ec6402a8c2d79740c71e1790743e351c54f81
4RMD160 (SNNSv4.3.tar.gz) = fe796c37b2220bac6ba8a2067c567a92ba2555c0 4RMD160 (SNNSv4.3.tar.gz) = fe796c37b2220bac6ba8a2067c567a92ba2555c0
5SHA512 (SNNSv4.3.tar.gz) = a057dc946b581eee01334956c33d6870b8b994d1b835834d58c37ae3a8585dfb1206f3082b17a49ee97b22f4c07c0efb47e4e3ae5aeb37e97f69472da3e21f0b 5SHA512 (SNNSv4.3.tar.gz) = a057dc946b581eee01334956c33d6870b8b994d1b835834d58c37ae3a8585dfb1206f3082b17a49ee97b22f4c07c0efb47e4e3ae5aeb37e97f69472da3e21f0b
6Size (SNNSv4.3.tar.gz) = 5076669 bytes 6Size (SNNSv4.3.tar.gz) = 5076669 bytes
7SHA1 (patch-aa) = 805db03fe9d0a00d9d5318f17487a1d4607ac8a7 7SHA1 (patch-aa) = 805db03fe9d0a00d9d5318f17487a1d4607ac8a7
8SHA1 (patch-ac) = 78e4b3329fd91a6fb090b576451f2f6e1187aa37 8SHA1 (patch-ac) = 088e4f144709bade658d0ffdee9fc4bb20c0d37d
 9SHA1 (patch-configure) = 11e19f7f0f57c49c4bca2564f89a2ec690c05be5
cvs diff -r1.2 -r1.2.12.1 pkgsrc/math/snns/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/math/snns/patches/patch-ac 2014/12/10 23:25:15 1.2
+++ pkgsrc/math/snns/patches/patch-ac 2016/05/23 04:59:24 1.2.12.1
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.2 2014/12/10 23:25:15 joerg Exp $ 1$NetBSD: patch-ac,v 1.2.12.1 2016/05/23 04:59:24 bsiegert Exp $
2 2
3--- configuration/Makefile.din.orig Thu Sep 3 15:44:26 1998 3--- configuration/Makefile.din.orig Thu Sep 3 15:44:26 1998
4+++ configuration/Makefile.din 4+++ configuration/Makefile.din
5@@ -93,7 +93,7 @@ 5@@ -93,7 +93,7 @@
6 # Define library and include paths for the X system if headers and 6 # Define library and include paths for the X system if headers and
7 # libraries can not be found in standard places 7 # libraries can not be found in standard places
8 X_CFLAGS = @X_CFLAGS@ # REPORT_IF_BUG 8 X_CFLAGS = @X_CFLAGS@ # REPORT_IF_BUG
9-X_LIBS = @X_LIBS@ # REPORT_IF_BUG 9-X_LIBS = @X_LIBS@ # REPORT_IF_BUG
10+X_LIBS = ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib @X_LIBS@ # REPORT_IF_BUG 10+X_LIBS = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib @X_LIBS@
11  11
12 # Any extra libraries needed to be linked after all X libraries 12 # Any extra libraries needed to be linked after all X libraries
13 X_EXTRA_LIBS = @X_EXTRA_LIBS@ # REPORT_IF_BUG 13 X_EXTRA_LIBS = @X_EXTRA_LIBS@ # REPORT_IF_BUG
File Added: pkgsrc/math/snns/patches/patch-configure
$NetBSD: patch-configure,v 1.1.2.2 2016/05/23 04:59:24 bsiegert 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