Date: Sat, 6 Oct 2012 20:17:51 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: makc@FreeBSD.org Subject: ports/172406: [PATCH] net-im/psi: update to 0.15 Message-ID: <20121006161751.7F6DB5C9@hades.panopticon> Resent-Message-ID: <201210061620.q96GK9QW071520@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172406
>Category: ports
>Synopsis: [PATCH] net-im/psi: update to 0.15
>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: Sat Oct 06 16:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Wed Jun 13 17:39:20 MSK 2012
>Description:
- Update to 0.15
These seem to be no other way to make psi respect systemwide compiler settings than to use qmake wrapper script, so it's done that way.
Added file(s):
- files/qmake-wrapper.sh
Removed file(s):
- files/patch-configure
- files/patch-iris__src__libbase.pri
Port maintainer (makc@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- psi-0.15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-im/psi/Makefile ./Makefile
--- /usr/ports/net-im/psi/Makefile 2012-07-27 15:03:38.000000000 +0400
+++ ./Makefile 2012-10-06 03:48:23.143698388 +0400
@@ -2,12 +2,11 @@
# Date created: Wed May 1 20:27:23 NZST 2002
# Whom: jonc@chen.org.nz
#
-# $FreeBSD: ports/net-im/psi/Makefile,v 1.56 2012/07/27 11:03:38 makc Exp $
+# $FreeBSD: head/net-im/psi/Makefile 301600 2012-07-27 11:03:38Z makc $
#
PORTNAME= psi
-PORTVERSION= 0.14
-PORTREVISION= 3
+PORTVERSION= 0.15
CATEGORIES= net-im
MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION}
@@ -20,17 +19,18 @@
HAS_CONFIGURE= yes
USE_BZIP2= yes
-USE_QT4= corelib dbus gui iconengines imageformats qt3support \
+USE_QT4= corelib gui iconengines imageformats \
inputmethods network script svg xml \
qmake_build moc_build rcc_build uic_build
+QT_NONSTANDARD= yes
+USE_GMAKE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \
- --disable-growl --disable-bundled-qca \
- --verbose
+ --disable-growl --verbose
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_SAFE= yes
-OPTIONS_DEFINE= ASPELL ENCHANT
+OPTIONS_DEFINE= ASPELL ENCHANT DBUS
OPTIONS_DEFAULT= ASPELL
ASPELL_DESC= Use aspell for spell checking
@@ -60,6 +60,18 @@
CONFIGURE_ARGS+= --disable-enchant
.endif
+.if ${PORT_OPTIONS:MDBUS}
+USE_QT4+= dbus
+.else
+CONFIGURE_ARGS+= --disable-qdbus
+.endif
+
+post-patch:
+ @${INSTALL_SCRIPT} ${FILESDIR}/qmake-wrapper.sh ${WRKDIR}
+ @${REINPLACE_CMD} -e 's|%%QMAKE%%|${QMAKE}|; s|%%QMAKEFLAGS%%|${QMAKEFLAGS}|' \
+ ${WRKDIR}/qmake-wrapper.sh
+ @${REINPLACE_CMD} -e 's|qm=""|qm="${WRKDIR}/qmake-wrapper.sh"|' ${WRKSRC}/configure
+
post-install:
${STRIP_CMD} ${PREFIX}/bin/psi
diff -ruN --exclude=CVS /usr/ports/net-im/psi/distinfo ./distinfo
--- /usr/ports/net-im/psi/distinfo 2011-03-20 15:53:36.000000000 +0300
+++ ./distinfo 2012-10-06 02:44:42.364051591 +0400
@@ -1,2 +1,2 @@
-SHA256 (psi-0.14.tar.bz2) = aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
-SIZE (psi-0.14.tar.bz2) = 2168801
+SHA256 (psi-0.15.tar.bz2) = 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6
+SIZE (psi-0.15.tar.bz2) = 1984777
diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-configure ./files/patch-configure
--- /usr/ports/net-im/psi/files/patch-configure 2008-07-11 03:27:03.000000000 +0400
+++ ./files/patch-configure 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- configure.orig Sun Jan 8 05:19:01 2006
-+++ configure Sat Feb 4 14:06:18 2006
-@@ -192,6 +192,8 @@
- shift
- ;;
- --help) show_usage; exit ;;
-+ --with-*)
-+ shift ;;
- *) show_usage; exit ;;
- esac
- done
diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/patch-iris__src__libbase.pri ./files/patch-iris__src__libbase.pri
--- /usr/ports/net-im/psi/files/patch-iris__src__libbase.pri 2009-08-10 21:20:04.000000000 +0400
+++ ./files/patch-iris__src__libbase.pri 1970-01-01 03:00:00.000000000 +0300
@@ -1,8 +0,0 @@
---- ./iris/src/libbase.pri.orig 2009-07-27 01:02:12.000000000 +0400
-+++ ./iris/src/libbase.pri 2009-08-10 13:57:28.000000000 +0400
-@@ -5,4 +5,4 @@
-
- include(../common.pri)
-
--QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
-+#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
diff -ruN --exclude=CVS /usr/ports/net-im/psi/files/qmake-wrapper.sh ./files/qmake-wrapper.sh
--- /usr/ports/net-im/psi/files/qmake-wrapper.sh 1970-01-01 03:00:00.000000000 +0300
+++ ./files/qmake-wrapper.sh 2012-10-06 03:44:07.349617831 +0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# There seem to be no other (simple) way to make Psi build system
+# respect QMAKEFLAGS, so inject them via this qmake wrapper script.
+
+if ! echo "$@" | grep -q -- -prl; then
+ exec %%QMAKE%% %%QMAKEFLAGS%% "$@"
+else
+ exec %%QMAKE%% "$@"
+fi
--- psi-0.15.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121006161751.7F6DB5C9>