aboutsummaryrefslogtreecommitdiff
path: root/mail/mutt14
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2016-01-24 10:21:26 +0000
committerThomas Zander <riggs@FreeBSD.org>2016-01-24 10:21:26 +0000
commitd55a69f049c9e76b958b4d7f0476a82081cd5a13 (patch)
treec4e67909865597558b962eb95ed7933221111d6c /mail/mutt14
parent530278c724fbd6d85717dfafbfe294d51910bf16 (diff)
downloadports-d55a69f049c9e76b958b4d7f0476a82081cd5a13.tar.gz
ports-d55a69f049c9e76b958b4d7f0476a82081cd5a13.zip
Fix build failures on current and pkg builds with XFACE option
PR: 205719 Submitted by: Udo.Schweigert@siemens.com (maintainer) MFH: 2016Q1
Notes
Notes: svn path=/head/; revision=407094
Diffstat (limited to 'mail/mutt14')
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/mutt14/files/patch-Makefile.am22
2 files changed, 23 insertions, 1 deletions
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 47019da8f0bf..efaac01639e3 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -145,7 +145,7 @@ post-patch:
${WRKSRC}/contrib/Makefile.in
.if ${PORT_OPTIONS:MMUTT_XFACE}
@${ECHO} "===> Applying XFACE patch"
- slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
+ slrnface_dir=`${FIND} ${WRKDIR}/../../../news/slrnface/work -type d \
-name slrnface-\*`; \
cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
.endif
diff --git a/mail/mutt14/files/patch-Makefile.am b/mail/mutt14/files/patch-Makefile.am
new file mode 100644
index 000000000000..320a71259dc0
--- /dev/null
+++ b/mail/mutt14/files/patch-Makefile.am
@@ -0,0 +1,22 @@
+--- Makefile.am.orig 2007-05-23 03:17:52.000000000 +0200
++++ Makefile.am 2015-12-29 17:27:11.713299000 +0100
+@@ -2,7 +2,7 @@
+ ## Use aclocal -I m4; automake --foreign
+
+ AUTOMAKE_OPTIONS = foreign
+-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
++EXTRA_PROGRAMS = mutt_dotlock pgpewrap pgpring makedoc
+
+ if BUILD_IMAP
+ IMAP_SUBDIR = imap
+@@ -90,6 +90,10 @@
+ pgpring_LDADD = @LIBOBJS@ $(INTLLIBS)
+ pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+
++pgpewrap_SOURCES = pgpewrap.c
++pgpewrap_LDADD = @LIBOBJS@ $(INTLLIBS)
++pgpewrap_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
++
+ mutt_dotlock.c: dotlock.c
+ cp $(srcdir)/dotlock.c mutt_dotlock.c
+