- Update to version 0.4.1

- Take over maintainership. I'm one of the authors :)

7 files changed, 52 insertions, 21 deletions

diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index c453991e11b0..1ad6f4abcaee 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -6,20 +6,29 @@
 #
 
 PORTNAME=	kssh
-PORTVERSION=	0.2
+PORTVERSION=	0.4.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.geocities.com/bilibao/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kevlo@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png \
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
-USE_QT=		yes
+USE_QT2=	yes
+MOC?=           ${X11BASE}/bin/moc2
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --datadir="${LOCALBASE}"
-CONFIGURE_ENV=	KDEDIR="${LOCALBASE}"
+CONFIGURE_ARGS+=--prefix="${PREFIX}" --datadir="${LOCALBASE}" \
+		--with-qt-includes=${X11BASE}/include/qt2 \
+		--with-qt-libraries=${X11BASE}/lib \
+		--with-extra-includes=${LOCALBASE}/include \
+		--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}" MOC="${MOC}" LIBQT="-lqt2" \
+		LIBQTFILE="libqt2"
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.4
 
 .include <bsd.port.mk>
diff --git a/security/kssh/distinfo b/security/kssh/distinfo
index 4b4b414634c5..e39d9d7e6f26 100644
--- a/security/kssh/distinfo
+++ b/security/kssh/distinfo
@@ -1 +1 @@
-MD5 (kssh-0.2.tar.gz) = 61bf40792fee8811f823052c226de42b
+MD5 (kssh-0.4.1.tar.gz) = a348a96166b1e0a5be4f84e910c3b010
diff --git a/security/kssh/files/patch-aa b/security/kssh/files/patch-aa
index a14c42dbf213..65e3ac0e76dc 100644
--- a/security/kssh/files/patch-aa
+++ b/security/kssh/files/patch-aa
@@ -1,6 +1,6 @@
---- configure	Fri Sep 24 05:24:26 1999
-+++ configure.new	Wed Mar 22 23:23:09 2000
-@@ -3565,7 +3565,7 @@
+--- configure.orig	Sat Nov 18 22:39:58 2000
++++ configure	Sat Nov 18 22:40:24 2000
+@@ -5674,7 +5674,7 @@
  kde_libdir=NO
  for i in $kde_libdirs;
  do
@@ -9,12 +9,12 @@
    do
      if test -r "$i/$j"; then
        kde_libdir=$i
-@@ -3575,7 +3575,7 @@
- done
+@@ -5685,7 +5685,7 @@
  
+ ac_kde_libraries="$kde_libdir"
  
 -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.so"; then
  { echo "configure: error: 
- in the prefix, you've chosen, are no kde libraries installed. This will fail.
+ 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; }
diff --git a/security/kssh/files/patch-ab b/security/kssh/files/patch-ab
new file mode 100644
index 000000000000..5a7803f0e184
--- /dev/null
+++ b/security/kssh/files/patch-ab
@@ -0,0 +1,11 @@
+--- kssh/Makefile.in.orig	Sat Nov 18 22:41:06 2000
++++ kssh/Makefile.in	Sat Nov 18 22:41:22 2000
+@@ -192,7 +192,7 @@
+ # you can add here more. This one gets installed 
+ bin_PROGRAMS = kssh 
+ kssh_SOURCES = optionsdiadata.cpp optionsdia.cpp sshdialogdata.cpp sshdialog.cpp main.cpp 
+-kssh_LDADD = -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET)
++kssh_LDADD = -lkdeui -lkdecore -lqt2 -lXext -lX11 $(LIBSOCKET)
+ 
+ SUBDIRS = docs 
+ 
diff --git a/security/kssh/files/patch-ac b/security/kssh/files/patch-ac
new file mode 100644
index 000000000000..bdee024ed25d
--- /dev/null
+++ b/security/kssh/files/patch-ac
@@ -0,0 +1,11 @@
+--- kssh/kssh.desktop.orig	Sat Nov 18 23:25:40 2000
++++ kssh/kssh.desktop	Sat Nov 18 23:25:47 2000
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+ Exec=kssh   
+-Icon=kssh.png
++Icon=kssh
+ DocPath=kssh/index.html
+ Comment= A front-end to ssh
+ Comment[it]= Front-end per ssh
diff --git a/security/kssh/pkg-descr b/security/kssh/pkg-descr
index 77f1b6be14c9..0f147934282f 100644
--- a/security/kssh/pkg-descr
+++ b/security/kssh/pkg-descr
@@ -3,6 +3,6 @@ KDE. It most nearly matches the windowing
 style of the Windows PuTTY & TeraTerm clients.
 
 WWW: http://www.geocities.com/bilibao/kssh.html
-Author: Andrea Rizzi <rizzi@kde.org>
 
---Will <andrews@technologist.com>
+- Kevin
+kevlo@FreeBSD.org
diff --git a/security/kssh/pkg-plist b/security/kssh/pkg-plist
index 937a860c8328..5c526fd18e25 100644
--- a/security/kssh/pkg-plist
+++ b/security/kssh/pkg-plist
@@ -1,7 +1,7 @@
 bin/kssh
-share/applnk/Internet/kssh.kdelnk
-share/icons/kssh.xpm
-share/icons/mini/kssh.xpm
-share/icons/large/kssh.xpm
+share/applnk/Internet/kssh.desktop
+share/icons/hicolor/32x32/apps/kssh.png
+share/icons/hicolor/48x48/apps/kssh.png
+share/icons/locolor/16x16/apps/kssh.png
 share/config/ksshrc
 share/locale/it/LC_MESSAGES/kssh.mo