Bug 181381 - astro/qlandkartegt : upgrade to 1.7.3
Summary: astro/qlandkartegt : upgrade to 1.7.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Max Brazhnikov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-08-18 18:00 UTC by Christoph Moench-Tegeder
Modified: 2013-08-22 23:50 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Moench-Tegeder freebsd_committer 2013-08-18 18:00:00 UTC
	This PR obsoletes ports/177991.
	QLandkarteGT 1.7.3 was released, so here is the upgrade.
	As in ports/177991, I'm dropping the wrapper script around
	qlandkartegt and use the compiled qlandkartegt binary directly,
	as the wrapper doesn't work with current versions of the nvidia-driver
	(which was it's intended use case) anymore.

Fix: svn status:
M       Makefile
M       distinfo
D       files/qlandkartegt.in
M       pkg-plist



Regards,
Christoph--0PjzA9gz1LNcB82DzeC9joAT9uRgTDqiXhSpLLceMw9k5hSb
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 324917)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qlandkartegt
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.7.3
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
 
@@ -10,7 +9,7 @@
 MAINTAINER=	i@levsha.me
 COMMENT=	The ultimate outdoor aficionado's tool
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
 LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 		proj:${PORTSDIR}/graphics/proj \
@@ -21,12 +20,6 @@
 		moc_build uic_build rcc_build qmake_build
 USE_GL=		glu
 
-SUB_FILES=	qlandkartegt
-
 MAN1=		qlandkartegt.1
 
-post-install:
-	${MV} ${PREFIX}/bin/qlandkartegt ${PREFIX}/bin/qlandkartegt.bin
-	${INSTALL_SCRIPT} ${WRKDIR}/qlandkartegt ${PREFIX}/bin
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 324917)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qlandkartegt-1.5.1.tar.gz) = 095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd
-SIZE (qlandkartegt-1.5.1.tar.gz) = 7113881
+SHA256 (qlandkartegt-1.7.3.tar.gz) = dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c
+SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026
Index: files/qlandkartegt.in
===================================================================
--- files/qlandkartegt.in	(revision 324917)
+++ files/qlandkartegt.in	(working copy)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if ( ldd %%LOCALBASE%%/lib/libGL.so | fgrep -Fq libnvidia )
-then
-	LD_PRELOAD="$(ls %%LOCALBASE%%/lib/XXX-libGL.so.*.%%.libGL-*|tail -1)"
-	export LD_PRELOAD
-fi
-
-%%PREFIX%%/bin/qlandkartegt.bin
-
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 324917)
+++ pkg-plist	(working copy)
@@ -1,8 +1,9 @@
 bin/cache2gtiff
 bin/map2gcm
+bin/map2jnx
 bin/map2rmap
+bin/map2rmp
 bin/qlandkartegt
-bin/qlandkartegt.bin
 share/applications/qlandkartegt.desktop
 share/pixmaps/qlandkartegt.png
 %%DATADIR%%/translations/qlandkartegt_cs.qm
@@ -14,5 +15,5 @@
 %%DATADIR%%/translations/qlandkartegt_nl.qm
 %%DATADIR%%/translations/qlandkartegt_ru.qm
 @dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
Comment 1 Edwin Groothuis freebsd_committer 2013-08-18 18:00:08 UTC
Maintainer of astro/qlandkartegt,

Please note that PR ports/181381 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/181381

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2013-08-18 18:00:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Max Brazhnikov freebsd_committer 2013-08-22 13:18:23 UTC
Responsible Changed
From-To: freebsd-ports-bugs->makc

I'll take it.
Comment 4 Max Brazhnikov freebsd_committer 2013-08-22 13:21:51 UTC
State Changed
From-To: feedback->open

maintainer timeout on ports/177991
Comment 5 Max Brazhnikov freebsd_committer 2013-08-22 22:43:25 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer 2013-08-22 23:47:12 UTC
Author: makc
Date: Thu Aug 22 21:42:42 2013
New Revision: 325235
URL: http://svnweb.freebsd.org/changeset/ports/325235

Log:
  - Update to 1.7.3
  - Remove no longer needed wrapper script
  - Update LICENSE
  
  PR:		ports/181381,
  		ports/177991
  Submitted by:	Christoph Moench-Tegeder <cmt at burggraben.net>
  Approved by:	maintainer timeout (4 months)

Deleted:
  head/astro/qlandkartegt/files/qlandkartegt.in
Modified:
  head/astro/qlandkartegt/Makefile
  head/astro/qlandkartegt/distinfo
  head/astro/qlandkartegt/pkg-plist

Modified: head/astro/qlandkartegt/Makefile
==============================================================================
--- head/astro/qlandkartegt/Makefile	Thu Aug 22 21:38:57 2013	(r325234)
+++ head/astro/qlandkartegt/Makefile	Thu Aug 22 21:42:42 2013	(r325235)
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	qlandkartegt
-PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTVERSION=	1.7.3
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
 
 MAINTAINER=	i@levsha.me
 COMMENT=	The ultimate outdoor aficionado's tool
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
 LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 		proj:${PORTSDIR}/graphics/proj \
@@ -21,12 +20,6 @@ USE_QT4=	dbus gui opengl network sql xml
 		moc_build uic_build rcc_build qmake_build
 USE_GL=		glu
 
-SUB_FILES=	qlandkartegt
-
 MAN1=		qlandkartegt.1
 
-post-install:
-	${MV} ${PREFIX}/bin/qlandkartegt ${PREFIX}/bin/qlandkartegt.bin
-	${INSTALL_SCRIPT} ${WRKDIR}/qlandkartegt ${PREFIX}/bin
-
 .include <bsd.port.mk>

Modified: head/astro/qlandkartegt/distinfo
==============================================================================
--- head/astro/qlandkartegt/distinfo	Thu Aug 22 21:38:57 2013	(r325234)
+++ head/astro/qlandkartegt/distinfo	Thu Aug 22 21:42:42 2013	(r325235)
@@ -1,2 +1,2 @@
-SHA256 (qlandkartegt-1.5.1.tar.gz) = 095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd
-SIZE (qlandkartegt-1.5.1.tar.gz) = 7113881
+SHA256 (qlandkartegt-1.7.3.tar.gz) = dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c
+SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026

Modified: head/astro/qlandkartegt/pkg-plist
==============================================================================
--- head/astro/qlandkartegt/pkg-plist	Thu Aug 22 21:38:57 2013	(r325234)
+++ head/astro/qlandkartegt/pkg-plist	Thu Aug 22 21:42:42 2013	(r325235)
@@ -1,8 +1,9 @@
 bin/cache2gtiff
 bin/map2gcm
+bin/map2jnx
 bin/map2rmap
+bin/map2rmp
 bin/qlandkartegt
-bin/qlandkartegt.bin
 share/applications/qlandkartegt.desktop
 share/pixmaps/qlandkartegt.png
 %%DATADIR%%/translations/qlandkartegt_cs.qm
@@ -14,5 +15,5 @@ share/pixmaps/qlandkartegt.png
 %%DATADIR%%/translations/qlandkartegt_nl.qm
 %%DATADIR%%/translations/qlandkartegt_ru.qm
 @dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"