From jonc@chen.org.nz  Mon Nov  4 01:34:24 2002
Return-Path: <jonc@chen.org.nz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C3FB637B408
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Nov 2002 01:34:24 -0800 (PST)
Received: from chen.org.nz (chen.org.nz [210.54.19.51])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB5E243E6E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Nov 2002 01:34:23 -0800 (PST)
	(envelope-from jonc@chen.org.nz)
Received: from grimoire.chen.org.nz (localhost [127.0.0.1])
	by chen.org.nz (8.12.6/8.12.6) with ESMTP id gA49YCEn026502
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 4 Nov 2002 22:34:12 +1300 (NZDT)
	(envelope-from jonc@grimoire.chen.org.nz)
Received: (from jonc@localhost)
	by grimoire.chen.org.nz (8.12.6/8.12.6/Submit) id gA49YCux026501;
	Mon, 4 Nov 2002 22:34:12 +1300 (NZDT)
Message-Id: <200211040934.gA49YCux026501@grimoire.chen.org.nz>
Date: Mon, 4 Nov 2002 22:34:12 +1300 (NZDT)
From: Jonathan Chen <jonc@chen.org.nz>
Reply-To: Jonathan Chen <jonc@chen.org.nz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update net/psi port to 0.8.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44874
>Category:       ports
>Synopsis:       update net/psi port to 0.8.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 04 01:40:01 PST 2002
>Closed-Date:    Sun Nov 10 09:16:07 PST 2002
>Last-Modified:  Sun Nov 10 09:16:07 PST 2002
>Originator:     Jonathan Chen
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD grimoire.chen.org.nz 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Nov 3 12:12:06 NZDT 2002 root@grimoire.chen.org.nz:/usr/obj/usr/src/sys/GRIMOIRE i386
>Description:
Upgrade net/psi port from 0.8.6 to 0.8.7
>How-To-Repeat:
>Fix:

The shell archive:
	1. update web-site details
	2. upgrade to 0.8.7. The patches are all different from 0.8.6's


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	psi
#	psi/files
#	psi/files/patch-src::psi.pro
#	psi/files/patch-configure
#	psi/Makefile
#	psi/distinfo
#	psi/pkg-comment
#	psi/pkg-descr
#	psi/pkg-plist
#
echo c - psi
mkdir -p psi > /dev/null 2>&1
echo c - psi/files
mkdir -p psi/files > /dev/null 2>&1
echo x - psi/files/patch-src::psi.pro
sed 's/^X//' >psi/files/patch-src::psi.pro << 'END-of-psi/files/patch-src::psi.pro'
X$FreeBSD$
X
XDisable the use of /bin/true (doesn't exist in FreeBSD)
X
X--- src/psi.pro.orig	Wed Oct 30 23:09:34 2002
X+++ src/psi.pro	Mon Nov  4 20:43:19 2002
X@@ -157,7 +157,6 @@
X 	LIBS         += -lz -lXss
X 	SOURCES      += trayicon_x11.cpp
X 
X-	QMAKE_STRIP = "/bin/true"
X 	include( configure.pri )
X }
X 
END-of-psi/files/patch-src::psi.pro
echo x - psi/files/patch-configure
sed 's/^X//' >psi/files/patch-configure << 'END-of-psi/files/patch-configure'
X$FreeBSD$
X
XFix the getopt to use BSD's getopt instead of Linux's
X
X--- configure.orig	Wed Oct 30 23:09:35 2002
X+++ configure	Mon Nov  4 22:10:49 2002
X@@ -2,8 +2,7 @@
X 
X # parsing options
X 
X-TEMP=`getopt -o p:b:l:q:h --long prefix:,bindir:,libdir:,qtdir:,help \
X--n 'configure' -- "$@"`
X+TEMP=`getopt p:b:l:q:h $*`
X 
X if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
X 
END-of-psi/files/patch-configure
echo x - psi/Makefile
sed 's/^X//' >psi/Makefile << 'END-of-psi/Makefile'
X# New ports collection makefile for:	psi
X# Date created:		Wed May  1 20:27:23 NZST 2002
X# Whom:			jonc@chen.org.nz
X#
X# $FreeBSD: ports/net/psi/Makefile,v 1.4 2002/07/31 03:17:04 pat Exp $
X#
X
XPORTNAME=	psi
XPORTVERSION=	0.8.7
XCATEGORIES=	net
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=	${PORTNAME}
X
XMAINTAINER=	jonc@chen.org.nz
X
XLIB_DEPENDS=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt30
X
XHAS_CONFIGURE=	yes
XUSE_X_PREFIX=	yes
XUSE_BZIP2=	yes
X
XCONFIGURE_ENV=	QTDIR=${X11BASE}
XCONFIGURE_ARGS=	-p ${PREFIX}
XMAKE_ARGS+=	QTDIR=${X11BASE} \
X		CFLAGS="-pipe -pthread -D_THREAD_SAFE -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
XBUILD_WRKSRC=	${WRKSRC}/src
XINSTALL_WRKSRC=	${WRKSRC}/src
X
X.include <bsd.port.mk>
END-of-psi/Makefile
echo x - psi/distinfo
sed 's/^X//' >psi/distinfo << 'END-of-psi/distinfo'
XMD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86
END-of-psi/distinfo
echo x - psi/pkg-comment
sed 's/^X//' >psi/pkg-comment << 'END-of-psi/pkg-comment'
XA Qt-based Jabber client
END-of-psi/pkg-comment
echo x - psi/pkg-descr
sed 's/^X//' >psi/pkg-descr << 'END-of-psi/pkg-descr'
XPsi is a client for the Jabber system. Written in C++ and based on the
XQt library, there are versions available for Linux, FreeBSD (and other
Xflavors of unix/X11), Microsoft Windows, and Apple MacOS X.
X
XIt does not require KDE to run.
X
XWWW: http://psi.sourceforge.net/
END-of-psi/pkg-descr
echo x - psi/pkg-plist
sed 's/^X//' >psi/pkg-plist << 'END-of-psi/pkg-plist'
Xbin/psi
Xshare/psi/COPYING
Xshare/psi/README
Xshare/psi/certs/README
Xshare/psi/certs/cacert-rootonly.pem
Xshare/psi/certs/cacert.pem
Xshare/psi/iconsets/lightbulb/away.png
Xshare/psi/iconsets/lightbulb/chat.png
Xshare/psi/iconsets/lightbulb/desc
Xshare/psi/iconsets/lightbulb/dnd.png
Xshare/psi/iconsets/lightbulb/groupclose.png
Xshare/psi/iconsets/lightbulb/groupempty.png
Xshare/psi/iconsets/lightbulb/groupopen.png
Xshare/psi/iconsets/lightbulb/message.png
Xshare/psi/iconsets/lightbulb/offline.png
Xshare/psi/iconsets/lightbulb/online.png
Xshare/psi/iconsets/lightbulb/system.png
Xshare/psi/iconsets/lightbulb/xa.png
Xshare/psi/iconsets/stellar/account.png
Xshare/psi/iconsets/stellar/add.png
Xshare/psi/iconsets/stellar/ask.png
Xshare/psi/iconsets/stellar/away.png
Xshare/psi/iconsets/stellar/changeacc.png
Xshare/psi/iconsets/stellar/chat.png
Xshare/psi/iconsets/stellar/chatclear.png
Xshare/psi/iconsets/stellar/connect.png
Xshare/psi/iconsets/stellar/desc
Xshare/psi/iconsets/stellar/dnd.png
Xshare/psi/iconsets/stellar/emoticon_angry.png
Xshare/psi/iconsets/stellar/emoticon_bat.png
Xshare/psi/iconsets/stellar/emoticon_beer.png
Xshare/psi/iconsets/stellar/emoticon_biggrin.png
Xshare/psi/iconsets/stellar/emoticon_blush.png
Xshare/psi/iconsets/stellar/emoticon_boy.png
Xshare/psi/iconsets/stellar/emoticon_brflower.png
Xshare/psi/iconsets/stellar/emoticon_brheart.png
Xshare/psi/iconsets/stellar/emoticon_coffee.png
Xshare/psi/iconsets/stellar/emoticon_coolglasses.png
Xshare/psi/iconsets/stellar/emoticon_cry.png
Xshare/psi/iconsets/stellar/emoticon_cuffs.png
Xshare/psi/iconsets/stellar/emoticon_devil.png
Xshare/psi/iconsets/stellar/emoticon_drink.png
Xshare/psi/iconsets/stellar/emoticon_flower.png
Xshare/psi/iconsets/stellar/emoticon_frowning.png
Xshare/psi/iconsets/stellar/emoticon_girl.png
Xshare/psi/iconsets/stellar/emoticon_heart.png
Xshare/psi/iconsets/stellar/emoticon_hugleft.png
Xshare/psi/iconsets/stellar/emoticon_hugright.png
Xshare/psi/iconsets/stellar/emoticon_kiss.png
Xshare/psi/iconsets/stellar/emoticon_lamp.png
Xshare/psi/iconsets/stellar/emoticon_mail.png
Xshare/psi/iconsets/stellar/emoticon_music.png
Xshare/psi/iconsets/stellar/emoticon_no.png
Xshare/psi/iconsets/stellar/emoticon_oh.png
Xshare/psi/iconsets/stellar/emoticon_phone.png
Xshare/psi/iconsets/stellar/emoticon_photo.png
Xshare/psi/iconsets/stellar/emoticon_pussy.png
Xshare/psi/iconsets/stellar/emoticon_rainbow.png
Xshare/psi/iconsets/stellar/emoticon_smile.png
Xshare/psi/iconsets/stellar/emoticon_star.png
Xshare/psi/iconsets/stellar/emoticon_stare.png
Xshare/psi/iconsets/stellar/emoticon_tongue.png
Xshare/psi/iconsets/stellar/emoticon_unhappy.png
Xshare/psi/iconsets/stellar/emoticon_wink.png
Xshare/psi/iconsets/stellar/emoticon_yes.png
Xshare/psi/iconsets/stellar/groupchat.png
Xshare/psi/iconsets/stellar/groupclose.png
Xshare/psi/iconsets/stellar/groupempty.png
Xshare/psi/iconsets/stellar/groupopen.png
Xshare/psi/iconsets/stellar/headline.png
Xshare/psi/iconsets/stellar/history.png
Xshare/psi/iconsets/stellar/info.png
Xshare/psi/iconsets/stellar/message.png
Xshare/psi/iconsets/stellar/noauth.png
Xshare/psi/iconsets/stellar/offline.png
Xshare/psi/iconsets/stellar/online.png
Xshare/psi/iconsets/stellar/perr.png
Xshare/psi/iconsets/stellar/psimain.png
Xshare/psi/iconsets/stellar/remove.png
Xshare/psi/iconsets/stellar/send.png
Xshare/psi/iconsets/stellar/ssl_no.png
Xshare/psi/iconsets/stellar/ssl_yes.png
Xshare/psi/iconsets/stellar/system.png
Xshare/psi/iconsets/stellar/url.png
Xshare/psi/iconsets/stellar/xa.png
Xshare/psi/image/aim_away.png
Xshare/psi/image/aim_dnd.png
Xshare/psi/image/aim_offline.png
Xshare/psi/image/aim_online.png
Xshare/psi/image/aim_xa.png
Xshare/psi/image/find.png
Xshare/psi/image/icon_16.png
Xshare/psi/image/icon_32.png
Xshare/psi/image/icon_48.png
Xshare/psi/image/icon_mac.png
Xshare/psi/image/icq_away.png
Xshare/psi/image/icq_dnd.png
Xshare/psi/image/icq_offline.png
Xshare/psi/image/icq_online.png
Xshare/psi/image/icq_xa.png
Xshare/psi/image/msn_away.png
Xshare/psi/image/msn_dnd.png
Xshare/psi/image/msn_offline.png
Xshare/psi/image/msn_online.png
Xshare/psi/image/msn_xa.png
Xshare/psi/image/psilogo.png
Xshare/psi/image/smile.png
Xshare/psi/image/trans_away.png
Xshare/psi/image/trans_dnd.png
Xshare/psi/image/trans_offline.png
Xshare/psi/image/trans_online.png
Xshare/psi/image/trans_xa.png
Xshare/psi/image/yahoo_away.png
Xshare/psi/image/yahoo_dnd.png
Xshare/psi/image/yahoo_offline.png
Xshare/psi/image/yahoo_online.png
Xshare/psi/image/yahoo_xa.png
Xshare/psi/sound/chat1.wav
Xshare/psi/sound/chat2.wav
Xshare/psi/sound/offline.wav
Xshare/psi/sound/online.wav
Xshare/psi/sound/send.wav
X@dirrm share/psi/sound
X@dirrm share/psi/image
X@dirrm share/psi/iconsets/stellar
X@dirrm share/psi/iconsets/lightbulb
X@dirrm share/psi/iconsets
X@dirrm share/psi/certs
X@dirrm share/psi
END-of-psi/pkg-plist
exit

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->dd 
Responsible-Changed-By: dd 
Responsible-Changed-When: Sun Nov 10 02:41:56 PST 2002 
Responsible-Changed-Why:  
I have this ready to commit, just waiting for the tree to thaw. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44874 
State-Changed-From-To: open->closed 
State-Changed-By: dd 
State-Changed-When: Sun Nov 10 09:15:03 PST 2002 
State-Changed-Why:  
Committed, thanks.  In the future, please submit diffs against the old 
port for updates--shar archives are for new ports only.  Also, please 
explicitly list exactly which patches need to be removed and added; 
"patches are all different" is workable, but less convenient (and easy 
to miss in the text of the PR). 

Thanks again. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44874 
>Unformatted:
