Date: Sat, 10 Jan 2004 16:56:18 +0100 (CET) From: Eugene Ossintsev <eugos@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@FreeBSD.org Subject: ports/61175: net/psi: fixes for 5-CURRENT (changed behaviour of 'expr') (supersedes ports/60881, ports/61139) Message-ID: <20040110155618.5A157203@badger.home> Resent-Message-ID: <200401101600.i0AG0cxv040811@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61175
>Category: ports
>Synopsis: net/psi: fixes for 5-CURRENT (changed behaviour of 'expr') (supersedes ports/60881, ports/61139)
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 10 08:00:37 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Eugene Ossintsev
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD badger.home 4.9-STABLE FreeBSD 4.9-STABLE #5: Sat Jan 3 23:47:24 CET 2004 root@badger.home:/usr/obj/usr/src/sys/BADGER i386
>Description:
Fixed the configure script in order not to depend on GNU make.
Added some fixes for 5-CURRENT (because of the changed behaviour of
'expr'). Lots of thanks to the following people for their help:
Munish Chopra <chopra@soulwax.net>
Valentin A. Alekseev <valeks@novel-il.ru>
>How-To-Repeat:
>Fix:
diff -ruN psi.orig/Makefile psi/Makefile
--- psi.orig/Makefile Fri Jan 9 21:05:50 2004
+++ psi/Makefile Sat Jan 10 16:10:56 2004
@@ -7,6 +7,7 @@
PORTNAME= psi
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,11 +18,9 @@
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
-USE_GMAKE= yes
USE_QT_VER= 3
-CONFIGURE_ENV= QTDIR=${X11BASE} \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} --disable-kde
MAKE_ARGS+= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff -ruN psi.orig/files/patch-configure psi/files/patch-configure
--- psi.orig/files/patch-configure Wed Jan 7 18:11:52 2004
+++ psi/files/patch-configure Sat Jan 10 16:06:13 2004
@@ -1,9 +1,49 @@
-$FreeBSD: ports/net/psi/files/patch-configure,v 1.4 2004/01/07 13:54:13 demon Exp $
+$FreeBSD$
-Hack configure to eat autogenerated qt options and to fix a bashism (type -p).
+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.
---- configure.orig Wed Dec 10 03:10:03 2003
-+++ configure Wed Jan 7 16:30:11 2004
+--- 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 @@
shift
;;
@@ -22,3 +62,17 @@
if [ -x "$qm" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
echo qmake found in $qm
+@@ -917,13 +919,6 @@
+ echo
+ exit 1;
+ fi
+-cat >Makefile.tmp <<EOT
+-export QTDIR = $QTDIR
+-EOT
+-cat Makefile >> Makefile.tmp
+-rm -f Makefile
+-cp -f Makefile.tmp Makefile
+-rm -f Makefile.tmp
+
+ echo
+ echo Good, your configure finished. Now run \'make\'.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040110155618.5A157203>