Don't install cat pages. Bump revision.

4 files changed, 8 insertions, 50 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 6227b7d3b57..6933df1e815 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2011/08/14 16:06:12 obache Exp $
+# $NetBSD: Makefile,v 1.32 2012/04/07 13:14:25 joerg Exp $
 #
 
 DISTNAME=	wml-2.0.9
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www perl5
 MASTER_SITES=	http://thewml.org/distrib/
 
@@ -45,20 +45,6 @@ pre-configure:
 	    cd ${WRKSRC}/$$i && autoreconf --force || exit 1; \
 	done
 
-post-install:
-	cd ${DESTDIR:Q}${PREFIX}/${PKGMANDIR}/cat1 ; \
-	for i in wml_aux_tidy wml_aux_txt2html wml_p4_gm4 ; \
-	do \
-	    ${MV} $${i}.1 $${i}.0 ; \
-	done
-	cd ${DESTDIR:Q}${PREFIX}/${PKGMANDIR}/cat7 ; \
-	for i in wml_barebone wml_std_css1 wml_std_css2 wml_std_csspos \
-	    wml_std_html20 wml_std_html32 wml_std_html40 wml_std_html401 \
-	    wml_std_wai10 wml_std_xhtml10 ; \
-	do \
-	    ${MV} $${i}.7 $${i}.0 ; \
-	done
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wml/PLIST b/www/wml/PLIST
index 64135d4f98f..9cb34a6ad02 100644
--- a/www/wml/PLIST
+++ b/www/wml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/04/07 13:14:25 joerg Exp $
 bin/wmb
 bin/wmd
 bin/wmk
@@ -114,19 +114,6 @@ lib/wml/perl/lib/${PERL_ARCHNAME}/auto/WML/GD/.packlist
 lib/wml/perl/lib/${PERL_ARCHNAME}/auto/WML/GD/GD.bs
 lib/wml/perl/lib/${PERL_ARCHNAME}/auto/WML/GD/GD.so
 lib/wml/perl/lib/${PERL_ARCHNAME}/auto/WML/GD/autosplit.ix
-man/cat1/wml_aux_tidy.0
-man/cat1/wml_aux_txt2html.0
-man/cat1/wml_p4_gm4.0
-man/cat7/wml_barebone.0
-man/cat7/wml_std_css1.0
-man/cat7/wml_std_css2.0
-man/cat7/wml_std_csspos.0
-man/cat7/wml_std_html20.0
-man/cat7/wml_std_html32.0
-man/cat7/wml_std_html40.0
-man/cat7/wml_std_html401.0
-man/cat7/wml_std_wai10.0
-man/cat7/wml_std_xhtml10.0
 man/man1/wmb.1
 man/man1/wmd.1
 man/man1/wmd_missing.1
diff --git a/www/wml/distinfo b/www/wml/distinfo
index 337f205f385..cbeed915b74 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/09/29 11:12:53 dholland Exp $
+$NetBSD: distinfo,v 1.13 2012/04/07 13:14:25 joerg Exp $
 
 SHA1 (wml-2.0.9.tar.gz) = ce95ad9c55fd52e2028099d391858d88cffd5d9f
 RMD160 (wml-2.0.9.tar.gz) = bf14a4c09bdd850c5bad5f48f712717a13b13412
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 80863037faadf220ba1d01ef2133cdc42e08f0fa
 SHA1 (patch-ad) = 2955f349aa737f1758493897d1989a0b96220268
 SHA1 (patch-ae) = d52b117c67e9d521d4ffdd1a2ba03a512fcc315b
 SHA1 (patch-af) = e7dcb9287066e962d3fedafcea4302c71fbf0dce
-SHA1 (patch-ag) = 642371cb755e993118f5cc6a16abeaa62ec8d163
+SHA1 (patch-ag) = da74f75377e42bb15ccf213cde8fd0db43ea451e
 SHA1 (patch-ah) = 8195a53d0a514b9ed1bd8e9460c8c3e77a1d0d8d
 SHA1 (patch-ai) = c376fe6308bd9defb66719a53a0e0da3953e2016
 SHA1 (patch-aj) = eea40cf13d883656dc0db5d4de11df4a27bdc70f
diff --git a/www/wml/patches/patch-ag b/www/wml/patches/patch-ag
index 80f1083a79e..f1f36a89c55 100644
--- a/www/wml/patches/patch-ag
+++ b/www/wml/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2007/09/29 21:23:12 heinz Exp $
+$NetBSD: patch-ag,v 1.2 2012/04/07 13:14:25 joerg Exp $
 
  DESTDIR support
 
---- Makefile.in.orig	2002-10-18 23:15:15.000000000 +0200
+--- Makefile.in.orig	2002-10-18 21:15:15.000000000 +0000
 +++ Makefile.in
-@@ -98,118 +98,118 @@ install: install-dirs install-core insta
+@@ -98,118 +98,103 @@ install: install-dirs install-core insta
  install-dirs:
  	@[ -f .build-ok ] || $(MAKE) all
  	@echo "___ INSTALL: prepare directory structure ___"
@@ -30,8 +30,6 @@ $NetBSD: patch-ag,v 1.1 2007/09/29 21:23:12 heinz Exp $
 +	$(MKDIR) $(DESTDIR)$(mandir)/man1
 +	$(MKDIR) $(DESTDIR)$(mandir)/man3
 +	$(MKDIR) $(DESTDIR)$(mandir)/man7
-+	$(MKDIR) $(DESTDIR)$(mandir)/$(catdir)1
-+	$(MKDIR) $(DESTDIR)$(mandir)/$(catdir)7
  
  install-core:
  	@echo ""
@@ -89,7 +87,6 @@ $NetBSD: patch-ag,v 1.1 2007/09/29 21:23:12 heinz Exp $
 +	$(INSTALL_PROGRAM) wml_backend/p3_eperl/eperl@EXEEXT@ $(DESTDIR)$(libdir)/exec/wml_p3_eperl@EXEEXT@
 +	$(INSTALL_DATA) wml_backend/p3_eperl/eperl.1 $(DESTDIR)$(mandir)/man1/wml_p3_eperl.1
 +	$(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4@EXEEXT@ $(DESTDIR)$(libdir)/exec/wml_p4_gm4@EXEEXT@
-+	$(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(DESTDIR)$(mandir)/$(catdir)1/wml_p4_gm4.1
 +	$(INSTALL_SCRIPT) wml_backend/p5_divert/divert.pl $(DESTDIR)$(libdir)/exec/wml_p5_divert
 +	$(INSTALL_DATA) wml_backend/p5_divert/divert.1 $(DESTDIR)$(mandir)/man1/wml_p5_divert.1
 +	$(INSTALL_SCRIPT) wml_backend/p6_asubst/asubst.pl $(DESTDIR)$(libdir)/exec/wml_p6_asubst
@@ -132,16 +129,6 @@ $NetBSD: patch-ag,v 1.1 2007/09/29 21:23:12 heinz Exp $
 +	$(INSTALL_DATA) wml_docs/wml_macros.7 $(DESTDIR)$(mandir)/man7/wml_macros.7
 +	$(INSTALL_DATA) wml_docs/wml_faq.7 $(DESTDIR)$(mandir)/man7/wml_faq.7
 +	$(INSTALL_DATA) wml_docs/wml_tags.7 $(DESTDIR)$(mandir)/man7/wml_tags.7
-+	$(INSTALL_DATA) wml_docs/wml_std_html20.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_html20.7
-+	$(INSTALL_DATA) wml_docs/wml_std_html32.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_html32.7
-+	$(INSTALL_DATA) wml_docs/wml_std_html40.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_html40.7
-+	$(INSTALL_DATA) wml_docs/wml_std_html401.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_html401.7
-+	$(INSTALL_DATA) wml_docs/wml_std_xhtml10.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_xhtml10.7
-+	$(INSTALL_DATA) wml_docs/wml_std_css1.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_css1.7
-+	$(INSTALL_DATA) wml_docs/wml_std_css2.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_css2.7
-+	$(INSTALL_DATA) wml_docs/wml_std_csspos.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_csspos.7
-+	$(INSTALL_DATA) wml_docs/wml_std_wai10.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_std_wai10.7
-+	$(INSTALL_DATA) wml_docs/wml_barebone.txt $(DESTDIR)$(mandir)/$(catdir)7/wml_barebone.7
  
  install-aux:
  	@echo ""
@@ -173,10 +160,8 @@ $NetBSD: patch-ag,v 1.1 2007/09/29 21:23:12 heinz Exp $
 +	$(INSTALL_SCRIPT) wml_aux/map2html/map2html.pl $(DESTDIR)$(libdir)/exec/wml_aux_map2html
 +	$(INSTALL_DATA) wml_aux/map2html/map2html.1 $(DESTDIR)$(mandir)/man1/wml_aux_map2html.1
 +	$(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(DESTDIR)$(libdir)/exec/wml_aux_txt2html
-+	$(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(DESTDIR)$(mandir)/$(catdir)1/wml_aux_txt2html.1
 +	$(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(DESTDIR)$(libdir)/data/txt2html.dict
 +	$(INSTALL_PROGRAM) wml_aux/tidy/tidy@EXEEXT@ $(DESTDIR)$(libdir)/exec/wml_aux_tidy@EXEEXT@
-+	$(INSTALL_DATA) wml_aux/tidy/tidy.txt $(DESTDIR)$(mandir)/$(catdir)1/wml_aux_tidy.1
 +	$(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(DESTDIR)$(libdir)/exec/wml_aux_htmlinfo
 +	$(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.1 $(DESTDIR)$(mandir)/man1/wml_aux_htmlinfo.1
 +	$(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(DESTDIR)$(libdir)/exec/wml_aux_linklint