Update from 0.4r925 to 0.4r971

4 files changed, 136 insertions, 9 deletions

diff --git a/graphics/xaralx-devel/Makefile b/graphics/xaralx-devel/Makefile
index fb37c482f4b..d342d5bf616 100644
--- a/graphics/xaralx-devel/Makefile
+++ b/graphics/xaralx-devel/Makefile
@@ -5,19 +5,18 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	0.4r925
+PORTVERSION=	0.4r971
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 COMMENT=	Top-tier vector/general purpose graphics program (development version)
 
+BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2
+
 MASTERDIR=	${.CURDIR}/../xaralx
 MD5_FILE=	${.CURDIR}/distinfo
 
-# we need to exclude some of the patches as they are applied upstream
-PATCHDIR=	${NONEXISTENT}
-EXTRA_PATCHES=	${MASTERDIR}/files/patch-Makefile.am \
-		${MASTERDIR}/files/patch-PreComp_Makefile.am \
-		${MASTERDIR}/files/patch-configure.in
+PATCHDIR=	${.CURDIR}/files
+EXTRA_PATCHES=	${MASTERDIR}/files/patch-PreComp_Makefile.am
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/xaralx-devel/distinfo b/graphics/xaralx-devel/distinfo
index e6fa8e9542e..da780a699af 100644
--- a/graphics/xaralx-devel/distinfo
+++ b/graphics/xaralx-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (XaraLX-0.4r925.tar.gz) = 0f64a8497fd7008877ff0d704de6dd6e
-SHA256 (XaraLX-0.4r925.tar.gz) = 481b3070cb0e64a3133de0cfb0676ea8cd3b24b63fab2dc67ee0c1da6af18608
-SIZE (XaraLX-0.4r925.tar.gz) = 27904898
+MD5 (XaraLX-0.4r971.tar.gz) = aca086b275129d15dd3d93ec55c8cf68
+SHA256 (XaraLX-0.4r971.tar.gz) = 957c4543999c094b7057715d476ceb383a337db4eda63a9f6c0ba77317a3a201
+SIZE (XaraLX-0.4r971.tar.gz) = 27955582
diff --git a/graphics/xaralx-devel/files/patch-Makefile.am b/graphics/xaralx-devel/files/patch-Makefile.am
new file mode 100644
index 00000000000..4d8b9fa2ebe
--- /dev/null
+++ b/graphics/xaralx-devel/files/patch-Makefile.am
@@ -0,0 +1,22 @@
+--- Makefile.am.orig	Sun May  7 23:30:33 2006
++++ Makefile.am	Mon May  8 10:20:59 2006
+@@ -1,5 +1,10 @@
++# we need -I- to prevent /usr/include/string.h from including our strings.h
++# instead of /usr/include/strings.h
++# Also we are using dlmalloc because the stock libc does not have
++# malloc_usable_size()
+ export XARAFLAGS = -I../PreComp -I../wxOil -I$(TOPDIR)/Kernel -I$(TOPDIR)/wxOil -I$(TOPDIR)/wxOil/Res \
+ 	-I$(TOPDIR)/tools -I$(TOPDIR)/GDraw -I$(TOPDIR)/PreComp -I$(TOPDIR)/wxXtra \
++	-I- -I$(LOCALBASE)/include/dlmalloc $(WX_CPPFLAGS) \
+ 	-DUSE_NATIVE_XLONG -DBUILDSHADOWS -DOLD_MATRIX_TRANSFORMATIONS \
+ 	-DVECTOR_STROKING -DEXCLUDE_FROM_XARALX -DNEW_SHADOW_RENDER -DNO_XARACMS \
+ 	-DNEW_FEATURES -DSHOWPORTNOTE -DDO_EXPORT
+@@ -22,7 +27,7 @@
+     XaraLX_SOURCES	= Kernel/libKernel.a wxOil/libwxOil.a tools/libTools.a wxXtra/libwxXtra.a
+     XaraLX_LDSOURCE = -Wl,--start-group $(XaraLX_SOURCES) -Wl,--end-group
+ endif
+-XaraLX_LDFLAGS		= --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw
++XaraLX_LDFLAGS		= --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) $(LIBXML2_LIBS) -lCDraw -L$(LOCALBASE) -ldlmalloc
+ XaraLX_LD			= $(CXX)
+ 
+ if STATIC_ENABLE
diff --git a/graphics/xaralx-devel/files/patch-configure.in b/graphics/xaralx-devel/files/patch-configure.in
new file mode 100644
index 00000000000..57a7d0fcb6c
--- /dev/null
+++ b/graphics/xaralx-devel/files/patch-configure.in
@@ -0,0 +1,106 @@
+--- configure.in.orig	Sun May  7 23:30:33 2006
++++ configure.in	Mon May  8 16:38:54 2006
+@@ -47,7 +47,7 @@
+ AC_PROG_INSTALL
+ # We don't need dlopen right now and it's not supported on Darwin
+ # AC_LIBTOOL_DLOPEN
+-AC_PROG_LIBTOOL
++AC_PROG_RANLIB
+ 
+ AC_C_BIGENDIAN
+ AC_CHECK_SIZEOF(void*)
+@@ -141,7 +141,6 @@
+ 	if echo $WX_CPPFLAGS | grep -q '__WXGTK__' ; then 
+ 		WX_GTK="yes"
+ 		AC_MSG_RESULT([found])
+-		PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+ 	else
+ 		AC_MSG_RESULT([not found])
+ 	fi
+@@ -151,11 +150,40 @@
+ fi
+ 
+ # Test for libxml2
+-# This is the simple version. Note that xml2-config script is also available
+-# for more detailed configuration.
+-LIBXML2_CFLAGS=""
+-LIBXML2_LIBS=""
+-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
++XML2CONFIG=xml2-config
++AC_ARG_WITH(xml2-config,
++[[  --with-xml2-config=FILE Use the given path to xml2-config when determining
++                            libxml2 configuration; defaults to "xml2-config"]],
++[
++    if test "$withval" != "yes" -a "$withval" != ""; then
++        XML2CONFIG=$withval
++    fi
++])
++
++xml2version=0
++
++AC_DEFUN([XML2TEST],
++[
++	AC_REQUIRE([AC_PROG_AWK])
++	AC_MSG_CHECKING([libxml2 version])
++	if xml2version=`$XML2CONFIG --version`; then
++		AC_MSG_RESULT([$xml2version])
++	else
++		AC_MSG_RESULT([not found])
++		AC_MSG_ERROR([libxml2 is required. Try --with-xml2-config.])
++	fi])
++
++# Call XML2TEST func
++XML2TEST
++
++# check libxml2 version
++xml2version=`echo $xml2version | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
++if test -z "$xml2version" || test "$xml2version" -lt 2006000; then
++	AC_MSG_ERROR([libxml2 2.6 or newer is required])
++fi
++
++LIBXML2_CFLAGS="`$XML2CONFIG --cflags`"
++LIBXML2_LIBS="`$XML2CONFIG --libs`"
+ 
+ # Define FTCONFIG
+ FTCONFIG=freetype-config
+@@ -185,20 +213,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"
+-			  ],
+-			  [
+-				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=""
+@@ -216,8 +231,8 @@
+ fi
+ 
+ # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering)
+-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
++CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND"
++CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND"
+ 
+ AC_MSG_CHECKING([Linker])
+ case $host in
+@@ -256,6 +271,7 @@
+ AM_CONDITIONAL(DARWIN_LINK, [test "$DarwinLink" = "yes"])
+ 
+ AC_SUBST(TOPDIR)
++AC_SUBST(WX_CPPFLAGS)
+ AC_SUBST(WX_LIBS)
+ AC_SUBST(XRCINCLUDE)
+ AC_SUBST(XARALANGUAGE)