Merge kde11-i18n into kde11, and remove my *-i18n ports.

There is no so-version bump, because of compatibility.

Approved by:	will (kde11 maintainer)

16 files changed, 393 insertions, 126 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 36816ec74712..4ef0df81b7ad 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -40,13 +40,10 @@
     SUBDIR += imwheel
     SUBDIR += kb2mb2
     SUBDIR += kde11
-    SUBDIR += kde11-i18n
     SUBDIR += kde2
     SUBDIR += kdebase11
-    SUBDIR += kdebase11-i18n
     SUBDIR += kdebase2
     SUBDIR += kdelibs11
-    SUBDIR += kdelibs11-i18n
     SUBDIR += kdelibs2
     SUBDIR += kvidtune
     SUBDIR += kworldwatch
diff --git a/x11/kde11/Makefile b/x11/kde11/Makefile
index fa944d65d7d2..71464828c3eb 100644
--- a/x11/kde11/Makefile
+++ b/x11/kde11/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
 		kmahjongg:${PORTSDIR}/games/kdegames11 \
 		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
 		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+		kmedia:${PORTSDIR}/audio/kdemultimedia11 \
+		kworldwatch:${PORTSDIR}/x11-clocks/kdetoys11-i18n
 
 NO_BUILD=	yes
 
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 9864f8a8794f..9720f2fd4906 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -7,12 +7,18 @@
 
 PORTNAME=	kdebase
 PORTVERSION= 	1.1.2
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
 
+PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/jp-patch/
+PATCHFILES=	kdebase-ja.19990823.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	will@FreeBSD.org
 
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
 		intl.1:${PORTSDIR}/devel/gettext
 
@@ -20,15 +26,20 @@ USE_XLIB=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xdmdir=${X11BASE}/lib/X11/xdm
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin"
-USE_GMAKE=	yes
+		INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin" \
+		RUN_KAPPFINDER="no"
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+pre-patch:
+	@${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps
+
 post-install:
+	${INSTALL_DATA} ${FILESDIR}/kwmrc ${PREFIX}/share/config
 	@${ECHO}
 	@${ECHO_MSG} "Due to the potential security hole represented by the KDE"
 	@${ECHO_MSG} "screensavers, you will have to set them setuid yourself."
diff --git a/x11/kdebase11/distinfo b/x11/kdebase11/distinfo
index 3b5e9ff7e1a1..8b0a9ea1dbf3 100644
--- a/x11/kdebase11/distinfo
+++ b/x11/kdebase11/distinfo
@@ -1 +1,2 @@
 MD5 (kdebase-1.1.2.tar.bz2) = 330492b058e8087fca7f1ce350363254
+MD5 (kdebase-ja.19990823.diff.gz) = 84bfd3b7f860dd3b8b8a985ee2add887
diff --git a/x11/kdebase11/files/ja.kimap b/x11/kdebase11/files/ja.kimap
new file mode 100644
index 000000000000..629d6a92428d
--- /dev/null
+++ b/x11/kdebase11/files/ja.kimap
@@ -0,0 +1,114 @@
+# KDE Config File
+
+[International Keyboard]
+Authors=Kazuhide Takahashi <kazu@dgra.ne.jp>
+
+Language=Japanese
+Language[ja]=ÆüËܸì
+
+Label=Ja
+Locale=ja
+
+[KeyboardMap]
+keycode1=9,Escape,,
+keycode2=10,1,exclam,
+ keycode3=11,2,quotedbl,
+keycode4=12,3,numbersign,
+keycode5=13,4,dollar,
+ keycode6=14,5,percent,
+ keycode7=15,6,ampersand,
+ keycode8=16,7,apostrophe,
+ keycode9=17,8,parenleft,
+ keycode10=18,9,parenright,
+ keycode11=19,0,,
+ keycode12=20,minus,equal,
+ keycode13=21,asciicircum,asciitilde,
+keycode14=22,BackSpace,,
+keycode15=23,Tab,ISO_Left_Tab,
+keycode16=24,q,Q,
+keycode17=25,w,W,
+keycode18=26,e,E,
+keycode19=27,r,R,
+keycode20=28,t,T,
+keycode21=29,y,Y,
+keycode22=30,u,U,
+keycode23=31,i,I,
+keycode24=32,o,O,
+keycode25=33,p,P,
+ keycode26=34,at,grave,
+ keycode27=35,bracketleft,braceleft,
+keycode28=36,Return,,
+keycode29=37,Control_L,,
+keycode30=38,a,A,
+keycode31=39,s,S,
+keycode32=40,d,D,
+keycode33=41,f,F,
+keycode34=42,g,G,
+keycode35=43,h,H,
+keycode36=44,j,J,
+keycode37=45,k,K,
+keycode38=46,l,L,
+ keycode39=47,semicolon,plus
+ keycode40=48,colon,asterisk,
+keycode41=49,grave,asciitilde,
+keycode42=50,Shift_L,,
+ keycode43=51,bracketright,braceright,
+keycode44=52,z,Z,
+keycode45=53,x,X,
+keycode46=54,c,C,
+keycode47=55,v,V,
+keycode48=56,b,B,
+keycode49=57,n,N,
+keycode50=58,m,M,
+keycode51=59,comma,less,
+keycode52=60,period,greater,
+keycode53=61,slash,question,
+keycode54=62,Shift_R,,
+keycode55=63,KP_Multiply,,
+keycode56=64,Alt_L,Meta_L,
+keycode57=65,space,,
+keycode58=66,Caps_Lock,,
+keycode59=67,F1,,
+keycode60=68,F2,,
+keycode61=69,F3,,
+keycode62=70,F4,,
+keycode63=71,F5,,
+keycode64=72,F6,,
+keycode65=73,F7,,
+keycode66=74,F8,,
+keycode67=75,F9,,
+keycode68=76,F10,,
+keycode69=77,Num_Lock,Pointer_EnableKeys,
+keycode70=78,Scroll_Lock,,
+keycode71=79,KP_Home,KP_7,
+keycode72=80,KP_Up,KP_8,
+keycode73=81,KP_Prior,KP_9,
+keycode74=82,KP_Subtract,,
+keycode75=83,KP_Left,KP_4,
+keycode76=84,KP_Begin,KP_5,
+keycode77=85,KP_Right,KP_6,
+keycode78=86,KP_Add,,
+keycode79=87,KP_End,KP_1,
+keycode80=88,KP_Down,KP_2,
+keycode81=89,KP_Next,KP_3,
+keycode82=90,KP_Insert,KP_0,
+keycode83=91,KP_Delete,KP_Decimala1,
+keycode86=94,less,greater
+keycode87=95,F11,,
+keycode88=96,F12,,
+keycode89=97,Home,,
+keycode90=98,Up,,
+keycode91=99,Prior,,
+keycode92=100,Left,,
+keycode94=102,Right,,
+keycode95=103,End,,
+keycode96=104,Down,,
+keycode97=105,Next,,
+keycode98=106,Insert,,
+keycode99=107,Delete,,
+keycode100=108,KP_Enter,,
+keycode101=109,Control_R,,
+keycode102=110,Pause,Break,
+keycode103=111,Print,Execute,
+keycode104=112,KP_Divide,,
+keycode105=113,Alt_R,Meta_R,
diff --git a/x11/kdebase11/files/kwmrc b/x11/kdebase11/files/kwmrc
new file mode 100644
index 000000000000..567c7d957791
--- /dev/null
+++ b/x11/kdebase11/files/kwmrc
@@ -0,0 +1,3 @@
+# KDE Config File
+[Focus]
+noFocusClasses=Kinput2,
diff --git a/x11/kdebase11/files/patch-ba b/x11/kdebase11/files/patch-ba
new file mode 100644
index 000000000000..0a8b2c1169de
--- /dev/null
+++ b/x11/kdebase11/files/patch-ba
@@ -0,0 +1,37 @@
+--- kcontrol/locale/pics/Makefile.in.orig	Wed Sep  8 00:20:25 1999
++++ kcontrol/locale/pics/Makefile.in	Wed Sep 15 23:46:12 1999
+@@ -170,7 +170,7 @@
+ x_libraries = @x_libraries@
+ xdmconfigsubdir = @xdmconfigsubdir@
+ 
+-data_DATA = flag_de.gif flag_en.gif flag_fr.gif flag_C.gif flag_cs.gif             flag_sv.gif flag_es.gif flag_ru.gif flag_nl.gif flag_hu.gif             flag_da.gif flag_fi.gif flag_is.gif flag_it.gif flag_pt.gif flag_pl.gif             flag_no.gif flag_el.gif flag_hr.gif flag_ro.gif flag_sk.gif 	    flag_zh_TW.Big5.gif flag_zh_CN.GB2312.gif flag_en_UK.gif 	    flag_ca.gif flag_pt_BR.gif flag_eo.gif flag_mk.gif flag_br.gif 	    flag_he.gif flag_tr.gif flag_et.gif flag_se.gif 	    flag_sl.gif  flag_ja.gif flag_ko.gif 	    flag_fr_CA.gif flag_us_eu.gif flag_fr_CH.gif flag_de_CH.gif 
++data_DATA = flag_de.xpm flag_en.xpm flag_fr.xpm flag_C.xpm flag_cs.xpm             flag_sv.xpm flag_es.xpm flag_ru.xpm flag_nl.xpm flag_hu.xpm             flag_da.xpm flag_fi.xpm flag_is.xpm flag_it.xpm flag_pt.xpm flag_pl.xpm             flag_no.xpm flag_el.xpm flag_hr.xpm flag_ro.xpm flag_sk.xpm 	    flag_zh_TW.Big5.xpm flag_zh_CN.GB2312.xpm flag_en_UK.xpm 	    flag_ca.xpm flag_pt_BR.xpm flag_eo.xpm flag_mk.xpm flag_br.xpm 	    flag_he.xpm flag_tr.xpm flag_et.xpm flag_se.xpm 	    flag_sl.xpm  flag_ja.xpm flag_ko.xpm 	    flag_fr_CA.xpm flag_us_eu.xpm flag_fr_CH.xpm flag_de_CH.xpm 
+ 
+ 
+ datadir = $(kde_datadir)/kcmlocale/pics
+@@ -190,6 +190,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
++.SUFFIXES: .gif .xpm
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kcontrol/locale/pics/Makefile
+ 
+@@ -301,3 +302,6 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++.gif.xpm:
++	$(LOCALBASE)/bin/convert $< $@
+--- kcontrol/locale/klangcombo.cpp.orig	Sat Sep 11 03:37:58 1999
++++ kcontrol/locale/klangcombo.cpp	Sat Sep 11 03:38:08 1999
+@@ -55,7 +55,7 @@
+   QPixmap pm(w, 16);
+ 
+   KIconLoader iconLoader;
+-  QPixmap flag(iconLoader.loadIcon(QString("flag_")+tag(lang)+".gif"));
++  QPixmap flag(iconLoader.loadIcon(QString("flag_")+tag(lang)+".xpm"));
+   
+   pm.fill(colorGroup().background());
+   p.begin(&pm);
diff --git a/x11/kdebase11/files/patch-bb b/x11/kdebase11/files/patch-bb
new file mode 100644
index 000000000000..f07bfa646348
--- /dev/null
+++ b/x11/kdebase11/files/patch-bb
@@ -0,0 +1,11 @@
+--- kikbd/maps/Makefile.in.orig	Wed Sep  8 00:20:32 1999
++++ kikbd/maps/Makefile.in	Wed Sep 15 23:49:42 1999
+@@ -170,7 +170,7 @@
+ x_libraries = @x_libraries@
+ xdmconfigsubdir = @xdmconfigsubdir@
+ 
+-data_DATA = cf.kimap csz.kimap pl.kimap rum.kimap ua.kimap 	uawm.kimap csp.kimap hu.kimap plnew.kimap ruw.kimap 	uam.kimap csy.kimap ru.kimap ruwm.kimap uaw.kimap 	bg.kimap fr.kimap de.kimap en.kimap el1.kimap el7.kimap lt.kimap 	he.kimap rua.kimap rui.kimap rumcyr.kimap skp.kimap sky.kimap skz.kimap 	es.kimap no.kimap sv.kimap fi.kimap se.kimap weu.kimap is.kimap 	fr_ch.kimap de_ch.kimap dv.kimap hr.kimap it.kimap la.kimap 	th.kimap ro.kimap pt.kimap pt-acc.kimap et.kimap dva.kimap 	trq.kimap
++data_DATA = cf.kimap csz.kimap pl.kimap rum.kimap ua.kimap 	uawm.kimap csp.kimap hu.kimap plnew.kimap ruw.kimap 	uam.kimap csy.kimap ru.kimap ruwm.kimap uaw.kimap 	bg.kimap fr.kimap de.kimap en.kimap el1.kimap el7.kimap lt.kimap 	he.kimap rua.kimap rui.kimap rumcyr.kimap skp.kimap sky.kimap skz.kimap 	es.kimap no.kimap sv.kimap fi.kimap se.kimap weu.kimap is.kimap 	fr_ch.kimap de_ch.kimap dv.kimap hr.kimap it.kimap la.kimap 	th.kimap ro.kimap pt.kimap pt-acc.kimap et.kimap dva.kimap 	trq.kimap ja.kimap
+ 
+ 
+ #  pt.kimap pt-acc.kimap
diff --git a/x11/kdebase11/files/patch-bc b/x11/kdebase11/files/patch-bc
new file mode 100644
index 000000000000..19139a2f36e9
--- /dev/null
+++ b/x11/kdebase11/files/patch-bc
@@ -0,0 +1,11 @@
+--- po/ja/Makefile.in.orig	Thu Sep 16 16:53:44 1999
++++ po/ja/Makefile.in	Thu Sep 16 16:54:09 1999
+@@ -173,7 +173,7 @@
+ x_libraries = @x_libraries@
+ xdmconfigsubdir = @xdmconfigsubdir@
+ 
+-GMOFILES = kfind.gmo kdehelp.gmo kcmdisplay.gmo kvt.gmo 	kfm.gmo kwm.gmo kfontmanager.gmo 	kdm.gmo kpanel.gmo klock.gmo krootwm.gmo 	kcmbell.gmo kcminfo.gmo kcminput.gmo kcmkwm.gmo 	kcmsamba.gmo kcmsample.gmo kcontrol.gmo kmenuedit.gmo 	kdmconfig.gmo kcmkpanel.gmo kcmlocale.gmo kcmsyssound.gmo 	kstart.gmo kikbd.gmo konsole.gmo kcmkfm.gmo kcmkeys.gmo 	kbgndwm.gmo kpager.gmo
++GMOFILES = kfind.gmo kdehelp.gmo kcmdisplay.gmo kvt.gmo 	kfm.gmo kwm.gmo kfontmanager.gmo 	kdm.gmo kpanel.gmo klock.gmo krootwm.gmo 	kcmbell.gmo kcminfo.gmo kcminput.gmo kcmkwm.gmo 	kcmsamba.gmo kcmsample.gmo kcontrol.gmo kmenuedit.gmo 	kdmconfig.gmo kcmkpanel.gmo kcmlocale.gmo kcmsyssound.gmo 	kstart.gmo kikbd.gmo konsole.gmo kcmkfm.gmo kcmkeys.gmo 	kbgndwm.gmo kpager.gmo kthememgr.gmo
+ 
+ 
+ POFILES = $(GMOFILES:.gmo=.po)
diff --git a/x11/kdebase11/files/patch-bd b/x11/kdebase11/files/patch-bd
new file mode 100644
index 000000000000..5edadef78d3e
--- /dev/null
+++ b/x11/kdebase11/files/patch-bd
@@ -0,0 +1,17 @@
+--- kpanel/sample_kdelnk_files/Makefile.in.orig	Fri May 21 21:24:46 1999
++++ kpanel/sample_kdelnk_files/Makefile.in	Fri May 21 21:36:28 1999
+@@ -302,14 +302,6 @@
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(kdisknavdir)
+-	@for dir in /cdrom /mnt/cdrom /CDROM /CD-ROM ; do \
+-		if test -d $$dir ; then \
+-			echo $(INSTALL_DATA) $(srcdir)/CD-ROM.kdelnk $(kdisknavdir) ;\
+-			$(INSTALL_DATA) $(srcdir)/CD-ROM.kdelnk $(kdisknavdir) ; \
+-			echo "URL=$$dir" >> $(kdisknavdir)/CD-ROM.kdelnk ; \
+-			break; \
+-		 fi ; \
+-	done 
+ 
+ uninstall-local:
+ 	-rm -f $(kdisknavdir)/CD-ROM.kdelnk
diff --git a/x11/kdebase11/files/patch-be b/x11/kdebase11/files/patch-be
new file mode 100644
index 000000000000..e95ef4dc4073
--- /dev/null
+++ b/x11/kdebase11/files/patch-be
@@ -0,0 +1,13 @@
+*** kvt/xsetup.c.orig	Tue Mar 30 17:23:20 1999
+--- kvt/xsetup.c	Tue Jun 22 21:50:56 1999
+***************
+*** 228,233 ****
+--- 228,235 ----
+    char *terminal = NULL;
+    display_name = getenv("DISPLAY");
+  
++   reg_font_handles[DEFAULT_FONT] = 0;
++ 
+    screen = DefaultScreen(display);
+    colormap = DefaultColormap(display, screen);
+  
diff --git a/x11/kdebase11/pkg-plist b/x11/kdebase11/pkg-plist
index 6a8ffd72acdf..53586ca494b7 100644
--- a/x11/kdebase11/pkg-plist
+++ b/x11/kdebase11/pkg-plist
@@ -311,46 +311,46 @@ share/apps/kappfinder/pics/xosview.xpm
 share/apps/kappfinder/pics/xpaint.xpm
 share/apps/kappfinder/pics/xpdf.xpm
 share/apps/kappfinder/pics/xv.xpm
-share/apps/kcmlocale/pics/flag_C.gif
-share/apps/kcmlocale/pics/flag_br.gif
-share/apps/kcmlocale/pics/flag_ca.gif
-share/apps/kcmlocale/pics/flag_cs.gif
-share/apps/kcmlocale/pics/flag_da.gif
-share/apps/kcmlocale/pics/flag_de.gif
-share/apps/kcmlocale/pics/flag_de_CH.gif
-share/apps/kcmlocale/pics/flag_el.gif
-share/apps/kcmlocale/pics/flag_en.gif
-share/apps/kcmlocale/pics/flag_en_UK.gif
-share/apps/kcmlocale/pics/flag_eo.gif
-share/apps/kcmlocale/pics/flag_es.gif
-share/apps/kcmlocale/pics/flag_et.gif
-share/apps/kcmlocale/pics/flag_fi.gif
-share/apps/kcmlocale/pics/flag_fr.gif
-share/apps/kcmlocale/pics/flag_fr_CA.gif
-share/apps/kcmlocale/pics/flag_fr_CH.gif
-share/apps/kcmlocale/pics/flag_he.gif
-share/apps/kcmlocale/pics/flag_hr.gif
-share/apps/kcmlocale/pics/flag_hu.gif
-share/apps/kcmlocale/pics/flag_is.gif
-share/apps/kcmlocale/pics/flag_it.gif
-share/apps/kcmlocale/pics/flag_ja.gif
-share/apps/kcmlocale/pics/flag_ko.gif
-share/apps/kcmlocale/pics/flag_mk.gif
-share/apps/kcmlocale/pics/flag_nl.gif
-share/apps/kcmlocale/pics/flag_no.gif
-share/apps/kcmlocale/pics/flag_pl.gif
-share/apps/kcmlocale/pics/flag_pt.gif
-share/apps/kcmlocale/pics/flag_pt_BR.gif
-share/apps/kcmlocale/pics/flag_ro.gif
-share/apps/kcmlocale/pics/flag_ru.gif
-share/apps/kcmlocale/pics/flag_se.gif
-share/apps/kcmlocale/pics/flag_sk.gif
-share/apps/kcmlocale/pics/flag_sl.gif
-share/apps/kcmlocale/pics/flag_sv.gif
-share/apps/kcmlocale/pics/flag_tr.gif
-share/apps/kcmlocale/pics/flag_us_eu.gif
-share/apps/kcmlocale/pics/flag_zh_CN.GB2312.gif
-share/apps/kcmlocale/pics/flag_zh_TW.Big5.gif
+share/apps/kcmlocale/pics/flag_C.xpm
+share/apps/kcmlocale/pics/flag_br.xpm
+share/apps/kcmlocale/pics/flag_ca.xpm
+share/apps/kcmlocale/pics/flag_cs.xpm
+share/apps/kcmlocale/pics/flag_da.xpm
+share/apps/kcmlocale/pics/flag_de.xpm
+share/apps/kcmlocale/pics/flag_de_CH.xpm
+share/apps/kcmlocale/pics/flag_el.xpm
+share/apps/kcmlocale/pics/flag_en.xpm
+share/apps/kcmlocale/pics/flag_en_UK.xpm
+share/apps/kcmlocale/pics/flag_eo.xpm
+share/apps/kcmlocale/pics/flag_es.xpm
+share/apps/kcmlocale/pics/flag_et.xpm
+share/apps/kcmlocale/pics/flag_fi.xpm
+share/apps/kcmlocale/pics/flag_fr.xpm
+share/apps/kcmlocale/pics/flag_fr_CA.xpm
+share/apps/kcmlocale/pics/flag_fr_CH.xpm
+share/apps/kcmlocale/pics/flag_he.xpm
+share/apps/kcmlocale/pics/flag_hr.xpm
+share/apps/kcmlocale/pics/flag_hu.xpm
+share/apps/kcmlocale/pics/flag_is.xpm
+share/apps/kcmlocale/pics/flag_it.xpm
+share/apps/kcmlocale/pics/flag_ja.xpm
+share/apps/kcmlocale/pics/flag_ko.xpm
+share/apps/kcmlocale/pics/flag_mk.xpm
+share/apps/kcmlocale/pics/flag_nl.xpm
+share/apps/kcmlocale/pics/flag_no.xpm
+share/apps/kcmlocale/pics/flag_pl.xpm
+share/apps/kcmlocale/pics/flag_pt.xpm
+share/apps/kcmlocale/pics/flag_pt_BR.xpm
+share/apps/kcmlocale/pics/flag_ro.xpm
+share/apps/kcmlocale/pics/flag_ru.xpm
+share/apps/kcmlocale/pics/flag_se.xpm
+share/apps/kcmlocale/pics/flag_sk.xpm
+share/apps/kcmlocale/pics/flag_sl.xpm
+share/apps/kcmlocale/pics/flag_sv.xpm
+share/apps/kcmlocale/pics/flag_tr.xpm
+share/apps/kcmlocale/pics/flag_us_eu.xpm
+share/apps/kcmlocale/pics/flag_zh_CN.GB2312.xpm
+share/apps/kcmlocale/pics/flag_zh_TW.Big5.xpm
 share/apps/kcontrol/pics/kdekcc.xpm
 share/apps/kdisknav/KDE.kdelnk
 share/apps/kdisknav/Root.kdelnk
@@ -447,6 +447,7 @@ share/apps/kikbd/hr.kimap
 share/apps/kikbd/hu.kimap
 share/apps/kikbd/is.kimap
 share/apps/kikbd/it.kimap
+share/apps/kikbd/ja.kimap
 share/apps/kikbd/la.kimap
 share/apps/kikbd/lt.kimap
 share/apps/kikbd/no.kimap
@@ -549,6 +550,7 @@ share/config/kdmrc
 share/config/kfmrc
 share/config/kikbdrc
 share/config/kpanelrc
+share/config/kwmrc
 share/doc/HTML/en/kcontrol/index-1.html
 share/doc/HTML/en/kcontrol/index-2.html
 share/doc/HTML/en/kcontrol/index.html
@@ -1825,6 +1827,7 @@ share/locale/ja/LC_MESSAGES/konsole.mo
 share/locale/ja/LC_MESSAGES/kpager.mo
 share/locale/ja/LC_MESSAGES/kpanel.mo
 share/locale/ja/LC_MESSAGES/krootwm.mo
+share/locale/ja/LC_MESSAGES/kthememgr.mo
 share/locale/ja/LC_MESSAGES/kvt.mo
 share/locale/ja/LC_MESSAGES/kwm.mo
 share/locale/ko/LC_MESSAGES/kcmbell.mo
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index fbcf1074ffe8..670f93df94ae 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -6,12 +6,17 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION= 	1.1.2.1
+PORTVERSION= 	1.1.2
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
 DISTNAME=	kdelibs-1.1.2
 
+PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/jp-patch/
+PATCHFILES=	kdelibs-ja.19990903.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -37,20 +42,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
-pre-install:
-.for applink in Applications Development Games Graphics Internet Multimedia \
-		Network Settings System Utilities
-	@${MKDIR} ${PREFIX}/share/applnk/${applink}
-.endfor
-.for lang in cs da de el es fi fr hu it ja nl pl pt ru sv zh_CN.GB2312
-	@${MKDIR} ${PREFIX}/share/doc/HTML/${lang}
-.endfor
-.for mimelnk in application audio image inode text video
-	@${MKDIR} ${PREFIX}/share/mimelnk/${mimelnk}
-.endfor
-	@${MKDIR} ${PREFIX}/share/icons/large
-	@${MKDIR} ${PREFIX}/share/icons/mini
-	@${MKDIR} ${PREFIX}/share/sounds
-	@${MKDIR} ${PREFIX}/share/wallpapers
-
 .include <bsd.port.mk>
diff --git a/x11/kdelibs11/distinfo b/x11/kdelibs11/distinfo
index 71d23a67f3b1..3f1c320f1a14 100644
--- a/x11/kdelibs11/distinfo
+++ b/x11/kdelibs11/distinfo
@@ -1 +1,2 @@
 MD5 (kdelibs-1.1.2.tar.bz2) = bd19469c2e6c8951e26f196e050cb096
+MD5 (kdelibs-ja.19990903.diff.gz) = b34cafbbb3784b86125779f06e60c935
diff --git a/x11/kdelibs11/files/patch-ba b/x11/kdelibs11/files/patch-ba
new file mode 100644
index 000000000000..407a2f75c96a
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ba
@@ -0,0 +1,19 @@
+*** mediatool/chunk.c.orig	Fri Oct 17 08:11:42 1997
+--- mediatool/chunk.c	Sun May  9 14:03:59 1999
+***************
+*** 77,83 ****
+    if (strlen(ChunkName) != 4)
+      return(NULL);
+  
+!   if (strncmp(adress, "MDTO", 4) !=0 )
+      return(NULL);
+  
+    /* Increment adress pointer by 4. The pointer now points to the first
+--- 77,83 ----
+    if (strlen(ChunkName) != 4)
+      return(NULL);
+  
+!   if (!adress || strncmp(adress, "MDTO", 4) !=0 )
+      return(NULL);
+  
+    /* Increment adress pointer by 4. The pointer now points to the first
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index ace82176e6be..81ea670d4bda 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -120,39 +120,40 @@ include/kwizard.h
 include/kwm.h
 include/kwmmapp.h
 include/mediatool.h
+include/nkf.h
 include/sections.h
 include/stl_headers.h
 include/xview.h
+lib/libjscript.la
 lib/libjscript.so
 lib/libjscript.so.%%LIBVER%%
-lib/libjscript.la
+lib/libkab.la
 lib/libkab.so
 lib/libkab.so.%%LIBVER%%
-lib/libkab.la
+lib/libkdecore.la
 lib/libkdecore.so
 lib/libkdecore.so.%%LIBVER%%
-lib/libkdecore.la
+lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.%%LIBVER%%
-lib/libkdeui.la
+lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.%%LIBVER%%
-lib/libkfile.la
+lib/libkfm.la
 lib/libkfm.so
 lib/libkfm.so.%%LIBVER%%
-lib/libkfm.la
+lib/libkhtmlw.la
 lib/libkhtmlw.so
 lib/libkhtmlw.so.%%LIBVER%%
-lib/libkhtmlw.la
+lib/libkimgio.la
 lib/libkimgio.so
 lib/libkimgio.so.%%LIBVER%%
-lib/libkimgio.la
+lib/libkspell.la
 lib/libkspell.so
 lib/libkspell.so.%%LIBVER%%
-lib/libkspell.la
+lib/libmediatool.la
 lib/libmediatool.so
 lib/libmediatool.so.%%LIBVER%%
-lib/libmediatool.la
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
@@ -184,6 +185,7 @@ share/doc/HTML/en/kfiledialog/viewmag.gif
 share/doc/HTML/en/kspell/ksconfig.html
 share/doc/HTML/en/kspell/ksdialog.html
 share/doc/HTML/en/kspell/kspell.html
+@exec ln -sf en %D/share/doc/HTML/default
 share/locale/br/LC_MESSAGES/kde.mo
 share/locale/br/charset
 share/locale/ca/LC_MESSAGES/kde.mo
@@ -311,16 +313,43 @@ share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
-@unexec rmdir %D/share/wallpapers 2>/dev/null || true
-@unexec rmdir %D/share/toolbar 2>/dev/null || true
-@unexec rmdir %D/share/sounds 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/video 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/image 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/audio 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@exec mkdir -p %D/share/applnk/Applications
+@exec mkdir -p %D/share/applnk/Development
+@exec mkdir -p %D/share/applnk/Games
+@exec mkdir -p %D/share/applnk/Graphics
+@exec mkdir -p %D/share/applnk/Internet
+@exec mkdir -p %D/share/applnk/Multimedia
+@exec mkdir -p %D/share/applnk/Network
+@exec mkdir -p %D/share/applnk/Settings
+@exec mkdir -p %D/share/applnk/System
+@exec mkdir -p %D/share/applnk/Utilities
+@exec mkdir -p %D/share/doc/HTML/cs
+@exec mkdir -p %D/share/doc/HTML/da
+@exec mkdir -p %D/share/doc/HTML/de
+@exec mkdir -p %D/share/doc/HTML/el
+@exec mkdir -p %D/share/doc/HTML/es
+@exec mkdir -p %D/share/doc/HTML/fi
+@exec mkdir -p %D/share/doc/HTML/fr
+@exec mkdir -p %D/share/doc/HTML/hu
+@exec mkdir -p %D/share/doc/HTML/it
+@exec mkdir -p %D/share/doc/HTML/ja
+@exec mkdir -p %D/share/doc/HTML/nl
+@exec mkdir -p %D/share/doc/HTML/pl
+@exec mkdir -p %D/share/doc/HTML/pt
+@exec mkdir -p %D/share/doc/HTML/ru
+@exec mkdir -p %D/share/doc/HTML/sv
+@exec mkdir -p %D/share/doc/HTML/zh_CN.GB2312
+@exec mkdir -p %D/share/icons/large
+@exec mkdir -p %D/share/icons/mini
+@exec mkdir -p %D/share/mimelnk/application
+@exec mkdir -p %D/share/mimelnk/audio
+@exec mkdir -p %D/share/mimelnk/image
+@exec mkdir -p %D/share/mimelnk/inode
+@exec mkdir -p %D/share/mimelnk/text
+@exec mkdir -p %D/share/mimelnk/video
+@exec mkdir -p %D/share/locale/hs/LC_MESSAGES
+@exec mkdir -p %D/share/sounds
+@exec mkdir -p %D/share/wallpapers
 @unexec rmdir %D/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW.Big5 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
@@ -393,46 +422,56 @@ share/toolbar/viewzoom.xpm
 @unexec rmdir %D/share/locale/br 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rm -f %D/share/doc/HTML/default
-@unexec rmdir %D/share/icons/mini 2>/dev/null || true
-@unexec rmdir %D/share/icons/large 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/pl 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/ja 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/hu 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/fi 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/en/kspell 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/en/kfiledialog 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/en/kdelibs 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/el 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
-@unexec rmdir %D/share/apps/khtmlw/pics 2>/dev/null || true
-@unexec rmdir %D/share/apps/khtmlw 2>/dev/null || true
-@unexec rmdir %D/share/apps/kde/pics 2>/dev/null || true
-@unexec rmdir %D/share/apps/kde 2>/dev/null || true
-@unexec rmdir %D/share/apps/kab/pics 2>/dev/null || true
-@unexec rmdir %D/share/apps/kab 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk/System 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Network 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Development 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrm share/wallpapers
+@dirrm share/toolbar
+@dirrm share/sounds
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/inode
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/audio
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/icons/mini
+@dirrm share/icons/large
+@dirrm share/icons
+@dirrm share/doc/HTML/zh_CN.GB2312
+@dirrm share/doc/HTML/sv
+@dirrm share/doc/HTML/ru
+@dirrm share/doc/HTML/pt
+@dirrm share/doc/HTML/pl
+@dirrm share/doc/HTML/nl
+@dirrm share/doc/HTML/ja
+@dirrm share/doc/HTML/it
+@dirrm share/doc/HTML/hu
+@dirrm share/doc/HTML/fr
+@dirrm share/doc/HTML/fi
+@dirrm share/doc/HTML/es
+@dirrm share/doc/HTML/en/kspell
+@dirrm share/doc/HTML/en/kfiledialog
+@dirrm share/doc/HTML/en/kdelibs
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/el
+@dirrm share/doc/HTML/de
+@dirrm share/doc/HTML/da
+@dirrm share/doc/HTML/cs
+@dirrm share/doc/HTML
+@dirrm share/config
+@dirrm share/apps/khtmlw/pics
+@dirrm share/apps/khtmlw
+@dirrm share/apps/kde/pics
+@dirrm share/apps/kde
+@dirrm share/apps/kab/pics
+@dirrm share/apps/kab
+@dirrm share/apps
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System
+@dirrm share/applnk/Settings
+@dirrm share/applnk/Network
+@dirrm share/applnk/Multimedia
+@dirrm share/applnk/Internet
+@dirrm share/applnk/Graphics
+@dirrm share/applnk/Games
+@dirrm share/applnk/Development
+@dirrm share/applnk/Applications
+@dirrm share/applnk