[pkgsrc/trunk]: pkgsrc/lang/sr sr-2.3.3nb2: create correct X11 linking instru...

[is <is%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27312e9c85f8
branches:  trunk
changeset: 490389:27312e9c85f8
user:      is <is%pkgsrc.org@localhost>
date:      Tue Mar 08 13:49:49 2005 +0000

description:
sr-2.3.3nb2: create correct X11 linking instructions.

diffstat:

 lang/sr/Makefile         |  16 ++++++++++------
 lang/sr/distinfo         |   4 ++--
 lang/sr/patches/patch-aa |  15 +++++++++------
 3 files changed, 21 insertions(+), 14 deletions(-)

diffs (87 lines):

diff -r 812bd82f778c -r 27312e9c85f8 lang/sr/Makefile
--- a/lang/sr/Makefile  Tue Mar 08 13:26:31 2005 +0000
+++ b/lang/sr/Makefile  Tue Mar 08 13:49:49 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/03/02 13:47:45 is Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/08 13:49:49 is Exp $
 #
 
 DISTNAME=              sr233
 PKGNAME=               sr-2.3.3
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            lang parallel
 MASTER_SITES=          ftp://ftp.cs.arizona.edu/sr/
 EXTRACT_SUFX=          .tar.Z
@@ -22,10 +22,14 @@
 TEST_TARGET=           verify
 
 pre-configure:
-                       ${MV} ${WRKSRC}/Configuration ${WRKSRC}/Configuration.template
-                       ${SED} -e 's,_LOCALBASE_,${LOCALBASE},' \
-                               -e 's,_WRKSRC_,${WRKSRC},' \
-                               ${WRKSRC}/Configuration.template > ${WRKSRC}/Configuration
+                       ${MV} ${WRKSRC}/Configuration \
+                               ${WRKSRC}/Configuration.template
+                       ${SED}  -e 's,_LOCALBASE_,${LOCALBASE},g' \
+                               -e 's,_WRKSRC_,${WRKSRC},g' \
+                               -e 's,_XINC_,${X11BASE}/include,g' \
+                               -e 's,_XLIB_,${X11BASE}/lib,g' \
+                               ${WRKSRC}/Configuration.template \
+                               > ${WRKSRC}/Configuration
 
 pre-install:
                        -${MKDIR} ${LOCALBASE}/lib/sr
diff -r 812bd82f778c -r 27312e9c85f8 lang/sr/distinfo
--- a/lang/sr/distinfo  Tue Mar 08 13:26:31 2005 +0000
+++ b/lang/sr/distinfo  Tue Mar 08 13:49:49 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/03/02 21:07:06 is Exp $
+$NetBSD: distinfo,v 1.14 2005/03/08 13:49:49 is Exp $
 
 SHA1 (sr233.tar.Z) = 0354987527ed1e84c32d3b1fc6bacb65d647f337
 Size (sr233.tar.Z) = 1424566 bytes
-SHA1 (patch-aa) = eef6cfc94c6aa73b52d152112e9cee007fb90906
+SHA1 (patch-aa) = 8df83950498d807024f00ba806613aff99a318e9
 SHA1 (patch-ab) = 2a086280fefb4acddd19cb3cbafd58f8de5b309e
 SHA1 (patch-ad) = 7fc00d7f52a16dc7b814c94c795bb5d7af02e58b
 SHA1 (patch-ar) = 9a331cdb90959d0cc7475d2fc203d2c302d4bf5c
diff -r 812bd82f778c -r 27312e9c85f8 lang/sr/patches/patch-aa
--- a/lang/sr/patches/patch-aa  Tue Mar 08 13:26:31 2005 +0000
+++ b/lang/sr/patches/patch-aa  Tue Mar 08 13:49:49 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/03/01 11:18:43 is Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/08 13:49:49 is Exp $
 
---- Configuration.orig 1999-08-14 01:42:02.000000000 +0200
+--- Configuration.orig 2005-01-18 16:11:10.000000000 +0000
 +++ Configuration
-@@ -26,13 +26,13 @@ VERSION = "SR version 2.3.2, August 1999
+@@ -26,13 +26,13 @@ VERSION = "SR version 2.3.3"
  #     MAN5:   directory in which to install the srmap/srtrace(5) man pages
  #             (extension will be `tr 1 5` of MANEXT)
  
@@ -39,17 +39,20 @@
  
  LIBC = 
 -LIBR =  -L/usr/X11/lib
-+LIBR =  -L/usr/X11R6/lib
++LIBR = -R_XLIB_ -L_XLIB_
  LIBM = -lm
  
  
-@@ -98,7 +98,7 @@ LIBM = -lm
+@@ -95,10 +95,10 @@ LIBM = -lm
+ #   If not set, SRanimator is not built.
+ #
+ #   for Sun Solaris 2.x, set XINCL = /usr/openwin/include
 -#   for NetBSD, set XINCL = /usr/X386/include
 +#   for NetBSD, set XINCL = /usr/X11R6/include
  #   for Linux, set XINCL = /usr/X11/include
  
 -XINCL = /usr/include
-+XINCL = /usr/X11R6/include
++XINCL = _XINC_
  XTANGO =