Upgrade graphics/xaralx from 0.5r1175 to 0.6r1441 and

graphics/xaralx-devel from 0.5r1402 to 0.6r1460

4 files changed, 16 insertions, 61 deletions

diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile
index f3f56a8fd53a..10374c362a95 100644
--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	XaraLX
-PORTVERSION?=	0.5r1175
-PORTREVISION?=	3
+PORTVERSION?=	0.6r1441
+PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.xara.com/opensource/
 DISTFILES?=	${PORTNAME}Src-${PORTVERSION}.tar.bz2
@@ -33,14 +33,11 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-wx-config=wxgtk2u-2.6-config \
 		--program-suffix=${PKGNAMESUFFIX}
-CONFIGURE_ENV+=	CPPFLAGS_APPEND="-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"
+MAKE_ENV?=	INCLUDES="-I${LOCALBASE}/include/dlmalloc"
 
 USE_GCC=	3.4+
 
@@ -71,19 +68,6 @@ PLIST_SUB+=	PKGNAMESUFFIX=${PKGNAMESUFFIX} \
 BROKEN=	does not configure due to the lack of CDraw libraries for ${ARCH}
 .endif
 
-.if !defined(PKGNAMESUFFIX)
-# 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
-	${REINPLACE_CMD} -E -e 's/^CHECKSUM = md5sum$$/CHECKSUM = md5/' \
-		${WRKSRC}/wxOil/Makefile.am
-	${REINPLACE_CMD} -E \
-		-e 's/^Name=Xara LX$$/Name=Xara LX ${PORTVERSION}/' \
-		${WRKSRC}/xaralx.desktop
-.else
 post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's/^Name=Xara LX$$/Name=Xara LX ${PORTVERSION}/' \
@@ -92,7 +76,6 @@ post-patch:
 		-e 's/^Exec=xaralx %F$$/Exec=xaralx${PKGNAMESUFFIX} %F/' \
 		-e 's/^TryExec=xaralx$$/TryExec=xaralx${PKGNAMESUFFIX}/' \
 		${WRKSRC}/xaralx.desktop
-.endif
 
 pre-configure:
 	cd ${WRKSRC} && \
diff --git a/graphics/xaralx/distinfo b/graphics/xaralx/distinfo
index 53bfe84b31b0..3d4369f7233b 100644
--- a/graphics/xaralx/distinfo
+++ b/graphics/xaralx/distinfo
@@ -1,3 +1,3 @@
-MD5 (XaraLXSrc-0.5r1175.tar.bz2) = acad5d2e8a8bfa536d44faeaedb99122
-SHA256 (XaraLXSrc-0.5r1175.tar.bz2) = 2ea7607a1473ebb232835b67e213356ea3a1c32b27cdf6064834257a3c13d096
-SIZE (XaraLXSrc-0.5r1175.tar.bz2) = 23509155
+MD5 (XaraLXSrc-0.6r1441.tar.bz2) = 3992ac99522277e2183457e03b6918bc
+SHA256 (XaraLXSrc-0.6r1441.tar.bz2) = a22fa1dc358836f7dc9d92410971e7f51b40666a0e101dbb0c4f787959e8bcf8
+SIZE (XaraLXSrc-0.6r1441.tar.bz2) = 31057898
diff --git a/graphics/xaralx/files/patch-PreComp_Makefile.am b/graphics/xaralx/files/patch-PreComp_Makefile.am
deleted file mode 100644
index 9b4c5e1810ec..000000000000
--- a/graphics/xaralx/files/patch-PreComp_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- PreComp/Makefile.am.orig	Mon Mar 27 09:58:41 2006
-+++ PreComp/Makefile.am	Mon Mar 27 09:58:52 2006
-@@ -13,10 +13,10 @@
- camtypes.h.gch: camtypes.h

- 	if $(CXXCOMPILE) -x c++-header -MT $@ -MD -MP -MF "$(DEPDIR)/camtypes.h.Tpo" -c -o $@ $<; \

- 	then mv -f "$(DEPDIR)/camtypes.h.Tpo" "$(DEPDIR)/camtypes.h.Po"; else rm -f "$(DEPDIR)/camtypes.h.Tpo"; exit 1; fi

--	make -C ../Kernel clean

--	make -C ../wxXtra clean

--	make -C ../tools clean

--	make -C ../wxOil clean

-+	$(MAKE) -C ../Kernel clean

-+	$(MAKE) -C ../wxXtra clean

-+	$(MAKE) -C ../tools clean

-+	$(MAKE) -C ../wxOil clean

- 	

- 

- 

diff --git a/graphics/xaralx/files/patch-configure.in b/graphics/xaralx/files/patch-configure.in
index 932bd36803e7..f8934484b3e1 100644
--- a/graphics/xaralx/files/patch-configure.in
+++ b/graphics/xaralx/files/patch-configure.in
@@ -1,22 +1,11 @@
---- configure.in.orig	Mon Jun  5 15:06:26 2006
-+++ configure.in	Mon Jun  5 15:07:19 2006
-@@ -139,7 +139,7 @@
- 	WX_CPPFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cppflags`"
- 	WX_CXXFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cxxflags | sed -e 's/-fno-exceptions//'`"
- 	WX_LIBS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --libs`"
--	WXRC="`$WXCONFIG --utility=wxrc`"
-+	WXRC="`$WXCONFIG --utility=wxrc-gtk2u`"
- 	
- 	# See if we are running on GTK
- 	WX_GTK="no"
-@@ -252,8 +252,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"
+--- configure.in.orig	Tue Jun  6 15:00:31 2006
++++ configure.in	Tue Jun  6 16:43:23 2006
+@@ -173,7 +173,7 @@
  
- AC_MSG_CHECKING([Linker])
- case $host in
+ 	if test "$InternationalEnable" = "yes"; then
+ 		AC_MSG_CHECKING([wxWidgets wxrc utility])
+-		WXRC="`$WXCONFIG --utility=wxrc`"
++		WXRC="`$WXCONFIG --utility=wxrc-gtk2u`"
+ 	
+ 		if test "$WXRC" = "" ; then
+ 			AC_MSG_RESULT([not found, disabling international build])