8 files changed, 22 insertions, 63 deletions

diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 09febcdf4a12..8641542419cc 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	skencil
-PORTVERSION=	0.6.16
-PORTREVISION=	1
+PORTVERSION=	0.6.17
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sketch
@@ -24,12 +23,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VERSION} == "python2.4"
-EXTRA_PATCHES=	${FILESDIR}/py24-patch-Pax_paxtkinter.c
-.endif
-
 CONFFLAGS=	--tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11"
 
 SKETCHDOCS=	BUGS Doc NEWS PROJECTS README TODO
@@ -41,26 +34,32 @@ do-configure:
 		${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} setup.py configure ${CONFFLAGS})
 
+post-build:
+.for exec in sk2ppm sk2ps skconvert skencil skshow
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${exec}.in
+	@${ECHO_CMD} '' >> ${WRKDIR}/${exec}.in
+	@${ECHO_CMD} 'exec ${PYTHON_CMD} ${DATADIR}/${exec}.py $$@' >> ${WRKDIR}/${exec}.in
+.endfor
+
 do-install:
+.for exec in sk2ppm sk2ps skconvert skencil skshow
+	${INSTALL_SCRIPT} ${WRKDIR}/${exec}.in ${PREFIX}/bin/${exec}
+.endfor
 	@${MKDIR} ${DATADIR}
 .for dir in Filter Pax Plugins Resources Script Sketch
-	(cd ${WRKSRC}; ${TAR} -cf - -X ${FILESDIR}/excludelist ${dir}) | \
-	    (cd ${DATADIR}; ${TAR} xf -)
+	${TAR} -C ${WRKSRC} -cf - -X ${FILESDIR}/excludelist ${dir} | \
+		${TAR} -C ${DATADIR} -xf -
 .endfor
 	(cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SKETCHSCRIPTS} ${DATADIR})
+	(cd ${DATADIR}; ${PYTHON_CMD} finishinst.py)
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}; ${TAR} cf - ${SKETCHDOCS}) | (cd ${DOCSDIR}; ${TAR} xf -)
+	${TAR} -C ${WRKSRC} -cf - ${SKETCHDOCS} | ${TAR} -C ${DOCSDIR} -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/Examples; ${TAR} cf - .) | (cd ${EXAMPLESDIR}; ${TAR} xf -)
+	${TAR} -C ${WRKSRC}/Examples -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
-	(cd ${DATADIR}; ${PYTHON_CMD} finishinst.py)
-.for exec in sk2ppm sk2ps skconvert skencil skshow
-	${SED} -e "s|@DATADIR@|${DATADIR}|g ; \
-		 s|@PYTHON_CMD@|${PYTHON_CMD}|g" \
-		< ${FILESDIR}/${exec}.in > ${PREFIX}/bin/${exec}
-	${CHMOD} ${BINMODE} ${PREFIX}/bin/${exec}
-	${CHOWN} ${BINOWN}:${BINGROUP} ${PREFIX}/bin/${exec}
-.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/skencil/distinfo b/graphics/skencil/distinfo
index b3ace95cd1ba..e34b8ed9a086 100644
--- a/graphics/skencil/distinfo
+++ b/graphics/skencil/distinfo
@@ -1,2 +1,2 @@
-MD5 (skencil-0.6.16.tar.gz) = 22db4f78151629df428c387e035fdad2
-SIZE (skencil-0.6.16.tar.gz) = 1136249
+MD5 (skencil-0.6.17.tar.gz) = 03f0a57cf623bcd657a4b8887d3ebe0b
+SIZE (skencil-0.6.17.tar.gz) = 1148628
diff --git a/graphics/skencil/files/py24-patch-Pax_paxtkinter.c b/graphics/skencil/files/py24-patch-Pax_paxtkinter.c
deleted file mode 100644
index cd1ea8d6ab85..000000000000
--- a/graphics/skencil/files/py24-patch-Pax_paxtkinter.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- Pax/paxtkinter.c.orig	Sun May  4 04:55:36 2003
-+++ Pax/paxtkinter.c	Mon Apr 18 12:40:08 2005
-@@ -1866,6 +1866,9 @@
- 	char *className = NULL;
- 	int interactive = 0;
- 
-+	int ignored_int = 0;
-+	char *ignored_charp = NULL;
-+
- 	baseName = strrchr(Py_GetProgramName(), '/');
- 	if (baseName != NULL)
- 		baseName++;
-@@ -1873,9 +1876,10 @@
- 		baseName = Py_GetProgramName();
- 	className = "Tk";
-   
--	if (!PyArg_ParseTuple(args, "|zssi",
-+	if (!PyArg_ParseTuple(args, "|zssiiiiz:create",
- 			      &screenName, &baseName, &className,
--			      &interactive))
-+			      &interactive, &ignored_int, &ignored_int,
-+			      &ignored_int, &ignored_charp))
- 		return NULL;
- 
- 	return (PyObject *) Tkapp_New(screenName, baseName, className, 
diff --git a/graphics/skencil/files/sk2ppm.in b/graphics/skencil/files/sk2ppm.in
deleted file mode 100644
index a65f02a22235..000000000000
--- a/graphics/skencil/files/sk2ppm.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @PYTHON_CMD@ @DATADIR@/sk2ppm.py $@
diff --git a/graphics/skencil/files/sk2ps.in b/graphics/skencil/files/sk2ps.in
deleted file mode 100644
index 5729f49f9f66..000000000000
--- a/graphics/skencil/files/sk2ps.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @PYTHON_CMD@ @DATADIR@/sk2ps.py $@
diff --git a/graphics/skencil/files/skconvert.in b/graphics/skencil/files/skconvert.in
deleted file mode 100644
index d7efee007b8d..000000000000
--- a/graphics/skencil/files/skconvert.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @PYTHON_CMD@ @DATADIR@/skconvert.py $@
diff --git a/graphics/skencil/files/skencil.in b/graphics/skencil/files/skencil.in
deleted file mode 100644
index a96b5d2c5519..000000000000
--- a/graphics/skencil/files/skencil.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @PYTHON_CMD@ @DATADIR@/skencil.py $@
diff --git a/graphics/skencil/files/skshow.in b/graphics/skencil/files/skshow.in
deleted file mode 100644
index 6e1d325ccb53..000000000000
--- a/graphics/skencil/files/skshow.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @PYTHON_CMD@ @DATADIR@/skshow.py $@