[pkgsrc/trunk]: pkgsrc/graphics/skencil Fix build with newer Python versions....

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/185a6ad41492
branches:  trunk
changeset: 554252:185a6ad41492
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 11 17:11:58 2009 +0000

description:
Fix build with newer Python versions. Add DESTDIR support.

diffstat:

 graphics/skencil/Makefile         |  18 ++++++++++--------
 graphics/skencil/distinfo         |   5 ++++-
 graphics/skencil/patches/patch-ab |  20 ++++++++++++++++++++
 graphics/skencil/patches/patch-ac |  20 ++++++++++++++++++++
 graphics/skencil/patches/patch-ad |  20 ++++++++++++++++++++
 5 files changed, 74 insertions(+), 9 deletions(-)

diffs (131 lines):

diff -r 02764438179f -r 185a6ad41492 graphics/skencil/Makefile
--- a/graphics/skencil/Makefile Wed Feb 11 16:21:03 2009 +0000
+++ b/graphics/skencil/Makefile Wed Feb 11 17:11:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/09 22:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/02/11 17:11:58 joerg Exp $
 #
 
 DISTNAME=      skencil-0.6.17
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://sketch.sourceforge.net/
 COMMENT=       Interactive drawing program
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    pax
 
 PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py
@@ -27,19 +29,19 @@
 
 do-install:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} setup.py install \
-               --prefix=${PREFIX}
+               --prefix=${PREFIX} --dest-dir=${DESTDIR}
 
 SKETCHDOCDIR=  ${PREFIX}/share/doc/skencil
 SKETCHDOCS=    BUGS Doc NEWS PROJECTS README TODO
 SKETCHEXDIR=   ${PREFIX}/share/examples/skencil
 
+INSTALLATION_DIRS=     ${SKETCHDOCDIR} ${SKETCHEXDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${SKETCHDOCDIR}
-       cd ${WRKSRC} && pax -rwpm -v ${SKETCHDOCS} ${SKETCHDOCDIR}
-       ${RM} ${SKETCHDOCDIR}/Doc/fonts.alias
-       ${RM} ${SKETCHDOCDIR}/Doc/fonts.scale
-       ${INSTALL_DATA_DIR} ${SKETCHEXDIR}
-       cd ${WRKSRC}/Examples && pax -rwpm -v . ${SKETCHEXDIR}
+       cd ${WRKSRC} && pax -rw -pm -v ${SKETCHDOCS} ${DESTDIR}${SKETCHDOCDIR}
+       ${RM} ${DESTDIR}${SKETCHDOCDIR}/Doc/fonts.alias
+       ${RM} ${DESTDIR}${SKETCHDOCDIR}/Doc/fonts.scale
+       cd ${WRKSRC}/Examples && pax -rwpm -v . ${DESTDIR}${SKETCHEXDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
diff -r 02764438179f -r 185a6ad41492 graphics/skencil/distinfo
--- a/graphics/skencil/distinfo Wed Feb 11 16:21:03 2009 +0000
+++ b/graphics/skencil/distinfo Wed Feb 11 17:11:58 2009 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/07/06 18:41:42 drochner Exp $
+$NetBSD: distinfo,v 1.5 2009/02/11 17:11:58 joerg Exp $
 
 SHA1 (skencil-0.6.17.tar.gz) = e0154f90629d7693d0268d21204a9eb12f2497aa
 RMD160 (skencil-0.6.17.tar.gz) = 9183a16afd8e9d56098821b2a9088a0383a9dc2d
 Size (skencil-0.6.17.tar.gz) = 1148628 bytes
 SHA1 (patch-aa) = 50e4c396e19c85a39866b9ca6834ff347a02cc3c
+SHA1 (patch-ab) = bca6bc1fee75d3f52a2022aa37274b33e0430133
+SHA1 (patch-ac) = 612bcc9d2b327d46aa9f0f68693af1fa21f46069
+SHA1 (patch-ad) = 405653de7fa8562bc14ec9580661418de5ea2976
diff -r 02764438179f -r 185a6ad41492 graphics/skencil/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/skencil/patches/patch-ab Wed Feb 11 17:11:58 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.3 2009/02/11 17:11:58 joerg Exp $
+
+--- Pax/Makefile.pre.in.orig   2009-02-11 17:51:19.000000000 +0100
++++ Pax/Makefile.pre.in
+@@ -124,6 +124,7 @@ RANLIB=            @RANLIB@
+ MACHDEP=      @MACHDEP@
+ SO=           @SO@
+ LDSHARED=     @LDSHARED@
++BLDSHARED=    @BLDSHARED@
+ CCSHARED=     @CCSHARED@
+ LINKFORSHARED=        @LINKFORSHARED@
+ #@SET_CCC@
+@@ -255,6 +256,7 @@ sedscript: $(MAKEFILE)
+        -e '/^RANLIB=/s/^RANLIB=[      ]*\(.*\)/s%@RANLIB[@]%\1%/p' \
+        -e '/^MACHDEP=/s/^MACHDEP=[    ]*\(.*\)/s%@MACHDEP[@]%\1%/p' \
+        -e '/^SO=/s/^SO=[      ]*\(.*\)/s%@SO[@]%\1%/p' \
++       -e '/^BLDSHARED=/s/^BLDSHARED=[        ]*\(.*\)/s%@BLDSHARED[@]%\1%/p' \
+        -e '/^LDSHARED=/s/^LDSHARED=[  ]*\(.*\)/s%@LDSHARED[@]%\1%/p' \
+        -e '/^CCSHARED=/s/^CCSHARED=[  ]*\(.*\)/s%@CCSHARED[@]%\1%/p' \
+        -e '/^$L=/s/^$L=[      ]*\(.*\)/s%@$L[@]%\1%/p' \
diff -r 02764438179f -r 185a6ad41492 graphics/skencil/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/skencil/patches/patch-ac Wed Feb 11 17:11:58 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2009/02/11 17:11:58 joerg Exp $
+
+--- Filter/Makefile.pre.in.orig        2002-08-06 22:21:15.000000000 +0200
++++ Filter/Makefile.pre.in
+@@ -124,6 +124,7 @@ RANLIB=            @RANLIB@
+ MACHDEP=      @MACHDEP@
+ SO=           @SO@
+ LDSHARED=     @LDSHARED@
++BLDSHARED=    @BLDSHARED@
+ CCSHARED=     @CCSHARED@
+ LINKFORSHARED=        @LINKFORSHARED@
+ #@SET_CCC@
+@@ -255,6 +256,7 @@ sedscript: $(MAKEFILE)
+        -e '/^RANLIB=/s/^RANLIB=[      ]*\(.*\)/s%@RANLIB[@]%\1%/p' \
+        -e '/^MACHDEP=/s/^MACHDEP=[    ]*\(.*\)/s%@MACHDEP[@]%\1%/p' \
+        -e '/^SO=/s/^SO=[      ]*\(.*\)/s%@SO[@]%\1%/p' \
++       -e '/^BLDSHARED=/s/^BLDSHARED=[        ]*\(.*\)/s%@BLDSHARED[@]%\1%/p' \
+        -e '/^LDSHARED=/s/^LDSHARED=[  ]*\(.*\)/s%@LDSHARED[@]%\1%/p' \
+        -e '/^CCSHARED=/s/^CCSHARED=[  ]*\(.*\)/s%@CCSHARED[@]%\1%/p' \
+        -e '/^$L=/s/^$L=[      ]*\(.*\)/s%@$L[@]%\1%/p' \
diff -r 02764438179f -r 185a6ad41492 graphics/skencil/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/skencil/patches/patch-ad Wed Feb 11 17:11:58 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2009/02/11 17:11:58 joerg Exp $
+
+--- Sketch/Modules/Makefile.pre.in.orig        2002-08-06 22:21:24.000000000 +0200
++++ Sketch/Modules/Makefile.pre.in
+@@ -124,6 +124,7 @@ RANLIB=            @RANLIB@
+ MACHDEP=      @MACHDEP@
+ SO=           @SO@
+ LDSHARED=     @LDSHARED@
++BLDSHARED=    @BLDSHARED@
+ CCSHARED=     @CCSHARED@
+ LINKFORSHARED=        @LINKFORSHARED@
+ #@SET_CCC@
+@@ -255,6 +256,7 @@ sedscript: $(MAKEFILE)
+        -e '/^RANLIB=/s/^RANLIB=[      ]*\(.*\)/s%@RANLIB[@]%\1%/p' \
+        -e '/^MACHDEP=/s/^MACHDEP=[    ]*\(.*\)/s%@MACHDEP[@]%\1%/p' \
+        -e '/^SO=/s/^SO=[      ]*\(.*\)/s%@SO[@]%\1%/p' \
++       -e '/^BLDSHARED=/s/^BLDSHARED=[        ]*\(.*\)/s%@BLDSHARED[@]%\1%/p' \
+        -e '/^LDSHARED=/s/^LDSHARED=[  ]*\(.*\)/s%@LDSHARED[@]%\1%/p' \
+        -e '/^CCSHARED=/s/^CCSHARED=[  ]*\(.*\)/s%@CCSHARED[@]%\1%/p' \
+        -e '/^$L=/s/^$L=[      ]*\(.*\)/s%@$L[@]%\1%/p' \