Attachment #65188 for bug #96671

View | Details | Raw Unified | Return to bug 96671
Collapse All | Expand All




#

PORTNAME=	mutt-ng
PORTVERSION=	20060501
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/		\
		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
DISTNAME=	muttng-${PORTVERSION}

MAINTAINER=	shaun@inerd.com
COMMENT=	A fork of the mutt with the goal to incorporate all the patches

GNU_CONFIGURE=	yes
USE_OPENSSL=	yes
USE_REINPLACE=	yes

CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--disable-fcntl --sysconfdir=${PREFIX}/etc \

USE_ICONV=	yes
PLIST_SUB+=	NLS=""
.if defined(WITHOUT_MUTT_ICONV)
BROKEN=	The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given
.endif
.elif !defined(WITHOUT_MUTT_ICONV)
USE_ICONV=	yes

CONFIGURE_ARGS+=	--disable-iconv
.endif

.if !defined(NOPORTDOCS)
BUILD_DEPENDS+=	lynx:${PORTSDIR}/www/lynx
.endif

OPTIONS=	POP "Enable pop3 support" on \
		IMAP "Enable imap support" on \
		NNTP "Enable nntp support" off \

.include <bsd.port.pre.mk>

.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
WITH_MUTT_IMAP_HEADER_CACHE=	yes
.endif

.if defined (WITH_POP)

LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
CONFIGURE_ARGS+=	--with-curses=${LOCALBASE}
.elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)
BROKEN=	You may not specify both WITH_SLANG and WITH_NCURSES options
.endif

.if defined(WITH_SASL2) || defined(WITH_MUTT_CYRUS_SASL2)
.if !defined(WITH_POP) && !defined(WITH_IMAP)
BROKEN=	SASL2 only is useful for imap or pop
.endif
LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+=	--with-sasl2=${LOCALBASE}

	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
		${DOCSDIR}
	@${FIND} ${DOCSDIR}/html ! -type d | ${SED} -e 's,${PREFIX}/,,' \
	>> ${TMPPLIST}
	@${ECHO} "@dirrm share/doc/mutt-ng/html" >> ${TMPPLIST}
	@${ECHO} "@dirrm ${DOCSDIR:S,${PREFIX},,}" >> ${TMPPLIST}
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)mutt-ng/distinfo (-3 / +3 lines)
1	MD5 (muttng-20051110.tar.gz) = 21594b8fe6f654fc38907a47ce22b779	1	MD5 (muttng-20060501.tar.gz) = 8b6752e9aebfd8ea78ea99036c760af2
2	SHA256 (muttng-20051110.tar.gz) = 8a22f01bbfd68f781da9c3fabb6f9ca65a60c29e6059490b9fc0efd969931657	2	SHA256 (muttng-20060501.tar.gz) = 0499233085745ecd29a889ff235f7d57ab8c75644ab12efc04e7d4ff101752be
3	SIZE (muttng-20051110.tar.gz) = 2732141	3	SIZE (muttng-20060501.tar.gz) = 2734082




--- doc/Makefile.in.orig	Tue Mar 14 10:36:31 2006
+++ doc/Makefile.in	Tue May  2 15:43:59 2006
@@ -89,11 +89,11 @@
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 	done
 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-	-cd html; for file in *.html ; do \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-	done
-	-$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
+#	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
+#	-cd html; for file in *.html ; do \
+#		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
+#	done
+#	-$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
 
 uninstall:
 	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
@@ -113,12 +113,12 @@
 	@HTMLCLEAN_CMD@ $@ || true
 
 manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
-	test -d html || mkdir html
-	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
-	touch stamp-doc-chunked
-	cd html; for file in *.html ; do \
-	  @HTMLCLEAN_CMD@ $$file || true ; \
-	done
+#	test -d html || mkdir html
+#	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
+#	touch stamp-doc-chunked
+#	cd html; for file in *.html ; do \
+#	  @HTMLCLEAN_CMD@ $$file || true ; \
+#	done
 	
 manual.pdf: stamp-doc-tex
 	-if test -f manual.tex; then pdfjadetex manual.tex; fi
@@ -182,11 +182,11 @@
 	  ln $$file $(distdir) 2> /dev/null \
 	  || cp -p $$file $(distdir) ; \
 	done
-	mkdir $(distdir)/html
-	cd html; for file in *.html ; do \
-	  ln $$file ../$(distdir)/html 2> /dev/null \
-	  || cp -p $$file ../$(distdir)/html ; \
-	done
+#	mkdir $(distdir)/html
+#	cd html; for file in *.html ; do \
+#	  ln $$file ../$(distdir)/html 2> /dev/null \
+#	  || cp -p $$file ../$(distdir)/html ; \
+#	done
 
 ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
 	(cd .. && $(MAKE) makedoc$(EXEEXT))

Lines 89-91 Link Here

(-)mutt-ng/pkg-plist (+1 lines)
89	%%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo	89	%%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo
90	@dirrm %%EXAMPLESDIR%%/iconv	90	@dirrm %%EXAMPLESDIR%%/iconv
91	@dirrm %%EXAMPLESDIR%%	91	@dirrm %%EXAMPLESDIR%%
		92	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 96671

Lines 6-23 Link Here

(-)mutt-ng/Makefile (-17 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= mutt-ng	8	PORTNAME= mutt-ng
9	PORTVERSION= 20051110	9	PORTVERSION= 20060501
10	PORTREVISION= 1
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= http://nion.modprobe.de/mutt-ng/snapshots/	11	MASTER_SITES= http://nion.modprobe.de/mutt-ng/snapshots/ \
		12	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
13	DISTNAME= muttng-${PORTVERSION}	13	DISTNAME= muttng-${PORTVERSION}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= shaun@inerd.com
16	COMMENT= A fork of the mutt with the goal to incorporate all the patches	16	COMMENT= A fork of the mutt with the goal to incorporate all the patches
17		17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	USE_OPENSSL= yes	19	USE_OPENSSL= yes
20	USE_REINPLACE= yes
21		20
22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
23	CONFIGURE_ARGS= --disable-fcntl --sysconfdir=${PREFIX}/etc \	22	CONFIGURE_ARGS= --disable-fcntl --sysconfdir=${PREFIX}/etc \
Lines 30-36 Link Here
30	USE_ICONV= yes	29	USE_ICONV= yes
31	PLIST_SUB+= NLS=""	30	PLIST_SUB+= NLS=""
32	.if defined(WITHOUT_MUTT_ICONV)	31	.if defined(WITHOUT_MUTT_ICONV)
33	BROKEN= "The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given"	32	BROKEN= The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given
34	.endif	33	.endif
35	.elif !defined(WITHOUT_MUTT_ICONV)	34	.elif !defined(WITHOUT_MUTT_ICONV)
36	USE_ICONV= yes	35	USE_ICONV= yes
Lines 42-51 Link Here
42	CONFIGURE_ARGS+= --disable-iconv	41	CONFIGURE_ARGS+= --disable-iconv
43	.endif	42	.endif
44		43
45	.if !defined(NOPORTDOCS)
46	BUILD_DEPENDS+= lynx:${PORTSDIR}/www/lynx
47	.endif
48
49	OPTIONS= POP "Enable pop3 support" on \	44	OPTIONS= POP "Enable pop3 support" on \
50	IMAP "Enable imap support" on \	45	IMAP "Enable imap support" on \
51	NNTP "Enable nntp support" off \	46	NNTP "Enable nntp support" off \
Lines 65-71 Link Here
65	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
66		61
67	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)	62	.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
68	WITH_MUTT_IMAP_HEADER_CACHE= yes	63	WITH_MUTT_IMAP_HEADER_CACHE= yes
69	.endif	64	.endif
70		65
71	.if defined (WITH_POP)	66	.if defined (WITH_POP)
Lines 119-130 Link Here
119	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses	114	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
120	CONFIGURE_ARGS+= --with-curses=${LOCALBASE}	115	CONFIGURE_ARGS+= --with-curses=${LOCALBASE}
121	.elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)	116	.elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)
122	BROKEN= "You may not specify both WITH_SLANG and WITH_NCURSES options"	117	BROKEN= You may not specify both WITH_SLANG and WITH_NCURSES options
123	.endif	118	.endif
124		119
125	.if defined(WITH_SASL2) \|\| defined(WITH_MUTT_CYRUS_SASL2)	120	.if defined(WITH_SASL2) \|\| defined(WITH_MUTT_CYRUS_SASL2)
126	.if !defined(WITH_POP) && !defined(WITH_IMAP)	121	.if !defined(WITH_POP) && !defined(WITH_IMAP)
127	BROKEN= "SASL2 only is useful for imap or pop"	122	BROKEN= SASL2 only is useful for imap or pop
128	.endif	123	.endif
129	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2	124	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
130	CONFIGURE_ARGS+= --with-sasl2=${LOCALBASE}	125	CONFIGURE_ARGS+= --with-sasl2=${LOCALBASE}
Lines 173-182 Link Here
173	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}	168	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
174	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \	169	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
175	${DOCSDIR}	170	${DOCSDIR}
176	@${FIND} ${DOCSDIR}/html ! -type d \| ${SED} -e 's,${PREFIX}/,,' \
177	>> ${TMPPLIST}
178	@${ECHO} "@dirrm share/doc/mutt-ng/html" >> ${TMPPLIST}
179	@${ECHO} "@dirrm ${DOCSDIR:S,${PREFIX},,}" >> ${TMPPLIST}
180	.endif	171	.endif
181		172
182	.include <bsd.port.post.mk>	173	.include <bsd.port.post.mk>

Line 0 Link Here

(-)mutt-ng/files/patch-doc_Makefile.in (+55 lines)
	1	--- doc/Makefile.in.orig Tue Mar 14 10:36:31 2006
	2	+++ doc/Makefile.in Tue May 2 15:43:59 2006
	3	@@ -89,11 +89,11 @@
	4	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
	5	done
	6	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) \|\| true
	7	- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
	8	- -cd html; for file in *.html ; do \
	9	- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ \|\| true ;\
	10	- done
	11	- -$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html \|\| true
	12	+# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
	13	+# -cd html; for file in *.html ; do \
	14	+# $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ \|\| true ;\
	15	+# done
	16	+# -$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html \|\| true
	17
	18	uninstall:
	19	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
	20	@@ -113,12 +113,12 @@
	21	@HTMLCLEAN_CMD@ $@ \|\| true
	22
	23	manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
	24	- test -d html \|\| mkdir html
	25	- -xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
	26	- touch stamp-doc-chunked
	27	- cd html; for file in *.html ; do \
	28	- @HTMLCLEAN_CMD@ $$file \|\| true ; \
	29	- done
	30	+# test -d html \|\| mkdir html
	31	+# -xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
	32	+# touch stamp-doc-chunked
	33	+# cd html; for file in *.html ; do \
	34	+# @HTMLCLEAN_CMD@ $$file \|\| true ; \
	35	+# done
	36
	37	manual.pdf: stamp-doc-tex
	38	-if test -f manual.tex; then pdfjadetex manual.tex; fi
	39	@@ -182,11 +182,11 @@
	40	ln $$file $(distdir) 2> /dev/null \
	41	\|\| cp -p $$file $(distdir) ; \
	42	done
	43	- mkdir $(distdir)/html
	44	- cd html; for file in *.html ; do \
	45	- ln $$file ../$(distdir)/html 2> /dev/null \
	46	- \|\| cp -p $$file ../$(distdir)/html ; \
	47	- done
	48	+# mkdir $(distdir)/html
	49	+# cd html; for file in *.html ; do \
	50	+# ln $$file ../$(distdir)/html 2> /dev/null \
	51	+# \|\| cp -p $$file ../$(distdir)/html ; \
	52	+# done
	53
	54	../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
	55	(cd .. && $(MAKE) makedoc$(EXEEXT))