5 files changed, 148 insertions, 81 deletions

diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 96619e089e53..309eb365d951 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sodipodi
-PORTVERSION=	0.28
+PORTVERSION=	0.29
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,15 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/frontline.pc:${PORTSDIR}/graphics/frontline
+LIB_DEPENDS=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/frontline.pc:${PORTSDIR}/graphics/frontline
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gal bonobo gnomeprint libglade
+USE_GNOME=	gnomeprefix gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		sodipodi.1
 
diff --git a/graphics/sodipodi/distinfo b/graphics/sodipodi/distinfo
index a34f657cea55..6c25e5d25996 100644
--- a/graphics/sodipodi/distinfo
+++ b/graphics/sodipodi/distinfo
@@ -1 +1 @@
-MD5 (sodipodi-0.28.tar.gz) = 60b5f58ff0f85b88a2a2755ee644fb08
+MD5 (sodipodi-0.29.tar.gz) = 9610cae5790e6a852bdf0176e040256f
diff --git a/graphics/sodipodi/files/patch-configure b/graphics/sodipodi/files/patch-configure
index 37f12adde5a0..4b679dab8fab 100644
--- a/graphics/sodipodi/files/patch-configure
+++ b/graphics/sodipodi/files/patch-configure
@@ -1,50 +1,155 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Oct  5 16:18:14 2001
-+++ configure	Fri Oct  5 16:21:24 2001
-@@ -2481,6 +2481,9 @@
- 
- GNOME_PRINT_LIBS=`gnome-config --libs print`
+--- configure.orig	Tue Jan 28 09:36:19 2003
++++ configure	Tue Jan 28 13:18:31 2003
+@@ -2630,6 +2630,9 @@
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
 +_CPPFLAGS="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS `gnome-config --cflags print`"
 +
  
- ac_safe=`echo "libgnomeprint/gnome-print-frgba.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libgnomeprint/gnome-print-frgba.h""... $ac_c" 1>&6
-@@ -2590,6 +2593,7 @@
-   echo "$ac_t""no" 1>&6
+ 
+ 
+@@ -2693,6 +2696,7 @@
  fi
  
+ 
 +CPPFLAGS="$_CPPFLAGS"
  
- ALL_LINGUAS="ca da de es et fr ga gl hu it ja no ru sl sv tr uk pl pt_BR"
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -3786,7 +3790,7 @@
+ fi
+ 
+ 
+-if test "x${prefix}" == "xNONE"; then
++if test "x${prefix}" = "xNONE"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_LOCALE_DIR "${ac_default_prefix}/${DATADIRNAME}/locale"
+@@ -7154,7 +7158,7 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-if test "x$PKG_CONFIG" == "xno"; then
++if test "x$PKG_CONFIG" = "xno"; then
+ 	{ { echo "$as_me:$LINENO: error: You have to install pkg-config to compile sodipodi." >&5
+ echo "$as_me: error: You have to install pkg-config to compile sodipodi." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -7280,7 +7284,7 @@
+ 
+ 
+ 	if test "x$popt_ok" != "xyes"; then
+-				if test "x$with_popt" == "xyes"; then
++				if test "x$with_popt" = "xyes"; then
+ 						{ { echo "$as_me:$LINENO: error: --with-popt was specified, but appropriate development packages could not be found" >&5
+ echo "$as_me: error: --with-popt was specified, but appropriate development packages could not be found" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -7294,7 +7298,7 @@
+ 
+ 
+ 
+-if test "x$popt_ok" == "xyes"; then
++if test "x$popt_ok" = "xyes"; then
+   USE_POPT_TRUE=
+   USE_POPT_FALSE='#'
+ else
+@@ -7302,7 +7306,7 @@
+   USE_POPT_FALSE=
+ fi
+ 
+-if test "x$popt_ok" == "xyes"; then
++if test "x$popt_ok" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_POPT 1
+@@ -7430,7 +7434,7 @@
+ 
+ 
+ 	if test "x$xft_ok" != "xyes"; then
+-				if test "x$with_xft" == "xyes"; then
++				if test "x$with_xft" = "xyes"; then
+ 						{ { echo "$as_me:$LINENO: error: --with-xft was specified, but appropriate development packages could not be found" >&5
+ echo "$as_me: error: --with-xft was specified, but appropriate development packages could not be found" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -7442,7 +7446,7 @@
  
-@@ -3974,7 +3978,7 @@
+ 
+ 
+-if test "x$xft_ok" == "xyes"; then
++if test "x$xft_ok" = "xyes"; then
+   USE_XFT_TRUE=
+   USE_XFT_FALSE='#'
+ else
+@@ -7450,7 +7454,7 @@
+   USE_XFT_FALSE=
+ fi
+ 
+-if test "x$xft_ok" == "xyes"; then
++if test "x$xft_ok" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_XFT 1
+@@ -7567,7 +7571,7 @@
+   fi
+ 
+ 	if test "x$gp" != "xyes"; then
+-				if test "x$with_gp" == "xyes"; then
++				if test "x$with_gp" = "xyes"; then
+ 						{ { echo "$as_me:$LINENO: error: --with-gnome-print was specified, but appropriate libgnomeprint development packages could not found" >&5
+ echo "$as_me: error: --with-gnome-print was specified, but appropriate libgnomeprint development packages could not found" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -7582,7 +7586,7 @@
+ 
+ 
+ 
+-if test "x$gp" == "xyes"; then
++if test "x$gp" = "xyes"; then
+   USE_GNOME_PRINT_TRUE=
+   USE_GNOME_PRINT_FALSE='#'
+ else
+@@ -7590,7 +7594,7 @@
+   USE_GNOME_PRINT_FALSE=
  fi
  
+-if test "x$gp" == "xyes"; then
++if test "x$gp" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_GNOME_PRINT 1
+@@ -7736,8 +7740,8 @@
+ echo "$as_me:$LINENO: checking compiler support for MMX" >&5
+ echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6
+ 
+-if test x$enable_mmx == xauto ; then
+-  if test $use_x86_asm == yes; then
++if test x$enable_mmx = xauto ; then
++  if test $use_x86_asm = yes; then
+     save_ac_ext=$ac_ext
+     ac_ext=S
+ 
+@@ -7753,13 +7757,13 @@
+     ac_ext=$save_ac_ext
+   fi
+ 
+-elif test x$enable_mmx == xyes ; then
++elif test x$enable_mmx = xyes ; then
+     use_mmx_asm=yes
+ else
+     use_mmx_asm=no
+ fi
+ 
+-if test $use_mmx_asm == yes; then
++if test $use_mmx_asm = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_MMX 1
+@@ -7774,7 +7778,7 @@
+ 
+ 
  
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 	
+-if test x$use_mmx_asm == xyes; then
++if test x$use_mmx_asm = xyes; then
+   USE_MMX_TRUE=
+   USE_MMX_FALSE='#'
  else
-@@ -4096,7 +4100,7 @@
-         
- 	BUILD_INCLUDED_LIBINTL=yes
- 	USE_INCLUDED_LIBINTL=yes
--        CATOBJEXT=.gmo
-+        CATOBJEXT=.mo
- 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
- 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
-@@ -4770,7 +4774,7 @@
- EOF
- 
- SODIPODI_CFLAGS="$FRONTLINE_CFLAGS $SODIPODI_CFLAGS"
--SODIPODI_LIBS="$FRONTLINE_LIBS $SODIPODI_LIBS"     
-+SODIPODI_LIBS="$SODIPODI_LIBS $FRONTLINE_LIBS"     
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$FRONTLINE_CONFIG" = "no" ; then
diff --git a/graphics/sodipodi/files/patch-po::Makefile.in.in b/graphics/sodipodi/files/patch-po::Makefile.in.in
deleted file mode 100644
index 0ad7f0b02c98..000000000000
--- a/graphics/sodipodi/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/Makefile.in.in.orig	Wed Sep 11 11:51:02 2002
-+++ po/Makefile.in.in	Wed Sep 11 11:51:50 2002
-@@ -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 \
-@@ -172,7 +172,7 @@
- 	catalogs='$(GMOFILES)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  cp $$lang.po $$lang.old.po; \
- 	  echo "$$lang:"; \
- 	  if $(MSGMERGE) $$lang ; then \
diff --git a/graphics/sodipodi/pkg-plist b/graphics/sodipodi/pkg-plist
index d7e700e22570..8af714de337f 100644
--- a/graphics/sodipodi/pkg-plist
+++ b/graphics/sodipodi/pkg-plist
@@ -1,6 +1,5 @@
 bin/sodipodi
 share/gnome/apps/Graphics/sodipodi.desktop
-share/gnome/oaf/GNOME_Sodipodi.oaf
 share/gnome/pixmaps/sodipodi.png
 share/gnome/sodipodi/about.svg
 share/gnome/sodipodi/add.xpm
@@ -16,7 +15,6 @@ share/gnome/sodipodi/al_right_in.xpm
 share/gnome/sodipodi/al_right_out.xpm
 share/gnome/sodipodi/al_top_in.xpm
 share/gnome/sodipodi/al_top_out.xpm
-share/gnome/sodipodi/align.glade
 share/gnome/sodipodi/align_bc.xpm
 share/gnome/sodipodi/align_bl.xpm
 share/gnome/sodipodi/align_br.xpm
@@ -32,7 +30,6 @@ share/gnome/sodipodi/angle_90.xpm
 share/gnome/sodipodi/angle_any.xpm
 share/gnome/sodipodi/arrows_hor.xpm
 share/gnome/sodipodi/arrows_ver.xpm
-share/gnome/sodipodi/back.xpm
 share/gnome/sodipodi/cap_butt.xpm
 share/gnome/sodipodi/cap_round.xpm
 share/gnome/sodipodi/cap_square.xpm
@@ -41,15 +38,11 @@ share/gnome/sodipodi/create_new.xpm
 share/gnome/sodipodi/curve.xpm
 share/gnome/sodipodi/cusp.xpm
 share/gnome/sodipodi/del.xpm
-share/gnome/sodipodi/delete.xpm
 share/gnome/sodipodi/delete_xml_attribute.xpm
 share/gnome/sodipodi/delete_xml_node.xpm
-share/gnome/sodipodi/desktop.glade
 share/gnome/sodipodi/dimension_hor.xpm
 share/gnome/sodipodi/dimension_ver.xpm
-share/gnome/sodipodi/display.glade
 share/gnome/sodipodi/div.xpm
-share/gnome/sodipodi/document.glade
 share/gnome/sodipodi/draw_arc.xpm
 share/gnome/sodipodi/draw_dynahand.xpm
 share/gnome/sodipodi/draw_freehand.xpm
@@ -96,7 +89,7 @@ share/gnome/sodipodi/font.xpm
 share/gnome/sodipodi/forward.xpm
 share/gnome/sodipodi/freehand.xpm
 share/gnome/sodipodi/guide_dialog.png
-share/gnome/sodipodi/item.glade
+share/gnome/sodipodi/icons.svg
 share/gnome/sodipodi/join.xpm
 share/gnome/sodipodi/join_bevel.xpm
 share/gnome/sodipodi/join_miter.xpm
@@ -124,7 +117,6 @@ share/gnome/sodipodi/object_flip_hor.xpm
 share/gnome/sodipodi/object_flip_ver.xpm
 share/gnome/sodipodi/object_font.xpm
 share/gnome/sodipodi/object_layout.xpm
-share/gnome/sodipodi/object_props.glade
 share/gnome/sodipodi/object_reset.xpm
 share/gnome/sodipodi/object_rotate.xpm
 share/gnome/sodipodi/object_stroke.xpm
@@ -159,13 +151,11 @@ share/gnome/sodipodi/skew.xpm
 share/gnome/sodipodi/skew_hor.xpm
 share/gnome/sodipodi/skew_ver.xpm
 share/gnome/sodipodi/smooth.xpm
-share/gnome/sodipodi/sodipodi.glade
 share/gnome/sodipodi/stroke.xpm
 share/gnome/sodipodi/sym.xpm
 share/gnome/sodipodi/text.xpm
 share/gnome/sodipodi/toback.xpm
 share/gnome/sodipodi/tofront.xpm
-share/gnome/sodipodi/toolbox.glade
 share/gnome/sodipodi/toolbox_draw.xpm
 share/gnome/sodipodi/toolbox_edit.xpm
 share/gnome/sodipodi/toolbox_file.xpm
@@ -173,11 +163,9 @@ share/gnome/sodipodi/toolbox_node.xpm
 share/gnome/sodipodi/toolbox_object.xpm
 share/gnome/sodipodi/toolbox_select.xpm
 share/gnome/sodipodi/toolbox_zoom.xpm
-share/gnome/sodipodi/transformation.glade
 share/gnome/sodipodi/unknown.xpm
 share/gnome/sodipodi/writing_mode_lr.xpm
 share/gnome/sodipodi/writing_mode_tb.xpm
-share/gnome/sodipodi/xml-tree.glade
 share/gnome/sodipodi/zoom.xpm
 share/gnome/sodipodi/zoom_1_to_1.xpm
 share/gnome/sodipodi/zoom_1_to_2.xpm
@@ -189,6 +177,7 @@ share/gnome/sodipodi/zoom_page.xpm
 share/gnome/sodipodi/zoom_select.xpm
 share/locale/az/LC_MESSAGES/sodipodi.mo
 share/locale/ca/LC_MESSAGES/sodipodi.mo
+share/locale/cs/LC_MESSAGES/sodipodi.mo
 share/locale/da/LC_MESSAGES/sodipodi.mo
 share/locale/de/LC_MESSAGES/sodipodi.mo
 share/locale/el/LC_MESSAGES/sodipodi.mo