[pkgsrc/trunk]: pkgsrc/archivers/file-roller Force pkgsrc's unzip so we can a...

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/953053a8d539
branches:  trunk
changeset: 399373:953053a8d539
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sat Sep 19 07:46:12 2009 +0000

description:
Force pkgsrc's unzip so we can actually list archive content on
NetBSD 5.99.16 with unzip in base.

diffstat:

 archivers/file-roller/Makefile |  13 +++++++++++--
 archivers/file-roller/distinfo |   3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r a0ea9c8dde6d -r 953053a8d539 archivers/file-roller/Makefile
--- a/archivers/file-roller/Makefile    Sat Sep 19 06:44:33 2009 +0000
+++ b/archivers/file-roller/Makefile    Sat Sep 19 07:46:12 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: Makefile,v 1.97 2009/09/19 07:46:12 ahoka Exp $
 #
 
 DISTNAME=      file-roller-2.26.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    archivers gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/file-roller/2.26/}
 EXTRACT_SUFX=  .tar.bz2
@@ -30,6 +30,15 @@
 BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libglade+=       libglade>=2.4.0
 
+# Force to use unzip from pkgsrc as other installed versions in path
+# may be incompatible. (For example NetBSD 6.0's unzip)
+#
+SUBST_CLASSES+=                unzip
+SUBST_STAGE.unzip=     pre-build
+SUBST_MESSAGE.unzip=   Hardcoding unzip path
+SUBST_FILES.unzip=     src/fr-command-zip.c
+SUBST_SED.unzip=       -e 's|@@UNZIP_COMMAND@@|${LOCALBASE}/bin/unzip|'
+
 # XXX force regen, bundled one doesn't fit
 # see gnome bugzilla #587869
 post-extract:
diff -r a0ea9c8dde6d -r 953053a8d539 archivers/file-roller/distinfo
--- a/archivers/file-roller/distinfo    Sat Sep 19 06:44:33 2009 +0000
+++ b/archivers/file-roller/distinfo    Sat Sep 19 07:46:12 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.48 2009/07/09 18:21:44 drochner Exp $
+$NetBSD: distinfo,v 1.49 2009/09/19 07:46:12 ahoka Exp $
 
 SHA1 (file-roller-2.26.3.tar.bz2) = 92760312c9dddec695851170c289f692c2521176
 RMD160 (file-roller-2.26.3.tar.bz2) = 4c8cb579c4849a6cdc92250df5b447f575be76a6
 Size (file-roller-2.26.3.tar.bz2) = 1561967 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
+SHA1 (patch-unzip) = d1abae47ce713af26875c972b351fcd4d00ca22e