* HOMEPAGE has disappeared

* MASTER_SITE has changed; fetch from master KDE site
* Update dependency to kdelibs-1.1.2
* Move installation into KDE 1.1.2 distribution directories
* Change to use libungif instead of giflib

4 files changed, 82 insertions, 18 deletions

diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index cc2d4733039..38a8e269b71 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,32 +1,29 @@
-# $NetBSD: Makefile,v 1.3 1999/06/04 00:11:37 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/10/09 20:27:36 jlam Exp $
 #
 
 DISTNAME=	khostchooser-0.3
 CATEGORIES=	x11 kde
-MASTER_SITES=	http://stud1.tuwien.ac.at/~e9025461/
+MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1.2/apps/network/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	root@garbled.net
-HOMEPAGE=       http://stud1.tuwien.ac.at/~e9025461/
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/msgfmt:../../devel/gettext
-DEPENDS+=	kdelibs-1.1.1:../../x11/kdelibs
+DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	giflib-3.0:../../graphics/giflib
+DEPENDS+=	libungif-*:../../graphics/libungif
 
 WRKSRC=		${WRKDIR}/khostchooser
 
 USE_X11BASE=	yes
-USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
 		--with-qt-dir=${PREFIX} \
 		--with-qt-includes=${PREFIX}/include/qt
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/khostchooser/files/patch-sum b/x11/khostchooser/files/patch-sum
new file mode 100644
index 00000000000..bd64cc7ed6e
--- /dev/null
+++ b/x11/khostchooser/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 1999/10/09 20:27:37 jlam Exp $
+
+MD5 (patch-aa) = ab73322af4d9376272a5e01b4ceb373e
diff --git a/x11/khostchooser/patches/patch-aa b/x11/khostchooser/patches/patch-aa
new file mode 100644
index 00000000000..f2f2d848307
--- /dev/null
+++ b/x11/khostchooser/patches/patch-aa
@@ -0,0 +1,64 @@
+$NetBSD: patch-aa,v 1.1 1999/10/09 20:27:37 jlam Exp $
+
+--- ./configure.orig	Fri Dec  5 18:14:30 1997
++++ ./configure	Sat Oct  9 02:56:30 1999
+@@ -491,9 +491,9 @@
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+   if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++    CONFIG_SITE="$prefix/share/kde/config.site $prefix/etc/config.site"
+   else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++    CONFIG_SITE="$ac_default_prefix/share/kde/config.site $ac_default_prefix/etc/config.site"
+   fi
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+@@ -2497,27 +2497,27 @@
+ 
+ 
+ 
+-kde_htmldir="\$(prefix)/share/doc/HTML"
++kde_htmldir="\$(prefix)/share/doc/kde/HTML"
+ 
+-kde_appsdir="\$(prefix)/share/applnk"
++kde_appsdir="\$(prefix)/share/kde/applnk"
+ 
+-kde_icondir="\$(prefix)/share/icons"
++kde_icondir="\$(prefix)/share/kde/icons"
+ 
+-kde_minidir="\$(prefix)/share/icons/mini"
++kde_minidir="\$(prefix)/share/kde/icons/mini"
+ 
+-kde_datadir="\$(prefix)/share/apps"
++kde_datadir="\$(prefix)/share/kde/apps"
+ 
+-kde_locale="\$(prefix)/share/locale"
++kde_locale="\$(prefix)/share/kde/locale"
+ 
+-kde_cgidir="\$(prefix)/cgi-bin"
++kde_cgidir="\$(prefix)/kde-cgi-bin"
+ 
+-kde_confdir="\$(prefix)/share/config"
++kde_confdir="\$(prefix)/share/kde/config"
+ 
+-kde_mimedir="\$(prefix)/share/mimelnk"
++kde_mimedir="\$(prefix)/share/kde/mimelnk"
+ 
+-kde_toolbardir="\$(prefix)/share/toolbar"
++kde_toolbardir="\$(prefix)/share/kde/toolbar"
+ 
+-kde_wallpaperdir="\$(prefix)/share/wallpaper"
++kde_wallpaperdir="\$(prefix)/share/kde/wallpaper"
+ 
+ 
+ 
+@@ -2563,7 +2563,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
++LIBS="$all_libraries -lungif -lX11 $LIBSOCKET"
+ cat > conftest.$ac_ext <<EOF
+ #line 2569 "configure"
+ #include "confdefs.h"
diff --git a/x11/khostchooser/pkg/PLIST b/x11/khostchooser/pkg/PLIST
index 8bd5e48cf21..e6dd5c7e745 100644
--- a/x11/khostchooser/pkg/PLIST
+++ b/x11/khostchooser/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/01 23:03:38 garbled Exp $
-share/locale/de/LC_MESSAGES/khostchooser.mo
-share/locale/en/LC_MESSAGES/khostchooser.mo
-share/doc/HTML/en/khostchooser/index.html
-share/doc/HTML/de/khostchooser/index.html
-share/config/khostchooserrc
-share/apps/khostchooser/chooserlogo.xpm
+@comment $NetBSD: PLIST,v 1.2 1999/10/09 20:27:38 jlam Exp $
 bin/khostchooser
-@dirrm share/doc/HTML/en/khostchooser
-@dirrm share/doc/HTML/de/khostchooser
-@dirrm share/apps/khostchooser
+share/doc/kde/HTML/de/khostchooser/index.html
+share/doc/kde/HTML/en/khostchooser/index.html
+share/kde/apps/khostchooser/chooserlogo.xpm
+share/kde/config/khostchooserrc
+share/kde/locale/de/LC_MESSAGES/khostchooser.mo
+share/kde/locale/en/LC_MESSAGES/khostchooser.mo
+@dirrm share/kde/apps/khostchooser
+@dirrm share/doc/kde/HTML/en/khostchooser
+@dirrm share/doc/kde/HTML/de/khostchooser