pkg/37897: diff: update lange/gauche to latest release, support DESTDIR

[asau%inbox.ru@localhost]

>Number:         37897
>Category:       pkg
>Synopsis:       diff: update lange/gauche to latest release, support DESTDIR
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 29 12:15:00 +0000 2008
>Originator:     Aleksej Saushev
>Release:        
>Organization:
>Environment:
>Description:
Newer lang/gauche is available, current package lacks DESTDIR support,
it is broken at last (see pkg/37458).
>How-To-Repeat:
Code inspection, also pkg/37458.
>Fix:
Add patch:

--- lib/Makefile.in.orig        Tue Jan 29 14:46:09 2008
+++ lib/Makefile.in     Tue Jan 29 14:46:19 2008
@@ -102,7 +102,7 @@
 # installation script.
 slibcat : 
        if test -f $(SLIB_DIR)/require.scm; then \
-         $(exec_prefix)/bin/gosh -ftest -uslib -E"require 'new-catalog" 
-Eexit;\
+         $(exec_prefix)/bin/gosh -ftest -uslib -E"slib:require 'new-catalog" 
-Eexit;\
        fi
 
 # Some package systems don't allow to run postinstall commands.  For such


Apply patch (supersedes pkg/37458):

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile    3 Nov 2007 22:36:49 -0000       1.43
+++ Makefile    29 Jan 2008 12:00:07 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.43 2007/11/03 22:36:49 rillig Exp $
 #
 
-DISTNAME=      Gauche-0.8.9
+DISTNAME=      Gauche-0.8.12
 PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gauche/}
@@ -13,6 +13,8 @@
 
 DEPENDS+=      slib-[0-9]*:../../devel/slib
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "options.mk"
 
 EVAL_PREFIX+=          SLIB_PREFIX=slib
@@ -36,6 +38,6 @@
 .include "../../mk/pthread.buildlink3.mk"
 
 post-install:
-       gzip -d ${PREFIX}/${PKGINFODIR}/gauche-ref*gz
+       gzip -d ${DESTDIR}${PREFIX}/${PKGINFODIR}/gauche-ref*gz
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- PLIST       19 Jan 2007 12:59:01 -0000      1.15
+++ PLIST       29 Jan 2008 12:00:07 -0000
@@ -169,7 +169,6 @@
 share/gauche/${PKGVERSION}/lib/rfc/sha1.scm
 share/gauche/${PKGVERSION}/lib/rfc/uri.scm
 share/gauche/${PKGVERSION}/lib/slib.scm
-share/gauche/${PKGVERSION}/lib/slibcat
 share/gauche/${PKGVERSION}/lib/srfi-0.scm
 share/gauche/${PKGVERSION}/lib/srfi-1.scm
 share/gauche/${PKGVERSION}/lib/srfi-11.scm
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo    19 Jan 2007 12:59:01 -0000      1.21
+++ distinfo    29 Jan 2008 12:00:07 -0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2007/01/19 12:59:01 uebayasi Exp $
+$NetBSD$
 
-SHA1 (Gauche-0.8.9.tgz) = 5d150708e3363e56b7e99e483d7f8e19937e9916
-RMD160 (Gauche-0.8.9.tgz) = b9b5a78e99c65db31c4fe6e3f6e90083a928f1e6
-Size (Gauche-0.8.9.tgz) = 3080645 bytes
-SHA1 (patch-aa) = 4051468ba1fee56927f0d1bc61b7310432655279
-SHA1 (patch-ae) = ab7aacbfe88450674cf56458c6000bc895b6f91e
+SHA1 (Gauche-0.8.12.tgz) = d2c2e7f3ee1feaf79c563d83adfb76175019ef82
+RMD160 (Gauche-0.8.12.tgz) = cfb56f1a427a6ed5e7c7c2bb2ceac7f8c104b78d
+Size (Gauche-0.8.12.tgz) = 3253476 bytes
+SHA1 (patch-aa) = 67e3ecae786c9e897e1f49a5103f0f396b6361f3
+SHA1 (patch-ae) = 2cfd522b94d7468ca671d6bd1c830b6edf7f5aa5
 SHA1 (patch-af) = cfa1772da7f0dd90a9f4a53c2d1e0b27a74a24ee
 SHA1 (patch-ag) = ee9946e364d6723b0efe3b260fc5d02ccb04621d
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patches/patch-aa    19 Jan 2007 12:59:01 -0000      1.8
+++ patches/patch-aa    29 Jan 2008 12:00:07 -0000
@@ -2,15 +2,6 @@
 
 --- configure.orig     2007-01-18 04:18:59.000000000 +0900
 +++ configure
-@@ -1619,7 +1619,7 @@ _ACEOF
- 
-       THREADLIBS="-lpthread -lrt"
-       ;;
--    *-*-freebsd*)
-+    *-*-freebsd*|*-*-dragonfly*)
-       { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support 
threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with 
Boehm GC.\"" >&2;}
- 
 @@ -7426,7 +7426,72 @@ fi
  
  
@@ -85,15 +76,6 @@
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -9068,7 +9133,7 @@ case $target in
-     SHLIB_MAIN_LDFLAGS=""
-     SHLIB_OK=ok
-     ;;
--  *-linux-gnu|*freebsd*)
-+  *-linux-gnu|*freebsd*|*dragonfly*)
-     SHLIB_SO_CFLAGS="-fPIC"
-     SHLIB_SO_LDFLAGS="$rpath -shared -o"
-     SHLIB_SO_SUFFIX="so"
 @@ -9466,7 +9531,9 @@ fi;
  if test "${with_iconv_lib+set}" = set; then
    withval="$with_iconv_lib"
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/patches/patch-ae,v
retrieving revision 1.11
diff -u -r1.11 patch-ae
--- patches/patch-ae    19 Jan 2007 12:59:02 -0000      1.11
+++ patches/patch-ae    29 Jan 2008 12:00:07 -0000
@@ -1,24 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2007/01/19 12:59:02 uebayasi Exp $
+$NetBSD$
 
---- gc/configure.orig  2007-01-18 04:19:02.000000000 +0900
-+++ gc/configure
-@@ -4040,7 +4040,7 @@ _ACEOF
-       { echo "$as_me:$LINENO: WARNING: \"Only HP-UX 11 POSIX threads are 
supported.\"" >&5
- echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
-       ;;
--     *-*-freebsd*)
-+     *-*-freebsd* | *-*-dragonfly*)
-       { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support 
threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with 
Boehm GC.\"" >&2;}
-       cat >>confdefs.h <<\_ACEOF
-@@ -4822,13 +4822,13 @@ darwin* | rhapsody*)
-   esac
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
+--- gc/configure.orig  Tue Oct 30 02:03:24 2007
++++ gc/configure       Tue Jan 29 14:06:16 2008
+@@ -4822,7 +4822,7 @@
      i*86 )
        # Not sure whether the presence of OpenBSD here was a mistake.
        # Let's accept both of them until this is cleared up.
@@ -27,21 +11,3 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7324,7 +7324,7 @@ else
-     ;;
- 
-   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
-+  freebsd* | dragonfly*)
-     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -7783,7 +7783,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in