- Fix install when NOPORTDOCS is defined [1]

- Add some missing locale files to pkg-plist

Pointed out by:	Anton Yuzhaninov [1]
Approved by:	ahze (mentor, implicit)

4 files changed, 74 insertions, 43 deletions

diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
index 19682ee6f65b..165df9851b20 100644
--- a/mail/mutt-ng/Makefile
+++ b/mail/mutt-ng/Makefile
@@ -142,8 +142,9 @@ CONFIGURE_ARGS+=	--enable-debug
 
 .if !defined (NOPORTDOCS)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nodoc
 .endif
 
 MAN1=	muttng.1 muttngbug.1 muttng_dotlock.1 fleang.1 muttng-flea.1
diff --git a/mail/mutt-ng/files/extra-patch-doc b/mail/mutt-ng/files/extra-patch-doc
index 4649fe92524e..bb6e36544693 100644
--- a/mail/mutt-ng/files/extra-patch-doc
+++ b/mail/mutt-ng/files/extra-patch-doc
@@ -1,21 +1,39 @@
---- doc/Makefile.in.orig2	Tue Jun 14 21:05:43 2005
-+++ doc/Makefile.in	Tue Jun 14 21:07:01 2005
-@@ -83,18 +83,6 @@
- 		$(DESTDIR)$(mandir)/man1/muttng_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5
- 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
--	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
+--- doc/Makefile.in.orig	Tue Mar 14 10:36:31 2006
++++ doc/Makefile.in	Thu Jul 13 16:51:53 2006
+@@ -89,11 +89,6 @@
+ 		$(INSTALL) -m 644 $(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	\
+-	-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:
- 	-rm -f $(DESTDIR)$(mandir)/man1/muttng.1
+ 	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
+@@ -113,12 +108,6 @@
+ 	@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
+ 	
+ manual.pdf: stamp-doc-tex
+ 	-if test -f manual.tex; then pdfjadetex manual.tex; fi
+@@ -181,11 +170,6 @@
+ 	for file in $(BUILT_DISTFILES) ; do \
+ 	  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
+ 
+ ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
diff --git a/mail/mutt-ng/files/patch-doc_Makefile.in b/mail/mutt-ng/files/extra-patch-nodoc
index f34ec5b98f57..ab3ce148496a 100644
--- a/mail/mutt-ng/files/patch-doc_Makefile.in
+++ b/mail/mutt-ng/files/extra-patch-nodoc
@@ -1,23 +1,26 @@
 --- 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
++++ doc/Makefile.in	Thu Jul 13 16:54:23 2006
+@@ -81,19 +81,6 @@
+ 		$(DESTDIR)$(mandir)/man1/muttng_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5
+ 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+-	for f in $(topsrcdir_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+-	done
+-	for f in $(srcdir_DOCFILES) ; do \
+-		$(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 @@
+@@ -113,12 +100,6 @@
  	@HTMLCLEAN_CMD@ $@ || true
  
  manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
@@ -27,29 +30,18 @@
 -	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 @@
+@@ -181,11 +162,6 @@
+ 	for file in $(BUILT_DISTFILES) ; do \
  	  ln $$file $(distdir) 2> /dev/null \
  	  || cp -p $$file $(distdir) ; \
- 	done
+-	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
+ 	done
  
  ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
- 	(cd .. && $(MAKE) makedoc$(EXEEXT))
diff --git a/mail/mutt-ng/pkg-plist b/mail/mutt-ng/pkg-plist
index bb8a5569af73..6f0e47f70084 100644
--- a/mail/mutt-ng/pkg-plist
+++ b/mail/mutt-ng/pkg-plist
@@ -87,6 +87,26 @@ etc/muttng-mime.types
 %%NLS%%share/locale/uk/LC_MESSAGES/muttng.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/muttng.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%EXAMPLESDIR%%/iconv
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%