Support staged installation.

3 files changed, 28 insertions, 18 deletions

diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 62e0e56fcbb..33e800087ce 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/07/19 19:14:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2009/12/12 21:36:55 asau Exp $
 
 DISTNAME=		vslisp-4.0-1
 PKGNAME=		vslisp-4.0.1
@@ -10,17 +10,19 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://vslisp.sourceforge.net/
 COMMENT=		Embeddable Lisp library and standalone interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/vslisp-4.0
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vslisp
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vslisp/html
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vslisp
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vslisp/html
 	@for d in Colors.txt ColorsDemo.txt lisp.sgml ; do \
-	${INSTALL_DATA} ${WRKSRC}/Documentation/$$d \
-	${PREFIX}/share/doc/vslisp; done
+		${INSTALL_DATA} ${WRKSRC}/Documentation/$$d \
+		${DESTDIR}${PREFIX}/share/doc/vslisp; done
 	${INSTALL_DATA} ${WRKSRC}/Documentation/html/* \
-	${PREFIX}/share/doc/vslisp/html
+		${DESTDIR}${PREFIX}/share/doc/vslisp/html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/vslisp/distinfo b/lang/vslisp/distinfo
index 86f3993bd1a..0c2e0e28d56 100644
--- a/lang/vslisp/distinfo
+++ b/lang/vslisp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/12/12 21:36:55 asau Exp $
 
 SHA1 (vslisp-4.0-1.tar.gz) = ccd21360f6bd2a7f47638797a7a5d25d2f8cb797
 RMD160 (vslisp-4.0-1.tar.gz) = e958c708ae1b63e9761f61a02b44ad639f23df4f
 Size (vslisp-4.0-1.tar.gz) = 167403 bytes
 SHA1 (patch-aa) = 5a397669bed7663ccdbd86d57e7669a70d16b5e1
-SHA1 (patch-ab) = 645d4a4ffd6949b9406083744b71676220bf19be
+SHA1 (patch-ab) = e5ab8da3d66831d3d25f8765bd9f7e4729c9f5e1
 SHA1 (patch-ac) = 490975b1e19ee6aaaf05fb2ade1d79e805257540
 SHA1 (patch-ad) = a08e31d1c11aa8aae909c2641f4f80f4ca39413a
 SHA1 (patch-ae) = b39473d8008d48ba19fc980e374bc95c28996705
diff --git a/lang/vslisp/patches/patch-ab b/lang/vslisp/patches/patch-ab
index 156b5bf9d8b..a0948c15a64 100644
--- a/lang/vslisp/patches/patch-ab
+++ b/lang/vslisp/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/04 23:47:37 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/12 21:36:55 asau Exp $
 
---- src/Makefile.orig	Tue Nov 21 19:22:45 2000
-+++ src/Makefile
+--- src/Makefile.orig	2000-05-08 00:26:03.000000000 +0400
++++ src/Makefile	2009-12-13 00:31:06.000000000 +0300
 @@ -24,91 +24,91 @@
  
  # LSer - just a test SERVER programm
@@ -142,16 +142,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/04 23:47:37 jtb Exp $
  		$(LDLIBS)
  
  clean:
-@@ -168,14 +168,14 @@
- 	mkdir -p $(PREFIX)/bin/
- 	mkdir -p $(PREFIX)/lib/
- 	mkdir -p $(PREFIX)/include/
+@@ -165,17 +165,17 @@
+ 	$(RM) funcs.c
+ 
+ install: VSLisp libvslisp$(HIVER).la
+-	mkdir -p $(PREFIX)/bin/
+-	mkdir -p $(PREFIX)/lib/
+-	mkdir -p $(PREFIX)/include/
 -	../libtool --mode=install $(INSTALL) -s VSLisp $(PREFIX)/bin/
 -	../libtool --mode=install $(INSTALL) -s -m 644 libvslisp$(HIVER).la \
-+	@$(LIBTOOL) --mode=install $(INSTALL) -s VSLisp $(PREFIX)/bin/
+-		 $(PREFIX)/lib/libvslisp$(HIVER).la
+-	cp l_defs.h $(PREFIX)/include/
++	mkdir -p $(DESTDIR)$(PREFIX)/bin/
++	mkdir -p $(DESTDIR)$(PREFIX)/lib/
++	mkdir -p $(DESTDIR)$(PREFIX)/include/
++	@$(LIBTOOL) --mode=install $(INSTALL) -s VSLisp $(DESTDIR)$(PREFIX)/bin/
 +	@$(LIBTOOL) --mode=install $(INSTALL) -s -m 644 libvslisp$(HIVER).la \
- 		 $(PREFIX)/lib/libvslisp$(HIVER).la
- 	cp l_defs.h $(PREFIX)/include/
++		 $(DESTDIR)$(PREFIX)/lib/libvslisp$(HIVER).la
++	cp l_defs.h $(DESTDIR)$(PREFIX)/include/
  
  uninstall:
  	rm -f $(PREFIX)/bin/VSLisp