Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
sambuc
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/zyGrib/Makefile
+14 -5
View File
@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.42 2014/02/12 23:18:16 tron Exp $
# $NetBSD: Makefile,v 1.45 2015/03/14 18:46:13 gdt Exp $
#
DISTNAME= zyGrib-6.0.1
PKGREVISION= 10
DISTNAME= zyGrib-7.0.0
PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.zygrib.org/getfile.php?file=
EXTRACT_SUFX= .tgz
MAINTAINER= plunky@rya-online.net
MAINTAINER= plunky@NetBSD.org
HOMEPAGE= http://www.zygrib.org/
COMMENT= GRIB file viewer for weather data
LICENSE= gnu-gpl-v3
@@ -24,7 +24,7 @@ SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_MESSAGE.paths= Fixing shared data paths.
SUBST_FILES.paths= util/Util.h
SUBST_SED.paths+= -e "s|\"data/|\"${PREFIX}/share/zyGrib/|"
SUBST_VARS.paths= PREFIX
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/zyGrib/colors
@@ -37,6 +37,7 @@ INSTALLATION_DIRS+= share/zyGrib/tr
INSTALL_FILES+= colors/colors_binary.txt
INSTALL_FILES+= colors/colors_cape_jkg.txt
INSTALL_FILES+= colors/colors_cin_jkg.txt
INSTALL_FILES+= colors/colors_clouds_black_pc.txt
INSTALL_FILES+= colors/colors_clouds_white_pc.txt
INSTALL_FILES+= colors/colors_current_kts.txt
@@ -45,9 +46,12 @@ INSTALL_FILES+= colors/colors_humidrel_pc.txt
INSTALL_FILES+= colors/colors_rain_mmh.txt
INSTALL_FILES+= colors/colors_snowdepth_m.txt
INSTALL_FILES+= colors/colors_temp_celcius.txt
INSTALL_FILES+= colors/colors_thetae_celcius.txt
INSTALL_FILES+= colors/colors_thetae_celcius_1.txt
INSTALL_FILES+= colors/colors_waveheight_m.txt
INSTALL_FILES+= colors/colors_whitecap_prb.txt
INSTALL_FILES+= colors/colors_whitecap_prb.txt.colors
INSTALL_FILES+= colors/colors_wind_jet_kts.txt
INSTALL_FILES+= colors/colors_wind_kts.txt
INSTALL_FILES+= gis/cities_10k-more.txt.gz
INSTALL_FILES+= gis/cities_3k-10k.txt.gz
@@ -59,6 +63,7 @@ INSTALL_FILES+= img/1leftarrow.png
INSTALL_FILES+= img/1rightarrow.png
INSTALL_FILES+= img/2leftarrow.png
INSTALL_FILES+= img/2rightarrow.png
INSTALL_FILES+= img/airport.png
INSTALL_FILES+= img/anim.png
INSTALL_FILES+= img/back.png
INSTALL_FILES+= img/connect_no.png
@@ -92,8 +97,11 @@ INSTALL_FILES+= img/player_playlist.png
INSTALL_FILES+= img/player_rew.png
INSTALL_FILES+= img/player_start.png
INSTALL_FILES+= img/player_stop.png
INSTALL_FILES+= img/printer.png
INSTALL_FILES+= img/reload.png
INSTALL_FILES+= img/resource.rc
INSTALL_FILES+= img/spreadsheet.png
INSTALL_FILES+= img/time_icon.png
INSTALL_FILES+= img/up.png
INSTALL_FILES+= img/viewmag+.png
INSTALL_FILES+= img/viewmag-.png
@@ -152,6 +160,7 @@ do-install:
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../geography/libnova/buildlink3.mk"
.include "../../geography/proj/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
misc/zyGrib/PLIST
+9 -1
View File
@@ -1,7 +1,8 @@
@comment $NetBSD: PLIST,v 1.7 2012/07/01 07:21:35 plunky Exp $
@comment $NetBSD: PLIST,v 1.8 2014/12/30 08:50:55 plunky Exp $
bin/zyGrib
share/zyGrib/colors/colors_binary.txt
share/zyGrib/colors/colors_cape_jkg.txt
share/zyGrib/colors/colors_cin_jkg.txt
share/zyGrib/colors/colors_clouds_black_pc.txt
share/zyGrib/colors/colors_clouds_white_pc.txt
share/zyGrib/colors/colors_current_kts.txt
@@ -10,9 +11,12 @@ share/zyGrib/colors/colors_humidrel_pc.txt
share/zyGrib/colors/colors_rain_mmh.txt
share/zyGrib/colors/colors_snowdepth_m.txt
share/zyGrib/colors/colors_temp_celcius.txt
share/zyGrib/colors/colors_thetae_celcius.txt
share/zyGrib/colors/colors_thetae_celcius_1.txt
share/zyGrib/colors/colors_waveheight_m.txt
share/zyGrib/colors/colors_whitecap_prb.txt
share/zyGrib/colors/colors_whitecap_prb.txt.colors
share/zyGrib/colors/colors_wind_jet_kts.txt
share/zyGrib/colors/colors_wind_kts.txt
share/zyGrib/gis/cities_10k-more.txt.gz
share/zyGrib/gis/cities_3k-10k.txt.gz
@@ -24,6 +28,7 @@ share/zyGrib/img/1leftarrow.png
share/zyGrib/img/1rightarrow.png
share/zyGrib/img/2leftarrow.png
share/zyGrib/img/2rightarrow.png
share/zyGrib/img/airport.png
share/zyGrib/img/anim.png
share/zyGrib/img/back.png
share/zyGrib/img/connect_no.png
@@ -57,8 +62,11 @@ share/zyGrib/img/player_playlist.png
share/zyGrib/img/player_rew.png
share/zyGrib/img/player_start.png
share/zyGrib/img/player_stop.png
share/zyGrib/img/printer.png
share/zyGrib/img/reload.png
share/zyGrib/img/resource.rc
share/zyGrib/img/spreadsheet.png
share/zyGrib/img/time_icon.png
share/zyGrib/img/up.png
share/zyGrib/img/viewmag+.png
share/zyGrib/img/viewmag-.png
misc/zyGrib/distinfo
+9 -8
View File
@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.18 2013/05/04 12:59:47 joerg Exp $
$NetBSD: distinfo,v 1.20 2015/01/25 21:39:40 plunky Exp $
SHA1 (zyGrib-6.0.1.tgz) = 8e6dd3acd84707a7a1717920d6e1219c90783335
RMD160 (zyGrib-6.0.1.tgz) = 6485f2a0d4418686579957db7a1b7bfc4f0b229d
Size (zyGrib-6.0.1.tgz) = 17243124 bytes
SHA1 (patch-ColorScale.cpp) = 9ddc09d64c7cf89c72ee66a17fcd003d6b0cdae6
SHA1 (patch-Terrain.cpp) = 83a2f54cebd466918ab1267f1c1d94ec0d88d8a4
SHA1 (patch-aa) = c56e9e8b3621d7b41a259bcf872f1707b8c164b6
SHA1 (patch-ab) = 7b9abde8a75ce0ebe5e2e35003041b827524af9f
SHA1 (zyGrib-7.0.0.tgz) = 376e7f813ac92f5e70163f90909d96a3912a0c61
RMD160 (zyGrib-7.0.0.tgz) = 5df3660963d9227269ccd304c7810e26f93a018c
Size (zyGrib-7.0.0.tgz) = 15287496 bytes
SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78
SHA1 (patch-Terrain.cpp) = cda31862011b758aa6b1c3655b9383dd1b38aceb
SHA1 (patch-aa) = 54bb3e7207a722f47667bb4c52d30084e5d5a675
SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8
SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7
misc/zyGrib/patches/patch-ColorScale.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ColorScale.cpp,v 1.1 2013/05/04 12:59:47 joerg Exp $
$NetBSD: patch-ColorScale.cpp,v 1.2 2014/12/30 08:50:55 plunky Exp $
--- ColorScale.cpp.orig 2013-05-04 00:40:33.000000000 +0000
--- ColorScale.cpp.orig 2014-11-02 00:01:52.000000000 +0000
+++ ColorScale.cpp
@@ -16,6 +16,7 @@ You should have received a copy of the G
along with this program. If not, see <http://www.gnu.org/licenses/>.
misc/zyGrib/patches/patch-Terrain.cpp
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-Terrain.cpp,v 1.2 2012/07/01 07:21:35 plunky Exp $
$NetBSD: patch-Terrain.cpp,v 1.3 2014/12/30 08:50:55 plunky Exp $
--- Terrain.cpp.orig 2012-06-03 21:03:41.000000000 +0000
--- Terrain.cpp.orig 2014-11-02 00:01:52.000000000 +0000
+++ Terrain.cpp
@@ -1032,7 +1032,7 @@ void Terrain::paintEvent(QPaintEvent * /
@@ -1109,7 +1109,7 @@ void Terrain::paintEvent(QPaintEvent *)
if (showOrthodromie)
{
misc/zyGrib/patches/patch-aa
+13 -12
View File
@@ -1,24 +1,25 @@
$NetBSD: patch-aa,v 1.8 2012/07/01 07:21:35 plunky Exp $
$NetBSD: patch-aa,v 1.9 2014/12/30 08:50:55 plunky Exp $
libbz2, libz and libproj are all provided by the buildlink3.mk
framework; no need to use private versions.
libraries are provided by the buildlink3.mk framework;
no need to provide paths
--- zyGrib.pro.orig 2012-06-03 21:03:41.000000000 +0000
--- zyGrib.pro.orig 2014-11-02 00:01:52.000000000 +0000
+++ zyGrib.pro
@@ -5,7 +5,7 @@ TEMPLATE = app
TARGET = zyGrib
DEPENDPATH += . util map GUI
-INCLUDEPATH += . util map GUI bzip2 zlib-1.2.3 proj-4.6.0/src
+INCLUDEPATH += . util map GUI
INCLUDEPATH += curvedrawer
-INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src
+INCLUDEPATH += . util map GUI curvedrawer
# LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj
@@ -31,7 +31,6 @@ macx {
ICON = ../data/img/zyGrib.icns
# ----------------------------------------------------
# platform specific
@@ -26,7 +26,7 @@ macx {
}
else {
- INCLUDEPATH += /usr/include/qwt
LIBS += -lbz2 -lz -lproj -lqwt
DESTDIR = .
- LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
+ LIBS += -lbz2 -lz -lproj -lnova -lqwt
}
}
# ----------------------------------------------------
misc/zyGrib/patches/patch-ab
+4 -4
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-ab,v 1.5 2012/07/01 07:21:35 plunky Exp $
$NetBSD: patch-ab,v 1.6 2014/12/30 08:50:55 plunky Exp $
--- map/Projection.h.orig 2012-06-03 21:03:41.000000000 +0000
--- map/Projection.h.orig 2014-11-02 00:01:52.000000000 +0000
+++ map/Projection.h
@@ -20,7 +20,7 @@ along with this program. If not, see <h
#define PROJECTION_H
@@ -21,7 +21,7 @@ along with this program. If not, see <h
#include <QObject>
#include <cstdio>
-#include "proj_api.h"
+#include <proj_api.h>
misc/zyGrib/patches/patch-util_Util.h
+33
View File
@@ -0,0 +1,33 @@
$NetBSD: patch-util_Util.h,v 1.1 2014/12/30 08:50:55 plunky Exp $
zyGrib normally runs in the build directory, but we install data files
to PREFIX/share/zyGrib, so fix the path part there.
--- util/Util.h.orig 2014-12-27 20:51:22.000000000 +0000
+++ util/Util.h
@@ -70,16 +70,16 @@ class Util : public QObject
static QString getOpenFileName (QWidget *parent, const QString &caption,
const QString &dir, const QString &filter=QString());
- static QString pathData () {return "./";};
- static QString pathColors () {return pathData()+"data/colors/";}
- static QString pathConfig () {return pathData()+"data/config/";}
- static QString pathFonts () {return pathData()+"data/fonts/";}
- static QString pathGis () {return pathData()+"data/gis/";}
- static QString pathGshhs () {return pathData()+"data/maps/gshhs/";}
- static QString pathStuff () {return pathData()+"data/stuff/";}
+ static QString pathData () {return "@PREFIX@/share/zyGrib/";};
+ static QString pathColors () {return pathData()+"colors/";}
+ static QString pathConfig () {return pathData()+"config/";}
+ static QString pathFonts () {return pathData()+"fonts/";}
+ static QString pathGis () {return pathData()+"gis/";}
+ static QString pathGshhs () {return pathData()+"maps/gshhs/";}
+ static QString pathStuff () {return pathData()+"stuff/";}
- static QString pathImg (const char *fname) {return pathData()+"data/img/"+fname;}
- static QString pathTr (QString lang) {return pathData()+"data/tr/zyGrib_"+lang;}
+ static QString pathImg (const char *fname) {return pathData()+"img/"+fname;}
+ static QString pathTr (QString lang) {return pathData()+"tr/zyGrib_"+lang;}
static QString getServerName ();
static void setSetting (const QString &key, const QVariant &value);