8 files changed, 50 insertions, 34 deletions

diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index ca5cd63ad779..1bb3d8932b2b 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	sketch
-# Version required:	0.5.5
+# Version required:	0.6.0
 # Date created:		04 November 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/03/12 10:54:23 tg Exp $
+# $Id: Makefile,v 1.3 1999/05/06 14:09:05 tg Exp $
 #
 
-DISTNAME=	sketch-0.5.5
+DISTNAME=	sketch-0.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.online.de/home/sketch/
 
@@ -16,27 +16,16 @@ BUILD_DEPENDS=	${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-ima
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${PREFIX}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging
 
-MAKE_FLAGS=	OPT="${CFLAGS}" -f
-ALL_TARGET=
-
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 
-post-extract:
-	${CP} ${FILESDIR}/Setup.Pax ${WRKSRC}/Pax/Setup
-	${CP} ${FILESDIR}/Setup.Modules ${WRKSRC}/Sketch/Modules/Setup
-
 do-configure:
-	(cd ${WRKSRC}/Pax; ${MAKE} -f Makefile.pre.in boot)
-	(cd ${WRKSRC}/Filter; ${MAKE} -f Makefile.pre.in boot)
-	(cd ${WRKSRC}/Sketch/Modules; ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC} && python setup.py configure)
 
 do-build:
-	@(cd ${WRKSRC}/Pax; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${WRKSRC}/Filter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${WRKSRC}/Sketch/Modules; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} python setup.py build)
 
 do-install:
 	${MKDIR} ${SKETCHDIR}
@@ -45,8 +34,10 @@ do-install:
 	    (cd ${SKETCHDIR}/; tar xf -)
 .endfor
 	(cd ${WRKSRC}; ${INSTALL_SCRIPT} finishinst.py sk2ps.py sketch.py ${SKETCHDIR})
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${SKETCHDOCDIR}
 	(cd ${WRKSRC}; tar cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; tar xf -)
+.endif
 	${MKDIR} ${SKETCHEXDIR}
 	(cd ${WRKSRC}/Examples; tar cf - .) | (cd ${SKETCHEXDIR}; tar xf -)
 	(cd ${SKETCHDIR}; python finishinst.py)
diff --git a/graphics/skencil/distinfo b/graphics/skencil/distinfo
index 6a82de8cffb7..f459e27511a1 100644
--- a/graphics/skencil/distinfo
+++ b/graphics/skencil/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.5.5.tar.gz) = c1772c6ffd6f03649e42dae093c8fd8e
+MD5 (sketch-0.6.0.tar.gz) = 82641a8575e71c0ea9d23b3fe85c1594
diff --git a/graphics/skencil/files/patch-aa b/graphics/skencil/files/patch-aa
new file mode 100644
index 000000000000..f39ac9cf3bb1
--- /dev/null
+++ b/graphics/skencil/files/patch-aa
@@ -0,0 +1,11 @@
+--- setup.py.orig	Tue May 18 18:37:04 1999
++++ setup.py	Wed May 19 09:44:38 1999
+@@ -212,7 +212,7 @@
+ 
+     if setup == None:
+         setup = os.path.join(sys.prefix, 'lib/python' + sys.version[:3],
+-                             'config/Setup')
++                             'config/Setup.local')
+     print 'reading configuration from', setup, '...',
+     configs = extract_config(setup, ['_tkinter'])
+     print 'done'
diff --git a/graphics/skencil/pkg-plist b/graphics/skencil/pkg-plist
index ac6707029e9c..fc4b9003aa77 100644
--- a/graphics/skencil/pkg-plist
+++ b/graphics/skencil/pkg-plist
@@ -74,6 +74,7 @@ share/sketch/Resources/Fontmetrics/putri.afm
 share/sketch/Resources/Fontmetrics/pzcmi.afm
 share/sketch/Resources/Fontmetrics/pzdr.afm
 share/sketch/Resources/Fontmetrics/std.sfd
+share/sketch/Resources/Messages/de/LC_MESSAGES/sketch.mo
 share/sketch/Resources/Misc/gamma.spl
 share/sketch/Resources/Misc/mini.spl
 share/sketch/Resources/Misc/pattern.ppm
@@ -473,6 +474,7 @@ share/doc/sketch/Doc/devguide-34.html
 share/doc/sketch/Doc/devguide-35.html
 share/doc/sketch/Doc/devguide-36.html
 share/doc/sketch/Doc/devguide-37.html
+share/doc/sketch/Doc/devguide-38.html
 share/doc/sketch/Doc/devguide-4.html
 share/doc/sketch/Doc/devguide-5.html
 share/doc/sketch/Doc/devguide-6.html
@@ -518,6 +520,7 @@ share/examples/sketch/images.sk
 share/examples/sketch/lena.jpg
 share/examples/sketch/line.sk
 share/examples/sketch/pathtext.sk
+share/examples/sketch/pattern.ppm                    
 share/examples/sketch/text.sk
 @dirrm share/sketch/Sketch/UI
 @dirrm share/sketch/Sketch/Scripting
@@ -530,6 +533,9 @@ share/examples/sketch/text.sk
 @dirrm share/sketch/Sketch
 @dirrm share/sketch/Script
 @dirrm share/sketch/Resources/Misc
+@dirrm share/sketch/Resources/Messages/de/LC_MESSAGES
+@dirrm share/sketch/Resources/Messages/de
+@dirrm share/sketch/Resources/Messages
 @dirrm share/sketch/Resources/Fontmetrics
 @dirrm share/sketch/Resources
 @dirrm share/sketch/Plugins/Objects
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index ca5cd63ad779..1bb3d8932b2b 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	sketch
-# Version required:	0.5.5
+# Version required:	0.6.0
 # Date created:		04 November 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/03/12 10:54:23 tg Exp $
+# $Id: Makefile,v 1.3 1999/05/06 14:09:05 tg Exp $
 #
 
-DISTNAME=	sketch-0.5.5
+DISTNAME=	sketch-0.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.online.de/home/sketch/
 
@@ -16,27 +16,16 @@ BUILD_DEPENDS=	${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-ima
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
 		${PREFIX}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging
 
-MAKE_FLAGS=	OPT="${CFLAGS}" -f
-ALL_TARGET=
-
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=	${PREFIX}/share/examples/sketch
 
-post-extract:
-	${CP} ${FILESDIR}/Setup.Pax ${WRKSRC}/Pax/Setup
-	${CP} ${FILESDIR}/Setup.Modules ${WRKSRC}/Sketch/Modules/Setup
-
 do-configure:
-	(cd ${WRKSRC}/Pax; ${MAKE} -f Makefile.pre.in boot)
-	(cd ${WRKSRC}/Filter; ${MAKE} -f Makefile.pre.in boot)
-	(cd ${WRKSRC}/Sketch/Modules; ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC} && python setup.py configure)
 
 do-build:
-	@(cd ${WRKSRC}/Pax; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${WRKSRC}/Filter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-	@(cd ${WRKSRC}/Sketch/Modules; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} python setup.py build)
 
 do-install:
 	${MKDIR} ${SKETCHDIR}
@@ -45,8 +34,10 @@ do-install:
 	    (cd ${SKETCHDIR}/; tar xf -)
 .endfor
 	(cd ${WRKSRC}; ${INSTALL_SCRIPT} finishinst.py sk2ps.py sketch.py ${SKETCHDIR})
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${SKETCHDOCDIR}
 	(cd ${WRKSRC}; tar cf - ${SKETCHDOCS}) | (cd ${SKETCHDOCDIR}; tar xf -)
+.endif
 	${MKDIR} ${SKETCHEXDIR}
 	(cd ${WRKSRC}/Examples; tar cf - .) | (cd ${SKETCHEXDIR}; tar xf -)
 	(cd ${SKETCHDIR}; python finishinst.py)
diff --git a/graphics/sketch/distinfo b/graphics/sketch/distinfo
index 6a82de8cffb7..f459e27511a1 100644
--- a/graphics/sketch/distinfo
+++ b/graphics/sketch/distinfo
@@ -1 +1 @@
-MD5 (sketch-0.5.5.tar.gz) = c1772c6ffd6f03649e42dae093c8fd8e
+MD5 (sketch-0.6.0.tar.gz) = 82641a8575e71c0ea9d23b3fe85c1594
diff --git a/graphics/sketch/files/patch-aa b/graphics/sketch/files/patch-aa
new file mode 100644
index 000000000000..f39ac9cf3bb1
--- /dev/null
+++ b/graphics/sketch/files/patch-aa
@@ -0,0 +1,11 @@
+--- setup.py.orig	Tue May 18 18:37:04 1999
++++ setup.py	Wed May 19 09:44:38 1999
+@@ -212,7 +212,7 @@
+ 
+     if setup == None:
+         setup = os.path.join(sys.prefix, 'lib/python' + sys.version[:3],
+-                             'config/Setup')
++                             'config/Setup.local')
+     print 'reading configuration from', setup, '...',
+     configs = extract_config(setup, ['_tkinter'])
+     print 'done'
diff --git a/graphics/sketch/pkg-plist b/graphics/sketch/pkg-plist
index ac6707029e9c..fc4b9003aa77 100644
--- a/graphics/sketch/pkg-plist
+++ b/graphics/sketch/pkg-plist
@@ -74,6 +74,7 @@ share/sketch/Resources/Fontmetrics/putri.afm
 share/sketch/Resources/Fontmetrics/pzcmi.afm
 share/sketch/Resources/Fontmetrics/pzdr.afm
 share/sketch/Resources/Fontmetrics/std.sfd
+share/sketch/Resources/Messages/de/LC_MESSAGES/sketch.mo
 share/sketch/Resources/Misc/gamma.spl
 share/sketch/Resources/Misc/mini.spl
 share/sketch/Resources/Misc/pattern.ppm
@@ -473,6 +474,7 @@ share/doc/sketch/Doc/devguide-34.html
 share/doc/sketch/Doc/devguide-35.html
 share/doc/sketch/Doc/devguide-36.html
 share/doc/sketch/Doc/devguide-37.html
+share/doc/sketch/Doc/devguide-38.html
 share/doc/sketch/Doc/devguide-4.html
 share/doc/sketch/Doc/devguide-5.html
 share/doc/sketch/Doc/devguide-6.html
@@ -518,6 +520,7 @@ share/examples/sketch/images.sk
 share/examples/sketch/lena.jpg
 share/examples/sketch/line.sk
 share/examples/sketch/pathtext.sk
+share/examples/sketch/pattern.ppm                    
 share/examples/sketch/text.sk
 @dirrm share/sketch/Sketch/UI
 @dirrm share/sketch/Sketch/Scripting
@@ -530,6 +533,9 @@ share/examples/sketch/text.sk
 @dirrm share/sketch/Sketch
 @dirrm share/sketch/Script
 @dirrm share/sketch/Resources/Misc
+@dirrm share/sketch/Resources/Messages/de/LC_MESSAGES
+@dirrm share/sketch/Resources/Messages/de
+@dirrm share/sketch/Resources/Messages
 @dirrm share/sketch/Resources/Fontmetrics
 @dirrm share/sketch/Resources
 @dirrm share/sketch/Plugins/Objects