From 58e16f8bb407cde87351e6fb370e468e4b3ed231 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 16 Aug 2005 04:56:18 +0000 Subject: Update to 1.12.2, and switch to X11BASE since libgsf installs GConf schemas. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4502 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/libgsf-gnome/Makefile | 10 ++++--- devel/libgsf-gnome/pkg-plist | 2 +- devel/libgsf/Makefile | 11 +++++--- devel/libgsf/distinfo | 4 +-- devel/libgsf/files/patch-gsf-gnome-Makefile.in | 38 ++++++++++++------------- devel/libgsf/pkg-plist | 39 ++++---------------------- 6 files changed, 40 insertions(+), 64 deletions(-) diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index ede28ec43..a2bacb531 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom$ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.5 2005/06/28 05:40:02 adamw Exp $ # CATEGORIES= devel gnome @@ -16,11 +16,13 @@ MASTERDIR= ${.CURDIR}/../libgsf DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomehack libgsf gnomevfs2 +USE_GNOME= gnomehack libgsf gnomevfs2 ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --disable-gtk-doc --with-bz2 --with-gnome -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lgsf-1" + +GCONF_SCHEMAS= do-build: @cd ${WRKSRC}/gsf-gnome && ${MAKE} diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index 4665e4907..be1ed8788 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.13 +lib/libgsf-gnome-1.so.1 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index e7abc7fbb..46160d88e 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.13 2005/07/23 18:59:02 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.14 2005/07/23 19:00:55 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.12.1 -PORTREVISION?= 1 +PORTVERSION= 1.12.2 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,14 +21,17 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif +USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -USE_GNOME?= gnomehack glib20 libxml2 +USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc --without-gnome --with-bz2 CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS?= gsf-office-thumbnailer.schemas + .include diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index ede4efd43..5ce9aa615 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.12.1.tar.bz2) = 76473db3245f2f384475f2e40c4ca432 -SIZE (gnome2/libgsf-1.12.1.tar.bz2) = 438829 +MD5 (gnome2/libgsf-1.12.2.tar.bz2) = fe5007f3a21bf7ab707af6c5c0d24489 +SIZE (gnome2/libgsf-1.12.2.tar.bz2) = 439507 diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index da0612a03..452978d48 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,19 +1,29 @@ ---- gsf-gnome/Makefile.in.orig Tue Jun 7 19:33:30 2005 -+++ gsf-gnome/Makefile.in Tue Jun 7 19:35:54 2005 -@@ -172,7 +172,7 @@ - +--- gsf-gnome/Makefile.in.orig Tue Aug 16 00:45:45 2005 ++++ gsf-gnome/Makefile.in Tue Aug 16 00:46:53 2005 +@@ -61,9 +61,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 +@@ -274,7 +272,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) @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ -@@ -181,14 +181,15 @@ +@@ -283,13 +281,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 \ @@ -27,19 +37,9 @@ +@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-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 -@@ -197,8 +198,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_TRUE@libgsf_gnome_1_la_DEPENDENCIES = - @WITH_LIBGSF_GNOME_FALSE@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 \ diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index facf47c09..82cccb929 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,5 +1,8 @@ +bin/gsf-office-thumbnailer include/libgsf-1/gsf-win32/gsf-input-win32.h include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf/gsf-blob.h +include/libgsf-1/gsf/gsf-clip-data.h include/libgsf-1/gsf/gsf-doc-meta-data.h include/libgsf-1/gsf/gsf-docprop-vector.h include/libgsf-1/gsf/gsf-impl-utils.h @@ -41,41 +44,9 @@ 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.13 +lib/libgsf-1.so.1 libdata/pkgconfig/libgsf-1.pc -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-Infile-reading-structed-files.html -share/doc/gsf/gsf-Input-from-unstructured-files.html -share/doc/gsf/gsf-MS-OLE2.html -share/doc/gsf/gsf-Outfile-writing-structed-files.html -share/doc/gsf/gsf-Output-to-unstructured-files.html -share/doc/gsf/gsf-Reading-and-Writing-from-local-files-and-directories.html -share/doc/gsf/gsf-Structured-Blobs.html -share/doc/gsf/gsf-Text.html -share/doc/gsf/gsf-XML-and-libxml.html -share/doc/gsf/gsf-Zip.html -share/doc/gsf/gsf-memory.html -share/doc/gsf/gsf-metadata.html -share/doc/gsf/gsf-utils.html -share/doc/gsf/gsf.devhelp -share/doc/gsf/home.png -share/doc/gsf/index.html -share/doc/gsf/index.sgml -share/doc/gsf/into.html -share/doc/gsf/io.html -share/doc/gsf/ix01.html -share/doc/gsf/left.png -share/doc/gsf/misc.html -share/doc/gsf/parsers.html -share/doc/gsf/right.png -share/doc/gsf/sources.html -share/doc/gsf/style.css -share/doc/gsf/up.png -@dirrm share/doc/gsf +share/locale/es/LC_MESSAGES/libgsf.mo @dirrm include/libgsf-1/gsf-win32 @dirrm include/libgsf-1/gsf @dirrm include/libgsf-1 -- cgit v1.2.3