Date: Fri, 11 Jun 2004 19:33:50 +0200 (CEST) From: Eugene@badger.home, Ossintsev@badger.home To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67840: net/psi: update to version 0.9.2 Message-ID: <20040611173350.50C522069@badger.home> Resent-Message-ID: <200406111740.i5BHeQ7Q024342@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67840
>Category: ports
>Synopsis: net/psi: update to version 0.9.2
>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: Fri Jun 11 17:40:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Eugene Ossintsev
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD badger.home 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jun 5 12:30:33 CEST 2004 root@badger.home:/usr/obj/usr/src/sys/BADGER i386
>Description:
Update net/psi to version 0.9.2 .
>How-To-Repeat:
>Fix:
diff -ruN psi.orig/Makefile psi/Makefile
--- psi.orig/Makefile Fri Mar 26 14:55:20 2004
+++ psi/Makefile Fri Jun 11 13:33:41 2004
@@ -6,8 +6,7 @@
#
PORTNAME= psi
-PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTVERSION= 0.9.2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN psi.orig/distinfo psi/distinfo
--- psi.orig/distinfo Fri Mar 26 14:55:20 2004
+++ psi/distinfo Fri Jun 11 13:34:50 2004
@@ -1,2 +1,2 @@
-MD5 (psi-0.9.1.tar.bz2) = 7057b61518e1b1ebd732a95c265a3b76
-SIZE (psi-0.9.1.tar.bz2) = 930227
+MD5 (psi-0.9.2.tar.bz2) = e29f90aea7d839f2a70e4a6e77e95a70
+SIZE (psi-0.9.2.tar.bz2) = 1154392
diff -ruN psi.orig/files/patch-configure psi/files/patch-configure
--- psi.orig/files/patch-configure Fri Mar 26 14:55:20 2004
+++ psi/files/patch-configure Fri Jun 11 14:27:55 2004
@@ -1,50 +1,11 @@
$FreeBSD: ports/net/psi/files/patch-configure,v 1.5 2004/01/11 17:38:02 petef Exp $
-Hack configure to eat autogenerated qt options, to fix a bashism (type -p),
-to avoid using expr, and to do the main Makefile make(1) compatible.
+Hack configure to eat autogenerated qt options
+and to do the main Makefile make(1) compatible.
---- configure.orig Wed Dec 10 01:10:03 2003
-+++ configure Sat Jan 10 15:52:00 2004
-@@ -27,32 +27,32 @@
- while [ $# -gt 0 ]; do
- case "$1" in
- --prefix=*)
-- PREFIX=`expr "${1}" : "--prefix=\(.*\)"`
-+ PREFIX="${1#--prefix=}"
- shift
- ;;
-
- --bindir=*)
-- BINDIR=`expr "${1}" : "--bindir=\(.*\)"`
-+ BINDIR="${1#--bindir=}"
- shift
- ;;
-
- --libdir=*)
-- LIBDIR=`expr "${1}" : "--libdir=\(.*\)"`
-+ LIBDIR="${1#--libdir=}"
- shift
- ;;
-
- --qtdir=*)
-- QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
-+ QTDIR="${1#--qtdir=}"
- shift
- ;;
-
- --with-zlib-inc=*)
-- QC_WITH_ZLIB_INC=`expr "${1}" : "--with-zlib-inc=\(.*\)"`
-+ QC_WITH_ZLIB_INC="${1#--with-zlib-inc=}"
- shift
- ;;
-
- --with-zlib-lib=*)
-- QC_WITH_ZLIB_LIB=`expr "${1}" : "--with-zlib-lib=\(.*\)"`
-+ QC_WITH_ZLIB_LIB="${1#--with-zlib-lib=}"
- shift
- ;;
-
-@@ -81,6 +81,8 @@
+--- configure.orig Fri Jun 11 13:49:06 2004
++++ configure Fri Jun 11 14:25:01 2004
+@@ -82,6 +82,8 @@
shift
;;
--help) show_usage; exit ;;
@@ -53,21 +14,13 @@
*) show_usage; exit ;;
esac
done
-@@ -136,7 +138,7 @@
- echo Warning: qmake not in \$QTDIR/bin/qmake
- echo trying to find it in \$PATH
- fi
-- qm=`type -p qmake`
-+ qm=`which qmake`
- if [ -x "$qm" ]; then
- if [ "$QC_DEBUG" = "Y" ]; then
- echo qmake found in $qm
-@@ -917,13 +919,6 @@
+@@ -1035,14 +1037,6 @@
echo
exit 1;
fi
-cat >Makefile.tmp <<EOT
-export QTDIR = $QTDIR
+-export PATH = $QTDIR/bin:$PATH
-EOT
-cat Makefile >> Makefile.tmp
-rm -f Makefile
diff -ruN psi.orig/pkg-plist psi/pkg-plist
--- psi.orig/pkg-plist Fri Mar 26 14:55:20 2004
+++ psi/pkg-plist Fri Jun 11 17:15:57 2004
@@ -3,6 +3,7 @@
share/psi/README
share/psi/certs/README
share/psi/certs/rootcert.xml
+share/psi/designer/libpsiwidgets.so
share/psi/iconsets/emoticons/README
share/psi/iconsets/emoticons/default/angry.png
share/psi/iconsets/emoticons/default/bat.png
@@ -55,6 +56,7 @@
share/psi/iconsets/roster/default/connect.png
share/psi/iconsets/roster/default/dnd.png
share/psi/iconsets/roster/default/ffc.png
+share/psi/iconsets/roster/default/file.png
share/psi/iconsets/roster/default/groupclose.png
share/psi/iconsets/roster/default/groupempty.png
share/psi/iconsets/roster/default/groupopen.png
@@ -141,6 +143,7 @@
share/psi/iconsets/system/default/chatclear.png
share/psi/iconsets/system/default/close.png
share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/download.png
share/psi/iconsets/system/default/edit.png
share/psi/iconsets/system/default/editclear.png
share/psi/iconsets/system/default/editcopy.png
@@ -148,6 +151,8 @@
share/psi/iconsets/system/default/editdelete.png
share/psi/iconsets/system/default/editpaste.png
share/psi/iconsets/system/default/edittrash.png
+share/psi/iconsets/system/default/eye_blue.png
+share/psi/iconsets/system/default/filemanager.png
share/psi/iconsets/system/default/groupchat.png
share/psi/iconsets/system/default/help.png
share/psi/iconsets/system/default/history.png
@@ -181,11 +186,14 @@
share/psi/iconsets/system/default/stop.png
share/psi/iconsets/system/default/time.png
share/psi/iconsets/system/default/tip.png
+share/psi/iconsets/system/default/upload.png
share/psi/iconsets/system/default/url.png
share/psi/iconsets/system/default/vcard.png
share/psi/iconsets/system/default/xml.png
share/psi/sound/chat1.wav
share/psi/sound/chat2.wav
+share/psi/sound/ft_complete.wav
+share/psi/sound/ft_incoming.wav
share/psi/sound/offline.wav
share/psi/sound/online.wav
share/psi/sound/send.wav
@@ -206,5 +214,6 @@
@dirrm share/psi/iconsets/emoticons/default
@dirrm share/psi/iconsets/emoticons
@dirrm share/psi/iconsets
+@dirrm share/psi/designer
@dirrm share/psi/certs
@dirrm share/psi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040611173350.50C522069>