Update libgnomecanvas to 1.110.0 after a repo-copy from ports/graphics/gnomecanvas

and connect it to the build.

4 files changed, 133 insertions, 31 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 191e0ce7eebc..5832ba197233 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -153,6 +153,7 @@
     SUBDIR += libfpx
     SUBDIR += libgdgeda
     SUBDIR += libggi
+    SUBDIR += libgnomecanvas
     SUBDIR += libgrass5
     SUBDIR += libimg
     SUBDIR += liblug
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 5158620ac64b..6949030c5a17 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -5,30 +5,30 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomecanvas
+PORTNAME=	libgnomecanvas
+PORTVERSION=	1.110.0
 CATEGORIES=	graphics gnome
-
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
-MASTERDIR=	${.CURDIR}/../gdk-pixbuf
-
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-USE_GNOMELIBS=	yes
-
-BUILD_CANVAS=	yes
-
-NAME=	gnomecanvaspixbuf
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/${NAME}Conf.sh ${PREFIX}/etc
-	cd ${WRKSRC}/gdk-pixbuf/.libs && \
-		${MKDIR} ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf && \
-		${INSTALL_DATA} ../gnome-canvas-pixbuf.h ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf && \
-		${INSTALL_DATA} lib${NAME}.a ${PREFIX}/lib && \
-		${INSTALL_PROGRAM} lib${NAME}.so.1 ${PREFIX}/lib && \
-		${LN} -sf lib${NAME}.so.1 ${PREFIX}/lib/lib${NAME}.so
-
-.include "${MASTERDIR}/Makefile"
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+DIST_SUBDIR=	gnome2
+
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+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/libgnomecanvas/files/patch-ltmain.sh b/graphics/libgnomecanvas/files/patch-ltmain.sh
new file mode 100644
index 000000000000..91713d2306f8
--- /dev/null
+++ b/graphics/libgnomecanvas/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/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 2377078827d3..f1d6d371a47f 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -1,5 +1,61 @@
-etc/gnomecanvaspixbufConf.sh
-include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
-lib/libgnomecanvaspixbuf.a
-lib/libgnomecanvaspixbuf.so
-lib/libgnomecanvaspixbuf.so.1
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-bpath.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-line.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-path-def.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-pixbuf.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-polygon.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-rect-ellipse.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-rich-text.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-shape.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-text.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-util.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-widget.h
+include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h
+include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
+lib/libglade/2.0/libcanvas.so
+lib/libgnomecanvas-2.a
+lib/libgnomecanvas-2.so
+lib/libgnomecanvas-2.so.0
+libdata/pkgconfig/libgnomecanvas-2.0.pc
+share/doc/libgnomecanvas/c4.html
+share/doc/libgnomecanvas/index.html
+share/doc/libgnomecanvas/index.sgml
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
+share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html
+share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
+@dirrm share/doc/libgnomecanvas
+@dirrm lib/libglade/2.0
+@dirrm lib/libglade
+@dirrm include/libgnomecanvas-2.0/libgnomecanvas
+@dirrm include/libgnomecanvas-2.0