summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/pdflib/distinfo3
-rw-r--r--print/pdflib/patches/patch-ae13
-rw-r--r--print/tcl-pdflib/Makefile18
3 files changed, 19 insertions, 15 deletions
diff --git a/print/pdflib/distinfo b/print/pdflib/distinfo
index f8daf07c5e0..7a3cb696541 100644
--- a/print/pdflib/distinfo
+++ b/print/pdflib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2009/09/09 16:50:06 joerg Exp $
+$NetBSD: distinfo,v 1.11 2010/01/27 22:18:35 joerg Exp $
SHA1 (pdflib-4.0.3.tar.gz) = 9fbe256249ef780c4607ee3070785d9a4ecc03f7
RMD160 (pdflib-4.0.3.tar.gz) = 5e21c05a9e2c49d90ccffea5a2ba085776b457c7
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = af526a893447186da5a09145bfd30994855e8e8d
SHA1 (patch-ab) = da90a65a101ae23622dfd85e1be3a5855f1fc265
SHA1 (patch-ac) = 3f226ef6ee2a1b740831f44d97d9c49a2a6db50f
SHA1 (patch-ad) = b4aab4f41184a7142d88bb9dadbf7b8ba8f11c94
+SHA1 (patch-ae) = f85f5beeec1c2aac90eafef24c1ed2fa96ebd2ac
diff --git a/print/pdflib/patches/patch-ae b/print/pdflib/patches/patch-ae
new file mode 100644
index 00000000000..0c9b68538eb
--- /dev/null
+++ b/print/pdflib/patches/patch-ae
@@ -0,0 +1,13 @@
+$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
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index 81743170b9a..be41ddcff64 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 22:18:35 joerg Exp $
+
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../print/pdflib/Makefile.common"
@@ -13,23 +15,11 @@ CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4"
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
-DIRS_TO_BUILD= bind/tcl
+BUILD_DIRS= bind/tcl
pre-build:
${TOUCH} ${WRKSRC}/pdflib/libpdf.la
-do-build:
-.for DIR in ${DIRS_TO_BUILD}
- cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_TARGET}
-.endfor
-
-do-install:
-.for DIR in ${DIRS_TO_BUILD}
- cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
-.endfor
-
.include "../../print/pdflib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"