- Update to 2.5

PR:		112822
Submitted by:	Stephen Hurd<shurd@sasktel.net>

5 files changed, 189 insertions, 41 deletions

diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 99af2c4b2fe..83dfbcf148c 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -6,45 +6,30 @@
 #
 
 PORTNAME=	agg
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.antigrain.com/ \
-		${MASTER_SITE_SOURCEFORGE} \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/novel/}
-MASTER_SITE_SUBDIR=	vector-agg
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A High Quality Rendering Engine for C++
 
-BUILD_WRKSRC=	${WRKDIR}/agg23/src
+GNU_CONFIGURE=	yes
+USE_SDL=	sdl
+USE_X_LIB=	yes
+USE_GNOME=	pkgconfig gnomehack
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
+USE_AUTOTOOLS=	autoconf:259:env automake:15:env libtool:15:env
 MAKE_ENV=	C="${CC}" CXX="${CXX}" AGGCXXFLAGS="${CXXFLAGS}"
-CXXFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib -I../include -L./
+CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
 
-PLIST_FILES=	lib/libagg.a
+post-patch:
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	${WRKSRC}/Makefile.am
 
-.include <bsd.port.pre.mk>
+pre-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ACLOCAL_ARGS="${ACLOCAL_ARGS}" ${SH} autogen.sh
 
-post-extract:
-	@${CP} -f ${FILESDIR}/Makefile.in.FreeBSD ${WRKSRC}
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/libagg.a ${PREFIX}/lib
-	@${MKDIR} ${PREFIX}/include/agg
-	${CP} -R ${WRKSRC}/include/ ${PREFIX}/include/agg
-	@${FIND} ${PREFIX}/include/agg ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/include/agg -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/agg/distinfo b/graphics/agg/distinfo
index 9e93ce39ba0..89d41ac9e06 100644
--- a/graphics/agg/distinfo
+++ b/graphics/agg/distinfo
@@ -1,3 +1,3 @@
-MD5 (agg23.tar.gz) = 8431bfebc16a0920d087b33604c69c8c
-SHA256 (agg23.tar.gz) = ef306fb346d941580836298552ac5a293584efe35e3d5800b0910cd24fe91aac
-SIZE (agg23.tar.gz) = 537070
+MD5 (agg-2.5.tar.gz) = ddc67cbdc7d51e1ec984c2ac2724c08a
+SHA256 (agg-2.5.tar.gz) = 589e9bdbaf51fa3c2358f0102303ed24d0722f553df3abe8f0241d1dfc804f5d
+SIZE (agg-2.5.tar.gz) = 564231
diff --git a/graphics/agg/files/Makefile.in.FreeBSD b/graphics/agg/files/Makefile.in.FreeBSD
deleted file mode 100644
index 6c5567ecd36..00000000000
--- a/graphics/agg/files/Makefile.in.FreeBSD
+++ /dev/null
@@ -1,7 +0,0 @@
-AGGLIBS= -lagg 
-#CXX = 
-#C = gcc
-#CXX = icc
-LIB = ar cr
-
-.PHONY : clean
diff --git a/graphics/agg/files/patch-autogen b/graphics/agg/files/patch-autogen
new file mode 100644
index 00000000000..0b34e55d852
--- /dev/null
+++ b/graphics/agg/files/patch-autogen
@@ -0,0 +1,11 @@
+--- autogen.sh.orig	Fri Jun 15 02:30:02 2007
++++ autogen.sh	Fri Jun 15 02:30:09 2007
+@@ -3,7 +3,7 @@
+ # invoke the auto* tools to create the configuration/build system
+ 
+ # build aclocal.m4
+-aclocal
++aclocal ${ACLOCAL_ARGS}
+ 
+ # build config.h
+ autoheader
diff --git a/graphics/agg/pkg-plist b/graphics/agg/pkg-plist
new file mode 100644
index 00000000000..ebcae0e3460
--- /dev/null
+++ b/graphics/agg/pkg-plist
@@ -0,0 +1,159 @@
+include/agg2/agg_alpha_mask_u8.h
+include/agg2/agg_arc.h
+include/agg2/agg_array.h
+include/agg2/agg_arrowhead.h
+include/agg2/agg_basics.h
+include/agg2/agg_bezier_arc.h
+include/agg2/agg_bitset_iterator.h
+include/agg2/agg_blur.h
+include/agg2/agg_bounding_rect.h
+include/agg2/agg_bspline.h
+include/agg2/agg_clip_liang_barsky.h
+include/agg2/agg_color_gray.h
+include/agg2/agg_color_rgba.h
+include/agg2/agg_config.h
+include/agg2/agg_conv_adaptor_vcgen.h
+include/agg2/agg_conv_adaptor_vpgen.h
+include/agg2/agg_conv_bspline.h
+include/agg2/agg_conv_clip_polygon.h
+include/agg2/agg_conv_clip_polyline.h
+include/agg2/agg_conv_close_polygon.h
+include/agg2/agg_conv_concat.h
+include/agg2/agg_conv_contour.h
+include/agg2/agg_conv_curve.h
+include/agg2/agg_conv_dash.h
+include/agg2/agg_conv_gpc.h
+include/agg2/agg_conv_marker.h
+include/agg2/agg_conv_marker_adaptor.h
+include/agg2/agg_conv_segmentator.h
+include/agg2/agg_conv_shorten_path.h
+include/agg2/agg_conv_smooth_poly1.h
+include/agg2/agg_conv_stroke.h
+include/agg2/agg_conv_transform.h
+include/agg2/agg_conv_unclose_polygon.h
+include/agg2/agg_curves.h
+include/agg2/agg_dda_line.h
+include/agg2/agg_ellipse.h
+include/agg2/agg_ellipse_bresenham.h
+include/agg2/agg_embedded_raster_fonts.h
+include/agg2/agg_font_cache_manager.h
+include/agg2/agg_font_freetype.h
+include/agg2/agg_gamma_functions.h
+include/agg2/agg_gamma_lut.h
+include/agg2/agg_glyph_raster_bin.h
+include/agg2/agg_gradient_lut.h
+include/agg2/agg_gsv_text.h
+include/agg2/agg_image_accessors.h
+include/agg2/agg_image_filters.h
+include/agg2/agg_line_aa_basics.h
+include/agg2/agg_math.h
+include/agg2/agg_math_stroke.h
+include/agg2/agg_path_length.h
+include/agg2/agg_path_storage.h
+include/agg2/agg_path_storage_integer.h
+include/agg2/agg_pattern_filters_rgba.h
+include/agg2/agg_pixfmt_amask_adaptor.h
+include/agg2/agg_pixfmt_gray.h
+include/agg2/agg_pixfmt_rgb.h
+include/agg2/agg_pixfmt_rgb_packed.h
+include/agg2/agg_pixfmt_rgba.h
+include/agg2/agg_pixfmt_transposer.h
+include/agg2/agg_rasterizer_cells_aa.h
+include/agg2/agg_rasterizer_compound_aa.h
+include/agg2/agg_rasterizer_outline.h
+include/agg2/agg_rasterizer_outline_aa.h
+include/agg2/agg_rasterizer_scanline_aa.h
+include/agg2/agg_rasterizer_sl_clip.h
+include/agg2/agg_renderer_base.h
+include/agg2/agg_renderer_markers.h
+include/agg2/agg_renderer_mclip.h
+include/agg2/agg_renderer_outline_aa.h
+include/agg2/agg_renderer_outline_image.h
+include/agg2/agg_renderer_primitives.h
+include/agg2/agg_renderer_raster_text.h
+include/agg2/agg_renderer_scanline.h
+include/agg2/agg_rendering_buffer.h
+include/agg2/agg_rendering_buffer_dynarow.h
+include/agg2/agg_rounded_rect.h
+include/agg2/agg_scanline_bin.h
+include/agg2/agg_scanline_boolean_algebra.h
+include/agg2/agg_scanline_p.h
+include/agg2/agg_scanline_storage_aa.h
+include/agg2/agg_scanline_storage_bin.h
+include/agg2/agg_scanline_u.h
+include/agg2/agg_shorten_path.h
+include/agg2/agg_simul_eq.h
+include/agg2/agg_span_allocator.h
+include/agg2/agg_span_converter.h
+include/agg2/agg_span_gouraud.h
+include/agg2/agg_span_gouraud_gray.h
+include/agg2/agg_span_gouraud_rgba.h
+include/agg2/agg_span_gradient.h
+include/agg2/agg_span_gradient_alpha.h
+include/agg2/agg_span_image_filter.h
+include/agg2/agg_span_image_filter_gray.h
+include/agg2/agg_span_image_filter_rgb.h
+include/agg2/agg_span_image_filter_rgba.h
+include/agg2/agg_span_interpolator_adaptor.h
+include/agg2/agg_span_interpolator_linear.h
+include/agg2/agg_span_interpolator_persp.h
+include/agg2/agg_span_interpolator_trans.h
+include/agg2/agg_span_pattern_gray.h
+include/agg2/agg_span_pattern_rgb.h
+include/agg2/agg_span_pattern_rgba.h
+include/agg2/agg_span_solid.h
+include/agg2/agg_span_subdiv_adaptor.h
+include/agg2/agg_trans_affine.h
+include/agg2/agg_trans_bilinear.h
+include/agg2/agg_trans_double_path.h
+include/agg2/agg_trans_perspective.h
+include/agg2/agg_trans_single_path.h
+include/agg2/agg_trans_viewport.h
+include/agg2/agg_trans_warp_magnifier.h
+include/agg2/agg_vcgen_bspline.h
+include/agg2/agg_vcgen_contour.h
+include/agg2/agg_vcgen_dash.h
+include/agg2/agg_vcgen_markers_term.h
+include/agg2/agg_vcgen_smooth_poly1.h
+include/agg2/agg_vcgen_stroke.h
+include/agg2/agg_vcgen_vertex_sequence.h
+include/agg2/agg_vertex_sequence.h
+include/agg2/agg_vpgen_clip_polygon.h
+include/agg2/agg_vpgen_clip_polyline.h
+include/agg2/agg_vpgen_segmentator.h
+include/agg2/ctrl/agg_bezier_ctrl.h
+include/agg2/ctrl/agg_cbox_ctrl.h
+include/agg2/ctrl/agg_ctrl.h
+include/agg2/ctrl/agg_gamma_ctrl.h
+include/agg2/ctrl/agg_gamma_spline.h
+include/agg2/ctrl/agg_polygon_ctrl.h
+include/agg2/ctrl/agg_rbox_ctrl.h
+include/agg2/ctrl/agg_scale_ctrl.h
+include/agg2/ctrl/agg_slider_ctrl.h
+include/agg2/ctrl/agg_spline_ctrl.h
+include/agg2/platform/agg_platform_support.h
+include/agg2/util/agg_color_conv.h
+include/agg2/util/agg_color_conv_rgb16.h
+include/agg2/util/agg_color_conv_rgb8.h
+lib/libagg.a
+lib/libagg.la
+lib/libagg.so
+lib/libagg.so.2
+lib/libaggfontfreetype.a
+lib/libaggfontfreetype.la
+lib/libaggfontfreetype.so
+lib/libaggfontfreetype.so.2
+lib/libaggplatformX11.a
+lib/libaggplatformX11.la
+lib/libaggplatformX11.so
+lib/libaggplatformX11.so.2
+lib/libaggplatformsdl.a
+lib/libaggplatformsdl.la
+lib/libaggplatformsdl.so
+lib/libaggplatformsdl.so.2
+libdata/pkgconfig/libagg.pc
+share/aclocal/libagg.m4
+@dirrm include/agg2/util
+@dirrm include/agg2/platform
+@dirrm include/agg2/ctrl
+@dirrm include/agg2