pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xterm Rename the INSTALL script template to INSTAL...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/075e9112bbae
branches:  trunk
changeset: 495504:075e9112bbae
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jun 12 05:06:11 2005 +0000

description:
Rename the INSTALL script template to INSTALL.openwin so avoid triggering
the special handling in bsd.pkg.mk if ${PKGDIR}/INSTALL exists.  This
fixes PR pkg/30502.

diffstat:

 x11/xterm/INSTALL         |  43 -------------------------------------------
 x11/xterm/INSTALL.openwin |  43 +++++++++++++++++++++++++++++++++++++++++++
 x11/xterm/Makefile        |   4 ++--
 3 files changed, 45 insertions(+), 45 deletions(-)

diffs (112 lines):

diff -r 06a2552ebf6b -r 075e9112bbae x11/xterm/INSTALL
--- a/x11/xterm/INSTALL Sun Jun 12 04:03:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $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 man/man1/resize.1 man/man1/xterm.1"
-
-case ${STAGE} in
-PRE-INSTALL)
-       cd ${PKG_PREFIX}
-       for FILE in $CONFLICTS
-       do
-               if [ -f $FILE ]
-               then
-                       @MV@ $FILE ${FILE}.openwin
-               fi
-       done
-       ;;
-
-POST-INSTALL)
-       cd ${PKG_PREFIX}/lib/X11/etc
-       TERMINFO=@LOCALBASE@/share/lib/terminfo
-       export TERMINFO
-       /usr/5bin/tic xterm.terminfo
-       ;;
-
-DEINSTALL)
-       ;;
-       
-POST-DEINSTALL)
-       cd ${PKG_PREFIX}
-       for FILE in $CONFLICTS
-       do
-               if [ -f ${FILE}.openwin ]
-               then
-                       @MV@ ${FILE}.openwin $FILE
-               fi
-       done
-       ;;
-esac
-exit 0
diff -r 06a2552ebf6b -r 075e9112bbae x11/xterm/INSTALL.openwin
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xterm/INSTALL.openwin Sun Jun 12 05:06:11 2005 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL.openwin,v 1.1 2005/06/12 05:06:11 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CONFLICTS="bin/resize bin/xterm lib/app-defaults/XTerm man/man1/resize.1 man/man1/xterm.1"
+
+case ${STAGE} in
+PRE-INSTALL)
+       cd ${PKG_PREFIX}
+       for FILE in $CONFLICTS
+       do
+               if [ -f $FILE ]
+               then
+                       @MV@ $FILE ${FILE}.openwin
+               fi
+       done
+       ;;
+
+POST-INSTALL)
+       cd ${PKG_PREFIX}/lib/X11/etc
+       TERMINFO=@LOCALBASE@/share/lib/terminfo
+       export TERMINFO
+       /usr/5bin/tic xterm.terminfo
+       ;;
+
+DEINSTALL)
+       ;;
+       
+POST-DEINSTALL)
+       cd ${PKG_PREFIX}
+       for FILE in $CONFLICTS
+       do
+               if [ -f ${FILE}.openwin ]
+               then
+                       @MV@ ${FILE}.openwin $FILE
+               fi
+       done
+       ;;
+esac
+exit 0
diff -r 06a2552ebf6b -r 075e9112bbae x11/xterm/Makefile
--- a/x11/xterm/Makefile        Sun Jun 12 04:03:30 2005 +0000
+++ b/x11/xterm/Makefile        Sun Jun 12 05:06:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/04 17:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/12 05:06:11 jlam Exp $
 
 DISTNAME=      xterm-202
 CATEGORIES=    x11
@@ -29,7 +29,7 @@
        @${SED} -e 's#@MV@#${MV}#g' \
          -e 's#@LOCALBASE@#${LOCALBASE}#g' \
          -e 's#@PREFIX@#${PREFIX}#g' \
-         ${PKGDIR}/INSTALL >${INSTALL_FILE}
+         ${PKGDIR}/INSTALL.openwin >${INSTALL_FILE}
 
 pre-install:
        ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL



Home | Main Index | Thread Index | Old Index