Date: Wed, 14 Mar 2012 09:26:39 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rfarmer@predatorlabs.net Subject: ports/166093: [PATCH] shells/fish: drop unknown post-deinstall target Message-ID: <1331742399.539535.79585.nullmailer@experts-exchange.com> Resent-Message-ID: <201203141630.q2EGU1mI068921@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166093
>Category: ports
>Synopsis: [PATCH] shells/fish: drop unknown post-deinstall target
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 14 16:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
post-deinstall is an invalid target, use default pkg-deinstall script on deinstall
Added file(s):
- pkg-deinstall
Port maintainer (rfarmer@predatorlabs.net) is cc'd.
Generated with FreeBSD Port Tools 0.99_4 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- fish-1.23.1_8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/fish/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 23 Sep 2011 22:25:21 -0000 1.17
+++ Makefile 14 Mar 2012 16:25:59 -0000
@@ -7,7 +7,7 @@
PORTNAME= fish
PORTVERSION= 1.23.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= shells
MASTER_SITES= SF
@@ -78,10 +78,4 @@
${ECHO_CMD} '${PREFIX}/bin/${PORTNAME}' >> /etc/shells; \
fi
-post-deinstall:
- ${CP} /etc/shells /etc/shells.bak
- ${GREP} -v '${PREFIX}/bin/${PORTNAME}' /etc/shells.bak \
- >> /etc/shells
- ${RM} -f /etc/shells.bak
-
.include <bsd.port.post.mk>
Index: pkg-deinstall
===================================================================
RCS file: pkg-deinstall
diff -N pkg-deinstall
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg-deinstall 14 Mar 2012 16:25:59 -0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$2" = "DEINSTALL" ]; then
+ /bin/cp /etc/shells /etc/shells.bak
+ /usr/bin/grep -v '/usr/local/bin/fish' /etc/shells.bak >> /etc/shells
+ /bin/rm -f /etc/shells.bak
+fi
--- fish-1.23.1_8.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1331742399.539535.79585.nullmailer>