Update from 0.4r762 to 0.4r790

3 files changed, 15 insertions, 54 deletions

diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile
index dd981e4468c..ff450a650f0 100644
--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XaraLX
-PORTVERSION=	0.4r762
+PORTVERSION=	0.4r790
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.xara.com/opensource/
 
@@ -41,9 +41,4 @@ PLIST_FILES=	bin/${PROG}
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -f -s -i
 
-# the stock install target installs include/camtypes.h in addition which
-# is absolutely completely not necessary
-#do-install:
-#	${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/graphics/xaralx/distinfo b/graphics/xaralx/distinfo
index 1fd84c0fcfc..2f3f057be41 100644
--- a/graphics/xaralx/distinfo
+++ b/graphics/xaralx/distinfo
@@ -1,3 +1,3 @@
-MD5 (XaraLX-0.4r762.tar.gz) = 8a2bdcaa46a0ef0513c20bed600f2c77
-SHA256 (XaraLX-0.4r762.tar.gz) = f3d5e73c9017b616a2c825e9032ecff2c161b5895464507d18b8e64de697c28a
-SIZE (XaraLX-0.4r762.tar.gz) = 25588884
+MD5 (XaraLX-0.4r790.tar.gz) = b58e449ef45a17f74ffdcb9d49984232
+SHA256 (XaraLX-0.4r790.tar.gz) = cc77be75f2ef95ebe4d4e530d29a97e2c9f8b9d4f895e7940fee30202cb7bbfb
+SIZE (XaraLX-0.4r790.tar.gz) = 25729738
diff --git a/graphics/xaralx/files/patch-configure.in b/graphics/xaralx/files/patch-configure.in
index 2959a9463af..1a6f7e4591b 100644
--- a/graphics/xaralx/files/patch-configure.in
+++ b/graphics/xaralx/files/patch-configure.in
@@ -1,23 +1,5 @@
---- configure.in.orig	Mon Apr  3 18:50:40 2006
-+++ configure.in	Tue Apr  4 16:01:33 2006
-@@ -8,7 +8,7 @@
- AC_ARG_ENABLE(debug,
- [[  --enable-debug          Add more debug information and checks to executable]],
- [
--	if test $enableval == "yes"; then
-+	if test $enableval = "yes"; then
- 		DEBUG_FLAGS="-ggdb -D_DEBUG"
- 		OPT_FLAGS="-O0"
- 		DebugEnable="yes"
-@@ -19,7 +19,7 @@
- AC_ARG_ENABLE(static-exec,
- [[  --enable-static-exec    Build a statically linked version of the executable]],
- [
--	if test $enableval == "yes"; then
-+	if test $enableval = "yes"; then
- 		StaticEnable="yes"
- 		DebugEnable="no"
- 	fi
+--- configure.in.orig	Mon Apr 10 12:05:33 2006
++++ configure.in	Mon Apr 10 12:09:09 2006
 @@ -47,7 +47,7 @@
  AC_PROG_INSTALL
  # We don't need dlopen right now and it's not supported on Darwin
@@ -27,15 +9,6 @@
  
  AC_C_BIGENDIAN
  AC_CHECK_SIZEOF(void*)
-@@ -72,7 +72,7 @@
- PrecompileEnable="yes"
- 
- AC_MSG_CHECKING([Compiler])
--if test $ac_compiler_gnu == "yes"; then
-+if test $ac_compiler_gnu = "yes"; then
- 	GccVersion=`$CXX -v 2>&1 | $AWK '{ if ($2 ~ /version/) print $3 }'`
- 	GccVersion=`echo $GccVersion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
- 
 @@ -141,7 +141,6 @@
  	if echo $WX_CPPFLAGS | grep -q '__WXGTK__' ; then 
  		WX_GTK="yes"
@@ -44,36 +17,29 @@
  	else
  		AC_MSG_RESULT([not found])
  	fi
-@@ -173,24 +172,15 @@
- 		AC_MSG_ERROR([freetype is required. Try --with-freetype-config.])
- 	fi])
- 
--if test $WX_GTK == "yes"; then
-+if test $WX_GTK = "yes"; then
+@@ -177,20 +176,7 @@
  	# GTK build, so call FTTEST function to test for FreeType
  	FTTEST
  	FT_CFLAGS="`$FTCONFIG --cflags`"
 -
 -	# check for the Pango package
+-	PkgError = "no"
 -	PKG_CHECK_MODULES(PANGOX, pangox,
 -			  [
 -				PANGO_CFLAGS="$PANGOX_CFLAGS"
 -			  ],
 -			  [
--				AC_MSG_ERROR([pangox library not found])
+-				PkgError = "yes"
 -			  ]
 -			  )
+-	if test PkgError = "yes"; then
+-		AC_MSG_ERROR([pangox library not found])
+-	fi
 +	PANGO_CFLAGS=""
  else
  	# non-GTK build, i.e., MacOS, so Pango and FreeType are not required
--	FT_CFLAGS = ""
--	PANGO_CFLAGS = ""
-+	FT_CFLAGS=""
-+	PANGO_CFLAGS=""
- fi
- 
- TOPDIR=$srcdir;
-@@ -204,8 +194,8 @@
+ 	FT_CFLAGS=""
+@@ -208,8 +194,8 @@
  fi
  
  # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering)
@@ -84,7 +50,7 @@
  
  AC_MSG_CHECKING([Linker])
  case $host in
-@@ -244,6 +234,7 @@
+@@ -248,6 +234,7 @@
  AM_CONDITIONAL(DARWIN_LINK, [test "$DarwinLink" = "yes"])
  
  AC_SUBST(TOPDIR)