- Merge the following from the English version:

r28473 -> r45410	head/ja_JP.eucJP/htdocs/commercial/Makefile
	r32391 -> r42980	head/ja_JP.eucJP/htdocs/community/Makefile
	r39545 -> r47265	head/ja_JP.eucJP/htdocs/ports/Makefile

ja_JP.eucJP/htdocs/commercial/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.18
+# Original revision: r45410
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -16,8 +16,7 @@ XSLT.DEFAULT=		${XSL_ENTRIES}
 DEPENDSET.DEFAULT=	commercial
 
 XMLDOCS=	consult::${XML_COMMERCIAL_CONSULT}:
-PARAMS.consult=	--param pagename "'Consulting Services'" \
+PARAMS.consult=	--param pagename "'Consulting Services'"
-		--param basename "'consult.html'"
 
 XMLDOCS+=	consult_bycat::${XML_COMMERCIAL_CONSULT}:
 PARAMS.consult_bycat=\

ja_JP.eucJP/htdocs/community/Makefile

@@ -1,5 +1,5 @@
 # $FreeBSD$
-# Original Revision: 1.2
+# Original Revision: r42980
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -10,6 +10,4 @@
 
 DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
-#XMLDOCS+=	social::${XML_EVENTS_EVENTS}:
-
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

ja_JP.eucJP/htdocs/ports/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 # The FreeBSD Japanese Documentation Project
-# Original revision: r39545
+# Original revision: r47265
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"