From owner-svn-ports-all@FreeBSD.ORG Fri Mar 7 00:40:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 603F54B0; Fri, 7 Mar 2014 00:40:30 +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 40EA718F; Fri, 7 Mar 2014 00:40:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s270eUmw094706; Fri, 7 Mar 2014 00:40:30 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s270eTBm094704; Fri, 7 Mar 2014 00:40:29 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403070040.s270eTBm094704@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 7 Mar 2014 00:40:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347333 - in head/cad/leocad: . files 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 00:40:30 -0000 Author: nemysis Date: Fri Mar 7 00:40:29 2014 New Revision: 347333 URL: http://svnweb.freebsd.org/changeset/ports/347333 QAT: https://qat.redports.org/buildarchive/r347333/ Log: - Update to 0.80.2, Announce message: Added Look At command. Added orthographic projection option. Added editing of group names from the Edit Group Dialog. Fixed wrong transform of some pieces when importing nested LDraw files. Fixed printing and saving images on certain Intel video cards. Fixed grid studs being enabled by grid lines option. Fixed piece arrows not being drawn if the axis icon is enabled. Preserve groups when merging. Note that due to changes in Google Code I had to switch to Google Drive to host the files and I'll probably close the project there so if you had any links/bookmarks pointing to that page please update them. - Change master site from GOOGLE_CODE to my SF site, have used svn download from Trac and Google Drive for pieces - Add OPTIONS_SINGLE=LIBRARY and LDRAW, LEOCAD Options - Change dependency for cad/ldraw, only for LDRAW Option - Change dependency for archivers/unzip, only for LEOCAD Option - Change REINPLACE - Remove obsolete patch, changed by upstream, the /usr change was a request from the Debian maintainers Deleted: head/cad/leocad/files/ Modified: head/cad/leocad/Makefile head/cad/leocad/distinfo Modified: head/cad/leocad/Makefile ============================================================================== --- head/cad/leocad/Makefile Thu Mar 6 23:21:06 2014 (r347332) +++ head/cad/leocad/Makefile Fri Mar 7 00:40:29 2014 (r347333) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= leocad -PORTVERSION= 0.80.1 +PORTVERSION= 0.80.2 CATEGORIES= cad -MASTER_SITES= GOOGLE_CODE -DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz \ - ${LEOCAD_PIECES} +MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/ +DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src.tgz @@ -15,18 +14,14 @@ COMMENT= CAD program that uses bricks si LICENSE= GPLv2 -EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png -RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw WRKSRC= ${WRKDIR}/${PORTNAME} -LEOCAD_PIECES= pieces-7439.zip USES= desktop-file-utils gmake pkgconfig qmake shared-mime-info USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ corelib gui network opengl - USE_GL= glut USE_GNOME= gtk20 @@ -34,18 +29,35 @@ PORTDOCS= CREDITS.txt README.txt TODO.tx 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 128x128 256x256 +.include + +.if ${PORT_OPTIONS:MLDRAW} +RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw +.endif + +.if ${PORT_OPTIONS:MLEOCAD} +LEOCAD_PIECES= Library-Linux-7931.zip +DISTFILES+= ${LEOCAD_PIECES} +EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip post-extract: @${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces +.endif post-patch: - @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \ - -e 's|share/man/man1|man/man1|' \ + @${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 - @${REINPLACE_CMD} -e 's|docs.files = docs/README.txt docs/CREDITS.txt docs/COPYING.txt|docs.files = |' \ - ${WRKSRC}/${PORTNAME}.pro .for s in 16 24 32 48 128 256 @cd ${WRKSRC}/tools/icon && \ @@ -56,7 +68,13 @@ post-patch: 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 Modified: head/cad/leocad/distinfo ============================================================================== --- head/cad/leocad/distinfo Thu Mar 6 23:21:06 2014 (r347332) +++ head/cad/leocad/distinfo Fri Mar 7 00:40:29 2014 (r347333) @@ -1,4 +1,4 @@ -SHA256 (leocad/leocad-0.80.1-src.tgz) = e1db5db1ad9bf9b25eb760b88a4833caeba4e9b96bc793e76c9622a0160bc160 -SIZE (leocad/leocad-0.80.1-src.tgz) = 963073 -SHA256 (leocad/pieces-7439.zip) = f826115999296800a8cb22a85521eb019d8fbeb91e8a92d3485bcbf0e94a15fd -SIZE (leocad/pieces-7439.zip) = 22023619 +SHA256 (leocad/leocad-0.80.2-src.tgz) = 8f4bdea7f1259da62fb158e19e8f869fccb99fa33073a4db29190bee1ee16f30 +SIZE (leocad/leocad-0.80.2-src.tgz) = 965872 +SHA256 (leocad/Library-Linux-7931.zip) = 3afa911f0c8064392a54937fdff305066cd8e910d66b1dafd7dbb5758c4b7456 +SIZE (leocad/Library-Linux-7931.zip) = 24226538