diff options
| author | jgh <jgh@FreeBSD.org> | 2012-03-15 01:55:59 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2012-03-15 01:55:59 +0800 |
| commit | 7dd2e00369b118b310c442ce357db0281c2a6655 (patch) | |
| tree | b0bb0578cfee2d8cb49bb6a366843c049e2673b3 /mail/archiveopteryx | |
| parent | f21d805c555d8aeba7dad732b98addd0b6cba060 (diff) | |
| download | freebsd-ports-gnome-7dd2e00369b118b310c442ce357db0281c2a6655.tar.gz freebsd-ports-gnome-7dd2e00369b118b310c442ce357db0281c2a6655.tar.zst freebsd-ports-gnome-7dd2e00369b118b310c442ce357db0281c2a6655.zip | |
- drop invalid post-deinstall target, and adjust pkg-{de}install, respectively
PR: ports/166060
Submitted by: jgh@
Approved by: maintainer, feld@feld.me
Feature safe: yes
Diffstat (limited to 'mail/archiveopteryx')
| -rw-r--r-- | mail/archiveopteryx/Makefile | 7 | ||||
| -rw-r--r-- | mail/archiveopteryx/pkg-deinstall | 12 | ||||
| -rw-r--r-- | mail/archiveopteryx/pkg-install | 12 |
3 files changed, 4 insertions, 27 deletions
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index 0da691709aed..4071ad45145a 100644 --- a/mail/archiveopteryx/Makefile +++ b/mail/archiveopteryx/Makefile @@ -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 @@ do-install: @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> diff --git a/mail/archiveopteryx/pkg-deinstall b/mail/archiveopteryx/pkg-deinstall index aca504aa7d9f..5edef8a57b8c 100644 --- a/mail/archiveopteryx/pkg-deinstall +++ b/mail/archiveopteryx/pkg-deinstall @@ -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 diff --git a/mail/archiveopteryx/pkg-install b/mail/archiveopteryx/pkg-install index 35d64789a865..0e6b9d4974a3 100644 --- a/mail/archiveopteryx/pkg-install +++ b/mail/archiveopteryx/pkg-install @@ -1,8 +1,5 @@ #!/bin/sh -PKGNAME=$1 -TARGET=$2 - MKDIR=/bin/mkdir CHOWN=/usr/sbin/chown CHMOD=/bin/chmod @@ -10,12 +7,7 @@ CHMOD=/bin/chmod 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 @@ if [ "$TARGET" = POST-INSTALL ]; then ${MKDIR} /var/run/aox ${CHOWN} ${AOXUSER}:${AOXGROUP} /var/db/aox /var/run/aox /var/db/aox/messages fi - -exit 0 |