- Remove DEPRECATED

- Update to 0.2.9
- Update WWW

PR:		155868
Submitted by:	Ports Fury

8 files changed, 64 insertions, 113 deletions

diff --git a/net/vyqchat/Makefile b/net/vyqchat/Makefile
index bb02c2b0b951..93fb4dab5ef1 100644
--- a/net/vyqchat/Makefile
+++ b/net/vyqchat/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	vyqchat
-PORTVERSION=	0.2.8
-PORTREVISION=	8
+PORTVERSION=	0.2.9
 CATEGORIES=	net
-MASTER_SITES=	http://linux.bydg.org/~yogin/
+MASTER_SITES=	http://www.linux-projects.net/d/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Qt LAN chat, compatible with Vypress Chat
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
 USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-Qt-dir=${QT_PREFIX}
+
 QTCFGLIBS=	${PTHREAD_LIBS}
 
-CONFIGURE_ARGS=	--with-Qt-dir=${QT_PREFIX}
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_ARTS)
 LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
@@ -40,14 +38,4 @@ CONFIGURE_ARGS+=--without-libao
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 .endif
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,Settings::getUUID,getUUID,' \
-		${WRKSRC}/src/settings.h
-	@${REINPLACE_CMD} -e 's,Sound::error,error,' \
-		${WRKSRC}/src/sound.h
-	@${REINPLACE_CMD} -e 's,User::setStatus,setStatus,' \
-		${WRKSRC}/src/user.h
-
 .include <bsd.port.post.mk>
diff --git a/net/vyqchat/distinfo b/net/vyqchat/distinfo
index 936a86724393..fe097cbdeaf4 100644
--- a/net/vyqchat/distinfo
+++ b/net/vyqchat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vyqchat-0.2.8.tar.gz) = d05e9d720977c73a187bb69f54135d638f54d60e9ede6ba01e853c6930c0c234
-SIZE (vyqchat-0.2.8.tar.gz) = 413505
+SHA256 (vyqchat-0.2.9.tar.gz) = 113f9fc2959eebc3344464cb47243e6b1c2b6428587a5afd85b7faaa0ff987d1
+SIZE (vyqchat-0.2.9.tar.gz) = 415762
diff --git a/net/vyqchat/files/patch-src-appwin.cpp b/net/vyqchat/files/patch-src-appwin.cpp
deleted file mode 100644
index 3f8f46b9c27b..000000000000
--- a/net/vyqchat/files/patch-src-appwin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/appwin.cpp	Tue Jul 19 18:54:11 2005
-+++ src/appwin.cpp	Sun Sep 18 21:22:23 2005
-@@ -1265,7 +1265,7 @@
- 	chattab->write(MAIN_CHANNEL, tmp, special_color);
- 	if (settings->getScriptEnabled(EventInfo))
- 		Scripting::executeInfoRequest(settings->getScriptFileName(EventInfo), QDateTime::currentDateTime(), from);
--	vc->vc_inforeqack(userslist->getIP(from), from, nick, settings->getHostname(), nick, settings->getIP().toString(), settings->getHideChannels() ? MAIN_CHANNEL: chattab->channelsList(), (status!=STATUS_NORMAL) ? autoanswer : QString(""));
-+	vc->vc_inforeqack(userslist->getIP(from), from, nick, settings->getHostname(), nick, settings->getIP().toString(), settings->getHideChannels() ? QString(MAIN_CHANNEL): chattab->channelsList(), (status!=STATUS_NORMAL) ? autoanswer : QString(""));
- }/*}}}*/
- 
- void MainWindow::on_vc_inforeqack(const QHostAddress &source, const QString &to, const QString &from, const QString &host, const QString &name, const QString &ip, const QString &channels, const QString &answer, const QString &computer, const QString &software, bool utf)/*{{{*/
diff --git a/net/vyqchat/files/patch-src-settings.cpp b/net/vyqchat/files/patch-src-settings.cpp
index 5b3871a5ab71..1e6601b5ebb6 100644
--- a/net/vyqchat/files/patch-src-settings.cpp
+++ b/net/vyqchat/files/patch-src-settings.cpp
@@ -1,13 +1,21 @@
---- src/settings.cpp	Mon Jul 18 21:54:08 2005
-+++ src/settings.cpp	Sun Sep 18 21:20:55 2005
-@@ -14,8 +14,9 @@
+--- src/settings.cpp.orig	2006-05-16 05:34:35.000000000 +0900
++++ src/settings.cpp	2011-03-16 13:57:41.000000000 +0900
+@@ -12,14 +12,14 @@
+ 
+ #include "global.h"
  #include "settings.h"
++#include <stdlib.h>
  #include <unistd.h>
  #include <sys/ioctl.h>
 -#include <net/if.h>
- #include <sys/socket.h>
-+#include <net/if.h>
-+#include <netinet/in.h>
+-#include <netinet/in.h>
+-#include <sys/socket.h>
  #include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
  #include <arpa/inet.h>
- #include <stdlib.h>
+-#include <stdlib.h>
++#include <net/if.h>
+ 
+ Settings::Settings() /*{{{*/
+ {
diff --git a/net/vyqchat/files/patch-src-settingsdlg.cpp b/net/vyqchat/files/patch-src-settingsdlg.cpp
deleted file mode 100644
index 132e0918884b..000000000000
--- a/net/vyqchat/files/patch-src-settingsdlg.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/settingsdlg.cpp	Mon Jul 18 21:54:08 2005
-+++ src/settingsdlg.cpp	Sun Sep 18 21:21:08 2005
-@@ -400,7 +400,7 @@
- 		settings->setSoundType(static_cast<Sound::SoundType>(opt_snddev->id(opt_snddev->selected())));
- 		sndcfgchanged = true;
- 	}
--	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : "");
-+	settings->setEncodingName(l_enc->currentItem() ? l_enc->currentText() : QString(""));
- 	if (b_useutf->isChecked() != settings->getUseUTF())
- 		settings->setUseUTF(b_useutf->isChecked());
- 	settings->setHideChannels(b_hide->isChecked());
diff --git a/net/vyqchat/files/patch-src-uuid.cpp b/net/vyqchat/files/patch-src-uuid.cpp
deleted file mode 100644
index 40f63de8794e..000000000000
--- a/net/vyqchat/files/patch-src-uuid.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/uuid.cpp	Mon Jul 18 21:54:08 2005
-+++ src/uuid.cpp	Sun Sep 18 21:21:21 2005
-@@ -12,7 +12,8 @@
- 
- #include "uuid.h"
- #include <qstring.h>
--#include <openssl/rand.h>
-+#include <unistd.h>
-+#include <fcntl.h>
- 
- UUID::UUID(): QByteArray(UUID_LEN)/*{{{*/
- {
-@@ -35,7 +36,9 @@
- 
- void UUID::generate()/*{{{*/
- {
--	RAND_bytes((unsigned char *)data(), UUID_LEN);
-+	int rfd = open("/dev/random", O_RDONLY);
-+	read(rfd, (void *)data(), UUID_LEN);
-+	close(rfd);
- }/*}}}*/
- 
- void UUID::set(const unsigned char *data)/*{{{*/
diff --git a/net/vyqchat/pkg-descr b/net/vyqchat/pkg-descr
index a5f9f6df0d21..3a5c3866848e 100644
--- a/net/vyqchat/pkg-descr
+++ b/net/vyqchat/pkg-descr
@@ -6,4 +6,4 @@ user-friendly and lets you to do most things with mouse. There is also optional
 sound support. VyQChat has been written in C++ and requires Qt library, version
 3.x.
 
-WWW: http://linux.bydg.org/~yogin/
+WWW: http://www.linux-projects.net/projects
diff --git a/net/vyqchat/pkg-plist b/net/vyqchat/pkg-plist
index 988ac072131d..65f26be46665 100644
--- a/net/vyqchat/pkg-plist
+++ b/net/vyqchat/pkg-plist
@@ -1,42 +1,42 @@
 bin/vyqchat
-share/vyqchat/default/channel_alert.png
-share/vyqchat/default/channel_normal.png
-share/vyqchat/default/channel.png
-share/vyqchat/default/comm.png
-share/vyqchat/default/enter.png
-share/vyqchat/default/info.png
-share/vyqchat/default/massmessage.png
-share/vyqchat/default/message.png
-share/vyqchat/default/priv_alert.png
-share/vyqchat/default/priv.png
-share/vyqchat/default/settings.png
-share/vyqchat/default/user_away.png
-share/vyqchat/default/user_dnd.png
-share/vyqchat/default/user_offline.png
-share/vyqchat/default/user.png
-share/vyqchat/default/themeinfo
-share/vyqchat/crystal/beep.png
-share/vyqchat/crystal/cancel.png
-share/vyqchat/crystal/channel_alert.png
-share/vyqchat/crystal/channel_normal.png
-share/vyqchat/crystal/channel.png
-share/vyqchat/crystal/comm.png
-share/vyqchat/crystal/enter.png
-share/vyqchat/crystal/info.png
-share/vyqchat/crystal/massmessage.png
-share/vyqchat/crystal/message.png
-share/vyqchat/crystal/priv_alert.png
-share/vyqchat/crystal/priv.png
-share/vyqchat/crystal/settings.png
-share/vyqchat/crystal/user_away.png
-share/vyqchat/crystal/user_dnd.png
-share/vyqchat/crystal/user_offline.png
-share/vyqchat/crystal/user.png
-share/vyqchat/crystal/themeinfo
-share/vyqchat/tr/vyqchat_pl.qm
-share/vyqchat/tr/vyqchat_ru.qm
-share/vyqchat/tr/vyqchat_tr.qm
-@dirrm share/vyqchat/default
-@dirrm share/vyqchat/crystal
-@dirrm share/vyqchat/tr
-@dirrm share/vyqchat
+%%DATADIR%%/crystal/beep.png
+%%DATADIR%%/crystal/cancel.png
+%%DATADIR%%/crystal/channel.png
+%%DATADIR%%/crystal/channel_alert.png
+%%DATADIR%%/crystal/channel_normal.png
+%%DATADIR%%/crystal/comm.png
+%%DATADIR%%/crystal/enter.png
+%%DATADIR%%/crystal/info.png
+%%DATADIR%%/crystal/massmessage.png
+%%DATADIR%%/crystal/message.png
+%%DATADIR%%/crystal/priv.png
+%%DATADIR%%/crystal/priv_alert.png
+%%DATADIR%%/crystal/settings.png
+%%DATADIR%%/crystal/themeinfo
+%%DATADIR%%/crystal/user.png
+%%DATADIR%%/crystal/user_away.png
+%%DATADIR%%/crystal/user_dnd.png
+%%DATADIR%%/crystal/user_offline.png
+%%DATADIR%%/default/channel.png
+%%DATADIR%%/default/channel_alert.png
+%%DATADIR%%/default/channel_normal.png
+%%DATADIR%%/default/comm.png
+%%DATADIR%%/default/enter.png
+%%DATADIR%%/default/info.png
+%%DATADIR%%/default/massmessage.png
+%%DATADIR%%/default/message.png
+%%DATADIR%%/default/priv.png
+%%DATADIR%%/default/priv_alert.png
+%%DATADIR%%/default/settings.png
+%%DATADIR%%/default/themeinfo
+%%DATADIR%%/default/user.png
+%%DATADIR%%/default/user_away.png
+%%DATADIR%%/default/user_dnd.png
+%%DATADIR%%/default/user_offline.png
+%%DATADIR%%/tr/vyqchat_pl.qm
+%%DATADIR%%/tr/vyqchat_ru.qm
+%%DATADIR%%/tr/vyqchat_tr.qm
+@dirrm %%DATADIR%%/tr
+@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%/crystal
+@dirrm %%DATADIR%%