diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm/DEINSTALL | 4 | ||||
-rw-r--r-- | x11/lesstif/DEINSTALL | 10 | ||||
-rw-r--r-- | x11/lesstif/INSTALL | 10 | ||||
-rw-r--r-- | x11/openmotif/DEINSTALL | 10 | ||||
-rw-r--r-- | x11/openmotif/INSTALL | 10 | ||||
-rw-r--r-- | x11/xterm/INSTALL | 13 |
6 files changed, 10 insertions, 47 deletions
diff --git a/x11/gdm/DEINSTALL b/x11/gdm/DEINSTALL index c565b92880d..e4a77770f60 100644 --- a/x11/gdm/DEINSTALL +++ b/x11/gdm/DEINSTALL @@ -1,6 +1,6 @@ -# $NetBSD: DEINSTALL,v 1.2 2003/01/10 17:26:55 jmmv Exp $ +# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:23:07 jlam Exp $ -if [ "$2" != POST-DEINSTALL ] +if [ "$2" = DEINSTALL ] then cd @GDMCFGDIR@ @RM@ -f Sessions/Default diff --git a/x11/lesstif/DEINSTALL b/x11/lesstif/DEINSTALL index bc6da8aeb0c..5b20beca0b2 100644 --- a/x11/lesstif/DEINSTALL +++ b/x11/lesstif/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:11:11 zuntum Exp $ +# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -21,9 +21,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak @@ -45,10 +42,5 @@ POST-DEINSTALL) ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/x11/lesstif/INSTALL b/x11/lesstif/INSTALL index 3f1b416791e..61ab91ea8c6 100644 --- a/x11/lesstif/INSTALL +++ b/x11/lesstif/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2003/05/06 17:43:10 jmmv Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -20,9 +20,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] then @@ -49,10 +46,5 @@ POST-INSTALL) ${LOCALBASE}/share/aclocal/ac_find_motif.m4 fi ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 diff --git a/x11/openmotif/DEINSTALL b/x11/openmotif/DEINSTALL index eede819f09f..581235a003e 100644 --- a/x11/openmotif/DEINSTALL +++ b/x11/openmotif/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.3 2003/05/19 19:43:16 jschauma Exp $ +# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:23:08 jlam Exp $ X11BASE=@X11BASE@ MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules @@ -7,9 +7,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -DEINSTALL) - ;; - POST-DEINSTALL) ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak @@ -32,9 +29,4 @@ POST-DEINSTALL) ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac diff --git a/x11/openmotif/INSTALL b/x11/openmotif/INSTALL index 8aed73c210f..8b580cef0a0 100644 --- a/x11/openmotif/INSTALL +++ b/x11/openmotif/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.4 2003/05/19 19:43:17 jschauma Exp $ +# $NetBSD: INSTALL,v 1.5 2003/08/30 20:23:08 jlam Exp $ X11BASE=@X11BASE@ MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules @@ -7,9 +7,6 @@ X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def case ${STAGE} in -PRE-INSTALL) - ;; - POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} ] then @@ -38,9 +35,4 @@ POST-INSTALL) ${RM} -f ${HOSTDEF}.bak ${ECHO} "done." ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; esac diff --git a/x11/xterm/INSTALL b/x11/xterm/INSTALL index 36c63f64133..fad096a3545 100644 --- a/x11/xterm/INSTALL +++ b/x11/xterm/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/12/17 14:47:02 tron Exp $ +# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:08 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -9,7 +9,7 @@ CONFLICTS="bin/resize bin/xterm lib/app-defaults/XTerm share/man/man1/resize.1 s case ${STAGE} in PRE-INSTALL) - cd @PREFIX@ + cd ${PKG_PREFIX} for FILE in $CONFLICTS do if [ -f $FILE ] @@ -20,7 +20,7 @@ PRE-INSTALL) ;; POST-INSTALL) - cd @PREFIX@/lib/X11/etc + cd ${PKG_PREFIX}/lib/X11/etc TERMINFO=@LOCALBASE@/share/lib/terminfo export TERMINFO /usr/5bin/tic xterm.terminfo @@ -30,7 +30,7 @@ DEINSTALL) ;; POST-DEINSTALL) - cd @PREFIX@ + cd ${PKG_PREFIX} for FILE in $CONFLICTS do if [ -f ${FILE}.openwin ] @@ -39,10 +39,5 @@ POST-DEINSTALL) fi done ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac exit 0 |