Update for Gnome 2.10.

This commit is contained in:
marcm 2005-05-24 21:51:32 +00:00
parent 080245f869
commit 1a9a6c5d46
7 changed files with 24 additions and 129 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.10 2004/12/27 18:57:58 sturm Exp $
# $OpenBSD: Makefile,v 1.11 2005/05/24 21:51:32 marcm Exp $
COMMENT= "graphics library for GNOME"
DISTNAME= libgnomecanvas-2.8.0
PKGNAME= ${DISTNAME}p0
DISTNAME= libgnomecanvas-2.10.1
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org
MAINTAINER= Marc Matteo <marcm@openbsd.org>
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.8/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.10/}
EXTRACT_SUFX= .tar.bz2
# LGPL
@ -17,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 \
WANTLIB= X11 Xft Xrender atk-1.0.0.0 \
fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
gobject-2.0.0.0 m pango-1.0.0.0 pangox-1.0.0.0 \
pangoxft-1.0.0.0 xml2 z
@ -30,9 +28,9 @@ LIB_DEPENDS= art_lgpl_2.5::graphics/libart \
glade-2.0.0.0::devel/libglade2 \
pangoft2-1.0.0.0::devel/pango
SEPARATE_BUILD= concurrent
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-gtk-doc

View File

@ -1,4 +1,4 @@
MD5 (libgnomecanvas-2.8.0.tar.bz2) = 2bf10396a92777e7b64b6052a8a232f1
RMD160 (libgnomecanvas-2.8.0.tar.bz2) = ef6cfb32003f1492211fcdf5c85b6428538f5cf4
SHA1 (libgnomecanvas-2.8.0.tar.bz2) = f10b6cc45843e23cf394425fd02a6726838088ed
SIZE (libgnomecanvas-2.8.0.tar.bz2) = 578849
MD5 (libgnomecanvas-2.10.1.tar.bz2) = 50b7080ae1212432e131980ae884365a
RMD160 (libgnomecanvas-2.10.1.tar.bz2) = 2dc33fbf21d17931aeadc062a5cadb1be46bb678
SHA1 (libgnomecanvas-2.10.1.tar.bz2) = 4df86d33bdf4f5a9e16321cae6bc05b4663b09bd
SIZE (libgnomecanvas-2.10.1.tar.bz2) = 551867

View File

@ -1,6 +1,6 @@
--- demos/Makefile.in.orig Wed Dec 1 18:32:13 2004
+++ demos/Makefile.in Wed Dec 1 18:32:39 2004
@@ -227,7 +227,7 @@
--- demos/Makefile.in.orig Mon Mar 7 05:35:58 2005
+++ demos/Makefile.in Tue Apr 5 08:05:27 2005
@@ -227,7 +227,7 @@ canvas_demo_OBJECTS = $(am_canvas_demo_O
canvas_demo_LDADD = $(LDADD)
canvas_demo_DEPENDENCIES = \
$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/23 03:26:15 marcm Exp $
--- ltmain.sh.orig 2004-04-11 20:01:57.000000000 -0600
+++ ltmain.sh 2004-06-20 11:57:34.000000000 -0600
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
-l*)
@@ -2274,10 +2277,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.2 2003/10/07 05:48:55 marcm Exp $
--- po/Makefile.in.in.orig Mon Jul 7 16:21:11 2003
+++ po/Makefile.in.in Mon Jul 7 16:21:24 2003
@@ -27,7 +27,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
libdir = @libdir@
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2004/12/10 20:36:44 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/05/24 21:51:32 marcm Exp $
lib/libglade/2.0/libcanvas.so
@lib lib/libgnomecanvas-2.so.800.0
@lib lib/libgnomecanvas-2.so.1000.1

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2004/12/27 18:57:58 sturm Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/05/24 21:51:32 marcm Exp $
include/libgnomecanvas-2.0/
include/libgnomecanvas-2.0/libgnomecanvas/
include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-bpath.h
@ -23,39 +23,12 @@ lib/libgnomecanvas-2.a
lib/libgnomecanvas-2.la
lib/pkgconfig/
lib/pkgconfig/libgnomecanvas-2.0.pc
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/libgnomecanvas/
share/gtk-doc/html/libgnomecanvas/GnomeCanvas.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasBpath.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasClipgroup.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasEllipse.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasGroup.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasItem.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasLine.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasPixbuf.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasPolygon.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasRE.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasRect.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasRichText.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasShape.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasText.html
share/gtk-doc/html/libgnomecanvas/GnomeCanvasWidget.html
share/gtk-doc/html/libgnomecanvas/ch01.html
share/gtk-doc/html/libgnomecanvas/ch02.html
share/gtk-doc/html/libgnomecanvas/home.png
share/gtk-doc/html/libgnomecanvas/index.html
share/gtk-doc/html/libgnomecanvas/index.sgml
share/gtk-doc/html/libgnomecanvas/left.png
share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
share/gtk-doc/html/libgnomecanvas/libgnomecanvas.devhelp
share/gtk-doc/html/libgnomecanvas/right.png
share/gtk-doc/html/libgnomecanvas/style.css
share/gtk-doc/html/libgnomecanvas/up.png
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ang/
share/locale/ang/LC_MESSAGES/
share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
@ -155,6 +128,9 @@ share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ro/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sq/
@ -181,6 +157,9 @@ share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/yi/
share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo