aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/pico-alpine/Makefile1
-rw-r--r--mail/alpine/pkg-install9
2 files changed, 9 insertions, 1 deletions
diff --git a/editors/pico-alpine/Makefile b/editors/pico-alpine/Makefile
index f00f7ca15483..6e1fbb249162 100644
--- a/editors/pico-alpine/Makefile
+++ b/editors/pico-alpine/Makefile
@@ -21,6 +21,7 @@ PLIST= ${.CURDIR}/pkg-plist
PATCHDIR= # To void equivalent in master port
PKGMESSAGE= /nonexistent # To void equivalent in master port
+PKGINSTALL= /nonexistent # To void equivalent in master port
PICO_ALPINE_SLAVE= yes
diff --git a/mail/alpine/pkg-install b/mail/alpine/pkg-install
index c7e0a18d5aed..fc52acc89a28 100644
--- a/mail/alpine/pkg-install
+++ b/mail/alpine/pkg-install
@@ -2,6 +2,13 @@
[ "$2" = 'POST-INSTALL' ] || exit 0
+case "$1" in
+alpine*) ;;
+*) exit 0 ;;
+esac
+
+[ -x "${PKG_PREFIX}/bin/alpine" ] || exit 1
+
PATH=/bin:/usr/bin
export PATH
@@ -18,7 +25,7 @@ install -o root -g wheel -m 444 ${TDIR}/alpine.conf.sample ${PKG_PREFIX}/etc/alp
${PKG_PREFIX}/bin/alpine -conf > ${TDIR}/alpine.conf
-if [ -e "${PKG_PREFIX}/etc/alpine.conf" ]; then
+if [ -s "${PKG_PREFIX}/etc/alpine.conf" ]; then
if ! cmp -s ${TDIR}/alpine.conf ${PKG_PREFIX}/etc/alpine.conf; then
unlink ${PKG_PREFIX}/etc/alpine.conf
install -o root -g wheel -m 444 ${TDIR}/alpine.conf ${PKG_PREFIX}/etc/alpine.conf