6 files changed, 40 insertions, 64 deletions

diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 664224440efc..ac516591c820 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.9
+PORTVERSION=	0.6.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging
+BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging \
+		${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \
@@ -21,17 +22,18 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 USE_PYTHON=	yes
 
+CONFFLAGS=	--tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -L${LOCALBASE}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11"
+
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 SKETCHSCRIPTS=	finishinst.py sk2ps.py sketch.py skshow.py
 
-post-patch:
-	@${PERL} -pi -e "s;%%PORTSDIR%%;${PORTSDIR};" ${WRKSRC}/setup.py
-
 do-configure:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py configure)
+	@(cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} \
+		${PYTHON_CMD} setup.py configure ${CONFFLAGS})
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
diff --git a/graphics/skencil/distinfo b/graphics/skencil/distinfo
index 954b800209b1..cd31637b1485 100644
--- a/graphics/skencil/distinfo
+++ b/graphics/skencil/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.9.tar.gz) = ed7e06a681a8d8befc0df230f3cbcd9f
+MD5 (sketch-0.6.10.tar.gz) = 784e61354d0af63aaccbd3212559e66c
diff --git a/graphics/skencil/files/patch-aa b/graphics/skencil/files/patch-aa
index 3d49ae62f123..5d61c21a882d 100644
--- a/graphics/skencil/files/patch-aa
+++ b/graphics/skencil/files/patch-aa
@@ -1,25 +1,11 @@
---- setup.py.orig	Tue Jun 27 01:06:41 2000
-+++ setup.py	Thu Aug 17 19:16:43 2000
-@@ -238,8 +238,10 @@
-                                  'python' + sys.version[:3], 'config')
-         setup = os.path.join(configdir, 'Setup')
-         setup_local = os.path.join(configdir, 'Setup.local')
-+        setup_tkinter = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
-     else:
-         setup_local = ''
-+        setup_tkinter = ''
-     print 'reading configuration from', setup, '...',
-     configs = extract_config(setup)
-     print 'done'
-@@ -247,6 +249,11 @@
-     if setup_local:
-         print 'reading additional configuration from', setup_local, '...',
-         configs = extract_config(setup_local, configs)
-+        print 'done'
-+
-+    if setup_tkinter:
-+        print 'reading additional configuration from', setup_tkinter, '...',
-+        configs = extract_config(setup_tkinter, configs)
-         print 'done'
- 
-     if not configs.has_key('_tkinter'):
+--- setup.py.orig	Sat May 12 21:20:07 2001
++++ setup.py	Tue May 15 15:21:20 2001
+@@ -224,7 +224,7 @@
+ def configure_tkinter(configs, flags):
+     # If --tk-flags was given on the command line, use those.
+     if flags['tk']['flags']:
+-        configs['_tkinter'] = read_target(flags['tk']['flags'])
++        configs['_tkinter'] = read_target(flags['tk']['flags'], '')
+         return
+     # For python < 2.1 just use the tkconfig from python's Setup, unless
+     # the user explicitly requests auto-configure
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 664224440efc..ac516591c820 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	sketch
-PORTVERSION=	0.6.9
+PORTVERSION=	0.6.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging
+BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/Imaging.h:${PORTSDIR}/graphics/py-imaging \
+		${PYDISTUTILS}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \
@@ -21,17 +22,18 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 USE_PYTHON=	yes
 
+CONFFLAGS=	--tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -L${LOCALBASE}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11"
+
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 SKETCHSCRIPTS=	finishinst.py sk2ps.py sketch.py skshow.py
 
-post-patch:
-	@${PERL} -pi -e "s;%%PORTSDIR%%;${PORTSDIR};" ${WRKSRC}/setup.py
-
 do-configure:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py configure)
+	@(cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} \
+		${PYTHON_CMD} setup.py configure ${CONFFLAGS})
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 954b800209b1..cd31637b1485 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.6.9.tar.gz) = ed7e06a681a8d8befc0df230f3cbcd9f
+MD5 (sketch-0.6.10.tar.gz) = 784e61354d0af63aaccbd3212559e66c
diff --git a/graphics/sketch/files/patch-aa b/graphics/sketch/files/patch-aa
index 3d49ae62f123..5d61c21a882d 100644
--- a/graphics/sketch/files/patch-aa
+++ b/graphics/sketch/files/patch-aa
@@ -1,25 +1,11 @@
---- setup.py.orig	Tue Jun 27 01:06:41 2000
-+++ setup.py	Thu Aug 17 19:16:43 2000
-@@ -238,8 +238,10 @@
-                                  'python' + sys.version[:3], 'config')
-         setup = os.path.join(configdir, 'Setup')
-         setup_local = os.path.join(configdir, 'Setup.local')
-+        setup_tkinter = '%%PORTSDIR%%/x11-toolkits/py-tkinter/files/Setup'
-     else:
-         setup_local = ''
-+        setup_tkinter = ''
-     print 'reading configuration from', setup, '...',
-     configs = extract_config(setup)
-     print 'done'
-@@ -247,6 +249,11 @@
-     if setup_local:
-         print 'reading additional configuration from', setup_local, '...',
-         configs = extract_config(setup_local, configs)
-+        print 'done'
-+
-+    if setup_tkinter:
-+        print 'reading additional configuration from', setup_tkinter, '...',
-+        configs = extract_config(setup_tkinter, configs)
-         print 'done'
- 
-     if not configs.has_key('_tkinter'):
+--- setup.py.orig	Sat May 12 21:20:07 2001
++++ setup.py	Tue May 15 15:21:20 2001
+@@ -224,7 +224,7 @@
+ def configure_tkinter(configs, flags):
+     # If --tk-flags was given on the command line, use those.
+     if flags['tk']['flags']:
+-        configs['_tkinter'] = read_target(flags['tk']['flags'])
++        configs['_tkinter'] = read_target(flags['tk']['flags'], '')
+         return
+     # For python < 2.1 just use the tkconfig from python's Setup, unless
+     # the user explicitly requests auto-configure