Date: Wed, 18 Jun 2003 02:57:54 +0200 (CEST) From: Herbert <herbert@bugat.freebsd2.rocks> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53431: Patch updates psi from version 0.8.7 to 0.9 Message-ID: <20030618005754.937B21FAE@freebsd2.rocks> Resent-Message-ID: <200306180110.h5I1A3rl054049@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53431
>Category: ports
>Synopsis: Patch updates psi from version 0.8.7 to 0.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 17 18:10:02 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Herbert
>Release: FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freebsd2.rocks 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Fri Jun 13 01:10:38 CEST 2003 herbert@freebsd2.rocks:/usr/obj/usr/src/sys/PC1 i386
Description:
This patch updates psi version 0.8.7 to version 0.9.
The configure script exits if you use a configure argument it doesn't
know of (e.g. --with-qt-includes=..., set by USE_QT_VER=3):
*) show_usage; exit ;;
So i changed that line to *) shift ;; to ignore the configure
arguments set by USE_QT_VER=3.
patch-src::psi.pro is removed.
Dirty?
>Description:
>How-To-Repeat:
>Fix:
diff -ruN psi.bak/Makefile psi/Makefile
--- psi.bak/Makefile Wed Jun 18 01:57:35 2003
+++ psi/Makefile Wed Jun 18 02:33: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}
@@ -21,10 +21,8 @@
USE_BZIP2= yes
USE_QT_VER= 3
CONFIGURE_ENV= QTDIR=${X11BASE}
-CONFIGURE_ARGS= -p ${PREFIX}
+CONFIGURE_ARGS= -p ${PREFIX} -q ${QTDIR}
MAKE_ARGS+= QTDIR=${X11BASE} \
CFLAGS="-pipe -pthread -D_THREAD_SAFE -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
-BUILD_WRKSRC= ${WRKSRC}/src
-INSTALL_WRKSRC= ${WRKSRC}/src
.include <bsd.port.mk>
diff -ruN psi.bak/distinfo psi/distinfo
--- psi.bak/distinfo Wed Jun 18 01:57:35 2003
+++ psi/distinfo Wed Jun 18 01:58:54 2003
@@ -1 +1 @@
-MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86
+MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
diff -ruN psi.bak/files/patch-configure psi/files/patch-configure
--- psi.bak/files/patch-configure Wed Jun 18 01:57:35 2003
+++ psi/files/patch-configure Wed Jun 18 02:32:13 2003
@@ -1,16 +1,11 @@
-$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 @@
+--- configure.orig Wed Jun 18 02:31:35 2003
++++ configure Wed Jun 18 02:31:47 2003
+@@ -86,7 +86,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
+ -h|--help) show_usage; exit ;;
+- *) show_usage; exit ;;
++ *) shift ;;
+ esac
+ done
diff -ruN psi.bak/files/patch-src::psi.pro psi/files/patch-src::psi.pro
--- psi.bak/files/patch-src::psi.pro Wed Jun 18 01:57:35 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.bak/pkg-plist psi/pkg-plist
--- psi.bak/pkg-plist Wed Jun 18 01:57:35 2003
+++ psi/pkg-plist Wed Jun 18 02:32:33 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?20030618005754.937B21FAE>