diff options
Diffstat (limited to 'misc/zyGrib')
| -rw-r--r-- | misc/zyGrib/Makefile | 10 | ||||
| -rw-r--r-- | misc/zyGrib/distinfo | 10 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-aa | 22 |
3 files changed, 27 insertions, 15 deletions
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile index 54ee14a3244..5b0ab3a9831 100644 --- a/misc/zyGrib/Makefile +++ b/misc/zyGrib/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2011/01/13 13:38:52 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2011/01/22 09:53:46 plunky Exp $ # -DISTNAME= zyGrib-3.9.7 -PKGREVISION= 2 +DISTNAME= zyGrib-3.9.9 CATEGORIES= misc -MASTER_SITES= http://www.zygrib.org/files/ +MASTER_SITES= http://www.zygrib.org/getfile.php?file= EXTRACT_SUFX= .tgz MAINTAINER= plunky@rya-online.net @@ -18,6 +17,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_LANGUAGES= c c++ USE_TOOLS+= make +CONFIGURE_ENV+= QTDIR=${QTDIR} + PKG_DESTDIR_SUPPORT= user-destdir SUBST_CLASSES+= paths @@ -123,4 +124,5 @@ do-install: .include "../../geography/proj/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" +.include "../../x11/qwt-qt4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo index 479c57b551e..1682ef127de 100644 --- a/misc/zyGrib/distinfo +++ b/misc/zyGrib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/11/08 18:42:44 plunky Exp $ +$NetBSD: distinfo,v 1.6 2011/01/22 09:53:46 plunky Exp $ -SHA1 (zyGrib-3.9.7.tgz) = 177c7a20ecdbffef5c3ede7ff36a8fb63bcc6db5 -RMD160 (zyGrib-3.9.7.tgz) = 8c01fdaa56a6e0a6835f165a833bb68af0df0cf4 -Size (zyGrib-3.9.7.tgz) = 16547934 bytes -SHA1 (patch-aa) = 8a72c6fe1e99a4c4a28e3b0f13c22733e4de7b74 +SHA1 (zyGrib-3.9.9.tgz) = 3641f23b49e2177fca830f45d027511c53712187 +RMD160 (zyGrib-3.9.9.tgz) = e860cb4d1a2e09cc716956f6c741ce5a37de23f2 +Size (zyGrib-3.9.9.tgz) = 16638803 bytes +SHA1 (patch-aa) = c15ab1aa116a6d81477e173bb246fc7c5bee1d18 SHA1 (patch-ab) = 0be80e7d5b784da70b65db3eb7d31aa62f660a1d diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa index b37eef7a518..d8add6dda00 100644 --- a/misc/zyGrib/patches/patch-aa +++ b/misc/zyGrib/patches/patch-aa @@ -1,19 +1,29 @@ -$NetBSD: patch-aa,v 1.3 2010/10/16 06:50:52 plunky Exp $ +$NetBSD: patch-aa,v 1.4 2011/01/22 09:53:46 plunky Exp $ libbz2, libz and libproj are all provided by the buildlink3.mk framework; no need to use private versions. ---- zyGrib.pro.orig 2009-04-10 23:07:17.000000000 +0000 +--- zyGrib.pro.orig 2011-01-07 21:18:45.000000000 +0000 +++ zyGrib.pro @@ -5,9 +5,9 @@ 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 += . util map GUI curvedrawer bzip2 zlib-1.2.3 proj-4.6.0/src ++INCLUDEPATH += . util map GUI curvedrawer -LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj +LIBS += -lbz2 -lz -lproj - CFLAGS += -std=c99 - + # ---------------------------------------------------- + # platform specific +@@ -27,8 +27,7 @@ + ICON = ../img/zyGrib.icns + } + else { +- INCLUDEPATH += /usr/include/qwt-qt4/ +- LIBS += -lqwt-qt4 ++ LIBS += -lqwt + DESTDIR = . + } + } |