Update to 1.0b7

4 files changed, 34 insertions, 25 deletions

diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 168427737f5f..09e9d646d373 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/graphics/wxsvg/Makefile,v 1.1 2006/09/22 01:48:33 ahze Exp $
 
 PORTNAME=	wxsvg
-DISTVERSION=	1.0b6
-PORTREVISION=	1
+DISTVERSION=	1.0b7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,22 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	C++ library to create, manipulate, and render SVG files
 
+AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:15 automake:15 autoconf:259
 USE_GNOME=	libartlgpl2
+USE_GMAKE=	yes
 USE_WX=		2.6
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=	does not build
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
-		${WRKSRC}/configure
+	@cd ${WRKSRC} && \
+		${TOUCH} -f README NEWS INSTALL
+	@${REINPLACE_CMD} -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=${WX_CONFIG}|' \
+		${WRKSRC}/*.m4
 
 pre-configure:
-	cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force
+	@cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I .; \
+		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/wxsvg/distinfo b/graphics/wxsvg/distinfo
index f323607588ad..9a881ccab5e0 100644
--- a/graphics/wxsvg/distinfo
+++ b/graphics/wxsvg/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxsvg-1.0b6.tar.gz) = 3509223706586efcbf5519e2ec2cd2a4
-SHA256 (wxsvg-1.0b6.tar.gz) = 307bd799fda2874facb5938eb13618c85e8b79a0012ddfcebfd90674d1a7e51a
-SIZE (wxsvg-1.0b6.tar.gz) = 671682
+MD5 (wxsvg-1.0b7.tar.gz) = 38a1caf8cb69037226c240b53f0e3509
+SHA256 (wxsvg-1.0b7.tar.gz) = e88c946637e3c124aee131ef66ebb235f9808b50d8c0e66b23ae8a0dc8b954d6
+SIZE (wxsvg-1.0b7.tar.gz) = 473402
diff --git a/graphics/wxsvg/files/patch-configure.in b/graphics/wxsvg/files/patch-configure.in
new file mode 100644
index 000000000000..3a392f9a09dc
--- /dev/null
+++ b/graphics/wxsvg/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Thu Feb 22 18:29:47 2007
++++ configure.in	Thu Feb 22 18:30:09 2007
+@@ -3,7 +3,7 @@
+ dnl initialization
+ AC_PREREQ(2.57)
+ AC_INIT([wxsvgtest], [1.0], [wx-svg-users@lists.sourceforge.net])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(wxsvg, 1.0b7)
+ AM_MAINTAINER_MODE
+ 
+ dnl options
diff --git a/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp
index f0182faeaa77..0504527220e5 100644
--- a/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp
+++ b/graphics/wxsvg/files/patch-src_freetype_SVGCanvasTestFreetype.cpp
@@ -1,15 +1,15 @@
---- src/freetype/SVGCanvasTextFreetype.cpp.orig	Thu Sep 21 21:42:35 2006
-+++ src/freetype/SVGCanvasTextFreetype.cpp	Thu Sep 21 21:45:02 2006
-@@ -165,7 +165,7 @@
+--- src/freetype/SVGCanvasTextFreetype.cpp.orig	Thu Jul 20 18:46:14 2006
++++ src/freetype/SVGCanvasTextFreetype.cpp	Thu Feb 22 18:42:55 2007
+@@ -163,7 +163,7 @@
    }
  }
  
--gint moveto(FT_Vector* to, gpointer data)
-+gint moveto(const FT_Vector* to, gpointer data)
+-static gint moveto(FT_Vector* to, gpointer data)
++static gint moveto(const FT_Vector* to, gpointer data)
  {
    wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
    
-@@ -181,7 +181,7 @@
+@@ -179,7 +179,7 @@
    return 0;
  }
  
@@ -18,7 +18,7 @@
  {
    wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
    if (!canvasText->m_endpath)
-@@ -194,7 +194,7 @@
+@@ -192,7 +192,7 @@
    return 0;
  }
  
@@ -27,7 +27,7 @@
  {
    wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
    if (!canvasText->m_endpath)
-@@ -209,8 +209,8 @@
+@@ -207,8 +207,8 @@
    return 0;
  }
  
@@ -38,7 +38,7 @@
  {
    wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
    if (!canvasText->m_endpath)
-@@ -227,7 +227,7 @@
+@@ -225,7 +225,7 @@
    return 0;
  }