DESTDIR support.

4 files changed, 36 insertions, 7 deletions

diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index 6a940b2ee35..e52eb71b23b 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/06/30 00:07:18 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/03 13:01:43 is Exp $
 #
 
 DISTNAME=		sr233
@@ -12,6 +12,8 @@ MAINTAINER=		is@NetBSD.org
 HOMEPAGE=		http://www.cs.arizona.edu/sr/
 COMMENT=		The SR language compiler and run time system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 WRKSRC= ${WRKDIR}
@@ -27,8 +29,8 @@ SUBST_SED.sr+=		-e 's,_XINC_,${X11BASE}/include,g'
 SUBST_SED.sr+=		-e 's,_XLIB_,${X11BASE}/lib,g'
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin
-	cd ${WRKSRC}/ps && ${INSTALL_DATA} *.ps ${PREFIX}/share/doc/sr
+	${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC}/ps && ${INSTALL_DATA} *.ps ${DESTDIR}${PREFIX}/share/doc/sr
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sr/distinfo b/lang/sr/distinfo
index 24b8653dfee..e639f32514d 100644
--- a/lang/sr/distinfo
+++ b/lang/sr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2005/04/05 15:58:05 is Exp $
+$NetBSD: distinfo,v 1.20 2010/03/03 13:01:43 is Exp $
 
 SHA1 (sr233.tar.Z) = 0354987527ed1e84c32d3b1fc6bacb65d647f337
 RMD160 (sr233.tar.Z) = 58c90c06abede7a15ca8a68f53b6fdfa575c79df
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 8df83950498d807024f00ba806613aff99a318e9
 SHA1 (patch-ab) = 2a086280fefb4acddd19cb3cbafd58f8de5b309e
 SHA1 (patch-ad) = 7fc00d7f52a16dc7b814c94c795bb5d7af02e58b
 SHA1 (patch-ar) = 9a331cdb90959d0cc7475d2fc203d2c302d4bf5c
-SHA1 (patch-as) = 6e959d3d151499dabdc9e9ee056d5f8187d83074
+SHA1 (patch-as) = db45b9cbc7adf8fccc207e91041a544e427c7a2a
 SHA1 (patch-at) = 989ea8ecf79a9f5d0567c53a2c9580b4ecc634c9
 SHA1 (patch-au) = 701c53883b3661c578dc5b192a9779e7fdc503f5
 SHA1 (patch-av) = 1beabb719e6f4a1d1872bd66c73d0d1169686770
@@ -25,3 +25,4 @@ SHA1 (patch-bg) = 3d3357f00129d8b6141506e700c4ae4da556a39a
 SHA1 (patch-bh) = c880064e871297a411e2292f78d82222bb46dac4
 SHA1 (patch-bi) = ad6706295ff164fe6df257d325a06f9b157175d1
 SHA1 (patch-bj) = cd46d268fc173fe02efa8338ebf3f664ff2e5b94
+SHA1 (patch-bk) = 7ec4207ea173377fd6de9dc6272ab20e48ef0780
diff --git a/lang/sr/patches/patch-as b/lang/sr/patches/patch-as
index fc3959ad130..ac66dcfbcf2 100644
--- a/lang/sr/patches/patch-as
+++ b/lang/sr/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.2 2005/02/26 18:49:08 is Exp $
+$NetBSD: patch-as,v 1.3 2010/03/03 13:01:43 is Exp $
 
---- Makefile.orig	2005-02-26 19:44:59.000000000 +0100
+--- Makefile.orig	2005-01-18 17:11:10.000000000 +0100
 +++ Makefile
 @@ -4,7 +4,7 @@
  
@@ -11,6 +11,15 @@ $NetBSD: patch-as,v 1.2 2005/02/26 18:49:08 is Exp $
  MAKE = make
  SHELL = /bin/sh
  
+@@ -38,7 +38,7 @@ all:	config
+ 
+ ##  Install everything.
+ 
+-install:  paths.sh	; sh install.sh
++install:  paths.sh	; sh install.sh ${DESTDIR}
+ 
+ 
+ 
 @@ -264,3 +264,6 @@ srvdist:
  	srv/srv  quick/vm  examples/mbrot  examples/remote  \
  	    create/args2  create/chairs  global/3  global/4  global/5  \
diff --git a/lang/sr/patches/patch-bk b/lang/sr/patches/patch-bk
new file mode 100644
index 00000000000..a7ee39f72ef
--- /dev/null
+++ b/lang/sr/patches/patch-bk
@@ -0,0 +1,17 @@
+$NetBSD: patch-bk,v 1.1 2010/03/03 13:01:43 is Exp $
+
+--- install.sh.orig	1999-07-28 22:42:21.000000000 +0200
++++ install.sh
+@@ -3,6 +3,12 @@
+ #  Install SR.
+ 
+ . ./paths.sh
++
++for var in SRCMD SRLIB MAN1 MAN3 MAN5; do
++	eval val=\$${var}
++	eval ${var}=$1${val}
++done
++
+ if [ -z "$SRCMD" -o -z "$SRLIB" ]; then
+     echo 'cannot install -- SRCMD or SRLIB is null' 1>&2
+     exit 1