diff options
| -rw-r--r-- | print/libgnomeprint/Makefile | 14 | ||||
| -rw-r--r-- | print/libgnomeprint/PLIST | 68 | ||||
| -rw-r--r-- | print/libgnomeprint/buildlink2.mk | 20 | ||||
| -rw-r--r-- | print/libgnomeprint/distinfo | 6 | ||||
| -rw-r--r-- | print/libgnomeprint/patches/patch-ab | 17 |
5 files changed, 63 insertions, 62 deletions
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index ebcefa8772d..a96cfa08b31 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2003/11/14 11:48:57 adam Exp $ +# $NetBSD: Makefile,v 1.20 2003/12/14 19:51:04 jmmv Exp $ # -DISTNAME= libgnomeprint-2.2.1.2 -PKGREVISION= 3 +DISTNAME= libgnomeprint-2.4.0 CATEGORIES= print gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.4/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -33,8 +32,10 @@ BUILD_DEFS+= USE_CUPS .if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss]) .include "../../print/cups/buildlink2.mk" CONFIGURE_ARGS+= --with-cups +PLIST_SUBST+= USE_CUPS= .else CONFIGURE_ARGS+= --without-cups +PLIST_SUBST+= USE_CUPS="@comment " .endif .if ${OPSYS} == "Darwin" @@ -43,10 +44,11 @@ CONFIGURE_ARGS+= --without-cups CONFIGURE_ENV+= libltdl_cv_shlibext=so .endif -.include "../../graphics/freetype2/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/pango/buildlink2.mk" -.include "../../devel/glib2/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST index c5c0d62f5f2..7de56ec5a87 100644 --- a/print/libgnomeprint/PLIST +++ b/print/libgnomeprint/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/03/12 13:03:30 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/12/14 19:51:04 jmmv Exp $ include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h include/libgnomeprint-2.2/libgnomeprint/gnome-font.h include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h @@ -12,6 +12,7 @@ include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h include/libgnomeprint-2.2/libgnomeprint/gp-gc.h include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h @@ -31,46 +32,49 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h lib/libgnomeprint-2-2.a lib/libgnomeprint-2-2.la lib/libgnomeprint-2-2.so -lib/libgnomeprint-2-2.so.0 -lib/libgnomeprint-2-2.so.0.0 +lib/libgnomeprint-2-2.so.1 +lib/libgnomeprint-2-2.so.1.0 +${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.a +${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la +${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.so lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.a lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0 -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0.0 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.a lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0 -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0.0 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.a lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0 -lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0.0 lib/pkgconfig/libgnomeprint-2.2.pc -share/doc/html/libgnomeprint-2.2/index.html -share/doc/html/libgnomeprint-2.2/index.sgml -share/doc/html/libgnomeprint-2.2/libgnomeprint-building.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-compiling.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html -share/doc/html/libgnomeprint-2.2/libgnomeprint-resources.html -share/doc/html/libgnomeprint-2.2/libgnomeprint.html -share/doc/html/libgnomeprint-2.2/libgnomeprintunsorted.html +share/doc/html/libgnomeprint/home.png +share/doc/html/libgnomeprint/index.html +share/doc/html/libgnomeprint/index.sgml +share/doc/html/libgnomeprint/left.png +share/doc/html/libgnomeprint/libgnomeprint-building.html +share/doc/html/libgnomeprint/libgnomeprint-compiling.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-font-face.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-font.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-glyphlist.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-pgl.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-print-config.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-print-job.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-print-paper.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-print-unit.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-print.html +share/doc/html/libgnomeprint/libgnomeprint-gnome-rfont.html +share/doc/html/libgnomeprint/libgnomeprint-resources.html +share/doc/html/libgnomeprint/libgnomeprint.html +share/doc/html/libgnomeprint/libgnomeprintunsorted.html +share/doc/html/libgnomeprint/right.png +share/doc/html/libgnomeprint/up.png share/libgnomeprint/${PKGVERSION}/globals.xml share/libgnomeprint/${PKGVERSION}/models/GNOME-GENERIC-PS.xml share/libgnomeprint/${PKGVERSION}/models/GNOME-PDF-WRITER.xml +share/libgnomeprint/${PKGVERSION}/models/uninstalled/GNOME-META.xml share/libgnomeprint/${PKGVERSION}/printers/GENERIC.xml share/libgnomeprint/${PKGVERSION}/printers/PDF-WRITER.xml +share/libgnomeprint/${PKGVERSION}/printers/uninstalled/META.xml ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo @@ -79,6 +83,7 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo @@ -96,7 +101,10 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo @@ -109,19 +117,25 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo +${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo +@dirrm share/libgnomeprint/${PKGVERSION}/printers/uninstalled @dirrm share/libgnomeprint/${PKGVERSION}/printers +@dirrm share/libgnomeprint/${PKGVERSION}/models/uninstalled @dirrm share/libgnomeprint/${PKGVERSION}/models @dirrm share/libgnomeprint/${PKGVERSION} @dirrm share/libgnomeprint -@dirrm share/doc/html/libgnomeprint-2.2 +@dirrm share/doc/html/libgnomeprint @dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports @dirrm lib/libgnomeprint/${PKGVERSION}/modules @dirrm lib/libgnomeprint/${PKGVERSION} diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk index 9657f13aee5..53fc46cc493 100644 --- a/print/libgnomeprint/buildlink2.mk +++ b/print/libgnomeprint/buildlink2.mk @@ -1,33 +1,35 @@ -# $NetBSD: buildlink2.mk,v 1.10 2003/11/12 01:31:51 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2003/12/14 19:51:04 jmmv Exp $ # # This Makefile fragment is included by packages that use libgnomeprint. # -# This file was created automatically using createbuildlink 2.4. +# This file was created automatically using createbuildlink 2.8. # .if !defined(LIBGNOMEPRINT_BUILDLINK2_MK) LIBGNOMEPRINT_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libgnomeprint -BUILDLINK_DEPENDS.libgnomeprint?= libgnomeprint>=2.2.1.2nb3 -BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint +BUILDLINK_DEPENDS.libgnomeprint?= libgnomeprint>=2.4.0 +BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomeprint=libgnomeprint BUILDLINK_PREFIX.libgnomeprint_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.libgnomeprint+= include/libgnomeprint-2.2/libgnomeprint/* BUILDLINK_FILES.libgnomeprint+= include/libgnomeprint-2.2/libgnomeprint/private/* BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint-2-2.* -BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-custom.* -BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-file.* -BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-lpr.* -BUILDLINK_FILES.libgnomeprint+= lib/pkgconfig/libgnomeprint-2.2.pc +BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.* +BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.* +BUILDLINK_FILES.libgnomeprint+= lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.* .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/pango/buildlink2.mk" -.include "../../devel/glib2/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" +.if !empty(USE_CUPS:M[Yy][Ee][Ss]) +.include "../../print/cups/buildlink2.mk" +.endif BUILDLINK_TARGETS+= libgnomeprint-buildlink diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index f3e870ade2b..64f29e3a5ce 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2003/09/27 21:05:22 danw Exp $ +$NetBSD: distinfo,v 1.6 2003/12/14 19:51:04 jmmv Exp $ -SHA1 (libgnomeprint-2.2.1.2.tar.bz2) = f70ccfa4d0dc009dbaba4aea8e16df3086da7c85 -Size (libgnomeprint-2.2.1.2.tar.bz2) = 555140 bytes +SHA1 (libgnomeprint-2.4.0.tar.bz2) = 397698448ccd377307b7e5620cd59912aafbe980 +Size (libgnomeprint-2.4.0.tar.bz2) = 652182 bytes SHA1 (patch-aa) = 54cf15d9caa7834f06cae48a792fc4716bc8a3f9 SHA1 (patch-ab) = f7ac5151f12e25fa0a4a616a32a5abac963d7a03 diff --git a/print/libgnomeprint/patches/patch-ab b/print/libgnomeprint/patches/patch-ab deleted file mode 100644 index 8bfde53b060..00000000000 --- a/print/libgnomeprint/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/09/27 21:05:22 danw Exp $ - ---- libgnomeprint/transports/Makefile.in.orig Mon Sep 1 10:27:21 2003 -+++ libgnomeprint/transports/Makefile.in Mon Sep 1 10:27:41 2003 -@@ -144,11 +144,8 @@ - $(CUSTOM_LIB) - - --CPPFLAGS = \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -- -- - INCLUDES = \ -+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir) \ - $(LIBGNOMEPRINT_CFLAGS) - |