[pkgsrc/trunk]: pkgsrc/x11/xterm correct manpage paths in INSTALL script and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bef10d371fe
branches:  trunk
changeset: 475334:5bef10d371fe
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri May 14 11:34:28 2004 +0000

description:
correct manpage paths in INSTALL script and only use install script
on Solaris.

diffstat:

 x11/xterm/INSTALL  |  4 ++--
 x11/xterm/Makefile |  7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 1409b53096d2 -r 5bef10d371fe x11/xterm/INSTALL
--- a/x11/xterm/INSTALL Fri May 14 11:29:19 2004 +0000
+++ b/x11/xterm/INSTALL Fri May 14 11:34:28 2004 +0000
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:08 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2004/05/14 11:34:28 grant Exp $
 
 PKGNAME=$1
 STAGE=$2
 
-CONFLICTS="bin/resize bin/xterm lib/app-defaults/XTerm share/man/man1/resize.1 share/man/man1/xterm.1"
+CONFLICTS="bin/resize bin/xterm lib/app-defaults/XTerm man/man1/resize.1 man/man1/xterm.1"
 
 case ${STAGE} in
 PRE-INSTALL)
diff -r 1409b53096d2 -r 5bef10d371fe x11/xterm/Makefile
--- a/x11/xterm/Makefile        Fri May 14 11:29:19 2004 +0000
+++ b/x11/xterm/Makefile        Fri May 14 11:34:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/14 11:24:49 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/14 11:34:28 grant Exp $
 
 DISTNAME=      ${PKGBASE}
 PKGNAME=       xterm-188
@@ -16,6 +16,9 @@
 USE_X11=       yes
 WRKSRC=                ${WRKDIR}/${PKGNAME}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
 INSTALL_FILE=  ${WRKDIR}/INSTALL
 DEINSTALL_FILE=        ${INSTALL_FILE}
 
@@ -30,5 +33,7 @@
 
 post-install:
        ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+.endif
 
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"