svn commit: r501894 - in head: . cad cad/leocad cad/leocad/files
Yuri Victorovich
yuri at FreeBSD.org
Sat May 18 02:51:06 UTC 2019
Author: yuri
Date: Sat May 18 02:51:04 2019
New Revision: 501894
URL: https://svnweb.freebsd.org/changeset/ports/501894
Log:
Re-add cad/leocad
It was removed because of the Qt4 dependency, but the current version
supports Qt5.
Added:
head/cad/leocad/
- copied from r495966, head/cad/leocad/
Deleted:
head/cad/leocad/pkg-plist
Modified:
head/MOVED
head/cad/Makefile
head/cad/leocad/Makefile
head/cad/leocad/distinfo
head/cad/leocad/files/patch-common_lc__application.cpp
head/cad/leocad/files/patch-leocad.pro
head/cad/leocad/pkg-descr
Modified: head/MOVED
==============================================================================
--- head/MOVED Sat May 18 01:23:59 2019 (r501893)
+++ head/MOVED Sat May 18 02:51:04 2019 (r501894)
@@ -11700,7 +11700,6 @@ audio/qmpdclient||2019-03-16|Has expired: Qt4 has been
audio/skype-call-recorder||2019-03-16|Has expired: Qt4 has been EOL since december 2015
biology/clustalx||2019-03-16|Has expired: Qt4 has been EOL since december 2015
cad/layouteditor||2019-03-16|Has expired: Qt4 has been EOL since december 2015
-cad/leocad||2019-03-16|Has expired: Qt4 has been EOL since december 2015
cad/meshlab||2019-03-16|Has expired: Qt4 has been EOL since december 2015
cad/qfsm||2019-03-16|Has expired: Qt4 has been EOL since december 2015
cad/qucs||2019-03-16|Has expired: Qt4 has been EOL since december 2015
Modified: head/cad/Makefile
==============================================================================
--- head/cad/Makefile Sat May 18 01:23:59 2019 (r501893)
+++ head/cad/Makefile Sat May 18 02:51:04 2019 (r501894)
@@ -55,6 +55,7 @@
SUBDIR += kicad-library-templates-devel
SUBDIR += klayout
SUBDIR += ldraw
+ SUBDIR += leocad
SUBDIR += lepton-eda
SUBDIR += libopencad
SUBDIR += librecad
Modified: head/cad/leocad/Makefile
==============================================================================
--- head/cad/leocad/Makefile Sat Mar 16 21:52:35 2019 (r495966)
+++ head/cad/leocad/Makefile Sat May 18 02:51:04 2019 (r501894)
@@ -2,98 +2,33 @@
# $FreeBSD$
PORTNAME= leocad
-PORTVERSION= 0.80.3
-PORTREVISION= 5
+DISTVERSIONPREFIX= v
+DISTVERSION= 18.02.20190517
CATEGORIES= cad
-MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
-DISTFILES= LeoCAD-Source-${PORTVERSION}.tgz
-DIST_SUBDIR= ${PORTNAME}
-EXTRACT_ONLY= LeoCAD-Source-${PORTVERSION}.tgz
-MAINTAINER= koalative at gmail.com
-COMMENT= CAD program that uses bricks similar to those found in many toys
+MAINTAINER= yuri at FreeBSD.org
+COMMENT= Qt-based GDS2 Viewer
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/docs/COPYING.txt
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
+RUN_DEPENDS= ldraw>0:cad/ldraw
-LIB_DEPENDS= libpng.so:graphics/png
+USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5 shared-mime-info
+USE_GITHUB= yes
+GH_ACCOUNT= leozide
+GH_TAGNAME= f392e3c
+USE_QT= core gui concurrent network opengl printsupport widgets xml buildtools_build linguisttools_build
+USE_GL= gl
-WRKSRC= ${WRKDIR}/${PORTNAME}
+QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} MAN_DIR=${PREFIX}/man/man1 LDRAW_LIBRARY_PATH=${PREFIX}/share/ldraw
-USES= desktop-file-utils gmake jpeg pkgconfig qmake qt:4 shared-mime-info
-USE_QT= moc_build rcc_build uic_build iconengines_run imageformats_run \
- corelib gui network opengl
-USE_GL= glut
-USE_GNOME= gtk20
-
-CXXFLAGS+= -include ${WRKSRC}/common/lc_global.h
-
-PORTDOCS= CREDITS.txt README.txt
-OPTIONS_DEFINE= DOCS
-
-OPTIONS_SINGLE= LIBRARY
-OPTIONS_SINGLE_LIBRARY= LDRAW LEOCAD
-OPTIONS_DEFAULT= LEOCAD
-
-LDRAW_DESC= Library from LDraw symlink, mostly fewer pieces
-LEOCAD_DESC= Library from LeoCad file, mostly more pieces
-
-INSTALLS_ICONS= yes
-ICON_SIZES= 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDRAW}
-RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw
-.endif
-
-.if ${PORT_OPTIONS:MLEOCAD}
-LEOCAD_PIECES= Library-Linux-7931.zip
-DISTFILES+= ${LEOCAD_PIECES}
-EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
-post-extract:
- @${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|; \
- s|share/man/man1|man/man1|; \
- s|docs.files = docs/README.txt docs/CREDITS.txt docs/COPYING.txt|docs.files = |' \
- ${WRKSRC}/${PORTNAME}.pro
-
-.for s in 16 24 32 48 64 128 256 512
- @cd ${WRKSRC}/tools/icon && \
- ${MV} ${PORTNAME}-${s}.png ${PORTNAME}_${s}x${s}.png
-.endfor
- @cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}
-
-.if ${PORT_OPTIONS:MLDRAW}
- ${LN} -s ${PREFIX}/share/ldraw ${STAGEDIR}${DATADIR}/library.bin
-.endif
-.if ${PORT_OPTIONS:MLEOCAD}
- ${INSTALL_DATA} ${WRKDIR}/pieces/* ${STAGEDIR}${DATADIR}
-.endif
-
-.for s in ${ICON_SIZES}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
- ${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
- ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
-.endfor
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-.for i in document*.png icon*.png
- @cd ${WRKSRC}/tools/icon && ${INSTALL_DATA} ${i} \
- ${STAGEDIR}${DATADIR}
-.endfor
- @${LN} -sf ../icons/hicolor/48x48/apps/${PORTNAME}.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps/
- ${INSTALL_MAN} ${WRKSRC}/docs/leocad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
+PLIST_FILES= bin/leocad \
+ share/applications/leocad.desktop \
+ share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg \
+ man/man1/leocad.1.gz \
+ share/metainfo/leocad.appdata.xml \
+ share/mime/packages/leocad.xml \
+ share/pixmaps/leocad.png
.include <bsd.port.mk>
Modified: head/cad/leocad/distinfo
==============================================================================
--- head/cad/leocad/distinfo Sat Mar 16 21:52:35 2019 (r495966)
+++ head/cad/leocad/distinfo Sat May 18 02:51:04 2019 (r501894)
@@ -1,4 +1,3 @@
-SHA256 (leocad/LeoCAD-Source-0.80.3.tgz) = 32591681fdce46ebdcee3d725613adf37ec4cdbc4a3ebc5e60358efefcf12468
-SIZE (leocad/LeoCAD-Source-0.80.3.tgz) = 1833287
-SHA256 (leocad/Library-Linux-7931.zip) = 3afa911f0c8064392a54937fdff305066cd8e910d66b1dafd7dbb5758c4b7456
-SIZE (leocad/Library-Linux-7931.zip) = 24226538
+TIMESTAMP = 1558142272
+SHA256 (leozide-leocad-v18.02.20190517-f392e3c_GH0.tar.gz) = 7b22858cbed34914b0100be7e3bfb4bd34e069dd7b57a99854482ffbefc1db0a
+SIZE (leozide-leocad-v18.02.20190517-f392e3c_GH0.tar.gz) = 5289474
Modified: head/cad/leocad/files/patch-common_lc__application.cpp
==============================================================================
--- head/cad/leocad/files/patch-common_lc__application.cpp Sat Mar 16 21:52:35 2019 (r495966)
+++ head/cad/leocad/files/patch-common_lc__application.cpp Sat May 18 02:51:04 2019 (r501894)
@@ -4,13 +4,13 @@ common/lc_application.cpp:209:23: error: no matching l
printf("Compiled "__DATE__"\n");
^
---- common/lc_application.cpp.orig 2018-08-25 03:56:08 UTC
+--- common/lc_application.cpp.orig 2019-05-17 23:24:38 UTC
+++ common/lc_application.cpp
-@@ -206,7 +206,6 @@ bool lcApplication::Initialize(int argc, char* argv[],
- else if ((strcmp(Param, "-v") == 0) || (strcmp(Param, "--version") == 0))
- {
- printf("LeoCAD Version " LC_VERSION_TEXT "\n");
-- printf("Compiled "__DATE__"\n");
+@@ -375,7 +375,6 @@ bool lcApplication::Initialize(QList<QPair<QString, bo
+ printf("LeoCAD Version " LC_VERSION_TEXT "\n");
+ #endif
+ printf("LeoCAD Version " LC_VERSION_TEXT "\n");
+- printf("Compiled " __DATE__ "\n");
- return false;
- }
+ ShowWindow = false;
+ return true;
Modified: head/cad/leocad/files/patch-leocad.pro
==============================================================================
--- head/cad/leocad/files/patch-leocad.pro Sat Mar 16 21:52:35 2019 (r495966)
+++ head/cad/leocad/files/patch-leocad.pro Sat May 18 02:51:04 2019 (r501894)
@@ -1,12 +1,11 @@
---- leocad.pro.orig 2014-01-30 23:26:55 UTC
+--- leocad.pro.orig 2019-05-18 01:23:33 UTC
+++ leocad.pro
-@@ -7,8 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
- }
+@@ -108,7 +108,7 @@ unix:!macx {
- INCLUDEPATH += qt common
--CONFIG += precompile_header incremental
--PRECOMPILED_HEADER = common/lc_global.h
-+CONFIG += incremental
- win32 {
- QMAKE_CXXFLAGS_WARN_ON += -wd4100
- DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
+ target.path = $$BIN_DIR
+ docs.path = $$DOCS_DIR
+- docs.files = docs/README.txt docs/CREDITS.txt docs/COPYING.txt
++ docs.files =
+ man.path = $$MAN_DIR
+ man.files = docs/leocad.1
+ desktop.path = $$DESKTOP_DIR
Modified: head/cad/leocad/pkg-descr
==============================================================================
--- head/cad/leocad/pkg-descr Sat Mar 16 21:52:35 2019 (r495966)
+++ head/cad/leocad/pkg-descr Sat May 18 02:51:04 2019 (r501894)
@@ -1,5 +1,14 @@
LeoCAD is a CAD program that can be used to create virtual LEGO models.
-It has an easy to use interface and currently features over 4000 different
-pieces created by the LDraw community.
-WWW: http://www.leocad.org/
+LeoCAD has an intuitive interface that is designed to allow new users to start
+creating new models without having to spend too much time learning the
+application.
+
+LeoCAD is fully compatible with the LDraw Standard and related tools, and it
+reads and writes LDR and MPD files so that you can share and download models
+from the Internet.
+
+It currently features several thousand different pieces created by the LDraw
+community.
+
+WWW: https://www.leocad.org/
More information about the svn-ports-all
mailing list