4 files changed, 74 insertions, 41 deletions

diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index a6cfa8cd8ddc..edf00881b24d 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,39 +3,30 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.13 1998/05/21 21:26:35 se Exp $
+# $Id: Makefile,v 1.14 1998/07/13 23:31:51 se Exp $
 #
 
-DISTNAME=	kdenetwork-beta4-1
-PKGNAME=	kdenetwork-4.1b
+DISTNAME=	kdenetwork-1.0
 CATEGORIES=	net news kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133 \
 		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		uu\\.1\\.:${PORTSDIR}/converters/uulib \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		mediatool\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
 		mimelib\\.1\\.[0-9]:${PORTSDIR}/converters/kdesupport
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
-
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=$(PREFIX)/include/giflib"
@@ -43,8 +34,6 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdenetwork
-
 pre-configure:
 		${LN} -sf $(PREFIX)/include/uu.h $(WRKSRC)/krn/uudeview.h
 
diff --git a/net/kdenetwork11/distinfo b/net/kdenetwork11/distinfo
index a2584d9bff79..7bd638acc2ec 100644
--- a/net/kdenetwork11/distinfo
+++ b/net/kdenetwork11/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-beta4-1.src.tar.bz2) = c44e534e75e4a95f7964e85ec60b6a4e
+MD5 (kdenetwork-1.0.tar.gz) = 0879ee6ac8077878c928c3ab48d021ce
diff --git a/net/kdenetwork11/files/patch-ac b/net/kdenetwork11/files/patch-ac
index 18dcf260ef05..622b6e06de82 100644
--- a/net/kdenetwork11/files/patch-ac
+++ b/net/kdenetwork11/files/patch-ac
@@ -1,15 +1,15 @@
-*** krn/Makefile.in.orig	Sat May  9 20:38:24 1998
---- krn/Makefile.in	Sat May  9 20:38:34 1998
+*** krn/Makefile.in.orig	Fri Jul 17 00:35:57 1998
+--- krn/Makefile.in	Fri Jul 17 00:36:04 1998
 ***************
-*** 129,133 ****
-  INCLUDES = $(all_includes)
+*** 142,146 ****
   
-! LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
+  kdecode_LDADD = -lkfile -lkfm -lkdeui -lkdecore -lqt -lXext \
+! 	-lX11 -luulib $(KDE_RPATH) $(LIBCOMPAT) $(LIBSOCKET)
   
   ICONDIR = $(kde_icondir)
---- 129,133 ----
-  INCLUDES = $(all_includes)
+--- 142,146 ----
   
-! LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
+  kdecode_LDADD = -lkfile -lkfm -lkdeui -lkdecore -lqt -lXext \
+! 	-lX11 -luu $(KDE_RPATH) $(LIBCOMPAT) $(LIBSOCKET)
   
   ICONDIR = $(kde_icondir)
diff --git a/net/kdenetwork11/pkg-plist b/net/kdenetwork11/pkg-plist
index b7ebb7b99105..b1aa4dfe1091 100644
--- a/net/kdenetwork11/pkg-plist
+++ b/net/kdenetwork11/pkg-plist
@@ -1,7 +1,9 @@
+bin/kdecode
 bin/kmail
 bin/knu
 bin/korn
 bin/kppp
+bin/kppplogview
 bin/krn
 share/applnk/Internet/KMail.kdelnk
 share/applnk/Internet/KOrn.kdelnk
@@ -24,9 +26,12 @@ share/apps/kmail/pics/kmfldsent.xpm
 share/apps/kmail/pics/kmfolder.xpm
 share/apps/kmail/pics/kminsorgmsg.xpm
 share/apps/kmail/pics/kmmsgdel.xpm
+share/apps/kmail/pics/kmmsgforwarded.xpm
 share/apps/kmail/pics/kmmsgnew.xpm
 share/apps/kmail/pics/kmmsgold.xpm
+share/apps/kmail/pics/kmmsgqueued.xpm
 share/apps/kmail/pics/kmmsgreplied.xpm
+share/apps/kmail/pics/kmmsgsent.xpm
 share/apps/kmail/pics/kmmsgunseen.xpm
 share/apps/kmail/pics/kmtrash.xpm
 share/apps/kmail/pics/pub_key_red.xpm
@@ -56,7 +61,17 @@ share/apps/kppp/Rules/Austria/Standard/Local.rst
 share/apps/kppp/Rules/Austria/Standard/Long_Distance_1.rst
 share/apps/kppp/Rules/Austria/Standard/Long_Distance_2.rst
 share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
+share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
 share/apps/kppp/Rules/Brasil/Brasil.rst
+share/apps/kppp/Rules/Croatia/CARNet_lokalni_poziv.rst
+share/apps/kppp/Rules/Croatia/CARNet_medjugradski_poziv.rst
+share/apps/kppp/Rules/Croatia/hinet_anonimni_ulaz.rst
+share/apps/kppp/Rules/Croatia/hinet_hpt.rst
+share/apps/kppp/Rules/Croatia/ibm_net.rst
+share/apps/kppp/Rules/Croatia/iskon_lokalni_poziv.rst
+share/apps/kppp/Rules/Croatia/iskon_medjugradski_poziv.rst
+share/apps/kppp/Rules/Croatia/iskon_zagrebacka_zupanija.rst
 share/apps/kppp/Rules/Czechia/Czech_Telecom_City.rst
 share/apps/kppp/Rules/Czechia/Czech_Telecom_Tarifni_pasmo1.rst
 share/apps/kppp/Rules/Czechia/Czech_Telecom_Tarifni_pasmo2.rst
@@ -68,19 +83,28 @@ 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/NetCologne_50km.rst
+share/apps/kppp/Rules/Germany/NetCologne_City.rst
+share/apps/kppp/Rules/Germany/NetCologne_Germany.rst
+share/apps/kppp/Rules/Germany/NetCologne_Time_Line.rst
+share/apps/kppp/Rules/Germany/Tele2.rst
+share/apps/kppp/Rules/Germany/TelePassport_Fern.rst
+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_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/Italy/0-15_Km.rst
-share/apps/kppp/Rules/Italy/15-30_Km.rst
-share/apps/kppp/Rules/Italy/30-60_Km.rst
-share/apps/kppp/Rules/Italy/Above_60Km.rst
-share/apps/kppp/Rules/Italy/Local.rst
-share/apps/kppp/Rules/Italy/Local_with_Formula_Urbana.rst
+share/apps/kppp/Rules/Italy/Telecom_0-15_km.rst
+share/apps/kppp/Rules/Italy/Telecom_15-30_km.rst
+share/apps/kppp/Rules/Italy/Telecom_30-60_km.rst
+share/apps/kppp/Rules/Italy/Telecom_60+_km.rst
+share/apps/kppp/Rules/Italy/Telecom_Interurbana_settoriale.rst
+share/apps/kppp/Rules/Italy/Telecom_TUT.rst
+share/apps/kppp/Rules/Italy/Telecom_Urbana.rst
 share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst
 share/apps/kppp/Rules/Jamaica/CWJ_Local.rst
 share/apps/kppp/Rules/Japan/NTT_Local.rst
@@ -95,6 +119,8 @@ share/apps/kppp/Rules/Portugal/Local+Activation_rate.rst
 share/apps/kppp/Rules/Portugal/Local.rst
 share/apps/kppp/Rules/Romania/Telecom_Interurban.rst
 share/apps/kppp/Rules/Romania/Telecom_Local.rst
+share/apps/kppp/Rules/Slovakia/Slovenske_Telekomunikacie_1_pasmo.rst
+share/apps/kppp/Rules/Slovakia/Slovenske_Telekomunikacie_2_pasmo.rst
 share/apps/kppp/Rules/Slovakia/Slovenske_Telekomunikacie_Mesto.rst
 share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
 share/apps/kppp/Rules/Spain/Infovia.rst
@@ -102,10 +128,15 @@ share/apps/kppp/Rules/Spain/Telefonica_Local.rst
 share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
 share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
 share/apps/kppp/Rules/Sweden/Local.rst
+share/apps/kppp/Rules/Sweden/Local_Telebonus_1.rst
+share/apps/kppp/Rules/Sweden/Local_Telebonus_2.rst
 share/apps/kppp/Rules/Sweden/Long_Distance.rst
+share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_1.rst
+share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_2.rst
 share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
 share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
 share/apps/kppp/Rules/TEMPLATE
+share/apps/kppp/Rules/checkrules
 share/apps/kppp/pics/Terminal.xpm
 share/apps/kppp/pics/back.xpm
 share/apps/kppp/pics/dock_both.xpm
@@ -162,7 +193,6 @@ share/doc/HTML/en/kmail/index-3.html
 share/doc/HTML/en/kmail/index-4.html
 share/doc/HTML/en/kmail/index-5.html
 share/doc/HTML/en/kmail/index-6.html
-share/doc/HTML/en/kmail/index-7.html
 share/doc/HTML/en/kmail/index.html
 share/doc/HTML/en/kmail/logotp3.gif
 share/doc/HTML/en/knu/index-1.html
@@ -171,8 +201,10 @@ share/doc/HTML/en/knu/index-3.html
 share/doc/HTML/en/knu/index-4.html
 share/doc/HTML/en/knu/index-5.html
 share/doc/HTML/en/knu/index-6.html
+share/doc/HTML/en/knu/index-7.html
 share/doc/HTML/en/knu/index.html
 share/doc/HTML/en/knu/knu-config.gif
+share/doc/HTML/en/knu/knu-finger.gif
 share/doc/HTML/en/knu/knu-host.gif
 share/doc/HTML/en/knu/knu-ping.gif
 share/doc/HTML/en/knu/knu-traceroute.gif
@@ -206,10 +238,7 @@ share/icons/mini/knu.xpm
 share/icons/mini/korn.xpm
 share/icons/mini/kppp.xpm
 share/icons/mini/krn.xpm
-share/locale/cr/LC_MESSAGES/kmail.mo
-share/locale/cr/LC_MESSAGES/knu.mo
-share/locale/cr/LC_MESSAGES/kppp.mo
-share/locale/cr/LC_MESSAGES/krn.mo
+share/locale/ca/LC_MESSAGES/kppp.mo
 share/locale/cs/LC_MESSAGES/kmail.mo
 share/locale/cs/LC_MESSAGES/knu.mo
 share/locale/cs/LC_MESSAGES/kppp.mo
@@ -235,6 +264,10 @@ share/locale/fr/LC_MESSAGES/kmail.mo
 share/locale/fr/LC_MESSAGES/knu.mo
 share/locale/fr/LC_MESSAGES/kppp.mo
 share/locale/fr/LC_MESSAGES/krn.mo
+share/locale/hr/LC_MESSAGES/kmail.mo
+share/locale/hr/LC_MESSAGES/knu.mo
+share/locale/hr/LC_MESSAGES/kppp.mo
+share/locale/hr/LC_MESSAGES/krn.mo
 share/locale/hu/LC_MESSAGES/kmail.mo
 share/locale/hu/LC_MESSAGES/knu.mo
 share/locale/it/LC_MESSAGES/kmail.mo
@@ -257,12 +290,21 @@ 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_BR/LC_MESSAGES/kmail.mo
+share/locale/pt_BR/LC_MESSAGES/knu.mo
+share/locale/pt_BR/LC_MESSAGES/kppp.mo
+share/locale/pt_BR/LC_MESSAGES/krn.mo
 share/locale/ro/LC_MESSAGES/kmail.mo
 share/locale/ro/LC_MESSAGES/kppp.mo
+share/locale/ro/LC_MESSAGES/krn.mo
 share/locale/sk/LC_MESSAGES/kmail.mo
 share/locale/sk/LC_MESSAGES/knu.mo
 share/locale/sk/LC_MESSAGES/kppp.mo
 share/locale/sk/LC_MESSAGES/krn.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kmail.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/knu.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kppp.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/krn.mo
 @dirrm share/doc/HTML/en/krn
 @dirrm share/doc/HTML/en/kppp
 @dirrm share/doc/HTML/en/korn
@@ -291,7 +333,9 @@ share/locale/sk/LC_MESSAGES/krn.mo
 @dirrm share/apps/kppp/Rules/France
 @dirrm share/apps/kppp/Rules/England
 @dirrm share/apps/kppp/Rules/Czechia
+@dirrm share/apps/kppp/Rules/Croatia
 @dirrm share/apps/kppp/Rules/Brasil
+@dirrm share/apps/kppp/Rules/Belgium
 @dirrm share/apps/kppp/Rules/Austria/Standard
 @dirrm share/apps/kppp/Rules/Austria/Minimum
 @dirrm share/apps/kppp/Rules/Austria/Business_2