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

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

Approved by:	will (kde11 maintainer)

7 files changed, 50 insertions, 4 deletions

diff --git a/net/Makefile b/net/Makefile
index a1b5b632b08a..102247a757b6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -109,7 +109,6 @@
     SUBDIR += jabber-transport
     SUBDIR += jwhois
     SUBDIR += kdenetwork11
-    SUBDIR += kdenetwork11-i18n
     SUBDIR += kdenetwork2
     SUBDIR += kdetelnet
     SUBDIR += kicq
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 06fefdff36e0..f263b560cd91 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -7,13 +7,21 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	net news kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
 
+PATCH_SITES=	http://www.kde.gr.jp/~toyohiro/ \
+		http://www.kde.gr.jp/~imura/ko/
+PATCHFILES=	kdenetwork-1.1.2-ja-19991124.diff.gz \
+		kdenetwork-1.1.2-ko-20000108.diff
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	will@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm \
+		msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 		kdecore.3:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
diff --git a/net/kdenetwork11/distinfo b/net/kdenetwork11/distinfo
index 9a6646b5d525..7e1f08729760 100644
--- a/net/kdenetwork11/distinfo
+++ b/net/kdenetwork11/distinfo
@@ -1 +1,3 @@
 MD5 (kdenetwork-1.1.2.tar.bz2) = ce8ce348a7b56769665afe58e36902ff
+MD5 (kdenetwork-1.1.2-ja-19991124.diff.gz) = 1f4b42d14aeabc217bfa8a037449f1dc
+MD5 (kdenetwork-1.1.2-ko-20000108.diff) = 83900d88154738ee0cbd36f2bd4fd3fb
diff --git a/net/kdenetwork11/files/patch-ba b/net/kdenetwork11/files/patch-ba
new file mode 100644
index 000000000000..e5bba9bfea77
--- /dev/null
+++ b/net/kdenetwork11/files/patch-ba
@@ -0,0 +1,11 @@
+--- kppp/Rules/Japan/NTT_Local.rst.orig	Sun Feb  8 03:18:47 1998
++++ kppp/Rules/Japan/NTT_Local.rst	Fri May 14 01:14:20 1999
+@@ -17,7 +17,7 @@
+ ################################################################
+ 
+ # defines JPY (Japanese Yen) to be used as currency
+-currency_symbol=JPY
++currency_symbol=±ß
+ 
+ # Define the position of the currency symbol.
+ currency_position=right
diff --git a/net/kdenetwork11/files/patch-bb b/net/kdenetwork11/files/patch-bb
new file mode 100644
index 000000000000..d5a6187a21b3
--- /dev/null
+++ b/net/kdenetwork11/files/patch-bb
@@ -0,0 +1,11 @@
+--- krn/Makefile.in.orig	Thu May 13 23:45:31 1999
++++ krn/Makefile.in	Thu May 13 23:45:46 1999
+@@ -329,7 +329,7 @@
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ 
+-DEFS = @DEFS@ -I. -I$(srcdir) -I..
++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../kmail
+ CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ krn_OBJECTS =  main.o NNTP.o groupdlg.o artdlg.o newsgroup.o asker.o \
diff --git a/net/kdenetwork11/files/patch-bc b/net/kdenetwork11/files/patch-bc
new file mode 100644
index 000000000000..2c3d94a0dbe7
--- /dev/null
+++ b/net/kdenetwork11/files/patch-bc
@@ -0,0 +1,14 @@
+*** karchie/KAView.cpp.orig	Wed Apr 14 21:22:18 1999
+--- karchie/KAView.cpp	Sun Sep 12 19:16:36 1999
+***************
+*** 457,462 ****
+--- 457,465 ----
+    // setup list
+    list = new KAViewList( this, "viewlist" );
+  
++   filetype = NULL;
++   box = NULL;
++ 
+    // setup fileview
+    //  config = KApplication::getKApplication()->getConfig();  
+    slotShowFileDiscriptor(KApplication::getKApplication()
diff --git a/net/kdenetwork11/pkg-plist b/net/kdenetwork11/pkg-plist
index 5e39f2480318..a9a796f16faa 100644
--- a/net/kdenetwork11/pkg-plist
+++ b/net/kdenetwork11/pkg-plist
@@ -768,6 +768,8 @@ share/toolbar/mini-ktalk.xpm
 @exec ln -sf libpbutton.so.0 %D/lib/ksirc/libpbutton.so
 @exec ln -sf libpalistbox.so.0 %D/lib/ksirc/libpalistbox.so
 @exec ln -sf libksirclistbox.so.0 %D/lib/ksirc/libksirclistbox.so
+@exec ln -sf kppp.html %D/share/doc/HTML/en/kppp/index.html
+@unexec rm -f %D/share/doc/HTML/en/kppp/index.html
 @dirrm share/doc/HTML/it/ktalkd
 @dirrm share/doc/HTML/fr/ktalkd
 @dirrm share/doc/HTML/en/pws
@@ -831,6 +833,7 @@ share/toolbar/mini-ktalk.xpm
 @dirrm share/apps/kmail
 @dirrm share/apps/kbiff/pics
 @dirrm share/apps/kbiff
+@dirrm share/applnk/Settings/Network
 @unexec rm -f %D/lib/ksirc/libksirclistbox.so
 @unexec rm -f %D/lib/ksirc/libpalistbox.so
 @unexec rm -f %D/lib/ksirc/libpbutton.so
@@ -848,5 +851,3 @@ share/toolbar/mini-ktalk.xpm
 @unexec rm -f %D/lib/ksirc/libptablevw.so
 @dirrm lib/ksirc
 @unexec rm -f %D/lib/libpuke.so
-@exec ln -sf kppp.html %D/share/doc/HTML/en/kppp/index.html
-@unexec rm -f %D/share/doc/HTML/en/kppp/index.html