ports/148384: [UPDATE] astro/merkaartor

Mon Jul 5 18:00:06 UTC 2010

>Number:         148384
>Category:       ports
>Synopsis:       [UPDATE] astro/merkaartor
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 05 18:00:05 UTC 2010
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted: