cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to viking 1.6.

Browse Source
This commit is contained in:
landry 2015-04-02 13:59:31 +00:00
parent 8a0cffc098
commit 0ae5bc8384
5 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
geo/viking/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.25 2015/03/27 08:11:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2015/04/02 13:59:31 landry Exp $
COMMENT = GPS track manager
DISTNAME = viking-1.5.1
REVISION = 1
DISTNAME = viking-1.6
CATEGORIES = geo x11
@ -26,7 +25,8 @@ USE_GMAKE = Yes
LIB_DEPENDS = archivers/bzip2 \
devel/libidn \
devel/libmagic \
graphics/libexif \
graphics/libgexiv2 \
graphics/mapnik \
misc/gpsd \
net/curl \
x11/gtk+2
@ -35,9 +35,13 @@ RUN_DEPENDS = geo/gpsbabel
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo crypto curl expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gthread-2.0 gps gtk-x11-2.0 exif
WANTLIB += idn m magic pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread ssl z
WANTLIB += gobject-2.0 gthread-2.0 gps gtk-x11-2.0
WANTLIB += idn m magic pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pthread ssl z gexiv2 mapnik sqlite3 stdc++
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
post-install:
@rm -f ${PREFIX}/share/gnome/help/viking/C/figures/*

4
geo/viking/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (viking-1.5.1.tar.bz2) = bFYMhmURJzLldREOmjFmOM8njwO17Nkv+IRUGcs9U+w=
SIZE (viking-1.5.1.tar.bz2) = 1616172
SHA256 (viking-1.6.tar.bz2) = IfG9NyxXG40CHkUJpp7GRI7+/sYjNVqdsmzYGJi1kgo=
SIZE (viking-1.6.tar.bz2) = 3060389

21
geo/viking/patches/patch-configure Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2015/04/02 13:59:32 landry Exp $
--- configure.orig Mon Mar 30 00:36:00 2015
+++ configure Thu Apr 2 15:18:27 2015
@@ -11755,7 +11755,7 @@ if ${ac_cv_lib_mapnik_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmapnik $LIBS"
+LIBS="-L${X11BASE}/lib -lmapnik $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -11784,7 +11784,7 @@ if test "x$ac_cv_lib_mapnik_main" = xyes; then :
#define HAVE_LIBMAPNIK 1
_ACEOF
- LIBS="-lmapnik $LIBS"
+ LIBS="-L${X11BASE}/lib -lmapnik $LIBS"
else
as_fn_error $? "libmapnik is needed but not found." "$LINENO" 5

8
geo/viking/patches/patch-src_gpspoint_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_gpspoint_c,v 1.1.1.1 2010/10/23 15:40:19 landry Exp $
$OpenBSD: patch-src_gpspoint_c,v 1.2 2015/04/02 13:59:32 landry Exp $
taken from pkgsrc/geography/viking/patch-aa
http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=40695
--- src/gpspoint.c.orig Thu Jan 14 21:19:52 2010
+++ src/gpspoint.c Sat Oct 23 11:27:25 2010
@@ -81,8 +81,8 @@ static gdouble line_altitude = VIK_DEFAULT_ALTITUDE;
--- src/gpspoint.c.orig Tue Oct 21 22:25:06 2014
+++ src/gpspoint.c Thu Apr 2 15:01:24 2015
@@ -88,8 +88,8 @@ static gdouble line_altitude = VIK_DEFAULT_ALTITUDE;
static gboolean line_visible = TRUE;
static gboolean line_extended = FALSE;

10
geo/viking/pkg/PLIST
View File

@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST,v 1.8 2014/06/06 11:18:24 kirby Exp $
@comment $OpenBSD: PLIST,v 1.9 2015/04/02 13:59:32 landry Exp $
@bin bin/viking
share/applications/viking.desktop
share/gnome/
share/gnome/help/
share/gnome/help/viking/
share/gnome/help/viking/C/
share/gnome/help/viking/C/attribution.xml
share/gnome/help/viking/C/commandline.xml
share/gnome/help/viking/C/figures/
share/gnome/help/viking/C/figures/DEM_file_info_dialog.png
share/gnome/help/viking/C/figures/LayersTracksList.png
@ -18,6 +20,7 @@ share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg
share/gnome/help/viking/C/figures/WaypointsList.png
share/gnome/help/viking/C/figures/addtr_18.png
share/gnome/help/viking/C/figures/addwp_18.png
share/gnome/help/viking/C/figures/customize_toolbar_dialog.png
share/gnome/help/viking/C/figures/demdl_18.png
share/gnome/help/viking/C/figures/edtr_18.png
share/gnome/help/viking/C/figures/edwp_18.png
@ -36,7 +39,10 @@ share/gnome/help/viking/C/figures/trw_statusbar.png
share/gnome/help/viking/C/figures/vik_new_route_18.png
share/gnome/help/viking/C/figures/zoom_18.png
share/gnome/help/viking/C/figures/zoom_status_popup.png
share/gnome/help/viking/C/georef_layer.xml
share/gnome/help/viking/C/legal.xml
share/gnome/help/viking/C/mapnik_rendering_layer.xml
share/gnome/help/viking/C/recommends.xml
share/gnome/help/viking/C/viking.xml
share/icons/hicolor/48x48/apps/viking.png
share/locale/ast/LC_MESSAGES/viking.mo
@ -57,6 +63,7 @@ share/locale/ja/LC_MESSAGES/viking.mo
share/locale/jv/
share/locale/jv/LC_MESSAGES/
share/locale/jv/LC_MESSAGES/viking.mo
share/locale/ko/LC_MESSAGES/viking.mo
share/locale/lt/LC_MESSAGES/viking.mo
share/locale/lv/LC_MESSAGES/viking.mo
share/locale/nb/LC_MESSAGES/viking.mo
@ -76,6 +83,7 @@ share/omf/viking/viking-C.omf
share/viking/
share/viking/external_tools.xml
share/viking/goto_tools.xml
share/viking/latlontz.txt
share/viking/maps.xml
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor