diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:19:46 +0000 |
| commit | 8515688e4fc1e61508e192542688b3ff53ea4ca8 (patch) | |
| tree | d2d4ad86fb660f5fc1d74e8ef4b3232c9aad1046 /print | |
| parent | 3612c287b035cd52b87361b84833d892629cf955 (diff) | |
| download | pkgsrc-8515688e4fc1e61508e192542688b3ff53ea4ca8.tar.gz | |
Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2
packages that have been converted to USE_BUILDLINK2.
Diffstat (limited to 'print')
| -rw-r--r-- | print/gimp-print-lib/distinfo | 3 | ||||
| -rw-r--r-- | print/gimp-print-lib/patches/patch-ac | 13 | ||||
| -rw-r--r-- | print/tcl-pdflib/PLIST | 6 | ||||
| -rw-r--r-- | print/xpdf/Makefile | 4 |
4 files changed, 20 insertions, 6 deletions
diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo index a494a224464..c5788fef12d 100644 --- a/print/gimp-print-lib/distinfo +++ b/print/gimp-print-lib/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/05/03 12:43:06 drochner Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:21:00 jlam Exp $ SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8 Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes SHA1 (patch-aa) = 9302f17215f3ee1dd3fd10dbf48f2bc4a4593aa8 SHA1 (patch-ab) = ac96c5825c09a8507ce16efd95fa9d24720d6899 +SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867 diff --git a/print/gimp-print-lib/patches/patch-ac b/print/gimp-print-lib/patches/patch-ac new file mode 100644 index 00000000000..51562e1b41e --- /dev/null +++ b/print/gimp-print-lib/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.4.2 2002/08/25 21:21:01 jlam Exp $ + +--- src/Makefile.in.orig Fri Apr 26 20:56:31 2002 ++++ src/Makefile.in +@@ -192,7 +192,7 @@ + AUTOMAKE_OPTIONS = 1.4 gnu + + MAINT_CHARSET = latin1 +-NONGIMP_SUBDIRS = cups foomatic ghost testpattern ++NONGIMP_SUBDIRS = # cups foomatic ghost testpattern + SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS) + + MAINTAINERCLEANFILES = Makefile.in diff --git a/print/tcl-pdflib/PLIST b/print/tcl-pdflib/PLIST index 433ac8d8192..f07c1f2e8a5 100644 --- a/print/tcl-pdflib/PLIST +++ b/print/tcl-pdflib/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:03 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:21:02 jlam Exp $ lib/tcl8.3/pdflib/pdflib_tcl.a lib/tcl8.3/pdflib/pdflib_tcl.la lib/tcl8.3/pdflib/pdflib_tcl.so -lib/tcl8.3/pdflib/pdflib_tcl.so.2 -lib/tcl8.3/pdflib/pdflib_tcl.so.2.1 +lib/tcl8.3/pdflib/pdflib_tcl.so.0 +lib/tcl8.3/pdflib/pdflib_tcl.so.0.0 lib/tcl8.3/pdflib/pkgIndex.tcl @dirrm lib/tcl8.3/pdflib diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 68369457428..29da71d0421 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7.2.2 2002/07/01 17:45:07 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.3 2002/08/25 21:21:03 jlam Exp $ # DISTNAME= xpdf-1.00 @@ -30,8 +30,8 @@ MAKE_ENV+= SED="${SED}" ECHO="${ECHO}" CONFIGURE_ARGS+= --enable-a4-paper .endif +.include "../../fonts/t1lib/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../textproc/t1lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |