Update libart_lgpl2 to 2.3.8 after a repo-copy from ports/graphics/libart and

connect it to the build.

9 files changed, 231 insertions, 114 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 05e4d2e1ad54..191e0ce7eebc 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -140,6 +140,7 @@
     SUBDIR += lib3ds
     SUBDIR += libafterimage
     SUBDIR += libart
+    SUBDIR += libart_lgpl2
     SUBDIR += libaux
     SUBDIR += libdivxdecore
     SUBDIR += libdivxdecore-devel
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index fe5a1228fb00..139bfaaec7d8 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -1,19 +1,30 @@
-# New ports collection makefile for:	libart
+# New ports collection makefile for:	libart_lgpl2
 # Date created:		8 July 2001
 # Whom:			Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libart
-PORTVERSION=	2.3.3
+PORTNAME=	libart_lgpl2
+PORTVERSION=	2.3.8
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.artofcode.com/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
-MAINTAINER=	perky@fallin.lv
+MAINTAINER=	gnome@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_lgpl-${PORTVERSION}
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+pre-patch:
+	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libart_lgpl/distinfo b/graphics/libart_lgpl/distinfo
index 3e6fa1c8c4a5..b95c1dad9834 100644
--- a/graphics/libart_lgpl/distinfo
+++ b/graphics/libart_lgpl/distinfo
@@ -1 +1 @@
-MD5 (libart-2.3.3.tar.gz) = 944a53194b13d3c36f06309201537c5f
+MD5 (gnome2/libart_lgpl-2.3.8.tar.bz2) = b3dba62f026ed6b30c61f572f6d65631
diff --git a/graphics/libart_lgpl/files/patch-ltmain.sh b/graphics/libart_lgpl/files/patch-ltmain.sh
new file mode 100644
index 000000000000..91713d2306f8
--- /dev/null
+++ b/graphics/libart_lgpl/files/patch-ltmain.sh
@@ -0,0 +1,45 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libart_lgpl/pkg-plist b/graphics/libart_lgpl/pkg-plist
index ebeabf774b40..1ae8c7df4bdd 100644
--- a/graphics/libart_lgpl/pkg-plist
+++ b/graphics/libart_lgpl/pkg-plist
@@ -1,49 +1,51 @@
-lib/libart_lgpl.so.5
-lib/libart_lgpl.so
-lib/libart_lgpl.la
-lib/libart_lgpl.a
-lib/libartConf.sh
-bin/libart-config
-include/libart_lgpl/art_affine.h
-include/libart_lgpl/art_alphagamma.h
-include/libart_lgpl/art_bpath.h
-include/libart_lgpl/art_config.h
-include/libart_lgpl/art_filterlevel.h
-include/libart_lgpl/art_gray_svp.h
-include/libart_lgpl/art_misc.h
-include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_pixbuf.h
-include/libart_lgpl/art_point.h
-include/libart_lgpl/art_rect.h
-include/libart_lgpl/art_rect_svp.h
-include/libart_lgpl/art_rect_uta.h
-include/libart_lgpl/art_render.h
-include/libart_lgpl/art_render_gradient.h
-include/libart_lgpl/art_render_svp.h
-include/libart_lgpl/art_rgb.h
-include/libart_lgpl/art_rgb_affine.h
-include/libart_lgpl/art_rgb_bitmap_affine.h
-include/libart_lgpl/art_rgba.h
-include/libart_lgpl/art_rgb_pixbuf_affine.h
-include/libart_lgpl/art_rgb_rgba_affine.h
-include/libart_lgpl/art_rgb_svp.h
-include/libart_lgpl/art_svp.h
-include/libart_lgpl/art_svp_ops.h
-include/libart_lgpl/art_svp_point.h
-include/libart_lgpl/art_svp_render_aa.h
-include/libart_lgpl/art_svp_vpath.h
-include/libart_lgpl/art_svp_vpath_stroke.h
-include/libart_lgpl/art_svp_wind.h
-include/libart_lgpl/art_uta.h
-include/libart_lgpl/art_uta_ops.h
-include/libart_lgpl/art_uta_rect.h
-include/libart_lgpl/art_uta_vpath.h
-include/libart_lgpl/art_uta_svp.h
-include/libart_lgpl/art_vpath.h
-include/libart_lgpl/art_vpath_bpath.h
-include/libart_lgpl/art_vpath_dash.h
-include/libart_lgpl/art_vpath_svp.h
-include/libart_lgpl/libart.h
-include/libart_lgpl/libart-features.h
-@dirrm include/libart_lgpl
-share/aclocal/libart.m4
+bin/libart2-config
+include/libart-2.0/libart_lgpl/art_affine.h
+include/libart-2.0/libart_lgpl/art_alphagamma.h
+include/libart-2.0/libart_lgpl/art_bpath.h
+include/libart-2.0/libart_lgpl/art_config.h
+include/libart-2.0/libart_lgpl/art_filterlevel.h
+include/libart-2.0/libart_lgpl/art_gray_svp.h
+include/libart-2.0/libart_lgpl/art_misc.h
+include/libart-2.0/libart_lgpl/art_pathcode.h
+include/libart-2.0/libart_lgpl/art_pixbuf.h
+include/libart-2.0/libart_lgpl/art_point.h
+include/libart-2.0/libart_lgpl/art_rect.h
+include/libart-2.0/libart_lgpl/art_rect_svp.h
+include/libart-2.0/libart_lgpl/art_rect_uta.h
+include/libart-2.0/libart_lgpl/art_render.h
+include/libart-2.0/libart_lgpl/art_render_gradient.h
+include/libart-2.0/libart_lgpl/art_render_mask.h
+include/libart-2.0/libart_lgpl/art_render_svp.h
+include/libart-2.0/libart_lgpl/art_rgb.h
+include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_svp.h
+include/libart-2.0/libart_lgpl/art_rgba.h
+include/libart-2.0/libart_lgpl/art_svp.h
+include/libart-2.0/libart_lgpl/art_svp_intersect.h
+include/libart-2.0/libart_lgpl/art_svp_ops.h
+include/libart-2.0/libart_lgpl/art_svp_point.h
+include/libart-2.0/libart_lgpl/art_svp_render_aa.h
+include/libart-2.0/libart_lgpl/art_svp_vpath.h
+include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
+include/libart-2.0/libart_lgpl/art_svp_wind.h
+include/libart-2.0/libart_lgpl/art_uta.h
+include/libart-2.0/libart_lgpl/art_uta_ops.h
+include/libart-2.0/libart_lgpl/art_uta_rect.h
+include/libart-2.0/libart_lgpl/art_uta_svp.h
+include/libart-2.0/libart_lgpl/art_uta_vpath.h
+include/libart-2.0/libart_lgpl/art_vpath.h
+include/libart-2.0/libart_lgpl/art_vpath_bpath.h
+include/libart-2.0/libart_lgpl/art_vpath_dash.h
+include/libart-2.0/libart_lgpl/art_vpath_svp.h
+include/libart-2.0/libart_lgpl/libart-features.h
+include/libart-2.0/libart_lgpl/libart.h
+lib/libart_lgpl_2.a
+lib/libart_lgpl_2.so
+lib/libart_lgpl_2.so.5
+libdata/pkgconfig/libart-2.0.pc
+@dirrm include/libart-2.0/libart_lgpl
+@dirrm include/libart-2.0
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index fe5a1228fb00..139bfaaec7d8 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -1,19 +1,30 @@
-# New ports collection makefile for:	libart
+# New ports collection makefile for:	libart_lgpl2
 # Date created:		8 July 2001
 # Whom:			Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libart
-PORTVERSION=	2.3.3
+PORTNAME=	libart_lgpl2
+PORTVERSION=	2.3.8
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.artofcode.com/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
-MAINTAINER=	perky@fallin.lv
+MAINTAINER=	gnome@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_lgpl-${PORTVERSION}
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+pre-patch:
+	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libart_lgpl2/distinfo b/graphics/libart_lgpl2/distinfo
index 3e6fa1c8c4a5..b95c1dad9834 100644
--- a/graphics/libart_lgpl2/distinfo
+++ b/graphics/libart_lgpl2/distinfo
@@ -1 +1 @@
-MD5 (libart-2.3.3.tar.gz) = 944a53194b13d3c36f06309201537c5f
+MD5 (gnome2/libart_lgpl-2.3.8.tar.bz2) = b3dba62f026ed6b30c61f572f6d65631
diff --git a/graphics/libart_lgpl2/files/patch-ltmain.sh b/graphics/libart_lgpl2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..91713d2306f8
--- /dev/null
+++ b/graphics/libart_lgpl2/files/patch-ltmain.sh
@@ -0,0 +1,45 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libart_lgpl2/pkg-plist b/graphics/libart_lgpl2/pkg-plist
index ebeabf774b40..1ae8c7df4bdd 100644
--- a/graphics/libart_lgpl2/pkg-plist
+++ b/graphics/libart_lgpl2/pkg-plist
@@ -1,49 +1,51 @@
-lib/libart_lgpl.so.5
-lib/libart_lgpl.so
-lib/libart_lgpl.la
-lib/libart_lgpl.a
-lib/libartConf.sh
-bin/libart-config
-include/libart_lgpl/art_affine.h
-include/libart_lgpl/art_alphagamma.h
-include/libart_lgpl/art_bpath.h
-include/libart_lgpl/art_config.h
-include/libart_lgpl/art_filterlevel.h
-include/libart_lgpl/art_gray_svp.h
-include/libart_lgpl/art_misc.h
-include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_pixbuf.h
-include/libart_lgpl/art_point.h
-include/libart_lgpl/art_rect.h
-include/libart_lgpl/art_rect_svp.h
-include/libart_lgpl/art_rect_uta.h
-include/libart_lgpl/art_render.h
-include/libart_lgpl/art_render_gradient.h
-include/libart_lgpl/art_render_svp.h
-include/libart_lgpl/art_rgb.h
-include/libart_lgpl/art_rgb_affine.h
-include/libart_lgpl/art_rgb_bitmap_affine.h
-include/libart_lgpl/art_rgba.h
-include/libart_lgpl/art_rgb_pixbuf_affine.h
-include/libart_lgpl/art_rgb_rgba_affine.h
-include/libart_lgpl/art_rgb_svp.h
-include/libart_lgpl/art_svp.h
-include/libart_lgpl/art_svp_ops.h
-include/libart_lgpl/art_svp_point.h
-include/libart_lgpl/art_svp_render_aa.h
-include/libart_lgpl/art_svp_vpath.h
-include/libart_lgpl/art_svp_vpath_stroke.h
-include/libart_lgpl/art_svp_wind.h
-include/libart_lgpl/art_uta.h
-include/libart_lgpl/art_uta_ops.h
-include/libart_lgpl/art_uta_rect.h
-include/libart_lgpl/art_uta_vpath.h
-include/libart_lgpl/art_uta_svp.h
-include/libart_lgpl/art_vpath.h
-include/libart_lgpl/art_vpath_bpath.h
-include/libart_lgpl/art_vpath_dash.h
-include/libart_lgpl/art_vpath_svp.h
-include/libart_lgpl/libart.h
-include/libart_lgpl/libart-features.h
-@dirrm include/libart_lgpl
-share/aclocal/libart.m4
+bin/libart2-config
+include/libart-2.0/libart_lgpl/art_affine.h
+include/libart-2.0/libart_lgpl/art_alphagamma.h
+include/libart-2.0/libart_lgpl/art_bpath.h
+include/libart-2.0/libart_lgpl/art_config.h
+include/libart-2.0/libart_lgpl/art_filterlevel.h
+include/libart-2.0/libart_lgpl/art_gray_svp.h
+include/libart-2.0/libart_lgpl/art_misc.h
+include/libart-2.0/libart_lgpl/art_pathcode.h
+include/libart-2.0/libart_lgpl/art_pixbuf.h
+include/libart-2.0/libart_lgpl/art_point.h
+include/libart-2.0/libart_lgpl/art_rect.h
+include/libart-2.0/libart_lgpl/art_rect_svp.h
+include/libart-2.0/libart_lgpl/art_rect_uta.h
+include/libart-2.0/libart_lgpl/art_render.h
+include/libart-2.0/libart_lgpl/art_render_gradient.h
+include/libart-2.0/libart_lgpl/art_render_mask.h
+include/libart-2.0/libart_lgpl/art_render_svp.h
+include/libart-2.0/libart_lgpl/art_rgb.h
+include/libart-2.0/libart_lgpl/art_rgb_a_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
+include/libart-2.0/libart_lgpl/art_rgb_svp.h
+include/libart-2.0/libart_lgpl/art_rgba.h
+include/libart-2.0/libart_lgpl/art_svp.h
+include/libart-2.0/libart_lgpl/art_svp_intersect.h
+include/libart-2.0/libart_lgpl/art_svp_ops.h
+include/libart-2.0/libart_lgpl/art_svp_point.h
+include/libart-2.0/libart_lgpl/art_svp_render_aa.h
+include/libart-2.0/libart_lgpl/art_svp_vpath.h
+include/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
+include/libart-2.0/libart_lgpl/art_svp_wind.h
+include/libart-2.0/libart_lgpl/art_uta.h
+include/libart-2.0/libart_lgpl/art_uta_ops.h
+include/libart-2.0/libart_lgpl/art_uta_rect.h
+include/libart-2.0/libart_lgpl/art_uta_svp.h
+include/libart-2.0/libart_lgpl/art_uta_vpath.h
+include/libart-2.0/libart_lgpl/art_vpath.h
+include/libart-2.0/libart_lgpl/art_vpath_bpath.h
+include/libart-2.0/libart_lgpl/art_vpath_dash.h
+include/libart-2.0/libart_lgpl/art_vpath_svp.h
+include/libart-2.0/libart_lgpl/libart-features.h
+include/libart-2.0/libart_lgpl/libart.h
+lib/libart_lgpl_2.a
+lib/libart_lgpl_2.so
+lib/libart_lgpl_2.so.5
+libdata/pkgconfig/libart-2.0.pc
+@dirrm include/libart-2.0/libart_lgpl
+@dirrm include/libart-2.0