diff options
| author | joerg <joerg@pkgsrc.org> | 2014-10-20 20:08:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-10-20 20:08:09 +0000 |
| commit | c6e5b9036f552880ba0a7ce69d4ca3b62d3164e2 (patch) | |
| tree | 514f0155f90892c8428cb9dc4ef86496fe0a61e3 | |
| parent | eba8c50f451cfdaf69f3c6505f8f7d3351907da0 (diff) | |
| download | pkgsrc-c6e5b9036f552880ba0a7ce69d4ca3b62d3164e2.tar.gz | |
Make sure that qwt-qt4 users don't pick up qwt6-qt4.
| -rw-r--r-- | geography/qgis/Makefile | 4 | ||||
| -rw-r--r-- | graphics/scidavis/Makefile | 4 | ||||
| -rw-r--r-- | ham/gnuradio-qtgui/Makefile | 3 | ||||
| -rw-r--r-- | x11/py-qwt-qt4/Makefile | 3 | ||||
| -rw-r--r-- | x11/qwt-qt4/buildlink3.mk | 6 |
5 files changed, 11 insertions, 9 deletions
diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile index 40601511d5c..247dec1f0a0 100644 --- a/geography/qgis/Makefile +++ b/geography/qgis/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2014/06/05 18:28:34 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2014/10/20 20:08:09 joerg Exp $ DISTNAME= qgis-1.7.4 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= geography MASTER_SITES= http://qgis.org/downloads/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/scidavis/Makefile b/graphics/scidavis/Makefile index 31790ecc09f..b0a3d59ab8d 100644 --- a/graphics/scidavis/Makefile +++ b/graphics/scidavis/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:03 tron Exp $ +# $NetBSD: Makefile,v 1.29 2014/10/20 20:08:09 joerg Exp $ # DISTNAME= scidavis-0.2.4 -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scidavis/} EXTRACT_SUFX= .tar.bz2 diff --git a/ham/gnuradio-qtgui/Makefile b/ham/gnuradio-qtgui/Makefile index 3722dc9e7a1..ad0b23231f4 100644 --- a/ham/gnuradio-qtgui/Makefile +++ b/ham/gnuradio-qtgui/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2014/10/13 12:51:10 mef Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/20 20:08:09 joerg Exp $ PKGNAME= gnuradio-qtgui-${VERSION} +PKGREVISION= 1 COMMENT= Qt GUI module of GNU Radio .include "../../ham/gnuradio-core/Makefile.common" diff --git a/x11/py-qwt-qt4/Makefile b/x11/py-qwt-qt4/Makefile index f6c0f0b8382..ace904312f7 100644 --- a/x11/py-qwt-qt4/Makefile +++ b/x11/py-qwt-qt4/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2014/10/02 03:47:28 mef Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/20 20:08:09 joerg Exp $ DISTNAME= PyQwt-5.2.0 PKGNAME= ${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//} +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqwt/} diff --git a/x11/qwt-qt4/buildlink3.mk b/x11/qwt-qt4/buildlink3.mk index 3dbdbc7743f..0e8d777b611 100644 --- a/x11/qwt-qt4/buildlink3.mk +++ b/x11/qwt-qt4/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.24 2013/06/06 12:53:43 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2014/10/20 20:08:09 joerg Exp $ BUILDLINK_TREE+= qwt .if !defined(QWT_BUILDLINK3_MK) QWT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qwt+= qwt>=5.2.0 -BUILDLINK_ABI_DEPENDS.qwt+= qwt>=5.2.2nb14 +BUILDLINK_API_DEPENDS.qwt+= qwt>=5.2.0<6 +BUILDLINK_ABI_DEPENDS.qwt+= qwt>=5.2.2nb14<6 BUILDLINK_PKGSRCDIR.qwt?= ../../x11/qwt-qt4 .include "../../x11/qt4-libs/buildlink3.mk" |