Date: Tue, 10 Dec 2013 18:42:46 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336077 - in head/cad/librecad: . files Message-ID: <201312101842.rBAIgkJp065451@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Dec 10 18:42:46 2013 New Revision: 336077 URL: http://svnweb.freebsd.org/changeset/ports/336077 Log: - Update to 2.0.0rc3 - Remove NLS options and related patches for simplicity - Add patch to fix build on 10 and head Added: head/cad/librecad/files/patch-librecad__src__lib__engine__rs_color.h (contents, props changed) Deleted: head/cad/librecad/files/patch-librecad.pro head/cad/librecad/files/patch-scripts__postprocess-unix.sh Modified: head/cad/librecad/Makefile head/cad/librecad/distinfo head/cad/librecad/pkg-plist (contents, props changed) Modified: head/cad/librecad/Makefile ============================================================================== --- head/cad/librecad/Makefile Tue Dec 10 18:30:46 2013 (r336076) +++ head/cad/librecad/Makefile Tue Dec 10 18:42:46 2013 (r336077) @@ -1,60 +1,45 @@ # $FreeBSD$ PORTNAME= librecad -PORTVERSION= 1.0.3 +DISTVERSION= 2.0.0rc3 CATEGORIES= cad MASTER_SITES= GITHUB MAINTAINER= makc@FreeBSD.org COMMENT= 2D CAD system -BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser +BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser \ + ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs -USE_QT4= help qt3support help-tools_build moc_build \ +USE_QT4= help qt3support help-tools_build linguist_build moc_build \ rcc_build uic_build uic3_build -USES= qmake +USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake MAKE_ENV= XDG_CONFIG_HOME=/dev/null USE_GITHUB= yes GH_ACCOUNT= LibreCAD GH_PROJECT= LibreCAD -GH_TAGNAME= v${PORTVERSION} -GH_COMMIT= c1f2eb6 - -OPTIONS_DEFINE= NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USE_QT4+= linguist_build -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +GH_TAGNAME= ${DISTVERSION} +GH_COMMIT= 358e3ae post-patch: ${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ - ${WRKSRC}/src/lib/engine/rs_system.cpp + ${WRKSRC}/librecad/src/lib/engine/rs_settings.cpp \ + ${WRKSRC}/librecad/src/lib/engine/rs_system.cpp ${REINPLACE_CMD} -e \ '/^Icon/s,librecad,${PREFIX}/share/pixmaps/librecad.png,' \ ${WRKSRC}/desktop/librecad.desktop -post-build: -.if ${PORT_OPTIONS:MNLS} - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LRELEASE} -compress librecad.pro - ${MKDIR} ${WRKSRC}/unix/resources/qm - ${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${WRKSRC}/unix/resources/qm -.endif - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${SH} scripts/postprocess-unix.sh +pre-install: + ${CHMOD} +w ${WRKSRC}/unix/resources/plugins/*.so + ${STRIP_CMD} ${WRKSRC}/unix/resources/plugins/*.so do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \ ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/res/main/librecad.png \ + ${INSTALL_DATA} ${WRKSRC}/librecad/res/main/librecad.png \ ${STAGEDIR}${PREFIX}/share/pixmaps .include <bsd.port.mk> Modified: head/cad/librecad/distinfo ============================================================================== --- head/cad/librecad/distinfo Tue Dec 10 18:30:46 2013 (r336076) +++ head/cad/librecad/distinfo Tue Dec 10 18:42:46 2013 (r336077) @@ -1,2 +1,2 @@ -SHA256 (librecad-1.0.3.tar.gz) = 51d286c1460d26773147f4c2682990aa187eb18dd9f41e6cc7586008960fbca0 -SIZE (librecad-1.0.3.tar.gz) = 4578144 +SHA256 (librecad-2.0.0rc3.tar.gz) = 6db3aad0c18970d7c8815bedb5a2a7afbc03f342b3267f74ec2b632f988cd4ff +SIZE (librecad-2.0.0rc3.tar.gz) = 15353899 Added: head/cad/librecad/files/patch-librecad__src__lib__engine__rs_color.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/librecad/files/patch-librecad__src__lib__engine__rs_color.h Tue Dec 10 18:42:46 2013 (r336077) @@ -0,0 +1,10 @@ +--- ./librecad/src/lib/engine/rs_color.h.orig 2013-11-13 10:16:38.000000000 +0000 ++++ ./librecad/src/lib/engine/rs_color.h 2013-12-10 17:20:29.235786970 +0000 +@@ -29,6 +29,7 @@ + #define RS_COLOR_H + + #include <QColor> ++#include <ostream> + + #include "rs_flags.h" + Modified: head/cad/librecad/pkg-plist ============================================================================== --- head/cad/librecad/pkg-plist Tue Dec 10 18:30:46 2013 (r336076) +++ head/cad/librecad/pkg-plist Tue Dec 10 18:42:46 2013 (r336077) @@ -2,6 +2,8 @@ bin/librecad share/applications/librecad.desktop %%DATADIR%%/doc/LibreCADdoc.qch %%DATADIR%%/doc/LibreCADdoc.qhc +%%DATADIR%%/fonts/OpenGostTypeA-Regular.lff +%%DATADIR%%/fonts/OpenGostTypeB-Regular.lff %%DATADIR%%/fonts/cursive.lff %%DATADIR%%/fonts/cyrillic_ii.lff %%DATADIR%%/fonts/gothgbt.lff @@ -13,7 +15,6 @@ share/applications/librecad.desktop %%DATADIR%%/fonts/greekp.lff %%DATADIR%%/fonts/greeks.lff %%DATADIR%%/fonts/iso.lff -%%DATADIR%%/fonts/iso8859-11.lff %%DATADIR%%/fonts/italicc.lff %%DATADIR%%/fonts/italiccs.lff %%DATADIR%%/fonts/italict.lff @@ -30,11 +31,16 @@ share/applications/librecad.desktop %%DATADIR%%/fonts/scripts.lff %%DATADIR%%/fonts/simplex.lff %%DATADIR%%/fonts/standard.lff +%%DATADIR%%/fonts/syastro.lff +%%DATADIR%%/fonts/symap.lff +%%DATADIR%%/fonts/symath.lff %%DATADIR%%/fonts/symbol.lff -%%DATADIR%%/fonts/symbol_astro.lff %%DATADIR%%/fonts/symbol_misc1.lff %%DATADIR%%/fonts/symbol_misc2.lff +%%DATADIR%%/fonts/symeteo.lff +%%DATADIR%%/fonts/symusic.lff %%DATADIR%%/fonts/unicode.lff +%%DATADIR%%/fonts/wqy-unicode.lff %%DATADIR%%/library/misc/a3.dxf %%DATADIR%%/library/misc/screw.dxf %%DATADIR%%/library/misc/t-part.dxf @@ -87,54 +93,117 @@ share/applications/librecad.desktop %%DATADIR%%/patterns/square.dxf %%DATADIR%%/patterns/triangle_a.dxf %%DATADIR%%/patterns/triangle_b.dxf -%%NLS%%%%DATADIR%%/qm/librecad_cs.qm -%%NLS%%%%DATADIR%%/qm/librecad_da.qm -%%NLS%%%%DATADIR%%/qm/librecad_de.qm -%%NLS%%%%DATADIR%%/qm/librecad_el.qm -%%NLS%%%%DATADIR%%/qm/librecad_en.qm -%%NLS%%%%DATADIR%%/qm/librecad_en_au.qm -%%NLS%%%%DATADIR%%/qm/librecad_es.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_ar.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_bo.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_cl.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_co.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_cr.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_do.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_ec.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_gt.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_hn.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_mx.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_ni.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_pa.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_pe.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_pr.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_py.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_sv.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_us.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_uy.qm -%%NLS%%%%DATADIR%%/qm/librecad_es_ve.qm -%%NLS%%%%DATADIR%%/qm/librecad_et.qm -%%NLS%%%%DATADIR%%/qm/librecad_fi.qm -%%NLS%%%%DATADIR%%/qm/librecad_fr.qm -%%NLS%%%%DATADIR%%/qm/librecad_hu.qm -%%NLS%%%%DATADIR%%/qm/librecad_id_ID.qm -%%NLS%%%%DATADIR%%/qm/librecad_it.qm -%%NLS%%%%DATADIR%%/qm/librecad_ja.qm -%%NLS%%%%DATADIR%%/qm/librecad_nl.qm -%%NLS%%%%DATADIR%%/qm/librecad_no.qm -%%NLS%%%%DATADIR%%/qm/librecad_pa.qm -%%NLS%%%%DATADIR%%/qm/librecad_pl.qm -%%NLS%%%%DATADIR%%/qm/librecad_pt.qm -%%NLS%%%%DATADIR%%/qm/librecad_ru.qm -%%NLS%%%%DATADIR%%/qm/librecad_sk.qm -%%NLS%%%%DATADIR%%/qm/librecad_sq_al.qm -%%NLS%%%%DATADIR%%/qm/librecad_sv.qm -%%NLS%%%%DATADIR%%/qm/librecad_tr.qm -%%NLS%%%%DATADIR%%/qm/librecad_uk.qm -%%NLS%%%%DATADIR%%/qm/librecad_zh_cn.qm -%%NLS%%%%DATADIR%%/qm/librecad_zh_tw.qm +%%DATADIR%%/plugins/libalign.so +%%DATADIR%%/plugins/libasciifile.so +%%DATADIR%%/plugins/libimportshp.so +%%DATADIR%%/plugins/liblist.so +%%DATADIR%%/plugins/libsameprop.so +%%DATADIR%%/plugins/libsample.so +%%DATADIR%%/qm/librecad_ca.qm +%%DATADIR%%/qm/librecad_cs.qm +%%DATADIR%%/qm/librecad_da.qm +%%DATADIR%%/qm/librecad_de.qm +%%DATADIR%%/qm/librecad_el.qm +%%DATADIR%%/qm/librecad_en.qm +%%DATADIR%%/qm/librecad_en_au.qm +%%DATADIR%%/qm/librecad_es.qm +%%DATADIR%%/qm/librecad_es_ar.qm +%%DATADIR%%/qm/librecad_es_bo.qm +%%DATADIR%%/qm/librecad_es_cl.qm +%%DATADIR%%/qm/librecad_es_co.qm +%%DATADIR%%/qm/librecad_es_cr.qm +%%DATADIR%%/qm/librecad_es_do.qm +%%DATADIR%%/qm/librecad_es_ec.qm +%%DATADIR%%/qm/librecad_es_gt.qm +%%DATADIR%%/qm/librecad_es_hn.qm +%%DATADIR%%/qm/librecad_es_mx.qm +%%DATADIR%%/qm/librecad_es_ni.qm +%%DATADIR%%/qm/librecad_es_pa.qm +%%DATADIR%%/qm/librecad_es_pe.qm +%%DATADIR%%/qm/librecad_es_pr.qm +%%DATADIR%%/qm/librecad_es_py.qm +%%DATADIR%%/qm/librecad_es_sv.qm +%%DATADIR%%/qm/librecad_es_us.qm +%%DATADIR%%/qm/librecad_es_uy.qm +%%DATADIR%%/qm/librecad_es_ve.qm +%%DATADIR%%/qm/librecad_et.qm +%%DATADIR%%/qm/librecad_fi.qm +%%DATADIR%%/qm/librecad_fr.qm +%%DATADIR%%/qm/librecad_hu.qm +%%DATADIR%%/qm/librecad_id_ID.qm +%%DATADIR%%/qm/librecad_it.qm +%%DATADIR%%/qm/librecad_ja.qm +%%DATADIR%%/qm/librecad_lv.qm +%%DATADIR%%/qm/librecad_nl.qm +%%DATADIR%%/qm/librecad_no.qm +%%DATADIR%%/qm/librecad_pa.qm +%%DATADIR%%/qm/librecad_pl.qm +%%DATADIR%%/qm/librecad_pt_br.qm +%%DATADIR%%/qm/librecad_pt_pt.qm +%%DATADIR%%/qm/librecad_ro_ro.qm +%%DATADIR%%/qm/librecad_ru.qm +%%DATADIR%%/qm/librecad_sk.qm +%%DATADIR%%/qm/librecad_sl.qm +%%DATADIR%%/qm/librecad_sq_al.qm +%%DATADIR%%/qm/librecad_sv.qm +%%DATADIR%%/qm/librecad_tr.qm +%%DATADIR%%/qm/librecad_uk.qm +%%DATADIR%%/qm/librecad_zh_cn.qm +%%DATADIR%%/qm/librecad_zh_tw.qm +%%DATADIR%%/qm/plugins_ca.qm +%%DATADIR%%/qm/plugins_cs.qm +%%DATADIR%%/qm/plugins_da.qm +%%DATADIR%%/qm/plugins_de.qm +%%DATADIR%%/qm/plugins_el.qm +%%DATADIR%%/qm/plugins_en.qm +%%DATADIR%%/qm/plugins_en_au.qm +%%DATADIR%%/qm/plugins_es.qm +%%DATADIR%%/qm/plugins_es_ar.qm +%%DATADIR%%/qm/plugins_es_bo.qm +%%DATADIR%%/qm/plugins_es_cl.qm +%%DATADIR%%/qm/plugins_es_co.qm +%%DATADIR%%/qm/plugins_es_cr.qm +%%DATADIR%%/qm/plugins_es_do.qm +%%DATADIR%%/qm/plugins_es_ec.qm +%%DATADIR%%/qm/plugins_es_gt.qm +%%DATADIR%%/qm/plugins_es_hn.qm +%%DATADIR%%/qm/plugins_es_mx.qm +%%DATADIR%%/qm/plugins_es_ni.qm +%%DATADIR%%/qm/plugins_es_pa.qm +%%DATADIR%%/qm/plugins_es_pe.qm +%%DATADIR%%/qm/plugins_es_pr.qm +%%DATADIR%%/qm/plugins_es_py.qm +%%DATADIR%%/qm/plugins_es_sv.qm +%%DATADIR%%/qm/plugins_es_us.qm +%%DATADIR%%/qm/plugins_es_uy.qm +%%DATADIR%%/qm/plugins_es_ve.qm +%%DATADIR%%/qm/plugins_et.qm +%%DATADIR%%/qm/plugins_fi.qm +%%DATADIR%%/qm/plugins_fr.qm +%%DATADIR%%/qm/plugins_hu.qm +%%DATADIR%%/qm/plugins_id_ID.qm +%%DATADIR%%/qm/plugins_it.qm +%%DATADIR%%/qm/plugins_ja.qm +%%DATADIR%%/qm/plugins_lv.qm +%%DATADIR%%/qm/plugins_nl.qm +%%DATADIR%%/qm/plugins_no.qm +%%DATADIR%%/qm/plugins_pa.qm +%%DATADIR%%/qm/plugins_pl.qm +%%DATADIR%%/qm/plugins_pt_br.qm +%%DATADIR%%/qm/plugins_pt_pt.qm +%%DATADIR%%/qm/plugins_ro_ro.qm +%%DATADIR%%/qm/plugins_ru.qm +%%DATADIR%%/qm/plugins_sk.qm +%%DATADIR%%/qm/plugins_sl.qm +%%DATADIR%%/qm/plugins_sq_al.qm +%%DATADIR%%/qm/plugins_sv.qm +%%DATADIR%%/qm/plugins_tr.qm +%%DATADIR%%/qm/plugins_uk.qm +%%DATADIR%%/qm/plugins_zh_cn.qm +%%DATADIR%%/qm/plugins_zh_tw.qm share/pixmaps/librecad.png -%%NLS%%@dirrm %%DATADIR%%/qm +@dirrm %%DATADIR%%/qm +@dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/patterns @dirrm %%DATADIR%%/library/templates @dirrm %%DATADIR%%/library/misc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101842.rBAIgkJp065451>