Modernize this package a bit:

* Use bsd.pkg.install.mk instead of supplying custom INSTALL/DEINSTALL
  scripts.

* Note that this package doesn't really use buildlink.

* Remove ancient BUILDLINK_DEPENDS= line at the bottom of the file that
  we no longer need since the buildlink1 days of yore.

1 files changed, 8 insertions, 33 deletions

diff --git a/pkgtools/xpkgwedge/DEINSTALL b/pkgtools/xpkgwedge/DEINSTALL
index 99c73ae44bc..739143284b0 100755
--- a/pkgtools/xpkgwedge/DEINSTALL
+++ b/pkgtools/xpkgwedge/DEINSTALL
@@ -1,34 +1,17 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2002/02/26 21:49:05 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CMP="@CMP@"
-CP="@CP@"
-ECHO="@ECHO@"
-GREP="@GREP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
+# $NetBSD: DEINSTALL,v 1.3 2003/08/30 11:08:22 jlam Exp $
 
 FONT_PROGS="@FONT_PROGS@"
 X11BASE=@X11BASE@
+
 X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
 HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
 
 case ${STAGE} in
-DEINSTALL)
-	;;
-
 POST-DEINSTALL)
-	for prog in ${FONT_PROGS}
-	do
-		if [ -f ${PKG_PREFIX}/bin/${prog} -a			\
-		     ${PKG_PREFIX} != ${X11BASE} ]
-		then
-			${RM} -f ${PKG_PREFIX}/bin/${prog}
+	for prog in ${FONT_PROGS}; do
+		if [ -f ${PKG_PREFIX}/bin/$prog -a			\
+		     ${PKG_PREFIX} != ${X11BASE} ]; then
+			${RM} -f ${PKG_PREFIX}/bin/$prog
 		fi
 	done
 
@@ -36,19 +19,11 @@ POST-DEINSTALL)
 	${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
 	( ${GREP} -v xpkgwedge ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF}
 	${RM} -f ${HOSTDEF}.bak
-	if [ ${PKG_PREFIX} != ${X11BASE} ] && \
-		[ -f ${X11_HOSTDEF} ] && \
-		${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}
-	then
+	if [ ${PKG_PREFIX} != ${X11BASE} -a -f ${X11_HOSTDEF} ] && \
+	   ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}; then
 		${RM} -f ${HOSTDEF}
 	fi
 	${ECHO} "done."
 	${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
 	;;
-
-*)
-	${ECHO} "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
-exit 0