24 files changed, 233 insertions, 75 deletions

diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index c93991509bd5..268886dfea8b 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ggv
-PORTVERSION=	0.95
+PORTVERSION=	1.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ggv
@@ -18,6 +18,7 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/print/ggv/distinfo b/print/ggv/distinfo
index 3662dcee2d88..0571954b8cfe 100644
--- a/print/ggv/distinfo
+++ b/print/ggv/distinfo
@@ -1 +1 @@
-MD5 (ggv-0.95.tar.gz) = e407836a107279b8fda1b961539a1cff
+MD5 (ggv-1.0.tar.gz) = a857c53a6b0ad2f3d95defc953e7cd5d
diff --git a/print/ggv/files/patch-aa b/print/ggv/files/patch-aa
index fe039bee57d1..0b27e1d93ee4 100644
--- a/print/ggv/files/patch-aa
+++ b/print/ggv/files/patch-aa
@@ -20,19 +20,3 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -4821,13 +4821,8 @@
-      fi
-   fi
-   if test "x$no_bonobo" = x ; then
--     echo "$ac_t""yes" 1>&6
--     
--	cat >> confdefs.h <<\EOF
--#define ENABLE_BONOBO 1
--EOF
--
--	have_bonobo=true
-+     echo "$ac_t""yes - but I'm ignoring it" 1>&6
-+	have_bonobo=false
-      
-   else
-      echo "$ac_t""no" 1>&6
diff --git a/print/ggv/files/patch-ad b/print/ggv/files/patch-ad
index b57932a3b65b..d346879b7abe 100644
--- a/print/ggv/files/patch-ad
+++ b/print/ggv/files/patch-ad
@@ -1,10 +1,6 @@
---- src/ps.h.orig	Tue Jan 26 13:58:49 1999
-+++ src/ps.h	Tue Jan 26 13:59:06 1999
-@@ -40,6 +40,7 @@
- 	/* Constants used to store keywords that are scanned. */
- 	/* NONE is not a keyword, it tells when a field was not set */
+--- src/ps.h.orig	Tue Feb 13 12:21:25 2001
++++ src/ps.h	Tue Feb 27 18:50:19 2001
+@@ -45,2 +45,3 @@
  
 +#undef NONE
- enum {ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL};
- 
- #define PSLINELENGTH 257	/* 255 characters + 1 newline + 1 NULL */
+ enum { ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL };
diff --git a/print/ggv/files/patch-af b/print/ggv/files/patch-af
new file mode 100644
index 000000000000..6f2b5511f022
--- /dev/null
+++ b/print/ggv/files/patch-af
@@ -0,0 +1,6 @@
+--- app-docs.make.orig	Tue Mar 27 14:36:27 2001
++++ app-docs.make	Tue Apr 17 19:42:48 2001
+@@ -1,2 +1,2 @@
+-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
++helpdir = $(datadir)/help/$(app)/$(lang)
+ help_DATA = \
diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist
index 293f0cd6982d..455c76bdb43a 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -1,8 +1,79 @@
+bin/bonobo-application-ps
 bin/ggv
-etc/CORBA/servers/application-ps.gnorba
 share/gnome/apps/Graphics/ggv.desktop
+share/gnome/help/ggv/C/docbook.css
+share/gnome/help/ggv/C/ggv.sgml
+share/gnome/help/ggv/C/index.html
+share/gnome/help/ggv/C/intro.html
+share/gnome/help/ggv/C/ln21.html
+share/gnome/help/ggv/C/mainwin.html
+share/gnome/help/ggv/C/menuopts.html
+share/gnome/help/ggv/C/options.html
+share/gnome/help/ggv/C/prefs.html
+share/gnome/help/ggv/C/probs.html
+share/gnome/help/ggv/C/stylesheet-images/caution.gif
+share/gnome/help/ggv/C/stylesheet-images/home.gif
+share/gnome/help/ggv/C/stylesheet-images/important.gif
+share/gnome/help/ggv/C/stylesheet-images/next.gif
+share/gnome/help/ggv/C/stylesheet-images/note.gif
+share/gnome/help/ggv/C/stylesheet-images/prev.gif
+share/gnome/help/ggv/C/stylesheet-images/tip.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/C/stylesheet-images/up.gif
+share/gnome/help/ggv/C/stylesheet-images/warning.gif
 share/gnome/help/ggv/C/topic.dat
+share/gnome/help/ggv/it/docbook.css
+share/gnome/help/ggv/it/ggv.sgml
+share/gnome/help/ggv/it/index.html
+share/gnome/help/ggv/it/intro.html
+share/gnome/help/ggv/it/ln21.html
+share/gnome/help/ggv/it/mainwin.html
+share/gnome/help/ggv/it/menuopts.html
+share/gnome/help/ggv/it/options.html
+share/gnome/help/ggv/it/prefs.html
+share/gnome/help/ggv/it/probs.html
+share/gnome/help/ggv/it/stylesheet-images/caution.gif
+share/gnome/help/ggv/it/stylesheet-images/home.gif
+share/gnome/help/ggv/it/stylesheet-images/important.gif
+share/gnome/help/ggv/it/stylesheet-images/next.gif
+share/gnome/help/ggv/it/stylesheet-images/note.gif
+share/gnome/help/ggv/it/stylesheet-images/prev.gif
+share/gnome/help/ggv/it/stylesheet-images/tip.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/it/stylesheet-images/up.gif
+share/gnome/help/ggv/it/stylesheet-images/warning.gif
 share/gnome/help/ggv/it/topic.dat
+share/gnome/help/ggv/ja/docbook.css
+share/gnome/help/ggv/ja/ggv.sgml
+share/gnome/help/ggv/ja/index.html
+share/gnome/help/ggv/ja/intro.html
+share/gnome/help/ggv/ja/ln21.html
+share/gnome/help/ggv/ja/mainwin.html
+share/gnome/help/ggv/ja/menuopts.html
+share/gnome/help/ggv/ja/options.html
+share/gnome/help/ggv/ja/prefs.html
+share/gnome/help/ggv/ja/probs.html
+share/gnome/help/ggv/ja/stylesheet-images/caution.gif
+share/gnome/help/ggv/ja/stylesheet-images/home.gif
+share/gnome/help/ggv/ja/stylesheet-images/important.gif
+share/gnome/help/ggv/ja/stylesheet-images/next.gif
+share/gnome/help/ggv/ja/stylesheet-images/note.gif
+share/gnome/help/ggv/ja/stylesheet-images/prev.gif
+share/gnome/help/ggv/ja/stylesheet-images/tip.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/ja/stylesheet-images/up.gif
+share/gnome/help/ggv/ja/stylesheet-images/warning.gif
+share/gnome/help/ggv/ja/topic.dat
+share/gnome/oaf/Bonobo_GGV.oafinfo
+share/gnome/omf/ggv/ggv-C.omf
+share/gnome/omf/ggv/ggv-it.omf
+share/gnome/omf/ggv/ggv-ja.omf
 share/gnome/pixmaps/ggv-splash.png
 share/gnome/pixmaps/gnome-ghostview.png
 share/locale/ca/LC_MESSAGES/ggv.mo
@@ -25,11 +96,20 @@ share/locale/no/LC_MESSAGES/ggv.mo
 share/locale/pl/LC_MESSAGES/ggv.mo
 share/locale/pt/LC_MESSAGES/ggv.mo
 share/locale/pt_BR/LC_MESSAGES/ggv.mo
+share/locale/ro/LC_MESSAGES/ggv.mo
 share/locale/ru/LC_MESSAGES/ggv.mo
+share/locale/sk/LC_MESSAGES/ggv.mo
 share/locale/sl/LC_MESSAGES/ggv.mo
 share/locale/sv/LC_MESSAGES/ggv.mo
 share/locale/tr/LC_MESSAGES/ggv.mo
 share/locale/uk/LC_MESSAGES/ggv.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/ggv.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/ggv.mo
+@dirrm share/gnome/omf/ggv
+@dirrm share/gnome/help/ggv/ja/stylesheet-images
+@dirrm share/gnome/help/ggv/ja
+@dirrm share/gnome/help/ggv/it/stylesheet-images
 @dirrm share/gnome/help/ggv/it
+@dirrm share/gnome/help/ggv/C/stylesheet-images
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index c93991509bd5..268886dfea8b 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ggv
-PORTVERSION=	0.95
+PORTVERSION=	1.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ggv
@@ -18,6 +18,7 @@ RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index 3662dcee2d88..0571954b8cfe 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1 +1 @@
-MD5 (ggv-0.95.tar.gz) = e407836a107279b8fda1b961539a1cff
+MD5 (ggv-1.0.tar.gz) = a857c53a6b0ad2f3d95defc953e7cd5d
diff --git a/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa
index fe039bee57d1..0b27e1d93ee4 100644
--- a/print/ggv2/files/patch-aa
+++ b/print/ggv2/files/patch-aa
@@ -20,19 +20,3 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -4821,13 +4821,8 @@
-      fi
-   fi
-   if test "x$no_bonobo" = x ; then
--     echo "$ac_t""yes" 1>&6
--     
--	cat >> confdefs.h <<\EOF
--#define ENABLE_BONOBO 1
--EOF
--
--	have_bonobo=true
-+     echo "$ac_t""yes - but I'm ignoring it" 1>&6
-+	have_bonobo=false
-      
-   else
-      echo "$ac_t""no" 1>&6
diff --git a/print/ggv2/files/patch-ad b/print/ggv2/files/patch-ad
index b57932a3b65b..d346879b7abe 100644
--- a/print/ggv2/files/patch-ad
+++ b/print/ggv2/files/patch-ad
@@ -1,10 +1,6 @@
---- src/ps.h.orig	Tue Jan 26 13:58:49 1999
-+++ src/ps.h	Tue Jan 26 13:59:06 1999
-@@ -40,6 +40,7 @@
- 	/* Constants used to store keywords that are scanned. */
- 	/* NONE is not a keyword, it tells when a field was not set */
+--- src/ps.h.orig	Tue Feb 13 12:21:25 2001
++++ src/ps.h	Tue Feb 27 18:50:19 2001
+@@ -45,2 +45,3 @@
  
 +#undef NONE
- enum {ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL};
- 
- #define PSLINELENGTH 257	/* 255 characters + 1 newline + 1 NULL */
+ enum { ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL };
diff --git a/print/ggv2/files/patch-af b/print/ggv2/files/patch-af
new file mode 100644
index 000000000000..6f2b5511f022
--- /dev/null
+++ b/print/ggv2/files/patch-af
@@ -0,0 +1,6 @@
+--- app-docs.make.orig	Tue Mar 27 14:36:27 2001
++++ app-docs.make	Tue Apr 17 19:42:48 2001
+@@ -1,2 +1,2 @@
+-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
++helpdir = $(datadir)/help/$(app)/$(lang)
+ help_DATA = \
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index 293f0cd6982d..455c76bdb43a 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -1,8 +1,79 @@
+bin/bonobo-application-ps
 bin/ggv
-etc/CORBA/servers/application-ps.gnorba
 share/gnome/apps/Graphics/ggv.desktop
+share/gnome/help/ggv/C/docbook.css
+share/gnome/help/ggv/C/ggv.sgml
+share/gnome/help/ggv/C/index.html
+share/gnome/help/ggv/C/intro.html
+share/gnome/help/ggv/C/ln21.html
+share/gnome/help/ggv/C/mainwin.html
+share/gnome/help/ggv/C/menuopts.html
+share/gnome/help/ggv/C/options.html
+share/gnome/help/ggv/C/prefs.html
+share/gnome/help/ggv/C/probs.html
+share/gnome/help/ggv/C/stylesheet-images/caution.gif
+share/gnome/help/ggv/C/stylesheet-images/home.gif
+share/gnome/help/ggv/C/stylesheet-images/important.gif
+share/gnome/help/ggv/C/stylesheet-images/next.gif
+share/gnome/help/ggv/C/stylesheet-images/note.gif
+share/gnome/help/ggv/C/stylesheet-images/prev.gif
+share/gnome/help/ggv/C/stylesheet-images/tip.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/C/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/C/stylesheet-images/up.gif
+share/gnome/help/ggv/C/stylesheet-images/warning.gif
 share/gnome/help/ggv/C/topic.dat
+share/gnome/help/ggv/it/docbook.css
+share/gnome/help/ggv/it/ggv.sgml
+share/gnome/help/ggv/it/index.html
+share/gnome/help/ggv/it/intro.html
+share/gnome/help/ggv/it/ln21.html
+share/gnome/help/ggv/it/mainwin.html
+share/gnome/help/ggv/it/menuopts.html
+share/gnome/help/ggv/it/options.html
+share/gnome/help/ggv/it/prefs.html
+share/gnome/help/ggv/it/probs.html
+share/gnome/help/ggv/it/stylesheet-images/caution.gif
+share/gnome/help/ggv/it/stylesheet-images/home.gif
+share/gnome/help/ggv/it/stylesheet-images/important.gif
+share/gnome/help/ggv/it/stylesheet-images/next.gif
+share/gnome/help/ggv/it/stylesheet-images/note.gif
+share/gnome/help/ggv/it/stylesheet-images/prev.gif
+share/gnome/help/ggv/it/stylesheet-images/tip.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/it/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/it/stylesheet-images/up.gif
+share/gnome/help/ggv/it/stylesheet-images/warning.gif
 share/gnome/help/ggv/it/topic.dat
+share/gnome/help/ggv/ja/docbook.css
+share/gnome/help/ggv/ja/ggv.sgml
+share/gnome/help/ggv/ja/index.html
+share/gnome/help/ggv/ja/intro.html
+share/gnome/help/ggv/ja/ln21.html
+share/gnome/help/ggv/ja/mainwin.html
+share/gnome/help/ggv/ja/menuopts.html
+share/gnome/help/ggv/ja/options.html
+share/gnome/help/ggv/ja/prefs.html
+share/gnome/help/ggv/ja/probs.html
+share/gnome/help/ggv/ja/stylesheet-images/caution.gif
+share/gnome/help/ggv/ja/stylesheet-images/home.gif
+share/gnome/help/ggv/ja/stylesheet-images/important.gif
+share/gnome/help/ggv/ja/stylesheet-images/next.gif
+share/gnome/help/ggv/ja/stylesheet-images/note.gif
+share/gnome/help/ggv/ja/stylesheet-images/prev.gif
+share/gnome/help/ggv/ja/stylesheet-images/tip.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-blank.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-minus.gif
+share/gnome/help/ggv/ja/stylesheet-images/toc-plus.gif
+share/gnome/help/ggv/ja/stylesheet-images/up.gif
+share/gnome/help/ggv/ja/stylesheet-images/warning.gif
+share/gnome/help/ggv/ja/topic.dat
+share/gnome/oaf/Bonobo_GGV.oafinfo
+share/gnome/omf/ggv/ggv-C.omf
+share/gnome/omf/ggv/ggv-it.omf
+share/gnome/omf/ggv/ggv-ja.omf
 share/gnome/pixmaps/ggv-splash.png
 share/gnome/pixmaps/gnome-ghostview.png
 share/locale/ca/LC_MESSAGES/ggv.mo
@@ -25,11 +96,20 @@ share/locale/no/LC_MESSAGES/ggv.mo
 share/locale/pl/LC_MESSAGES/ggv.mo
 share/locale/pt/LC_MESSAGES/ggv.mo
 share/locale/pt_BR/LC_MESSAGES/ggv.mo
+share/locale/ro/LC_MESSAGES/ggv.mo
 share/locale/ru/LC_MESSAGES/ggv.mo
+share/locale/sk/LC_MESSAGES/ggv.mo
 share/locale/sl/LC_MESSAGES/ggv.mo
 share/locale/sv/LC_MESSAGES/ggv.mo
 share/locale/tr/LC_MESSAGES/ggv.mo
 share/locale/uk/LC_MESSAGES/ggv.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/ggv.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/ggv.mo
+@dirrm share/gnome/omf/ggv
+@dirrm share/gnome/help/ggv/ja/stylesheet-images
+@dirrm share/gnome/help/ggv/ja
+@dirrm share/gnome/help/ggv/it/stylesheet-images
 @dirrm share/gnome/help/ggv/it
+@dirrm share/gnome/help/ggv/C/stylesheet-images
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 83f4f01e60f3..19d3b2c8bcae 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeprint
-PORTVERSION=	0.25
+PORTVERSION=	0.28
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-print
@@ -15,15 +15,13 @@ DISTNAME=	gnome-print-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMECTRL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index a5909c7fa11f..3254ee6401f5 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.25.tar.gz) = 18d122b0ce1cc9f8ddf57a642c0e2af3
+MD5 (gnome-print-0.28.tar.gz) = a14fa46020e432661deddc3128fdfe99
diff --git a/print/gnome-print/files/patch-ac b/print/gnome-print/files/patch-ac
new file mode 100644
index 000000000000..a299a643f671
--- /dev/null
+++ b/print/gnome-print/files/patch-ac
@@ -0,0 +1,8 @@
+--- installer/gf-pfb.c.orig	Thu Nov 16 20:22:10 2000
++++ installer/gf-pfb.c	Thu Mar 15 19:26:11 2001
+@@ -6,4 +6,4 @@
+ 
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index b1170ac68f73..e402bc3d3bbd 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -24,7 +24,7 @@ include/libgnomeprint/gnome-rfont.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.13
+lib/libgnomeprint.so.16
 share/gnome/fonts/afms/adobe/pagd8a.afm
 share/gnome/fonts/afms/adobe/pagdo8a.afm
 share/gnome/fonts/afms/adobe/pagk8a.afm
@@ -66,9 +66,11 @@ share/gnome/fonts/afms/adobe/putr8a.afm
 share/gnome/fonts/afms/adobe/putri8a.afm
 share/gnome/fonts/afms/adobe/pzcmi8a.afm
 share/gnome/fonts/afms/adobe/pzdr.afm
-share/gnome/fonts/fontmap
+share/gnome/fonts/fontmap2
 share/gnome/gnome-print/%%VERSION%%/profiles/PostscriptOptimized.profile
+share/gnome/gnome-print/%%VERSION%%/profiles/fax-g3.profile
 share/gnome/gnome-print/%%VERSION%%/profiles/pdf.profile
+share/locale/az/LC_MESSAGES/gnome-print.mo
 share/locale/ca/LC_MESSAGES/gnome-print.mo
 share/locale/da/LC_MESSAGES/gnome-print.mo
 share/locale/de/LC_MESSAGES/gnome-print.mo
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 83f4f01e60f3..19d3b2c8bcae 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeprint
-PORTVERSION=	0.25
+PORTVERSION=	0.28
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-print
@@ -15,15 +15,13 @@ DISTNAME=	gnome-print-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMECTRL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/print/gnomeprint/distinfo b/print/gnomeprint/distinfo
index a5909c7fa11f..3254ee6401f5 100644
--- a/print/gnomeprint/distinfo
+++ b/print/gnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.25.tar.gz) = 18d122b0ce1cc9f8ddf57a642c0e2af3
+MD5 (gnome-print-0.28.tar.gz) = a14fa46020e432661deddc3128fdfe99
diff --git a/print/gnomeprint/files/patch-ac b/print/gnomeprint/files/patch-ac
new file mode 100644
index 000000000000..a299a643f671
--- /dev/null
+++ b/print/gnomeprint/files/patch-ac
@@ -0,0 +1,8 @@
+--- installer/gf-pfb.c.orig	Thu Nov 16 20:22:10 2000
++++ installer/gf-pfb.c	Thu Mar 15 19:26:11 2001
+@@ -6,4 +6,4 @@
+ 
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
diff --git a/print/gnomeprint/pkg-plist b/print/gnomeprint/pkg-plist
index b1170ac68f73..e402bc3d3bbd 100644
--- a/print/gnomeprint/pkg-plist
+++ b/print/gnomeprint/pkg-plist
@@ -24,7 +24,7 @@ include/libgnomeprint/gnome-rfont.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.13
+lib/libgnomeprint.so.16
 share/gnome/fonts/afms/adobe/pagd8a.afm
 share/gnome/fonts/afms/adobe/pagdo8a.afm
 share/gnome/fonts/afms/adobe/pagk8a.afm
@@ -66,9 +66,11 @@ share/gnome/fonts/afms/adobe/putr8a.afm
 share/gnome/fonts/afms/adobe/putri8a.afm
 share/gnome/fonts/afms/adobe/pzcmi8a.afm
 share/gnome/fonts/afms/adobe/pzdr.afm
-share/gnome/fonts/fontmap
+share/gnome/fonts/fontmap2
 share/gnome/gnome-print/%%VERSION%%/profiles/PostscriptOptimized.profile
+share/gnome/gnome-print/%%VERSION%%/profiles/fax-g3.profile
 share/gnome/gnome-print/%%VERSION%%/profiles/pdf.profile
+share/locale/az/LC_MESSAGES/gnome-print.mo
 share/locale/ca/LC_MESSAGES/gnome-print.mo
 share/locale/da/LC_MESSAGES/gnome-print.mo
 share/locale/de/LC_MESSAGES/gnome-print.mo
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 83f4f01e60f3..19d3b2c8bcae 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeprint
-PORTVERSION=	0.25
+PORTVERSION=	0.28
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-print
@@ -15,15 +15,13 @@ DISTNAME=	gnome-print-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
-LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMECTRL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index a5909c7fa11f..3254ee6401f5 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.25.tar.gz) = 18d122b0ce1cc9f8ddf57a642c0e2af3
+MD5 (gnome-print-0.28.tar.gz) = a14fa46020e432661deddc3128fdfe99
diff --git a/print/libgnomeprint/files/patch-ac b/print/libgnomeprint/files/patch-ac
new file mode 100644
index 000000000000..a299a643f671
--- /dev/null
+++ b/print/libgnomeprint/files/patch-ac
@@ -0,0 +1,8 @@
+--- installer/gf-pfb.c.orig	Thu Nov 16 20:22:10 2000
++++ installer/gf-pfb.c	Thu Mar 15 19:26:11 2001
+@@ -6,4 +6,4 @@
+ 
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index b1170ac68f73..e402bc3d3bbd 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -24,7 +24,7 @@ include/libgnomeprint/gnome-rfont.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.so
-lib/libgnomeprint.so.13
+lib/libgnomeprint.so.16
 share/gnome/fonts/afms/adobe/pagd8a.afm
 share/gnome/fonts/afms/adobe/pagdo8a.afm
 share/gnome/fonts/afms/adobe/pagk8a.afm
@@ -66,9 +66,11 @@ share/gnome/fonts/afms/adobe/putr8a.afm
 share/gnome/fonts/afms/adobe/putri8a.afm
 share/gnome/fonts/afms/adobe/pzcmi8a.afm
 share/gnome/fonts/afms/adobe/pzdr.afm
-share/gnome/fonts/fontmap
+share/gnome/fonts/fontmap2
 share/gnome/gnome-print/%%VERSION%%/profiles/PostscriptOptimized.profile
+share/gnome/gnome-print/%%VERSION%%/profiles/fax-g3.profile
 share/gnome/gnome-print/%%VERSION%%/profiles/pdf.profile
+share/locale/az/LC_MESSAGES/gnome-print.mo
 share/locale/ca/LC_MESSAGES/gnome-print.mo
 share/locale/da/LC_MESSAGES/gnome-print.mo
 share/locale/de/LC_MESSAGES/gnome-print.mo