From f4e4ac6742b5396eadf240bdfb0774823466ecb9 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 9 Mar 2009 23:09:19 +0000 Subject: [PATCH] a few spec fixes and assorted pkg bumps, more to come. --- astro/py-metar/Makefile | 4 ++-- lang/python/Makefile.inc | 8 ++++---- lang/python/python.port.mk | 17 +++++++++++++---- lang/tcl/tcl.port.mk | 12 ++++++++---- multimedia/gstreamer-0.10/core/Makefile | 6 +++--- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/astro/py-metar/Makefile b/astro/py-metar/Makefile index ac39643758a..0c36154042a 100644 --- a/astro/py-metar/Makefile +++ b/astro/py-metar/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2007/12/18 20:54:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2009/03/09 23:09:19 espie Exp $ COMMENT= Python module to access the NOAA's METAR weather reports V= 0.13 DISTNAME= pymetar-${V} -PKGNAME= py-metar-${V} +PKGNAME= py-metar-${V}p0 CATEGORIES= astro HOMEPAGE= http://www.schwarzvogel.de/software-pymetar.shtml diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc index bb7ee1c52c8..3d4fa06f6dc 100644 --- a/lang/python/Makefile.inc +++ b/lang/python/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.57 2009/01/01 21:03:27 djm Exp $ +# $OpenBSD: Makefile.inc,v 1.58 2009/03/09 23:09:19 espie Exp $ # IMPORTANT! If you make any changes to the Python ports, be sure # to also update files/CHANGES.OpenBSD for your change. This is a @@ -56,12 +56,12 @@ WANTLIB-main= ssl panel m crypto c util z readline pthread \ LIB_DEPENDS-main+= sqlite3::databases/sqlite3 .endif -LIB_DEPENDS-bsddb= lib/db4/db.>=4:db-4.*:databases/db/v4 +LIB_DEPENDS-bsddb= lib/db4/db.>=4:db->=4,<5:databases/db/v4 LIB_DEPENDS-gdbm= gdbm.>=3::databases/gdbm RUN_DEPENDS-idle= ${RUN_DEPENDS} \ ::lang/python/${VERSION},-tkinter -LIB_DEPENDS-tkinter= tcl84:tcl-8.4.*:lang/tcl/8.4 \ - tk84:tk-8.4.*:x11/tk/8.4 +LIB_DEPENDS-tkinter= tcl84:tcl->=8.4,<8.5:lang/tcl/8.4 \ + tk84:tk->=8.4,<8.5:x11/tk/8.4 WANTLIB-tkinter= X11 FULLPKGNAME-bsddb= python-bsddb-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL} diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk index b91d165d372..230751c1b0f 100644 --- a/lang/python/python.port.mk +++ b/lang/python/python.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: python.port.mk,v 1.26 2009/01/01 21:03:27 djm Exp $ +# $OpenBSD: python.port.mk,v 1.27 2009/03/09 23:09:19 espie Exp $ # # python.port.mk - Xavier Santolaria # This file is in the public domain. @@ -8,10 +8,19 @@ SHARED_ONLY= Yes CATEGORIES+= lang/python MODPY_VERSION?= 2.5 +.if ${MODPY_VERSION} == 2.3 +MODPYSPEC=python->=${MODPY_VERSION},<2.4 +.elif ${MODPY_VERSION} == 2.4 +MODPYSPEC=python->=${MODPY_VERSION},<2.5 +.elif ${MODPY_VERSION} == 2.5 +MODPYSPEC=python->=${MODPY_VERSION},<2.6 +.elif ${MODPY_VERSION} == 2.6 +MODPYSPEC=python->=${MODPY_VERSION},<2.7 +.endif -MODPY_RUN_DEPENDS= :python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION} -MODPY_LIB_DEPENDS= python${MODPY_VERSION}:python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION} -_MODPY_BUILD_DEPENDS= :python-${MODPY_VERSION}*:lang/python/${MODPY_VERSION} +MODPY_RUN_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION} +MODPY_LIB_DEPENDS= python${MODPY_VERSION}:${MODPYSPEC}:lang/python/${MODPY_VERSION} +_MODPY_BUILD_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION} MODPY_RUNDEP?= Yes diff --git a/lang/tcl/tcl.port.mk b/lang/tcl/tcl.port.mk index 5a1404c08e0..4c67ece281e 100644 --- a/lang/tcl/tcl.port.mk +++ b/lang/tcl/tcl.port.mk @@ -1,17 +1,21 @@ -# $OpenBSD: tcl.port.mk,v 1.3 2009/02/15 22:27:44 sthen Exp $ +# $OpenBSD: tcl.port.mk,v 1.4 2009/03/09 23:09:19 espie Exp $ CATEGORIES += lang/tcl MODTCL_VERSION ?= 8.5 +.if ${MODTCL_VERSION} == 8.5 +_MODTCL_SPEC = tcl->=${MODTCL_VERSION},<8.6 +.endif + MODTCL_BIN ?= ${LOCALBASE}/bin/tclsh${MODTCL_VERSION} MODTCL_INCDIR ?= ${LOCALBASE}/include/tcl${MODTCL_VERSION} MODTCL_LIBDIR ?= ${LOCALBASE}/lib/tcl${MODTCL_VERSION} MODTCL_CONFIG ?= ${MODTCL_LIBDIR}/tclConfig.sh -MODTCL_BUILD_DEPENDS ?= :tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION} -MODTCL_RUN_DEPENDS ?= :tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION} -MODTCL_LIB_DEPENDS ?= tcl${MODTCL_VERSION:S/.//}:tcl-${MODTCL_VERSION}.*:lang/tcl/${MODTCL_VERSION} +MODTCL_BUILD_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} +MODTCL_RUN_DEPENDS ?= :${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} +MODTCL_LIB_DEPENDS ?= tcl${MODTCL_VERSION:S/.//}:${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION} # Handle the two most commonly used methods diff --git a/multimedia/gstreamer-0.10/core/Makefile b/multimedia/gstreamer-0.10/core/Makefile index 835a2500ac9..bc2b6266e41 100644 --- a/multimedia/gstreamer-0.10/core/Makefile +++ b/multimedia/gstreamer-0.10/core/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2008/06/21 21:03:55 deanna Exp $ +# $OpenBSD: Makefile,v 1.8 2009/03/09 23:09:19 espie Exp $ COMMENT-main = streaming media framework - core COMMENT-frontend = streaming media framework - frontend commands V = 0.10.19 -PKGNAME-main = gstreamer-$Vp0 -PKGNAME-frontend = gstreamer-frontend-$Vp0 +PKGNAME-main = gstreamer-$Vp1 +PKGNAME-frontend = gstreamer-frontend-$Vp1 DISTNAME = gstreamer-$V