diff options
| author | grant <grant> | 2004-05-14 11:34:28 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-05-14 11:34:28 +0000 |
| commit | ccc02bf8258543f53cb52fe6747a1f1c4ad9da39 (patch) | |
| tree | 418044a0c7b2e4b4e79451cd9dd6f4af6e11eb94 /x11/xterm | |
| parent | 73651b1ab5f27cd48179525a4ac6564016bbd4a4 (diff) | |
| download | pkgsrc-ccc02bf8258543f53cb52fe6747a1f1c4ad9da39.tar.gz | |
correct manpage paths in INSTALL script and only use install script
on Solaris.
Diffstat (limited to 'x11/xterm')
| -rw-r--r-- | x11/xterm/INSTALL | 4 | ||||
| -rw-r--r-- | x11/xterm/Makefile | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/x11/xterm/INSTALL b/x11/xterm/INSTALL index fad096a3545..f711bd4d216 100644 --- a/x11/xterm/INSTALL +++ b/x11/xterm/INSTALL @@ -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 --git a/x11/xterm/Makefile b/x11/xterm/Makefile index fa0b34a283d..fae76166f55 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -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_BUILDLINK3= yes 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 @@ pre-install: post-install: ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.endif +.include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |