pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gauche Add user-destdir support, inspired by Gauc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3687d65dbcdf
branches:  trunk
changeset: 572142:3687d65dbcdf
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Feb 20 13:51:12 2010 +0000

description:
Add user-destdir support, inspired by Gauche.spec in source tarball.

diffstat:

 lang/gauche/Makefile |  11 ++++++-----
 lang/gauche/PLIST    |   5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r a83872458ffc -r 3687d65dbcdf lang/gauche/Makefile
--- a/lang/gauche/Makefile      Sat Feb 20 12:49:48 2010 +0000
+++ b/lang/gauche/Makefile      Sat Feb 20 13:51:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2009/11/27 09:26:06 enami Exp $
+# $NetBSD: Makefile,v 1.53 2010/02/20 13:51:12 obache Exp $
 #
 
 DISTNAME=      Gauche-0.9
@@ -13,8 +13,7 @@
 
 DEPENDS+=              slib-[0-9]*:../../devel/slib
 
-# XXX Wants to execute bin/gosh during installation
-#PKG_DESTDIR_SUPPORT=  user-destdir
+PKG_DESTDIR_SUPPORT=   user-destdir
 NOT_FOR_BULK_PLATFORM= HPUX-*-*
 
 .include "options.mk"
@@ -26,7 +25,6 @@
 CONFIGURE_ARGS+=       --with-slib=${SLIB_PREFIX}/share/slib
 CONFIGURE_ARGS+=       --enable-threads=pthreads
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
-MAKEVARS+=             DESTDIR
 
 CHECK_BUILTIN.iconv:=  no
 .include "../../converters/libiconv/builtin.mk"
@@ -41,7 +39,10 @@
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gzip makeinfo
 TEST_TARGET=   check
-INFO_FILES=    # PLIST
+INFO_FILES=    yes
+
+# refer %install in ${WRKSRC}/Gauche.spec
+INSTALL_TARGET=        install-pkg install-doc
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r a83872458ffc -r 3687d65dbcdf lang/gauche/PLIST
--- a/lang/gauche/PLIST Sat Feb 20 12:49:48 2010 +0000
+++ b/lang/gauche/PLIST Sat Feb 20 13:51:12 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/11/27 09:26:06 enami Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/02/20 13:51:12 obache Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -220,7 +220,7 @@
 share/gauche/${PKGVERSION}/lib/rfc/uri.scm
 share/gauche/${PKGVERSION}/lib/rfc/zlib.scm
 share/gauche/${PKGVERSION}/lib/slib.scm
-share/gauche/${PKGVERSION}/lib/slibcat
+@unexec ${RM} -f %D/share/gauche/${PKGVERSION}/lib/slibcat || ${TRUE}
 share/gauche/${PKGVERSION}/lib/srfi-0.scm
 share/gauche/${PKGVERSION}/lib/srfi-1.scm
 share/gauche/${PKGVERSION}/lib/srfi-11.scm
@@ -288,3 +288,4 @@
 share/gauche/${PKGVERSION}/template.test.scm
 @pkgdir lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}
 @pkgdir share/gauche/site/lib
+@exec %D/bin/gosh -ftest -uslib -E"require 'new-catalog" -Eexit || ${TRUE}



Home | Main Index | Thread Index | Old Index