summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/libgnomeprint/Makefile7
-rw-r--r--print/libgnomeprint/PLIST17
-rw-r--r--print/libgnomeprint/buildlink3.mk4
-rw-r--r--print/libgnomeprint/distinfo7
-rw-r--r--print/libgnomeprint/patches/patch-aa14
-rw-r--r--print/libgnomeprintui/Makefile8
-rw-r--r--print/libgnomeprintui/PLIST14
-rw-r--r--print/libgnomeprintui/buildlink3.mk5
-rw-r--r--print/libgnomeprintui/distinfo7
-rw-r--r--print/libgnomeprintui/patches/patch-aa26
10 files changed, 47 insertions, 62 deletions
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 8f661d2ed38..71067118ca2 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/01 18:29:40 jmmv Exp $
#
-DISTNAME= libgnomeprint-2.4.2
-PKGREVISION= 2
+DISTNAME= libgnomeprint-2.6.0
CATEGORIES= print gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.4/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.6/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index fab8dd874b1..c92821d11bc 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/18 11:02:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:29:40 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
@@ -15,6 +15,7 @@ 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-pango.h
include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
@@ -53,6 +54,16 @@ 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
@@ -77,6 +88,8 @@ ${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
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -85,6 +98,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -101,6 +115,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index afe1cf843de..731bb063e93 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:29:40 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprint}
BUILDLINK_PACKAGES+= libgnomeprint
.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.4.2nb1
+BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.6.0
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.endif # LIBGNOMEPRINT_BUILDLINK3_MK
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index d4fa87ecc17..3773bcbc53a 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/12/18 11:02:47 adam Exp $
+$NetBSD: distinfo,v 1.9 2004/04/01 18:29:40 jmmv Exp $
-SHA1 (libgnomeprint-2.4.2.tar.bz2) = 86c3010533b8d9514f94ae3a4dab80be406f44fb
-Size (libgnomeprint-2.4.2.tar.bz2) = 639654 bytes
-SHA1 (patch-aa) = 54cf15d9caa7834f06cae48a792fc4716bc8a3f9
+SHA1 (libgnomeprint-2.6.0.tar.bz2) = 07a4993402d8ee925a4f81fb31f47198737cca85
+Size (libgnomeprint-2.6.0.tar.bz2) = 685974 bytes
diff --git a/print/libgnomeprint/patches/patch-aa b/print/libgnomeprint/patches/patch-aa
deleted file mode 100644
index b37f131034e..00000000000
--- a/print/libgnomeprint/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/09/27 21:05:22 danw Exp $
-
---- libgnomeprint/gnome-print.c.orig Mon Sep 1 10:11:58 2003
-+++ libgnomeprint/gnome-print.c Mon Sep 1 10:11:35 2003
-@@ -38,8 +38,8 @@
- #include <libgnomeprint/gnome-print-frgba.h>
-
- /* For the buffer stuff, remove when the buffer stuff is moved out here */
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 86604d11ab2..92c676c5ee6 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/01 18:29:40 jmmv Exp $
#
-DISTNAME= libgnomeprintui-2.4.2
-PKGREVISION= 2
+DISTNAME= libgnomeprintui-2.6.0
CATEGORIES= print gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.4/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.6/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
@@ -31,6 +30,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index 397070dd242..f42496231f9 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/18 11:05:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:29:40 jmmv Exp $
include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h
include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
@@ -16,6 +17,13 @@ share/doc/html/libgnomeprintui/home.png
share/doc/html/libgnomeprintui/index.html
share/doc/html/libgnomeprintui/index.sgml
share/doc/html/libgnomeprintui/left.png
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
share/doc/html/libgnomeprintui/libgnomeprintui.html
share/doc/html/libgnomeprintui/right.png
share/doc/html/libgnomeprintui/up.png
@@ -31,6 +39,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -58,6 +68,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -70,6 +81,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 277a42f8d69..2fbd4ca77f2 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:29:40 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprintui}
BUILDLINK_PACKAGES+= libgnomeprintui
.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.4.2nb1
+BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.6.0
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 0efd5e38172..2a4e98140d7 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/18 11:05:25 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:29:40 jmmv Exp $
-SHA1 (libgnomeprintui-2.4.2.tar.bz2) = acb256ac0ad4ad5d064cdc5ea2e23c3aae4746a0
-Size (libgnomeprintui-2.4.2.tar.bz2) = 509655 bytes
-SHA1 (patch-aa) = 08d8651239974915cb515ac94e13d7705295f367
+SHA1 (libgnomeprintui-2.6.0.tar.bz2) = 0c82f3dc8c657a6a9852dc926c91f1519c512a85
+Size (libgnomeprintui-2.6.0.tar.bz2) = 551097 bytes
diff --git a/print/libgnomeprintui/patches/patch-aa b/print/libgnomeprintui/patches/patch-aa
deleted file mode 100644
index f4e51afcd07..00000000000
--- a/print/libgnomeprintui/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/12/18 11:05:25 adam Exp $
-
---- libgnomeprintui/gpaui/Makefile.in.orig 2003-11-26 20:41:53.000000000 +0000
-+++ libgnomeprintui/gpaui/Makefile.in
-@@ -54,11 +54,6 @@ CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
-
--CPPFLAGS = \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-- -DBINDIR=\""$(bindir)"\" \
-- -DDATADIR=\""$(datadir)"\"
--
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -192,6 +187,9 @@ INCLUDES = \
- -I$(top_srcdir)/libgnomeprintui \
- -DWE_ARE_LIBGNOMEPRINT_INTERNALS \
- $(LIBGNOMEPRINTUI_CFLAGS) \
-+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DBINDIR=\""$(bindir)"\" \
-+ -DDATADIR=\""$(datadir)"\" \
- -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED