- Update to 1.4.1

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

PR:		178841
Submitted by:	maintainer

3 files changed, 10 insertions, 20 deletions

diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index de7622e14ae5..892b4321f2f2 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -22,12 +21,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 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 xcb 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
@@ -38,7 +37,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=	GEOTAG GPSD
+OPTIONS_DEFINE=		NLS GEOTAG GPSD
 OPTIONS_DEFAULT=	GEOTAG
 GEOTAG_DESC=	Geotag support
 GPSD_DESC=	Realtime GPS tracking
@@ -67,6 +66,7 @@ CONFIGURE_ARGS+=	--disable-realtime-gps-tracking
 
 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
@@ -75,9 +75,8 @@ post-install:
 	${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 --git a/astro/viking/distinfo b/astro/viking/distinfo
index c3ba0f491e20..2b8ae6f16f57 100644
--- a/astro/viking/distinfo
+++ b/astro/viking/distinfo
@@ -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 --git a/astro/viking/pkg-plist b/astro/viking/pkg-plist
index 33ab78c4a078..8960f0c7655b 100644
--- a/astro/viking/pkg-plist
+++ b/astro/viking/pkg-plist
@@ -57,18 +57,9 @@ share/pixmaps/viking.png
 %%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