aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--comms/wsjt/Makefile9
-rw-r--r--comms/wspr/Makefile9
-rw-r--r--devel/fnorb/Makefile10
-rw-r--r--devel/py-simpy/Makefile9
-rw-r--r--devel/pylint/Makefile3
-rw-r--r--games/ptkei/Makefile10
-rw-r--r--games/pyching/Makefile9
-rw-r--r--games/pysol/Makefile10
-rw-r--r--games/pysolfc/Makefile4
-rw-r--r--games/pythonchess/Makefile10
-rw-r--r--games/thudboard/Makefile9
-rw-r--r--graphics/py-imaging/Makefile12
-rw-r--r--graphics/py-opengl/Makefile12
-rw-r--r--math/asymptote/Makefile10
-rw-r--r--math/py-gato/Makefile9
-rw-r--r--misc/cuecat/Makefile10
-rw-r--r--net-im/pwytter/Makefile4
-rw-r--r--net/forg/Makefile11
-rw-r--r--net/tcpwatch/Makefile10
-rw-r--r--print/latex2slides/Makefile11
-rw-r--r--print/scribus-devel/Makefile4
-rw-r--r--print/scribus/Makefile6
-rw-r--r--science/mayavi/Makefile13
-rw-r--r--science/py-paida/Makefile9
-rw-r--r--sysutils/openipmi/Makefile10
-rw-r--r--x11-fm/twander/Makefile11
-rw-r--r--x11-toolkits/py-Pmw/Makefile10
-rw-r--r--x11-toolkits/py-tktreectrl/Makefile9
28 files changed, 83 insertions, 170 deletions
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 07c83d409915..18452f3f020a 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: wsjt
-# Date created: 3rd August 2006
-# Whom: Diane Bruce <db@db.net>
-#
+# Created by: Diane Bruce <db@db.net>
# $FreeBSD$
-#
PORTNAME= wsjt
VERSION= 9.1
+PORTREVISION= 1
DISTVERSION= ${VERSION}.r${SVN_REV}
CATEGORIES= comms hamradio
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -16,7 +13,7 @@ DISTNAME= wsjt-r${SVN_REV}
MAINTAINER= db@FreeBSD.org
COMMENT= Weak signal ham radio communication package
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \
samplerate:${PORTSDIR}/audio/libsamplerate
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 04c479784eed..85597134194a 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: wspr
-# Date created: 30 April 2009
-# Whom: Diane Bruce <db@db.net>
-#
+# Created by: Diane Bruce <db@db.net>
# $FreeBSD$
-#
PORTNAME= wspr
DISTVERSION= ${VERSION}.r${SVN_REV}
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= db
@@ -15,7 +12,7 @@ DISTNAME= wspr-r${SVN_REV}
MAINTAINER= db@FreeBSD.org
COMMENT= Weak signal for HF ham radio communication package
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib \
fftw3f:${PORTSDIR}/math/fftw3-float \
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index f30a167a4845..519dae88ec9e 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for: fnorb
-# Date created: 12 Septermber 2000
-# Whom: Johann Visagie <johann@egenetics.com>
-#
+# Created by: Johann Visagie <johann@egenetics.com>
# $FreeBSD$
-#
PORTNAME= Fnorb
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A CORBA 2.0 ORB written in Python
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index 353caaf13661..87b43d4c90fa 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -1,12 +1,9 @@
-# ex:ts=8
-# Ports collection makefile for: py-simpy
-# Date created: Jun 29, 2004
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
PORTNAME= simpy
PORTVERSION= 2.3.1
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP \
SF/${PORTNAME}/${PORTNAME}/SimPy-${PORTVERSION}
@@ -26,7 +23,7 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
.include <bsd.port.pre.mk>
.if defined(WITH_TKINTER)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
post-install:
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index 72cc59584ba2..9ac3acea62da 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pylint
PORTVERSION= 0.26.0
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= LOGILAB
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
@@ -27,7 +28,7 @@ post-extract:
${RM} -fr ${WRKSRC}/test
.if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
.include <bsd.port.mk>
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index ca85e6f08d96..c869c87e2b01 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for: ptkei
-# Date created: 26 October 1999
-# Whom: Daniel O'Connor <darius@dons.net.au>
-#
+# Created by: Daniel O'Connor <darius@dons.net.au>
# $FreeBSD$
-#
PORTNAME= ptkei
PORTVERSION= 1.18.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.lfmm.org/ptkei/
MAINTAINER= ports@FreeBSD.org
COMMENT= A Python/Tk graphical client for Wolfpack Empire servers
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
USE_PYTHON= yes
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 061a566a5d65..d9444b165e9b 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -1,19 +1,16 @@
-# New ports collection makefile for: pyching
-# Date created: 5 July 2001
-# Whom: Hye-Shik Chang <perky@python.or.kr>
-#
+# Created by: Hye-Shik Chang <perky@python.or.kr>
# $FreeBSD$
-#
PORTNAME= pyching
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= games python
MASTER_SITES= SF/${PORTNAME}/pyChing/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Consult a I Ching, an ancient Chinese book of wisdom
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 6bbc52531823..7a9c081ba1ce 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: PySol
-# Date created: 11 September 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= pysol
PORTVERSION= 4.82
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.pysol.org/download/pysol/:source \
${MASTER_SITE_LOCAL:S/$/:support/}
@@ -19,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Solitaire game, written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysolsoundserver.so:${PORTSDIR}/audio/pysol-sound-server \
- ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 858b0f3daf54..09601e9ee2f2 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pysolfc
PORTVERSION= 2.0
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= games python
MASTER_SITES= SF/${PORTNAME}/PySolFC/PySolFC-${PORTVERSION} \
SF/${PORTNAME}/PySolFC-Cardsets/PySolFC-Cardsets-${PORTVERSION}:cardsets
@@ -15,7 +15,7 @@ COMMENT= Solitaire game, written in Python and the successor of PySol
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
USE_BZIP2= yes
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index fbdc3cb250c6..f548f16f0945 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: pythonchess
-# Date created: 24 November 2005
-# Whom: Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
# $FreeBSD$
-#
PORTNAME= pythonchess
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alepulver
@@ -16,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Small program for playing chess against the computer
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 706eac47a016..d66c17a9f353 100644
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@@ -1,19 +1,16 @@
-# New ports collection makefile for: ThudBoard
-# Date created: 04 Januar 2004
-# Whom: Jan Stocker <Jan.Stocker@t-online.de>
-#
+# Created by: Jan Stocker <Jan.Stocker@t-online.de>
# $FreeBSD$
-#
PORTNAME= thudboard
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.million.nl/file/
MAINTAINER= lme@FreeBSD.org
COMMENT= The Discworld Boardgame Board
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
NO_WRKSUBDIR= yes
USE_PYTHON= yes
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 616f9a9bcb29..01eff39fde37 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: PIL
-# Date created: 02 November 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= imaging
PORTVERSION= 1.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= http://effbot.org/media/downloads/ \
http://www.pythonware.net/storage/
@@ -39,8 +35,8 @@ OPTIONS= TKINTER "Build with tkinter for X support" on
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_TKINTER)
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
PLIST_SUB+= TKINTER=""
.else
PLIST_SUB+= TKINTER="@comment "
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 0f58de8ca379..9f4e1f01199f 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: PyOpenGL
-# Date created: Wed Aug 18 18:49:17 EDT 1999
-# Whom: Randall Hopper <aa8vb@ipass.net>
-#
+# Created by: Randall Hopper <aa8vb@ipass.net>
# $FreeBSD$
-#
PORTNAME= opengl
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= SF/py${PORTNAME}/PyOpenGL/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -37,8 +33,8 @@ USE_DOS2UNIX= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MTKINTER}
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
post-patch:
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 7d49f5c28fd9..1da184f69810 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: asymptote
-# Date created: 2005-07-22
-# Whom: Nicola Vitale <nivit@email.it>
-#
+# Created by: Nicola Vitale <nivit@email.it>
# $FreeBSD$
-#
PORTNAME= asymptote
PORTVERSION= 2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
@@ -22,7 +18,7 @@ LICENSE_COMB= dual
RUN_DEPENDS= gv:${PORTSDIR}/print/gv \
latex:${PORTSDIR}/print/teTeX-base \
- ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_PKGNAMEPREFIX}imaging>=1.1.6_3:${PORTSDIR}/graphics/py-imaging
ONLY_FOR_ARCHS= i386 amd64
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index e75e8fce4551..22ea6a5bb5d3 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: py-gato
-# Date created: 31 August 2001
-# Whom: Johann Visagie <wjv@FreeBSD.org>
-#
+# Created by: Johann Visagie <wjv@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= gato
PORTVERSION= 1.02
+PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= http://gato.sourceforge.net/Download/
MASTER_SITE_SUBDIR= gato
@@ -16,7 +13,7 @@ DISTNAME= Gato-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Python-based toolbox to visualise algorithms on graphs
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
WRKSRC= ${WRKDIR}/Gato
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index 27d700541e53..9a4822075a61 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: cuecat
-# Date created: 18 October 2000
-# Whom: mwm@mired.org
-#
+# Created by: mwm@mired.org
# $FreeBSD$
-#
PORTNAME= cuecat
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc python
MASTER_SITES= http://www.mired.org/downloads/
@@ -15,7 +11,7 @@ MAINTAINER= mwm@mired.org
COMMENT= Tools for decoding and using the output of a :Cue:Cat(TM) wand scanner
.if !defined(WITHOUT_X11)
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
.endif
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index 37874faab138..f8fdf819098c 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pwytter
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im www python
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -13,7 +13,7 @@ COMMENT= Free multi-platform Twitter client written in Python
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging \
${PYTHON_PKGNAMEPREFIX}simplejson>=1.7.1:${PORTSDIR}/devel/py-simplejson
diff --git a/net/forg/Makefile b/net/forg/Makefile
index e4c04d1499e2..05102f48db63 100644
--- a/net/forg/Makefile
+++ b/net/forg/Makefile
@@ -1,14 +1,9 @@
-# ex:ts=8
-# New ports collection makefile for: forg
-# Date created: Sep 25, 2001
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= forg
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net python
MASTER_SITES= http://gopher.quux.org:70/give-me-gopher/
# Old home website doesn't seem to work anymore (19/05/03)
@@ -17,7 +12,7 @@ MASTER_SITES= http://gopher.quux.org:70/give-me-gopher/
MAINTAINER= ports@FreeBSD.org
COMMENT= A Gopher client
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
USE_PYTHON= yes
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index 54ef66868911..f9b1c0959d13 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for: tcpwatch
-# Date created: 2004-05-11
-# Whom: ports@c0decafe.net
-#
+# Created by: ports@c0decafe.net
# $FreeBSD$
-#
PORTNAME= tcpwatch
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net python
MASTER_SITES= http://hathawaymix.org/Software/TCPWatch/
MAINTAINER= ports@FreeBSD.org
COMMENT= TCP monitoring and logging tool with support for HTTP 1.1
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= bin/tcpwatch.py
diff --git a/print/latex2slides/Makefile b/print/latex2slides/Makefile
index d94ecf2137c7..36661ec8776e 100644
--- a/print/latex2slides/Makefile
+++ b/print/latex2slides/Makefile
@@ -1,14 +1,9 @@
-# ex:ts=8
-# Ports collection makefile for: latex2slides
-# Date created: May 23, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= latex2slides
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print
MASTER_SITES= SF
EXTRACT_SUFX= .tgz
@@ -18,7 +13,7 @@ COMMENT= Produces a set of HTML/JPEG slides from a TeX or LaTeX source
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
dvips:${PORTSDIR}/print/teTeX \
- ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
NO_BUILD= yes
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index cc87b13fa03d..07643c75e8bd 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scribus
PORTVERSION= 1.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print editors
MASTER_SITES= http://download.tuxfamily.org/bartcoding/FreeBSD/ \
${MASTER_SITE_LOCAL}
@@ -26,7 +26,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
execinfo:${PORTSDIR}/devel/libexecinfo \
poppler:${PORTSDIR}/graphics/poppler \
osg:${PORTSDIR}/graphics/osg
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging \
update-mime-database:${PORTSDIR}/misc/shared-mime-info
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 5a34d23b439e..64ef58f2647e 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,11 +1,9 @@
# Created by: ijliao
-# $Carpetsmoker: ports/print/scribus/Makefile,v 1.2 2007/09/24 08:06:52 carpetsmoker Exp $
# $FreeBSD$
-#
PORTNAME= scribus
PORTVERSION= 1.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print editors
MASTER_SITES= SF \
http://www.scribus.net/downloads/${PORTVERSION}/
@@ -26,7 +24,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
hyphen:${PORTSDIR}/textproc/hyphen \
execinfo:${PORTSDIR}/devel/libexecinfo \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging \
update-mime-database:${PORTSDIR}/misc/shared-mime-info
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index cef332f2dec3..2f739c1faa63 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -1,14 +1,9 @@
-# ex:ts=8
-# Ports collection makefile for: mayavi
-# Date created: Mar 9, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= mayavi
PORTVERSION= 1.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science python
MASTER_SITES= SF
DISTNAME= MayaVi-${PORTVERSION}
@@ -16,9 +11,9 @@ DISTNAME= MayaVi-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific data visualizer
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/vtk.pth:${PORTSDIR}/math/vtk-python \
- ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index 8ac41f1fd687..5f4ba9dd7cc0 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: paida
-# Date created: 2005-07-17
-# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru>
-#
+# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
# $FreeBSD$
-#
PORTNAME= paida
PORTVERSION= 3.2.1.2.10
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.2.1_2.10.1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +13,7 @@ MAINTAINER= wenheping@gmail.com
COMMENT= Pure Python scientific analysis package
.if !defined(NO_GUI)
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
USE_PYTHON= yes
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index b4e73cb7e655..58ef215b108d 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: sysutils/openipmi
-# Date created: 28/Mar/2010
-# Whom: Alex Deiter <alex.deiter@gmail.com>
-#
+# Created by: Alex Deiter <alex.deiter@gmail.com>
# $FreeBSD$
-#
PORTNAME= openipmi
PORTVERSION= 2.0.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library
DISTNAME= OpenIPMI-${PORTVERSION}
@@ -69,7 +65,7 @@ CONFIGURE_ARGS+= --with-openssl=no
WITH_TCL= yes
USE_PYTHON= yes
WITH_PYTHON= yes
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:${PORTSDIR}/x11-toolkits/tix
CONFIGURE_ARGS+= --with-tkinter
PLIST_SUB+= TKINTER=""
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index 46462f92911b..573324cd9c3c 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -1,20 +1,17 @@
-# New ports collection makefile for: twander
-# Date Created: 17 February 2003
-# Whom: tundra
-#
+# Created by: tundra
# $FreeBSD$
-#
PORTNAME= twander
PORTVERSION= 3.231
+PORTREVISION= 1
CATEGORIES= x11-fm
MASTER_SITES= http://www.tundraware.com/Software/twander/
MAINTAINER= twander@tundraware.com
COMMENT= A Better Filesystem Browser
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
USE_PYTHON= yes
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 6308e8f94ca8..cc2efc0d417e 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: pmw
-# Date created: 03 June 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= Pmw
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +12,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= fmysh@iijmio-mail.jp
COMMENT= High-level compound graphics widgets for Python
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
LIB_DEPENDS= BLT24.3:${PORTSDIR}/x11-toolkits/blt
USE_PYTHON= yes
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index e7b6dee3acb8..0899cf02fed0 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: tkintertreectrl
-# Date created: 09 December 2006
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= tktreectrl
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= x11-toolkits tk python
MASTER_SITES= http://klappnase.bubble.org/TkinterTreectrl/ CENKES
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +13,7 @@ MAINTAINER= sylvio@FreeBSD.org
COMMENT= TkTreectrl Python bindings
LIB_DEPENDS= treectrl.0:${PORTSDIR}/x11-toolkits/tktreectrl
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
USE_TK_RUN= yes