From f3d5f24958ddf04b429dfc21f58df3f94b53e9c8 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Fri, 25 Apr 2008 12:39:50 +0000
Subject: - Update to R33d

Security:	http://www.vuxml.org/freebsd/86c05550-12c1-11dd-bab7-0016179b2dd5.html
---
 shells/mksh/Makefile      | 16 ++++++----------
 shells/mksh/distinfo      |  6 +++---
 shells/mksh/pkg-deinstall | 22 ----------------------
 shells/mksh/pkg-install   | 19 -------------------
 4 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 shells/mksh/pkg-deinstall
 delete mode 100644 shells/mksh/pkg-install

(limited to 'shells/mksh')

diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index 96f52d0b1ca8..fb43b69068d4 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		mksh
-PORTVERSION=		R33b
+PORTVERSION=		R33d
 CATEGORIES=		shells
 MASTER_SITES=		http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 			http://pub.allbsd.org/MirOS/dist/mir/mksh/
@@ -21,9 +21,6 @@ MAN1=			mksh.1
 PLIST_FILES=		bin/mksh share/examples/mksh/dot.mkshrc
 PLIST_DIRS=		share/examples/mksh
 
-PKGINSTALL=		pkg-install
-PKGDEINSTALL=		pkg-deinstall
-
 .include <bsd.port.pre.mk>
 
 do-extract:
@@ -40,12 +37,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${MANPREFIX}/man/man1
 
-pre-install:
-	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${ECHO_MSG} "updating /etc/shells"
+	@${CP} /etc/shells /etc/shells.bak
+	@(${GREP} -v ${PREFIX}/bin/mksh /etc/shells.bak; \
+	${ECHO_CMD} ${PREFIX}/bin/mksh) > /etc/shells
+	@${RM} /etc/shells.bak
 
 .include <bsd.port.post.mk>
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index 3cd544f3f107..96383ba16e4f 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,3 +1,3 @@
-MD5 (mksh-R33b.cpio.gz) = 4a882352ba709130020d940bfaba25ed
-SHA256 (mksh-R33b.cpio.gz) = aacbf028c96a6705daad06d9b5f7625aebff6cb073c3072abb6bbf3b2e9b78fc
-SIZE (mksh-R33b.cpio.gz) = 255256
+MD5 (mksh-R33d.cpio.gz) = 8ad2547ad55dc3a02b13554ab9b5c9c8
+SHA256 (mksh-R33d.cpio.gz) = 05ad1f28ceb1059ec6e50337363c10ede3287e614ad751427ca70611f7cd674f
+SIZE (mksh-R33d.cpio.gz) = 255911
diff --git a/shells/mksh/pkg-deinstall b/shells/mksh/pkg-deinstall
deleted file mode 100644
index dc9e8fa6cd84..000000000000
--- a/shells/mksh/pkg-deinstall
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-MKSH="${PKG_PREFIX-/usr/local}/bin/mksh"
-SHELLS="${PKG_DESTDIR-}/etc/shells"
-
-case $2 in
-DEINSTALL)
-  if grep -qs "^$MKSH\$" "$SHELLS"; then
-    if [ `id -u` -eq 0 ]; then
-      TMPSHELLS=`mktemp -t shells`
-      grep -v "^$MKSH\$" "$SHELLS" > "$TMPSHELLS"
-      cat "$TMPSHELLS" > "$SHELLS"
-      rm "$TMPSHELLS"
-    else
-      echo "Not root, please remove $MKSH from $SHELLS manually"
-    fi
-  fi
-  ;;
-esac
diff --git a/shells/mksh/pkg-install b/shells/mksh/pkg-install
deleted file mode 100644
index 87dea009ba0a..000000000000
--- a/shells/mksh/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-MKSH="${PKG_PREFIX-/usr/local}/bin/mksh"
-SHELLS="/etc/shells"
-
-case $2 in
-POST-INSTALL)
-  if [ -d "${SHELLS%/*}" ] && ! grep -qs "^$MKSH\$" "$SHELLS"; then
-    if [ `id -u` -eq 0 ]; then
-      echo "$MKSH" >> "$SHELLS"
-    else
-      echo "Not root, please add $MKSH to $SHELLS manually"
-    fi
-  fi
-  ;;
-esac
-- 
cgit v1.2.3