From owner-svn-ports-all@FreeBSD.ORG Fri Mar 7 14:03:56 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id ED4B1BFE; Fri, 7 Mar 2014 14:03:55 +0000 (UTC) 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 CDCD12B8; Fri, 7 Mar 2014 14:03:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27E3tu5070990; Fri, 7 Mar 2014 14:03:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27E3tQS070989; Fri, 7 Mar 2014 14:03:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403071403.s27E3tQS070989@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 7 Mar 2014 14:03:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347388 - head/cad/kicad X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 14:03:56 -0000 Author: bapt Date: Fri Mar 7 14:03:55 2014 New Revision: 347388 URL: http://svnweb.freebsd.org/changeset/ports/347388 QAT: https://qat.redports.org/buildarchive/r347388/ Log: Support stage Convert to dos2unix Modernise (options helpers, etc) Modified: head/cad/kicad/Makefile Modified: head/cad/kicad/Makefile ============================================================================== --- head/cad/kicad/Makefile Fri Mar 7 14:02:37 2014 (r347387) +++ head/cad/kicad/Makefile Fri Mar 7 14:03:55 2014 (r347388) @@ -3,7 +3,7 @@ PORTNAME= kicad DISTVERSION= 2010-05-05-BZR2356 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/ \ @@ -11,6 +11,7 @@ MASTER_SITES= ftp://iut-tice.ujf-grenobl DISTFILES= ${SFNAME}-stable${EXTRACT_SUFX} \ ${DFNAME}.tgz EXTRACT_ONLY= ${SFNAME}-stable${EXTRACT_SUFX} +EXTRACT_SUFX= .zip MAINTAINER= thierry@FreeBSD.org COMMENT= Schematic and PCB editing software @@ -22,9 +23,8 @@ CONFLICTS= kicad-devel* WRKSRC= ${WRKDIR}/kicad -USE_ZIP= yes -USE_DOS2UNIX= *.cmake -USES= cmake +USES= cmake dos2unix desktop-file-utils shared-mime-info +DOS2UNIX_GLOB= *.cmake USE_GL= yes USE_WX= 2.8 WX_UNICODE= yes @@ -38,18 +38,10 @@ WRKSRC= ${WRKDIR}/${SFNAME} PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} -NO_STAGE= yes - OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext SFNAME= ${PORTNAME}-sources-${DISTVERSION} DFNAME= doc_components-${DISTVERSION}-stable @@ -57,16 +49,10 @@ BINS= cvpcb eeschema gerbview kicad pcb EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \ contrib_makefiles.txt running_kicad_under_W98.txt -.if exists(${LOCALBASE}/bin/konqueror) -RUN_DEPENDS+= konqueror:${PORTSDIR}/x11/kdebase3 -.else RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf -.endif -.if ${PORT_OPTIONS:MDOCS} post-extract: cd ${WRKSRC} && ${TAR} -xf ${DISTDIR}/${DFNAME}.tgz -.endif pre-configure: ${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|' \ @@ -76,18 +62,11 @@ pre-configure: ${WRKSRC}/common/gestfich.cpp post-install: -.if ${PORT_OPTIONS:MNLS} - ${MKDIR} ${DATADIR}/internat + @${MKDIR} ${STAGEDIR}${DATADIR}/internat (cd ${WRKSRC}/internat && \ - ${COPYTREE_SHARE} \* ${DATADIR}/internat) - ${RM} ${DATADIR}/internat/CMakeLists.txt - ${FIND} ${DATADIR}/internat -name kicad.po -delete -.endif -.if ${PORT_OPTIONS:MDOCS} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}) -.endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/internat) + ${RM} -f ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt + ${FIND} ${STAGEDIR}${DATADIR}/internat -name kicad.po -delete + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include