From owner-svn-ports-all@FreeBSD.ORG Tue Sep 17 19:14:03 2013 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 ESMTP id 60107C82; Tue, 17 Sep 2013 19:14:03 +0000 (UTC) (envelope-from nemysis@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 4C0CB2C0E; Tue, 17 Sep 2013 19:14:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HJE3nC033551; Tue, 17 Sep 2013 19:14:03 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HJE22V033545; Tue, 17 Sep 2013 19:14:02 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201309171914.r8HJE22V033545@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Sep 2013 19:14:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327502 - 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.14 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: Tue, 17 Sep 2013 19:14:03 -0000 Author: nemysis Date: Tue Sep 17 19:14:02 2013 New Revision: 327502 URL: http://svnweb.freebsd.org/changeset/ports/327502 Log: - Update to 0.80.1 - Change maintainer email gmx.ch --> FreeBSD.org - Use the new format for LIB_DEPENDS - Add dependency for cad/ldraw - USES desktop-file-utils gmake pkgconfig shared-mime-info - Add USE_QT4 Approved by: tabwg/pawel (mentors) Added: head/cad/leocad/files/patch-qt-qtmain.cpp (contents, props changed) Deleted: head/cad/leocad/files/patch-config.mk Modified: head/cad/leocad/Makefile head/cad/leocad/distinfo head/cad/leocad/pkg-plist Modified: head/cad/leocad/Makefile ============================================================================== --- head/cad/leocad/Makefile Tue Sep 17 19:04:58 2013 (r327501) +++ head/cad/leocad/Makefile Tue Sep 17 19:14:02 2013 (r327502) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= leocad -PORTVERSION= 0.79.3 +PORTVERSION= 0.80.1 CATEGORIES= cad MASTER_SITES= GOOGLE_CODE DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz \ @@ -10,82 +10,76 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-sr DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-src.tgz -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= CAD program that uses bricks similar to those found in many toys LICENSE= GPLv2 EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png +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-7114.zip +LEOCAD_PIECES= pieces-7439.zip + +USES= desktop-file-utils gmake pkgconfig shared-mime-info +USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ + corelib gui network opengl -USES= gmake pkgconfig shared-mime-info USE_GL= glut USE_GNOME= gtk20 MAN1= leocad.1 -PORTDOCS= * - -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= CREDITS.txt README.txt - -DOCSRCDIR2= ${WRKSRC}/docs -DOCSDIR2= ${DOCSDIR}/docs -DOC_FILES2= LINUX.txt TODO.txt +PORTDOCS= CREDITS.txt README.txt TODO.txt INSTALLS_ICONS= yes ICON_SIZES= 16x16 24x24 32x32 48x48 128x128 256x256 OPTIONS_DEFINE= DOCS -.include +.include post-extract: @${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces post-patch: - @${REINPLACE_CMD} -e \ - 's|-ldl||' ${WRKSRC}/common/module.mk - @${REINPLACE_CMD} \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \ - -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - ${WRKSRC}/config.mk - @${REINPLACE_CMD} 's|share/man|man|g' \ - ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \ + -e 's|share/man/man1|man/man1|' \ + ${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 && \ ${MV} icon${s}.png ${PORTNAME}_${s}x${s}.png .endfor @cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png + @cd ${WRKSRC}/tools/icon && ${MV} icon.svg ${PORTNAME}.svg do-configure: - cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} post-install: @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR} .for s in ${ICON_SIZES} - ${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps + @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps ${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \ ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps + @${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg \ + ${PREFIX}/share/icons/hicolor/scalable/apps/ + @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1/ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - @${MKDIR} ${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} -.endif - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR} .endif -.include +.include Modified: head/cad/leocad/distinfo ============================================================================== --- head/cad/leocad/distinfo Tue Sep 17 19:04:58 2013 (r327501) +++ head/cad/leocad/distinfo Tue Sep 17 19:14:02 2013 (r327502) @@ -1,4 +1,4 @@ -SHA256 (leocad/leocad-0.79.3-src.tgz) = 588abe0b9415e550cb5087af131fd048228ea9b8e79e8ef831f104e3e5faf703 -SIZE (leocad/leocad-0.79.3-src.tgz) = 2124587 -SHA256 (leocad/pieces-7114.zip) = 16506da21d139769524d140ce47bfce57bc5415f541fbd6f66a67025c1f535ab -SIZE (leocad/pieces-7114.zip) = 20546651 +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 Added: head/cad/leocad/files/patch-qt-qtmain.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/leocad/files/patch-qt-qtmain.cpp Tue Sep 17 19:14:02 2013 (r327502) @@ -0,0 +1,13 @@ +--- qt/qtmain.cpp.orig 2013-08-13 06:54:12.000000000 +0200 ++++ qt/qtmain.cpp 2013-08-30 23:52:45.000000000 +0200 +@@ -149,6 +149,10 @@ + const char* libPath = LC_INSTALL_PREFIX"/share/leocad/"; + #endif + ++#ifdef Q_OS_FREEBSD ++ const char* libPath = LC_INSTALL_PREFIX"/local/share/leocad/"; ++#endif ++ + #ifdef Q_OS_MAC + QDir bundlePath = QDir(QCoreApplication::applicationDirPath()); + bundlePath.cdUp(); Modified: head/cad/leocad/pkg-plist ============================================================================== --- head/cad/leocad/pkg-plist Tue Sep 17 19:04:58 2013 (r327501) +++ head/cad/leocad/pkg-plist Tue Sep 17 19:14:02 2013 (r327502) @@ -6,12 +6,13 @@ share/icons/hicolor/24x24/apps/leocad.pn share/icons/hicolor/256x256/apps/leocad.png share/icons/hicolor/32x32/apps/leocad.png share/icons/hicolor/48x48/apps/leocad.png +share/icons/hicolor/scalable/apps/leocad.svg share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg -%%DATADIR%%/icon.png %%DATADIR%%/library.bin share/mime/application/vnd.leocad.xml -share/mime/packages/leocad-mime.xml +share/mime/packages/leocad.xml share/pixmaps/leocad.png -share/pixmaps/leocad.svg +@dirrmtry share/mime/application +@dirrmtry share/mime @dirrm %%DATADIR%% @dirrmtry share/applications