* Upgrade xaralx from 0.4r798 to 0.5r1175

* Move all the hacks from the slave port (xaralx-devel) to the
  master port (xaralx) because these are now common for both ports
* Switch both ports from .gz to .bz2 to save some resources

7 files changed, 37 insertions, 105 deletions

diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile
index 6425d3da351..fcc1166faa0 100644
--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@@ -6,34 +6,43 @@
 #
 
 PORTNAME=	XaraLX
-PORTVERSION?=	0.4r798
+PORTVERSION?=	0.5r1175
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.xara.com/opensource/
-DISTFILES?=	${PORTNAME}Src-${PORTVERSION}.tar.gz
+DISTFILES?=	${PORTNAME}Src-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT?=	Top-tier vector/general purpose graphics program (recommended version)
 
+USE_BZIP2=	yes
+
 #WXDEP=	${X11BASE}/libwx_baseu-2.6.so.0.3.1
 WXDEP=	wxgtk2-unicode>=2.6.3
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
-		${LOCALBASE}/bin/md5sum:${PORTSDIR}/archivers/dpkg \
-		${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc
+		md5sum:${PORTSDIR}/archivers/dpkg \
+		xml2-config:${PORTSDIR}/textproc/libxml2 \
+		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS+=	${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
+LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-wx-config=wxgtk2u-2.6-config \
+CONFIGURE_ARGS+=	--with-wx-config=wxgtk2u-2.6-config \
 		--program-suffix=${PKGNAMESUFFIX}
 PKGCONFIGS=atk fontconfig gdk-2.0 pango
 CONFIGURE_ENV+=	CPPFLAGS_APPEND="`pkg-config --cflags ${PKGCONFIGS}` \
 		-I${LOCALBASE}/include/atk-1.0/atk \
 		-I${X11BASE}/include/gtk-2.0/gtk"
+# we're using dlmalloc because the stock libc does not have malloc_usable_size()
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -ldlmalloc"
 
 USE_GMAKE=	yes
+# add wxOil with -I- appended to it before any other -I stuff, see below
+MAKE_ENV+=	INCLUDES="-I../wxOil -I- -I${LOCALBASE}/include/dlmalloc"
+
 USE_GCC=	3.4+
 
 .include <bsd.port.pre.mk>
@@ -46,6 +55,13 @@ PROG=	XaraLX${PKGNAMESUFFIX}
 
 PLIST_FILES=	bin/${PROG}
 
+# we need to strip wxOil from the include path because it contains file
+# named strings.h which when included by /usr/include/string.h results
+# in a complete mess
+post-patch:
+	${REINPLACE_CMD} -E -e 's|-I[^[:space:]]*/wxOil[[:space:]]||g' \
+		${WRKSRC}/Makefile.am
+
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -f -s -i
 
diff --git a/graphics/xaralx/distinfo b/graphics/xaralx/distinfo
index 1209d8ddcf5..53bfe84b31b 100644
--- a/graphics/xaralx/distinfo
+++ b/graphics/xaralx/distinfo
@@ -1,3 +1,3 @@
-MD5 (XaraLXSrc-0.4r798.tar.gz) = 8fb1a44690c0e17ac03f2d5ff465a411
-SHA256 (XaraLXSrc-0.4r798.tar.gz) = 49999851065ac9f617778e641d866ebe66a97f3e079c942c3ed69e9d41771804
-SIZE (XaraLXSrc-0.4r798.tar.gz) = 25737093
+MD5 (XaraLXSrc-0.5r1175.tar.bz2) = acad5d2e8a8bfa536d44faeaedb99122
+SHA256 (XaraLXSrc-0.5r1175.tar.bz2) = 2ea7607a1473ebb232835b67e213356ea3a1c32b27cdf6064834257a3c13d096
+SIZE (XaraLXSrc-0.5r1175.tar.bz2) = 23509155
diff --git a/graphics/xaralx/files/patch-Makefile.am b/graphics/xaralx/files/patch-Makefile.am
deleted file mode 100644
index e0e0e368951..00000000000
--- a/graphics/xaralx/files/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig	Mon Apr  3 18:50:40 2006
-+++ Makefile.am	Tue Apr  4 15:41:30 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$(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
-@@ -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) -lCDraw
-+XaraLX_LDFLAGS		= --debug -L$(srcdir)/$(CDRAW_LIB_DIR) $(WX_LIBS) $(LIBS) -lCDraw -L$(LOCALBASE) -ldlmalloc
- XaraLX_LD			= $(CXX)
- 
- if STATIC_ENABLE
diff --git a/graphics/xaralx/files/patch-configure.in b/graphics/xaralx/files/patch-configure.in
index 1a6f7e4591b..8d33883a5b6 100644
--- a/graphics/xaralx/files/patch-configure.in
+++ b/graphics/xaralx/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Apr 10 12:05:33 2006
-+++ configure.in	Mon Apr 10 12:09:09 2006
+--- configure.in.orig	Wed May 10 14:01:21 2006
++++ configure.in	Wed May 10 14:04:32 2006
 @@ -47,7 +47,7 @@
  AC_PROG_INSTALL
  # We don't need dlopen right now and it's not supported on Darwin
@@ -17,19 +17,19 @@
  	else
  		AC_MSG_RESULT([not found])
  	fi
-@@ -177,20 +176,7 @@
+@@ -215,20 +214,7 @@
  	# GTK build, so call FTTEST function to test for FreeType
  	FTTEST
  	FT_CFLAGS="`$FTCONFIG --cflags`"
 -
 -	# check for the Pango package
--	PkgError = "no"
+-	PkgError="no"
 -	PKG_CHECK_MODULES(PANGOX, pangox,
 -			  [
 -				PANGO_CFLAGS="$PANGOX_CFLAGS"
 -			  ],
 -			  [
--				PkgError = "yes"
+-				PkgError="yes"
 -			  ]
 -			  )
 -	if test PkgError = "yes"; then
@@ -39,18 +39,18 @@
  else
  	# non-GTK build, i.e., MacOS, so Pango and FreeType are not required
  	FT_CFLAGS=""
-@@ -208,8 +194,8 @@
+@@ -246,8 +232,8 @@
  fi
  
  # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering)
--CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS"
--CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $CPPFLAGS_APPEND"
-+CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $CPPFLAGS_APPEND"
+-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
-@@ -248,6 +234,7 @@
+@@ -286,6 +272,7 @@
  AM_CONDITIONAL(DARWIN_LINK, [test "$DarwinLink" = "yes"])
  
  AC_SUBST(TOPDIR)
diff --git a/graphics/xaralx/files/patch-wxOil_compatdef.h b/graphics/xaralx/files/patch-wxOil_compatdef.h
deleted file mode 100644
index 54ea08ab8a6..00000000000
--- a/graphics/xaralx/files/patch-wxOil_compatdef.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- wxOil/compatdef.h.orig	Thu Mar 23 18:43:35 2006
-+++ wxOil/compatdef.h	Thu Mar 23 18:45:19 2006
-@@ -136,7 +136,7 @@
- #define lstrcpyn		wcsncpy
- #define lstrcat			wcscat
- #define lstrcmp			wcscmp
--#if defined(__WXMAC__)
-+#if defined(__WXMAC__) || defined(__FreeBSD__)
- //PORTNOTE("MacPort", "Horrendous bodge - can't find case insensitive string compare function")
- // NOTE! wcscasecmp not available in wchar.h on Mac OS X (???) Bodged to be case senstive temporarilly...
- #define lstrcmpi		wcscmp
-@@ -153,7 +153,7 @@
- #define _tcsncpy		wcsncpy
- #define _tcscat			wcscat
- #define _tcschr			wcschr
--#if defined(__WXMAC__)
-+#if defined(__WXMAC__) || defined(__FreeBSD__)
- #define _tcsdup			wxStrdup
- #else
- #define _tcsdup			wcsdup
-@@ -162,7 +162,7 @@
- #define tcstok			wcstok
- #define _tcscmp			wcscmp
- #define _tcsncmp		wcsncmp
--#if defined(__WXMAC__)
-+#if defined(__WXMAC__) || defined(__FreeBSD__)
- //PORTNOTE("MacPort", "Horrendous bodge - can't find case insensitive string compare function")
- // NOTE! wcsncasecmp not available in wchar.h on Mac OS X (???) Bodged to be case senstive temporarilly...
- #define _tcsnicmp		wcsncmp
diff --git a/graphics/xaralx/files/patch-wxOil_errors.cpp b/graphics/xaralx/files/patch-wxOil_errors.cpp
deleted file mode 100644
index a95a92b79ee..00000000000
--- a/graphics/xaralx/files/patch-wxOil_errors.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- wxOil/errors.cpp.orig	Thu Mar 23 20:23:57 2006
-+++ wxOil/errors.cpp	Thu Mar 23 20:24:13 2006
-@@ -1558,7 +1558,7 @@
- 
- ********************************************************************************************/
- 
--#ifndef __WXMAC__
-+#if !defined(__WXMAC__) && !defined(__FreeBSD__)
- void Error::StackWalker::OnStackFrame(const wxStackFrame & frame)
- {
- #ifdef _DEBUG
diff --git a/graphics/xaralx/files/patch-wxOil_errors.h b/graphics/xaralx/files/patch-wxOil_errors.h
deleted file mode 100644
index b5f5890f054..00000000000
--- a/graphics/xaralx/files/patch-wxOil_errors.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- wxOil/errors.h.orig	Thu Mar 23 18:38:06 2006
-+++ wxOil/errors.h	Thu Mar 23 18:39:20 2006
-@@ -106,7 +106,8 @@
- #ifndef INC_ERRORS
- #define INC_ERRORS
- 
--#ifndef __WXMAC__
-+// FreeBSD does not provide backtrace()
-+#if !defined(__WXMAC__) && !defined(__FreeBSD__)
- #include <wx/stackwalk.h>
- #endif
- 
-@@ -594,7 +595,8 @@
- public:
- 	static void DumpStack(UINT32 frames=0);
- 
--#ifndef __WXMAC__
-+// FreeBSD does not provide backtrace()
-+#if !defined(__WXMAC__) && !defined(__FreeBSD__)
- 	class StackWalker : public wxStackWalker
- 	{
- 		public: