Support staged installation.

9 files changed, 274 insertions, 4 deletions

diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 37437928d6a..c7d95dc2322 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/06/07 20:47:19 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2011/03/30 22:17:48 asau Exp $
 
 DISTNAME=	onyx-${VERS}
 CATEGORIES=	lang
@@ -11,6 +11,8 @@ COMMENT=	Embeddable stack-based threaded interpreted language
 
 BUILD_DEPENDS+=	cook-[0-9]*:../../devel/cook
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
 
@@ -25,10 +27,10 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} cook
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} cook install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} cook install
 
 post-install:
-	strip ${PREFIX}/bin/onyx
+	strip ${DESTDIR}${PREFIX}/bin/onyx
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/onyx/distinfo b/lang/onyx/distinfo
index 0f7bdeaf267..699dea65df4 100644
--- a/lang/onyx/distinfo
+++ b/lang/onyx/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.7 2009/06/07 20:47:19 mrg Exp $
+$NetBSD: distinfo,v 1.8 2011/03/30 22:17:48 asau Exp $
 
 SHA1 (onyx-5.1.2.tar.bz2) = 1164431e4c5d4fd5122b7d41698baefc1c70d63d
 RMD160 (onyx-5.1.2.tar.bz2) = 0ecca943f37eb9dfb6370c57e9932567a955ed59
 Size (onyx-5.1.2.tar.bz2) = 1397404 bytes
+SHA1 (patch-Cookfile.in) = 2f6d863d1f5b3cb62c9d0c1ae13ff4cb11070986
+SHA1 (patch-bin_onyx_Cookfile.inc.in) = 8babf137c15514ee613cc81be81dec77dfe166cb
+SHA1 (patch-bin_onyx__config_Cookfile.inc.in) = 225d5e570e05e73e4b14ba74304117673af38713
+SHA1 (patch-doc_latex_onyx_Cookfile.inc.in) = 6d560afe66ed73968341e3dd434f6b900d561af9
+SHA1 (patch-lib_libonyx_Cookfile.inc.in) = 0d50270348d45f2f11ae90fd198bb6bf736e95e5
+SHA1 (patch-mod_modclopt_Cookfile.inc.in) = ac0488df5307e23050daa7c43ba4fe4d862fd843
+SHA1 (patch-mod_modprompt_Cookfile.inc.in) = e0a846e5539197813fd76a9a98820bda940707c3
diff --git a/lang/onyx/patches/patch-Cookfile.in b/lang/onyx/patches/patch-Cookfile.in
new file mode 100644
index 00000000000..3374fce9577
--- /dev/null
+++ b/lang/onyx/patches/patch-Cookfile.in
@@ -0,0 +1,11 @@
+$NetBSD: patch-Cookfile.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- Cookfile.in.orig	2005-03-17 07:54:57.000000000 +0000
++++ Cookfile.in
+@@ -37,4 +37,6 @@
+  *
+  ******************************************************************************/
+ 
++DESTDIR = [getenv DESTDIR];
++
+ #include-cooked @objroot@/Cookfile.inc
diff --git a/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in b/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in
new file mode 100644
index 00000000000..432d085c1a0
--- /dev/null
+++ b/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in
@@ -0,0 +1,46 @@
+$NetBSD: patch-bin_onyx_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- bin/onyx/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
++++ bin/onyx/Cookfile.inc.in
+@@ -428,26 +428,26 @@ onyx_bins_check_update : onyx_bins_tests
+ onyx_bins_install : [ONYX] mods_install
+                     libonyx_libs_install_s
+ {
+-  @INSTALL@ -d [BINDIR];
++  @INSTALL@ -d [DESTDIR][BINDIR];
+ 
+-  @INSTALL@ -m 0755 [ONYX] [BINDIR]/onyx-@onyx_version@;
+-  rm -f [BINDIR]/onyx;
+-  ln -s onyx-@onyx_version@ [BINDIR]/onyx;
+-
+-  @INSTALL@ -d [MANDIR]/man1;
+-  @INSTALL@ -m 0444 @objroot@/bin/onyx/man/man1/onyx.1 [MANDIR]/man1;
+-
+-  @INSTALL@ -d [DATADIR];
+-  rm -f [DATADIR]/onyx;
+-  ln -s onyx-@onyx_version@ [DATADIR]/onyx;
++  @INSTALL@ -m 0755 [ONYX] [DESTDIR][BINDIR]/onyx-@onyx_version@;
++  rm -f [DESTDIR][BINDIR]/onyx;
++  ln -s onyx-@onyx_version@ [DESTDIR][BINDIR]/onyx;
++
++  @INSTALL@ -d [DESTDIR][MANDIR]/man1;
++  @INSTALL@ -m 0444 @objroot@/bin/onyx/man/man1/onyx.1 [DESTDIR][MANDIR]/man1;
++
++  @INSTALL@ -d [DESTDIR][DATADIR];
++  rm -f [DESTDIR][DATADIR]/onyx;
++  ln -s onyx-@onyx_version@ [DESTDIR][DATADIR]/onyx;
+ }
+ 
+ onyx_bins_uninstall :
+ {
+-  rm -f [BINDIR]/onyx-@onyx_version@;
+-  rm -f [BINDIR]/onyx;
+-  rm -f [MANDIR]/man1/onyx.1;
+-  rm -f [DATADIR]/onyx;
++  rm -f [DESTDIR][BINDIR]/onyx-@onyx_version@;
++  rm -f [DESTDIR][BINDIR]/onyx;
++  rm -f [DESTDIR][MANDIR]/man1/onyx.1;
++  rm -f [DESTDIR][DATADIR]/onyx;
+ }
+ 
+ onyx_bins_clean :
diff --git a/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in b/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in
new file mode 100644
index 00000000000..c8287047521
--- /dev/null
+++ b/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-bin_onyx__config_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- bin/onyx_config/Cookfile.inc.in.orig	2005-03-17 07:55:08.000000000 +0000
++++ bin/onyx_config/Cookfile.inc.in
+@@ -72,22 +72,22 @@ onyx_config_bins_install : [ONYX_CONFIG]
+                            mods_install
+                            onyx_bins_install
+ {
+-  @INSTALL@ -d [BINDIR];
++  @INSTALL@ -d [DESTDIR][BINDIR];
+ 
+-  @INSTALL@ -m 0755 [ONYX_CONFIG] [BINDIR]/onyx_config-@onyx_version@;
+-  rm -f [BINDIR]/onyx_config;
+-  ln -s onyx_config-@onyx_version@ [BINDIR]/onyx_config;
++  @INSTALL@ -m 0755 [ONYX_CONFIG] [DESTDIR][BINDIR]/onyx_config-@onyx_version@;
++  rm -f [DESTDIR][BINDIR]/onyx_config;
++  ln -s onyx_config-@onyx_version@ [DESTDIR][BINDIR]/onyx_config;
+ 
+-  @INSTALL@ -d [MANDIR]/man1;
++  @INSTALL@ -d [DESTDIR][MANDIR]/man1;
+   @INSTALL@ -m 0444 @objroot@/bin/onyx_config/man/man1/onyx_config.1
+-            [MANDIR]/man1;
++            [DESTDIR][MANDIR]/man1;
+ }
+ 
+ onyx_config_bins_uninstall :
+ {
+-  rm -f [BINDIR]/onyx_config-@onyx_version@;
+-  rm -f [BINDIR]/onyx_config;
+-  rm -f [MANDIR]/man1/onyx_config.1;
++  rm -f [DESTDIR][BINDIR]/onyx_config-@onyx_version@;
++  rm -f [DESTDIR][BINDIR]/onyx_config;
++  rm -f [DESTDIR][MANDIR]/man1/onyx_config.1;
+ }
+ 
+ onyx_config_bins_clean :
diff --git a/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in b/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in
new file mode 100644
index 00000000000..1a61dd905c7
--- /dev/null
+++ b/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in
@@ -0,0 +1,45 @@
+$NetBSD: patch-doc_latex_onyx_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- doc/latex/onyx/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
++++ doc/latex/onyx/Cookfile.inc.in
+@@ -82,31 +82,31 @@ onyx_docs_html :
+ 
+ onyx_docs_install_pdf : onyx_docs_pdf onyx_docs_install
+ {
+-  @INSTALL@ -d [DATADIR]/doc/onyx-@onyx_version@/pdf;
+-  @INSTALL@ -m 0444 [ONYX_PDF] [DATADIR]/doc/onyx-@onyx_version@/pdf;
++  @INSTALL@ -d [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/pdf;
++  @INSTALL@ -m 0444 [ONYX_PDF] [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/pdf;
+ }
+ 
+ onyx_docs_install_html : onyx_docs_html onyx_docs_install
+ {
+-  @INSTALL@ -d [DATADIR]/doc/onyx-@onyx_version@/html;
++  @INSTALL@ -d [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/html;
+ 
+   loop local f = [glob [dirname [ONYX_HTML]]"/*"]
+   {
+-    @INSTALL@ -m 0444 [f] [DATADIR]/doc/onyx-@onyx_version@/html;
++    @INSTALL@ -m 0444 [f] [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/html;
+   }
+ }
+ 
+ onyx_docs_install :
+ {
+-  @INSTALL@ -d [DATADIR]/doc;
+-  rm -f [DATADIR]/doc/onyx;
+-  ln -s onyx-@onyx_version@ [DATADIR]/doc/onyx;
++  @INSTALL@ -d [DESTDIR][DATADIR]/doc;
++  rm -f [DESTDIR][DATADIR]/doc/onyx;
++  ln -s onyx-@onyx_version@ [DESTDIR][DATADIR]/doc/onyx;
+ }
+ 
+ onyx_docs_uninstall :
+ {
+-  rm -rf [DATADIR]/doc/onyx-@onyx_version@;
+-  rm -f [DATADIR]/doc/onyx;
++  rm -rf [DESTDIR][DATADIR]/doc/onyx-@onyx_version@;
++  rm -f [DESTDIR][DATADIR]/doc/onyx;
+ }
+ 
+ onyx_docs_clean :
diff --git a/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in b/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in
new file mode 100644
index 00000000000..c34961de903
--- /dev/null
+++ b/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in
@@ -0,0 +1,65 @@
+$NetBSD: patch-lib_libonyx_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- lib/libonyx/Cookfile.inc.in.orig	2005-03-17 07:54:57.000000000 +0000
++++ lib/libonyx/Cookfile.inc.in
+@@ -235,10 +235,10 @@ libonyx_libs_install : libonyx_libs_inst
+ 
+ libonyx_libs_uninstall :
+ {
+-  rm -f [glob [LIBDIR]/libonyx*];
+-  rm -rf [INCLUDEDIR]/libonyx;
++  rm -f [glob [DESTDIR][LIBDIR]/libonyx*];
++  rm -rf [DESTDIR][INCLUDEDIR]/libonyx;
+ #if @enable_posix@
+-  rm -rf [DATADIR]/onyx-@onyx_version@/libonyx;
++  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx;
+ #endif
+ }
+ 
+@@ -303,37 +303,37 @@ libonyx_libs_install_i :
+                          [LIBONYX_INIT]
+ #endif
+ {
+-  @INSTALL@ -d [INCLUDEDIR]/libonyx;
++  @INSTALL@ -d [DESTDIR][INCLUDEDIR]/libonyx;
+ 
+   loop local f = [LIBONYX_INCS]
+   {
+-    @INSTALL@ -m 0644 [f] [INCLUDEDIR]/libonyx/;
++    @INSTALL@ -m 0644 [f] [DESTDIR][INCLUDEDIR]/libonyx/;
+   }
+ 
+ #if @enable_posix@
+-  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/libonyx;
++  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx;
+ 
+-  @INSTALL@ -m 0644 [LIBONYX_INIT] [DATADIR]/onyx-@onyx_version@/libonyx/;
++  @INSTALL@ -m 0644 [LIBONYX_INIT] [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx/;
+ #endif
+ }
+ 
+ libonyx_libs_install_common :
+ {
+-  @INSTALL@ -d [LIBDIR];
++  @INSTALL@ -d [DESTDIR][LIBDIR];
+ }
+ 
+ libonyx_libs_install_a : [LIBONYX_A] libonyx_libs_install_common
+ {
+-  @INSTALL@ -m 0444 [LIBONYX_A] [LIBDIR];
++  @INSTALL@ -m 0444 [LIBONYX_A] [DESTDIR][LIBDIR];
+ }
+ 
+ libonyx_libs_install_s : [LIBONYX_S] libonyx_libs_install_common
+ {
+-  @INSTALL@ -m 0444 [LIBONYX_S] [LIBDIR];
++  @INSTALL@ -m 0444 [LIBONYX_S] [DESTDIR][LIBDIR];
+ 
+ #if [count [LIBONYX_LNAME]]
+-  rm -f [LIBDIR]/[LIBONYX_LNAME];
+-  ln -s [LIBONYX_SNAME] [LIBDIR]/[LIBONYX_LNAME];
++  rm -f [DESTDIR][LIBDIR]/[LIBONYX_LNAME];
++  ln -s [LIBONYX_SNAME] [DESTDIR][LIBDIR]/[LIBONYX_LNAME];
+ #endif
+ }
+ 
diff --git a/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in b/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in
new file mode 100644
index 00000000000..af3e8460fc6
--- /dev/null
+++ b/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-mod_modclopt_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- mod/modclopt/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
++++ mod/modclopt/Cookfile.inc.in
+@@ -92,18 +92,18 @@ modclopt_mods_check_update : modclopt_mo
+ 
+ modclopt_mods_install :
+ {
+-  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nx/modclopt;
++  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt;
+ 
+   loop local f = [MODCLOPT_NX] [MODCLOPT_NX_GEN]
+   {
+-    @INSTALL@ -m 0644 [f] [DATADIR]/onyx-@onyx_version@/nx/modclopt/;
++    @INSTALL@ -m 0644 [f] [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt/;
+   }
+ }
+ 
+ modclopt_mods_uninstall :
+ {
+-  rm -f [DATADIR]/onyx-@onyx_version@/nxm/modclopt.nxm;
+-  rm -rf [DATADIR]/onyx-@onyx_version@/nx/modclopt;
++  rm -f [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm/modclopt.nxm;
++  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt;
+ }
+ 
+ modclopt_mods_clean :
diff --git a/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in b/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in
new file mode 100644
index 00000000000..862b3331296
--- /dev/null
+++ b/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in
@@ -0,0 +1,31 @@
+$NetBSD: patch-mod_modprompt_Cookfile.inc.in,v 1.1 2011/03/30 22:17:49 asau Exp $
+
+--- mod/modprompt/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
++++ mod/modprompt/Cookfile.inc.in
+@@ -73,20 +73,20 @@ modprompt_mods_check_update : ;
+ 
+ modprompt_mods_install : [MODPROMPT]
+ {
+-  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nxm;
+-  @INSTALL@ -m 0444 [MODPROMPT] [DATADIR]/onyx-@onyx_version@/nxm;
+-  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nx/modprompt;
++  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm;
++  @INSTALL@ -m 0444 [MODPROMPT] [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm;
++  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt;
+ 
+   loop local f = [MODPROMPT_NX] [MODPROMPT_NX_GEN]
+   {
+-    @INSTALL@ -m 0644 [f] [DATADIR]/onyx-@onyx_version@/nx/modprompt/;
++    @INSTALL@ -m 0644 [f] [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt/;
+   }
+ }
+ 
+ modprompt_mods_uninstall :
+ {
+-  rm -f [DATADIR]/onyx-@onyx_version@/nxm/modprompt.nxm;
+-  rm -rf [DATADIR]/onyx-@onyx_version@/nx/modprompt;
++  rm -f [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm/modprompt.nxm;
++  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt;
+ }
+ 
+ modprompt_mods_clean :