ports/166060: mail/archiveopteryx: remove unknown target post-deinstall

[Jason Helfman]

>Number:         166060
>Category:       ports
>Synopsis:       mail/archiveopteryx: remove unknown target post-deinstall
>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:   Tue Mar 13 20:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
post-deinstall will never be run
update pkg-install and pkg-deinstall files, as well as syntax in Makefile for standards
>How-To-Repeat:
	
>Fix:

? work
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/archiveopteryx/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	18 Aug 2011 12:47:50 -0000	1.4
+++ Makefile	13 Mar 2012 20:22:58 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.1.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/%SUBDIR%/
 MASTER_SITE_SUBDIR=	download
@@ -50,11 +51,7 @@
 	@cd ${WRKSRC} && ${JAM} install
 
 post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-post-deinstall:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
-
-
 .include <bsd.port.post.mk>
Index: pkg-deinstall
===================================================================
RCS file: /home/pcvs/ports/mail/archiveopteryx/pkg-deinstall,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall
--- pkg-deinstall	3 Oct 2010 13:24:46 -0000	1.1
+++ pkg-deinstall	13 Mar 2012 20:22:58 -0000
@@ -1,20 +1,10 @@
 #!/bin/sh
 
-PKGNAME=$1
-TARGET=$2
-
 RMDIR=/bin/rmdir
 
-if [ $# -ne 2 ]; then
-	echo "Usage: $0 [PKGNAME] [DEINSTALL | POST-DEINSTALL]"
-	exit 1
-fi
-
-if [ "$TARGET" = POST-DEINSTALL ]; then
+if [ "$2" = POST-DEINSTALL ]; then
 	for i in /var/db/aox/jail /var/db/aox/messages /var/run/aox; do
 		${RMDIR} ${i} 2>/dev/null
 	done
 	${RMDIR} /var/db/aox 2>/dev/null
 fi
-
-exit 0
Index: pkg-install
===================================================================
RCS file: /home/pcvs/ports/mail/archiveopteryx/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- pkg-install	11 Aug 2011 14:02:57 -0000	1.2
+++ pkg-install	13 Mar 2012 20:22:58 -0000
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-PKGNAME=$1
-TARGET=$2
-
 MKDIR=/bin/mkdir
 CHOWN=/usr/sbin/chown
 CHMOD=/bin/chmod
@@ -10,12 +7,7 @@
 AOXGROUP=aox
 AOXUSER=aox
 
-if [ $# -ne 2 ]; then
-	echo "Usage: $0 [PKGNAME] [PRE-INSTALL | POST-INSTALL]"
-	exit 1
-fi
-
-if [ "$TARGET" = POST-INSTALL ]; then
+if [ "$2" = POST-INSTALL ]; then
 	for i in /var/db/aox/jail /var/db/aox/messages; do
 		${MKDIR} -m 700 -p ${i}
 	done
@@ -24,5 +16,3 @@
 	${MKDIR} /var/run/aox
 	${CHOWN} ${AOXUSER}:${AOXGROUP} /var/db/aox /var/run/aox /var/db/aox/messages
 fi
-
-exit 0
>Release-Note:
>Audit-Trail:
>Unformatted: