summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-20 18:15:37 +0000
committerjlam <jlam@pkgsrc.org>2006-03-20 18:15:37 +0000
commit741aecb60794fe08a7a2c61bfcc516bee56c6a2b (patch)
tree0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /textproc
parent6132a5c7603ce3eb9c6eaaf83c45b47f9e30fa6d (diff)
downloadpkgsrc-741aecb60794fe08a7a2c61bfcc516bee56c6a2b.tar.gz
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead. * Properly account for split info files during installation. * Move info file listings directly into the package PLISTs. This fixes info-file-related PLIST problems.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/wdiff/Makefile17
-rw-r--r--textproc/wdiff/PLIST3
2 files changed, 12 insertions, 8 deletions
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index d4ac6edae7d..172f65ba2e2 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/20 18:15:39 jlam Exp $
#
DISTNAME= wdiff-0.5
@@ -15,8 +15,8 @@ CONFIGURE_HAS_INFODIR= no
CONFIGURE_HAS_MANDIR= no
USE_TOOLS+= makeinfo
-INFO_FILES= wdiff.info
-INSTALLATION_DIRS= bin ${INFO_DIR} ${PKGMANDIR}/man1 share/doc/wdiff
+INFO_FILES= # PLIST
+INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/wdiff
# pkgsrc does not provide libtermcap, but ncurses does provide
# libtermcap routines.
@@ -26,9 +26,12 @@ BUILDLINK_TRANSFORM+= l:termcap:ncurses
.endif
do-install:
- ${INSTALL_MAN} ${WRKSRC}/wdiff.1 ${PREFIX}/${PKGMANDIR}/man1/
- ${INSTALL_MAN} ${WRKSRC}/wdiff.info ${PREFIX}/${INFO_DIR}/
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wdiff/
- ${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/wdiff.1 ${PREFIX}/${PKGMANDIR}/man1
+ cd ${WRKSRC}; for f in wdiff.info wdiff.info-[0-9]*; do \
+ ${TEST} ! -f "$$f" || \
+ ${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR}; \
+ done
+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wdiff
+ ${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/wdiff/PLIST b/textproc/wdiff/PLIST
index 985f29f2611..36a76ef3f83 100644
--- a/textproc/wdiff/PLIST
+++ b/textproc/wdiff/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/08 19:06:25 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:39 jlam Exp $
bin/wdiff
man/man1/wdiff.1
+info/wdiff.info
share/doc/wdiff/README
@dirrm share/doc/wdiff