From nobody@FreeBSD.org  Mon Jul  5 17:59:10 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E3551065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  5 Jul 2010 17:59:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CFC28FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  5 Jul 2010 17:59:10 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o65Hx95U008957
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 5 Jul 2010 17:59:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o65Hx9Il008956;
	Mon, 5 Jul 2010 17:59:09 GMT
	(envelope-from nobody)
Message-Id: <201007051759.o65Hx9Il008956@www.freebsd.org>
Date: Mon, 5 Jul 2010 17:59:09 GMT
From: C-S <c-s@c-s.li>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] astro/merkaartor
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: slaven@rezic.de

>Number:         148384
>Category:       ports
>Synopsis:       [UPDATE] astro/merkaartor
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 05 18:00:05 UTC 2010
>Closed-Date:    Thu Aug 19 01:28:37 UTC 2010
>Last-Modified:  Thu Aug 19 01:30:03 UTC 2010
>Originator:     C-S
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.16.1.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -C 5 merkaartor.old/Makefile merkaartor.new/Makefile
*** merkaartor.old/Makefile	2010-07-05 19:45:21.393855025 +0200
--- merkaartor.new/Makefile	2010-07-05 19:56:29.020898681 +0200
***************
*** 4,32 ****
  #
  # $FreeBSD: ports/astro/merkaartor/Makefile,v 1.10 2010/03/28 06:30:36 dinoex Exp $
  #
  
  PORTNAME=	merkaartor
! PORTVERSION=	0.14
! PORTREVISION=	2
  CATEGORIES=	astro
! MASTER_SITES=	http://www.merkaartor.org/downloads/source/
  
  MAINTAINER=	slaven@rezic.de
  COMMENT=	An openstreetmap mapping program
  
  USE_BZIP2=	yes
  
  USE_QT_VER=	4
  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
- 
  OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on
  
  .include <bsd.port.options.mk>
  
  .if !defined(WITHOUT_GEOIMAGE)
--- 4,34 ----
  #
  # $FreeBSD: ports/astro/merkaartor/Makefile,v 1.10 2010/03/28 06:30:36 dinoex Exp $
  #
  
  PORTNAME=	merkaartor
! PORTVERSION=	0.16.1
  CATEGORIES=	astro
! MASTER_SITES=	http://www.merkaartor.be/attachments/download/2/
  
  MAINTAINER=	slaven@rezic.de
  COMMENT=	An openstreetmap mapping program
  
+ LICENSE=	GPLv2
+ LICENSE_FILE=	${WRKSRC}/LICENSE
+ 
  USE_BZIP2=	yes
  
  USE_QT_VER=	4
  QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
  		gui network svg webkit xml imageformats script scripttools
  MAKE_JOBS_SAFE=	yes
+ INSTALLS_ICONS=	yes
+ USE_LDCONFIG=	yes
  
  QMAKEFLAGS=	PREFIX=${PREFIX}
  
  OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on
  
  .include <bsd.port.options.mk>
  
  .if !defined(WITHOUT_GEOIMAGE)
***************
*** 46,54 ****
  
  do-configure:
  	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
  		${QMAKE} ${QMAKEFLAGS}
  
- post-install:
- 	${INSTALL_MAN} ${WRKSRC}/debian/merkaartor.1 ${PREFIX}/man/man1
- 
  .include <bsd.port.mk>
--- 48,53 ----
diff -C 5 merkaartor.old/distinfo merkaartor.new/distinfo
*** merkaartor.old/distinfo	2010-07-05 19:45:21.392858017 +0200
--- merkaartor.new/distinfo	2010-07-05 19:56:29.019898267 +0200
***************
*** 1,3 ****
! MD5 (merkaartor-0.14.tar.bz2) = eaba052e083c796fcc9ad8edebc19dec
! SHA256 (merkaartor-0.14.tar.bz2) = efc9da3da199ba7899d1c8ebba8092b7d5d23288e108791037f3db487a1819b8
! SIZE (merkaartor-0.14.tar.bz2) = 5121445
--- 1,3 ----
! MD5 (merkaartor-0.16.1.tar.bz2) = 2da9635619df7251cd16da72970b250d
! SHA256 (merkaartor-0.16.1.tar.bz2) = c1ca13a037060c367e93d895a92f5de8da344a753d43bd5119de15473e918a4b
! SIZE (merkaartor-0.16.1.tar.bz2) = 5794456
diff -C 5 merkaartor.old/pkg-descr merkaartor.new/pkg-descr
*** merkaartor.old/pkg-descr	2010-07-05 19:45:21.392858017 +0200
--- merkaartor.new/pkg-descr	2010-07-05 19:56:29.020898681 +0200
***************
*** 1,7 ****
! Merkaartor is an openstreetmap mapping program. Merkaartor focuses on
! providing a visually pleasing but performant editing environment for
! free geographical data.
! 
! It is based on Qt4.
  
  WWW: http://www.merkaartor.org/
--- 1,5 ----
! Merkaartor is an openstreetmap mapping program. Merkaartor focuses on providing
! a visually pleasing but performant editing environment for free geographical
! data.
  
  WWW: http://www.merkaartor.org/
diff -C 5 merkaartor.old/pkg-plist merkaartor.new/pkg-plist
*** merkaartor.old/pkg-plist	2010-07-05 19:45:21.393855025 +0200
--- merkaartor.new/pkg-plist	2010-07-05 19:56:29.019898267 +0200
***************
*** 1,32 ****
  bin/merkaartor
  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
--- 1,42 ----
  bin/merkaartor
+ lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
  lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
+ lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
  lib/merkaartor/plugins/styles/libskulpture.so
  share/applications/merkaartor.desktop
  share/icons/hicolor/48x48/apps/merkaartor.png
+ share/licenses/merkaartor-0.16.1/LICENSE
+ share/licenses/merkaartor-0.16.1/catalog.mk
  %%DATADIR%%/BookmarksList.xml
  %%DATADIR%%/Projections.xml
  %%DATADIR%%/TmsServersList.xml
  %%DATADIR%%/WmsServersList.xml
! %%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_ja.qm
! %%DATADIR%%/translations/merkaartor_nl.qm
! %%DATADIR%%/translations/merkaartor_pl.qm
! %%DATADIR%%/translations/merkaartor_pt.qm
! %%DATADIR%%/translations/merkaartor_pt_BR.qm
! %%DATADIR%%/translations/merkaartor_ru.qm
! %%DATADIR%%/translations/merkaartor_sk.qm
! %%DATADIR%%/translations/merkaartor_sv.qm
! %%DATADIR%%/translations/merkaartor_uk.qm
  %%DATADIR%%/world_background.osb
  @dirrm %%DATADIR%%/translations
  @dirrm %%DATADIR%%
! @dirrm share/licenses/merkaartor-0.16.1
! @dirrm share/licenses
! @dirrm share/icons/hicolor/48x48/apps
! @dirrm share/icons/hicolor/48x48
! @dirrm share/icons/hicolor
! @dirrm share/icons
! @dirrm share/applications
  @dirrm lib/merkaartor/plugins/styles
  @dirrm lib/merkaartor/plugins/background
  @dirrm lib/merkaartor/plugins
  @dirrm lib/merkaartor


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 5 18:00:28 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: slaven@rezic.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148384: [UPDATE] astro/merkaartor
Date: Mon, 5 Jul 2010 18:00:27 UT

 Maintainer of astro/merkaartor,
 
 Please note that PR ports/148384 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148384
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Tue Jul 6 02:08:41 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: C-S <c-s@c-s.li>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/148384: [UPDATE] astro/merkaartor
Date: Wed, 7 Jul 2010 01:35:06 +0400

 * C-S (c-s@c-s.li) wrote:
 
 Does not build:
 http://people.freebsd.org/~amdmi3/merkaartor-0.16.1.log
 
 > + USE_LDCONFIG=	yes
 
 Not needed.
 
 > ! %%NLS%%%%DATADIR%%/translations/merkaartor_ar.qm
 > --- 1,42 ----
 > ! %%DATADIR%%/translations/merkaartor_ar.qm
 
 Probably broken since translations are still installed conditionally.
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
State-Changed-From-To: feedback->open 
State-Changed-By: amdmi3 
State-Changed-When: Wed Jul 28 00:03:11 UTC 2010 
State-Changed-Why:  
Submitter & maintainer timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148384: [UPDATE] astro/merkaartor
Date: Wed, 28 Jul 2010 04:08:10 +0400

 > http://www.freebsd.org/cgi/query-pr.cgi?pr=148384
 
 Maintainer & submitter timeouts; I suggest the following patch, and will
 commit it by the weekend if there're no objections.
 
 --- merkaartor.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- Makefile	28 Mar 2010 06:30:36 -0000	1.10
 +++ Makefile	27 Jul 2010 23:35:25 -0000
 @@ -6,25 +6,27 @@
  #
  
  PORTNAME=	merkaartor
 -PORTVERSION=	0.14
 -PORTREVISION=	2
 +PORTVERSION=	0.16.1
  CATEGORIES=	astro
 -MASTER_SITES=	http://www.merkaartor.org/downloads/source/
 +MASTER_SITES=	http://www.merkaartor.be/attachments/download/2/
  
  MAINTAINER=	slaven@rezic.de
  COMMENT=	An openstreetmap mapping program
  
 +BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
 +
 +LICENSE=	GPLv2
 +
  USE_BZIP2=	yes
  
  USE_QT_VER=	4
  QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
  		gui network svg webkit xml imageformats script scripttools
  MAKE_JOBS_SAFE=	yes
 +INSTALLS_ICONS=	yes
  
  QMAKEFLAGS=	PREFIX=${PREFIX}
  
 -MAN1=		merkaartor.1
 -
  OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on
  
  .include <bsd.port.options.mk>
 @@ -48,7 +50,4 @@
  	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
  		${QMAKE} ${QMAKEFLAGS}
  
 -post-install:
 -	${INSTALL_MAN} ${WRKSRC}/debian/merkaartor.1 ${PREFIX}/man/man1
 -
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	30 Dec 2009 12:59:00 -0000	1.4
 +++ distinfo	6 Jul 2010 13:01:35 -0000
 @@ -1,3 +1,3 @@
 -MD5 (merkaartor-0.14.tar.bz2) = eaba052e083c796fcc9ad8edebc19dec
 -SHA256 (merkaartor-0.14.tar.bz2) = efc9da3da199ba7899d1c8ebba8092b7d5d23288e108791037f3db487a1819b8
 -SIZE (merkaartor-0.14.tar.bz2) = 5121445
 +MD5 (merkaartor-0.16.1.tar.bz2) = 2da9635619df7251cd16da72970b250d
 +SHA256 (merkaartor-0.16.1.tar.bz2) = c1ca13a037060c367e93d895a92f5de8da344a753d43bd5119de15473e918a4b
 +SIZE (merkaartor-0.16.1.tar.bz2) = 5794456
 Index: pkg-descr
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr	15 Jan 2009 01:44:35 -0000	1.1
 +++ pkg-descr	27 Jul 2010 23:36:10 -0000
 @@ -4,4 +4,4 @@
  
  It is based on Qt4.
  
 -WWW: http://www.merkaartor.org/
 +WWW: http://merkaartor.be/
 Index: pkg-plist
 ===================================================================
 RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/astro/merkaartor/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- pkg-plist	30 Dec 2009 12:59:00 -0000	1.2
 +++ pkg-plist	27 Jul 2010 23:14:49 -0000
 @@ -1,5 +1,7 @@
  bin/merkaartor
 +lib/merkaartor/plugins/background/libMWalkingPapersBackgroundPlugin.so
  lib/merkaartor/plugins/background/libMYahooBackgroundPlugin.so
 +lib/merkaartor/plugins/background/libMYahooTiledBackgroundPlugin.so
  lib/merkaartor/plugins/styles/libskulpture.so
  share/applications/merkaartor.desktop
  share/icons/hicolor/48x48/apps/merkaartor.png
 @@ -16,8 +18,12 @@
  %%NLS%%%%DATADIR%%/translations/merkaartor_ja.qm
  %%NLS%%%%DATADIR%%/translations/merkaartor_nl.qm
  %%NLS%%%%DATADIR%%/translations/merkaartor_pl.qm
 +%%NLS%%%%DATADIR%%/translations/merkaartor_pt.qm
 +%%NLS%%%%DATADIR%%/translations/merkaartor_pt_BR.qm
  %%NLS%%%%DATADIR%%/translations/merkaartor_ru.qm
 +%%NLS%%%%DATADIR%%/translations/merkaartor_sk.qm
  %%NLS%%%%DATADIR%%/translations/merkaartor_sv.qm
 +%%NLS%%%%DATADIR%%/translations/merkaartor_uk.qm
  %%DATADIR%%/world_background.osb
  @dirrm %%DATADIR%%/translations
  @dirrm %%DATADIR%%
 --- merkaartor.patch ends here ---
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
State-Changed-From-To: open->feedback 
State-Changed-By: amdmi3 
State-Changed-When: Wed Jul 28 00:18:52 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 
State-Changed-From-To: feedback->open 
State-Changed-By: amdmi3 
State-Changed-When: Thu Aug 19 01:27:47 UTC 2010 
State-Changed-Why:  
Feedback timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Thu Aug 19 01:28:36 UTC 2010 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148384 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148384: commit references a PR
Date: Thu, 19 Aug 2010 01:28:31 +0000 (UTC)

 amdmi3      2010-08-19 01:28:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     astro/merkaartor     Makefile distinfo pkg-descr pkg-plist 
   Log:
   - Update to 0.16.1
   
   PR:             148384
   Submitted by:   C-S <c-s@c-s.li>
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.11      +7 -8      ports/astro/merkaartor/Makefile
   1.5       +3 -3      ports/astro/merkaartor/distinfo
   1.2       +1 -1      ports/astro/merkaartor/pkg-descr
   1.3       +6 -0      ports/astro/merkaartor/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
