From d24ea2d260a8fc594020080642cf179cbbc51133 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Wed, 3 Sep 2014 11:00:04 +0200
Subject: [PATCH] Restructure download page and includes

---
 common/distributions-other.inc      |  7 +++++
 common/distributions-unofficial.inc |  7 +++++
 common/distributions.inc            | 44 +++++++++++++++--------------
 download.php.de                     | 18 ++++--------
 download.php.en                     | 18 ++++--------
 5 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 common/distributions-other.inc
 create mode 100644 common/distributions-unofficial.inc

diff --git a/common/distributions-other.inc b/common/distributions-other.inc
new file mode 100644
index 0000000..98ee583
--- /dev/null
+++ b/common/distributions-other.inc
@@ -0,0 +1,7 @@
+<ul>
+	<li>
+		<a href="http://amiga.sourceforge.net/">Amiga.sf</a>:
+		<a href="http://amiga.sourceforge.net/index.php?showpackage=ngIRCd">Port</a>
+	</li>
+</ul>
+
diff --git a/common/distributions-unofficial.inc b/common/distributions-unofficial.inc
new file mode 100644
index 0000000..ac4979e
--- /dev/null
+++ b/common/distributions-unofficial.inc
@@ -0,0 +1,7 @@
+<ul>
+	<li>
+		<a href="http://www.debian.org/">Debian Linux</a>:
+		<a href="http://debian.barton.de/debian/pool/main/n/ngircd/">deb</a>
+		(Autor: Alex Barton)
+	</li>
+</ul>
diff --git a/common/distributions.inc b/common/distributions.inc
index b841d0d..fcc75c5 100644
--- a/common/distributions.inc
+++ b/common/distributions.inc
@@ -1,8 +1,16 @@
+<h4>BSD</h4>
 <ul>
 	<li>
-		<a href="http://amiga.sourceforge.net/">Amiga.sf</a>:
-		<a href="http://amiga.sourceforge.net/index.php?showpackage=ngIRCd">Port</a>
+		<a href="http://www.freebsd.org/">FreeBSD</a>:
+		<a href="http://www.freebsd.org/cgi/ports.cgi?query=ngircd&amp;stype=all">Port</a>
+	</li>
+	<li>
+		<a href="http://www.openbsd.org/">OpenBSD</a>:
+		<a href="http://www.openbsd.org/cgi-bin/cvsweb/ports/net/ngircd/">Port</a>
 	</li>
+</ul>
+<h4>Linux</h4>
+<ul>
 	<li>
 		<a href="http://www.archlinux.org/">Arch Linux</a>:
 		<a href="https://www.archlinux.org/packages/?q=ngircd">pkg</a>
@@ -15,37 +23,31 @@
 		<a href="http://fedoraproject.org/">Fedora Linux</a>:
 		<a href="https://admin.fedoraproject.org/pkgdb/acls/name/ngircd">rpm</a>
 	</li>
-	<li>
-		<a href="http://www.finkproject.org/">Fink Project</a>:
-		<a href="http://pdb.finkproject.org/pdb/package.php/ngircd">Port</a>
-	</li>
-	<li>
-		<a href="http://www.freebsd.org/">FreeBSD</a>:
-		<a href="http://www.freebsd.org/cgi/ports.cgi?query=ngircd&amp;stype=all">Port</a>
-	</li>
 	<li>
 		<a href="http://www.gentoo.org/">Gentoo Linux</a>:
 		<a href="http://packages.gentoo.org/package/net-irc/ngircd">ebuild</a>
 	</li>
 	<li>
-		<a href="http://brew.sh/">Homebrew</a>:
-		<a href="https://github.com/Homebrew/homebrew/blob/master/Library/Formula/ngircd.rb">Formula</a>
+		<a href="http://www.opensuse.org/">OpenSUSE</a>:
+		<a href="http://download.opensuse.org/repositories/server:/irc/">rpm</a>
 	</li>
 	<li>
-		<a href="http://www.macports.org/">Mac Ports</a>:
-		<a href="http://trac.macports.org/browser/trunk/dports/irc/ngircd/Portfile">Port</a>
+		<a href="http://www.ubuntu.com/">Ubuntu Linux</a>:
+		<a href="http://packages.ubuntu.com/ngircd">deb</a>
 	</li>
+</ul>
+<h4>OS X</h4>
+<ul>
 	<li>
-		<a href="http://www.openbsd.org/">OpenBSD</a>:
-		<a href="http://www.openbsd.org/cgi-bin/cvsweb/ports/net/ngircd/">Port</a>
+		<a href="http://www.finkproject.org/">Fink Project</a>:
+		<a href="http://pdb.finkproject.org/pdb/package.php/ngircd">Port</a>
 	</li>
 	<li>
-		<a href="http://www.opensuse.org/">OpenSUSE</a>:
-		<a href="http://download.opensuse.org/repositories/server:/irc/">rpm</a>
+		<a href="http://brew.sh/">Homebrew</a>:
+		<a href="https://github.com/Homebrew/homebrew/blob/master/Library/Formula/ngircd.rb">Formula</a>
 	</li>
 	<li>
-		<a href="http://www.ubuntu.com/">Ubuntu Linux</a>:
-		<a href="http://packages.ubuntu.com/ngircd">deb</a>
+		<a href="http://www.macports.org/">Mac Ports</a>:
+		<a href="http://trac.macports.org/browser/trunk/dports/irc/ngircd/Portfile">Port</a>
 	</li>
 </ul>
-
diff --git a/download.php.de b/download.php.de
index 23c24cc..527743c 100644
--- a/download.php.de
+++ b/download.php.de
@@ -24,19 +24,11 @@
 <p>
 	Von den folgenden Distributionen gibt es fertige Pakete für den ngIRCd:
 </p>
-<?php
-	include('common/distributions.inc');
-?>
-<p>
-	Inoffizielle Pakete:
-</p>
-<ul>
-	<li>
-		<a href="http://www.debian.org/">Debian Linux</a>:
-		<a href="http://debian.barton.de/debian/pool/main/n/ngircd/">deb</a>
-		(Autor: Alex Barton)
-	</li>
-</ul>
+<?php include('common/distributions.inc'); ?>
+<h4>Weitere</h4>
+<?php include('common/distributions-other.inc'); ?>
+<h4>Inoffizielle Pakete</h4>
+<?php include('common/distributions-unofficial.inc'); ?>
 <h3 id="git">
 	GIT-Repository
 </h3>
diff --git a/download.php.en b/download.php.en
index 0db7228..83710aa 100644
--- a/download.php.en
+++ b/download.php.en
@@ -23,19 +23,11 @@
 	Ready packages for ngIRCd are available for the following
 	distributions:
 </p>
-<?php
-	include('common/distributions.inc');
-?>
-<p>
-	Inofficial packages:
-</p>
-<ul>
-	<li>
-		<a href="http://www.debian.org/">Debian Linux</a>:
-		<a href="http://debian.barton.de/debian/pool/main/n/ngircd/">deb</a>
-		(Author: Alex Barton)
-	</li>
-</ul>
+<?php include('common/distributions.inc'); ?>
+<h4>Other</h4>
+<?php include('common/distributions-other.inc'); ?>
+<h4>Inofficial packages</h4>
+<?php include('common/distributions-unofficial.inc'); ?>
 <h3 id="git">
 	GIT Repository
 </h3>
-- 
2.39.2