Wed Jan 27 22:18:35 2010 UTC ()
DESTDIR support for tcl-pdflib


(joerg)
diff -r1.10 -r1.11 pkgsrc/print/pdflib/distinfo
diff -r0 -r1.1 pkgsrc/print/pdflib/patches/patch-ae
diff -r1.18 -r1.19 pkgsrc/print/tcl-pdflib/Makefile

cvs diff -r1.10 -r1.11 pkgsrc/print/pdflib/distinfo (expand / switch to unified diff)

--- pkgsrc/print/pdflib/distinfo 2009/09/09 16:50:06 1.10
+++ pkgsrc/print/pdflib/distinfo 2010/01/27 22:18:35 1.11
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.10 2009/09/09 16:50:06 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2010/01/27 22:18:35 joerg Exp $
2 2
3SHA1 (pdflib-4.0.3.tar.gz) = 9fbe256249ef780c4607ee3070785d9a4ecc03f7 3SHA1 (pdflib-4.0.3.tar.gz) = 9fbe256249ef780c4607ee3070785d9a4ecc03f7
4RMD160 (pdflib-4.0.3.tar.gz) = 5e21c05a9e2c49d90ccffea5a2ba085776b457c7 4RMD160 (pdflib-4.0.3.tar.gz) = 5e21c05a9e2c49d90ccffea5a2ba085776b457c7
5Size (pdflib-4.0.3.tar.gz) = 2373817 bytes 5Size (pdflib-4.0.3.tar.gz) = 2373817 bytes
6SHA1 (patch-aa) = af526a893447186da5a09145bfd30994855e8e8d 6SHA1 (patch-aa) = af526a893447186da5a09145bfd30994855e8e8d
7SHA1 (patch-ab) = da90a65a101ae23622dfd85e1be3a5855f1fc265 7SHA1 (patch-ab) = da90a65a101ae23622dfd85e1be3a5855f1fc265
8SHA1 (patch-ac) = 3f226ef6ee2a1b740831f44d97d9c49a2a6db50f 8SHA1 (patch-ac) = 3f226ef6ee2a1b740831f44d97d9c49a2a6db50f
9SHA1 (patch-ad) = b4aab4f41184a7142d88bb9dadbf7b8ba8f11c94 9SHA1 (patch-ad) = b4aab4f41184a7142d88bb9dadbf7b8ba8f11c94
 10SHA1 (patch-ae) = f85f5beeec1c2aac90eafef24c1ed2fa96ebd2ac

File Added: pkgsrc/print/pdflib/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2010/01/27 22:18:35 joerg Exp $

--- bind/tcl/Makefile.in.orig	2010-01-27 22:17:02.000000000 +0000
+++ bind/tcl/Makefile.in
@@ -26,7 +26,7 @@ PDFLIBCONVENIENT= @PDFLIBCONVENIENT@
 .c.$(OBJ):
 	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFINES) $<
 
-LANG_LIBDIR 	= @TCLPACKAGEDIR@
+LANG_LIBDIR 	= ${DESTDIR}@TCLPACKAGEDIR@
 TCLBIN		= @TCLBIN@
 
 SWIG		= swig1.2 -I../../pdflib -tcl -stat

cvs diff -r1.18 -r1.19 pkgsrc/print/tcl-pdflib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/tcl-pdflib/Makefile 2010/01/18 09:59:24 1.18
+++ pkgsrc/print/tcl-pdflib/Makefile 2010/01/27 22:18:35 1.19
@@ -1,36 +1,26 @@ @@ -1,36 +1,26 @@
1# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2010/01/27 22:18:35 joerg Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "../../print/pdflib/Makefile.common" 5.include "../../print/pdflib/Makefile.common"
4 6
5PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS} 7PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
6PKGREVISION= 9 8PKGREVISION= 9
7COMMENT= Tcl interface to PDFlib for generating PDF files 9COMMENT= Tcl interface to PDFlib for generating PDF files
8 10
9BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS} 11BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
10 12
11CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q} 13CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q}
12CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include" 14CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
13CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4" 15CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4"
14TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh 16TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
15 17
16DIRS_TO_BUILD= bind/tcl 18BUILD_DIRS= bind/tcl
17 19
18pre-build: 20pre-build:
19 ${TOUCH} ${WRKSRC}/pdflib/libpdf.la 21 ${TOUCH} ${WRKSRC}/pdflib/libpdf.la
20 22
21do-build: 
22.for DIR in ${DIRS_TO_BUILD} 
23 cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \ 
24 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_TARGET} 
25.endfor 
26 
27do-install: 
28.for DIR in ${DIRS_TO_BUILD} 
29 cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \ 
30 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} 
31.endfor 
32 
33.include "../../print/pdflib/buildlink3.mk" 23.include "../../print/pdflib/buildlink3.mk"
34.include "../../lang/tcl/buildlink3.mk" 24.include "../../lang/tcl/buildlink3.mk"
35 25
36.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"