svn commit: r324936 - head/astro/viking

[Rusmir Dusko]

Author: nemysis
Date: Sun Aug 18 20:45:45 2013
New Revision: 324936
URL: http://svnweb.freebsd.org/changeset/ports/324936

Log:
  - Update to 1.4.2
  - Change maintainer email gmx.ch --> FreeBSD.org
  - USES gmake iconv desktop-file-utils perl5 pkgconfig
  - Add DOCS Option
  - Add GPSD to default Options
  - Add OPTIONS_SUB
  - Trim NLS, GEOTAG and GPSD to use Options Helpers
  - Remove not needed patch, now are good installed in figures jpg and png
  - Trim pkg-plist, what Port install @dirrmtry --> @dirrm
  
  Approved by:	wg (mentor)

Modified:
  head/astro/viking/Makefile
  head/astro/viking/distinfo
  head/astro/viking/pkg-plist

Modified: head/astro/viking/Makefile
==============================================================================
--- head/astro/viking/Makefile	Sun Aug 18 20:40:02 2013	(r324935)
+++ head/astro/viking/Makefile	Sun Aug 18 20:45:45 2013	(r324936)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
-MAINTAINER=	nemysis at gmx.ch
+MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 
 LICENSE=	GPLv2
@@ -22,13 +21,12 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
-USES=		iconv desktop-file-utils pkgconfig
+USES=		gmake iconv desktop-file-utils perl5 pkgconfig
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	gnomedocutils gtk20
+USE_PERL5=	run
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5_RUN=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 
@@ -37,41 +35,27 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
-OPTIONS_DEFINE=		NLS GEOTAG GPSD
-OPTIONS_DEFAULT=	GEOTAG
+OPTIONS_DEFINE=		DOCS NLS GEOTAG GPSD
+OPTIONS_DEFAULT=	GEOTAG GPSD
 GEOTAG_DESC=	Geotag support
 GPSD_DESC=	Realtime GPS tracking
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MGEOTAG}
-LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
-.else
-CONFIGURE_ARGS+=	--disable-geotag
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+GEOTAG_LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif
+GEOTAG_CONFIGURE_ENABLE=geotag
+GPSD_LIB_DEPENDS=	gps:${PORTSDIR}/astro/gpsd
+GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
-.if ${PORT_OPTIONS:MGPSD}
-LIB_DEPENDS+=	gps:${PORTSDIR}/astro/gpsd
-.else
-CONFIGURE_ARGS+=	--disable-realtime-gps-tracking
-.endif
+.include <bsd.port.options.mk>
 
 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
-	@${RM} -f ${PREFIX}/share/gnome/help/viking/C/figures/*
-	@(cd ${WRKSRC}/help/C/figures && ${COPYTREE_SHARE} "*.jpg *.png" ${PREFIX}/share/gnome/help/viking/C/figures/)
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/astro/viking/distinfo
==============================================================================
--- head/astro/viking/distinfo	Sun Aug 18 20:40:02 2013	(r324935)
+++ head/astro/viking/distinfo	Sun Aug 18 20:45:45 2013	(r324936)
@@ -1,2 +1,2 @@
-SHA256 (viking-1.4.1.tar.gz) = 20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640
-SIZE (viking-1.4.1.tar.gz) = 1490617
+SHA256 (viking-1.4.2.tar.gz) = 58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1
+SIZE (viking-1.4.2.tar.gz) = 1503822

Modified: head/astro/viking/pkg-plist
==============================================================================
--- head/astro/viking/pkg-plist	Sun Aug 18 20:40:02 2013	(r324935)
+++ head/astro/viking/pkg-plist	Sun Aug 18 20:45:45 2013	(r324936)
@@ -56,10 +56,10 @@ share/pixmaps/viking.png
 %%DATADIR%%/goto_tools.xml
 %%DATADIR%%/maps.xml
 @dirrm %%DATADIR%%
- at dirrmtry share/omf/viking
+ at dirrm share/omf/viking
 %%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/jv
- at dirrmtry share/gnome/help/viking/C/figures
- at dirrmtry share/gnome/help/viking/C
- at dirrmtry share/gnome/help/viking
+ at dirrm share/gnome/help/viking/C/figures
+ at dirrm share/gnome/help/viking/C
+ at dirrm share/gnome/help/viking
 @dirrmtry share/applications