Date: Mon, 23 Jun 2003 10:42:21 +1200 (NZST) From: Jonathan Chen <jonc@chen.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53618: net/psi update to 0.9 Message-ID: <200306222242.h5MMgLFP025747@grimoire.chen.org.nz> Resent-Message-ID: <200306222250.h5MMoFiP068393@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53618
>Category: ports
>Synopsis: net/psi update to 0.9
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 22 15:50:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Jonathan Chen
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD grimoire.chen.org.nz 4.8-STABLE FreeBSD 4.8-STABLE #0: Fri Jun 13 20:49:38 NZST 2003 root@grimoire.chen.org.nz:/usr/obj/usr/src/sys/GRIMOIRE i386
>Description:
Update net/psi port to 0.9
>How-To-Repeat:
>Fix:
Diffs to update attached. The following file needs to be removed:
files/patch-src::psi.pro
diff -ur /usr/ports/net/psi/Makefile ./Makefile
--- /usr/ports/net/psi/Makefile Mon Feb 24 11:41:22 2003
+++ ./Makefile Fri Jun 20 11:31:34 2003
@@ -6,7 +6,7 @@
#
PORTNAME= psi
-PORTVERSION= 0.8.7
+PORTVERSION= 0.9
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,17 +14,12 @@
MAINTAINER= jonc@chen.org.nz
COMMENT= A Qt-based Jabber client
-LIB_DEPENDS+= qssl.0:${PORTSDIR}/devel/qssl
-
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_QT_VER= 3
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
-INSTALL_WRKSRC= ${WRKSRC}/src
+MAKE_ARGS+= QTDIR=${X11BASE}
.include <bsd.port.mk>
diff -ur /usr/ports/net/psi/distinfo ./distinfo
--- /usr/ports/net/psi/distinfo Mon Nov 11 09:20:04 2002
+++ ./distinfo Fri Jun 20 11:06:34 2003
@@ -1 +1 @@
-MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86
+MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
diff -ur /usr/ports/net/psi/files/patch-configure ./files/patch-configure
--- /usr/ports/net/psi/files/patch-configure Mon Nov 11 06:12:28 2002
+++ ./files/patch-configure Mon Jun 23 09:48:40 2003
@@ -1,16 +1,15 @@
-$FreeBSD: ports/net/psi/files/patch-configure,v 1.1 2002/11/10 17:12:28 dd Exp $
+$FreeBSD$
-Fix the getopt to use BSD's getopt instead of Linux's
+Hack configure to eat autogenerated qt options.
---- 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
+--- configure.orig Wed Jun 11 06:12:49 2003
++++ configure Mon Jun 23 09:46:58 2003
+@@ -86,6 +86,8 @@
+ ;;
+ -h|--help) show_usage; exit ;;
++ --with-*)
++ shift;;
+ *) show_usage; exit ;;
+ esac
+ done
Only in /usr/ports/net/psi/files: patch-src::psi.pro
diff -ur /usr/ports/net/psi/pkg-plist ./pkg-plist
--- /usr/ports/net/psi/pkg-plist Mon Nov 11 09:20:04 2002
+++ ./pkg-plist Mon Jun 23 10:16:09 2003
@@ -2,8 +2,7 @@
share/psi/COPYING
share/psi/README
share/psi/certs/README
-share/psi/certs/cacert-rootonly.pem
-share/psi/certs/cacert.pem
+share/psi/certs/rootcert.xml
share/psi/iconsets/lightbulb/away.png
share/psi/iconsets/lightbulb/chat.png
share/psi/iconsets/lightbulb/desc
@@ -18,6 +17,10 @@
share/psi/iconsets/lightbulb/xa.png
share/psi/iconsets/stellar/account.png
share/psi/iconsets/stellar/add.png
+share/psi/iconsets/stellar/arrow_down.png
+share/psi/iconsets/stellar/arrow_left.png
+share/psi/iconsets/stellar/arrow_right.png
+share/psi/iconsets/stellar/arrow_up.png
share/psi/iconsets/stellar/ask.png
share/psi/iconsets/stellar/away.png
share/psi/iconsets/stellar/changeacc.png
@@ -68,27 +71,45 @@
share/psi/iconsets/stellar/groupempty.png
share/psi/iconsets/stellar/groupopen.png
share/psi/iconsets/stellar/headline.png
+share/psi/iconsets/stellar/help.png
share/psi/iconsets/stellar/history.png
share/psi/iconsets/stellar/info.png
+share/psi/iconsets/stellar/invisible.png
+share/psi/iconsets/stellar/jabber.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/options.png
share/psi/iconsets/stellar/perr.png
+share/psi/iconsets/stellar/pgp.png
+share/psi/iconsets/stellar/play_sounds.png
share/psi/iconsets/stellar/psimain.png
+share/psi/iconsets/stellar/quit.png
+share/psi/iconsets/stellar/register.png
+share/psi/iconsets/stellar/reload.png
share/psi/iconsets/stellar/remove.png
+share/psi/iconsets/stellar/search.png
share/psi/iconsets/stellar/send.png
share/psi/iconsets/stellar/ssl_no.png
share/psi/iconsets/stellar/ssl_yes.png
+share/psi/iconsets/stellar/stop.png
share/psi/iconsets/stellar/system.png
+share/psi/iconsets/stellar/time.png
share/psi/iconsets/stellar/url.png
share/psi/iconsets/stellar/xa.png
+share/psi/iconsets/stellar/xml.png
share/psi/image/aim_away.png
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/gg_away.png
+share/psi/image/gg_dnd.png
+share/psi/image/gg_offline.png
+share/psi/image/gg_online.png
+share/psi/image/gg_xa.png
share/psi/image/icon_16.png
share/psi/image/icon_32.png
share/psi/image/icon_48.png
@@ -98,6 +119,10 @@
share/psi/image/icq_offline.png
share/psi/image/icq_online.png
share/psi/image/icq_xa.png
+share/psi/image/key.png
+share/psi/image/key2.png
+share/psi/image/key_bad.png
+share/psi/image/key_unknown.png
share/psi/image/msn_away.png
share/psi/image/msn_dnd.png
share/psi/image/msn_offline.png
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306222242.h5MMgLFP025747>