Date: Thu, 17 Dec 2009 00:02:21 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: slaven@rezic.de Subject: ports/141691: [PATCH] astro/merkaartor: update to 0.14 Message-ID: <20091216210221.EA8DAB84C@hades.panopticon> Resent-Message-ID: <200912162110.nBGLA1RX039085@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141691 >Category: ports >Synopsis: [PATCH] astro/merkaartor: update to 0.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 16 21:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 8.0-RELEASE i386 >Organization: >Environment: System: FreeBSD hades.panopticon 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Tue Nov 24 22:31:59 MSK 2009 >Description: - Update to 0.14 - Mark MAKE_JOBS_SAFE - Add option for GEOIMAGE - Use QMAKEFLAGS - Support WITHOUT_NLS Removed file(s): - files/patch-Merkaartor.pro Port maintainer (slaven@rezic.de) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- merkaartor-0.14.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 4 Aug 2009 21:35:49 -0000 1.7 +++ Makefile 16 Dec 2009 19:49:58 -0000 @@ -6,39 +6,46 @@ # PORTNAME= merkaartor -PORTVERSION= 0.13.2 -PORTREVISION= 2 +PORTVERSION= 0.14 CATEGORIES= astro MASTER_SITES= http://www.merkaartor.org/downloads/source/ MAINTAINER= slaven@rezic.de COMMENT= An openstreetmap mapping program -LIB_DEPENDS= exiv2:${PORTSDIR}/graphics/exiv2 - USE_BZIP2= yes USE_QT_VER= 4 -QT_COMPONENTS= qmake_build uic_build moc_build rcc_build linguist_build \ +QT_COMPONENTS= qmake_build uic_build moc_build rcc_build \ gui network svg webkit xml imageformats script scripttools +MAKE_JOBS_SAFE= yes + +QMAKEFLAGS= PREFIX=${PREFIX} MAN1= merkaartor.1 -HAS_CONFIGURE= yes +OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on + +.include <bsd.port.options.mk> + +.if !defined(WITHOUT_GEOIMAGE) +QMAKEFLAGS+= GEOIMAGE=1 +LIB_DEPENDS+= exiv2:${PORTSDIR}/graphics/exiv2 +.endif + +.if defined(WITHOUT_NLS) +PLIST_SUB+= NLS="@comment " +.else +PLIST_SUB+= NLS="" +QT_COMPONENTS+= linguist_build + +pre-build: + @cd ${WRKSRC}/translations && lrelease-qt4 ../src/src.pro +.endif -post-patch: - @${REINPLACE_CMD} -e 's|/lrelease|&-qt4|' \ - ${WRKSRC}/Merkaartor.pro - -# Don't ask. If the compiler_TSQM_make_all target is not called before -# calling qmake-qt4, then the install_translations target won't show -# up in the Makefile. do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} - cd ${WRKSRC} && ${MAKE} compiler_TSQM_make_all - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} + ${QMAKE} ${QMAKEFLAGS} post-install: ${INSTALL_MAN} ${WRKSRC}/debian/merkaartor.1 ${PREFIX}/man/man1 Index: distinfo =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/distinfo,v retrieving revision 1.3 diff -u -u -r1.3 distinfo --- distinfo 9 Jun 2009 13:36:58 -0000 1.3 +++ distinfo 15 Dec 2009 17:40:29 -0000 @@ -1,3 +1,3 @@ -MD5 (merkaartor-0.13.2.tar.bz2) = 0e6a65d723a7fa29f1e8c921a74d1893 -SHA256 (merkaartor-0.13.2.tar.bz2) = bc216c1785f84f1e554e0f457203f6ccb4f675c5871221f8b906b2cf79a0fd54 -SIZE (merkaartor-0.13.2.tar.bz2) = 3010664 +MD5 (merkaartor-0.14.tar.bz2) = eaba052e083c796fcc9ad8edebc19dec +SHA256 (merkaartor-0.14.tar.bz2) = efc9da3da199ba7899d1c8ebba8092b7d5d23288e108791037f3db487a1819b8 +SIZE (merkaartor-0.14.tar.bz2) = 5121445 Index: pkg-plist =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/pkg-plist,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist --- pkg-plist 23 Apr 2009 13:38:45 -0000 1.1 +++ pkg-plist 16 Dec 2009 20:40:15 -0000 @@ -1,11 +1,32 @@ bin/merkaartor -%%DATADIR%%/translations/merkaartor_ar.qm -%%DATADIR%%/translations/merkaartor_cs.qm -%%DATADIR%%/translations/merkaartor_de.qm -%%DATADIR%%/translations/merkaartor_es.qm -%%DATADIR%%/translations/merkaartor_fr.qm -%%DATADIR%%/translations/merkaartor_it.qm -%%DATADIR%%/translations/merkaartor_pl.qm -%%DATADIR%%/translations/merkaartor_ru.qm +lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so +lib/merkaartor/plugins/styles/libskulpture.so +share/applications/merkaartor.desktop +share/icons/hicolor/48x48/apps/merkaartor.png +%%DATADIR%%/BookmarksList.xml +%%DATADIR%%/Projections.xml +%%DATADIR%%/TmsServersList.xml +%%DATADIR%%/WmsServersList.xml +%%NLS%%%%DATADIR%%/translations/merkaartor_ar.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_cs.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_de.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_es.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_fr.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_it.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_ja.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_nl.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_pl.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_ru.qm +%%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm +%%DATADIR%%/world_background.osb @dirrm %%DATADIR%%/translations @dirrm %%DATADIR%% +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/applications +@dirrm lib/merkaartor/plugins/styles +@dirrm lib/merkaartor/plugins/background +@dirrm lib/merkaartor/plugins +@dirrm lib/merkaartor Index: files/patch-Merkaartor.pro =================================================================== RCS file: files/patch-Merkaartor.pro diff -N files/patch-Merkaartor.pro --- files/patch-Merkaartor.pro 23 Apr 2009 13:38:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- Merkaartor.pro.orig 2009-03-27 16:41:05.000000000 +0100 -+++ Merkaartor.pro 2009-04-21 23:41:43.231724554 +0200 -@@ -85,7 +85,7 @@ - translations/merkaartor_ar.qm \ - translations/merkaartor_cs.qm \ - translations/merkaartor_de.qm \ -- translations/merkaartor_es.ts \ -+ translations/merkaartor_es.qm \ - translations/merkaartor_fr.qm \ - translations/merkaartor_it.qm \ - translations/merkaartor_pl.qm \ --- merkaartor-0.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091216210221.EA8DAB84C>