svn commit: r356808 - in head/mail/mutt14: . files

Martin Wilke miwi at FreeBSD.org
Fri Jun 6 15:38:38 UTC 2014 

Author: miwi
Date: Fri Jun  6 15:38:37 2014
New Revision: 356808
URL: http://svnweb.freebsd.org/changeset/ports/356808
QAT: https://qat.redports.org/buildarchive/r356808/

Log:
  - Implement staging
  - Remove SGML_DOCS option which no longer works with current sgmltools
  
  PR:		190097
  Submitted by:	maintainer

Added:
  head/mail/mutt14/pkg-message.xface   (contents, props changed)
Deleted:
  head/mail/mutt14/pkg-plist.htmlfiles
Modified:
  head/mail/mutt14/Makefile
  head/mail/mutt14/files/patch-02
  head/mail/mutt14/files/patch-z
  head/mail/mutt14/pkg-plist   (contents, props changed)

Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile	Fri Jun  6 15:33:39 2014	(r356807)
+++ head/mail/mutt14/Makefile	Fri Jun  6 15:38:37 2014	(r356808)
@@ -25,7 +25,7 @@ COMMENT?=	The Mongrel of Mailers (part E
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
 PKGNAMESUFFIX=	14
 
-OPTIONS_DEFINE=	NLS SGML_DOCS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
+OPTIONS_DEFINE=	NLS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
 OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
 
 OPTIONS_RADIO=		CONS
@@ -38,7 +38,6 @@ OPTIONS_DEFAULT+=	SLANG
 CONS_DESC=	Console driver (if none chosen, uses ncurses from base system)
 SLANG_DESC=	Adds display/screen management via S-Lang
 NCURSES_DESC=	Adds console graphics support with ncurses from ports
-SGML_DOCS_DESC=	Build mutt's SGML documentation
 LOCALES_FIX_DESC=	Enable locales fixes
 MUTT_XFACE_DESC=	Adds mutt X-Face support
 MUTT_FLOCK_DESC=	Use flock() for file locks
@@ -48,10 +47,8 @@ USE_OPENSSL=	yes
 
 .if defined (MUTT_LITE)
 PKGNAMESUFFIX=	14-lite
-OPTIONS_EXCLUDE=	SGML_DOCS
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
@@ -73,7 +70,7 @@ USES+=	iconv
 .endif
 
 .if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
 .elif ${PORT_OPTIONS:MNCURSES}
 USES+=	ncurses:port
 .else
@@ -83,12 +80,10 @@ USES+=	ncurses
 .if defined(WITH_MUTT_CYRUS_SASL)
 IGNORE=	the SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
 .endif
-.if ${PORT_OPTIONS:MSGML_DOCS}
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
 .if ${PORT_OPTIONS:MMUTT_XFACE}
 PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
 RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
+PKGMESSAGE=	${PKGDIR}/pkg-message.xface
 .endif
 .endif
 
@@ -134,15 +129,13 @@ CFLAGS+=	-I${NCURSESINC}
 .endif
 .if ${PORT_OPTIONS:MGSSAPI}
 .if exists(${LOCALBASE}/bin/gss-client)
-LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
 .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
 WITH_MUTT_KRB5_SYS=YES
 .endif
 .endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		mbox.5 muttrc.5
 
 post-patch::
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
@@ -190,38 +183,14 @@ post-build:
 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
 		${WRKSRC}/doc/muttrc.man
-.if ${PORT_OPTIONS:MSGML_DOCS}
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
-	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
-.endif
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} && ${CHMOD} a+rx ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${DOCSDIR}
-.if ${PORT_OPTIONS:MSGML_DOCS}
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
-	    -d ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MMUTT_XFACE}
-	@${ECHO} ""
-	@${ECHO} "************************************************************"
-	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
-	@${ECHO} "        set xface=yes"
-	@${ECHO} "  to your ~/.muttrc"
-	@${ECHO} "  Additional information is provided by news/slrnface"
-	@${ECHO} "************************************************************"
-	@${ECHO} ""
+		${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/mail/mutt14/files/patch-02
==============================================================================
--- head/mail/mutt14/files/patch-02	Fri Jun  6 15:33:39 2014	(r356807)
+++ head/mail/mutt14/files/patch-02	Fri Jun  6 15:38:37 2014	(r356808)
@@ -1,63 +1,21 @@
---- doc/Makefile.in.orig	Tue Nov  6 11:12:31 2001
-+++ doc/Makefile.in	Fri Jun 21 12:00:28 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: muttrc.man try-html try-txt
-+all: muttrc.man try-html try-txt try-latin1
- 
- try-html: ../makedoc
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
- 
- install: all instdoc
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -86,10 +92,10 @@
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	for file in manual*.html ; do	\
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
-+	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-+	# for file in manual*.html ; do	\
-+	# 	$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-+	# done
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -99,14 +105,18 @@
+--- doc/Makefile.in.orig	2007-05-23 03:17:52.000000000 +0200
++++ doc/Makefile.in	2014-05-13 08:16:43.000000000 +0200
+@@ -98,18 +98,6 @@
+ 	-rm -rf $(DESTDIR)$(docdir)
  
  check:
- manual.txt: manual.sgml
+-manual.txt: manual.sgml
 -	if sgml2txt -c latin manual ; then \
 -		uniq < manual.txt | expand > _manual.txt ; \
 -		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
- 
- manual.html: manual.sgml
+-		mv _manual.txt manual.txt ;\
+-	fi
+-
+-manual.html: manual.sgml
 -	sgml2html manual  || true
-+	@# sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
+-
+-manual.ps: manual.sgml
+-	sgml2latex --output=ps manual || true
  
- manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true
+ clean: 
+ 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps

Modified: head/mail/mutt14/files/patch-z
==============================================================================
--- head/mail/mutt14/files/patch-z	Fri Jun  6 15:33:39 2014	(r356807)
+++ head/mail/mutt14/files/patch-z	Fri Jun  6 15:38:37 2014	(r356808)
@@ -1,5 +1,5 @@
---- Makefile.am.orig2	Thu Jan  6 15:45:58 2005
-+++ Makefile.am	Thu Jan  6 15:47:48 2005
+--- Makefile.am.orig	2014-06-01 17:46:47.000000000 +0200
++++ Makefile.am	2014-06-01 17:48:02.000000000 +0200
 @@ -11,7 +11,7 @@
  
  SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
@@ -9,6 +9,24 @@
  
  BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
  
+@@ -135,16 +135,7 @@
+ 
+ install-data-local: Muttrc
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+-	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+-		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+-	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
+-	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
+-	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
+-		$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
+-	fi
+-	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
+-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
+-	fi
++	$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
+ 
+ 
+ # Don't make this one ChangeLog - it's intended to be
 --- doc/Makefile.in.orig2	Thu Jan  6 15:45:57 2005
 +++ doc/Makefile.in	Thu Jan  6 15:53:52 2005
 @@ -78,8 +78,6 @@

Added: head/mail/mutt14/pkg-message.xface
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mutt14/pkg-message.xface	Fri Jun  6 15:38:37 2014	(r356808)
@@ -0,0 +1,8 @@
+
+************************************************************
+  To enable the XFACE support in mutt you also have to add
+        set xface=yes
+  to your ~/.muttrc
+  Additional information is provided by news/slrnface
+************************************************************
+

Modified: head/mail/mutt14/pkg-plist
==============================================================================
--- head/mail/mutt14/pkg-plist	Fri Jun  6 15:33:39 2014	(r356807)
+++ head/mail/mutt14/pkg-plist	Fri Jun  6 15:38:37 2014	(r356808)
@@ -1,10 +1,13 @@
+ at comment $FreeBSD$
 bin/mutt
 bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
- at unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
-etc/Muttrc.dist
- at exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
+ at sample etc/Muttrc.sample
+man/man1/mutt.1.gz
+man/man1/mutt_dotlock.1.gz
+man/man5/mbox.5.gz
+man/man5/muttrc.5.gz
 %%DOCSDIR%%/COPYRIGHT
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/GPL
@@ -19,6 +22,14 @@ etc/Muttrc.dist
 %%DOCSDIR%%/devel-notes.txt
 %%DOCSDIR%%/manual.txt
 %%DOCSDIR%%/patch-notes.txt
+%%DOCSDIR%%/html/manual.html
+%%DOCSDIR%%/html/manual-1.html
+%%DOCSDIR%%/html/manual-2.html
+%%DOCSDIR%%/html/manual-3.html
+%%DOCSDIR%%/html/manual-4.html
+%%DOCSDIR%%/html/manual-5.html
+%%DOCSDIR%%/html/manual-6.html
+%%DOCSDIR%%/html/manual-7.html
 %%EXAMPLESDIR%%/Mush.rc
 %%EXAMPLESDIR%%/Pine.rc
 %%EXAMPLESDIR%%/Tin.rc
@@ -75,4 +86,5 @@ etc/Muttrc.dist
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
 @dirrm %%EXAMPLESDIR%%/iconv
 @dirrm %%EXAMPLESDIR%%
+ at dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%

More information about the svn-ports-all mailing list