kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.15

Browse source 
make D-Bus support optional [1]
Respect CC, CFLAGS via QMAKEFLAGS

PR:		ports/172406 [1]
Submitted by:	amdmi3
This commit is contained in:
Max Brazhnikov 2012-10-09 23:02:10 +00:00
parent 09cbb54789
commit 07629c4ff2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=305619
3 changed files with 47 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net-im/psi/Makefile
View file

@ -1,13 +1,8 @@
# New ports collection makefile for: psi # Created by: Jonathan Chen <jonc@chen.org.nz>
# Date created: Wed May 1 20:27:23 NZST 2002
# Whom: jonc@chen.org.nz
#
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= psi PORTNAME= psi
PORTVERSION= 0.14 PORTVERSION= 0.15
PORTREVISION= 3
CATEGORIES= net-im CATEGORIES= net-im
MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/Psi/${PORTVERSION}
@ -19,19 +14,20 @@ RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
USE_BZIP2= yes USE_BZIP2= yes
USE_QT4= corelib dbus gui iconengines imageformats qt3support \ USE_PKGCONFIG= build
inputmethods network script svg xml \ USE_QT4= gui network xml imageformats_run \
qmake_build moc_build rcc_build uic_build qmake_build moc_build rcc_build uic_build
USE_XORG= xscrnsaver
CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \
--disable-growl --disable-bundled-qca \ --disable-growl --verbose
--verbose CONFIGURE_ENV= QMAKEFLAGS='${QMAKEFLAGS}'
MAKE_JOBS_SAFE= yes
MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= ASPELL ENCHANT DBUS
OPTIONS_DEFAULT= ASPELL DBUS
OPTIONS_DEFINE= ASPELL ENCHANT
OPTIONS_DEFAULT= ASPELL
ASPELL_DESC= Use aspell for spell checking ASPELL_DESC= Use aspell for spell checking
ENCHANT_DESC= Use Enchant for spell checking ENCHANT_DESC= Use Enchant for spell checking
@ -46,6 +42,12 @@ CONFIGURE_ARGS+= --release --no-separate-debug-info
PLIST_SUB+= DEBUG="@comment " PLIST_SUB+= DEBUG="@comment "
.endif .endif
.if ${PORT_OPTIONS:MDBUS}
USE_QT4+= dbus
.else
CONFIGURE_ARGS+= --disable-qdbus
.endif
.if ${PORT_OPTIONS:MASPELL} .if ${PORT_OPTIONS:MASPELL}
LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \

4
net-im/psi/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (psi-0.14.tar.bz2) = aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA256 (psi-0.15.tar.bz2) = 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6
SIZE (psi-0.14.tar.bz2) = 2168801 SIZE (psi-0.15.tar.bz2) = 1984777

39
net-im/psi/files/patch-configure
View file

@ -1,11 +1,28 @@
--- configure.orig Sun Jan 8 05:19:01 2006 --- ./configure.orig 2012-10-04 00:53:03.000000000 +0000
+++ configure Sat Feb 4 14:06:18 2006 +++ ./configure 2012-10-06 22:30:21.900714143 +0000
@@ -192,6 +192,8 @@ @@ -100,7 +100,7 @@
shift # find a make command
;; if [ -z "$MAKE" ]; then
--help) show_usage; exit ;; MAKE=
+ --with-*) - for mk in gmake make; do
+ shift ;; + for mk in make gmake; do
*) show_usage; exit ;; if $WHICH $mk >/dev/null 2>&1; then
esac MAKE=`$WHICH $mk`
done break
@@ -2186,7 +2186,7 @@
QDir::setCurrent(dir.path());
bool ok = false;
- int r = doCommand(qmake_path, QStringList() << "atest.pro");
+ int r = doCommand(qmake_path, QStringList() << qc_getenv("QMAKEFLAGS") << "atest.pro");
if(r == 0)
{
r = doCommand(maketool, QStringList());
@@ -2587,6 +2587,7 @@
args += "-spec";
args += qmakespec;
}
+ args += qc_getenv("QMAKEFLAGS");
args += proPath;
int ret = qc_runprogram(qmake_path, args, 0, true);
if(ret != 0)