[pkgsrc/pkgsrc-2006Q1]: pkgsrc/net/freewais-sf Pullup ticket 1297 - requested...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b5b413833f7
branches:  pkgsrc-2006Q1
changeset: 510180:5b5b413833f7
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Apr 01 03:33:25 2006 +0000

description:
Pullup ticket 1297 - requested by jlam
Tools paths and PLIST fixes for freewais-sf

Revisions pulled up:
- pkgsrc/net/freewais-sf/Makefile               1.25, 1.26
- pkgsrc/net/freewais-sf/PLIST                  1.6

   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Fri Mar 31 22:43:04 UTC 2006

   Modified Files:
        pkgsrc/net/freewais-sf: Makefile PLIST

   Log Message:
   List info files directly in the PLIST, and honor PKGMANDIR.
---
   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Fri Mar 31 22:54:23 UTC 2006

   Modified Files:
        pkgsrc/net/freewais-sf: Makefile

   Log Message:
   Fix paths to tools in installed files.  Bump the PKGREVISION to 4.

diffstat:

 net/freewais-sf/Makefile |  26 +++++++++++++++-----------
 net/freewais-sf/PLIST    |   3 ++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r a85b7ccb2a5c -r 5b5b413833f7 net/freewais-sf/Makefile
--- a/net/freewais-sf/Makefile  Fri Mar 31 10:46:25 2006 +0000
+++ b/net/freewais-sf/Makefile  Sat Apr 01 03:33:25 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2006/04/01 03:33:25 salo Exp $
 #
 
 DISTNAME=      freeWAIS-sf-2.2.12
 PKGNAME=       freewais-sf-2.2.12
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    net databases
 MASTER_SITES=  ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/freeWAIS-sf/
 
@@ -14,23 +14,27 @@
 NOT_FOR_PLATFORM=      Darwin-*-*
 
 USE_LIBTOOL=   yes
-USE_TOOLS+=    makeinfo perl:run
+USE_TOOLS+=    makeinfo gzcat:run gzip:run perl:run
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ENV+=                PREFIX=${PREFIX:Q}
 CONFIGURE_SCRIPT=      ./Configure
-CONFIGURE_ARGS+=       -sde -Dprefix=${PREFIX:Q} \
-                       -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS}
+CONFIGURE_ARGS+=       -sde -Dprefix=${PREFIX:Q}                       \
+                       -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS}       \
+                       -Dmansrc=${PREFIX:Q}/${PKGMANDIR:Q}/man1        \
+                       -Dgzip=${TOOLS_PATH.gzip:Q}                     \
+                       -Dzcat=${TOOLS_PATH.gzcat:Q}
 CONFIGURE_ENV+=                PERL5=${PERL5:Q}
-INSTALL_TARGET=        install install.man
-
-USE_MAKEINFO=  YES
-INFO_FILES=    fwsf.info
+INSTALL_TARGET=                install install.man
+INFO_FILES=            # PLIST
 
 post-build:
-       cd ${WRKSRC}/doc/SF; ${MAKEINFO} fwsf.texi
+       cd ${WRKSRC}/doc/SF && makeinfo fwsf.texi
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/SF/fwsf.info* ${PREFIX}/info
+       cd ${WRKSRC}/doc/SF; for f in fwsf.info fwsf.info-[0-9]*; do    \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+       done
 
 .include "../../mk/bsd.pkg.mk"
diff -r a85b7ccb2a5c -r 5b5b413833f7 net/freewais-sf/PLIST
--- a/net/freewais-sf/PLIST     Fri Mar 31 10:46:25 2006 +0000
+++ b/net/freewais-sf/PLIST     Sat Apr 01 03:33:25 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5.12.1 2006/04/01 03:33:25 salo Exp $
 bin/catalog
 bin/check-sources
 bin/dictionary
@@ -17,6 +17,7 @@
 bin/waisserver
 bin/ws
 include/wais.h
+info/fwsf.info
 lib/libwais.la
 man/man1/catalog.1
 man/man1/dictionary.1