Hi.
This diff add "PORTHOME=${WRKDIST}" to qt3.port.mk and qt4.port.mk.
It also removes all PORTHOME variables from ports that have
MODULES=x11/qt{3,4} or MODULES=x11/kde (since the latest also includes
x11/qt3).
I think it could be a nice cleanup as all qt based ports can benefit
from this without adding the same variable again and again.
Thoughs? Comments? Ok?
--
Antoine
Index: cad/klogic/Makefile
===================================================================
RCS file: /cvs/ports/cad/klogic/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- cad/klogic/Makefile 18 Sep 2006 11:40:07 -0000 1.11
+++ cad/klogic/Makefile 12 Jan 2007 08:21:02 -0000
@@ -22,8 +22,6 @@
MODULES= x11/kde
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: editors/kxmleditor/Makefile
===================================================================
RCS file: /cvs/ports/editors/kxmleditor/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- editors/kxmleditor/Makefile 18 Sep 2006 11:50:40 -0000 1.27
+++ editors/kxmleditor/Makefile 12 Jan 2007 08:21:39 -0000
@@ -29,8 +29,6 @@
MODULES= x11/kde
MODKDE_VERSION= 3.1
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: games/taxipilot/Makefile
===================================================================
RCS file: /cvs/ports/games/taxipilot/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- games/taxipilot/Makefile 18 Sep 2006 11:50:40 -0000 1.11
+++ games/taxipilot/Makefile 12 Jan 2007 08:21:48 -0000
@@ -25,8 +25,6 @@
MODULES= x11/qt3
MODQT_MT= Yes
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= ${CONFIGURE_ENV}
# Ensure Qt3 will always be at the front
MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
Index: graphics/gwenview/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gwenview/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- graphics/gwenview/Makefile 18 Dec 2006 17:05:49 -0000 1.34
+++ graphics/gwenview/Makefile 12 Jan 2007 08:21:52 -0000
@@ -27,8 +27,6 @@
MODULES= x11/kde
MODKDE_VERSION= 3.5.3
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: graphics/gwenview-i18n/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gwenview-i18n/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/gwenview-i18n/Makefile 18 Dec 2006 17:05:49 -0000 1.2
+++ graphics/gwenview-i18n/Makefile 12 Jan 2007 08:21:52 -0000
@@ -22,8 +22,6 @@
MODULES= x11/kde
MODKDE_VERSION= 3.5.3
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: graphics/k3dsurf/Makefile
===================================================================
RCS file: /cvs/ports/graphics/k3dsurf/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- graphics/k3dsurf/Makefile 26 Dec 2006 14:07:10 -0000 1.2
+++ graphics/k3dsurf/Makefile 12 Jan 2007 08:21:52 -0000
@@ -24,8 +24,6 @@
USE_X11= Yes
NO_REGRESS= Yes
-PORTHOME= ${WRKDIR}
-
do-configure:
perl -pi -e "s/!!CXXFLAGS!!/${CXXFLAGS}/" ${WRKSRC}/src/src.pro
cd ${WRKDIST} && ${LOCALBASE}/bin/qmake
Index: misc/ktimeclock/Makefile
===================================================================
RCS file: /cvs/ports/misc/ktimeclock/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- misc/ktimeclock/Makefile 3 Aug 2006 20:04:52 -0000 1.8
+++ misc/ktimeclock/Makefile 12 Jan 2007 08:22:07 -0000
@@ -26,8 +26,6 @@
MODULES= x11/qt3
MODQT_MT= Yes
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
# Ensure qt2 will always be at the front
MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
Index: textproc/xxdiff/Makefile
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- textproc/xxdiff/Makefile 13 Nov 2006 12:51:15 -0000 1.22
+++ textproc/xxdiff/Makefile 12 Jan 2007 08:22:36 -0000
@@ -24,9 +24,6 @@
MAKE_ENV+= UIC=${MODQT_UIC}
-# For qsettings to write its setup
-PORTHOME= ${WRKDIST}
-
USE_X11= Yes
NO_REGRESS= Yes
Index: x11/kde/Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/kde/Makefile.inc,v
retrieving revision 1.36
diff -u -r1.36 Makefile.inc
--- x11/kde/Makefile.inc 3 Jun 2006 12:47:30 -0000 1.36
+++ x11/kde/Makefile.inc 12 Jan 2007 08:22:47 -0000
@@ -34,8 +34,6 @@
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
USE_GMAKE?= Yes
-PORTHOME?=${WRKDIR}
-
CONFIGURE_ENV+= ${MODKDE_CONFIGURE_ENV}
MAKE_ENV= ${CONFIGURE_ENV}
Index: x11/kdirstat/Makefile
===================================================================
RCS file: /cvs/ports/x11/kdirstat/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- x11/kdirstat/Makefile 18 Sep 2006 10:21:49 -0000 1.14
+++ x11/kdirstat/Makefile 12 Jan 2007 08:22:48 -0000
@@ -26,10 +26,6 @@
MODULES= x11/kde
-# catch $HOME/.kde/share/config
-# that meinproc creates during build.
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= ${MODKDE_CONFIGURE_ENV}
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: x11/kmplayer/Makefile
===================================================================
RCS file: /cvs/ports/x11/kmplayer/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- x11/kmplayer/Makefile 11 Nov 2006 18:38:02 -0000 1.7
+++ x11/kmplayer/Makefile 12 Jan 2007 08:22:48 -0000
@@ -21,7 +21,6 @@
AUTOCONF_VERSION= 2.52
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
USE_GMAKE= Yes
-PORTHOME=${WRKDIR}
CONFIGURE_ENV+= ${MODKDE_CONFIGURE_ENV}
MAKE_ENV= ${CONFIGURE_ENV}
Index: x11/kountdown/Makefile
===================================================================
RCS file: /cvs/ports/x11/kountdown/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/kountdown/Makefile 18 Sep 2006 10:21:49 -0000 1.11
+++ x11/kountdown/Makefile 12 Jan 2007 08:22:48 -0000
@@ -27,8 +27,6 @@
MODKDE_VERSION= 3.1
MODULES= x11/kde
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_ENV+= UIC_PATH="${MODQT_UIC}" UIC="${MODQT_UIC}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: x11/qinx/Makefile
===================================================================
RCS file: /cvs/ports/x11/qinx/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11/qinx/Makefile 18 Sep 2006 10:21:49 -0000 1.8
+++ x11/qinx/Makefile 12 Jan 2007 08:22:49 -0000
@@ -27,8 +27,6 @@
MODKDE_VERSION= 3.2
MODULES= x11/kde
-PORTHOME= ${WRKDIR}
-
MAKE_ENV= KDEDIR="${LOCALBASE}"
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
Index: x11/qt3/qt3.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt3/qt3.port.mk,v
retrieving revision 1.7
diff -u -r1.7 qt3.port.mk
--- x11/qt3/qt3.port.mk 20 Nov 2006 20:41:00 -0000 1.7
+++ x11/qt3/qt3.port.mk 12 Jan 2007 08:22:49 -0000
@@ -32,6 +32,9 @@
ERRORS+="Fatal: support QTMT only"
.endif
+# For qsettings to write its setup
+PORTHOME?= ${WRKDIR}
+
CONFIGURE_ENV+= ${_MODQT_SETUP}
MAKE_ENV+= ${_MODQT_SETUP}
MAKE_FLAGS+= ${_MODQT_SETUP}
Index: x11/qt4/qt4.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt4/qt4.port.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 qt4.port.mk
--- x11/qt4/qt4.port.mk 4 Jul 2005 11:10:13 -0000 1.1.1.1
+++ x11/qt4/qt4.port.mk 12 Jan 2007 08:22:49 -0000
@@ -25,6 +25,9 @@
MODQT_UIC= ${LOCALBASE}/bin/uic4
MODQT_QTDIR= ${LOCALBASE}/lib/qt4
+# For qsettings to write its setup
+PORTHOME?= ${WRKDIR}
+
CONFIGURE_ENV+= ${_MODQT_SETUP}
MAKE_ENV+= ${_MODQT_SETUP}
MAKE_FLAGS+= ${_MODQT_SETUP}
