cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to /usr/bin/env for shebang, reported by aja@

Browse Source 
Remove .orig files in INSTDIR instead of WRKSRC, proposed by jca@

ok aja@ jca@
This commit is contained in:
solene 2018-04-27 08:31:01 +00:00
parent 3fe2774552
commit 2ad881881e
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/mailpile/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/04/26 20:20:08 solene Exp $
# $OpenBSD: Makefile,v 1.2 2018/04/27 08:31:01 solene Exp $
COMMENT = mail client with encryption and privacy features
PKGNAME = ${DISTNAME:L}
GH_ACCOUNT = mailpile
GH_PROJECT = Mailpile
GH_TAGNAME = 1.0.0rc2
REVISION = 0
CATEGORIES = mail
MAINTAINER = Solene Rapenne <solene@perso.pw>
@ -13,8 +15,6 @@ MAINTAINER = Solene Rapenne <solene@perso.pw>
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_ADJ_FILES= mp scripts/mailpile-test.py
RUN_DEPENDS = devel/py-fasteners \
security/py-pgpdump \
@ -32,16 +32,13 @@ PKG_ARCH = *
INSTDIR = ${PREFIX}/share/mailpile
pre-configure:
@${SUBST_CMD} ${WRKSRC}/scripts/test-sendmail.sh
do-install:
find ${WRKSRC} -name '*.orig' -delete
${INSTALL_DATA_DIR} ${INSTDIR}
find ${WRKSRC} -exec ${MODPY_BIN} \
${MODPY_LIBDIR}/compileall.py {} \;
cd ${WRKSRC} && pax -rw * ${INSTDIR}
cd ${INSTDIR} && rm -fr mailpile/tests packages
find ${INSTDIR} -name '*.orig' -delete
@cd ${PREFIX}/bin && \
ln -sf ../share/mailpile/mp mp

4
mail/mailpile/patches/patch-scripts_test-sendmail_sh
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-scripts_test-sendmail_sh,v 1.1.1.1 2018/04/26 20:20:08 solene Exp $
$OpenBSD: patch-scripts_test-sendmail_sh,v 1.2 2018/04/27 08:31:01 solene Exp $
Index: scripts/test-sendmail.sh
--- scripts/test-sendmail.sh.orig
+++ scripts/test-sendmail.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
+#!/usr/bin/env bash
OUTPUT="$(dirname $0)/../mailpile/tests/data/tmp/sent.mbx"
mkdir -p "$(dirname $OUTPUT)"
touch "$OUTPUT"

3
mail/mailpile/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/26 20:20:08 solene Exp $
@comment $OpenBSD: PLIST,v 1.2 2018/04/27 08:31:01 solene Exp $
bin/mp
share/mailpile/
share/mailpile/AGPLv3.txt
@ -380,7 +380,6 @@ share/mailpile/scripts/python-lint.sh
share/mailpile/scripts/reset-mac-mailpile.sh
@comment share/mailpile/scripts/setup-test.sh
share/mailpile/scripts/test-sendmail.sh
share/mailpile/scripts/test-sendmail.sh.beforesubst
share/mailpile/scripts/unsent-mail-finder.py
share/mailpile/scripts/unsent-mail-finder.pyc
@comment share/mailpile/scripts/vagrant_bootstrap.sh