mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

- Split libgsf port to two standalone ports:

Browse Source 
* devel/libgsf is the old port minus gsf-gnome bits
  * devel/libgsf-gnome contains libgsf-gnome-1 library and it's header files
  This greatly reduces number of dependencies for ports that was using only
  non-gnome part of this library.
- Point USE_GNOME parameter libgsf to GNOME-less port and create new parameter
  libgsf_gnome for libgsf-gnome port.
- Convert all consumers of libgsf-gnome-1 library to depend on libgsf-gnome
  port (read all as: Gnumeric)

PR:		ports/63851 (in the spirit of)
Submitted by:	Sybolt de Boer <sybolt@xs4all.nl>
Prodded by:	lofi (KDE team)
Reviewed by:	marcus (GNOME team)
This commit is contained in:
Pav Lucistnik 2004-05-22 20:56:52 +00:00
parent ccac9ebe1b
commit 6b8fe3db6b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=109734
9 changed files with 108 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mk/bsd.gnome.mk
View File

@ -42,8 +42,8 @@ _USE_GNOME_ALL+=glib20 atk pango gtk20 linc libidl orbit2 \
libgnome libbonoboui libgnomeui atspi libgailgnome \
libgtkhtml gnomedesktop libwnck vte libzvt librsvg2 eel2 \
gnomepanel nautilus2 metacity gal2 gnomecontrolcenter2 libgda2 \
libgnomedb gtksourceview libgsf pygtk2 pygnome2 gstreamerplugins \
gtkhtml3 gnomespeech
libgnomedb gtksourceview libgsf libgsf_gnome pygtk2 pygnome2 \
gstreamerplugins gtkhtml3 gnomespeech
SCROLLKEEPER_DIR= /var/db/scrollkeeper
gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
@ -381,8 +381,12 @@ pkgconfig_BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
libgsf_LIB_DEPENDS= gsf-1.10:${PORTSDIR}/devel/libgsf
libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-gnome-1.pc
libgsf_USE_GNOME_IMPL= gnomevfs2 libbonobo
libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
libgsf_USE_GNOME_IMPL= glib10 libxml2
libgsf_gnome_LIB_DEPENDS= gsf-gnome-1.10:${PORTSDIR}/devel/libgsf-gnome
libgsf_gnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-gnome-1.pc
libgsf_gnome_USE_GNOME_IMPL= gnomevfs2 libbonobo
pygtk2_DETECT= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py
pygtk2_BUILD_DEPENDS= ${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2

1
devel/Makefile
View File

@ -399,6 +399,7 @@
SUBDIR += libglademm
SUBDIR += libgnugetopt
SUBDIR += libgsf
SUBDIR += libgsf-gnome
SUBDIR += libgtop2
SUBDIR += libhash
SUBDIR += libhoard

31
devel/libgsf-gnome/Makefile Normal file
View File

@ -0,0 +1,31 @@
# New ports collection makefile for: libgsf
# Date created: 11 September 2002
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
#
CATEGORIES= devel gnome
PKGNAMESUFFIX= -gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME wrapper for libgsf
MASTERDIR= ${.CURDIR}/../libgsf
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomehack libgsf gnomevfs2
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"
do-build:
@cd ${WRKSRC}/gsf-gnome && ${MAKE}
do-install:
@cd ${WRKSRC}/gsf-gnome && ${MAKE} install
@${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc ${PREFIX}/libdata/pkgconfig
.include "${MASTERDIR}/Makefile"

3
devel/libgsf-gnome/pkg-descr Normal file
View File

@ -0,0 +1,3 @@
The library is a bonobo and gnomevfs wrapper for libgsf, providing a high level
API for GNOME applications to access and exchange various structured file
formats.

10
devel/libgsf-gnome/pkg-plist Normal file
View File

@ -0,0 +1,10 @@
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.a
lib/libgsf-gnome-1.so
lib/libgsf-gnome-1.so.10
libdata/pkgconfig/libgsf-gnome-1.pc
@dirrm include/libgsf-1/gsf-gnome

13
devel/libgsf/Makefile
View File

@ -7,13 +7,14 @@
PORTNAME= libgsf
PORTVERSION= 1.9.1
CATEGORIES= devel gnome
PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An extensible i/o abstraction for dealing with structured file formats
COMMENT?= An extensible i/o abstraction for dealing with structured file formats
.if !exists(/usr/lib/libbz2.so.1)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
@ -22,11 +23,11 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack libbonobo gnomevfs2
USE_GNOME?= gnomehack glib20 libxml2
USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc --with-gnome --with-bz2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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"
.include <bsd.port.mk>

46
devel/libgsf/files/patch-gsf-gnome-Makefile.in Normal file
View File

@ -0,0 +1,46 @@
--- gsf-gnome/Makefile.in.orig Sat May 22 18:56:24 2004
+++ gsf-gnome/Makefile.in Sat May 22 18:57:23 2004
@@ -170,7 +170,7 @@
lib_LTLIBRARIES = $(target_libgsf_gnome)
-libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS)
+libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS)
libgsf_gnome_1_la_LDFLAGS = -version-info $(VERSION_INFO)
libgsf_gnome_1_la_SOURCES = \
gsf-input-gnomevfs.c \
@@ -199,7 +199,7 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-libgsf_gnome_1_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la
+libgsf_gnome_1_la_DEPENDENCIES =
am_libgsf_gnome_1_la_OBJECTS = gsf-input-gnomevfs.lo \
gsf-output-gnomevfs.lo gsf-input-bonobo.lo gsf-output-bonobo.lo \
gsf-shared-bonobo-stream.lo
--- gsf-gnome/Makefile.in.orig Sat May 22 19:26:16 2004
+++ gsf-gnome/Makefile.in Sat May 22 19:30:30 2004
@@ -179,14 +179,15 @@
gsf-output-bonobo.c \
gsf-shared-bonobo-stream.c
-
-libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
-libgsf_gnome_1_include_HEADERS = \
- gsf-input-gnomevfs.h \
- gsf-output-gnomevfs.h \
- gsf-input-bonobo.h \
- gsf-output-bonobo.h \
- gsf-shared-bonobo-stream.h
+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_includedir =
+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS =
+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
+@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-output-bonobo.h \
+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h
# include these just in case we are building a tarball without

10
devel/libgsf/pkg-plist
View File

@ -1,8 +1,3 @@
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-win32/gsf-input-win32.h
include/libgsf-1/gsf-win32/gsf-output-win32.h
include/libgsf-1/gsf/gsf-doc-meta-data.h
@ -41,11 +36,7 @@ include/libgsf-1/gsf/gsf.h
lib/libgsf-1.a
lib/libgsf-1.so
lib/libgsf-1.so.10
lib/libgsf-gnome-1.a
lib/libgsf-gnome-1.so
lib/libgsf-gnome-1.so.10
libdata/pkgconfig/libgsf-1.pc
libdata/pkgconfig/libgsf-gnome-1.pc
share/doc/gsf/api.html
share/doc/gsf/gsf-Bononbo.html
share/doc/gsf/gsf-Compression.html
@ -80,6 +71,5 @@ share/doc/gsf/style.css
share/doc/gsf/up.png
@dirrm share/doc/gsf
@dirrm include/libgsf-1/gsf-win32
@dirrm include/libgsf-1/gsf-gnome
@dirrm include/libgsf-1/gsf
@dirrm include/libgsf-1

3
math/gnumeric2/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= gnumeric2
PORTVERSION= 1.2.12
PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
@ -24,7 +25,7 @@ USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeprintui libgnomedb \
libgsf
libgsf_gnome
USE_PYTHON= yes
USE_REINPLACE= yes
USE_LIBTOOL_VER=13