[pkgsrc/trunk]: pkgsrc/devel split out gnome support, to get more granular de...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b8c0414bea7
branches:  trunk
changeset: 396741:9b8c0414bea7
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Aug 02 10:52:06 2009 +0000

description:
split out gnome support, to get more granular dependencies

diffstat:

 devel/libgsf-gnome/DESCR         |   3 ++
 devel/libgsf-gnome/Makefile      |  43 ++++++++++++++++++++++++++++++++++++++++
 devel/libgsf-gnome/PLIST         |   8 +++++++
 devel/libgsf-gnome/buildlink3.mk |  21 +++++++++++++++++++
 devel/libgsf/Makefile            |   6 +---
 devel/libgsf/PLIST               |   9 +-------
 devel/libgsf/buildlink3.mk       |   4 +--
 devel/libgsf/distinfo            |   3 +-
 devel/libgsf/patches/patch-ab    |  31 ++++++++++++++++++++++++++++
 9 files changed, 112 insertions(+), 16 deletions(-)

diffs (215 lines):

diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf-gnome/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libgsf-gnome/DESCR  Sun Aug 02 10:52:06 2009 +0000
@@ -0,0 +1,3 @@
+libgsf provides an efficient extensible I/O abstraction for dealing with
+different structured file formats.  It has support for Microsoft OLE2
+streams and Zip import.  The aim of this library is to replace libole2.
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf-gnome/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libgsf-gnome/Makefile       Sun Aug 02 10:52:06 2009 +0000
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2009/08/02 10:52:06 drochner Exp $
+#
+
+DISTNAME=      libgsf-1.14.15
+PKGNAME=       libgsf-gnome-1.14.15
+CATEGORIES=    devel gnome
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.gnome.org/
+COMMENT=       GNOME2 structured file library
+LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1
+
+CONFLICTS+=    libgsf<1.14.15nb1
+
+DISTINFO_FILE= ${.CURDIR}/../libgsf/distinfo
+PATCHDIR=      ${.CURDIR}/../libgsf/patches
+BUILD_DIRS=    gsf-gnome
+INSTALLATION_DIRS=     lib/pkgconfig
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_TOOLS+=            gmake intltool msgfmt pkg-config
+GNU_CONFIGURE=         YES
+USE_LIBTOOL=           YES
+
+PKGCONFIG_OVERRIDE+=   libgsf-gnome-1.pc.in
+
+CONFIGURE_ARGS+=       --without-python
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc \
+               ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/libgsf/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf-gnome/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libgsf-gnome/PLIST  Sun Aug 02 10:52:06 2009 +0000
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1 2009/08/02 10:52:06 drochner Exp $
+include/libgsf-1/gsf-gnome/gsf-input-bonobo.h
+include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
+include/libgsf-1/gsf-gnome/gsf-output-bonobo.h
+include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
+include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
+lib/libgsf-gnome-1.la
+lib/pkgconfig/libgsf-gnome-1.pc
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf-gnome/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libgsf-gnome/buildlink3.mk  Sun Aug 02 10:52:06 2009 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2009/08/02 10:52:06 drochner Exp $
+
+BUILDLINK_TREE+=       libgsf-gnome
+
+.if !defined(LIBGSF_GNOME_BUILDLINK3_MK)
+LIBGSF_GNOME_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libgsf-gnome+=   libgsf-gnome>=1.14.15
+BUILDLINK_PKGSRCDIR.libgsf-gnome?=     ../../devel/libgsf-gnome
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/libgsf/buildlink3.mk"
+.endif # LIBGSF_GNOME_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -libgsf-gnome
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf/Makefile
--- a/devel/libgsf/Makefile     Sun Aug 02 10:45:28 2009 +0000
+++ b/devel/libgsf/Makefile     Sun Aug 02 10:52:06 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2009/07/22 12:23:37 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2009/08/02 10:52:06 drochner Exp $
 #
 
 DISTNAME=      libgsf-1.14.15
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=  .tar.bz2
@@ -19,7 +20,6 @@
 USE_PKGLOCALEDIR=      yes
 
 PKGCONFIG_OVERRIDE=    libgsf-1.pc.in
-PKGCONFIG_OVERRIDE+=   libgsf-gnome-1.pc.in
 
 CONFIGURE_ARGS+=       --without-python
 
@@ -30,9 +30,7 @@
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf/PLIST
--- a/devel/libgsf/PLIST        Sun Aug 02 10:45:28 2009 +0000
+++ b/devel/libgsf/PLIST        Sun Aug 02 10:52:06 2009 +0000
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.25 2009/06/14 17:48:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.26 2009/08/02 10:52:06 drochner Exp $
 bin/gsf
 bin/gsf-office-thumbnailer
 bin/gsf-vba-dump
-include/libgsf-1/gsf-gnome/gsf-input-bonobo.h
-include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
-include/libgsf-1/gsf-gnome/gsf-output-bonobo.h
-include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
-include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.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
@@ -56,9 +51,7 @@
 include/libgsf-1/gsf/gsf-utils.h
 include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.la
-lib/libgsf-gnome-1.la
 lib/pkgconfig/libgsf-1.pc
-lib/pkgconfig/libgsf-gnome-1.pc
 man/man1/gsf-office-thumbnailer.1
 man/man1/gsf-vba-dump.1
 man/man1/gsf.1
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf/buildlink3.mk
--- a/devel/libgsf/buildlink3.mk        Sun Aug 02 10:45:28 2009 +0000
+++ b/devel/libgsf/buildlink3.mk        Sun Aug 02 10:52:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/08/02 10:52:06 drochner Exp $
 
 BUILDLINK_TREE+=       libgsf
 
@@ -11,9 +11,7 @@
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # LIBGSF_BUILDLINK3_MK
 
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf/distinfo
--- a/devel/libgsf/distinfo     Sun Aug 02 10:45:28 2009 +0000
+++ b/devel/libgsf/distinfo     Sun Aug 02 10:52:06 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2009/07/22 12:23:37 wiz Exp $
+$NetBSD: distinfo,v 1.33 2009/08/02 10:52:06 drochner Exp $
 
 SHA1 (libgsf-1.14.15.tar.bz2) = 813f039274a08104da2eabb3074f59d254e96bed
 RMD160 (libgsf-1.14.15.tar.bz2) = 804601e912c75fb5f433a445cf19b55c70712144
 Size (libgsf-1.14.15.tar.bz2) = 589878 bytes
 SHA1 (patch-aa) = 05b2c046b389cf81fa022b801903d66b58c2b701
+SHA1 (patch-ab) = 0687571d39e44d36cbe2ba146a31249cf8e33853
diff -r 84cfb266394d -r 9b8c0414bea7 devel/libgsf/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libgsf/patches/patch-ab     Sun Aug 02 10:52:06 2009 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.12 2009/08/02 10:52:06 drochner Exp $
+
+--- gsf-gnome/Makefile.in.orig 2009-06-20 15:09:36.000000000 +0200
++++ gsf-gnome/Makefile.in
+@@ -70,7 +70,6 @@ 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)
+ am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \
+       gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \
+@@ -303,7 +302,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ 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 = -L$(prefix)/lib -lgsf-1 $(LIBGSF_GNOME_LIBS)
+ @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \
+ @WITH_LIBGSF_GNOME_TRUE@      $(VERSION_INFO) $(am__append_1)
+ @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \
+@@ -560,7 +559,8 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-libgsf_gnome_1_includeHEADERS
++install-data-am:
++@WITH_LIBGSF_GNOME_TRUE@install-data-am: install-libgsf_gnome_1_includeHEADERS
+ 
+ install-dvi: install-dvi-am
+