From herbert@TK212017121218.teleweb.at  Fri Jun 20 15:53:43 2003
Return-Path: <herbert@TK212017121218.teleweb.at>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 386FC37B401
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 20 Jun 2003 15:53:43 -0700 (PDT)
Received: from TK212017121218.teleweb.at (TK212017121218.teleweb.at [212.17.121.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5A70B43FB1
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 20 Jun 2003 15:53:42 -0700 (PDT)
	(envelope-from herbert@TK212017121218.teleweb.at)
Message-Id: <20030620225331.GB46585@TK212017121218.teleweb.at>
Date: Sat, 21 Jun 2003 00:53:31 +0200
From: Herbert <herbert@bugat.at>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Re: Patch updates psi from version 0.8.7 to 0.9

>Number:         53568
>Category:       ports
>Synopsis:       Re: Patch updates psi from version 0.8.7 to 0.9
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ceri
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 20 16:00:29 PDT 2003
>Closed-Date:    Mon Jun 23 11:54:48 PDT 2003
>Last-Modified:  Mon Jun 23 11:54:48 PDT 2003
>Originator:     Herbert
>Release:        
>Organization:
>Environment:
>Description:
 Sorry, the previous patch was crap!
 This one is working! ;-)
 Thanks arverd.
 
 
 ------[ patch ] ------
 
 diff -ruN psi.orig/Makefile psi/Makefile
 --- psi.orig/Makefile	Sat Jun 21 00:17:59 2003
 +++ psi/Makefile	Sat Jun 21 00:18:31 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}
 @@ -16,15 +16,21 @@
  
  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
 +		CFLAGS="${PTHREAD_CFLAGS} -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
 +
 +do-configure:
 +	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
 +		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ psi.pro
 +
 +do-install:
 +	${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin
 +	@${MKDIR} ${DATADIR}
 +.for dir in certs iconsets image sound
 +	@${TAR} -C ${WRKSRC} -cf  - ${dir} | \
 +		${TAR} -C ${DATADIR} --unlink -xf -
 +.endfor
  
  .include <bsd.port.mk>
 diff -ruN psi.orig/distinfo psi/distinfo
 --- psi.orig/distinfo	Sat Jun 21 00:17:59 2003
 +++ psi/distinfo	Sat Jun 21 00:18:31 2003
 @@ -1 +1 @@
 -MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86
 +MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
 diff -ruN psi.orig/files/patch-configure psi/files/patch-configure
 --- psi.orig/files/patch-configure	Sat Jun 21 00:17:59 2003
 +++ psi/files/patch-configure	Thu Jan  1 01:00:00 1970
 @@ -1,16 +0,0 @@
 -$FreeBSD: ports/net/psi/files/patch-configure,v 1.1 2002/11/10 17:12:28 dd Exp $
 -
 -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
 - 
 diff -ruN psi.orig/files/patch-psi_pro psi/files/patch-psi_pro
 --- psi.orig/files/patch-psi_pro	Thu Jan  1 01:00:00 1970
 +++ psi/files/patch-psi_pro	Sat Jun 21 00:32:34 2003
 @@ -0,0 +1,10 @@
 +--- psi.pro.orig	Fri Jun 20 23:48:22 2003
 ++++ psi.pro	Fri Jun 20 23:49:02 2003
 +@@ -172,6 +172,7 @@
 + # Platform specifics
 + unix:!mac {
 + 	include(configure.pri)
 ++	LIBS += -lXss
 + }
 + win32: {
 + 	RC_FILE = win32/psi_win32.rc
 diff -ruN psi.orig/files/patch-src::psi.pro psi/files/patch-src::psi.pro
 --- psi.orig/files/patch-src::psi.pro	Sat Jun 21 00:17:59 2003
 +++ psi/files/patch-src::psi.pro	Thu Jan  1 01:00:00 1970
 @@ -1,14 +0,0 @@
 -$FreeBSD: ports/net/psi/files/patch-src::psi.pro,v 1.1 2002/11/10 17:12:28 dd Exp $
 -
 -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 )
 - }
 - 
 diff -ruN psi.orig/pkg-plist psi/pkg-plist
 --- psi.orig/pkg-plist	Sat Jun 21 00:17:59 2003
 +++ psi/pkg-plist	Sat Jun 21 00:18:31 2003
 @@ -1,9 +1,6 @@
  bin/psi
 -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 +15,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 +69,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 +117,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
 
 ------ [end ] ------
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ceri 
State-Changed-When: Mon Jun 23 11:54:15 PDT 2003 
State-Changed-Why:  
Misfiled followup to ports/53431 [content migrated]. 


Responsible-Changed-From-To: gnats-admin->ceri 
Responsible-Changed-By: ceri 
Responsible-Changed-When: Mon Jun 23 11:54:15 PDT 2003 
Responsible-Changed-Why:  

Take from gnats-admin. 

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