From owner-svn-ports-head@FreeBSD.ORG Thu Oct 10 12:32:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7BA92EA3; Thu, 10 Oct 2013 12:32:57 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F5CF27FE; Thu, 10 Oct 2013 12:32:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ACWvxY006184; Thu, 10 Oct 2013 12:32:57 GMT (envelope-from mr@svn.freebsd.org) Received: (from mr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ACWvMj006183; Thu, 10 Oct 2013 12:32:57 GMT (envelope-from mr@svn.freebsd.org) Message-Id: <201310101232.r9ACWvMj006183@svn.freebsd.org> From: Michael Reifenberger Date: Thu, 10 Oct 2013 12:32:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329984 - head/cad/kicad-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 12:32:57 -0000 Author: mr Date: Thu Oct 10 12:32:56 2013 New Revision: 329984 URL: http://svnweb.freebsd.org/changeset/ports/329984 Log: Try to fix the build. Modified: head/cad/kicad-devel/Makefile Modified: head/cad/kicad-devel/Makefile ============================================================================== --- head/cad/kicad-devel/Makefile Thu Oct 10 12:10:24 2013 (r329983) +++ head/cad/kicad-devel/Makefile Thu Oct 10 12:32:56 2013 (r329984) @@ -5,15 +5,19 @@ PORTNAME= kicad DISTVERSION= r${BZR_SRC_REV} PORTREVISION= 3 CATEGORIES= cad -DIST_SUBDIR= ${PORTNAME} MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mr PKGNAMESUFFIX= -devel +DIST_SUBDIR= ${PORTNAME} # Additional patches: http://svn.openmoko.org/trunk/gta02-core/kicad-patches/ MAINTAINER= mr@FreeBSD.org COMMENT= Schematic and PCB editing software +BUILD_DEPENDS= wxgtk2-2.8-config:${PORTSDIR}/x11-toolkits/wxgtk28 \ + bzr:${PORTSDIR}/devel/bzr \ + ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:${PORTSDIR}/devel/bzrtools + LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs CONFLICTS= kicad-2008* @@ -45,11 +49,6 @@ CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" NO_STAGE= yes -.include - -BUILD_DEPENDS= wxgtk2-2.8-config:${PORTSDIR}/x11-toolkits/wxgtk28 \ - bzr:${PORTSDIR}/devel/bzr \ - ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:${PORTSDIR}/devel/bzrtools #.if !defined(WITHOUT_GTA2CORE) #PATCH_STRIP= -p1 @@ -59,7 +58,7 @@ BUILD_DEPENDS= wxgtk2-2.8-config:${PORTS #.endif .if exists(${LOCALBASE}/bin/konqueror) -RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kdebase3 +RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kde4-baseapps .else RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf .endif @@ -88,7 +87,7 @@ FETCH_DEPENDS+= bzr:${PORTSDIR}/devel/bz do-fetch: ${MKDIR} ${WRKDIR} - ${ECHO} ${WRKSRC} + ${ECHO} ${WRKSRC} bzr export -r ${BZR_SRC_REV} ${WRKSRC} lp:kicad bzr export -r ${BZR_LIB_REV} ${WRKDIR}/kicad-library lp:~kicad-lib-committers/kicad/library bzr export -r ${BZR_DOC_REV} ${WRKDIR}/kicad-doc lp:~kicad-developers/kicad/doc @@ -158,8 +157,8 @@ PLIST_FILE_LIST= bin/freeroute.jnlp \ share/mime/packages/kicad.xml \ share/applications/kicad.desktop \ share/applications/eeschema.desktop - -PLIST_DIR_LIST= lib/kicad + +PLIST_DIR_LIST= lib/kicad PLIST_SHAREDDIR_LIST= share/applications \ share/mimelnk/application \ @@ -184,4 +183,4 @@ build-plist: -e 's|${DOCSDIR}|%%DOCSDIR%%|' \ -e 's|^|@dirrm |' >> ${PLIST} -.include +.include