Upgrade to 0.8.7.

PR:		44874
Submitted by:	Jonathan Chen <jonc@chen.org.nz>
This commit is contained in:
Dima Dorfman 2002-11-10 17:12:28 +00:00
parent 7f49013883
commit bb613ac89d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=69811
16 changed files with 90 additions and 232 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= psi
PORTVERSION= 0.8.6
PORTREVISION= 2
PORTVERSION= 0.8.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -16,24 +15,15 @@ MAINTAINER= jonc@chen.org.nz
LIB_DEPENDS= qt-mt.3:${PORTSDIR}/x11-toolkits/qt30
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
CONFIGURE_ENV= QTDIR=${X11BASE}
CONFIGURE_ARGS= -p ${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE} \
CFLAGS="-pipe -pthread -D_THREAD_SAFE -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
BUILD_WRKSRC= ${WRKSRC}/src
MAKE_ARGS= QTDIR=${X11BASE}
EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp
pre-patch:
${SED} s,%%DATADIR%%,${DATADIR}, ${PATCHDIR}/template.patch-common.cpp > \
${WRKDIR}/patch-common.cpp
pre-build:
cd ${BUILD_WRKSRC}; qmake -spec ${X11BASE}/mkspecs/freebsd-g++ psi.pro
do-install:
@${MKDIR} ${DATADIR}
@cd ${INSTALL_WRKSRC}; \
${CP} -r image iconsets sound certs README COPYING ${DATADIR}
@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/psi ${PREFIX}/bin
INSTALL_WRKSRC= ${WRKSRC}/src
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (psi-0.8.6.tar.bz2) = 8e624f88c7dde5794ce14c22f978f3ad
MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86

View file

@ -0,0 +1,16 @@
$FreeBSD$
Fix the getopt to use BSD's getopt instead of Linux's
--- configure.orig Wed Oct 30 23:09:35 2002
+++ configure Mon Nov 4 22:10:49 2002
@@ -2,8 +2,7 @@
# parsing options
-TEMP=`getopt -o p:b:l:q:h --long prefix:,bindir:,libdir:,qtdir:,help \
--n 'configure' -- "$@"`
+TEMP=`getopt p:b:l:q:h $*`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002
+++ src/ndns.cpp Thu Jul 11 18:40:24 2002
@@ -51,6 +51,7 @@
#include "ndns.h"
#ifdef Q_OS_UNIX
+#include <sys/types.h>
#include<netdb.h>
#include<netinet/in.h>
#include<arpa/inet.h>

View file

@ -0,0 +1,14 @@
$FreeBSD$
Disable the use of /bin/true (doesn't exist in FreeBSD)
--- src/psi.pro.orig Wed Oct 30 23:09:34 2002
+++ src/psi.pro Mon Nov 4 20:43:19 2002
@@ -157,7 +157,6 @@
LIBS += -lz -lXss
SOURCES += trayicon_x11.cpp
- QMAKE_STRIP = "/bin/true"
include( configure.pri )
}

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- src/common.cpp.orig Wed May 1 22:06:07 2002
+++ src/common.cpp Wed May 1 22:06:47 2002
@@ -1130,7 +1130,7 @@
#ifdef Q_WS_X11
QString getResourcesDir()
{
- return "/usr/local/psi";
+ return "%%DATADIR%%";
}
QString getHomeDir()

View file

@ -4,4 +4,4 @@ flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
It does not require KDE to run.
WWW: http://psi.affinix.com/
WWW: http://psi.sourceforge.net/

View file

@ -4,53 +4,6 @@ share/psi/README
share/psi/certs/README
share/psi/certs/cacert-rootonly.pem
share/psi/certs/cacert.pem
share/psi/iconsets/cosmic/add.png
share/psi/iconsets/cosmic/away.png
share/psi/iconsets/cosmic/changeacc.png
share/psi/iconsets/cosmic/chat.png
share/psi/iconsets/cosmic/desc
share/psi/iconsets/cosmic/dnd.png
share/psi/iconsets/cosmic/groupclose.png
share/psi/iconsets/cosmic/groupempty.png
share/psi/iconsets/cosmic/groupopen.png
share/psi/iconsets/cosmic/headline.png
share/psi/iconsets/cosmic/history.png
share/psi/iconsets/cosmic/info.png
share/psi/iconsets/cosmic/message.png
share/psi/iconsets/cosmic/offline.png
share/psi/iconsets/cosmic/online.png
share/psi/iconsets/cosmic/remove.png
share/psi/iconsets/cosmic/send.png
share/psi/iconsets/cosmic/system.png
share/psi/iconsets/cosmic/url.png
share/psi/iconsets/cosmic/xa.png
share/psi/iconsets/gabber/away.png
share/psi/iconsets/gabber/chat.png
share/psi/iconsets/gabber/desc
share/psi/iconsets/gabber/dnd.png
share/psi/iconsets/gabber/message.png
share/psi/iconsets/gabber/offline.png
share/psi/iconsets/gabber/online.png
share/psi/iconsets/gabber/xa.png
share/psi/iconsets/icq2/away.png
share/psi/iconsets/icq2/chat.png
share/psi/iconsets/icq2/desc
share/psi/iconsets/icq2/dnd.png
share/psi/iconsets/icq2/message.png
share/psi/iconsets/icq2/offline.png
share/psi/iconsets/icq2/online.png
share/psi/iconsets/icq2/send.png
share/psi/iconsets/icq2/xa.png
share/psi/iconsets/licq/add.png
share/psi/iconsets/licq/away.png
share/psi/iconsets/licq/chat.png
share/psi/iconsets/licq/desc
share/psi/iconsets/licq/dnd.png
share/psi/iconsets/licq/message.png
share/psi/iconsets/licq/offline.png
share/psi/iconsets/licq/online.png
share/psi/iconsets/licq/send.png
share/psi/iconsets/licq/xa.png
share/psi/iconsets/lightbulb/away.png
share/psi/iconsets/lightbulb/chat.png
share/psi/iconsets/lightbulb/desc
@ -63,30 +16,14 @@ share/psi/iconsets/lightbulb/offline.png
share/psi/iconsets/lightbulb/online.png
share/psi/iconsets/lightbulb/system.png
share/psi/iconsets/lightbulb/xa.png
share/psi/iconsets/mike/away.png
share/psi/iconsets/mike/chat.png
share/psi/iconsets/mike/desc
share/psi/iconsets/mike/dnd.png
share/psi/iconsets/mike/message.png
share/psi/iconsets/mike/offline.png
share/psi/iconsets/mike/online.png
share/psi/iconsets/mike/send.png
share/psi/iconsets/mike/xa.png
share/psi/iconsets/smiley/away.png
share/psi/iconsets/smiley/chat.png
share/psi/iconsets/smiley/desc
share/psi/iconsets/smiley/dnd.png
share/psi/iconsets/smiley/message.png
share/psi/iconsets/smiley/offline.png
share/psi/iconsets/smiley/online.png
share/psi/iconsets/smiley/send.png
share/psi/iconsets/smiley/xa.png
share/psi/iconsets/stellar/account.png
share/psi/iconsets/stellar/add.png
share/psi/iconsets/stellar/ask.png
share/psi/iconsets/stellar/away.png
share/psi/iconsets/stellar/changeacc.png
share/psi/iconsets/stellar/chat.png
share/psi/iconsets/stellar/chatclear.png
share/psi/iconsets/stellar/connect.png
share/psi/iconsets/stellar/desc
share/psi/iconsets/stellar/dnd.png
share/psi/iconsets/stellar/emoticon_angry.png
@ -126,6 +63,7 @@ share/psi/iconsets/stellar/emoticon_tongue.png
share/psi/iconsets/stellar/emoticon_unhappy.png
share/psi/iconsets/stellar/emoticon_wink.png
share/psi/iconsets/stellar/emoticon_yes.png
share/psi/iconsets/stellar/groupchat.png
share/psi/iconsets/stellar/groupclose.png
share/psi/iconsets/stellar/groupempty.png
share/psi/iconsets/stellar/groupopen.png
@ -133,8 +71,10 @@ share/psi/iconsets/stellar/headline.png
share/psi/iconsets/stellar/history.png
share/psi/iconsets/stellar/info.png
share/psi/iconsets/stellar/message.png
share/psi/iconsets/stellar/noauth.png
share/psi/iconsets/stellar/offline.png
share/psi/iconsets/stellar/online.png
share/psi/iconsets/stellar/perr.png
share/psi/iconsets/stellar/psimain.png
share/psi/iconsets/stellar/remove.png
share/psi/iconsets/stellar/send.png
@ -148,6 +88,7 @@ share/psi/image/aim_dnd.png
share/psi/image/aim_offline.png
share/psi/image/aim_online.png
share/psi/image/aim_xa.png
share/psi/image/find.png
share/psi/image/icon_16.png
share/psi/image/icon_32.png
share/psi/image/icon_48.png
@ -182,13 +123,7 @@ share/psi/sound/send.wav
@dirrm share/psi/sound
@dirrm share/psi/image
@dirrm share/psi/iconsets/stellar
@dirrm share/psi/iconsets/smiley
@dirrm share/psi/iconsets/mike
@dirrm share/psi/iconsets/lightbulb
@dirrm share/psi/iconsets/licq
@dirrm share/psi/iconsets/icq2
@dirrm share/psi/iconsets/gabber
@dirrm share/psi/iconsets/cosmic
@dirrm share/psi/iconsets
@dirrm share/psi/certs
@dirrm share/psi

View file

@ -6,8 +6,7 @@
#
PORTNAME= psi
PORTVERSION= 0.8.6
PORTREVISION= 2
PORTVERSION= 0.8.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -16,24 +15,15 @@ MAINTAINER= jonc@chen.org.nz
LIB_DEPENDS= qt-mt.3:${PORTSDIR}/x11-toolkits/qt30
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
CONFIGURE_ENV= QTDIR=${X11BASE}
CONFIGURE_ARGS= -p ${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE} \
CFLAGS="-pipe -pthread -D_THREAD_SAFE -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
BUILD_WRKSRC= ${WRKSRC}/src
MAKE_ARGS= QTDIR=${X11BASE}
EXTRA_PATCHES= ${WRKDIR}/patch-common.cpp
pre-patch:
${SED} s,%%DATADIR%%,${DATADIR}, ${PATCHDIR}/template.patch-common.cpp > \
${WRKDIR}/patch-common.cpp
pre-build:
cd ${BUILD_WRKSRC}; qmake -spec ${X11BASE}/mkspecs/freebsd-g++ psi.pro
do-install:
@${MKDIR} ${DATADIR}
@cd ${INSTALL_WRKSRC}; \
${CP} -r image iconsets sound certs README COPYING ${DATADIR}
@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/psi ${PREFIX}/bin
INSTALL_WRKSRC= ${WRKSRC}/src
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (psi-0.8.6.tar.bz2) = 8e624f88c7dde5794ce14c22f978f3ad
MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86

View file

@ -0,0 +1,16 @@
$FreeBSD$
Fix the getopt to use BSD's getopt instead of Linux's
--- configure.orig Wed Oct 30 23:09:35 2002
+++ configure Mon Nov 4 22:10:49 2002
@@ -2,8 +2,7 @@
# parsing options
-TEMP=`getopt -o p:b:l:q:h --long prefix:,bindir:,libdir:,qtdir:,help \
--n 'configure' -- "$@"`
+TEMP=`getopt p:b:l:q:h $*`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- src/ndns.cpp.orig Thu Jul 11 18:49:42 2002
+++ src/ndns.cpp Thu Jul 11 18:40:24 2002
@@ -51,6 +51,7 @@
#include "ndns.h"
#ifdef Q_OS_UNIX
+#include <sys/types.h>
#include<netdb.h>
#include<netinet/in.h>
#include<arpa/inet.h>

View file

@ -0,0 +1,14 @@
$FreeBSD$
Disable the use of /bin/true (doesn't exist in FreeBSD)
--- src/psi.pro.orig Wed Oct 30 23:09:34 2002
+++ src/psi.pro Mon Nov 4 20:43:19 2002
@@ -157,7 +157,6 @@
LIBS += -lz -lXss
SOURCES += trayicon_x11.cpp
- QMAKE_STRIP = "/bin/true"
include( configure.pri )
}

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- src/common.cpp.orig Wed May 1 22:06:07 2002
+++ src/common.cpp Wed May 1 22:06:47 2002
@@ -1130,7 +1130,7 @@
#ifdef Q_WS_X11
QString getResourcesDir()
{
- return "/usr/local/psi";
+ return "%%DATADIR%%";
}
QString getHomeDir()

View file

@ -4,4 +4,4 @@ flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
It does not require KDE to run.
WWW: http://psi.affinix.com/
WWW: http://psi.sourceforge.net/

View file

@ -4,53 +4,6 @@ share/psi/README
share/psi/certs/README
share/psi/certs/cacert-rootonly.pem
share/psi/certs/cacert.pem
share/psi/iconsets/cosmic/add.png
share/psi/iconsets/cosmic/away.png
share/psi/iconsets/cosmic/changeacc.png
share/psi/iconsets/cosmic/chat.png
share/psi/iconsets/cosmic/desc
share/psi/iconsets/cosmic/dnd.png
share/psi/iconsets/cosmic/groupclose.png
share/psi/iconsets/cosmic/groupempty.png
share/psi/iconsets/cosmic/groupopen.png
share/psi/iconsets/cosmic/headline.png
share/psi/iconsets/cosmic/history.png
share/psi/iconsets/cosmic/info.png
share/psi/iconsets/cosmic/message.png
share/psi/iconsets/cosmic/offline.png
share/psi/iconsets/cosmic/online.png
share/psi/iconsets/cosmic/remove.png
share/psi/iconsets/cosmic/send.png
share/psi/iconsets/cosmic/system.png
share/psi/iconsets/cosmic/url.png
share/psi/iconsets/cosmic/xa.png
share/psi/iconsets/gabber/away.png
share/psi/iconsets/gabber/chat.png
share/psi/iconsets/gabber/desc
share/psi/iconsets/gabber/dnd.png
share/psi/iconsets/gabber/message.png
share/psi/iconsets/gabber/offline.png
share/psi/iconsets/gabber/online.png
share/psi/iconsets/gabber/xa.png
share/psi/iconsets/icq2/away.png
share/psi/iconsets/icq2/chat.png
share/psi/iconsets/icq2/desc
share/psi/iconsets/icq2/dnd.png
share/psi/iconsets/icq2/message.png
share/psi/iconsets/icq2/offline.png
share/psi/iconsets/icq2/online.png
share/psi/iconsets/icq2/send.png
share/psi/iconsets/icq2/xa.png
share/psi/iconsets/licq/add.png
share/psi/iconsets/licq/away.png
share/psi/iconsets/licq/chat.png
share/psi/iconsets/licq/desc
share/psi/iconsets/licq/dnd.png
share/psi/iconsets/licq/message.png
share/psi/iconsets/licq/offline.png
share/psi/iconsets/licq/online.png
share/psi/iconsets/licq/send.png
share/psi/iconsets/licq/xa.png
share/psi/iconsets/lightbulb/away.png
share/psi/iconsets/lightbulb/chat.png
share/psi/iconsets/lightbulb/desc
@ -63,30 +16,14 @@ share/psi/iconsets/lightbulb/offline.png
share/psi/iconsets/lightbulb/online.png
share/psi/iconsets/lightbulb/system.png
share/psi/iconsets/lightbulb/xa.png
share/psi/iconsets/mike/away.png
share/psi/iconsets/mike/chat.png
share/psi/iconsets/mike/desc
share/psi/iconsets/mike/dnd.png
share/psi/iconsets/mike/message.png
share/psi/iconsets/mike/offline.png
share/psi/iconsets/mike/online.png
share/psi/iconsets/mike/send.png
share/psi/iconsets/mike/xa.png
share/psi/iconsets/smiley/away.png
share/psi/iconsets/smiley/chat.png
share/psi/iconsets/smiley/desc
share/psi/iconsets/smiley/dnd.png
share/psi/iconsets/smiley/message.png
share/psi/iconsets/smiley/offline.png
share/psi/iconsets/smiley/online.png
share/psi/iconsets/smiley/send.png
share/psi/iconsets/smiley/xa.png
share/psi/iconsets/stellar/account.png
share/psi/iconsets/stellar/add.png
share/psi/iconsets/stellar/ask.png
share/psi/iconsets/stellar/away.png
share/psi/iconsets/stellar/changeacc.png
share/psi/iconsets/stellar/chat.png
share/psi/iconsets/stellar/chatclear.png
share/psi/iconsets/stellar/connect.png
share/psi/iconsets/stellar/desc
share/psi/iconsets/stellar/dnd.png
share/psi/iconsets/stellar/emoticon_angry.png
@ -126,6 +63,7 @@ share/psi/iconsets/stellar/emoticon_tongue.png
share/psi/iconsets/stellar/emoticon_unhappy.png
share/psi/iconsets/stellar/emoticon_wink.png
share/psi/iconsets/stellar/emoticon_yes.png
share/psi/iconsets/stellar/groupchat.png
share/psi/iconsets/stellar/groupclose.png
share/psi/iconsets/stellar/groupempty.png
share/psi/iconsets/stellar/groupopen.png
@ -133,8 +71,10 @@ share/psi/iconsets/stellar/headline.png
share/psi/iconsets/stellar/history.png
share/psi/iconsets/stellar/info.png
share/psi/iconsets/stellar/message.png
share/psi/iconsets/stellar/noauth.png
share/psi/iconsets/stellar/offline.png
share/psi/iconsets/stellar/online.png
share/psi/iconsets/stellar/perr.png
share/psi/iconsets/stellar/psimain.png
share/psi/iconsets/stellar/remove.png
share/psi/iconsets/stellar/send.png
@ -148,6 +88,7 @@ share/psi/image/aim_dnd.png
share/psi/image/aim_offline.png
share/psi/image/aim_online.png
share/psi/image/aim_xa.png
share/psi/image/find.png
share/psi/image/icon_16.png
share/psi/image/icon_32.png
share/psi/image/icon_48.png
@ -182,13 +123,7 @@ share/psi/sound/send.wav
@dirrm share/psi/sound
@dirrm share/psi/image
@dirrm share/psi/iconsets/stellar
@dirrm share/psi/iconsets/smiley
@dirrm share/psi/iconsets/mike
@dirrm share/psi/iconsets/lightbulb
@dirrm share/psi/iconsets/licq
@dirrm share/psi/iconsets/icq2
@dirrm share/psi/iconsets/gabber
@dirrm share/psi/iconsets/cosmic
@dirrm share/psi/iconsets
@dirrm share/psi/certs
@dirrm share/psi