diff --git a/en/commercial/Makefile b/en/commercial/Makefile
index 4512ab2166..ab50b7421e 100644
--- a/en/commercial/Makefile
+++ b/en/commercial/Makefile
@@ -1,54 +1,83 @@
-# $FreeBSD: www/en/commercial/Makefile,v 1.13 2000/09/30 00:21:38 nbm Exp $
+# $FreeBSD$
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
-PERL= perl5
-
-DOCS = commercial.sgml
-DOCS+= consulting.sgml
-DOCS+= consulting_bycat.sgml
-DOCS+= hardware.sgml
-DOCS+= misc.sgml
-DOCS+= software.sgml
-DOCS+= software_bycat.sgml
-
-INDEXLINK=commercial.html
-CLEANFILES+= consulting.inc consulting_bycat.inc hardware.inc
-CLEANFILES+= misc.inc software.inc software_bycat.inc
-
-consulting.html: consulting.sgml consulting.inc
-
-consulting_bycat.html: consulting_bycat.sgml consulting_bycat.inc
-
-hardware.html: hardware.sgml hardware.inc
-
-misc.html: misc.sgml misc.inc
-
-software.html: software.sgml software.inc
-
-software_bycat.html: software_bycat.sgml software_bycat.inc
+DOCS= commercial.sgml
+
+DATA= consult.html
+DATA+= consult_bycat.html
+DATA+= hardware.html
+DATA+= misc.html
+DATA+= software.html
+DATA+= software_bycat.html
+
+CLEANFILES= commercial.html
+CLEANFILES+= consult.html
+CLEANFILES+= consult_bycat.html
+CLEANFILES+= hardware.html
+CLEANFILES+= misc.html
+CLEANFILES+= software.html
+CLEANFILES+= software_bycat.html
+
+INDEXLINK= commercial.html
+
+XMLLINT?= /usr/local/bin/xmllint # Part of textproc/libxml2.
+
+consult.html: entries.xsl consult.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ --param pagename "'Consulting Services'" \
+ ${.CURDIR}/entries.xsl ${.CURDIR}/consult.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-consulting.inc: gencommercial.pl commercial.desc consulting.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} consulting
+consult_bycat.html: consult_bycat.xsl consult.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ ${.CURDIR}/consult_bycat.xsl ${.CURDIR}/consult.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-consulting_bycat.inc: gencommercial.pl commercial.desc consulting.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} -c consulting
+hardware.html: entries.xsl hardware.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ --param pagename "'Hardware Vendors'" \
+ ${.CURDIR}/entries.xsl ${.CURDIR}/hardware.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-hardware.inc: gencommercial.pl commercial.desc hardware.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} hardware
+misc.html: entries.xsl misc.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ --param pagename "'Miscellaneous Vendors'" \
+ ${.CURDIR}/entries.xsl ${.CURDIR}/misc.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-misc.inc: gencommercial.pl commercial.desc misc.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} misc
+software.html: entries.xsl software.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ --param pagename "'Software Vendors'" \
+ ${.CURDIR}/entries.xsl ${.CURDIR}/software.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-software.inc: gencommercial.pl commercial.desc software.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} software
+software_bycat.html: soft_bycat.xsl software.xml ../includes.xsl
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+ ${.CURDIR}/soft_bycat.xsl ${.CURDIR}/software.xml
+.if !defined(NO_TIDY)
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
+.endif
-software_bycat.inc: gencommercial.pl commercial.desc software.raw
- ${PERL} ${.CURDIR}/gencommercial.pl -s ${.CURDIR} -c software
+lint:
+ ${XMLLINT} --valid -o /dev/null ${.CURDIR}/consult.xml
+ ${XMLLINT} --valid -o /dev/null ${.CURDIR}/hardware.xml
+ ${XMLLINT} --valid -o /dev/null ${.CURDIR}/misc.xml
+ ${XMLLINT} --valid -o /dev/null ${.CURDIR}/software.xml
.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/commercial/commercial.desc b/en/commercial/commercial.desc
deleted file mode 100644
index 71750275d3..0000000000
--- a/en/commercial/commercial.desc
+++ /dev/null
@@ -1,54 +0,0 @@
-# FreeBSD Commercial Gallery Category Description File.
-#
-# $FreeBSD: www/en/commercial/commercial.desc,v 1.7 2000/08/28 13:19:03 phantom Exp $
-
-################################################################
-## CONSULTING CATEGORY DESCRIPTION
-################################################################
-
-CATEGORY="CONSULTING" SHORT="Consulting" LONG="Consulting Services"
-
-DEFAULT_SUBCAT="NAMERICA"
-
-SUBCAT="NAMERICA" DESCRIPTION="North America"
-SUBCAT="SAMERICA" DESCRIPTION="South America"
-SUBCAT="EUROPE" DESCRIPTION="Europe"
-SUBCAT="ASIA" DESCRIPTION="Asia"
-SUBCAT="AFRICA" DESCRIPTION="Africa"
-SUBCAT="AUSTRALIA" DESCRIPTION="Australia"
-SUBCAT="NEWZEALAND" DESCRIPTION="New Zealand"
-
-################################################################
-# HARDWARE CATEGORY DESCRIPTION
-################################################################
-
-## HARDWARE does not have subcategories
-
-CATEGORY="HARDWARE" SHORT="Hardware" LONG="Hardware Vendors"
-
-
-################################################################
-# MISC CATEGORY DESCRIPTION
-################################################################
-
-## MISC does not have subcategories
-
-CATEGORY="MISC" SHORT="Miscellaneous" LONG="Miscellaneous Vendors"
-
-################################################################
-## SOFTWARE CATEGORY DESCRIPTION
-################################################################
-
-CATEGORY="SOFTWARE" SHORT="Software" LONG="Software Vendors"
-
-DEFAULT_SUBCAT="MISC"
-
-SUBCAT="SYSADMIN" DESCRIPTION="System Administration / ISP"
-SUBCAT="SECURITY" DESCRIPTION="Security"
-SUBCAT="NETWORK" DESCRIPTION="Network Systems and Applications"
-SUBCAT="DATABASE" DESCRIPTION="Databases"
-SUBCAT="SCIENTIFIC" DESCRIPTION="Scientific and Language Tools"
-SUBCAT="MULTIMEDIA" DESCRIPTION="Multimedia"
-SUBCAT="MISC" DESCRIPTION="Miscellaneous"
-SUBCAT="DEV" DESCRIPTION="Development Tools"
-SUBCAT="ECOMMERCE" DESCRIPTION="E-Commerce Solutions and Tools"
diff --git a/en/commercial/commercial.sgml b/en/commercial/commercial.sgml
index 7c0d1c1674..59bbe28695 100644
--- a/en/commercial/commercial.sgml
+++ b/en/commercial/commercial.sgml
@@ -1,60 +1,49 @@
%includes;
]>
&header;
-
- The power, flexibility, and reliability of FreeBSD
- attract a wide variety of users and vendors.
- Below is a list of vendors offering commercial products, services,
- and/or consulting for FreeBSD.
-
+The power, flexibility, and reliability of FreeBSD attract a wide
+ variety of users and vendors. Below is a list of vendors offering
+ commercial products, services, and/or consulting for FreeBSD.
-
-- Consulting Services
- Whether you are just starting out with FreeBSD, or need to complete
- a large project, hiring consultants might be your answer. You can
- see the alphabetical list, or, if you
- prefer, view it by categories.
-
-
-- Hardware Vendors
- Need specialized tools, looking to buy a new desktop, or to fill a
- cage with rack mount servers that come with FreeBSD pre-installed?
- These companies may have what you need!
-
-
-- Miscellaneous Vendors
- Books and accessories you just cannot live without!
-
-
-- Software Vendors
- From audio players, network drivers, to commercial databases,
- FreeBSD has a wide variety of industrial strength software
- available. You can see the alphabetical list, or, if you prefer, view
- it by categories.
-
-
+ - Consulting Services Whether you
+ are just starting out with FreeBSD, or need to complete a large
+ project, hiring consultants might be your answer. You can see the
+ alphabetical list, or, if you prefer,
+ view it by categories.
+
+- Hardware Vendors Need specialized
+ tools, looking to buy a new desktop, or to fill a cage with rack
+ mount servers that come with FreeBSD pre-installed? These
+ companies may have what you need!
+
+- Miscellaneous Vendors Books and
+ accessories you just cannot live without!
+
+- Software Vendors From audio
+ players, network drivers, to commercial databases, FreeBSD has a
+ wide variety of industrial strength software available. You can
+ see the alphabetical list, or, if you
+ prefer, view it by categories.
-
- If your company supports a FreeBSD related product, service,
+
If your company supports a FreeBSD related product, service,
consulting, or support that should be added to this page, please
send email to www@FreeBSD.org
and let us know! Submissions should be in HTML and a medium-sized
paragraph in length. Please note that the inclusion of vendors in
our list does not signify our endorsement of their products or
- services by the FreeBSD Project.
-
+ services by the FreeBSD Project.
&footer;