6 files changed, 2 insertions, 415 deletions

diff --git a/MOVED b/MOVED
index fd3f791d20e2..44f9b65a6cde 100644
--- a/MOVED
+++ b/MOVED
@@ -2899,4 +2899,5 @@ editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
 editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete
 lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42
 japanese/ptex-tetex|japanese/ptex|2007-04-08|Merged into japanese/ptex
-japanese/ptex-base|japanese/ptex|2007-04-08|Merged into japanese/ptex
\ No newline at end of file
+japanese/ptex-base|japanese/ptex|2007-04-08|Merged into japanese/ptex
+games/kgeography|misc/kdeedu3|2007-04-09|Merged into kdeedu
diff --git a/games/Makefile b/games/Makefile
index c004b25b27b6..9125122cb00a 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -375,7 +375,6 @@
     SUBDIR += kcheckers
     SUBDIR += kdegames3
     SUBDIR += kfreerings
-    SUBDIR += kgeography
     SUBDIR += kiki
     SUBDIR += kimboot
     SUBDIR += klavaro
diff --git a/games/kgeography/Makefile b/games/kgeography/Makefile
deleted file mode 100644
index ae9af2df781e..000000000000
--- a/games/kgeography/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:	kgeography
-# Date created:							2004-12-01
-# Whom:									arved
-#
-# $FreeBSD$
-
-PORTNAME=	kgeography
-PORTVERSION=	0.4
-PORTREVISION=	1
-CATEGORIES=	games kde
-MASTER_SITES=	http://download.berlios.de/kgeography/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Geography learning tool
-
-CONFLICTS=	kdegames-3.5.[0-9]*
-
-USE_BZIP2=	yes
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-
-.include <bsd.port.mk>
diff --git a/games/kgeography/distinfo b/games/kgeography/distinfo
deleted file mode 100644
index 6db20e4629c1..000000000000
--- a/games/kgeography/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (kgeography-0.4.tar.bz2) = 139b9c8f6e9a92cdb0ef518f19f23ea7
-SHA256 (kgeography-0.4.tar.bz2) = 3a6b141596c3f58ede68439b453d9dd56efcea2d29dedd26075c04b2ae09c024
-SIZE (kgeography-0.4.tar.bz2) = 3384520
diff --git a/games/kgeography/pkg-descr b/games/kgeography/pkg-descr
deleted file mode 100644
index c323e450932e..000000000000
--- a/games/kgeography/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-KGeography is a geography learning tool. Right now it has six usage modes:
-*	Browse the maps clicking in a map division to see it's name
-*	The game tells you a map division name and you have to click on it
-*	The game tells you a capital and you have to guess the division it
-	belongs to
-*	The game tells you a division and you have to guess its capital
-*	The game shows you a map division flag and you have to guess its name
-*	The game tells you a map division name and you have to guess its flag
-
-WWW:	http://kgeography.berlios.de/
-Author:	Albert Astals Cid.
diff --git a/games/kgeography/pkg-plist b/games/kgeography/pkg-plist
deleted file mode 100644
index 752dd429bd9c..000000000000
--- a/games/kgeography/pkg-plist
+++ /dev/null
@@ -1,376 +0,0 @@
-bin/kgeography
-share/applications/kde/kgeography.desktop
-share/apps/kgeography/africa.kgm
-share/apps/kgeography/africa.png
-share/apps/kgeography/asia.kgm
-share/apps/kgeography/asia.png
-share/apps/kgeography/austria.kgm
-share/apps/kgeography/austria.png
-share/apps/kgeography/brazil.kgm
-share/apps/kgeography/brazil.png
-share/apps/kgeography/canada.kgm
-share/apps/kgeography/canada.png
-share/apps/kgeography/china.kgm
-share/apps/kgeography/china.png
-share/apps/kgeography/europe.kgm
-share/apps/kgeography/europe.png
-share/apps/kgeography/flags/Monaco.png
-share/apps/kgeography/flags/NewZealand.png
-share/apps/kgeography/flags/SriLanka.png
-share/apps/kgeography/flags/Vatican.png
-share/apps/kgeography/flags/afghanistan.png
-share/apps/kgeography/flags/albania.png
-share/apps/kgeography/flags/alberta.png
-share/apps/kgeography/flags/algeria.png
-share/apps/kgeography/flags/andorra.png
-share/apps/kgeography/flags/angola.png
-share/apps/kgeography/flags/antigua.png
-share/apps/kgeography/flags/argentina.png
-share/apps/kgeography/flags/armenia.png
-share/apps/kgeography/flags/australia.png
-share/apps/kgeography/flags/austria.png
-share/apps/kgeography/flags/azerbaijan.png
-share/apps/kgeography/flags/baden_wurttemberg.png
-share/apps/kgeography/flags/bahamas.png
-share/apps/kgeography/flags/bahrain.png
-share/apps/kgeography/flags/bangladesh.png
-share/apps/kgeography/flags/barbados.png
-share/apps/kgeography/flags/bavaria.png
-share/apps/kgeography/flags/bc.png
-share/apps/kgeography/flags/belarus.png
-share/apps/kgeography/flags/belgium.png
-share/apps/kgeography/flags/belize.png
-share/apps/kgeography/flags/benin.png
-share/apps/kgeography/flags/berlin.png
-share/apps/kgeography/flags/bhutan.png
-share/apps/kgeography/flags/bolivia.png
-share/apps/kgeography/flags/bosnia_herzegovina.png
-share/apps/kgeography/flags/botswana.png
-share/apps/kgeography/flags/br_AC.png
-share/apps/kgeography/flags/br_AL.png
-share/apps/kgeography/flags/br_AM.png
-share/apps/kgeography/flags/br_AP.png
-share/apps/kgeography/flags/br_BA.png
-share/apps/kgeography/flags/br_CE.png
-share/apps/kgeography/flags/br_DF.png
-share/apps/kgeography/flags/br_ES.png
-share/apps/kgeography/flags/br_GO.png
-share/apps/kgeography/flags/br_MA.png
-share/apps/kgeography/flags/br_MG.png
-share/apps/kgeography/flags/br_MS.png
-share/apps/kgeography/flags/br_MT.png
-share/apps/kgeography/flags/br_PA.png
-share/apps/kgeography/flags/br_PE.png
-share/apps/kgeography/flags/br_PI.png
-share/apps/kgeography/flags/br_PN.png
-share/apps/kgeography/flags/br_PR.png
-share/apps/kgeography/flags/br_RJ.png
-share/apps/kgeography/flags/br_RN.png
-share/apps/kgeography/flags/br_RO.png
-share/apps/kgeography/flags/br_RR.png
-share/apps/kgeography/flags/br_RS.png
-share/apps/kgeography/flags/br_SC.png
-share/apps/kgeography/flags/br_SE.png
-share/apps/kgeography/flags/br_SP.png
-share/apps/kgeography/flags/br_TO.png
-share/apps/kgeography/flags/brandenburg.png
-share/apps/kgeography/flags/brazil.png
-share/apps/kgeography/flags/bremen.png
-share/apps/kgeography/flags/brunei.png
-share/apps/kgeography/flags/bulgaria.png
-share/apps/kgeography/flags/burkina.png
-share/apps/kgeography/flags/burundi.png
-share/apps/kgeography/flags/cambodia.png
-share/apps/kgeography/flags/cameroon.png
-share/apps/kgeography/flags/canada.png
-share/apps/kgeography/flags/central_african_republic.png
-share/apps/kgeography/flags/chad.png
-share/apps/kgeography/flags/chile.png
-share/apps/kgeography/flags/china.png
-share/apps/kgeography/flags/colombia.png
-share/apps/kgeography/flags/congo_brazzaville.png
-share/apps/kgeography/flags/congo_kinshasa.png
-share/apps/kgeography/flags/costa_rica.png
-share/apps/kgeography/flags/cote_divoire.png
-share/apps/kgeography/flags/croatia.png
-share/apps/kgeography/flags/cuba_3x2.png
-share/apps/kgeography/flags/cyprus_4x3.png
-share/apps/kgeography/flags/czech.png
-share/apps/kgeography/flags/denmark.png
-share/apps/kgeography/flags/djibouti.png
-share/apps/kgeography/flags/dominica.png
-share/apps/kgeography/flags/dominicanrepublic.png
-share/apps/kgeography/flags/easttimor.png
-share/apps/kgeography/flags/ecuador.png
-share/apps/kgeography/flags/egypt.png
-share/apps/kgeography/flags/el_salvador.png
-share/apps/kgeography/flags/equatorial_guinea.png
-share/apps/kgeography/flags/eritrea.png
-share/apps/kgeography/flags/estonia.png
-share/apps/kgeography/flags/ethiopia.png
-share/apps/kgeography/flags/fiji.png
-share/apps/kgeography/flags/finland.png
-share/apps/kgeography/flags/france.png
-share/apps/kgeography/flags/gabon.png
-share/apps/kgeography/flags/gambia.png
-share/apps/kgeography/flags/georgia.png
-share/apps/kgeography/flags/germany.png
-share/apps/kgeography/flags/ghana.png
-share/apps/kgeography/flags/greece.png
-share/apps/kgeography/flags/greenland.png
-share/apps/kgeography/flags/guatemala.png
-share/apps/kgeography/flags/guinea.png
-share/apps/kgeography/flags/guineabissau.png
-share/apps/kgeography/flags/guyana.png
-share/apps/kgeography/flags/haiti.png
-share/apps/kgeography/flags/hamburg.png
-share/apps/kgeography/flags/hesse.png
-share/apps/kgeography/flags/honduras.png
-share/apps/kgeography/flags/hungary.png
-share/apps/kgeography/flags/iceland.png
-share/apps/kgeography/flags/india.png
-share/apps/kgeography/flags/indonesia.png
-share/apps/kgeography/flags/iran.png
-share/apps/kgeography/flags/iraq.png
-share/apps/kgeography/flags/ireland.png
-share/apps/kgeography/flags/israel.png
-share/apps/kgeography/flags/italy.png
-share/apps/kgeography/flags/italy/it-abr200.png
-share/apps/kgeography/flags/italy/it-aos200.png
-share/apps/kgeography/flags/italy/it-bas200.png
-share/apps/kgeography/flags/italy/it-cal200.png
-share/apps/kgeography/flags/italy/it-cam200.png
-share/apps/kgeography/flags/italy/it-emi200.png
-share/apps/kgeography/flags/italy/it-fri200.png
-share/apps/kgeography/flags/italy/it-lat200.png
-share/apps/kgeography/flags/italy/it-lig200.png
-share/apps/kgeography/flags/italy/it-lom200.png
-share/apps/kgeography/flags/italy/it-mar200.png
-share/apps/kgeography/flags/italy/it-mol200.png
-share/apps/kgeography/flags/italy/it-pie200.png
-share/apps/kgeography/flags/italy/it-pug200.png
-share/apps/kgeography/flags/italy/it-sar200.png
-share/apps/kgeography/flags/italy/it-sic200.png
-share/apps/kgeography/flags/italy/it-tre200.png
-share/apps/kgeography/flags/italy/it-tus200.png
-share/apps/kgeography/flags/italy/it-umb200.png
-share/apps/kgeography/flags/italy/it-ven200.png
-share/apps/kgeography/flags/jamaica.png
-share/apps/kgeography/flags/japan.png
-share/apps/kgeography/flags/jordan.png
-share/apps/kgeography/flags/kazakhstan.png
-share/apps/kgeography/flags/kenya.png
-share/apps/kgeography/flags/kuwait.png
-share/apps/kgeography/flags/kyrgyzstan.png
-share/apps/kgeography/flags/laos.png
-share/apps/kgeography/flags/latvia.png
-share/apps/kgeography/flags/lebanon.png
-share/apps/kgeography/flags/lesotho.png
-share/apps/kgeography/flags/liberia.png
-share/apps/kgeography/flags/libya.png
-share/apps/kgeography/flags/lithuania.png
-share/apps/kgeography/flags/lower_saxony.png
-share/apps/kgeography/flags/luxembourg.png
-share/apps/kgeography/flags/macedonia.png
-share/apps/kgeography/flags/madagascar.png
-share/apps/kgeography/flags/malawi.png
-share/apps/kgeography/flags/malaysia.png
-share/apps/kgeography/flags/mali.png
-share/apps/kgeography/flags/manitoba.png
-share/apps/kgeography/flags/mauritania.png
-share/apps/kgeography/flags/mecklenburg_western_pomerania.png
-share/apps/kgeography/flags/mexico.png
-share/apps/kgeography/flags/moldova.png
-share/apps/kgeography/flags/mongolia.png
-share/apps/kgeography/flags/morocco.png
-share/apps/kgeography/flags/mozambique.png
-share/apps/kgeography/flags/myanmar.png
-share/apps/kgeography/flags/namibia.png
-share/apps/kgeography/flags/nepal.png
-share/apps/kgeography/flags/netherlands.png
-share/apps/kgeography/flags/newbrunswick.png
-share/apps/kgeography/flags/newfoundland.png
-share/apps/kgeography/flags/nicaragua.png
-share/apps/kgeography/flags/niger.png
-share/apps/kgeography/flags/nigeria.png
-share/apps/kgeography/flags/nkorea.png
-share/apps/kgeography/flags/north_rhine_westphalia.png
-share/apps/kgeography/flags/norway.png
-share/apps/kgeography/flags/novascotia.png
-share/apps/kgeography/flags/nunavut.png
-share/apps/kgeography/flags/nwterritories.png
-share/apps/kgeography/flags/oman.png
-share/apps/kgeography/flags/ontario.png
-share/apps/kgeography/flags/pakistan.png
-share/apps/kgeography/flags/panama.png
-share/apps/kgeography/flags/papua_new_guinea.png
-share/apps/kgeography/flags/paraguay.png
-share/apps/kgeography/flags/pei.png
-share/apps/kgeography/flags/peru.png
-share/apps/kgeography/flags/philippines.png
-share/apps/kgeography/flags/poland.png
-share/apps/kgeography/flags/portugal.png
-share/apps/kgeography/flags/qatar.png
-share/apps/kgeography/flags/quebec.png
-share/apps/kgeography/flags/rhineland_palatinate.png
-share/apps/kgeography/flags/romania.png
-share/apps/kgeography/flags/russia.png
-share/apps/kgeography/flags/rwanda.png
-share/apps/kgeography/flags/saarland.png
-share/apps/kgeography/flags/san_marino.png
-share/apps/kgeography/flags/saskatchewan.png
-share/apps/kgeography/flags/saudiarabia.png
-share/apps/kgeography/flags/saxony.png
-share/apps/kgeography/flags/saxony_anhalt.png
-share/apps/kgeography/flags/schleswig_holstein.png
-share/apps/kgeography/flags/senegal.png
-share/apps/kgeography/flags/serbiamontenegro_3x2.png
-share/apps/kgeography/flags/sierra_leone.png
-share/apps/kgeography/flags/singapore.png
-share/apps/kgeography/flags/skorea.png
-share/apps/kgeography/flags/slovakia.png
-share/apps/kgeography/flags/slovenia.png
-share/apps/kgeography/flags/somalia.png
-share/apps/kgeography/flags/southafrica.png
-share/apps/kgeography/flags/spain.png
-share/apps/kgeography/flags/sudan.png
-share/apps/kgeography/flags/suriname.png
-share/apps/kgeography/flags/swaziland.png
-share/apps/kgeography/flags/sweden.png
-share/apps/kgeography/flags/switzerland.png
-share/apps/kgeography/flags/syria.png
-share/apps/kgeography/flags/taiwan.png
-share/apps/kgeography/flags/tajikistan.png
-share/apps/kgeography/flags/tanzania.png
-share/apps/kgeography/flags/thailand.png
-share/apps/kgeography/flags/thuringia.png
-share/apps/kgeography/flags/togo.png
-share/apps/kgeography/flags/tonga.png
-share/apps/kgeography/flags/trinidad_tobago.png
-share/apps/kgeography/flags/tunisia.png
-share/apps/kgeography/flags/turkey.png
-share/apps/kgeography/flags/turkmenistan.png
-share/apps/kgeography/flags/uae.png
-share/apps/kgeography/flags/uganda.png
-share/apps/kgeography/flags/uk.png
-share/apps/kgeography/flags/ukraine.png
-share/apps/kgeography/flags/uruguay.png
-share/apps/kgeography/flags/usa.png
-share/apps/kgeography/flags/uzbekistan.png
-share/apps/kgeography/flags/venezuela.png
-share/apps/kgeography/flags/vietnam.png
-share/apps/kgeography/flags/western_sahara.png
-share/apps/kgeography/flags/yemen.png
-share/apps/kgeography/flags/yukon.png
-share/apps/kgeography/flags/zambia.png
-share/apps/kgeography/flags/zimbabwe.png
-share/apps/kgeography/france.kgm
-share/apps/kgeography/france.png
-share/apps/kgeography/germany.kgm
-share/apps/kgeography/germany.png
-share/apps/kgeography/italy.kgm
-share/apps/kgeography/italy.png
-share/apps/kgeography/italyprovince.kgm
-share/apps/kgeography/italyprovince.png
-share/apps/kgeography/kgeographyui.rc
-share/apps/kgeography/ncamerica.kgm
-share/apps/kgeography/ncamerica.png
-share/apps/kgeography/netherlands.kgm
-share/apps/kgeography/netherlands.png
-share/apps/kgeography/norway.kgm
-share/apps/kgeography/norway.png
-share/apps/kgeography/poland.kgm
-share/apps/kgeography/poland.png
-share/apps/kgeography/southamerica.kgm
-share/apps/kgeography/southamerica.png
-share/apps/kgeography/spain.kgm
-share/apps/kgeography/spain.png
-share/apps/kgeography/usa.kgm
-share/apps/kgeography/usa.png
-share/apps/kgeography/world.kgm
-share/apps/kgeography/world.png
-share/config.kcfg/kgeography.kcfg
-share/doc/HTML/en/kgeography/common
-share/doc/HTML/en/kgeography/first-start1.png
-share/doc/HTML/en/kgeography/first-start10.png
-share/doc/HTML/en/kgeography/first-start11.png
-share/doc/HTML/en/kgeography/first-start12.png
-share/doc/HTML/en/kgeography/first-start2.png
-share/doc/HTML/en/kgeography/first-start3.png
-share/doc/HTML/en/kgeography/first-start4.png
-share/doc/HTML/en/kgeography/first-start5.png
-share/doc/HTML/en/kgeography/first-start6.png
-share/doc/HTML/en/kgeography/first-start7.png
-share/doc/HTML/en/kgeography/first-start8.png
-share/doc/HTML/en/kgeography/first-start9.png
-share/doc/HTML/en/kgeography/index.cache.bz2
-share/doc/HTML/en/kgeography/index.docbook
-share/doc/HTML/en/kgeography/kgeography.png
-share/doc/HTML/en/kgeography/river.png
-share/doc/HTML/en/kgeography/zoom.png
-share/icons/crystalsvg/128x128/apps/kgeography.png
-share/icons/crystalsvg/16x16/apps/kgeography.png
-share/icons/crystalsvg/22x22/apps/kgeography.png
-share/icons/crystalsvg/32x32/apps/kgeography.png
-share/icons/crystalsvg/48x48/apps/kgeography.png
-share/icons/crystalsvg/64x64/apps/kgeography.png
-share/icons/crystalsvg/scalable/apps/kgeography.svgz
-share/icons/hicolor/128x128/apps/kgeography.png
-share/icons/hicolor/16x16/apps/kgeography.png
-share/icons/hicolor/22x22/apps/kgeography.png
-share/icons/hicolor/32x32/apps/kgeography.png
-share/icons/hicolor/48x48/apps/kgeography.png
-share/icons/hicolor/64x64/apps/kgeography.png
-share/locale/az/LC_MESSAGES/kgeography.mo
-share/locale/br/LC_MESSAGES/kgeography.mo
-share/locale/ca/LC_MESSAGES/kgeography.mo
-share/locale/cs/LC_MESSAGES/kgeography.mo
-share/locale/cy/LC_MESSAGES/kgeography.mo
-share/locale/da/LC_MESSAGES/kgeography.mo
-share/locale/de/LC_MESSAGES/kgeography.mo
-share/locale/el/LC_MESSAGES/kgeography.mo
-share/locale/en_GB/LC_MESSAGES/kgeography.mo
-share/locale/es/LC_MESSAGES/kgeography.mo
-share/locale/et/LC_MESSAGES/kgeography.mo
-share/locale/fr/LC_MESSAGES/kgeography.mo
-share/locale/ga/LC_MESSAGES/kgeography.mo
-share/locale/gl/LC_MESSAGES/kgeography.mo
-share/locale/is/LC_MESSAGES/kgeography.mo
-share/locale/it/LC_MESSAGES/kgeography.mo
-share/locale/ja/LC_MESSAGES/kgeography.mo
-share/locale/lt/LC_MESSAGES/kgeography.mo
-share/locale/nl/LC_MESSAGES/kgeography.mo
-share/locale/pa/LC_MESSAGES/kgeography.mo
-share/locale/pl/LC_MESSAGES/kgeography.mo
-share/locale/pt_BR/LC_MESSAGES/kgeography.mo
-share/locale/ro/LC_MESSAGES/kgeography.mo
-share/locale/ru/LC_MESSAGES/kgeography.mo
-share/locale/rw/LC_MESSAGES/kgeography.mo
-share/locale/sr/LC_MESSAGES/kgeography.mo
-share/locale/sr@Latn/LC_MESSAGES/kgeography.mo
-share/locale/sv/LC_MESSAGES/kgeography.mo
-share/locale/ta/LC_MESSAGES/kgeography.mo
-share/locale/tr/LC_MESSAGES/kgeography.mo
-share/locale/uk/LC_MESSAGES/kgeography.mo
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrm share/doc/HTML/en/kgeography
-@dirrm share/apps/kgeography/flags/italy
-@dirrm share/apps/kgeography/flags
-@dirrm share/apps/kgeography