diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index bead908ef4b..5c1305335b9 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,14 +1,15 @@ -# $OpenBSD: Makefile,v 1.26 2008/05/12 16:43:57 fgsch Exp $ +# $OpenBSD: Makefile,v 1.27 2008/06/03 16:34:43 jasper Exp $ COMMENT-main= GNOME Structured File library COMMENT-gnome= GNOME specific extensions to libgsf -VERSION= 1.14.4 +GNOME_PROJECT= libgsf +GNOME_VERSION= 1.14.8 DISTNAME= libgsf-${VERSION} PKGNAME-main= ${DISTNAME} PKGNAME-gnome= libgsf-gnome-${VERSION} -SHARED_LIBS += gsf-1 114.4 # .114.4 -SHARED_LIBS += gsf-gnome-1 114.4 # .114.4 +SHARED_LIBS += gsf-1 114.8 # .114.8 +SHARED_LIBS += gsf-gnome-1 114.8 # .114.8 CATEGORIES= devel @@ -22,14 +23,11 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c m z pcre -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.14/} -EXTRACT_SUFX= .tar.bz2 - MODULES= devel/gettext \ - lang/python + lang/python \ + x11/gnome -BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \ - :py-gtk2->=2.10:x11/py-gtk2 \ +BUILD_DEPENDS= :py-gtk2->=2.10:x11/py-gtk2 \ :popt-*:devel/popt LIB_DEPENDS= bz2.>=10.2::archivers/bzip2 \ glib-2.0.>=0.12,gobject-2.0.>=0.12::devel/glib2 \ @@ -37,17 +35,17 @@ LIB_DEPENDS= bz2.>=10.2::archivers/bzip2 \ AUTOCONF_VERSION = 2.61 -USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= autoconf -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --with-bz2 \ +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --with-bz2 \ --disable-schemas-install \ --with-python \ - --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libgsf + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libgsf/ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PYTHON="${MODPY_BIN}" +MAKE_ENV+= GCONF2_SCHEMAS_DIR="${LOCALBASE}/share/schemas/libgsf/" PSEUDO_FLAVORS= no_gnome FLAVOR?= @@ -67,8 +65,10 @@ WANTLIB-gnome= ${WANTLIB} crypto ssl ORBit-2 ORBitCosNaming-2 \ .if ${MULTI_PACKAGES:M-gnome} CONFIGURE_ARGS+= --with-gnome +#CONFIGURE_ARGS+= --with-gvfs .else -CONFIGURE_ARGS+= --without-gnome +CONFIGURE_ARGS+= --without-gnome \ + --without-gvfs .endif .include diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 2d8bca92b79..1d845e6b932 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,5 +1,5 @@ -MD5 (libgsf-1.14.4.tar.bz2) = LQetLxM2wQHOFJgrpyifgA== -RMD160 (libgsf-1.14.4.tar.bz2) = w9DWLFuewhzOoF3dTTV4hQcTszw= -SHA1 (libgsf-1.14.4.tar.bz2) = aE2JyPuaf+M8g9gQ5FQBiJx5T+I= -SHA256 (libgsf-1.14.4.tar.bz2) = 5o7oJr2iQayEdCAEPwM1wchM337nctZyrjkv8hgV5/A= -SIZE (libgsf-1.14.4.tar.bz2) = 543158 +MD5 (libgsf-1.14.8.tar.bz2) = CeS2Y5vnn6iIyrx1H3NnTw== +RMD160 (libgsf-1.14.8.tar.bz2) = a4CteZLHEkDrbHxiHtz761qwf4I= +SHA1 (libgsf-1.14.8.tar.bz2) = eApBEFCyFoJj8VTWal67BxQShOM= +SHA256 (libgsf-1.14.8.tar.bz2) = 1fY16ob4QX3Xd8Mrz374bPOvORLzSuIduZM6DkjlR0g= +SIZE (libgsf-1.14.8.tar.bz2) = 632363 diff --git a/devel/libgsf/patches/patch-configure_in b/devel/libgsf/patches/patch-configure_in deleted file mode 100644 index 8adfcaf3b6d..00000000000 --- a/devel/libgsf/patches/patch-configure_in +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1 2008/05/12 16:43:57 fgsch Exp $ ---- configure.in.orig Thu May 8 11:37:27 2008 -+++ configure.in Thu May 8 11:42:27 2008 -@@ -377,7 +377,6 @@ else - *) AC_MSG_ERROR(bad value ${withval} for --with-bonobo) ;; - esac], - [WITH_BONOBO=yes]) dnl Default value -- AM_CONDITIONAL(WITH_BONOBO, test $WITH_BONOBO = yes) - - if test $WITH_BONOBO = yes; then - libgsf_gnome_reqs="$libgsf_gnome_reqs libbonobo-2.0 >= 2.0.0" -@@ -391,6 +390,7 @@ else - AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo]) - fi]) - fi -+AM_CONDITIONAL(WITH_BONOBO, test x"$WITH_BONOBO" != x"no") - AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes) - - # =================== diff --git a/devel/libgsf/patches/patch-thumbnailer_Makefile_in b/devel/libgsf/patches/patch-thumbnailer_Makefile_in new file mode 100644 index 00000000000..f3ed0ac0f44 --- /dev/null +++ b/devel/libgsf/patches/patch-thumbnailer_Makefile_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-thumbnailer_Makefile_in,v 1.1 2008/06/03 16:34:43 jasper Exp $ +--- thumbnailer/Makefile.in.orig Mon Jun 2 00:01:38 2008 ++++ thumbnailer/Makefile.in Mon Jun 2 00:02:10 2008 +@@ -277,8 +277,9 @@ schema_files = \ + gsf-office-thumbnailer.schemas.in + + schemas = gsf-office-thumbnailer.schemas +-schemadir = $(GCONF_SCHEMA_FILE_DIR) +-@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = $(schemas) ++# XXX workaround for missing substitution in configure ++schemadir = ${GCONF2_SCHEMAS_DIR} ++schema_DATA = $(schemas) + EXTRA_DIST = \ + $(schema_files) + diff --git a/devel/libgsf/pkg/PLIST-gnome b/devel/libgsf/pkg/PLIST-gnome index 203c546d30d..3934848a865 100644 --- a/devel/libgsf/pkg/PLIST-gnome +++ b/devel/libgsf/pkg/PLIST-gnome @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-gnome,v 1.3 2007/05/06 11:32:34 jasper Exp $ +@comment $OpenBSD: PLIST-gnome,v 1.4 2008/06/03 16:34:43 jasper Exp $ +%%SHARED%% bin/gsf-office-thumbnailer include/libgsf-1/gsf-gnome/ include/libgsf-1/gsf-gnome/gsf-input-bonobo.h @@ -10,8 +11,6 @@ lib/libgsf-gnome-1.a lib/libgsf-gnome-1.la lib/pkgconfig/libgsf-gnome-1.pc @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/libgsf/*.schemas > /dev/null -share/schemas/ share/schemas/libgsf/ share/schemas/libgsf/gsf-office-thumbnailer.schemas -%%SHARED%% @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/libgsf/*.schemas > /dev/null diff --git a/devel/libgsf/pkg/PLIST-main b/devel/libgsf/pkg/PLIST-main index c4a25204568..e46155be6b2 100644 --- a/devel/libgsf/pkg/PLIST-main +++ b/devel/libgsf/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2008/05/12 16:43:57 fgsch Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2008/06/03 16:34:43 jasper Exp $ @pkgpath devel/libgsf @pkgpath devel/libgsf,no_gnome %%SHARED%% @@ -6,9 +6,9 @@ bin/gsf bin/gsf-vba-dump include/libgsf-1/ include/libgsf-1/gsf/ -@comment include/libgsf-1/gsf-win32/ -@comment include/libgsf-1/gsf-win32/gsf-input-win32.h -@comment include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf-gvfs/ +include/libgsf-1/gsf-gvfs/gsf-input-gvfs.h +include/libgsf-1/gsf-gvfs/gsf-output-gvfs.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 @@ -65,6 +65,7 @@ lib/python${MODPY_VERSION}/site-packages/gsf/__init__.pyo @comment lib/python${MODPY_VERSION}/site-packages/gsf/gnomemodule.a @comment lib/python${MODPY_VERSION}/site-packages/gsf/gnomemodule.la @man man/man1/gsf-office-thumbnailer.1 +@man man/man1/gsf.1 share/gtk-doc/ share/gtk-doc/html/ share/gtk-doc/html/gsf/ @@ -107,4 +108,7 @@ share/gtk-doc/html/gsf/sources.html share/gtk-doc/html/gsf/style.css share/gtk-doc/html/gsf/up.png share/locale/es/LC_MESSAGES/libgsf.mo +share/locale/oc/LC_MESSAGES/libgsf.mo share/locale/sv/LC_MESSAGES/libgsf.mo +share/locale/zh_HK/LC_MESSAGES/libgsf.mo +share/locale/zh_TW/LC_MESSAGES/libgsf.mo