ports/74016: [UPDATE] security/qca-tls: get rid of 'expr' in configure script

[Eugene at badger.home]

>Number:         74016
>Category:       ports
>Synopsis:       [UPDATE] security/qca-tls: get rid of 'expr' in configure script
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 16 21:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Eugene Ossintsev
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD badger.home 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Tue Nov 9 22:34:36 CET 2004 root@:/usr/obj/usr/src/sys/BADGER i386
>Description:
The configure script does not work correctly on FreeBSD 5.x because of the
changed behaviour of 'expr' from 4.x to 5.x. I have made the same changes
here that were earlier applied by me to the net/psi configure script (and
then were accepted by the author of net/psi). qca-tls is of the same
author. So, I am going to ask him to include these changes into the next
version of qca-tls, too.

GNU make dependency has been also removed since the deleted line 'export
QTDIR', which caused incompatibility with BSD make, is useless in our case
as we set QTDIR ourselves in the port Makefile.
>How-To-Repeat:
	
>Fix:
diff -ruN qca-tls.orig/Makefile qca-tls/Makefile
--- qca-tls.orig/Makefile	Tue Nov 16 12:42:03 2004
+++ qca-tls/Makefile	Tue Nov 16 12:38:14 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	qca-tls
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://psi.affinix.com/beta/
 
@@ -19,7 +19,6 @@
 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_QT_VER=	3
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff -ruN qca-tls.orig/files/patch-configure qca-tls/files/patch-configure
--- qca-tls.orig/files/patch-configure	Tue Nov 16 12:42:03 2004
+++ qca-tls/files/patch-configure	Tue Nov 16 12:34:04 2004
@@ -1,5 +1,26 @@
---- configure.orig	Thu Dec 18 01:54:50 2003
-+++ configure	Tue Jan 27 14:58:26 2004
+--- configure.orig	Wed Dec 17 23:54:50 2003
++++ configure	Tue Nov 16 12:33:52 2004
+@@ -20,17 +20,17 @@
+ while [ $# -gt 0 ]; do
+ 	case "$1" in
+ 		--qtdir=*)
+-			QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
++			QTDIR="${1#--qtdir=}"
+ 			shift
+ 			;;
+ 
+ 		--with-openssl-inc=*)
+-			QC_WITH_OPENSSL_INC=`expr "${1}" : "--with-openssl-inc=\(.*\)"`
++			QC_WITH_OPENSSL_INC="${1#--with-openssl-inc=}"
+ 			shift
+ 			;;
+ 
+ 		--with-openssl-lib=*)
+-			QC_WITH_OPENSSL_LIB=`expr "${1}" : "--with-openssl-lib=\(.*\)"`
++			QC_WITH_OPENSSL_LIB="${1#--with-openssl-lib=}"
+ 			shift
+ 			;;
+ 
 @@ -43,6 +43,8 @@
  	esac
  done
@@ -27,3 +48,17 @@
  			lib = s;
  		}
  		else {
+@@ -570,13 +570,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: