Update to libgsf 1.14.10.

While here, remove the crazy no_gnome PSEUDO_FLAVOR, it leaded to way too
much headaches. Ports needing gsf-gnome extensions just have to directly
depend on libgsf,-gnome subpackage.

discussed at length with sturm@ ajacoutot@ jasper@ naddy@
ok ajacoutot@ jasper@
This commit is contained in:
landry 2008-11-18 13:25:43 +00:00
parent 69043201b4
commit 60d028d5e8
3 changed files with 14 additions and 24 deletions

View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.29 2008/09/09 20:58:11 brad Exp $
# $OpenBSD: Makefile,v 1.30 2008/11/18 13:25:43 landry Exp $
COMMENT-main= GNOME Structured File library
COMMENT-gnome= GNOME specific extensions to libgsf
GNOME_PROJECT= libgsf
GNOME_VERSION= 1.14.9
GNOME_VERSION= 1.14.10
DISTNAME= libgsf-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-gnome= libgsf-gnome-${VERSION}
CATEGORIES= devel
SHARED_LIBS+= gsf-1 114.9
SHARED_LIBS+= gsf-gnome-1 114.9
SHARED_LIBS+= gsf-1 114.10
SHARED_LIBS+= gsf-gnome-1 114.10
HOMEPAGE= http://www.gnome.org/
@ -21,6 +21,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main -gnome
WANTLIB= c m z pcre
MODULES= devel/gettext \
@ -45,14 +47,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PYTHON="${MODPY_BIN}"
MAKE_ENV+= GCONF2_SCHEMAS_DIR="${LOCALBASE}/share/schemas/libgsf"
PSEUDO_FLAVORS= no_gnome
FLAVOR?=
MULTI_PACKAGES= -main
.if !${FLAVOR:L:Mno_gnome}
MULTI_PACKAGES+= -gnome
.endif
LIB_DEPENDS-gnome= ${LIB_DEPENDS} \
gsf-1::${BUILD_PKGPATH} \
gnomevfs-2.>=1800:gnome-vfs2->=2.18:x11/gnome/vfs2 \
@ -61,9 +55,4 @@ WANTLIB-gnome= ${WANTLIB} crypto ssl ORBit-2 ORBitCosNaming-2 \
bonobo-activation gobject-2.0 gthread-2.0 util xml2 \
bz2 dbus-1 dbus-glib-1 gconf-2 glib-2.0 gmodule-2.0
.if !${MULTI_PACKAGES:M-gnome}
CONFIGURE_ARGS+= --without-bonobo \
--without-gnome_vfs
.endif
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (libgsf-1.14.9.tar.bz2) = QiqEYZJ7hjeA01eZkakVpQ==
RMD160 (libgsf-1.14.9.tar.bz2) = jrUjeFULFaDJQrj/h+8+RdKfuOA=
SHA1 (libgsf-1.14.9.tar.bz2) = RcXkJkMJgJtDX9qu2bPKPTg4xvo=
SHA256 (libgsf-1.14.9.tar.bz2) = 0WGP5j8nJZkrWybiZ21semigsif/XoR1mqZpUQAwfNY=
SIZE (libgsf-1.14.9.tar.bz2) = 626043
MD5 (libgsf-1.14.10.tar.bz2) = +bLzCQia9oMGb/CzGSJ+Vw==
RMD160 (libgsf-1.14.10.tar.bz2) = qSEWylYqDuVYSE9ccAqrKxpkNoE=
SHA1 (libgsf-1.14.10.tar.bz2) = EZrXoc7QdnWNGAGAKvoKeUFKXlI=
SHA256 (libgsf-1.14.10.tar.bz2) = ZqPzTmTQpylEJNUpvxI2FUTFiPQLK2kWLSKmA0vuCmE=
SIZE (libgsf-1.14.10.tar.bz2) = 634273

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2008/09/07 22:21:10 brad Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2008/11/18 13:25:43 landry Exp $
@pkgpath devel/libgsf
@pkgpath devel/libgsf,no_gnome
%%SHARED%%
@ -15,6 +15,7 @@ include/libgsf-1/gsf/gsf-infile-impl.h
include/libgsf-1/gsf/gsf-infile-msole.h
include/libgsf-1/gsf/gsf-infile-msvba.h
include/libgsf-1/gsf/gsf-infile-stdio.h
include/libgsf-1/gsf/gsf-infile-tar.h
include/libgsf-1/gsf/gsf-infile-zip.h
include/libgsf-1/gsf/gsf-infile.h
include/libgsf-1/gsf/gsf-input-bzip.h
@ -48,6 +49,7 @@ include/libgsf-1/gsf/gsf-output-iochannel.h
include/libgsf-1/gsf/gsf-output-memory.h
include/libgsf-1/gsf/gsf-output-stdio.h
include/libgsf-1/gsf/gsf-output.h
include/libgsf-1/gsf/gsf-shared-memory.h
include/libgsf-1/gsf/gsf-structured-blob.h
include/libgsf-1/gsf/gsf-timestamp.h
include/libgsf-1/gsf/gsf-utils.h
@ -66,7 +68,6 @@ lib/python${MODPY_VERSION}/site-packages/gsf/__init__.pyo
@man man/man1/gsf-office-thumbnailer.1
@man man/man1/gsf-vba-dump.1
@man man/man1/gsf.1
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gsf/
share/gtk-doc/html/gsf/GsfClipData.html