summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/mutt-devel/Makefile11
-rw-r--r--mail/mutt-devel/files/patch-Makefile.am.doc11
2 files changed, 15 insertions, 7 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index b6c93c5..35a96a8 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -108,6 +108,9 @@ MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \
ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www.spinnaker.de/mutt/compressed/:rr
+DISTNAME= mutt-${PORTVERSION}i
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
@@ -123,12 +126,10 @@ MAINTAINER?= udo.schweigert@siemens.com
COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
CONFLICTS= mutt-[0-9]*
-
DIST_SUBDIR= mutt
DOCSDIR?= ${PREFIX}/share/doc/mutt
EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
DATADIR?= ${PREFIX}/share/mutt
-
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \
@@ -150,10 +151,6 @@ SCRIPTS_ENV= WRKDIR="${WRKDIR}"
.include <bsd.port.pre.mk>
-DISTNAME= mutt-${PORTVERSION}i
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
CD_PATCH_VERSION= 1.5.5.1
CD_IFDEF_PATCH_VERSION= 1.5.4
DW_PATCH_VERSION= 1.5.6
@@ -383,7 +380,7 @@ pre-configure::
@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
.if defined(MUTT_SLAVE_HTML_PAGES)
-SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="$(MUTT_SLAVE_HTML_PAGES)"
+SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
.endif
.if defined(WITH_MUTT_NNTP)
SCRIPTS_ENV+= MUTT_NNTP="yes"
diff --git a/mail/mutt-devel/files/patch-Makefile.am.doc b/mail/mutt-devel/files/patch-Makefile.am.doc
new file mode 100644
index 0000000..5c58542
--- /dev/null
+++ b/mail/mutt-devel/files/patch-Makefile.am.doc
@@ -0,0 +1,11 @@
+--- Makefile.am.orig2 Mon Feb 7 10:20:52 2005
++++ Makefile.am Mon Feb 7 10:29:41 2005
+@@ -10,7 +10,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
+
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+
OpenPOWER on IntegriCloud