Submitter-Id: current-users
Originator:Olli Hauer
Organization:
Confidential: no
Synopsis: [patch] devel/kdesdk3 devel/kdesdk4 and other kde@ maintained
ports build with subversion-freebsd
Severity: non-critical
Priority: low
Category: ports
Class: change-request
Release:
Environment:
Description:
Fix build in tinderbox if WITH_FREEBSD_SUBVERSION is defined
- kdesdk3
- kdesdk4
- kdevelop
- kdevplatform
How-To-Repeat:
Do a tinderbox build where WITH_FREEBSD_SUBVERSION is defined.
Define WITH_FREEBSD_SUBVERSION in a tinderbox build.
RUN/BUILD_DEPENDS are OK, but LIB_DEPENDS fail mostly because
subversion is added twice (subversion for the port and
subversion-freebsd for RUN/BUILD_DEPENDS ports)
Fix:
--- kdesdk3.diff begins here ---
Index: kdesdk3/Makefile
===
RCS file: /home/pcvs/ports/devel/kdesdk3/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- kdesdk3/Makefile25 Feb 2011 01:31:43 - 1.77
+++ kdesdk3/Makefile5 Jun 2011 20:45:11 -
@@ -17,7 +17,12 @@
COMMENT= KDE Software Development Kit
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion
+
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
CONFLICTS= umbrello-[0-9]* kcachegrind-[0-9]*
--- kdesdk3.diff ends here ---
--- kdesdk4.diff begins here ---
Index: kdesdk4/Makefile
===
RCS file: /home/pcvs/ports/devel/kdesdk4/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- kdesdk4/Makefile25 Mar 2011 10:33:48 - 1.98
+++ kdesdk4/Makefile5 Jun 2011 20:45:14 -
@@ -16,10 +16,15 @@
BUILD_DEPENDS= ${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \
- boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
+
LATEST_LINK= ${PORTNAME}4
CONFLICTS= kdeutils-4.5.[0-5]
--- kdesdk4.diff ends here ---
--- kdevelop.diff begins here ---
Index: kdevelop/Makefile
===
RCS file: /home/pcvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- kdevelop/Makefile 25 Feb 2011 01:31:43 - 1.114
+++ kdevelop/Makefile 5 Jun 2011 20:45:21 -
@@ -19,7 +19,13 @@
BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \
dot:${PORTSDIR}/graphics/graphviz
-LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion
+
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
+
RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
extractrc:${PORTSDIR}/devel/kdesdk3 \
gdb66:${PORTSDIR}/devel/gdb66 \
--- kdevelop.diff ends here ---
--- kdevplatform.diff begins here ---
Index: kdevplatform/Makefile
===
RCS file: /home/pcvs/ports/devel/kdevplatform/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- kdevplatform/Makefile 9 Nov 2010 01:52:43 - 1.2
+++ kdevplatform/Makefile 5 Jun 2011 20:45:24 -
@@ -14,10 +14,15 @@
MAINTAINER=k...@freebsd.org
COMMENT= KDE development platform
-LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \
- boost_thread.4:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
qjson.0:${PORTSDIR}/devel/qjson
+.if !defined(WITH_FREEBSD_SUBVERSION)
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
+.else
+LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
+.endif
+
USE_BZIP2= yes
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
KDE4_BUILDENV= yes
--- kdevplatform.diff ends here ---
___
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
