From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 22 15:10:26 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7430E16A432 for ; Wed, 22 Jun 2005 15:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47FCE43D48 for ; Wed, 22 Jun 2005 15:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5MFAQkU073632 for ; Wed, 22 Jun 2005 15:10:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5MFAQtr073628; Wed, 22 Jun 2005 15:10:26 GMT (envelope-from gnats) Resent-Date: Wed, 22 Jun 2005 15:10:26 GMT Resent-Message-Id: <200506221510.j5MFAQtr073628@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 004FF16A41C for ; Wed, 22 Jun 2005 15:02:03 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep01.dion.ne.jp (hfep01.dion.ne.jp [203.181.105.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44E3143D1D for ; Wed, 22 Jun 2005 15:02:03 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.209.161]) by hfep01.dion.ne.jp with SMTP id <20050622150157727.RUFC@hfep01.dion.ne.jp> for ; Thu, 23 Jun 2005 00:01:57 +0900 Message-Id: <20050623000018.17c8df10.tkato432@yahoo.com> Date: Thu, 23 Jun 2005 00:00:18 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/82537: Update port: graphics/skencil to 0.6.17 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2005 15:10:26 -0000 >Number: 82537 >Category: ports >Synopsis: Update port: graphics/skencil to 0.6.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 22 15:10:25 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 0.6.17 Remove file: files/py24-patch-Pax_paxtkinter.c files/sk2ppm.in files/sk2ps.in files/skconvert.in files/skencil.in files/skshow.in >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/skencil/Makefile graphics/skencil/Makefile --- /usr/ports/graphics/skencil/Makefile Mon Apr 18 23:57:15 2005 +++ graphics/skencil/Makefile Mon Jun 20 03:23:39 2005 @@ -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 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes -.include - -.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 @@ ${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 +.include diff -urN /usr/ports/graphics/skencil/distinfo graphics/skencil/distinfo --- /usr/ports/graphics/skencil/distinfo Thu Mar 18 13:52:30 2004 +++ graphics/skencil/distinfo Mon Jun 20 02:22:00 2005 @@ -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 -urN /usr/ports/graphics/skencil/files/py24-patch-Pax_paxtkinter.c graphics/skencil/files/py24-patch-Pax_paxtkinter.c --- /usr/ports/graphics/skencil/files/py24-patch-Pax_paxtkinter.c Mon Apr 18 17:18:24 2005 +++ graphics/skencil/files/py24-patch-Pax_paxtkinter.c Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/graphics/skencil/files/sk2ppm.in graphics/skencil/files/sk2ppm.in --- /usr/ports/graphics/skencil/files/sk2ppm.in Thu Jan 29 11:03:10 2004 +++ graphics/skencil/files/sk2ppm.in Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -exec @PYTHON_CMD@ @DATADIR@/sk2ppm.py $@ diff -urN /usr/ports/graphics/skencil/files/sk2ps.in graphics/skencil/files/sk2ps.in --- /usr/ports/graphics/skencil/files/sk2ps.in Thu Jan 29 11:03:10 2004 +++ graphics/skencil/files/sk2ps.in Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -exec @PYTHON_CMD@ @DATADIR@/sk2ps.py $@ diff -urN /usr/ports/graphics/skencil/files/skconvert.in graphics/skencil/files/skconvert.in --- /usr/ports/graphics/skencil/files/skconvert.in Thu Jan 29 11:03:10 2004 +++ graphics/skencil/files/skconvert.in Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -exec @PYTHON_CMD@ @DATADIR@/skconvert.py $@ diff -urN /usr/ports/graphics/skencil/files/skencil.in graphics/skencil/files/skencil.in --- /usr/ports/graphics/skencil/files/skencil.in Thu Jan 29 04:45:14 2004 +++ graphics/skencil/files/skencil.in Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -exec @PYTHON_CMD@ @DATADIR@/skencil.py $@ diff -urN /usr/ports/graphics/skencil/files/skshow.in graphics/skencil/files/skshow.in --- /usr/ports/graphics/skencil/files/skshow.in Thu Jan 29 11:03:10 2004 +++ graphics/skencil/files/skshow.in Thu Jan 1 09:00:00 1970 @@ -1,3 +0,0 @@ -#!/bin/sh - -exec @PYTHON_CMD@ @DATADIR@/skshow.py $@ >Release-Note: >Audit-Trail: >Unformatted: