On Tue, 12 Mar 2013 12:49:03 +0000 Max Brazhnikov wrote:
> SVN commit 9076 by makc:
>
> bsd.cmake.mk
> - Deprecate CMAKE_OUTSOURCE in favour of 'USE_CMAKE= outsource'.
> - Add guards to ensure bsd.cmake.mk is included only once.
> - Remove trivial comments
> - Enable verbosity/disable colouring when PACKAGE_BUILDING is set.
> Although tinderbox and pointyhat set BATCH as well, the PACKAGE_BUILDING
> is more appropriate for this check. I think the check for BATCH can be
> removed from here, but I leave it for now.
>
> bsd.kde4.mk
> - Use 'USE_CMAKE= outsource' for KDE4_BUILDENV
Actually, I don't any reason why we should keep KDE4_BUILDENV:
de facto it means USE_LDCONFIG=yes and USE_CMAKE=outsource now.
The first only pollutes numerous ports, that don't install libraries, the
second can replace KDE4_BUILDENV in ports Makefiles.
KDE4_VERSION in PLIST_SUB and redefined CMAKE_BUILD_TYPE won't hunt non KDE SC
ports. Any objection against removing it?
Max
Index: bsd.kde4.mk
===================================================================
--- bsd.kde4.mk (revision 9076)
+++ bsd.kde4.mk (working copy)
@@ -102,7 +102,8 @@
. endif
.endif
-PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}"
+PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" \
+ KDE4_VERSION="${KDE4_VERSION}"
# Keep in sync with cmake/modules/PythonMacros.cmake
_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//}
@@ -116,24 +117,10 @@
PYO_SUFFIX=pyo
.endif
-# The following definitions are not intended for usage in KDE4-dependent ports.
-.if defined(KDE4_BUILDENV)
-
-USE_CMAKE= outsource
-USE_LDCONFIG= yes
-
-. if ${KDE4_BRANCH} == "unstable"
-WITH_DEBUG= yes
-. endif
-
. if defined(WITH_DEBUG)
CMAKE_BUILD_TYPE= DebugFull
. endif
-PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}"
-
-.endif # defined(KDE4_BUILDENV)
-
.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
