6 files changed, 63 insertions, 145 deletions

diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 9af97da9c645..6e5c642ceb8e 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,15 +3,13 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
+# $Id: Makefile,v 1.26 1999/02/03 11:11:55 asami Exp $
 #
 
-DISTNAME=	kdenetwork
-PKGNAME=	kdenetwork-1.1a1
+DISTNAME=	kdenetwork-1.1pre2
 CATEGORIES=	net news kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1pre1/distribution/tar/generic/source
-EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.1pre2/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
@@ -25,16 +23,18 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		mimelib.1:${PORTSDIR}/converters/kdesupport11 \
 		rdb.55:${PORTSDIR}/converters/kdesupport11
 
-USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
-
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
+CFLAGS+=	"-I${PREFIX}/include"
 
 pre-configure:
 		${LN} -sf $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
 
+post-install:
+		${LN} -sf kppp.html ${PREFIX}/share/doc/HTML/en/kppp/index.html
+
 .include <bsd.port.mk>
diff --git a/net/kdenetwork11/distinfo b/net/kdenetwork11/distinfo
index 5c841f53071f..2a5ac1714673 100644
--- a/net/kdenetwork11/distinfo
+++ b/net/kdenetwork11/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-1.1-alpha1.src.tar.bz2) = 0843de75a68773f93aa3f853b1205fef
+MD5 (kdenetwork-1.1pre2.tar.gz) = a28911f26ff268c1af05953fe3f46a8a
diff --git a/net/kdenetwork11/files/patch-aa b/net/kdenetwork11/files/patch-aa
index 081ceda612b2..bae358fe4032 100644
--- a/net/kdenetwork11/files/patch-aa
+++ b/net/kdenetwork11/files/patch-aa
@@ -1,19 +1,15 @@
-*** kppp/opener.h~	Sat Dec 19 22:28:22 1998
---- kppp/opener.h	Thu Dec 31 00:22:12 1998
+*** kppp/opener.cpp~	Fri Jan 22 21:28:43 1999
+--- kppp/opener.cpp	Fri Feb  5 23:12:08 1999
 ***************
-*** 32,38 ****
-    bool createAuthFile(int authMethod, char *username, char *password);
-    bool removeAuthFile(int authMethod);
-    const char* authFile(int authMethod, int version = Original);
+*** 44,48 ****
+  #include <netinet/in.h>
+  #include <signal.h>
+! #include <wait.h>
   
--   enum { Original=0x100, New=0x200, Old=0x400 } Version;
-    int socket;
-    char lockfile[MaxPathLen+1];
---- 32,38 ----
-    bool createAuthFile(int authMethod, char *username, char *password);
-    bool removeAuthFile(int authMethod);
-+   enum { Original=0x100, New=0x200, Old=0x400 } Version;
-    const char* authFile(int authMethod, int version = Original);
+  #include "kpppconfig.h"
+--- 44,48 ----
+  #include <netinet/in.h>
+  #include <signal.h>
+! #include <sys/wait.h>
   
-    int socket;
-    char lockfile[MaxPathLen+1];
+  #include "kpppconfig.h"
diff --git a/net/kdenetwork11/files/patch-ab b/net/kdenetwork11/files/patch-ab
deleted file mode 100644
index 283e6cb22eb1..000000000000
--- a/net/kdenetwork11/files/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-*** kppp/requester.cpp~	Sat Dec 19 22:28:23 1998
---- kppp/requester.cpp	Thu Dec 31 00:38:12 1998
-***************
-*** 74,78 ****
-    msg.msg_iovlen = 2;
-  
-!   iov[0].iov_base = &response;
-    iov[0].iov_len = sizeof(struct ResponseHeader);
-    iov[1].iov_base = filename;
---- 74,78 ----
-    msg.msg_iovlen = 2;
-  
-!   iov[0].iov_base = (char *) &response;
-    iov[0].iov_len = sizeof(struct ResponseHeader);
-    iov[1].iov_base = filename;
-***************
-*** 87,91 ****
-    control.cmsg.cmsg_type = MY_SCM_RIGHTS;
-  
-!   msg.msg_control = &control;
-    msg.msg_controllen = control.cmsg.cmsg_len;
-  
---- 87,91 ----
-    control.cmsg.cmsg_type = MY_SCM_RIGHTS;
-  
-!   msg.msg_control = (char *) &control;
-    msg.msg_controllen = control.cmsg.cmsg_len;
-  
-***************
-*** 137,141 ****
-    msg.msg_controllen = 0;
-  
-!   iov.iov_base = &response;
-    iov.iov_len = sizeof(struct ResponseHeader);
-    Debug("recvResponse(): waiting for message");
---- 137,141 ----
-    msg.msg_controllen = 0;
-  
-!   iov.iov_base = (char *) &response;
-    iov.iov_len = sizeof(struct ResponseHeader);
-    Debug("recvResponse(): waiting for message");
-***************
-*** 281,285 ****
-    struct iovec iov;
-  
-!   iov.iov_base = (void *) request;
-    iov.iov_len = len;
-    
---- 281,285 ----
-    struct iovec iov;
-  
-!   iov.iov_base = (char *) request;
-    iov.iov_len = len;
-    
diff --git a/net/kdenetwork11/files/patch-ac b/net/kdenetwork11/files/patch-ac
deleted file mode 100644
index dc476ff069c5..000000000000
--- a/net/kdenetwork11/files/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-*** kppp/opener.cpp~	Sat Dec 19 22:28:22 1998
---- kppp/opener.cpp	Thu Dec 31 00:39:47 1998
-***************
-*** 71,75 ****
-    struct iovec iov;
-  
-!   iov.iov_base = (void *) &request;
-    iov.iov_len = sizeof(request);
-    
---- 71,75 ----
-    struct iovec iov;
-  
-!   iov.iov_base = (char *) &request;
-    iov.iov_len = sizeof(request);
-    
-***************
-*** 233,239 ****
-  
-    // Send data
-!   iov[0].iov_base = (void *) response;
-    iov[0].iov_len = sizeof(struct ResponseHeader);
-!   iov[1].iov_base = (void *) path;
-    iov[1].iov_len = strlen(path) + 1;
-  
---- 233,239 ----
-  
-    // Send data
-!   iov[0].iov_base = (char *) response;
-    iov[0].iov_len = sizeof(struct ResponseHeader);
-!   iov[1].iov_base = (char *) path;
-    iov[1].iov_len = strlen(path) + 1;
-  
-***************
-*** 243,247 ****
-    control.cmsg.cmsg_type = MY_SCM_RIGHTS;
-  
-!   msg.msg_control = &control;
-    msg.msg_controllen = control.cmsg.cmsg_len;
-  
---- 243,247 ----
-    control.cmsg.cmsg_type = MY_SCM_RIGHTS;
-  
-!   msg.msg_control = (char *) &control;
-    msg.msg_controllen = control.cmsg.cmsg_len;
-  
-***************
-*** 277,281 ****
-  
-    // Send data
-!   iov.iov_base = (void *) response;
-    iov.iov_len = sizeof(struct ResponseHeader);
-  
---- 277,281 ----
-  
-    // Send data
-!   iov.iov_base = (char *) response;
-    iov.iov_len = sizeof(struct ResponseHeader);
-  
diff --git a/net/kdenetwork11/pkg-plist b/net/kdenetwork11/pkg-plist
index 3f9bade583ed..e3ab79e4a9fb 100644
--- a/net/kdenetwork11/pkg-plist
+++ b/net/kdenetwork11/pkg-plist
@@ -8,7 +8,6 @@ bin/knu
 bin/korn
 bin/kotalkd
 bin/kppp
-bin/kppp.bin
 bin/kppplogview
 bin/krn
 bin/ktalkd
@@ -23,6 +22,7 @@ share/applnk/Internet/karchie.kdelnk
 share/applnk/Internet/kbiff.kdelnk
 share/applnk/Internet/kfinger.kdelnk
 share/applnk/Internet/knu.kdelnk
+share/applnk/Internet/kppplogview.kdelnk
 share/applnk/Settings/Network/kcmktalkd.kdelnk
 share/apps/kbiff/pics/delete.xpm
 share/apps/kbiff/pics/mailbox.xpm
@@ -112,6 +112,7 @@ share/apps/kppp/Rules/England/BritishTelecom_Local.rst
 share/apps/kppp/Rules/England/BritishTelecom_National.rst
 share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
 share/apps/kppp/Rules/France/Local.rst
+share/apps/kppp/Rules/Germany/Arcor_Internet_by_Call.rst
 share/apps/kppp/Rules/Germany/NetCologne_50km.rst
 share/apps/kppp/Rules/Germany/NetCologne_City.rst
 share/apps/kppp/Rules/Germany/NetCologne_Germany.rst
@@ -122,11 +123,14 @@ share/apps/kppp/Rules/Germany/TelePassport_Nah.rst
 share/apps/kppp/Rules/Germany/Telekom_200km.rst
 share/apps/kppp/Rules/Germany/Telekom_50km.rst
 share/apps/kppp/Rules/Germany/Telekom_City.rst
+share/apps/kppp/Rules/Germany/Telekom_City_Weekend.rst
 share/apps/kppp/Rules/Germany/Telekom_Ferntarif.rst
 share/apps/kppp/Rules/Germany/Telekom_Regio_Call.rst
 share/apps/kppp/Rules/Greece/Hellas_local.rst
 share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst
 share/apps/kppp/Rules/Hungary/Local.rst
+share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst
+share/apps/kppp/Rules/Hungary/Local_MATAV.rst
 share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst
 share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst
 share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst
@@ -357,8 +361,19 @@ share/locale/cs/LC_MESSAGES/korn.mo
 share/locale/cs/LC_MESSAGES/kppp.mo
 share/locale/cs/LC_MESSAGES/krn.mo
 share/locale/cs/LC_MESSAGES/ktalkd.mo
+share/locale/da/LC_MESSAGES/karchie.mo
+share/locale/da/LC_MESSAGES/kbiff.mo
+share/locale/da/LC_MESSAGES/kcmktalkd.mo
+share/locale/da/LC_MESSAGES/kfinger.mo
+share/locale/da/LC_MESSAGES/kmail.mo
+share/locale/da/LC_MESSAGES/knu.mo
+share/locale/da/LC_MESSAGES/korn.mo
 share/locale/da/LC_MESSAGES/kppp.mo
+share/locale/da/LC_MESSAGES/krn.mo
+share/locale/da/LC_MESSAGES/ksirc.mo
+share/locale/da/LC_MESSAGES/ktalkd.mo
 share/locale/de/LC_MESSAGES/karchie.mo
+share/locale/de/LC_MESSAGES/kbiff.mo
 share/locale/de/LC_MESSAGES/kcmktalkd.mo
 share/locale/de/LC_MESSAGES/kfinger.mo
 share/locale/de/LC_MESSAGES/kmail.mo
@@ -372,10 +387,18 @@ share/locale/el/LC_MESSAGES/kmail.mo
 share/locale/el/LC_MESSAGES/knu.mo
 share/locale/el/LC_MESSAGES/kppp.mo
 share/locale/el/LC_MESSAGES/krn.mo
+share/locale/eo/LC_MESSAGES/karchie.mo
+share/locale/eo/LC_MESSAGES/kbiff.mo
+share/locale/eo/LC_MESSAGES/kcmktalkd.mo
+share/locale/eo/LC_MESSAGES/kfinger.mo
 share/locale/eo/LC_MESSAGES/kmail.mo
 share/locale/eo/LC_MESSAGES/knu.mo
+share/locale/eo/LC_MESSAGES/korn.mo
 share/locale/eo/LC_MESSAGES/kppp.mo
 share/locale/eo/LC_MESSAGES/krn.mo
+share/locale/eo/LC_MESSAGES/ksirc.mo
+share/locale/eo/LC_MESSAGES/ktalkd.mo
+share/locale/es/LC_MESSAGES/kbiff.mo
 share/locale/es/LC_MESSAGES/kfinger.mo
 share/locale/es/LC_MESSAGES/kmail.mo
 share/locale/es/LC_MESSAGES/knu.mo
@@ -383,6 +406,7 @@ share/locale/es/LC_MESSAGES/korn.mo
 share/locale/es/LC_MESSAGES/kppp.mo
 share/locale/es/LC_MESSAGES/krn.mo
 share/locale/es/LC_MESSAGES/ktalkd.mo
+share/locale/et/LC_MESSAGES/kmail.mo
 share/locale/fi/LC_MESSAGES/karchie.mo
 share/locale/fi/LC_MESSAGES/kbiff.mo
 share/locale/fi/LC_MESSAGES/kcmktalkd.mo
@@ -414,6 +438,8 @@ share/locale/hu/LC_MESSAGES/kmail.mo
 share/locale/hu/LC_MESSAGES/knu.mo
 share/locale/hu/LC_MESSAGES/ktalkd.mo
 share/locale/is/LC_MESSAGES/kmail.mo
+share/locale/is/LC_MESSAGES/ksirc.mo
+share/locale/is/LC_MESSAGES/ktalkd.mo
 share/locale/it/LC_MESSAGES/kfinger.mo
 share/locale/it/LC_MESSAGES/kmail.mo
 share/locale/it/LC_MESSAGES/knu.mo
@@ -424,6 +450,7 @@ share/locale/ko/LC_MESSAGES/kmail.mo
 share/locale/ko/LC_MESSAGES/knu.mo
 share/locale/ko/LC_MESSAGES/kppp.mo
 share/locale/ko/LC_MESSAGES/krn.mo
+share/locale/mk/LC_MESSAGES/kmail.mo
 share/locale/nl/LC_MESSAGES/kmail.mo
 share/locale/nl/LC_MESSAGES/knu.mo
 share/locale/nl/LC_MESSAGES/kppp.mo
@@ -440,23 +467,36 @@ share/locale/no/LC_MESSAGES/kppp.mo
 share/locale/no/LC_MESSAGES/krn.mo
 share/locale/no/LC_MESSAGES/ksirc.mo
 share/locale/no/LC_MESSAGES/ktalkd.mo
+share/locale/pl/LC_MESSAGES/karchie.mo
 share/locale/pl/LC_MESSAGES/kbiff.mo
+share/locale/pl/LC_MESSAGES/kfinger.mo
 share/locale/pl/LC_MESSAGES/kmail.mo
 share/locale/pl/LC_MESSAGES/knu.mo
+share/locale/pl/LC_MESSAGES/korn.mo
 share/locale/pl/LC_MESSAGES/kppp.mo
 share/locale/pl/LC_MESSAGES/krn.mo
+share/locale/pl/LC_MESSAGES/ksirc.mo
+share/locale/pl/LC_MESSAGES/ktalkd.mo
+share/locale/pt/LC_MESSAGES/kbiff.mo
+share/locale/pt/LC_MESSAGES/kcmktalkd.mo
 share/locale/pt/LC_MESSAGES/kfinger.mo
 share/locale/pt/LC_MESSAGES/kmail.mo
 share/locale/pt/LC_MESSAGES/knu.mo
 share/locale/pt/LC_MESSAGES/kppp.mo
 share/locale/pt/LC_MESSAGES/krn.mo
+share/locale/pt/LC_MESSAGES/ksirc.mo
 share/locale/pt/LC_MESSAGES/ktalkd.mo
+share/locale/pt_BR/LC_MESSAGES/karchie.mo
 share/locale/pt_BR/LC_MESSAGES/kbiff.mo
+share/locale/pt_BR/LC_MESSAGES/kcmktalkd.mo
 share/locale/pt_BR/LC_MESSAGES/kcmtalkd.mo
+share/locale/pt_BR/LC_MESSAGES/kfinger.mo
 share/locale/pt_BR/LC_MESSAGES/kmail.mo
 share/locale/pt_BR/LC_MESSAGES/knu.mo
+share/locale/pt_BR/LC_MESSAGES/korn.mo
 share/locale/pt_BR/LC_MESSAGES/kppp.mo
 share/locale/pt_BR/LC_MESSAGES/krn.mo
+share/locale/pt_BR/LC_MESSAGES/ksirc.mo
 share/locale/pt_BR/LC_MESSAGES/ktalkd.mo
 share/locale/ro/LC_MESSAGES/kfinger.mo
 share/locale/ro/LC_MESSAGES/kmail.mo
@@ -473,7 +513,7 @@ share/locale/ru/LC_MESSAGES/ksirc.mo
 share/locale/ru/LC_MESSAGES/ktalkd.mo
 share/locale/sk/LC_MESSAGES/karchie.mo
 share/locale/sk/LC_MESSAGES/kbiff.mo
-share/locale/sk/LC_MESSAGES/kcmtalkd.mo
+share/locale/sk/LC_MESSAGES/kcmktalkd.mo
 share/locale/sk/LC_MESSAGES/kfinger.mo
 share/locale/sk/LC_MESSAGES/kmail.mo
 share/locale/sk/LC_MESSAGES/knu.mo
@@ -508,13 +548,10 @@ share/toolbar/kcontrol.xpm
 share/toolbar/mini-clock.xpm
 share/toolbar/mini-connect.xpm
 share/toolbar/mini-ktalk.xpm
-@exec ln -sf index.html %D/share/doc/HTML/en/kppp/kppp.html
+@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/sounds
 @dirrm share/doc/HTML/it/ktalkd
-@dirrm share/doc/HTML/it
 @dirrm share/doc/HTML/fr/ktalkd
-@dirrm share/doc/HTML/fr
 @dirrm share/doc/HTML/en/ktalkd
 @dirrm share/doc/HTML/en/krn
 @dirrm share/doc/HTML/en/kppp
@@ -524,10 +561,7 @@ share/toolbar/mini-ktalk.xpm
 @dirrm share/doc/HTML/en/kfinger
 @dirrm share/doc/HTML/en/kbiff
 @dirrm share/doc/HTML/en/karchie
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/el/ktalkd
-@dirrm share/doc/HTML/el
-@dirrm share/doc/HTML
 @dirrm share/apps/krn/toolbar
 @dirrm share/apps/krn
 @dirrm share/apps/kppp/pics