Fix port URL for non-Linux ports.

16 files changed, 16 insertions, 2 deletions

diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index fa8de3806..81461eed0 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -4,6 +4,7 @@
 
 archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc;linux-any"
 arch_listname="amd64"
+arch_porturl="amd64"
 arch_kernel="Linux"
 minimum_memory=56
 minimum_memory_gtk=96
diff --git a/build/arch-options/armel b/build/arch-options/armel
index 39c7c9fb7..c17dc63c3 100644
--- a/build/arch-options/armel
+++ b/build/arch-options/armel
@@ -8,6 +8,7 @@
 
 archspec="arm;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="arm"
+arch_porturl="arm"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 6c50a6508..a6047da33 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -4,6 +4,7 @@
 
 archspec="hppa;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="hppa"
+arch_porturl="hppa"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386
index a913acbaf..53d4c4ed1 100644
--- a/build/arch-options/hurd-i386
+++ b/build/arch-options/hurd-i386
@@ -4,6 +4,7 @@
 
 archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;hurd-any"
 arch_listname="hurd"
+arch_porturl="hurd"
 arch_kernel="Hurd"
 # TODO: update
 minimum_memory=44
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 741f4a560..47a7a1802 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -4,6 +4,7 @@
 
 archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc;linux-any"
 arch_listname="boot"
+arch_porturl="i386"
 arch_kernel="Linux"
 minimum_memory=44
 minimum_memory_gtk=96
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index e6483dc11..b70597dff 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -4,6 +4,7 @@
 
 archspec="ia64;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="ia64"
+arch_porturl="ia64"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64
index 46ab9267c..f61e649b9 100644
--- a/build/arch-options/kfreebsd-amd64
+++ b/build/arch-options/kfreebsd-amd64
@@ -4,6 +4,7 @@
 
 archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
 arch_listname="bsd"
+arch_porturl="kfreebsd-gnu"
 arch_kernel="kFreeBSD"
 # TODO: update
 minimum_memory=56
diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386
index 67734925c..4e0f4e831 100644
--- a/build/arch-options/kfreebsd-i386
+++ b/build/arch-options/kfreebsd-i386
@@ -4,6 +4,7 @@
 
 archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc;kfreebsd-any"
 arch_listname="bsd"
+arch_porturl="kfreebsd-gnu"
 arch_kernel="kFreeBSD"
 # TODO: update
 minimum_memory=44
diff --git a/build/arch-options/mips b/build/arch-options/mips
index c7259c65b..38ba2ae74 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -4,6 +4,7 @@
 
 archspec="mips;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="mips"
+arch_porturl="mips"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index e47979507..240c5e234 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -4,6 +4,7 @@
 
 archspec="mipsel;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="mips"
+arch_porturl="mips"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 008775381..8dc564b86 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -4,6 +4,7 @@
 
 archspec="powerpc;not-s390;not-x86;linux-any"
 arch_listname="powerpc"
+arch_porturl="powerpc"
 arch_kernel="Linux"
 minimum_memory=32
 minimum_memory_gtk=128
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index b7fa1f4fc..2a4021872 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -4,6 +4,7 @@
 
 archspec="s390;not-powerpc;not-x86;linux-any"
 arch_listname="s390"
+arch_porturl="s390"
 arch_kernel="Linux"
 minimum_memory=20
 # These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 61255e2e8..a128b0047 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -4,6 +4,7 @@
 
 archspec="sparc;not-x86;not-s390;not-powerpc;linux-any"
 arch_listname="sparc"
+arch_porturl="sparc"
 arch_kernel="Linux"
 minimum_memory=32
 # These two options should be set if condition 'smp' is set below
diff --git a/build/buildone.sh b/build/buildone.sh
index 47b09e4ec..09bfa63ae 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -83,6 +83,7 @@ create_profiled () {
     echo "<!ENTITY architecture \"${arch}\">" >> $dynamic
     echo "<!ENTITY arch-kernel \"${arch_kernel}\">" >> $dynamic
     echo "<!ENTITY arch-listname \"${arch_listname}\">" >> $dynamic
+    echo "<!ENTITY arch-porturl \"${arch_porturl}\">" >> $dynamic
     echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic
     echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
     echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index ac7981b2b..0d849c860 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -42,8 +42,7 @@
 <!ENTITY url-d-i-sataraid "&url-d-i-wiki;SataRaid">
 <!ENTITY url-d-i-multipath "&url-d-i-wiki;MultipathSupport">
 
-<!-- broken for i386 (from the website, `i386 is not a port') -->
-<!ENTITY url-ports "http://&www-debian-org;/ports/&architecture;/">
+<!ENTITY url-ports "http://&www-debian-org;/ports/&arch-porturl;/">
 
 <!ENTITY email-debian-boot-list "debian-boot@lists.debian.org">
 
diff --git a/debian/changelog b/debian/changelog
index f62413487..16655937e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Add a "What is Debian GNU/kFreeBSD" section.
   * Add the list of architectures supported by the kFreeBSD port.
   * Restrict "Board Devices" accessibility section to Linux.
+  * Fix port URL for non-Linux ports.
 
  -- Samuel Thibault <sthibault@debian.org>  Mon, 06 Sep 2010 00:56:02 +0200