ports/53791: Can't pass CPPFLAGS to configure when WITH_QT_VER setted (patch)

[Sergey Matveychuk]

>Number:         53791
>Category:       ports
>Synopsis:       Can't pass CPPFLAGS to configure when WITH_QT_VER setted (patch)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 26 11:20:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD sem-home.ciam.ru 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Wed Jun 11 02:03:37 MSD 2003 root at sem-home.ciam.ru:/usr/src/sys/i386/compile/SEM-HOME i386


	
>Description:
	
	My port can build WITH_QT or without it. Also I pass CPPFLAGS
	to 'configure' by CONFIGURE_ENV. When I don't set WITH_QT
	all goes right, when I don't set it I loss CPPFLAGS in
	'configure'. It's happened because these lines in bsd.kde.mk:

        CONFIGURE_ENV+=	CPPFLAGS="${QTCPPFLAGS}"

	that overrides my CPPFLAGS settings.
	The followed patch fix it. I think it's unpainful for other KDE
	stuff.

	It's important for my port. So let me know if it's possible
	to commit it soon, please.

>How-To-Repeat:
	
>Fix:

	


--- bsd.kde.mk.orig	Thu Jun 26 21:17:13 2003
+++ bsd.kde.mk	Thu Jun 26 21:20:36 2003
@@ -110,8 +110,9 @@
 .if !defined (QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
 				--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-				QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
+				LIBS="${QTCFGLIBS}" QTDIR="${QT_CVS_PREFIX}" \
+				KDEDIR="${KDE_CVS_PREFIX}"
 .endif
 
 .elif ${USE_QT_VER} == 3
@@ -139,7 +140,8 @@
 CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
 				--with-qt-libraries=${QT_PREFIX}/lib \
 				--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
+			    LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .else # QT2
@@ -159,7 +161,7 @@
 				--with-qt-libraries=${X11BASE}/lib \
 				--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
-				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+				CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
 .endif # !defined(QT_NONSTANDARD)
 
 .endif # USE_QT_VER == ???
>Release-Note:
>Audit-Trail:
>Unformatted: