From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 21 23:00:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FA331065673 for ; Tue, 21 Apr 2009 23:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F2C7B8FC1A for ; Tue, 21 Apr 2009 23:00:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LN05Ad090722 for ; Tue, 21 Apr 2009 23:00:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3LN05vB090721; Tue, 21 Apr 2009 23:00:05 GMT (envelope-from gnats) Resent-Date: Tue, 21 Apr 2009 23:00:05 GMT Resent-Message-Id: <200904212300.n3LN05vB090721@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, slaven@rezic.de Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7EC4106566B for ; Tue, 21 Apr 2009 22:59:54 +0000 (UTC) (envelope-from slaven@rezic.de) Received: from mail.ixls.org (mail3.ixls.de [78.47.208.109]) by mx1.freebsd.org (Postfix) with ESMTP id 7DC258FC18 for ; Tue, 21 Apr 2009 22:59:53 +0000 (UTC) (envelope-from slaven@rezic.de) Received: from e178122210.adsl.alicedsl.de ([85.178.122.210] helo=localhost.localdomain) by mail.ixls.org with esmtpa (Exim 4.63) id 1LwOTP-0002Oh-Dc; Wed, 22 Apr 2009 00:29:51 +0200 Received: from biokovo-amd64.herceg.de (localhost [127.0.0.1]) by biokovo-amd64.herceg.de (8.14.2/8.14.2) with ESMTP id n3LMGxh9098501; Wed, 22 Apr 2009 00:16:59 +0200 (CEST) (envelope-from eserte@biokovo-amd64.herceg.de) Received: (from eserte@localhost) by biokovo-amd64.herceg.de (8.14.2/8.14.2/Submit) id n3LMGxEM098500; Wed, 22 Apr 2009 00:16:59 +0200 (CEST) (envelope-from eserte) Message-Id: <200904212216.n3LMGxEM098500@biokovo-amd64.herceg.de> Date: Wed, 22 Apr 2009 00:16:59 +0200 (CEST) From: Slaven Rezic To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: slaven@rezic.de Subject: ports/133900: Update port: astro/merkaartor X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: slaven@rezic.de List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2009 23:00:06 -0000 >Number: 133900 >Category: ports >Synopsis: Update port: astro/merkaartor >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 21 23:00:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Slaven Rezic >Release: FreeBSD 7.0-RELEASE amd64 >Organization: www.rezic.de >Environment: System: FreeBSD biokovo-amd64.herceg.de 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 10:35:36 UTC 2008 root@driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Updated port to version 0.13.1. Included is also a hack to get the installation of translations working. This version is also required because of the recent change to the OpenStreetMap API 0.6. The old merkaartor version only supported API 0.5, which means that uploading data does not work anymore. >How-To-Repeat: >Fix: diff --git a/Makefile b/Makefile index 3b74c41..3792968 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,7 @@ # PORTNAME= merkaartor -PORTVERSION= 0.12 -PORTREVISION= 2 +PORTVERSION= 0.13.1 CATEGORIES= astro MASTER_SITES= http://www.merkaartor.org/downloads/source/ @@ -25,11 +24,27 @@ MAN1= merkaartor.1 HAS_CONFIGURE= yes -PLIST_FILES= bin/merkaartor - +PLIST_FILES= bin/merkaartor \ + share/merkaartor/translations/merkaartor_ar.qm \ + share/merkaartor/translations/merkaartor_cs.qm \ + share/merkaartor/translations/merkaartor_de.qm \ + share/merkaartor/translations/merkaartor_es.qm \ + share/merkaartor/translations/merkaartor_fr.qm \ + share/merkaartor/translations/merkaartor_it.qm \ + share/merkaartor/translations/merkaartor_pl.qm \ + share/merkaartor/translations/merkaartor_ru.qm +PLIST_DIRS= share/merkaartor/translations \ + share/merkaartor + +# 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} post-install: ${INSTALL_MAN} ${WRKSRC}/debian/merkaartor.1 ${PREFIX}/man/man1 diff --git a/distinfo b/distinfo index 2497fac..0e3250c 100644 --- a/distinfo +++ b/distinfo @@ -1,3 +1,3 @@ -MD5 (merkaartor-0.12.tar.bz2) = 662320392a7efe427ac1de1a891bdc05 -SHA256 (merkaartor-0.12.tar.bz2) = 56de6a19ab7ad703b50f18ea8935e042a1728449040ba62b1efcd57fbffafb58 -SIZE (merkaartor-0.12.tar.bz2) = 1266076 +MD5 (merkaartor-0.13.1.tar.bz2) = b3eccc1ccf1534a80258f5a24b13e661 +SHA256 (merkaartor-0.13.1.tar.bz2) = 1577d63cc6fd37ff548ea3836f1242755fbbdf8c2b5b1034b7d3b440b0532ef7 +SIZE (merkaartor-0.13.1.tar.bz2) = 3011810 diff --git a/files/patch-Merkaartor.pro b/files/patch-Merkaartor.pro new file mode 100644 index 0000000..ac00341 --- /dev/null +++ b/files/patch-Merkaartor.pro @@ -0,0 +1,11 @@ +--- 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 \ >Release-Note: >Audit-Trail: >Unformatted: