5 files changed, 28 insertions, 35 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 4eaf3844dc9d..6f64ab03231e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeprint
-PORTVERSION=	0.34
+PORTVERSION=	0.35
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-print
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 3a52fce3f8b6..d7d8b90a124d 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1 +1 @@
-MD5 (gnome-print-0.34.tar.gz) = af477455dca1c68539343a26a04e6c2b
+MD5 (gnome-print-0.35.tar.gz) = 65e0e91bfa43f01debfa12d25c5dc70b
diff --git a/print/gnome-print/files/patch-ltmain.sh b/print/gnome-print/files/patch-ltmain.sh
index 98cb05e4ddb3..13a95afca583 100644
--- a/print/gnome-print/files/patch-ltmain.sh
+++ b/print/gnome-print/files/patch-ltmain.sh
@@ -1,9 +1,24 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
++++ ltmain.sh	Tue Jan 29 09:13:29 2002
+@@ -1037,8 +1037,14 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2416,6 +2422,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -12,8 +27,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4183,10 +4192,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/print/gnome-print/files/patch-po::Makefile.in.in b/print/gnome-print/files/patch-po::Makefile.in.in
deleted file mode 100644
index 3c2510227fc6..000000000000
--- a/print/gnome-print/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2001/10/05 11:35:53	1.1
-+++ po/Makefile.in.in	2001/10/05 11:36:35
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
-@@ -126,7 +126,7 @@
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
- 	done
- 	if test "$(PACKAGE)" = "gettext"; then \
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index a84de0558ef5..a7ff24b7aa9b 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -74,16 +74,18 @@ share/gnome/fonts/afms/adobe/putri8a.afm
 share/gnome/fonts/afms/adobe/pzcmi8a.afm
 share/gnome/fonts/afms/adobe/pzdr.afm
 share/gnome/fonts/defaults.fontmap
-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/gnome/gnome-print/profiles/PostscriptOptimized.profile
+share/gnome/gnome-print/profiles/fax-g3.profile
+share/gnome/gnome-print/profiles/pdf.profile
 share/locale/az/LC_MESSAGES/gnome-print.mo
+share/locale/bg/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
 share/locale/el/LC_MESSAGES/gnome-print.mo
 share/locale/es/LC_MESSAGES/gnome-print.mo
 share/locale/et/LC_MESSAGES/gnome-print.mo
+share/locale/eu/LC_MESSAGES/gnome-print.mo
 share/locale/fi/LC_MESSAGES/gnome-print.mo
 share/locale/fr/LC_MESSAGES/gnome-print.mo
 share/locale/gl/LC_MESSAGES/gnome-print.mo
@@ -110,8 +112,7 @@ share/locale/uk/LC_MESSAGES/gnome-print.mo
 share/locale/wa/LC_MESSAGES/gnome-print.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-print.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome/gnome-print/%%VERSION%%/profiles
-@dirrm share/gnome/gnome-print/%%VERSION%%
+@dirrm share/gnome/gnome-print/profiles
 @dirrm share/gnome/gnome-print
 @dirrm share/gnome/fonts/afms/adobe
 @dirrm share/gnome/fonts/afms