diff options
| -rw-r--r-- | Mk/bsd.gnome.mk | 6 | ||||
| -rw-r--r-- | devel/libgsf-gnome/pkg-plist | 2 | ||||
| -rw-r--r-- | devel/libgsf/Makefile | 4 | ||||
| -rw-r--r-- | devel/libgsf/distinfo | 4 | ||||
| -rw-r--r-- | devel/libgsf/files/patch-doc_Makefile.in | 10 | ||||
| -rw-r--r-- | devel/libgsf/files/patch-gsf-gnome-Makefile.in | 48 | ||||
| -rw-r--r-- | devel/libgsf/pkg-plist | 7 |
7 files changed, 41 insertions, 40 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index bf6543136..c3789d190 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.331 2005/09/19 04:07:42 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.332 2005/09/22 05:42:47 marcus Exp $ # # Please view me with 4 column tabs! @@ -407,11 +407,11 @@ pkgconfig_DETECT= ${LOCALBASE}/bin/pkg-config pkgconfig_BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -libgsf_LIB_DEPENDS= gsf-1.1:${PORTSDIR}/devel/libgsf +libgsf_LIB_DEPENDS= gsf-1.113:${PORTSDIR}/devel/libgsf libgsf_DETECT= ${X11BASE}/libdata/pkgconfig/libgsf-1.pc libgsf_USE_GNOME_IMPL= glib20 libxml2 -libgsf_gnome_LIB_DEPENDS= gsf-gnome-1.1:${PORTSDIR}/devel/libgsf-gnome +libgsf_gnome_LIB_DEPENDS= gsf-gnome-1.113:${PORTSDIR}/devel/libgsf-gnome libgsf_gnome_DETECT= ${X11BASE}/libdata/pkgconfig/libgsf-gnome-1.pc libgsf_gnome_USE_GNOME_IMPL= libgsf gnomevfs2 diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index be1ed8788..9c9ca34bf 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.1 +lib/libgsf-gnome-1.so.113 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 8820317d7..c7e0acd63 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.15 2005/08/16 04:56:17 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.16 2005/09/08 17:52:59 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.12.3 +PORTVERSION= 1.13.2 PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 33da0b6d9..bcd0b44dd 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.12.3.tar.bz2) = 34b51119d5cbae30be0357ab246e93de -SIZE (gnome2/libgsf-1.12.3.tar.bz2) = 503106 +MD5 (gnome2/libgsf-1.13.2.tar.bz2) = 0894afd88f9e43eada27e52cb22cd0f1 +SIZE (gnome2/libgsf-1.13.2.tar.bz2) = 504413 diff --git a/devel/libgsf/files/patch-doc_Makefile.in b/devel/libgsf/files/patch-doc_Makefile.in index 8d68fe6e5..2d1069fce 100644 --- a/devel/libgsf/files/patch-doc_Makefile.in +++ b/devel/libgsf/files/patch-doc_Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Thu Sep 8 13:46:25 2005 -+++ doc/Makefile.in Thu Sep 8 13:46:35 2005 -@@ -278,7 +278,7 @@ +--- doc/Makefile.in.orig Tue Oct 11 15:56:09 2005 ++++ doc/Makefile.in Tue Oct 11 15:56:24 2005 +@@ -293,7 +293,7 @@ + # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) - -manpagedir = $(datadir)/man/man1 +manpagedir = $(prefix)/man/man1 manpage_DATA = gsf-office-thumbnailer.1 @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) - + @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index 35cf5d3ac..ffe67fa45 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,18 +1,29 @@ ---- gsf-gnome/Makefile.in.orig Thu Sep 8 13:40:17 2005 -+++ gsf-gnome/Makefile.in Thu Sep 8 13:42:02 2005 -@@ -221,7 +221,7 @@ - +--- gsf-gnome/Makefile.in.orig Tue Oct 11 15:47:39 2005 ++++ gsf-gnome/Makefile.in Tue Oct 11 15:50:56 2005 +@@ -54,9 +54,7 @@ + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ +-@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \ +-@WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1) ++@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = + am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ + gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ + gsf-shared-bonobo-stream.c +@@ -273,7 +271,7 @@ + target_alias = @target_alias@ + AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la - -@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO) $(am__append_1) @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ -@@ -231,13 +231,15 @@ +@@ -282,13 +280,15 @@ + @WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.c \ @WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.c - -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -libgsf_gnome_1_include_HEADERS = \ - gsf-input-gnomevfs.h \ @@ -24,22 +35,11 @@ +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h - subdir = gsf-gnome - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -246,9 +248,7 @@ - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) + all: all-am --@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ --@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la --@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_la_DEPENDENCIES = -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = - am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ - gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ - gsf-shared-bonobo-stream.c diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index e7c566be7..169911e34 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -24,6 +24,7 @@ include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-libxml.h include/libgsf-1/gsf/gsf-meta-names.h include/libgsf-1/gsf/gsf-msole-utils.h +include/libgsf-1/gsf/gsf-opendoc-utils.h include/libgsf-1/gsf/gsf-outfile-impl.h include/libgsf-1/gsf/gsf-outfile-msole.h include/libgsf-1/gsf/gsf-outfile-stdio.h @@ -44,15 +45,15 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.1 +lib/libgsf-1.so.113 libdata/pkgconfig/libgsf-1.pc +share/doc/gsf/GsfBlob.html +share/doc/gsf/GsfClipData.html share/doc/gsf/api.html share/doc/gsf/gsf-Bononbo.html share/doc/gsf/gsf-Compression.html share/doc/gsf/gsf-GIOChannel.html share/doc/gsf/gsf-GnomeVFS.html -share/doc/gsf/gsf-GsfBlob.html -share/doc/gsf/gsf-GsfClipData.html share/doc/gsf/gsf-Infile-reading-structed-files.html share/doc/gsf/gsf-Input-from-unstructured-files.html share/doc/gsf/gsf-MS-OLE2.html |