From 24c23c4eebaf4fa86fd27f1c65fa3f220ce30059 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 5 Apr 2009 16:37:12 +0200
Subject: [PATCH] kfreebsd moves to main archive

While on it, reflect the fact that m68k is from debports in some
places where this was missing.
---
 README                         |  3 +--
 bin/parse-contents             |  2 +-
 cron.d/100syncarchive          |  4 ----
 cron.d/100syncarchive_debports |  2 +-
 templates/config/mirrors.tmpl  | 12 ++++--------
 templates/html/download.tmpl   |  2 +-
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/README b/README
index 944fc32..14d8bfb 100644
--- a/README
+++ b/README
@@ -44,8 +44,7 @@ Cron
 050checkinst               -- check if all needed packages are installed
 100syncarchive             -- retrieve data from main Debian archive
 100syncarchive_backports   -- retrieve data from backports.org
-100syncarchive_debports    -- retrieve data from debian-ports.org
-                              (kfreebsd-*, armel)
+100syncarchive_debports    -- retrieve data from debian-ports.org (m68k)
 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k        -- retrieve data for etch-m68k
 100syncarchive_maintainers -- retrieve maintainer index
diff --git a/bin/parse-contents b/bin/parse-contents
index 82df0b8..a72bb71 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -142,7 +142,7 @@ for my $suite (@suites) {
 
 	    activate($filelist_db);
 	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
-	    if ($arch !~ m/^kfreebsd-.*$/) {
+	    if ($arch ne 'm68k') {
 		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 02750b0..d8b9f79 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,8 +21,6 @@ then
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -57,8 +55,6 @@ else
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    test ! "$arch" = "kfreebsd-i386" || continue
-	    test ! "$arch" = "kfreebsd-amd64" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index c16f4c9..16dae22 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="kfreebsd-i386 kfreebsd-amd64 m68k"
+architectures="m68k"
 
 for dist in sid experimental
   do
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a30d811..f68562c 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -138,16 +138,12 @@ mirrors = {
 	},
 
 	debports => {
-		title => g('ports of packages to architectures not yet available in Debian'),
+		title => g('ports of packages to architectures not yet or not anymore available in Debian'),
 		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
-			'kfreebsd-amd64' => {
-				url_name => 'kfreebsd-gnu',
-				name => 'GNU/kFreeBSD',
-			},
-			'kfreebsd-i386' => {
-				url_name => 'kfreebsd-gnu',
-				name => 'GNU/kFreeBSD',
+			m68k => {
+				url_name => 'm68k',
+				name => 'M68K',
 			},
 		},
 		north_america => [
diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 97ef81e..01dd76a 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -94,7 +94,7 @@ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
-<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
 	port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]
 
-- 
2.39.2