From owner-ports-jp@jp.freebsd.org  Tue Jun 15 23:52:23 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA20374;
	Tue, 15 Jun 1999 23:52:23 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mail.af.airnet.ne.jp (mail.af.airnet.ne.jp [210.159.66.49])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id XAA20367
	for <ports-jp@jp.freebsd.org>; Tue, 15 Jun 1999 23:52:19 +0900 (JST)
	(envelope-from imura@af.airnet.ne.jp)
Received: from localhost (tok328.airnet.ne.jp [210.159.89.72])
	by mail.af.airnet.ne.jp (8.8.8/3.6W/06/13/98-AF.AIRNET.NE.JP) with ESMTP id XAA13834
	for <ports-jp@jp.freebsd.org>; Tue, 15 Jun 1999 23:52:13 +0900
To: ports-jp@jp.freebsd.org
From: =?iso-2022-jp?B?GyRCMGZCPBsoQiAbJEJONTBsTzobKEI=?=
 <imura@cs.titech.ac.jp>
In-Reply-To: <19990606214359X.imura@af.airnet.ne.jp>
References: <19990529151825M.imura@af.airnet.ne.jp>
	<14159.50321.355801.59291Z@dolphin.be.to>
	<19990606214359X.imura@af.airnet.ne.jp>
X-Mailer: Mew version 1.94b20 on Emacs 19.34 / Mule 2.3
 =?iso-2022-jp?B?KBskQkt2RSYyVhsoQik=?=
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Tue_Jun_15_23:49:28_1999_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990615235148I.imura@af.airnet.ne.jp>
Date: Tue, 15 Jun 1999 23:51:48 +0900
X-Dispatcher: imput version 990401(IM113)
Lines: 265
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990610
X-Sequence: ports-jp 6804
Subject: [ports-jp 6804] Re: kde11-i18n
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: imura@af.airnet.ne.jp

----Next_Part(Tue_Jun_15_23:49:28_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B$$$`$i$G$9!#(B

kdebase-1.1.1 $B$H(B kdenetwork-1.1.1 $B$KBP$9$k%;%-%e%j%F%#%Q%C%A$,$"$C$?$N$H(B
kdenetwork$B$NF|K\8l2=%Q%C%A$,99?7$5$l$?$N$GJQ99$7$^$9!#(B

 kdebase -> current $B$H$N(B diff
 kdenetwork -> [ports-jp 6700] $B$H$N(B diff

$B$G$9!#(B

----Next_Part(Tue_Jun_15_23:49:28_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="kdebase11-i18n.diff"

Index: kdebase11-i18n/Makefile
diff -u kdebase11-i18n/Makefile:1.1.1.2 kdebase11-i18n/Makefile:1.1.1.1.2.5
--- kdebase11-i18n/Makefile:1.1.1.2	Sat Jun 12 21:15:50 1999
+++ kdebase11-i18n/Makefile	Tue Jun 15 23:34:04 1999
@@ -9,10 +9,14 @@
 DISTNAME=	kdebase-1.1.1
 PKGNAME=	kdebase-i18n-1.1.1
 CATEGORIES=	x11 kde
-MASTER_SITES=	http://apollon.cs.titech.ac.jp/~imura/kde-jp/po/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
+MASTER_SITES=	http://apollon.cs.titech.ac.jp/~imura/kde-jp/po/ \
+		ftp://ftp.kde.org/pub/kde/security_patches/ \
+		$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
 DISTFILES=	kdebase-1.1.1.tar.bz2 \
+		kdelnkfiles-ja-19990523.tar.bz2 \
+		kvt-security.patch
+EXTRACT_ONLY=	kdebase-1.1.1.tar.bz2 \
 		kdelnkfiles-ja-19990523.tar.bz2
 
 PATCH_SITES=	http://www.asahi-net.or.jp/~hc3j-tkg/kde-jp/
@@ -34,8 +38,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4" \
 		RUN_KAPPFINDER="no"
 CXXFLAGS?=	${CFLAGS}
@@ -47,5 +50,8 @@
 CXX=	eg++
 BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs
 .endif
+
+pre-patch:
+		@${PATCH} -d ${WRKSRC}/kvt --forward --quiet -E -p0 < ${DISTDIR}/kvt-security.patch
 
 .include <bsd.port.post.mk>
Index: kdebase11-i18n/files/md5
diff -u kdebase11-i18n/files/md5:1.1.1.2 kdebase11-i18n/files/md5:1.1.1.1.2.2
--- kdebase11-i18n/files/md5:1.1.1.2	Sat Jun 12 21:15:51 1999
+++ kdebase11-i18n/files/md5	Tue Jun 15 23:34:07 1999
@@ -1,3 +1,4 @@
 MD5 (kdebase-1.1.1.tar.bz2) = 6efd55d3ed1438907911c5c6321feb0b
 MD5 (kdelnkfiles-ja-19990523.tar.bz2) = a82f96d87907623ca90b98394a8745b2
+MD5 (kvt-security.patch) = ff7f635cfca9f50e7b15e9b876928a42
 MD5 (kdebase-ja.19990126.diff.gz) = 19153a5f0c9d712460d437b573bf2eb1

----Next_Part(Tue_Jun_15_23:49:28_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="kdenetwork11-i18n.diff"

diff -urN ../kdenetwork11-i18n/Makefile kdenetwork11-i18n/Makefile
--- ../kdenetwork11-i18n/Makefile	Sun Jun  6 20:17:10 1999
+++ kdenetwork11-i18n/Makefile	Tue Jun 15 23:31:07 1999
@@ -9,15 +9,20 @@
 DISTNAME=	kdenetwork-1.1.1
 PKGNAME=	kdenetwork-i18n-1.1.1
 CATEGORIES=	net news kde
-MASTER_SITES=	http://apollon.cs.titech.ac.jp/~imura/kde-jp/po/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
+MASTER_SITES=	http://apollon.cs.titech.ac.jp/~imura/kde-jp/po/ \
+		ftp://ftp.kde.org/pub/kde/security_patches/ \
+		$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
 DISTFILES=	kdenetwork-1.1.1.tar.bz2 \
+		kdelnkfiles-ja-19990523.tar.bz2 \
+		kmail-security-patch.diff
+EXTRACT_ONLY=	kdenetwork-1.1.1.tar.bz2 \
 		kdelnkfiles-ja-19990523.tar.bz2
 
-PATCH_SITES=	http://ha6.seikyou.ne.jp/home/tklab/kde/
-PATCHFILES=	kdenetwork-ja.19990513.diff.gz
-PATCH_DIST_STRIP=    -p1
+PATCH_SITES=	http://www.ksmplus.com/~toyohiro/kde/kmail/ \
+		http://www.ksmplus.com/~toyohiro/kde/krn/
+PATCHFILES=	kmail-19990615.patch.gz \
+		krn-19990614.patch.gz
 
 MAINTAINER=	imura@cs.titech.ac.jp
 
@@ -36,7 +41,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4"
 CXXFLAGS?=	${CFLAGS}
 
@@ -58,6 +63,9 @@
 pre-configure:
 		${LN} -sf $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
 		${LN} -sf ${FILESDIR}/nkf.h ${WRKSRC}/kmail/nkf.h
+
+pre-patch:
+		@${PATCH} -d ${WRKSRC}/kmail --forward --quiet -E -p0 < ${DISTDIR}/kmail-security-patch.diff
 
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff -urN ../kdenetwork11-i18n/files/md5 kdenetwork11-i18n/files/md5
--- ../kdenetwork11-i18n/files/md5	Sun Jun  6 00:43:56 1999
+++ kdenetwork11-i18n/files/md5	Tue Jun 15 23:32:10 1999
@@ -1,3 +1,5 @@
 MD5 (kdenetwork-1.1.1.tar.bz2) = 0aaf5096be18ad7da35ee48df94653dd
 MD5 (kdelnkfiles-ja-19990523.tar.bz2) = a82f96d87907623ca90b98394a8745b2
-MD5 (kdenetwork-ja.19990513.diff.gz) = 2e0c914735fe572b8d4d8f8585b0a95e
+MD5 (kmail-security-patch.diff) = b90feb711f00a7e3488cf1111caf0573
+MD5 (kmail-19990615.patch.gz) = 96f083951c21763dd9a6d6b061a7ba98
+MD5 (krn-19990614.patch.gz) = 0f8874592094ef26618185942ee3e00c
diff -urN ../kdenetwork11-i18n/patches/patch-aa kdenetwork11-i18n/patches/patch-aa
--- ../kdenetwork11-i18n/patches/patch-aa	Sun Jun  6 00:28:23 1999
+++ kdenetwork11-i18n/patches/patch-aa	Sat Jun 12 23:27:41 1999
@@ -1,5 +1,14 @@
---- configure.orig	Thu May 13 20:31:06 1999
-+++ configure	Thu May 13 20:37:54 1999
+--- configure.orig	Thu Apr 29 00:26:00 1999
++++ configure	Sat Jun 12 23:22:06 1999
+@@ -2006,7 +2006,7 @@
+ CC=$CXX
+ CFLAGS="$CXXFLAGS"
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent'
+ 
+ 
+ # Check for any special flags to pass to ltconfig.
 @@ -3414,9 +3414,9 @@
  
  
@@ -40,6 +49,24 @@
  
  
  
+@@ -3946,7 +3946,7 @@
+ kde_libdir=NO
+ for i in $kde_libdirs;
+ do
+-  for j in libkdecore.la;
++  for j in libkdecore.a;
+   do
+     if test -r "$i/$j"; then
+       kde_libdir=$i
+@@ -3956,7 +3956,7 @@
+ done
+ 
+ 
+-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then
++if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.a"; then
+ { echo "configure: error: 
+ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
+ So, check this please and use another prefix!" 1>&2; exit 1; }
 @@ -4335,9 +4335,9 @@
     
     LIB_KFM='-lkfm $(LIB_KDECORE)'
diff -urN ../kdenetwork11-i18n/patches/patch-ad kdenetwork11-i18n/patches/patch-ad
--- ../kdenetwork11-i18n/patches/patch-ad	Sun Jun  6 00:43:57 1999
+++ kdenetwork11-i18n/patches/patch-ad	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- kmail/kmcomposewin.cpp.orig	Mon May 17 21:05:33 1999
-+++ kmail/kmcomposewin.cpp	Mon May 17 21:07:22 1999
-@@ -847,6 +847,8 @@
-              tbuf[k++]=str[i++];
-              tbuf[k++]=str[i++];
-          }
-+ 	 tbuf[k]='\0';
-+	 nkf.reset();	
-          nkf.setOutputCode(Nkf::JIS);
-          ktmp=nkf.convert(tbuf);
-          ret=(char*)rfc822_binary( (void *)ktmp,strlen(ktmp) );
diff -urN ../kdenetwork11-i18n/pkg/PLIST kdenetwork11-i18n/pkg/PLIST
--- ../kdenetwork11-i18n/pkg/PLIST	Sun Jun  6 20:17:13 1999
+++ kdenetwork11-i18n/pkg/PLIST	Sat Jun 12 22:31:31 1999
@@ -20,67 +20,51 @@
 bin/newkrn
 lib/ksirc/libksirclistbox.so.0
 lib/ksirc/libksirclistbox.so
-lib/ksirc/libksirclistbox.la
 lib/ksirc/libksirclistbox.a
 lib/ksirc/libpalistbox.so.0
 lib/ksirc/libpalistbox.so
-lib/ksirc/libpalistbox.la
 lib/ksirc/libpalistbox.a
 lib/ksirc/libpbutton.so.0
 lib/ksirc/libpbutton.so
-lib/ksirc/libpbutton.la
 lib/ksirc/libpbutton.a
 lib/ksirc/libpframe.so.0
 lib/ksirc/libpframe.so
-lib/ksirc/libpframe.la
 lib/ksirc/libpframe.a
 lib/ksirc/libpkfiledialog.so.0
 lib/ksirc/libpkfiledialog.so
-lib/ksirc/libpkfiledialog.la
 lib/ksirc/libpkfiledialog.a
 lib/ksirc/libplabel.so.0
 lib/ksirc/libplabel.so
-lib/ksirc/libplabel.la
 lib/ksirc/libplabel.a
 lib/ksirc/libplined.so.0
 lib/ksirc/libplined.so
-lib/ksirc/libplined.la
 lib/ksirc/libplined.a
 lib/ksirc/libplistbox.so.0
 lib/ksirc/libplistbox.so
-lib/ksirc/libplistbox.la
 lib/ksirc/libplistbox.a
 lib/ksirc/libpmenudta.so.0
 lib/ksirc/libpmenudta.so
-lib/ksirc/libpmenudta.la
 lib/ksirc/libpmenudta.a
 lib/ksirc/libpobjfinder.so.0
 lib/ksirc/libpobjfinder.so
-lib/ksirc/libpobjfinder.la
 lib/ksirc/libpobjfinder.a
 lib/ksirc/libppopmenu.so.0
 lib/ksirc/libppopmenu.so
-lib/ksirc/libppopmenu.la
 lib/ksirc/libppopmenu.a
 lib/ksirc/libpprogress.so.0
 lib/ksirc/libpprogress.so
-lib/ksirc/libpprogress.la
 lib/ksirc/libpprogress.a
 lib/ksirc/libppushbt.so.0
 lib/ksirc/libppushbt.so
-lib/ksirc/libppushbt.la
 lib/ksirc/libppushbt.a
 lib/ksirc/libptablevw.so.0
 lib/ksirc/libptablevw.so
-lib/ksirc/libptablevw.la
 lib/ksirc/libptablevw.a
 lib/ksirc/libptabdialog.so.0
 lib/ksirc/libptabdialog.so
-lib/ksirc/libptabdialog.la
 lib/ksirc/libptabdialog.a
 lib/libkplunger.a
 lib/libpuke.a
-lib/libpuke.la
 lib/libpuke.so
 lib/libpuke.so.0
 share/doc/HTML/en/karchie/index.html

----Next_Part(Tue_Jun_15_23:49:28_1999_809)----
