diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-09 01:53:14 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-09 01:53:14 +0800 |
commit | 25e302ca6a63211ec5f3610ad654cd61a4df857c (patch) | |
tree | fdd986abb6b86bf2b7597f0d7206417f8a1f6738 | |
parent | 1f877f646ff7c812bea70f7972bb6c1162124751 (diff) | |
download | marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar.gz marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar.bz2 marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar.lz marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar.xz marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.tar.zst marcuscom-ports-25e302ca6a63211ec5f3610ad654cd61a4df857c.zip |
Update to 1.12.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4792 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | devel/libgsf-gnome/Makefile | 3 | ||||
-rw-r--r-- | devel/libgsf/Makefile | 12 | ||||
-rw-r--r-- | devel/libgsf/distinfo | 4 | ||||
-rw-r--r-- | devel/libgsf/files/patch-doc_Makefile.in | 11 | ||||
-rw-r--r-- | devel/libgsf/files/patch-gsf-gnome-Makefile.in | 40 | ||||
-rw-r--r-- | devel/libgsf/pkg-plist | 35 |
6 files changed, 78 insertions, 27 deletions
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 2b2a86760..725430574 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.6 2005/08/16 04:56:18 marcus Exp $ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.7 2005/08/19 02:00:04 mezz Exp $ # CATEGORIES= devel gnome @@ -23,6 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lgsf-1" GCONF_SCHEMAS= +GSF_SLAVE= yes do-build: @cd ${WRKSRC}/gsf-gnome && ${MAKE} diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 46160d88e..8820317d7 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.14 2005/07/23 19:00:55 marcus Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.15 2005/08/16 04:56:17 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.12.2 +PORTVERSION= 1.12.3 PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} @@ -28,10 +28,14 @@ INSTALLS_SHLIB= yes 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 + --disable-gtk-doc --without-gnome --with-bz2 \ + --mandir=${PREFIX}/man CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS?= gsf-office-thumbnailer.schemas +.if !defined(GSF_SLAVE) +GCONF_SCHEMAS= gsf-office-thumbnailer.schemas +MAN1= gsf-office-thumbnailer.1 +.endif .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 5ce9aa615..33da0b6d9 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.12.2.tar.bz2) = fe5007f3a21bf7ab707af6c5c0d24489 -SIZE (gnome2/libgsf-1.12.2.tar.bz2) = 439507 +MD5 (gnome2/libgsf-1.12.3.tar.bz2) = 34b51119d5cbae30be0357ab246e93de +SIZE (gnome2/libgsf-1.12.3.tar.bz2) = 503106 diff --git a/devel/libgsf/files/patch-doc_Makefile.in b/devel/libgsf/files/patch-doc_Makefile.in new file mode 100644 index 000000000..8d68fe6e5 --- /dev/null +++ b/devel/libgsf/files/patch-doc_Makefile.in @@ -0,0 +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 @@ + 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) + diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index 452978d48..35cf5d3ac 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,29 +1,18 @@ ---- 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) +--- 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 @@ + @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_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 \ -@@ -283,13 +281,15 @@ - @WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.c \ +@@ -231,13 +231,15 @@ @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 \ @@ -41,5 +30,16 @@ +@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ +@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h - all: all-am + subdir = gsf-gnome + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -246,9 +248,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) +-@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 82cccb929..e7c566be7 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -46,7 +46,42 @@ lib/libgsf-1.a lib/libgsf-1.so 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-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 +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 share/locale/es/LC_MESSAGES/libgsf.mo +@dirrm share/doc/gsf @dirrm include/libgsf-1/gsf-win32 @dirrm include/libgsf-1/gsf @dirrm include/libgsf-1 |