[pkgsrc/trunk]: pkgsrc/graphics/tiff Make these INSTALL scripts safe for when...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e32f49bf91a
branches:  trunk
changeset: 460492:0e32f49bf91a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 30 23:01:31 2003 +0000

description:
Make these INSTALL scripts safe for when pkgviews is merged.

diffstat:

 graphics/tiff/INSTALL.OpenWindows |  19 +++----------------
 graphics/tiff/Makefile            |  15 +++++++--------
 2 files changed, 10 insertions(+), 24 deletions(-)

diffs (79 lines):

diff -r c95d4680ee26 -r 0e32f49bf91a graphics/tiff/INSTALL.OpenWindows
--- a/graphics/tiff/INSTALL.OpenWindows Sat Aug 30 22:57:05 2003 +0000
+++ b/graphics/tiff/INSTALL.OpenWindows Sat Aug 30 23:01:31 2003 +0000
@@ -1,6 +1,4 @@
-# INSTALL_TMPL replacement
-#
-# $NetBSD: INSTALL.OpenWindows,v 1.2 2002/10/20 09:15:23 jlam Exp $
+# $NetBSD: INSTALL.OpenWindows,v 1.3 2003/08/30 23:01:31 jlam Exp $
 
 LIBTIFF="libtiff.so libtiff.so.3"
 
@@ -8,31 +6,20 @@
 PRE-INSTALL)
        for lib in ${LIBTIFF}; do
                src="${PKG_PREFIX}/lib/${lib}"
-               dest="@X11BASE@/lib/${lib}"
+               dest="${X11BASE}/lib/${lib}"
                if [ -f ${dest} ]; then
                        ${MV} -f ${dest} ${dest}.openwin
                        ${LN} -sf ${src} ${dest}
                fi
        done
        ;;
-
-POST-INSTALL)
-       ;;
-
-DEINSTALL)
-       ;;
        
 POST-DEINSTALL)
        for lib in ${LIBTIFF}; do
-               file="@X11BASE@/lib/${lib}"
+               file="${X11BASE}/lib/${lib}"
                if [ -f ${file}.openwin ]; then
                        ${MV} -f ${file}.openwin ${file}
                fi
        done
        ;;
-
-*)
-       ${ECHO} "Unexpected argument: ${STAGE}"
-       exit 1
-       ;;
 esac
diff -r c95d4680ee26 -r 0e32f49bf91a graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Sat Aug 30 22:57:05 2003 +0000
+++ b/graphics/tiff/Makefile    Sat Aug 30 23:01:31 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/07/17 21:42:52 grant Exp $
+# $NetBSD: Makefile,v 1.47 2003/08/30 23:01:32 jlam Exp $
 
 DISTNAME=      tiff-v3.5.7
 PKGNAME=       tiff-3.5.7
@@ -20,6 +20,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(X11BASE:M*openwin)
+USE_PKGINSTALL=                yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL.OpenWindows
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL.OpenWindows
+.endif
+
 .if defined(USE_GIF)
 LZW_VERSION=   1.3
 DISTFILES+=    libtiff-lzw-compression-kit-${LZW_VERSION}.tar.gz
@@ -49,11 +55,4 @@
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
-
-.if !empty(X11BASE:M*openwin)
-USE_PKGINSTALL=        yes
-DEINSTALL_TMPL=        ${INSTALL_TMPL}
-INSTALL_TMPL=  ${.CURDIR}/INSTALL.OpenWindows
-.endif
-
 .include "../../mk/bsd.pkg.mk"