Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 May 2013 22:03:40 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/178841: [MAINTAINER] astro/viking: update to 1.4.1
Message-ID:  <20130522200342.BE8DD9E3@hub.freebsd.org>
Resent-Message-ID: <201305222010.r4MKA08C077213@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178841
>Category:       ports
>Synopsis:       [MAINTAINER] astro/viking: update to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 22 20:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Jan 29 15:02:50 EST 2013
>Description:

- Update to 1.4.1
- Add new Uses
- Add NLS Options
- Trim desktop entry
- Trim pkg-plist, remove mtree

Generated and tested manually, tested with port test and with RedPortsd, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130418134200-13549/

>Fix:

--- viking-1.4.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/astro/viking/Makefile ./Makefile
--- /usr/ports/astro/viking/Makefile	2013-04-29 12:53:36.000000000 +0200
+++ ./Makefile	2013-05-22 21:47:33.000000000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/astro/viking/Makefile 316684 2013-04-27 18:31:47Z mva $
 
 PORTNAME=	viking
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -23,12 +22,12 @@
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
-USES=		iconv pkgconfig
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USES=		iconv desktop-file-utils pkgconfig
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
-USE_GNOME=	desktopfileutils gnomedocutils gtk20
+USE_GNOME=	gnomedocutils gtk20
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
@@ -39,11 +38,13 @@
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=	GEOTAG GPSD
-OPTIONS_DEFAULT=	GEOTAG
+OPTIONS_DEFINE=	NLS GEOTAG GPSD
+
 GEOTAG_DESC=	Geotag support
 GPSD_DESC=	Realtime GPS tracking
 
+OPTIONS_DEFAULT=	GEOTAG
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -68,6 +69,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' ${WRKSRC}/src/viking.desktop.in
 
 post-install:
 # Port not install in figures jpg and png, this is cleaner as patch
@@ -76,9 +78,8 @@
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
-	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/astro/viking/distinfo ./distinfo
--- /usr/ports/astro/viking/distinfo	2013-02-19 23:46:51.000000000 +0100
+++ ./distinfo	2013-05-21 14:30:49.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (viking-1.4.tar.gz) = 80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799
-SIZE (viking-1.4.tar.gz) = 1487470
+SHA256 (viking-1.4.1.tar.gz) = 20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640
+SIZE (viking-1.4.1.tar.gz) = 1490617
diff -ruN --exclude=CVS /usr/ports/astro/viking/pkg-plist ./pkg-plist
--- /usr/ports/astro/viking/pkg-plist	2013-02-19 23:46:51.000000000 +0100
+++ ./pkg-plist	2013-05-21 14:11:34.000000000 +0200
@@ -57,18 +57,9 @@
 %%DATADIR%%/maps.xml
 @dirrm %%DATADIR%%
 @dirrmtry share/omf/viking
-@dirrmtry share/omf
 %%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/jv
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrmtry share/gnome/help/viking/C/figures
 @dirrmtry share/gnome/help/viking/C
 @dirrmtry share/gnome/help/viking
-@dirrmtry share/gnome/help
-@dirrmtry share/gnome
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database  -q || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database  -q || /usr/bin/true
--- viking-1.4.1.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?20130522200342.BE8DD9E3>