From a203353b335d8f666a437c115d84c8340384bfd6 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 30 Aug 2003 23:01:31 +0000
Subject: Make these INSTALL scripts safe for when pkgviews is merged.

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

(limited to 'graphics/tiff')

diff --git a/graphics/tiff/INSTALL.OpenWindows b/graphics/tiff/INSTALL.OpenWindows
index 0ebac569b7d..667155ee94b 100644
--- a/graphics/tiff/INSTALL.OpenWindows
+++ b/graphics/tiff/INSTALL.OpenWindows
@@ -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 @@ case ${STAGE} in
 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 --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 44b98275cd1..adf10b3d542 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -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 @@ CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR} --prefix=${PREFIX}
 
 .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 @@ pre-patch:
 
 .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"
-- 
cgit v1.2.3