diff options
137 files changed, 3347 insertions, 1645 deletions
diff --git a/databases/Makefile b/databases/Makefile index 6aad57411fcb..9d7137175828 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -21,6 +21,7 @@ SUBDIR += gtksql SUBDIR += interbase4 SUBDIR += jdbc-oracle816 + SUBDIR += libgda SUBDIR += libiodbc SUBDIR += mdbtools SUBDIR += metakit diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile new file mode 100644 index 000000000000..9b0bc9d59d66 --- /dev/null +++ b/databases/libgda/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: libgda +# Date created: 8th March 2001 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= libgda +PORTVERSION= 0.2.3 +CATEGORIES= databases gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/libgda + +MAINTAINER= ade@FreeBSD.org + +USE_GNOME= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +INSTALLS_SHLIB= yes + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + +.include <bsd.port.mk> diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo new file mode 100644 index 000000000000..802e4a484e63 --- /dev/null +++ b/databases/libgda/distinfo @@ -0,0 +1 @@ +MD5 (libgda-0.2.3.tar.gz) = 8d1f1ea307ae4f680bcefedb433e0c34 diff --git a/databases/libgda/files/patch-aa b/databases/libgda/files/patch-aa new file mode 100644 index 000000000000..370723ab829b --- /dev/null +++ b/databases/libgda/files/patch-aa @@ -0,0 +1,7 @@ +--- Makefile.in.orig Wed Feb 14 18:40:55 2001 ++++ Makefile.in Thu Mar 8 17:10:44 2001 +@@ -138,3 +138,3 @@ + +-SUBDIRS = po macros doc idl lib bindings providers tools report testing ++SUBDIRS = po macros doc idl lib bindings providers tools report + diff --git a/databases/libgda/pkg-comment b/databases/libgda/pkg-comment new file mode 100644 index 000000000000..be18a121d7f0 --- /dev/null +++ b/databases/libgda/pkg-comment @@ -0,0 +1 @@ +Provides uniform access to different kinds of data sources diff --git a/databases/libgda/pkg-descr b/databases/libgda/pkg-descr new file mode 100644 index 000000000000..7c5a50c3cffd --- /dev/null +++ b/databases/libgda/pkg-descr @@ -0,0 +1,19 @@ +GNU Data Access (GDA) is an attempt to provide uniform access to +different kinds of data sources (databases, information servers, +mail spools, etc). + +It is a complete architecture that provides all you need to access +your data, defined by a set of CORBA interfaces as generic as possible +(but very powerful at the same time) so that any kind of data source +can be accessed through them. + +libgda is an interface to the GDA architecture, providing a nice +wrapper around the CORBA interfaces, for both the client and the server +parts. It also provides a bunch of tools to help you both in the +development and management of your data sources, all done through +the GDA model's set of CORBA interfaces. + +libgda was part of the GNOME-DB project, but has been separated from it +to allow non-GNOME applications to be developed based on it. + +WWW: http://www.gnome.org/projects/gnome-db/ diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist new file mode 100644 index 000000000000..e8f37837790f --- /dev/null +++ b/databases/libgda/pkg-plist @@ -0,0 +1,132 @@ +bin/gda-buildclient +bin/gda-buildserver +bin/gda-config +bin/gda-report-server +bin/gda-run +include/gda/GDA.h +include/gda/gda++/gdaBatch.h +include/gda/gda++/gdaCommand.h +include/gda/gda++/gdaConnection.h +include/gda/gda++/gdaError.h +include/gda/gda++/gdaErrorList.h +include/gda/gda++/gdaField.h +include/gda/gda++/gdaIncludes.h +include/gda/gda++/gdaRecordset.h +include/gda/gda++/gdaValue.h +include/gda/gda-batch.h +include/gda/gda-client.h +include/gda/gda-command.h +include/gda/gda-common.h +include/gda/gda-config.h +include/gda/gda-connection-pool.h +include/gda/gda-connection.h +include/gda/gda-corba.h +include/gda/gda-error.h +include/gda/gda-field.h +include/gda/gda-log.h +include/gda/gda-recordset.h +include/gda/gda-report-client.h +include/gda/gda-report-defs.h +include/gda/gda-report-engine.h +include/gda/gda-report-stream.h +include/gda/gda-server-impl.h +include/gda/gda-server.h +include/gda/gda-thread.h +include/gda/gda-util.h +include/gda/gda-value.h +include/gda/gda-xml-database.h +include/gda/gda-xml-file.h +include/gda/gda-xml-query.h +lib/libgda-client.a +lib/libgda-client.so +lib/libgda-client.so.0 +lib/libgda-clientcpp.a +lib/libgda-clientcpp.so +lib/libgda-clientcpp.so.0 +lib/libgda-common.a +lib/libgda-common.so +lib/libgda-common.so.0 +lib/libgda-report.a +lib/libgda-report.so +lib/libgda-report.so.0 +lib/libgda-server.a +lib/libgda-server.so +lib/libgda-server.so.0 +share/gda/templates/gda-srv-command.c.tmpl +share/gda/templates/gda-srv-connection.c.tmpl +share/gda/templates/gda-srv-recordset.c.tmpl +share/gda/templates/gda-srv.h.tmpl +share/gda/templates/main-srv.c.tmpl +share/gnome/gda/dtd/gda-report.dtd +share/gnome/gda/dtd/gda-xml-query.dtd +share/gnome/help/libgda/C/architecture.html +share/gnome/help/libgda/C/clients-building-corba.html +share/gnome/help/libgda/C/clients-building.html +share/gnome/help/libgda/C/clients.html +share/gnome/help/libgda/C/docbook.css +share/gnome/help/libgda/C/gda-client-batch.html +share/gnome/help/libgda/C/gda-client-meta.html +share/gnome/help/libgda/C/gda-client-objects.html +share/gnome/help/libgda/C/gda-client-types.html +share/gnome/help/libgda/C/gda-client.html +share/gnome/help/libgda/C/gda-common-logs.html +share/gnome/help/libgda/C/gda-common-xml-databases.html +share/gnome/help/libgda/C/gda-common-xml-queries.html +share/gnome/help/libgda/C/gda-common.html +share/gnome/help/libgda/C/index.html +share/gnome/help/libgda/C/installation-configuring.html +share/gnome/help/libgda/C/installation-installing.html +share/gnome/help/libgda/C/installation.html +share/gnome/help/libgda/C/introduction.html +share/gnome/help/libgda/C/libgda.html +share/gnome/help/libgda/C/ln32.html +share/gnome/help/libgda/C/providers-actual-implementation.html +share/gnome/help/libgda/C/providers-examples.html +share/gnome/help/libgda/C/providers-implementation.html +share/gnome/help/libgda/C/providers.html +share/gnome/help/libgda/C/reports.html +share/gnome/help/libgda/C/topic.dat +share/gnome/help/libgda/pt_BR/architecture.html +share/gnome/help/libgda/pt_BR/c162.html +share/gnome/help/libgda/pt_BR/c182.html +share/gnome/help/libgda/pt_BR/c323.html +share/gnome/help/libgda/pt_BR/c350.html +share/gnome/help/libgda/pt_BR/clients-building-corba.html +share/gnome/help/libgda/pt_BR/clients-building.html +share/gnome/help/libgda/pt_BR/docbook.css +share/gnome/help/libgda/pt_BR/gda-client-batch.html +share/gnome/help/libgda/pt_BR/gda-client-meta.html +share/gnome/help/libgda/pt_BR/gda-client-objects.html +share/gnome/help/libgda/pt_BR/gda-client-types.html +share/gnome/help/libgda/pt_BR/gda-common-logs.html +share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html +share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html +share/gnome/help/libgda/pt_BR/index.html +share/gnome/help/libgda/pt_BR/installation-configuring.html +share/gnome/help/libgda/pt_BR/installation-installing.html +share/gnome/help/libgda/pt_BR/installation.html +share/gnome/help/libgda/pt_BR/introduction.html +share/gnome/help/libgda/pt_BR/libgda.html +share/gnome/help/libgda/pt_BR/ln38.html +share/gnome/help/libgda/pt_BR/providers-actual-implementation.html +share/gnome/help/libgda/pt_BR/providers-examples.html +share/gnome/help/libgda/pt_BR/providers-implementation.html +share/gnome/help/libgda/pt_BR/topic.dat +share/idl/GDA.idl +share/idl/GDA_Command.idl +share/idl/GDA_Connection.idl +share/idl/GDA_Error.idl +share/idl/GDA_Field.idl +share/idl/GDA_Parameter.idl +share/idl/GDA_Recordset.idl +@dirrm share/gnome/help/libgda/pt_BR/images +@dirrm share/gnome/help/libgda/pt_BR +@dirrm share/gnome/help/libgda/C/images +@dirrm share/gnome/help/libgda/C +@dirrm share/gnome/help/libgda +@dirrm share/gnome/gda/dtd +@dirrm share/gnome/gda +@dirrm share/gda/templates +@dirrm share/gda +@dirrm include/gda/gda++ +@dirrm include/gda diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile new file mode 100644 index 000000000000..9b0bc9d59d66 --- /dev/null +++ b/databases/libgda2/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: libgda +# Date created: 8th March 2001 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= libgda +PORTVERSION= 0.2.3 +CATEGORIES= databases gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/libgda + +MAINTAINER= ade@FreeBSD.org + +USE_GNOME= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +INSTALLS_SHLIB= yes + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + +.include <bsd.port.mk> diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo new file mode 100644 index 000000000000..802e4a484e63 --- /dev/null +++ b/databases/libgda2/distinfo @@ -0,0 +1 @@ +MD5 (libgda-0.2.3.tar.gz) = 8d1f1ea307ae4f680bcefedb433e0c34 diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa new file mode 100644 index 000000000000..370723ab829b --- /dev/null +++ b/databases/libgda2/files/patch-aa @@ -0,0 +1,7 @@ +--- Makefile.in.orig Wed Feb 14 18:40:55 2001 ++++ Makefile.in Thu Mar 8 17:10:44 2001 +@@ -138,3 +138,3 @@ + +-SUBDIRS = po macros doc idl lib bindings providers tools report testing ++SUBDIRS = po macros doc idl lib bindings providers tools report + diff --git a/databases/libgda2/pkg-comment b/databases/libgda2/pkg-comment new file mode 100644 index 000000000000..be18a121d7f0 --- /dev/null +++ b/databases/libgda2/pkg-comment @@ -0,0 +1 @@ +Provides uniform access to different kinds of data sources diff --git a/databases/libgda2/pkg-descr b/databases/libgda2/pkg-descr new file mode 100644 index 000000000000..7c5a50c3cffd --- /dev/null +++ b/databases/libgda2/pkg-descr @@ -0,0 +1,19 @@ +GNU Data Access (GDA) is an attempt to provide uniform access to +different kinds of data sources (databases, information servers, +mail spools, etc). + +It is a complete architecture that provides all you need to access +your data, defined by a set of CORBA interfaces as generic as possible +(but very powerful at the same time) so that any kind of data source +can be accessed through them. + +libgda is an interface to the GDA architecture, providing a nice +wrapper around the CORBA interfaces, for both the client and the server +parts. It also provides a bunch of tools to help you both in the +development and management of your data sources, all done through +the GDA model's set of CORBA interfaces. + +libgda was part of the GNOME-DB project, but has been separated from it +to allow non-GNOME applications to be developed based on it. + +WWW: http://www.gnome.org/projects/gnome-db/ diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist new file mode 100644 index 000000000000..e8f37837790f --- /dev/null +++ b/databases/libgda2/pkg-plist @@ -0,0 +1,132 @@ +bin/gda-buildclient +bin/gda-buildserver +bin/gda-config +bin/gda-report-server +bin/gda-run +include/gda/GDA.h +include/gda/gda++/gdaBatch.h +include/gda/gda++/gdaCommand.h +include/gda/gda++/gdaConnection.h +include/gda/gda++/gdaError.h +include/gda/gda++/gdaErrorList.h +include/gda/gda++/gdaField.h +include/gda/gda++/gdaIncludes.h +include/gda/gda++/gdaRecordset.h +include/gda/gda++/gdaValue.h +include/gda/gda-batch.h +include/gda/gda-client.h +include/gda/gda-command.h +include/gda/gda-common.h +include/gda/gda-config.h +include/gda/gda-connection-pool.h +include/gda/gda-connection.h +include/gda/gda-corba.h +include/gda/gda-error.h +include/gda/gda-field.h +include/gda/gda-log.h +include/gda/gda-recordset.h +include/gda/gda-report-client.h +include/gda/gda-report-defs.h +include/gda/gda-report-engine.h +include/gda/gda-report-stream.h +include/gda/gda-server-impl.h +include/gda/gda-server.h +include/gda/gda-thread.h +include/gda/gda-util.h +include/gda/gda-value.h +include/gda/gda-xml-database.h +include/gda/gda-xml-file.h +include/gda/gda-xml-query.h +lib/libgda-client.a +lib/libgda-client.so +lib/libgda-client.so.0 +lib/libgda-clientcpp.a +lib/libgda-clientcpp.so +lib/libgda-clientcpp.so.0 +lib/libgda-common.a +lib/libgda-common.so +lib/libgda-common.so.0 +lib/libgda-report.a +lib/libgda-report.so +lib/libgda-report.so.0 +lib/libgda-server.a +lib/libgda-server.so +lib/libgda-server.so.0 +share/gda/templates/gda-srv-command.c.tmpl +share/gda/templates/gda-srv-connection.c.tmpl +share/gda/templates/gda-srv-recordset.c.tmpl +share/gda/templates/gda-srv.h.tmpl +share/gda/templates/main-srv.c.tmpl +share/gnome/gda/dtd/gda-report.dtd +share/gnome/gda/dtd/gda-xml-query.dtd +share/gnome/help/libgda/C/architecture.html +share/gnome/help/libgda/C/clients-building-corba.html +share/gnome/help/libgda/C/clients-building.html +share/gnome/help/libgda/C/clients.html +share/gnome/help/libgda/C/docbook.css +share/gnome/help/libgda/C/gda-client-batch.html +share/gnome/help/libgda/C/gda-client-meta.html +share/gnome/help/libgda/C/gda-client-objects.html +share/gnome/help/libgda/C/gda-client-types.html +share/gnome/help/libgda/C/gda-client.html +share/gnome/help/libgda/C/gda-common-logs.html +share/gnome/help/libgda/C/gda-common-xml-databases.html +share/gnome/help/libgda/C/gda-common-xml-queries.html +share/gnome/help/libgda/C/gda-common.html +share/gnome/help/libgda/C/index.html +share/gnome/help/libgda/C/installation-configuring.html +share/gnome/help/libgda/C/installation-installing.html +share/gnome/help/libgda/C/installation.html +share/gnome/help/libgda/C/introduction.html +share/gnome/help/libgda/C/libgda.html +share/gnome/help/libgda/C/ln32.html +share/gnome/help/libgda/C/providers-actual-implementation.html +share/gnome/help/libgda/C/providers-examples.html +share/gnome/help/libgda/C/providers-implementation.html +share/gnome/help/libgda/C/providers.html +share/gnome/help/libgda/C/reports.html +share/gnome/help/libgda/C/topic.dat +share/gnome/help/libgda/pt_BR/architecture.html +share/gnome/help/libgda/pt_BR/c162.html +share/gnome/help/libgda/pt_BR/c182.html +share/gnome/help/libgda/pt_BR/c323.html +share/gnome/help/libgda/pt_BR/c350.html +share/gnome/help/libgda/pt_BR/clients-building-corba.html +share/gnome/help/libgda/pt_BR/clients-building.html +share/gnome/help/libgda/pt_BR/docbook.css +share/gnome/help/libgda/pt_BR/gda-client-batch.html +share/gnome/help/libgda/pt_BR/gda-client-meta.html +share/gnome/help/libgda/pt_BR/gda-client-objects.html +share/gnome/help/libgda/pt_BR/gda-client-types.html +share/gnome/help/libgda/pt_BR/gda-common-logs.html +share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html +share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html +share/gnome/help/libgda/pt_BR/index.html +share/gnome/help/libgda/pt_BR/installation-configuring.html +share/gnome/help/libgda/pt_BR/installation-installing.html +share/gnome/help/libgda/pt_BR/installation.html +share/gnome/help/libgda/pt_BR/introduction.html +share/gnome/help/libgda/pt_BR/libgda.html +share/gnome/help/libgda/pt_BR/ln38.html +share/gnome/help/libgda/pt_BR/providers-actual-implementation.html +share/gnome/help/libgda/pt_BR/providers-examples.html +share/gnome/help/libgda/pt_BR/providers-implementation.html +share/gnome/help/libgda/pt_BR/topic.dat +share/idl/GDA.idl +share/idl/GDA_Command.idl +share/idl/GDA_Connection.idl +share/idl/GDA_Error.idl +share/idl/GDA_Field.idl +share/idl/GDA_Parameter.idl +share/idl/GDA_Recordset.idl +@dirrm share/gnome/help/libgda/pt_BR/images +@dirrm share/gnome/help/libgda/pt_BR +@dirrm share/gnome/help/libgda/C/images +@dirrm share/gnome/help/libgda/C +@dirrm share/gnome/help/libgda +@dirrm share/gnome/gda/dtd +@dirrm share/gnome/gda +@dirrm share/gda/templates +@dirrm share/gda +@dirrm include/gda/gda++ +@dirrm include/gda diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile new file mode 100644 index 000000000000..9b0bc9d59d66 --- /dev/null +++ b/databases/libgda3/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: libgda +# Date created: 8th March 2001 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= libgda +PORTVERSION= 0.2.3 +CATEGORIES= databases gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/libgda + +MAINTAINER= ade@FreeBSD.org + +USE_GNOME= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +INSTALLS_SHLIB= yes + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + +.include <bsd.port.mk> diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo new file mode 100644 index 000000000000..802e4a484e63 --- /dev/null +++ b/databases/libgda3/distinfo @@ -0,0 +1 @@ +MD5 (libgda-0.2.3.tar.gz) = 8d1f1ea307ae4f680bcefedb433e0c34 diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa new file mode 100644 index 000000000000..370723ab829b --- /dev/null +++ b/databases/libgda3/files/patch-aa @@ -0,0 +1,7 @@ +--- Makefile.in.orig Wed Feb 14 18:40:55 2001 ++++ Makefile.in Thu Mar 8 17:10:44 2001 +@@ -138,3 +138,3 @@ + +-SUBDIRS = po macros doc idl lib bindings providers tools report testing ++SUBDIRS = po macros doc idl lib bindings providers tools report + diff --git a/databases/libgda3/pkg-comment b/databases/libgda3/pkg-comment new file mode 100644 index 000000000000..be18a121d7f0 --- /dev/null +++ b/databases/libgda3/pkg-comment @@ -0,0 +1 @@ +Provides uniform access to different kinds of data sources diff --git a/databases/libgda3/pkg-descr b/databases/libgda3/pkg-descr new file mode 100644 index 000000000000..7c5a50c3cffd --- /dev/null +++ b/databases/libgda3/pkg-descr @@ -0,0 +1,19 @@ +GNU Data Access (GDA) is an attempt to provide uniform access to +different kinds of data sources (databases, information servers, +mail spools, etc). + +It is a complete architecture that provides all you need to access +your data, defined by a set of CORBA interfaces as generic as possible +(but very powerful at the same time) so that any kind of data source +can be accessed through them. + +libgda is an interface to the GDA architecture, providing a nice +wrapper around the CORBA interfaces, for both the client and the server +parts. It also provides a bunch of tools to help you both in the +development and management of your data sources, all done through +the GDA model's set of CORBA interfaces. + +libgda was part of the GNOME-DB project, but has been separated from it +to allow non-GNOME applications to be developed based on it. + +WWW: http://www.gnome.org/projects/gnome-db/ diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist new file mode 100644 index 000000000000..e8f37837790f --- /dev/null +++ b/databases/libgda3/pkg-plist @@ -0,0 +1,132 @@ +bin/gda-buildclient +bin/gda-buildserver +bin/gda-config +bin/gda-report-server +bin/gda-run +include/gda/GDA.h +include/gda/gda++/gdaBatch.h +include/gda/gda++/gdaCommand.h +include/gda/gda++/gdaConnection.h +include/gda/gda++/gdaError.h +include/gda/gda++/gdaErrorList.h +include/gda/gda++/gdaField.h +include/gda/gda++/gdaIncludes.h +include/gda/gda++/gdaRecordset.h +include/gda/gda++/gdaValue.h +include/gda/gda-batch.h +include/gda/gda-client.h +include/gda/gda-command.h +include/gda/gda-common.h +include/gda/gda-config.h +include/gda/gda-connection-pool.h +include/gda/gda-connection.h +include/gda/gda-corba.h +include/gda/gda-error.h +include/gda/gda-field.h +include/gda/gda-log.h +include/gda/gda-recordset.h +include/gda/gda-report-client.h +include/gda/gda-report-defs.h +include/gda/gda-report-engine.h +include/gda/gda-report-stream.h +include/gda/gda-server-impl.h +include/gda/gda-server.h +include/gda/gda-thread.h +include/gda/gda-util.h +include/gda/gda-value.h +include/gda/gda-xml-database.h +include/gda/gda-xml-file.h +include/gda/gda-xml-query.h +lib/libgda-client.a +lib/libgda-client.so +lib/libgda-client.so.0 +lib/libgda-clientcpp.a +lib/libgda-clientcpp.so +lib/libgda-clientcpp.so.0 +lib/libgda-common.a +lib/libgda-common.so +lib/libgda-common.so.0 +lib/libgda-report.a +lib/libgda-report.so +lib/libgda-report.so.0 +lib/libgda-server.a +lib/libgda-server.so +lib/libgda-server.so.0 +share/gda/templates/gda-srv-command.c.tmpl +share/gda/templates/gda-srv-connection.c.tmpl +share/gda/templates/gda-srv-recordset.c.tmpl +share/gda/templates/gda-srv.h.tmpl +share/gda/templates/main-srv.c.tmpl +share/gnome/gda/dtd/gda-report.dtd +share/gnome/gda/dtd/gda-xml-query.dtd +share/gnome/help/libgda/C/architecture.html +share/gnome/help/libgda/C/clients-building-corba.html +share/gnome/help/libgda/C/clients-building.html +share/gnome/help/libgda/C/clients.html +share/gnome/help/libgda/C/docbook.css +share/gnome/help/libgda/C/gda-client-batch.html +share/gnome/help/libgda/C/gda-client-meta.html +share/gnome/help/libgda/C/gda-client-objects.html +share/gnome/help/libgda/C/gda-client-types.html +share/gnome/help/libgda/C/gda-client.html +share/gnome/help/libgda/C/gda-common-logs.html +share/gnome/help/libgda/C/gda-common-xml-databases.html +share/gnome/help/libgda/C/gda-common-xml-queries.html +share/gnome/help/libgda/C/gda-common.html +share/gnome/help/libgda/C/index.html +share/gnome/help/libgda/C/installation-configuring.html +share/gnome/help/libgda/C/installation-installing.html +share/gnome/help/libgda/C/installation.html +share/gnome/help/libgda/C/introduction.html +share/gnome/help/libgda/C/libgda.html +share/gnome/help/libgda/C/ln32.html +share/gnome/help/libgda/C/providers-actual-implementation.html +share/gnome/help/libgda/C/providers-examples.html +share/gnome/help/libgda/C/providers-implementation.html +share/gnome/help/libgda/C/providers.html +share/gnome/help/libgda/C/reports.html +share/gnome/help/libgda/C/topic.dat +share/gnome/help/libgda/pt_BR/architecture.html +share/gnome/help/libgda/pt_BR/c162.html +share/gnome/help/libgda/pt_BR/c182.html +share/gnome/help/libgda/pt_BR/c323.html +share/gnome/help/libgda/pt_BR/c350.html +share/gnome/help/libgda/pt_BR/clients-building-corba.html +share/gnome/help/libgda/pt_BR/clients-building.html +share/gnome/help/libgda/pt_BR/docbook.css +share/gnome/help/libgda/pt_BR/gda-client-batch.html +share/gnome/help/libgda/pt_BR/gda-client-meta.html +share/gnome/help/libgda/pt_BR/gda-client-objects.html +share/gnome/help/libgda/pt_BR/gda-client-types.html +share/gnome/help/libgda/pt_BR/gda-common-logs.html +share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html +share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html +share/gnome/help/libgda/pt_BR/index.html +share/gnome/help/libgda/pt_BR/installation-configuring.html +share/gnome/help/libgda/pt_BR/installation-installing.html +share/gnome/help/libgda/pt_BR/installation.html +share/gnome/help/libgda/pt_BR/introduction.html +share/gnome/help/libgda/pt_BR/libgda.html +share/gnome/help/libgda/pt_BR/ln38.html +share/gnome/help/libgda/pt_BR/providers-actual-implementation.html +share/gnome/help/libgda/pt_BR/providers-examples.html +share/gnome/help/libgda/pt_BR/providers-implementation.html +share/gnome/help/libgda/pt_BR/topic.dat +share/idl/GDA.idl +share/idl/GDA_Command.idl +share/idl/GDA_Connection.idl +share/idl/GDA_Error.idl +share/idl/GDA_Field.idl +share/idl/GDA_Parameter.idl +share/idl/GDA_Recordset.idl +@dirrm share/gnome/help/libgda/pt_BR/images +@dirrm share/gnome/help/libgda/pt_BR +@dirrm share/gnome/help/libgda/C/images +@dirrm share/gnome/help/libgda/C +@dirrm share/gnome/help/libgda +@dirrm share/gnome/gda/dtd +@dirrm share/gnome/gda +@dirrm share/gda/templates +@dirrm share/gda +@dirrm include/gda/gda++ +@dirrm include/gda diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 87c085df42bc..64eefe9b184e 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gob -PORTVERSION= 1.0.8 +PORTVERSION= 1.0.9 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.5z.com/pub/gob/ diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo index 363614ceb6b1..ca427d6454f0 100644 --- a/devel/gob2/distinfo +++ b/devel/gob2/distinfo @@ -1 +1 @@ -MD5 (gob-1.0.8.tar.gz) = b020e8df621fc90674c9c5c6332900e4 +MD5 (gob-1.0.9.tar.gz) = c32b6af9d6d3fe0f325a10bf369365dc diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index bb2f6572350b..679b96c6316c 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libole2 -PORTVERSION= 0.2.0 +PORTVERSION= 0.2.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/libole2 diff --git a/devel/libole2/distinfo b/devel/libole2/distinfo index 2e6415992a03..f54365c95d55 100644 --- a/devel/libole2/distinfo +++ b/devel/libole2/distinfo @@ -1 +1 @@ -MD5 (libole2-0.2.0.tar.gz) = d8a98c577026bdd172b107c19c23e4d2 +MD5 (libole2-0.2.1.tar.gz) = 425c3543b1cabd40951ecf7c70c3ed70 diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index 98461e9e4225..1b52e1633c99 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -11,6 +11,7 @@ PORTNAME= AbiWord PORTVERSION= 0.7.13 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ DISTNAME= abi-${PORTVERSION} @@ -24,7 +25,6 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png -# iconv.2:${PORTSDIR}/converters/iconv RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord diff --git a/editors/AbiWord/files/patch-avoid-gnomeole2 b/editors/AbiWord/files/patch-avoid-gnomeole2 new file mode 100644 index 000000000000..71406025f301 --- /dev/null +++ b/editors/AbiWord/files/patch-avoid-gnomeole2 @@ -0,0 +1,21 @@ +--- ../../wv/libole2/ms-ole-vba.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole-vba.c Thu Apr 19 20:35:07 2001 +@@ -14,3 +14,3 @@ + +-#include <libole2/ms-ole-vba.h> ++#include "ms-ole-vba.h" + +--- ../../wv/libole2/ms-ole-vba.h.orig Tue Jun 6 02:42:41 2000 ++++ ../../wv/libole2/ms-ole-vba.h Thu Apr 19 20:35:18 2001 +@@ -12,3 +12,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + +--- ../../wv/libole2/ms-ole.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole.c Thu Apr 19 20:35:32 2001 +@@ -38,3 +38,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 98461e9e4225..1b52e1633c99 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -11,6 +11,7 @@ PORTNAME= AbiWord PORTVERSION= 0.7.13 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ DISTNAME= abi-${PORTVERSION} @@ -24,7 +25,6 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png -# iconv.2:${PORTSDIR}/converters/iconv RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord diff --git a/editors/AbiWord2/files/patch-avoid-gnomeole2 b/editors/AbiWord2/files/patch-avoid-gnomeole2 new file mode 100644 index 000000000000..71406025f301 --- /dev/null +++ b/editors/AbiWord2/files/patch-avoid-gnomeole2 @@ -0,0 +1,21 @@ +--- ../../wv/libole2/ms-ole-vba.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole-vba.c Thu Apr 19 20:35:07 2001 +@@ -14,3 +14,3 @@ + +-#include <libole2/ms-ole-vba.h> ++#include "ms-ole-vba.h" + +--- ../../wv/libole2/ms-ole-vba.h.orig Tue Jun 6 02:42:41 2000 ++++ ../../wv/libole2/ms-ole-vba.h Thu Apr 19 20:35:18 2001 +@@ -12,3 +12,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + +--- ../../wv/libole2/ms-ole.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole.c Thu Apr 19 20:35:32 2001 +@@ -38,3 +38,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 98461e9e4225..1b52e1633c99 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -11,6 +11,7 @@ PORTNAME= AbiWord PORTVERSION= 0.7.13 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ DISTNAME= abi-${PORTVERSION} @@ -24,7 +25,6 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png -# iconv.2:${PORTSDIR}/converters/iconv RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord diff --git a/editors/abiword-devel/files/patch-avoid-gnomeole2 b/editors/abiword-devel/files/patch-avoid-gnomeole2 new file mode 100644 index 000000000000..71406025f301 --- /dev/null +++ b/editors/abiword-devel/files/patch-avoid-gnomeole2 @@ -0,0 +1,21 @@ +--- ../../wv/libole2/ms-ole-vba.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole-vba.c Thu Apr 19 20:35:07 2001 +@@ -14,3 +14,3 @@ + +-#include <libole2/ms-ole-vba.h> ++#include "ms-ole-vba.h" + +--- ../../wv/libole2/ms-ole-vba.h.orig Tue Jun 6 02:42:41 2000 ++++ ../../wv/libole2/ms-ole-vba.h Thu Apr 19 20:35:18 2001 +@@ -12,3 +12,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + +--- ../../wv/libole2/ms-ole.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole.c Thu Apr 19 20:35:32 2001 +@@ -38,3 +38,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 98461e9e4225..1b52e1633c99 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -11,6 +11,7 @@ PORTNAME= AbiWord PORTVERSION= 0.7.13 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ DISTNAME= abi-${PORTVERSION} @@ -24,7 +25,6 @@ MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png -# iconv.2:${PORTSDIR}/converters/iconv RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord diff --git a/editors/abiword/files/patch-avoid-gnomeole2 b/editors/abiword/files/patch-avoid-gnomeole2 new file mode 100644 index 000000000000..71406025f301 --- /dev/null +++ b/editors/abiword/files/patch-avoid-gnomeole2 @@ -0,0 +1,21 @@ +--- ../../wv/libole2/ms-ole-vba.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole-vba.c Thu Apr 19 20:35:07 2001 +@@ -14,3 +14,3 @@ + +-#include <libole2/ms-ole-vba.h> ++#include "ms-ole-vba.h" + +--- ../../wv/libole2/ms-ole-vba.h.orig Tue Jun 6 02:42:41 2000 ++++ ../../wv/libole2/ms-ole-vba.h Thu Apr 19 20:35:18 2001 +@@ -12,3 +12,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + +--- ../../wv/libole2/ms-ole.c.orig Thu Jan 25 10:52:17 2001 ++++ ../../wv/libole2/ms-ole.c Thu Apr 19 20:35:32 2001 +@@ -38,3 +38,3 @@ + +-#include <libole2/ms-ole.h> ++#include "ms-ole.h" + diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 790ccebe424a..05886d9a75e7 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -6,16 +6,13 @@ # PORTNAME= gedit -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.6 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gedit MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade - USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= yes diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index 8ff6e98d53c8..878143fd9a3f 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1 +1 @@ -MD5 (gedit-0.9.4.tar.gz) = 6e7eb64c6263422c5dafaeefaf43b38c +MD5 (gedit-0.9.6.tar.gz) = 6050a8d7288aef81727736e935f7fe6a diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index af35cd043499..cac481f4245d 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -19,10 +19,8 @@ share/gnome/gedit/glade/prefs.glade share/gnome/gedit/glade/program.glade share/gnome/gedit/glade/replace.glade share/gnome/gedit/glade/shell_output.glade -share/gnome/help/gedit/C/authors.html -share/gnome/help/gedit/C/bugs.html +share/gnome/gedit/glade/uri.glade share/gnome/help/gedit/C/docbook.css -share/gnome/help/gedit/C/faq.html share/gnome/help/gedit/C/images/browse.png share/gnome/help/gedit/C/images/convert.png share/gnome/help/gedit/C/images/diff.png @@ -44,11 +42,7 @@ share/gnome/help/gedit/C/images/replace.png share/gnome/help/gedit/C/images/shell.png share/gnome/help/gedit/C/images/toolbar.png share/gnome/help/gedit/C/index.html -share/gnome/help/gedit/C/license.html -share/gnome/help/gedit/C/ln10.html -share/gnome/help/gedit/C/menus.html share/gnome/help/gedit/C/plugins.html -share/gnome/help/gedit/C/prefs-0.html share/gnome/help/gedit/C/stylesheet-images/caution.gif share/gnome/help/gedit/C/stylesheet-images/home.gif share/gnome/help/gedit/C/stylesheet-images/important.gif @@ -63,10 +57,7 @@ share/gnome/help/gedit/C/stylesheet-images/up.gif share/gnome/help/gedit/C/stylesheet-images/warning.gif share/gnome/help/gedit/C/topic.dat share/gnome/help/gedit/C/usage.html -share/gnome/help/gedit/ja/authors.html -share/gnome/help/gedit/ja/bugs.html share/gnome/help/gedit/ja/docbook.css -share/gnome/help/gedit/ja/faq.html share/gnome/help/gedit/ja/images/browse.png share/gnome/help/gedit/ja/images/convert.png share/gnome/help/gedit/ja/images/diff.png @@ -88,11 +79,7 @@ share/gnome/help/gedit/ja/images/replace.png share/gnome/help/gedit/ja/images/shell.png share/gnome/help/gedit/ja/images/toolbar.png share/gnome/help/gedit/ja/index.html -share/gnome/help/gedit/ja/license.html -share/gnome/help/gedit/ja/ln13.html -share/gnome/help/gedit/ja/menus.html share/gnome/help/gedit/ja/plugins.html -share/gnome/help/gedit/ja/prefs-0.html share/gnome/help/gedit/ja/stylesheet-images/caution.gif share/gnome/help/gedit/ja/stylesheet-images/home.gif share/gnome/help/gedit/ja/stylesheet-images/important.gif @@ -110,6 +97,7 @@ share/gnome/help/gedit/ja/usage.html share/gnome/mime-info/gedit.keys share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png +share/locale/az/LC_MESSAGES/gedit.mo share/locale/ca/LC_MESSAGES/gedit.mo share/locale/cs/LC_MESSAGES/gedit.mo share/locale/da/LC_MESSAGES/gedit.mo diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index 790ccebe424a..05886d9a75e7 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,16 +6,13 @@ # PORTNAME= gedit -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.6 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gedit MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade - USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= yes diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo index 8ff6e98d53c8..878143fd9a3f 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1 +1 @@ -MD5 (gedit-0.9.4.tar.gz) = 6e7eb64c6263422c5dafaeefaf43b38c +MD5 (gedit-0.9.6.tar.gz) = 6050a8d7288aef81727736e935f7fe6a diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist index af35cd043499..cac481f4245d 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -19,10 +19,8 @@ share/gnome/gedit/glade/prefs.glade share/gnome/gedit/glade/program.glade share/gnome/gedit/glade/replace.glade share/gnome/gedit/glade/shell_output.glade -share/gnome/help/gedit/C/authors.html -share/gnome/help/gedit/C/bugs.html +share/gnome/gedit/glade/uri.glade share/gnome/help/gedit/C/docbook.css -share/gnome/help/gedit/C/faq.html share/gnome/help/gedit/C/images/browse.png share/gnome/help/gedit/C/images/convert.png share/gnome/help/gedit/C/images/diff.png @@ -44,11 +42,7 @@ share/gnome/help/gedit/C/images/replace.png share/gnome/help/gedit/C/images/shell.png share/gnome/help/gedit/C/images/toolbar.png share/gnome/help/gedit/C/index.html -share/gnome/help/gedit/C/license.html -share/gnome/help/gedit/C/ln10.html -share/gnome/help/gedit/C/menus.html share/gnome/help/gedit/C/plugins.html -share/gnome/help/gedit/C/prefs-0.html share/gnome/help/gedit/C/stylesheet-images/caution.gif share/gnome/help/gedit/C/stylesheet-images/home.gif share/gnome/help/gedit/C/stylesheet-images/important.gif @@ -63,10 +57,7 @@ share/gnome/help/gedit/C/stylesheet-images/up.gif share/gnome/help/gedit/C/stylesheet-images/warning.gif share/gnome/help/gedit/C/topic.dat share/gnome/help/gedit/C/usage.html -share/gnome/help/gedit/ja/authors.html -share/gnome/help/gedit/ja/bugs.html share/gnome/help/gedit/ja/docbook.css -share/gnome/help/gedit/ja/faq.html share/gnome/help/gedit/ja/images/browse.png share/gnome/help/gedit/ja/images/convert.png share/gnome/help/gedit/ja/images/diff.png @@ -88,11 +79,7 @@ share/gnome/help/gedit/ja/images/replace.png share/gnome/help/gedit/ja/images/shell.png share/gnome/help/gedit/ja/images/toolbar.png share/gnome/help/gedit/ja/index.html -share/gnome/help/gedit/ja/license.html -share/gnome/help/gedit/ja/ln13.html -share/gnome/help/gedit/ja/menus.html share/gnome/help/gedit/ja/plugins.html -share/gnome/help/gedit/ja/prefs-0.html share/gnome/help/gedit/ja/stylesheet-images/caution.gif share/gnome/help/gedit/ja/stylesheet-images/home.gif share/gnome/help/gedit/ja/stylesheet-images/important.gif @@ -110,6 +97,7 @@ share/gnome/help/gedit/ja/usage.html share/gnome/mime-info/gedit.keys share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png +share/locale/az/LC_MESSAGES/gedit.mo share/locale/ca/LC_MESSAGES/gedit.mo share/locale/cs/LC_MESSAGES/gedit.mo share/locale/da/LC_MESSAGES/gedit.mo diff --git a/games/atomix/Makefile b/games/atomix/Makefile index 3abba5fa2085..1d3cabae2271 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -6,7 +6,7 @@ # PORTNAME= atomix -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.3 CATEGORIES= games gnome MASTER_SITES= http://www.informatik.uni-oldenburg.de/~pearl/download/ diff --git a/games/atomix/distinfo b/games/atomix/distinfo index da69db69b4b2..d13577865e71 100644 --- a/games/atomix/distinfo +++ b/games/atomix/distinfo @@ -1 +1 @@ -MD5 (atomix-0.4.0.tar.gz) = 47035319996f4434658acd87dda99aa5 +MD5 (atomix-0.4.3.tar.gz) = 2df3cdb8d7712e595751cc0ef19fe4b8 diff --git a/games/atomix/pkg-plist b/games/atomix/pkg-plist index 43cae37452d6..c320c0c6b427 100644 --- a/games/atomix/pkg-plist +++ b/games/atomix/pkg-plist @@ -91,14 +91,19 @@ share/gnome/help/atomix/C/ln7.html share/gnome/help/atomix/C/menubar.html share/gnome/help/atomix/C/preferences.html share/gnome/help/atomixed/C/atomixed.html +share/gnome/help/atomixed/C/authors.html share/gnome/help/atomixed/C/docbook.css share/gnome/help/atomixed/C/images/ed_mainwin.png share/gnome/help/atomixed/C/images/ed_themeeditorwin.png share/gnome/help/atomixed/C/images/ed_themewin.png share/gnome/help/atomixed/C/leveleditor.html +share/gnome/help/atomixed/C/ln7.html +share/gnome/help/atomixed/C/menus.html share/gnome/help/atomixed/C/overview.html share/gnome/help/atomixed/C/themeeditor.html share/gnome/pixmaps/atomix/atomix-logo.png +share/locale/it/LC_MESSAGES/atomix.mo +share/locale/sv/LC_MESSAGES/atomix.mo @dirrm share/gnome/pixmaps/atomix @dirrm share/gnome/help/atomixed/C/images @dirrm share/gnome/help/atomixed/C diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 9bc220594bb9..1596942d1222 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -7,15 +7,13 @@ PORTNAME= dia PORTVERSION= 0.86 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/dia MAINTAINER= saper@system.pl -LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml \ - popt.0:${PORTSDIR}/devel/popt - USE_X_PREFIX= yes USE_GMAKE= yes USE_IMLIB= yes diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 4ca742492b49..0ef213511a8c 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -7,16 +7,13 @@ PORTNAME= eog PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/eog MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \ - bonobo.2:${PORTSDIR}/devel/bonobo \ - gconf-1.1:${PORTSDIR}/devel/gconf - USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= yes diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 4ca742492b49..0ef213511a8c 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -7,16 +7,13 @@ PORTNAME= eog PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/eog MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \ - bonobo.2:${PORTSDIR}/devel/bonobo \ - gconf-1.1:${PORTSDIR}/devel/gconf - USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= yes diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index f0f9577f3bed..89b53b82db62 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -7,17 +7,14 @@ PORTNAME= sodipodi PORTVERSION= 0.22 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade \ - gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - bonobo.2:${PORTSDIR}/devel/bonobo \ - gal.4:${PORTSDIR}/x11-toolkits/gal \ - unicode.0:${PORTSDIR}/devel/libunicode +LIB_DEPENDS= gal.6:${PORTSDIR}/x11-toolkits/gal USE_GMAKE= yes USE_X_PREFIX= yes diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile index 5603134b79d0..e3cc8c3fb5cc 100644 --- a/lang/gnomebasic/Makefile +++ b/lang/gnomebasic/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomebasic -PORTVERSION= 0.0.17 +PORTVERSION= 0.0.18 CATEGORIES= lang gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gb diff --git a/lang/gnomebasic/distinfo b/lang/gnomebasic/distinfo index 59927344718b..533c392ab072 100644 --- a/lang/gnomebasic/distinfo +++ b/lang/gnomebasic/distinfo @@ -1 +1 @@ -MD5 (gb-0.0.17.tar.gz) = 3cd9606630275cf9b5571afcc4423c91 +MD5 (gb-0.0.18.tar.gz) = a23c4ee3d79a8cc454390ed429f78a24 diff --git a/lang/gnomebasic/files/patch-aa b/lang/gnomebasic/files/patch-aa index 109189f3414f..d18a12476c08 100644 --- a/lang/gnomebasic/files/patch-aa +++ b/lang/gnomebasic/files/patch-aa @@ -1,6 +1,11 @@ ---- configure.orig Sat Oct 21 13:51:21 2000 -+++ configure Sat Oct 21 17:27:33 2000 -@@ -3182,5 +3182,5 @@ +--- configure.orig Tue Mar 13 05:50:33 2001 ++++ configure Wed Mar 28 13:59:56 2001 +@@ -3010,3 +3010,3 @@ + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi +@@ -4704,5 +4704,5 @@ -GMODULE_CFLAGS=`glib-config --cflags gmodule` +GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule` @@ -8,14 +13,14 @@ -GMODULE_LIBS=`glib-config --libs gmodule` +GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule` -@@ -3435,4 +3435,4 @@ - echo "configure:3436: checking for GTK >= 1.2.2" >&5 +@@ -4957,4 +4957,4 @@ + echo "configure:4958: checking for GTK >= 1.2.2" >&5 -if gtk-config --version > /dev/null 2>&1; then - vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if $GTK_CONFIG --version > /dev/null 2>&1; then + vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` if test "$vers" -ge 1002002; then -@@ -4046,4 +4046,4 @@ +@@ -5629,4 +5629,4 @@ GB_INCLUDEDIR='-I${includedir}' -GB_INCLUDEDIR="$GB_INCLUDEDIR `glib-config --cflags glib`" -GB_LIBS="-lgb `glib-config --libs glib`" diff --git a/lang/gnomebasic/pkg-plist b/lang/gnomebasic/pkg-plist index 242565b3054c..90908abac3e9 100644 --- a/lang/gnomebasic/pkg-plist +++ b/lang/gnomebasic/pkg-plist @@ -1,5 +1,6 @@ bin/gb etc/gbConf.sh +include/gb/gb-class.h include/gb/gb-constants.h include/gb/gb-eval.h include/gb/gb-expr.h @@ -30,6 +31,16 @@ lib/libgb.so.0 lib/libgbrun.a lib/libgbrun.so lib/libgbrun.so.0 +share/locale/az/LC_MESSAGES/gb.mo +share/locale/da/LC_MESSAGES/gb.mo +share/locale/el/LC_MESSAGES/gb.mo +share/locale/fr/LC_MESSAGES/gb.mo +share/locale/no/LC_MESSAGES/gb.mo +share/locale/ru/LC_MESSAGES/gb.mo +share/locale/sk/LC_MESSAGES/gb.mo +share/locale/sv/LC_MESSAGES/gb.mo +share/locale/tr/LC_MESSAGES/gb.mo +share/locale/uk/LC_MESSAGES/gb.mo @dirrm include/gbrun/objects @dirrm include/gbrun @dirrm include/gb diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index d43debd5d1e5..8f33cb3ff6ea 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -6,18 +6,18 @@ # PORTNAME= gnumeric -PORTVERSION= 0.61 +PORTVERSION= 0.64 CATEGORIES?= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric MAINTAINER?= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade \ - guile.9:${PORTSDIR}/lang/guile \ +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal \ + gb.0:${PORTSDIR}/lang/gnomebasic \ + gda-common.0:${PORTSDIR}/databases/libgda USE_X_PREFIX= yes USE_PERL5= yes @@ -26,7 +26,7 @@ USE_GNOME= yes USE_PYTHON= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-guile --without-bonobo --without-gb +CONFIGURE_ARGS= --without-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index aa83814e1cc8..58f0661a5ddb 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.61.tar.gz) = 3a40015a74a10a75e3290a86fc9f7f0c +MD5 (gnumeric-0.64.tar.gz) = 49673e41e314dacc54ea5aa74c0792ea diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index cdbc964c7b35..1cd62fd3a186 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -1,22 +1,65 @@ bin/gnumeric etc/CORBA/servers/gnumeric.gnorba etc/gnumericConf.sh -lib/gnumeric/%%VERSION%%/plugins/gnum_dif.so -lib/gnumeric/%%VERSION%%/plugins/gnum_guile.so -lib/gnumeric/%%VERSION%%/plugins/gnum_html.so -lib/gnumeric/%%VERSION%%/plugins/gnum_lotus.so -lib/gnumeric/%%VERSION%%/plugins/gnum_numtheory.so -lib/gnumeric/%%VERSION%%/plugins/gnum_oleo.so -lib/gnumeric/%%VERSION%%/plugins/gnum_sc.so -lib/gnumeric/%%VERSION%%/plugins/gnum_sylk.so -lib/gnumeric/%%VERSION%%/plugins/gnum_xbase.so -lib/gnumeric/%%VERSION%%/plugins/gnum_applix.so -lib/gnumeric/%%VERSION%%/plugins/gnum_xml2.so +lib/gnumeric/%%VERSION%%/plugins/applix/applix.so +lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/dif/dif.so +lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gb/gnum_gb.so +lib/gnumeric/%%VERSION%%/plugins/gb/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so +lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/html/html.so +lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so +lib/gnumeric/%%VERSION%%/plugins/lotus/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/numtheory/numtheory.so +lib/gnumeric/%%VERSION%%/plugins/numtheory/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so +lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sc/sc.so +lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so +lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so +lib/gnumeric/%%VERSION%%/plugins/xml2/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/xml2/xml2.so share/gnome/apps/Applications/gnumeric.desktop +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade share/gnome/gnumeric/%%VERSION%%/glade/analysis-tools.glade share/gnome/gnumeric/%%VERSION%%/glade/autocorrect-exceptions.glade share/gnome/gnumeric/%%VERSION%%/glade/autocorrect.glade +share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade share/gnome/gnumeric/%%VERSION%%/glade/autosave-prompt.glade share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade @@ -29,6 +72,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade +share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade share/gnome/gnumeric/%%VERSION%%/glade/import.glade share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade @@ -36,41 +80,14 @@ share/gnome/gnumeric/%%VERSION%%/glade/names.glade share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade share/gnome/gnumeric/%%VERSION%%/glade/print.glade share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade +share/gnome/gnumeric/%%VERSION%%/glade/search-replace.glade share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade share/gnome/gnumeric/%%VERSION%%/glade/sheet-rename.glade share/gnome/gnumeric/%%VERSION%%/glade/solver-options.glade share/gnome/gnumeric/%%VERSION%%/glade/solver.glade share/gnome/gnumeric/%%VERSION%%/glade/summary.glade +share/gnome/gnumeric/%%VERSION%%/glade/validate.glade share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade -share/gnome/gnumeric/%%VERSION%%/guile/functions.scm -share/gnome/gnumeric/%%VERSION%%/guile/gnumeric_startup.scm -share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py -share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.3D.button.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.3D.list.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.cool.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.simple.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.trendy.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.banana.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.black.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.blue.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.orange.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.vanilla.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.desert.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.ice.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.modern.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.purple.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.advanced.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.empty.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.table.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.green.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.lila.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.simple.xml -share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade -share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade share/gnome/gnumeric/%%VERSION%%/idl/Gnumeric.idl share/gnome/gnumeric/%%VERSION%%/idl/gnumeric-graphs.idl share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric @@ -218,347 +235,347 @@ share/gnome/help/gnumeric/C/number-formatting-overview.html share/gnome/help/gnumeric/C/print-preview.html share/gnome/help/gnumeric/C/print-setup.html share/gnome/help/gnumeric/C/printing.html -share/gnome/help/gnumeric/C/r10014.html -share/gnome/help/gnumeric/C/r10038.html -share/gnome/help/gnumeric/C/r10066.html -share/gnome/help/gnumeric/C/r10086.html -share/gnome/help/gnumeric/C/r10109.html -share/gnome/help/gnumeric/C/r10133.html -share/gnome/help/gnumeric/C/r10161.html -share/gnome/help/gnumeric/C/r10182.html -share/gnome/help/gnumeric/C/r10202.html -share/gnome/help/gnumeric/C/r10229.html -share/gnome/help/gnumeric/C/r10269.html -share/gnome/help/gnumeric/C/r10294.html -share/gnome/help/gnumeric/C/r10323.html -share/gnome/help/gnumeric/C/r10345.html -share/gnome/help/gnumeric/C/r10368.html -share/gnome/help/gnumeric/C/r10395.html -share/gnome/help/gnumeric/C/r10421.html -share/gnome/help/gnumeric/C/r10449.html -share/gnome/help/gnumeric/C/r10469.html -share/gnome/help/gnumeric/C/r10494.html -share/gnome/help/gnumeric/C/r10517.html -share/gnome/help/gnumeric/C/r10541.html -share/gnome/help/gnumeric/C/r10567.html -share/gnome/help/gnumeric/C/r10589.html -share/gnome/help/gnumeric/C/r10613.html -share/gnome/help/gnumeric/C/r10639.html -share/gnome/help/gnumeric/C/r10661.html -share/gnome/help/gnumeric/C/r10686.html -share/gnome/help/gnumeric/C/r10709.html -share/gnome/help/gnumeric/C/r10731.html -share/gnome/help/gnumeric/C/r10760.html -share/gnome/help/gnumeric/C/r10781.html -share/gnome/help/gnumeric/C/r10804.html -share/gnome/help/gnumeric/C/r10826.html -share/gnome/help/gnumeric/C/r10853.html -share/gnome/help/gnumeric/C/r10873.html -share/gnome/help/gnumeric/C/r10899.html -share/gnome/help/gnumeric/C/r10922.html -share/gnome/help/gnumeric/C/r10947.html -share/gnome/help/gnumeric/C/r10970.html -share/gnome/help/gnumeric/C/r10991.html -share/gnome/help/gnumeric/C/r11016.html -share/gnome/help/gnumeric/C/r11040.html -share/gnome/help/gnumeric/C/r11062.html -share/gnome/help/gnumeric/C/r11082.html -share/gnome/help/gnumeric/C/r11102.html -share/gnome/help/gnumeric/C/r11126.html -share/gnome/help/gnumeric/C/r2690.html -share/gnome/help/gnumeric/C/r2714.html -share/gnome/help/gnumeric/C/r2743.html -share/gnome/help/gnumeric/C/r2764.html -share/gnome/help/gnumeric/C/r2788.html -share/gnome/help/gnumeric/C/r2818.html -share/gnome/help/gnumeric/C/r2838.html -share/gnome/help/gnumeric/C/r2860.html -share/gnome/help/gnumeric/C/r2883.html -share/gnome/help/gnumeric/C/r2911.html -share/gnome/help/gnumeric/C/r2932.html -share/gnome/help/gnumeric/C/r2962.html -share/gnome/help/gnumeric/C/r2982.html -share/gnome/help/gnumeric/C/r3006.html -share/gnome/help/gnumeric/C/r3028.html -share/gnome/help/gnumeric/C/r3067.html -share/gnome/help/gnumeric/C/r3090.html -share/gnome/help/gnumeric/C/r3111.html -share/gnome/help/gnumeric/C/r3141.html -share/gnome/help/gnumeric/C/r3181.html -share/gnome/help/gnumeric/C/r3204.html -share/gnome/help/gnumeric/C/r3228.html -share/gnome/help/gnumeric/C/r3252.html -share/gnome/help/gnumeric/C/r3277.html -share/gnome/help/gnumeric/C/r3301.html -share/gnome/help/gnumeric/C/r3324.html -share/gnome/help/gnumeric/C/r3346.html -share/gnome/help/gnumeric/C/r3369.html -share/gnome/help/gnumeric/C/r3398.html -share/gnome/help/gnumeric/C/r3422.html -share/gnome/help/gnumeric/C/r3449.html -share/gnome/help/gnumeric/C/r3473.html -share/gnome/help/gnumeric/C/r3498.html -share/gnome/help/gnumeric/C/r3520.html -share/gnome/help/gnumeric/C/r3547.html -share/gnome/help/gnumeric/C/r3571.html -share/gnome/help/gnumeric/C/r3591.html -share/gnome/help/gnumeric/C/r3613.html -share/gnome/help/gnumeric/C/r3637.html -share/gnome/help/gnumeric/C/r3662.html -share/gnome/help/gnumeric/C/r3685.html -share/gnome/help/gnumeric/C/r3713.html -share/gnome/help/gnumeric/C/r3736.html -share/gnome/help/gnumeric/C/r3756.html -share/gnome/help/gnumeric/C/r3778.html -share/gnome/help/gnumeric/C/r3805.html -share/gnome/help/gnumeric/C/r3828.html -share/gnome/help/gnumeric/C/r3848.html -share/gnome/help/gnumeric/C/r3959.html -share/gnome/help/gnumeric/C/r3984.html -share/gnome/help/gnumeric/C/r4008.html -share/gnome/help/gnumeric/C/r4031.html -share/gnome/help/gnumeric/C/r4060.html -share/gnome/help/gnumeric/C/r4083.html -share/gnome/help/gnumeric/C/r4106.html -share/gnome/help/gnumeric/C/r4133.html -share/gnome/help/gnumeric/C/r4154.html -share/gnome/help/gnumeric/C/r4178.html -share/gnome/help/gnumeric/C/r4207.html -share/gnome/help/gnumeric/C/r4228.html -share/gnome/help/gnumeric/C/r4251.html -share/gnome/help/gnumeric/C/r4273.html -share/gnome/help/gnumeric/C/r4294.html -share/gnome/help/gnumeric/C/r4317.html -share/gnome/help/gnumeric/C/r4337.html -share/gnome/help/gnumeric/C/r4362.html -share/gnome/help/gnumeric/C/r4385.html -share/gnome/help/gnumeric/C/r4409.html -share/gnome/help/gnumeric/C/r4432.html -share/gnome/help/gnumeric/C/r4452.html -share/gnome/help/gnumeric/C/r4475.html -share/gnome/help/gnumeric/C/r4503.html -share/gnome/help/gnumeric/C/r4527.html -share/gnome/help/gnumeric/C/r4547.html -share/gnome/help/gnumeric/C/r4570.html -share/gnome/help/gnumeric/C/r4596.html -share/gnome/help/gnumeric/C/r4621.html -share/gnome/help/gnumeric/C/r4650.html -share/gnome/help/gnumeric/C/r4673.html -share/gnome/help/gnumeric/C/r4700.html -share/gnome/help/gnumeric/C/r4727.html -share/gnome/help/gnumeric/C/r4749.html -share/gnome/help/gnumeric/C/r4771.html -share/gnome/help/gnumeric/C/r4795.html -share/gnome/help/gnumeric/C/r4820.html -share/gnome/help/gnumeric/C/r4843.html -share/gnome/help/gnumeric/C/r4866.html -share/gnome/help/gnumeric/C/r4888.html -share/gnome/help/gnumeric/C/r4913.html -share/gnome/help/gnumeric/C/r4937.html -share/gnome/help/gnumeric/C/r4961.html -share/gnome/help/gnumeric/C/r5002.html -share/gnome/help/gnumeric/C/r5024.html -share/gnome/help/gnumeric/C/r5045.html -share/gnome/help/gnumeric/C/r5066.html -share/gnome/help/gnumeric/C/r5090.html -share/gnome/help/gnumeric/C/r5116.html -share/gnome/help/gnumeric/C/r5136.html -share/gnome/help/gnumeric/C/r5160.html -share/gnome/help/gnumeric/C/r5182.html -share/gnome/help/gnumeric/C/r5204.html -share/gnome/help/gnumeric/C/r5227.html -share/gnome/help/gnumeric/C/r5252.html -share/gnome/help/gnumeric/C/r5279.html -share/gnome/help/gnumeric/C/r5300.html -share/gnome/help/gnumeric/C/r5322.html -share/gnome/help/gnumeric/C/r5345.html -share/gnome/help/gnumeric/C/r5369.html -share/gnome/help/gnumeric/C/r5410.html -share/gnome/help/gnumeric/C/r5430.html -share/gnome/help/gnumeric/C/r5458.html -share/gnome/help/gnumeric/C/r5482.html -share/gnome/help/gnumeric/C/r5506.html -share/gnome/help/gnumeric/C/r5533.html -share/gnome/help/gnumeric/C/r5558.html -share/gnome/help/gnumeric/C/r5578.html -share/gnome/help/gnumeric/C/r5598.html -share/gnome/help/gnumeric/C/r5622.html -share/gnome/help/gnumeric/C/r5647.html -share/gnome/help/gnumeric/C/r5671.html -share/gnome/help/gnumeric/C/r5696.html -share/gnome/help/gnumeric/C/r5720.html -share/gnome/help/gnumeric/C/r5748.html -share/gnome/help/gnumeric/C/r5771.html -share/gnome/help/gnumeric/C/r5798.html -share/gnome/help/gnumeric/C/r5822.html -share/gnome/help/gnumeric/C/r5842.html -share/gnome/help/gnumeric/C/r5865.html -share/gnome/help/gnumeric/C/r5889.html -share/gnome/help/gnumeric/C/r5929.html -share/gnome/help/gnumeric/C/r5952.html -share/gnome/help/gnumeric/C/r5975.html -share/gnome/help/gnumeric/C/r6000.html -share/gnome/help/gnumeric/C/r6025.html -share/gnome/help/gnumeric/C/r6048.html -share/gnome/help/gnumeric/C/r6071.html -share/gnome/help/gnumeric/C/r6094.html -share/gnome/help/gnumeric/C/r6122.html -share/gnome/help/gnumeric/C/r6142.html -share/gnome/help/gnumeric/C/r6165.html -share/gnome/help/gnumeric/C/r6187.html -share/gnome/help/gnumeric/C/r6227.html -share/gnome/help/gnumeric/C/r6252.html -share/gnome/help/gnumeric/C/r6274.html -share/gnome/help/gnumeric/C/r6295.html -share/gnome/help/gnumeric/C/r6320.html -share/gnome/help/gnumeric/C/r6342.html -share/gnome/help/gnumeric/C/r6371.html -share/gnome/help/gnumeric/C/r6395.html -share/gnome/help/gnumeric/C/r6420.html -share/gnome/help/gnumeric/C/r6444.html -share/gnome/help/gnumeric/C/r6471.html -share/gnome/help/gnumeric/C/r6493.html -share/gnome/help/gnumeric/C/r6515.html -share/gnome/help/gnumeric/C/r6541.html -share/gnome/help/gnumeric/C/r6565.html -share/gnome/help/gnumeric/C/r6585.html -share/gnome/help/gnumeric/C/r6612.html -share/gnome/help/gnumeric/C/r6637.html -share/gnome/help/gnumeric/C/r6661.html -share/gnome/help/gnumeric/C/r6684.html -share/gnome/help/gnumeric/C/r6709.html -share/gnome/help/gnumeric/C/r6731.html -share/gnome/help/gnumeric/C/r6754.html -share/gnome/help/gnumeric/C/r6776.html -share/gnome/help/gnumeric/C/r6818.html -share/gnome/help/gnumeric/C/r6841.html -share/gnome/help/gnumeric/C/r6864.html -share/gnome/help/gnumeric/C/r6885.html -share/gnome/help/gnumeric/C/r6917.html -share/gnome/help/gnumeric/C/r6942.html -share/gnome/help/gnumeric/C/r6967.html -share/gnome/help/gnumeric/C/r6987.html -share/gnome/help/gnumeric/C/r7010.html -share/gnome/help/gnumeric/C/r7035.html -share/gnome/help/gnumeric/C/r7059.html -share/gnome/help/gnumeric/C/r7080.html -share/gnome/help/gnumeric/C/r7103.html -share/gnome/help/gnumeric/C/r7128.html -share/gnome/help/gnumeric/C/r7151.html -share/gnome/help/gnumeric/C/r7180.html -share/gnome/help/gnumeric/C/r7204.html -share/gnome/help/gnumeric/C/r7226.html -share/gnome/help/gnumeric/C/r7253.html -share/gnome/help/gnumeric/C/r7275.html -share/gnome/help/gnumeric/C/r7302.html -share/gnome/help/gnumeric/C/r7322.html -share/gnome/help/gnumeric/C/r7348.html -share/gnome/help/gnumeric/C/r7373.html -share/gnome/help/gnumeric/C/r7398.html -share/gnome/help/gnumeric/C/r7422.html -share/gnome/help/gnumeric/C/r7449.html -share/gnome/help/gnumeric/C/r7489.html -share/gnome/help/gnumeric/C/r7515.html -share/gnome/help/gnumeric/C/r7538.html -share/gnome/help/gnumeric/C/r7560.html -share/gnome/help/gnumeric/C/r7583.html -share/gnome/help/gnumeric/C/r7605.html -share/gnome/help/gnumeric/C/r7625.html -share/gnome/help/gnumeric/C/r7650.html -share/gnome/help/gnumeric/C/r7672.html -share/gnome/help/gnumeric/C/r7698.html -share/gnome/help/gnumeric/C/r7721.html -share/gnome/help/gnumeric/C/r7746.html -share/gnome/help/gnumeric/C/r7774.html -share/gnome/help/gnumeric/C/r7804.html -share/gnome/help/gnumeric/C/r7828.html -share/gnome/help/gnumeric/C/r7854.html -share/gnome/help/gnumeric/C/r7874.html -share/gnome/help/gnumeric/C/r7910.html -share/gnome/help/gnumeric/C/r7927.html -share/gnome/help/gnumeric/C/r7949.html -share/gnome/help/gnumeric/C/r7974.html -share/gnome/help/gnumeric/C/r7999.html -share/gnome/help/gnumeric/C/r8023.html -share/gnome/help/gnumeric/C/r8046.html -share/gnome/help/gnumeric/C/r8069.html -share/gnome/help/gnumeric/C/r8092.html -share/gnome/help/gnumeric/C/r8125.html -share/gnome/help/gnumeric/C/r8147.html -share/gnome/help/gnumeric/C/r8174.html -share/gnome/help/gnumeric/C/r8194.html -share/gnome/help/gnumeric/C/r8234.html -share/gnome/help/gnumeric/C/r8257.html -share/gnome/help/gnumeric/C/r8280.html -share/gnome/help/gnumeric/C/r8303.html -share/gnome/help/gnumeric/C/r8327.html -share/gnome/help/gnumeric/C/r8351.html -share/gnome/help/gnumeric/C/r8377.html -share/gnome/help/gnumeric/C/r8399.html -share/gnome/help/gnumeric/C/r8423.html -share/gnome/help/gnumeric/C/r8451.html -share/gnome/help/gnumeric/C/r8474.html -share/gnome/help/gnumeric/C/r8494.html -share/gnome/help/gnumeric/C/r8516.html -share/gnome/help/gnumeric/C/r8543.html -share/gnome/help/gnumeric/C/r8566.html -share/gnome/help/gnumeric/C/r8588.html -share/gnome/help/gnumeric/C/r8612.html -share/gnome/help/gnumeric/C/r8645.html -share/gnome/help/gnumeric/C/r8673.html -share/gnome/help/gnumeric/C/r8697.html -share/gnome/help/gnumeric/C/r8719.html -share/gnome/help/gnumeric/C/r8747.html -share/gnome/help/gnumeric/C/r8773.html -share/gnome/help/gnumeric/C/r8796.html -share/gnome/help/gnumeric/C/r8819.html -share/gnome/help/gnumeric/C/r8847.html -share/gnome/help/gnumeric/C/r8871.html -share/gnome/help/gnumeric/C/r8896.html -share/gnome/help/gnumeric/C/r8924.html -share/gnome/help/gnumeric/C/r8951.html -share/gnome/help/gnumeric/C/r8969.html -share/gnome/help/gnumeric/C/r8993.html -share/gnome/help/gnumeric/C/r9021.html -share/gnome/help/gnumeric/C/r9049.html -share/gnome/help/gnumeric/C/r9072.html -share/gnome/help/gnumeric/C/r9094.html -share/gnome/help/gnumeric/C/r9117.html -share/gnome/help/gnumeric/C/r9137.html -share/gnome/help/gnumeric/C/r9165.html -share/gnome/help/gnumeric/C/r9186.html -share/gnome/help/gnumeric/C/r9209.html -share/gnome/help/gnumeric/C/r9233.html -share/gnome/help/gnumeric/C/r9257.html -share/gnome/help/gnumeric/C/r9285.html -share/gnome/help/gnumeric/C/r9308.html -share/gnome/help/gnumeric/C/r9337.html -share/gnome/help/gnumeric/C/r9359.html -share/gnome/help/gnumeric/C/r9383.html -share/gnome/help/gnumeric/C/r9404.html -share/gnome/help/gnumeric/C/r9428.html -share/gnome/help/gnumeric/C/r9451.html -share/gnome/help/gnumeric/C/r9476.html -share/gnome/help/gnumeric/C/r9499.html -share/gnome/help/gnumeric/C/r9519.html -share/gnome/help/gnumeric/C/r9540.html -share/gnome/help/gnumeric/C/r9565.html -share/gnome/help/gnumeric/C/r9594.html -share/gnome/help/gnumeric/C/r9619.html -share/gnome/help/gnumeric/C/r9639.html -share/gnome/help/gnumeric/C/r9659.html -share/gnome/help/gnumeric/C/r9681.html -share/gnome/help/gnumeric/C/r9703.html -share/gnome/help/gnumeric/C/r9727.html -share/gnome/help/gnumeric/C/r9753.html -share/gnome/help/gnumeric/C/r9774.html -share/gnome/help/gnumeric/C/r9815.html -share/gnome/help/gnumeric/C/r9843.html -share/gnome/help/gnumeric/C/r9863.html -share/gnome/help/gnumeric/C/r9903.html -share/gnome/help/gnumeric/C/r9924.html -share/gnome/help/gnumeric/C/r9947.html -share/gnome/help/gnumeric/C/r9988.html +share/gnome/help/gnumeric/C/r10002.html +share/gnome/help/gnumeric/C/r10028.html +share/gnome/help/gnumeric/C/r10052.html +share/gnome/help/gnumeric/C/r10080.html +share/gnome/help/gnumeric/C/r10100.html +share/gnome/help/gnumeric/C/r10123.html +share/gnome/help/gnumeric/C/r10147.html +share/gnome/help/gnumeric/C/r10175.html +share/gnome/help/gnumeric/C/r10196.html +share/gnome/help/gnumeric/C/r10216.html +share/gnome/help/gnumeric/C/r10243.html +share/gnome/help/gnumeric/C/r10283.html +share/gnome/help/gnumeric/C/r10308.html +share/gnome/help/gnumeric/C/r10337.html +share/gnome/help/gnumeric/C/r10359.html +share/gnome/help/gnumeric/C/r10382.html +share/gnome/help/gnumeric/C/r10409.html +share/gnome/help/gnumeric/C/r10435.html +share/gnome/help/gnumeric/C/r10463.html +share/gnome/help/gnumeric/C/r10483.html +share/gnome/help/gnumeric/C/r10508.html +share/gnome/help/gnumeric/C/r10531.html +share/gnome/help/gnumeric/C/r10555.html +share/gnome/help/gnumeric/C/r10581.html +share/gnome/help/gnumeric/C/r10603.html +share/gnome/help/gnumeric/C/r10627.html +share/gnome/help/gnumeric/C/r10653.html +share/gnome/help/gnumeric/C/r10675.html +share/gnome/help/gnumeric/C/r10700.html +share/gnome/help/gnumeric/C/r10723.html +share/gnome/help/gnumeric/C/r10745.html +share/gnome/help/gnumeric/C/r10774.html +share/gnome/help/gnumeric/C/r10795.html +share/gnome/help/gnumeric/C/r10818.html +share/gnome/help/gnumeric/C/r10840.html +share/gnome/help/gnumeric/C/r10867.html +share/gnome/help/gnumeric/C/r10887.html +share/gnome/help/gnumeric/C/r10913.html +share/gnome/help/gnumeric/C/r10936.html +share/gnome/help/gnumeric/C/r10961.html +share/gnome/help/gnumeric/C/r10984.html +share/gnome/help/gnumeric/C/r11005.html +share/gnome/help/gnumeric/C/r11030.html +share/gnome/help/gnumeric/C/r11054.html +share/gnome/help/gnumeric/C/r11076.html +share/gnome/help/gnumeric/C/r11096.html +share/gnome/help/gnumeric/C/r11116.html +share/gnome/help/gnumeric/C/r11141.html +share/gnome/help/gnumeric/C/r2697.html +share/gnome/help/gnumeric/C/r2721.html +share/gnome/help/gnumeric/C/r2750.html +share/gnome/help/gnumeric/C/r2771.html +share/gnome/help/gnumeric/C/r2795.html +share/gnome/help/gnumeric/C/r2825.html +share/gnome/help/gnumeric/C/r2845.html +share/gnome/help/gnumeric/C/r2867.html +share/gnome/help/gnumeric/C/r2890.html +share/gnome/help/gnumeric/C/r2918.html +share/gnome/help/gnumeric/C/r2939.html +share/gnome/help/gnumeric/C/r2969.html +share/gnome/help/gnumeric/C/r2989.html +share/gnome/help/gnumeric/C/r3013.html +share/gnome/help/gnumeric/C/r3035.html +share/gnome/help/gnumeric/C/r3074.html +share/gnome/help/gnumeric/C/r3097.html +share/gnome/help/gnumeric/C/r3118.html +share/gnome/help/gnumeric/C/r3148.html +share/gnome/help/gnumeric/C/r3188.html +share/gnome/help/gnumeric/C/r3211.html +share/gnome/help/gnumeric/C/r3235.html +share/gnome/help/gnumeric/C/r3259.html +share/gnome/help/gnumeric/C/r3289.html +share/gnome/help/gnumeric/C/r3313.html +share/gnome/help/gnumeric/C/r3336.html +share/gnome/help/gnumeric/C/r3358.html +share/gnome/help/gnumeric/C/r3381.html +share/gnome/help/gnumeric/C/r3410.html +share/gnome/help/gnumeric/C/r3434.html +share/gnome/help/gnumeric/C/r3461.html +share/gnome/help/gnumeric/C/r3485.html +share/gnome/help/gnumeric/C/r3510.html +share/gnome/help/gnumeric/C/r3532.html +share/gnome/help/gnumeric/C/r3559.html +share/gnome/help/gnumeric/C/r3583.html +share/gnome/help/gnumeric/C/r3603.html +share/gnome/help/gnumeric/C/r3625.html +share/gnome/help/gnumeric/C/r3649.html +share/gnome/help/gnumeric/C/r3674.html +share/gnome/help/gnumeric/C/r3697.html +share/gnome/help/gnumeric/C/r3725.html +share/gnome/help/gnumeric/C/r3748.html +share/gnome/help/gnumeric/C/r3768.html +share/gnome/help/gnumeric/C/r3790.html +share/gnome/help/gnumeric/C/r3817.html +share/gnome/help/gnumeric/C/r3840.html +share/gnome/help/gnumeric/C/r3860.html +share/gnome/help/gnumeric/C/r3971.html +share/gnome/help/gnumeric/C/r3996.html +share/gnome/help/gnumeric/C/r4020.html +share/gnome/help/gnumeric/C/r4043.html +share/gnome/help/gnumeric/C/r4072.html +share/gnome/help/gnumeric/C/r4095.html +share/gnome/help/gnumeric/C/r4118.html +share/gnome/help/gnumeric/C/r4145.html +share/gnome/help/gnumeric/C/r4166.html +share/gnome/help/gnumeric/C/r4190.html +share/gnome/help/gnumeric/C/r4219.html +share/gnome/help/gnumeric/C/r4240.html +share/gnome/help/gnumeric/C/r4263.html +share/gnome/help/gnumeric/C/r4285.html +share/gnome/help/gnumeric/C/r4306.html +share/gnome/help/gnumeric/C/r4329.html +share/gnome/help/gnumeric/C/r4349.html +share/gnome/help/gnumeric/C/r4374.html +share/gnome/help/gnumeric/C/r4397.html +share/gnome/help/gnumeric/C/r4421.html +share/gnome/help/gnumeric/C/r4444.html +share/gnome/help/gnumeric/C/r4464.html +share/gnome/help/gnumeric/C/r4487.html +share/gnome/help/gnumeric/C/r4515.html +share/gnome/help/gnumeric/C/r4539.html +share/gnome/help/gnumeric/C/r4559.html +share/gnome/help/gnumeric/C/r4582.html +share/gnome/help/gnumeric/C/r4608.html +share/gnome/help/gnumeric/C/r4633.html +share/gnome/help/gnumeric/C/r4662.html +share/gnome/help/gnumeric/C/r4685.html +share/gnome/help/gnumeric/C/r4712.html +share/gnome/help/gnumeric/C/r4739.html +share/gnome/help/gnumeric/C/r4761.html +share/gnome/help/gnumeric/C/r4783.html +share/gnome/help/gnumeric/C/r4807.html +share/gnome/help/gnumeric/C/r4832.html +share/gnome/help/gnumeric/C/r4855.html +share/gnome/help/gnumeric/C/r4878.html +share/gnome/help/gnumeric/C/r4900.html +share/gnome/help/gnumeric/C/r4925.html +share/gnome/help/gnumeric/C/r4949.html +share/gnome/help/gnumeric/C/r4973.html +share/gnome/help/gnumeric/C/r5014.html +share/gnome/help/gnumeric/C/r5036.html +share/gnome/help/gnumeric/C/r5057.html +share/gnome/help/gnumeric/C/r5078.html +share/gnome/help/gnumeric/C/r5102.html +share/gnome/help/gnumeric/C/r5128.html +share/gnome/help/gnumeric/C/r5148.html +share/gnome/help/gnumeric/C/r5172.html +share/gnome/help/gnumeric/C/r5194.html +share/gnome/help/gnumeric/C/r5216.html +share/gnome/help/gnumeric/C/r5239.html +share/gnome/help/gnumeric/C/r5265.html +share/gnome/help/gnumeric/C/r5292.html +share/gnome/help/gnumeric/C/r5313.html +share/gnome/help/gnumeric/C/r5335.html +share/gnome/help/gnumeric/C/r5358.html +share/gnome/help/gnumeric/C/r5382.html +share/gnome/help/gnumeric/C/r5423.html +share/gnome/help/gnumeric/C/r5443.html +share/gnome/help/gnumeric/C/r5471.html +share/gnome/help/gnumeric/C/r5495.html +share/gnome/help/gnumeric/C/r5519.html +share/gnome/help/gnumeric/C/r5546.html +share/gnome/help/gnumeric/C/r5571.html +share/gnome/help/gnumeric/C/r5591.html +share/gnome/help/gnumeric/C/r5611.html +share/gnome/help/gnumeric/C/r5635.html +share/gnome/help/gnumeric/C/r5660.html +share/gnome/help/gnumeric/C/r5684.html +share/gnome/help/gnumeric/C/r5709.html +share/gnome/help/gnumeric/C/r5733.html +share/gnome/help/gnumeric/C/r5761.html +share/gnome/help/gnumeric/C/r5784.html +share/gnome/help/gnumeric/C/r5811.html +share/gnome/help/gnumeric/C/r5835.html +share/gnome/help/gnumeric/C/r5855.html +share/gnome/help/gnumeric/C/r5878.html +share/gnome/help/gnumeric/C/r5902.html +share/gnome/help/gnumeric/C/r5942.html +share/gnome/help/gnumeric/C/r5965.html +share/gnome/help/gnumeric/C/r5988.html +share/gnome/help/gnumeric/C/r6013.html +share/gnome/help/gnumeric/C/r6038.html +share/gnome/help/gnumeric/C/r6061.html +share/gnome/help/gnumeric/C/r6084.html +share/gnome/help/gnumeric/C/r6107.html +share/gnome/help/gnumeric/C/r6135.html +share/gnome/help/gnumeric/C/r6155.html +share/gnome/help/gnumeric/C/r6178.html +share/gnome/help/gnumeric/C/r6200.html +share/gnome/help/gnumeric/C/r6240.html +share/gnome/help/gnumeric/C/r6265.html +share/gnome/help/gnumeric/C/r6287.html +share/gnome/help/gnumeric/C/r6308.html +share/gnome/help/gnumeric/C/r6333.html +share/gnome/help/gnumeric/C/r6355.html +share/gnome/help/gnumeric/C/r6384.html +share/gnome/help/gnumeric/C/r6408.html +share/gnome/help/gnumeric/C/r6433.html +share/gnome/help/gnumeric/C/r6457.html +share/gnome/help/gnumeric/C/r6484.html +share/gnome/help/gnumeric/C/r6506.html +share/gnome/help/gnumeric/C/r6529.html +share/gnome/help/gnumeric/C/r6555.html +share/gnome/help/gnumeric/C/r6579.html +share/gnome/help/gnumeric/C/r6599.html +share/gnome/help/gnumeric/C/r6626.html +share/gnome/help/gnumeric/C/r6651.html +share/gnome/help/gnumeric/C/r6675.html +share/gnome/help/gnumeric/C/r6698.html +share/gnome/help/gnumeric/C/r6723.html +share/gnome/help/gnumeric/C/r6745.html +share/gnome/help/gnumeric/C/r6768.html +share/gnome/help/gnumeric/C/r6790.html +share/gnome/help/gnumeric/C/r6832.html +share/gnome/help/gnumeric/C/r6855.html +share/gnome/help/gnumeric/C/r6878.html +share/gnome/help/gnumeric/C/r6899.html +share/gnome/help/gnumeric/C/r6931.html +share/gnome/help/gnumeric/C/r6956.html +share/gnome/help/gnumeric/C/r6981.html +share/gnome/help/gnumeric/C/r7001.html +share/gnome/help/gnumeric/C/r7024.html +share/gnome/help/gnumeric/C/r7049.html +share/gnome/help/gnumeric/C/r7073.html +share/gnome/help/gnumeric/C/r7094.html +share/gnome/help/gnumeric/C/r7117.html +share/gnome/help/gnumeric/C/r7142.html +share/gnome/help/gnumeric/C/r7165.html +share/gnome/help/gnumeric/C/r7194.html +share/gnome/help/gnumeric/C/r7218.html +share/gnome/help/gnumeric/C/r7240.html +share/gnome/help/gnumeric/C/r7267.html +share/gnome/help/gnumeric/C/r7289.html +share/gnome/help/gnumeric/C/r7316.html +share/gnome/help/gnumeric/C/r7336.html +share/gnome/help/gnumeric/C/r7362.html +share/gnome/help/gnumeric/C/r7387.html +share/gnome/help/gnumeric/C/r7412.html +share/gnome/help/gnumeric/C/r7436.html +share/gnome/help/gnumeric/C/r7463.html +share/gnome/help/gnumeric/C/r7503.html +share/gnome/help/gnumeric/C/r7529.html +share/gnome/help/gnumeric/C/r7552.html +share/gnome/help/gnumeric/C/r7574.html +share/gnome/help/gnumeric/C/r7597.html +share/gnome/help/gnumeric/C/r7619.html +share/gnome/help/gnumeric/C/r7639.html +share/gnome/help/gnumeric/C/r7664.html +share/gnome/help/gnumeric/C/r7686.html +share/gnome/help/gnumeric/C/r7712.html +share/gnome/help/gnumeric/C/r7735.html +share/gnome/help/gnumeric/C/r7760.html +share/gnome/help/gnumeric/C/r7788.html +share/gnome/help/gnumeric/C/r7818.html +share/gnome/help/gnumeric/C/r7842.html +share/gnome/help/gnumeric/C/r7868.html +share/gnome/help/gnumeric/C/r7888.html +share/gnome/help/gnumeric/C/r7924.html +share/gnome/help/gnumeric/C/r7941.html +share/gnome/help/gnumeric/C/r7963.html +share/gnome/help/gnumeric/C/r7988.html +share/gnome/help/gnumeric/C/r8013.html +share/gnome/help/gnumeric/C/r8037.html +share/gnome/help/gnumeric/C/r8060.html +share/gnome/help/gnumeric/C/r8083.html +share/gnome/help/gnumeric/C/r8106.html +share/gnome/help/gnumeric/C/r8139.html +share/gnome/help/gnumeric/C/r8161.html +share/gnome/help/gnumeric/C/r8188.html +share/gnome/help/gnumeric/C/r8208.html +share/gnome/help/gnumeric/C/r8248.html +share/gnome/help/gnumeric/C/r8271.html +share/gnome/help/gnumeric/C/r8294.html +share/gnome/help/gnumeric/C/r8317.html +share/gnome/help/gnumeric/C/r8341.html +share/gnome/help/gnumeric/C/r8365.html +share/gnome/help/gnumeric/C/r8391.html +share/gnome/help/gnumeric/C/r8413.html +share/gnome/help/gnumeric/C/r8437.html +share/gnome/help/gnumeric/C/r8465.html +share/gnome/help/gnumeric/C/r8488.html +share/gnome/help/gnumeric/C/r8508.html +share/gnome/help/gnumeric/C/r8530.html +share/gnome/help/gnumeric/C/r8557.html +share/gnome/help/gnumeric/C/r8580.html +share/gnome/help/gnumeric/C/r8602.html +share/gnome/help/gnumeric/C/r8626.html +share/gnome/help/gnumeric/C/r8659.html +share/gnome/help/gnumeric/C/r8687.html +share/gnome/help/gnumeric/C/r8711.html +share/gnome/help/gnumeric/C/r8733.html +share/gnome/help/gnumeric/C/r8761.html +share/gnome/help/gnumeric/C/r8787.html +share/gnome/help/gnumeric/C/r8810.html +share/gnome/help/gnumeric/C/r8833.html +share/gnome/help/gnumeric/C/r8861.html +share/gnome/help/gnumeric/C/r8885.html +share/gnome/help/gnumeric/C/r8910.html +share/gnome/help/gnumeric/C/r8938.html +share/gnome/help/gnumeric/C/r8965.html +share/gnome/help/gnumeric/C/r8983.html +share/gnome/help/gnumeric/C/r9007.html +share/gnome/help/gnumeric/C/r9035.html +share/gnome/help/gnumeric/C/r9063.html +share/gnome/help/gnumeric/C/r9086.html +share/gnome/help/gnumeric/C/r9108.html +share/gnome/help/gnumeric/C/r9131.html +share/gnome/help/gnumeric/C/r9151.html +share/gnome/help/gnumeric/C/r9179.html +share/gnome/help/gnumeric/C/r9200.html +share/gnome/help/gnumeric/C/r9223.html +share/gnome/help/gnumeric/C/r9247.html +share/gnome/help/gnumeric/C/r9271.html +share/gnome/help/gnumeric/C/r9299.html +share/gnome/help/gnumeric/C/r9322.html +share/gnome/help/gnumeric/C/r9351.html +share/gnome/help/gnumeric/C/r9373.html +share/gnome/help/gnumeric/C/r9397.html +share/gnome/help/gnumeric/C/r9418.html +share/gnome/help/gnumeric/C/r9442.html +share/gnome/help/gnumeric/C/r9465.html +share/gnome/help/gnumeric/C/r9490.html +share/gnome/help/gnumeric/C/r9513.html +share/gnome/help/gnumeric/C/r9533.html +share/gnome/help/gnumeric/C/r9554.html +share/gnome/help/gnumeric/C/r9579.html +share/gnome/help/gnumeric/C/r9608.html +share/gnome/help/gnumeric/C/r9633.html +share/gnome/help/gnumeric/C/r9653.html +share/gnome/help/gnumeric/C/r9673.html +share/gnome/help/gnumeric/C/r9695.html +share/gnome/help/gnumeric/C/r9717.html +share/gnome/help/gnumeric/C/r9741.html +share/gnome/help/gnumeric/C/r9767.html +share/gnome/help/gnumeric/C/r9788.html +share/gnome/help/gnumeric/C/r9829.html +share/gnome/help/gnumeric/C/r9857.html +share/gnome/help/gnumeric/C/r9877.html +share/gnome/help/gnumeric/C/r9917.html +share/gnome/help/gnumeric/C/r9938.html +share/gnome/help/gnumeric/C/r9961.html share/gnome/help/gnumeric/C/rest.html share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html share/gnome/help/gnumeric/C/solver.html @@ -631,6 +648,8 @@ share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/da/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo share/locale/el/LC_MESSAGES/gnumeric.mo +share/locale/en_AU/LC_MESSAGES/gnumeric.mo +share/locale/en_CA/LC_MESSAGES/gnumeric.mo share/locale/en_GB/LC_MESSAGES/gnumeric.mo share/locale/es/LC_MESSAGES/gnumeric.mo share/locale/es_DO/LC_MESSAGES/gnumeric.mo @@ -658,6 +677,7 @@ share/locale/pt_BR/LC_MESSAGES/gnumeric.mo share/locale/ru/LC_MESSAGES/gnumeric.mo share/locale/sk/LC_MESSAGES/gnumeric.mo share/locale/sv/LC_MESSAGES/gnumeric.mo +share/locale/tr/LC_MESSAGES/gnumeric.mo share/locale/uk/LC_MESSAGES/gnumeric.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @@ -665,15 +685,32 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/help/gnumeric/C @dirrm share/gnome/help/gnumeric @dirrm share/gnome/gnumeric/%%VERSION%%/templates -@dirrm share/gnome/gnumeric/%%VERSION%%/python @dirrm share/gnome/gnumeric/%%VERSION%%/idl -@dirrm share/gnome/gnumeric/%%VERSION%%/guile @dirrm share/gnome/gnumeric/%%VERSION%%/glade +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D @dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates @dirrm share/gnome/gnumeric/%%VERSION%% @dirrm share/gnome/gnumeric @unexec rmdir %D/share/gnome/oaf 2>/dev/null || true @dirrm share/gnome/pixmaps/gnumeric +@dirrm lib/gnumeric/%%VERSION%%/plugins/xml2 +@dirrm lib/gnumeric/%%VERSION%%/plugins/xbase +@dirrm lib/gnumeric/%%VERSION%%/plugins/sylk +@dirrm lib/gnumeric/%%VERSION%%/plugins/sc +@dirrm lib/gnumeric/%%VERSION%%/plugins/plan_perfect +@dirrm lib/gnumeric/%%VERSION%%/plugins/oleo +@dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory +@dirrm lib/gnumeric/%%VERSION%%/plugins/lotus +@dirrm lib/gnumeric/%%VERSION%%/plugins/html +@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif +@dirrm lib/gnumeric/%%VERSION%%/plugins/gb +@dirrm lib/gnumeric/%%VERSION%%/plugins/dif +@dirrm lib/gnumeric/%%VERSION%%/plugins/applix @dirrm lib/gnumeric/%%VERSION%%/plugins @dirrm lib/gnumeric/%%VERSION%% @dirrm lib/gnumeric diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index d43debd5d1e5..8f33cb3ff6ea 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -6,18 +6,18 @@ # PORTNAME= gnumeric -PORTVERSION= 0.61 +PORTVERSION= 0.64 CATEGORIES?= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric MAINTAINER?= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade \ - guile.9:${PORTSDIR}/lang/guile \ +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal \ + gb.0:${PORTSDIR}/lang/gnomebasic \ + gda-common.0:${PORTSDIR}/databases/libgda USE_X_PREFIX= yes USE_PERL5= yes @@ -26,7 +26,7 @@ USE_GNOME= yes USE_PYTHON= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-guile --without-bonobo --without-gb +CONFIGURE_ARGS= --without-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo index aa83814e1cc8..58f0661a5ddb 100644 --- a/math/gnumeric2/distinfo +++ b/math/gnumeric2/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.61.tar.gz) = 3a40015a74a10a75e3290a86fc9f7f0c +MD5 (gnumeric-0.64.tar.gz) = 49673e41e314dacc54ea5aa74c0792ea diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist index cdbc964c7b35..1cd62fd3a186 100644 --- a/math/gnumeric2/pkg-plist +++ b/math/gnumeric2/pkg-plist @@ -1,22 +1,65 @@ bin/gnumeric etc/CORBA/servers/gnumeric.gnorba etc/gnumericConf.sh -lib/gnumeric/%%VERSION%%/plugins/gnum_dif.so -lib/gnumeric/%%VERSION%%/plugins/gnum_guile.so -lib/gnumeric/%%VERSION%%/plugins/gnum_html.so -lib/gnumeric/%%VERSION%%/plugins/gnum_lotus.so -lib/gnumeric/%%VERSION%%/plugins/gnum_numtheory.so -lib/gnumeric/%%VERSION%%/plugins/gnum_oleo.so -lib/gnumeric/%%VERSION%%/plugins/gnum_sc.so -lib/gnumeric/%%VERSION%%/plugins/gnum_sylk.so -lib/gnumeric/%%VERSION%%/plugins/gnum_xbase.so -lib/gnumeric/%%VERSION%%/plugins/gnum_applix.so -lib/gnumeric/%%VERSION%%/plugins/gnum_xml2.so +lib/gnumeric/%%VERSION%%/plugins/applix/applix.so +lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/dif/dif.so +lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gb/gnum_gb.so +lib/gnumeric/%%VERSION%%/plugins/gb/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so +lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/html/html.so +lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so +lib/gnumeric/%%VERSION%%/plugins/lotus/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/numtheory/numtheory.so +lib/gnumeric/%%VERSION%%/plugins/numtheory/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so +lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sc/sc.so +lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so +lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so +lib/gnumeric/%%VERSION%%/plugins/xml2/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/xml2/xml2.so share/gnome/apps/Applications/gnumeric.desktop +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/.category +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml +share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml share/gnome/gnumeric/%%VERSION%%/glade/advanced-filter.glade share/gnome/gnumeric/%%VERSION%%/glade/analysis-tools.glade share/gnome/gnumeric/%%VERSION%%/glade/autocorrect-exceptions.glade share/gnome/gnumeric/%%VERSION%%/glade/autocorrect.glade +share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade share/gnome/gnumeric/%%VERSION%%/glade/autosave-prompt.glade share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade @@ -29,6 +72,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade +share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade share/gnome/gnumeric/%%VERSION%%/glade/import.glade share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade @@ -36,41 +80,14 @@ share/gnome/gnumeric/%%VERSION%%/glade/names.glade share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade share/gnome/gnumeric/%%VERSION%%/glade/print.glade share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade +share/gnome/gnumeric/%%VERSION%%/glade/search-replace.glade share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade share/gnome/gnumeric/%%VERSION%%/glade/sheet-rename.glade share/gnome/gnumeric/%%VERSION%%/glade/solver-options.glade share/gnome/gnumeric/%%VERSION%%/glade/solver.glade share/gnome/gnumeric/%%VERSION%%/glade/summary.glade +share/gnome/gnumeric/%%VERSION%%/glade/validate.glade share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade -share/gnome/gnumeric/%%VERSION%%/guile/functions.scm -share/gnome/gnumeric/%%VERSION%%/guile/gnumeric_startup.scm -share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py -share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.3D.button.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.3D.list.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.cool.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.simple.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Classical.trendy.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.banana.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.black.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.blue.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.orange.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Colourful.vanilla.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.desert.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.ice.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.modern.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.Financial.purple.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.advanced.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.empty.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.General.table.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.basic.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.green.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.lila.xml -share/gnome/gnumeric/%%VERSION%%/autoformat-templates/autoformat.List.simple.xml -share/gnome/gnumeric/%%VERSION%%/glade/autoformat.glade -share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade share/gnome/gnumeric/%%VERSION%%/idl/Gnumeric.idl share/gnome/gnumeric/%%VERSION%%/idl/gnumeric-graphs.idl share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric @@ -218,347 +235,347 @@ share/gnome/help/gnumeric/C/number-formatting-overview.html share/gnome/help/gnumeric/C/print-preview.html share/gnome/help/gnumeric/C/print-setup.html share/gnome/help/gnumeric/C/printing.html -share/gnome/help/gnumeric/C/r10014.html -share/gnome/help/gnumeric/C/r10038.html -share/gnome/help/gnumeric/C/r10066.html -share/gnome/help/gnumeric/C/r10086.html -share/gnome/help/gnumeric/C/r10109.html -share/gnome/help/gnumeric/C/r10133.html -share/gnome/help/gnumeric/C/r10161.html -share/gnome/help/gnumeric/C/r10182.html -share/gnome/help/gnumeric/C/r10202.html -share/gnome/help/gnumeric/C/r10229.html -share/gnome/help/gnumeric/C/r10269.html -share/gnome/help/gnumeric/C/r10294.html -share/gnome/help/gnumeric/C/r10323.html -share/gnome/help/gnumeric/C/r10345.html -share/gnome/help/gnumeric/C/r10368.html -share/gnome/help/gnumeric/C/r10395.html -share/gnome/help/gnumeric/C/r10421.html -share/gnome/help/gnumeric/C/r10449.html -share/gnome/help/gnumeric/C/r10469.html -share/gnome/help/gnumeric/C/r10494.html -share/gnome/help/gnumeric/C/r10517.html -share/gnome/help/gnumeric/C/r10541.html -share/gnome/help/gnumeric/C/r10567.html -share/gnome/help/gnumeric/C/r10589.html -share/gnome/help/gnumeric/C/r10613.html -share/gnome/help/gnumeric/C/r10639.html -share/gnome/help/gnumeric/C/r10661.html -share/gnome/help/gnumeric/C/r10686.html -share/gnome/help/gnumeric/C/r10709.html -share/gnome/help/gnumeric/C/r10731.html -share/gnome/help/gnumeric/C/r10760.html -share/gnome/help/gnumeric/C/r10781.html -share/gnome/help/gnumeric/C/r10804.html -share/gnome/help/gnumeric/C/r10826.html -share/gnome/help/gnumeric/C/r10853.html -share/gnome/help/gnumeric/C/r10873.html -share/gnome/help/gnumeric/C/r10899.html -share/gnome/help/gnumeric/C/r10922.html -share/gnome/help/gnumeric/C/r10947.html -share/gnome/help/gnumeric/C/r10970.html -share/gnome/help/gnumeric/C/r10991.html -share/gnome/help/gnumeric/C/r11016.html -share/gnome/help/gnumeric/C/r11040.html -share/gnome/help/gnumeric/C/r11062.html -share/gnome/help/gnumeric/C/r11082.html -share/gnome/help/gnumeric/C/r11102.html -share/gnome/help/gnumeric/C/r11126.html -share/gnome/help/gnumeric/C/r2690.html -share/gnome/help/gnumeric/C/r2714.html -share/gnome/help/gnumeric/C/r2743.html -share/gnome/help/gnumeric/C/r2764.html -share/gnome/help/gnumeric/C/r2788.html -share/gnome/help/gnumeric/C/r2818.html -share/gnome/help/gnumeric/C/r2838.html -share/gnome/help/gnumeric/C/r2860.html -share/gnome/help/gnumeric/C/r2883.html -share/gnome/help/gnumeric/C/r2911.html -share/gnome/help/gnumeric/C/r2932.html -share/gnome/help/gnumeric/C/r2962.html -share/gnome/help/gnumeric/C/r2982.html -share/gnome/help/gnumeric/C/r3006.html -share/gnome/help/gnumeric/C/r3028.html -share/gnome/help/gnumeric/C/r3067.html -share/gnome/help/gnumeric/C/r3090.html -share/gnome/help/gnumeric/C/r3111.html -share/gnome/help/gnumeric/C/r3141.html -share/gnome/help/gnumeric/C/r3181.html -share/gnome/help/gnumeric/C/r3204.html -share/gnome/help/gnumeric/C/r3228.html -share/gnome/help/gnumeric/C/r3252.html -share/gnome/help/gnumeric/C/r3277.html -share/gnome/help/gnumeric/C/r3301.html -share/gnome/help/gnumeric/C/r3324.html -share/gnome/help/gnumeric/C/r3346.html -share/gnome/help/gnumeric/C/r3369.html -share/gnome/help/gnumeric/C/r3398.html -share/gnome/help/gnumeric/C/r3422.html -share/gnome/help/gnumeric/C/r3449.html -share/gnome/help/gnumeric/C/r3473.html -share/gnome/help/gnumeric/C/r3498.html -share/gnome/help/gnumeric/C/r3520.html -share/gnome/help/gnumeric/C/r3547.html -share/gnome/help/gnumeric/C/r3571.html -share/gnome/help/gnumeric/C/r3591.html -share/gnome/help/gnumeric/C/r3613.html -share/gnome/help/gnumeric/C/r3637.html -share/gnome/help/gnumeric/C/r3662.html -share/gnome/help/gnumeric/C/r3685.html -share/gnome/help/gnumeric/C/r3713.html -share/gnome/help/gnumeric/C/r3736.html -share/gnome/help/gnumeric/C/r3756.html -share/gnome/help/gnumeric/C/r3778.html -share/gnome/help/gnumeric/C/r3805.html -share/gnome/help/gnumeric/C/r3828.html -share/gnome/help/gnumeric/C/r3848.html -share/gnome/help/gnumeric/C/r3959.html -share/gnome/help/gnumeric/C/r3984.html -share/gnome/help/gnumeric/C/r4008.html -share/gnome/help/gnumeric/C/r4031.html -share/gnome/help/gnumeric/C/r4060.html -share/gnome/help/gnumeric/C/r4083.html -share/gnome/help/gnumeric/C/r4106.html -share/gnome/help/gnumeric/C/r4133.html -share/gnome/help/gnumeric/C/r4154.html -share/gnome/help/gnumeric/C/r4178.html -share/gnome/help/gnumeric/C/r4207.html -share/gnome/help/gnumeric/C/r4228.html -share/gnome/help/gnumeric/C/r4251.html -share/gnome/help/gnumeric/C/r4273.html -share/gnome/help/gnumeric/C/r4294.html -share/gnome/help/gnumeric/C/r4317.html -share/gnome/help/gnumeric/C/r4337.html -share/gnome/help/gnumeric/C/r4362.html -share/gnome/help/gnumeric/C/r4385.html -share/gnome/help/gnumeric/C/r4409.html -share/gnome/help/gnumeric/C/r4432.html -share/gnome/help/gnumeric/C/r4452.html -share/gnome/help/gnumeric/C/r4475.html -share/gnome/help/gnumeric/C/r4503.html -share/gnome/help/gnumeric/C/r4527.html -share/gnome/help/gnumeric/C/r4547.html -share/gnome/help/gnumeric/C/r4570.html -share/gnome/help/gnumeric/C/r4596.html -share/gnome/help/gnumeric/C/r4621.html -share/gnome/help/gnumeric/C/r4650.html -share/gnome/help/gnumeric/C/r4673.html -share/gnome/help/gnumeric/C/r4700.html -share/gnome/help/gnumeric/C/r4727.html -share/gnome/help/gnumeric/C/r4749.html -share/gnome/help/gnumeric/C/r4771.html -share/gnome/help/gnumeric/C/r4795.html -share/gnome/help/gnumeric/C/r4820.html -share/gnome/help/gnumeric/C/r4843.html -share/gnome/help/gnumeric/C/r4866.html -share/gnome/help/gnumeric/C/r4888.html -share/gnome/help/gnumeric/C/r4913.html -share/gnome/help/gnumeric/C/r4937.html -share/gnome/help/gnumeric/C/r4961.html -share/gnome/help/gnumeric/C/r5002.html -share/gnome/help/gnumeric/C/r5024.html -share/gnome/help/gnumeric/C/r5045.html -share/gnome/help/gnumeric/C/r5066.html -share/gnome/help/gnumeric/C/r5090.html -share/gnome/help/gnumeric/C/r5116.html -share/gnome/help/gnumeric/C/r5136.html -share/gnome/help/gnumeric/C/r5160.html -share/gnome/help/gnumeric/C/r5182.html -share/gnome/help/gnumeric/C/r5204.html -share/gnome/help/gnumeric/C/r5227.html -share/gnome/help/gnumeric/C/r5252.html -share/gnome/help/gnumeric/C/r5279.html -share/gnome/help/gnumeric/C/r5300.html -share/gnome/help/gnumeric/C/r5322.html -share/gnome/help/gnumeric/C/r5345.html -share/gnome/help/gnumeric/C/r5369.html -share/gnome/help/gnumeric/C/r5410.html -share/gnome/help/gnumeric/C/r5430.html -share/gnome/help/gnumeric/C/r5458.html -share/gnome/help/gnumeric/C/r5482.html -share/gnome/help/gnumeric/C/r5506.html -share/gnome/help/gnumeric/C/r5533.html -share/gnome/help/gnumeric/C/r5558.html -share/gnome/help/gnumeric/C/r5578.html -share/gnome/help/gnumeric/C/r5598.html -share/gnome/help/gnumeric/C/r5622.html -share/gnome/help/gnumeric/C/r5647.html -share/gnome/help/gnumeric/C/r5671.html -share/gnome/help/gnumeric/C/r5696.html -share/gnome/help/gnumeric/C/r5720.html -share/gnome/help/gnumeric/C/r5748.html -share/gnome/help/gnumeric/C/r5771.html -share/gnome/help/gnumeric/C/r5798.html -share/gnome/help/gnumeric/C/r5822.html -share/gnome/help/gnumeric/C/r5842.html -share/gnome/help/gnumeric/C/r5865.html -share/gnome/help/gnumeric/C/r5889.html -share/gnome/help/gnumeric/C/r5929.html -share/gnome/help/gnumeric/C/r5952.html -share/gnome/help/gnumeric/C/r5975.html -share/gnome/help/gnumeric/C/r6000.html -share/gnome/help/gnumeric/C/r6025.html -share/gnome/help/gnumeric/C/r6048.html -share/gnome/help/gnumeric/C/r6071.html -share/gnome/help/gnumeric/C/r6094.html -share/gnome/help/gnumeric/C/r6122.html -share/gnome/help/gnumeric/C/r6142.html -share/gnome/help/gnumeric/C/r6165.html -share/gnome/help/gnumeric/C/r6187.html -share/gnome/help/gnumeric/C/r6227.html -share/gnome/help/gnumeric/C/r6252.html -share/gnome/help/gnumeric/C/r6274.html -share/gnome/help/gnumeric/C/r6295.html -share/gnome/help/gnumeric/C/r6320.html -share/gnome/help/gnumeric/C/r6342.html -share/gnome/help/gnumeric/C/r6371.html -share/gnome/help/gnumeric/C/r6395.html -share/gnome/help/gnumeric/C/r6420.html -share/gnome/help/gnumeric/C/r6444.html -share/gnome/help/gnumeric/C/r6471.html -share/gnome/help/gnumeric/C/r6493.html -share/gnome/help/gnumeric/C/r6515.html -share/gnome/help/gnumeric/C/r6541.html -share/gnome/help/gnumeric/C/r6565.html -share/gnome/help/gnumeric/C/r6585.html -share/gnome/help/gnumeric/C/r6612.html -share/gnome/help/gnumeric/C/r6637.html -share/gnome/help/gnumeric/C/r6661.html -share/gnome/help/gnumeric/C/r6684.html -share/gnome/help/gnumeric/C/r6709.html -share/gnome/help/gnumeric/C/r6731.html -share/gnome/help/gnumeric/C/r6754.html -share/gnome/help/gnumeric/C/r6776.html -share/gnome/help/gnumeric/C/r6818.html -share/gnome/help/gnumeric/C/r6841.html -share/gnome/help/gnumeric/C/r6864.html -share/gnome/help/gnumeric/C/r6885.html -share/gnome/help/gnumeric/C/r6917.html -share/gnome/help/gnumeric/C/r6942.html -share/gnome/help/gnumeric/C/r6967.html -share/gnome/help/gnumeric/C/r6987.html -share/gnome/help/gnumeric/C/r7010.html -share/gnome/help/gnumeric/C/r7035.html -share/gnome/help/gnumeric/C/r7059.html -share/gnome/help/gnumeric/C/r7080.html -share/gnome/help/gnumeric/C/r7103.html -share/gnome/help/gnumeric/C/r7128.html -share/gnome/help/gnumeric/C/r7151.html -share/gnome/help/gnumeric/C/r7180.html -share/gnome/help/gnumeric/C/r7204.html -share/gnome/help/gnumeric/C/r7226.html -share/gnome/help/gnumeric/C/r7253.html -share/gnome/help/gnumeric/C/r7275.html -share/gnome/help/gnumeric/C/r7302.html -share/gnome/help/gnumeric/C/r7322.html -share/gnome/help/gnumeric/C/r7348.html -share/gnome/help/gnumeric/C/r7373.html -share/gnome/help/gnumeric/C/r7398.html -share/gnome/help/gnumeric/C/r7422.html -share/gnome/help/gnumeric/C/r7449.html -share/gnome/help/gnumeric/C/r7489.html -share/gnome/help/gnumeric/C/r7515.html -share/gnome/help/gnumeric/C/r7538.html -share/gnome/help/gnumeric/C/r7560.html -share/gnome/help/gnumeric/C/r7583.html -share/gnome/help/gnumeric/C/r7605.html -share/gnome/help/gnumeric/C/r7625.html -share/gnome/help/gnumeric/C/r7650.html -share/gnome/help/gnumeric/C/r7672.html -share/gnome/help/gnumeric/C/r7698.html -share/gnome/help/gnumeric/C/r7721.html -share/gnome/help/gnumeric/C/r7746.html -share/gnome/help/gnumeric/C/r7774.html -share/gnome/help/gnumeric/C/r7804.html -share/gnome/help/gnumeric/C/r7828.html -share/gnome/help/gnumeric/C/r7854.html -share/gnome/help/gnumeric/C/r7874.html -share/gnome/help/gnumeric/C/r7910.html -share/gnome/help/gnumeric/C/r7927.html -share/gnome/help/gnumeric/C/r7949.html -share/gnome/help/gnumeric/C/r7974.html -share/gnome/help/gnumeric/C/r7999.html -share/gnome/help/gnumeric/C/r8023.html -share/gnome/help/gnumeric/C/r8046.html -share/gnome/help/gnumeric/C/r8069.html -share/gnome/help/gnumeric/C/r8092.html -share/gnome/help/gnumeric/C/r8125.html -share/gnome/help/gnumeric/C/r8147.html -share/gnome/help/gnumeric/C/r8174.html -share/gnome/help/gnumeric/C/r8194.html -share/gnome/help/gnumeric/C/r8234.html -share/gnome/help/gnumeric/C/r8257.html -share/gnome/help/gnumeric/C/r8280.html -share/gnome/help/gnumeric/C/r8303.html -share/gnome/help/gnumeric/C/r8327.html -share/gnome/help/gnumeric/C/r8351.html -share/gnome/help/gnumeric/C/r8377.html -share/gnome/help/gnumeric/C/r8399.html -share/gnome/help/gnumeric/C/r8423.html -share/gnome/help/gnumeric/C/r8451.html -share/gnome/help/gnumeric/C/r8474.html -share/gnome/help/gnumeric/C/r8494.html -share/gnome/help/gnumeric/C/r8516.html -share/gnome/help/gnumeric/C/r8543.html -share/gnome/help/gnumeric/C/r8566.html -share/gnome/help/gnumeric/C/r8588.html -share/gnome/help/gnumeric/C/r8612.html -share/gnome/help/gnumeric/C/r8645.html -share/gnome/help/gnumeric/C/r8673.html -share/gnome/help/gnumeric/C/r8697.html -share/gnome/help/gnumeric/C/r8719.html -share/gnome/help/gnumeric/C/r8747.html -share/gnome/help/gnumeric/C/r8773.html -share/gnome/help/gnumeric/C/r8796.html -share/gnome/help/gnumeric/C/r8819.html -share/gnome/help/gnumeric/C/r8847.html -share/gnome/help/gnumeric/C/r8871.html -share/gnome/help/gnumeric/C/r8896.html -share/gnome/help/gnumeric/C/r8924.html -share/gnome/help/gnumeric/C/r8951.html -share/gnome/help/gnumeric/C/r8969.html -share/gnome/help/gnumeric/C/r8993.html -share/gnome/help/gnumeric/C/r9021.html -share/gnome/help/gnumeric/C/r9049.html -share/gnome/help/gnumeric/C/r9072.html -share/gnome/help/gnumeric/C/r9094.html -share/gnome/help/gnumeric/C/r9117.html -share/gnome/help/gnumeric/C/r9137.html -share/gnome/help/gnumeric/C/r9165.html -share/gnome/help/gnumeric/C/r9186.html -share/gnome/help/gnumeric/C/r9209.html -share/gnome/help/gnumeric/C/r9233.html -share/gnome/help/gnumeric/C/r9257.html -share/gnome/help/gnumeric/C/r9285.html -share/gnome/help/gnumeric/C/r9308.html -share/gnome/help/gnumeric/C/r9337.html -share/gnome/help/gnumeric/C/r9359.html -share/gnome/help/gnumeric/C/r9383.html -share/gnome/help/gnumeric/C/r9404.html -share/gnome/help/gnumeric/C/r9428.html -share/gnome/help/gnumeric/C/r9451.html -share/gnome/help/gnumeric/C/r9476.html -share/gnome/help/gnumeric/C/r9499.html -share/gnome/help/gnumeric/C/r9519.html -share/gnome/help/gnumeric/C/r9540.html -share/gnome/help/gnumeric/C/r9565.html -share/gnome/help/gnumeric/C/r9594.html -share/gnome/help/gnumeric/C/r9619.html -share/gnome/help/gnumeric/C/r9639.html -share/gnome/help/gnumeric/C/r9659.html -share/gnome/help/gnumeric/C/r9681.html -share/gnome/help/gnumeric/C/r9703.html -share/gnome/help/gnumeric/C/r9727.html -share/gnome/help/gnumeric/C/r9753.html -share/gnome/help/gnumeric/C/r9774.html -share/gnome/help/gnumeric/C/r9815.html -share/gnome/help/gnumeric/C/r9843.html -share/gnome/help/gnumeric/C/r9863.html -share/gnome/help/gnumeric/C/r9903.html -share/gnome/help/gnumeric/C/r9924.html -share/gnome/help/gnumeric/C/r9947.html -share/gnome/help/gnumeric/C/r9988.html +share/gnome/help/gnumeric/C/r10002.html +share/gnome/help/gnumeric/C/r10028.html +share/gnome/help/gnumeric/C/r10052.html +share/gnome/help/gnumeric/C/r10080.html +share/gnome/help/gnumeric/C/r10100.html +share/gnome/help/gnumeric/C/r10123.html +share/gnome/help/gnumeric/C/r10147.html +share/gnome/help/gnumeric/C/r10175.html +share/gnome/help/gnumeric/C/r10196.html +share/gnome/help/gnumeric/C/r10216.html +share/gnome/help/gnumeric/C/r10243.html +share/gnome/help/gnumeric/C/r10283.html +share/gnome/help/gnumeric/C/r10308.html +share/gnome/help/gnumeric/C/r10337.html +share/gnome/help/gnumeric/C/r10359.html +share/gnome/help/gnumeric/C/r10382.html +share/gnome/help/gnumeric/C/r10409.html +share/gnome/help/gnumeric/C/r10435.html +share/gnome/help/gnumeric/C/r10463.html +share/gnome/help/gnumeric/C/r10483.html +share/gnome/help/gnumeric/C/r10508.html +share/gnome/help/gnumeric/C/r10531.html +share/gnome/help/gnumeric/C/r10555.html +share/gnome/help/gnumeric/C/r10581.html +share/gnome/help/gnumeric/C/r10603.html +share/gnome/help/gnumeric/C/r10627.html +share/gnome/help/gnumeric/C/r10653.html +share/gnome/help/gnumeric/C/r10675.html +share/gnome/help/gnumeric/C/r10700.html +share/gnome/help/gnumeric/C/r10723.html +share/gnome/help/gnumeric/C/r10745.html +share/gnome/help/gnumeric/C/r10774.html +share/gnome/help/gnumeric/C/r10795.html +share/gnome/help/gnumeric/C/r10818.html +share/gnome/help/gnumeric/C/r10840.html +share/gnome/help/gnumeric/C/r10867.html +share/gnome/help/gnumeric/C/r10887.html +share/gnome/help/gnumeric/C/r10913.html +share/gnome/help/gnumeric/C/r10936.html +share/gnome/help/gnumeric/C/r10961.html +share/gnome/help/gnumeric/C/r10984.html +share/gnome/help/gnumeric/C/r11005.html +share/gnome/help/gnumeric/C/r11030.html +share/gnome/help/gnumeric/C/r11054.html +share/gnome/help/gnumeric/C/r11076.html +share/gnome/help/gnumeric/C/r11096.html +share/gnome/help/gnumeric/C/r11116.html +share/gnome/help/gnumeric/C/r11141.html +share/gnome/help/gnumeric/C/r2697.html +share/gnome/help/gnumeric/C/r2721.html +share/gnome/help/gnumeric/C/r2750.html +share/gnome/help/gnumeric/C/r2771.html +share/gnome/help/gnumeric/C/r2795.html +share/gnome/help/gnumeric/C/r2825.html +share/gnome/help/gnumeric/C/r2845.html +share/gnome/help/gnumeric/C/r2867.html +share/gnome/help/gnumeric/C/r2890.html +share/gnome/help/gnumeric/C/r2918.html +share/gnome/help/gnumeric/C/r2939.html +share/gnome/help/gnumeric/C/r2969.html +share/gnome/help/gnumeric/C/r2989.html +share/gnome/help/gnumeric/C/r3013.html +share/gnome/help/gnumeric/C/r3035.html +share/gnome/help/gnumeric/C/r3074.html +share/gnome/help/gnumeric/C/r3097.html +share/gnome/help/gnumeric/C/r3118.html +share/gnome/help/gnumeric/C/r3148.html +share/gnome/help/gnumeric/C/r3188.html +share/gnome/help/gnumeric/C/r3211.html +share/gnome/help/gnumeric/C/r3235.html +share/gnome/help/gnumeric/C/r3259.html +share/gnome/help/gnumeric/C/r3289.html +share/gnome/help/gnumeric/C/r3313.html +share/gnome/help/gnumeric/C/r3336.html +share/gnome/help/gnumeric/C/r3358.html +share/gnome/help/gnumeric/C/r3381.html +share/gnome/help/gnumeric/C/r3410.html +share/gnome/help/gnumeric/C/r3434.html +share/gnome/help/gnumeric/C/r3461.html +share/gnome/help/gnumeric/C/r3485.html +share/gnome/help/gnumeric/C/r3510.html +share/gnome/help/gnumeric/C/r3532.html +share/gnome/help/gnumeric/C/r3559.html +share/gnome/help/gnumeric/C/r3583.html +share/gnome/help/gnumeric/C/r3603.html +share/gnome/help/gnumeric/C/r3625.html +share/gnome/help/gnumeric/C/r3649.html +share/gnome/help/gnumeric/C/r3674.html +share/gnome/help/gnumeric/C/r3697.html +share/gnome/help/gnumeric/C/r3725.html +share/gnome/help/gnumeric/C/r3748.html +share/gnome/help/gnumeric/C/r3768.html +share/gnome/help/gnumeric/C/r3790.html +share/gnome/help/gnumeric/C/r3817.html +share/gnome/help/gnumeric/C/r3840.html +share/gnome/help/gnumeric/C/r3860.html +share/gnome/help/gnumeric/C/r3971.html +share/gnome/help/gnumeric/C/r3996.html +share/gnome/help/gnumeric/C/r4020.html +share/gnome/help/gnumeric/C/r4043.html +share/gnome/help/gnumeric/C/r4072.html +share/gnome/help/gnumeric/C/r4095.html +share/gnome/help/gnumeric/C/r4118.html +share/gnome/help/gnumeric/C/r4145.html +share/gnome/help/gnumeric/C/r4166.html +share/gnome/help/gnumeric/C/r4190.html +share/gnome/help/gnumeric/C/r4219.html +share/gnome/help/gnumeric/C/r4240.html +share/gnome/help/gnumeric/C/r4263.html +share/gnome/help/gnumeric/C/r4285.html +share/gnome/help/gnumeric/C/r4306.html +share/gnome/help/gnumeric/C/r4329.html +share/gnome/help/gnumeric/C/r4349.html +share/gnome/help/gnumeric/C/r4374.html +share/gnome/help/gnumeric/C/r4397.html +share/gnome/help/gnumeric/C/r4421.html +share/gnome/help/gnumeric/C/r4444.html +share/gnome/help/gnumeric/C/r4464.html +share/gnome/help/gnumeric/C/r4487.html +share/gnome/help/gnumeric/C/r4515.html +share/gnome/help/gnumeric/C/r4539.html +share/gnome/help/gnumeric/C/r4559.html +share/gnome/help/gnumeric/C/r4582.html +share/gnome/help/gnumeric/C/r4608.html +share/gnome/help/gnumeric/C/r4633.html +share/gnome/help/gnumeric/C/r4662.html +share/gnome/help/gnumeric/C/r4685.html +share/gnome/help/gnumeric/C/r4712.html +share/gnome/help/gnumeric/C/r4739.html +share/gnome/help/gnumeric/C/r4761.html +share/gnome/help/gnumeric/C/r4783.html +share/gnome/help/gnumeric/C/r4807.html +share/gnome/help/gnumeric/C/r4832.html +share/gnome/help/gnumeric/C/r4855.html +share/gnome/help/gnumeric/C/r4878.html +share/gnome/help/gnumeric/C/r4900.html +share/gnome/help/gnumeric/C/r4925.html +share/gnome/help/gnumeric/C/r4949.html +share/gnome/help/gnumeric/C/r4973.html +share/gnome/help/gnumeric/C/r5014.html +share/gnome/help/gnumeric/C/r5036.html +share/gnome/help/gnumeric/C/r5057.html +share/gnome/help/gnumeric/C/r5078.html +share/gnome/help/gnumeric/C/r5102.html +share/gnome/help/gnumeric/C/r5128.html +share/gnome/help/gnumeric/C/r5148.html +share/gnome/help/gnumeric/C/r5172.html +share/gnome/help/gnumeric/C/r5194.html +share/gnome/help/gnumeric/C/r5216.html +share/gnome/help/gnumeric/C/r5239.html +share/gnome/help/gnumeric/C/r5265.html +share/gnome/help/gnumeric/C/r5292.html +share/gnome/help/gnumeric/C/r5313.html +share/gnome/help/gnumeric/C/r5335.html +share/gnome/help/gnumeric/C/r5358.html +share/gnome/help/gnumeric/C/r5382.html +share/gnome/help/gnumeric/C/r5423.html +share/gnome/help/gnumeric/C/r5443.html +share/gnome/help/gnumeric/C/r5471.html +share/gnome/help/gnumeric/C/r5495.html +share/gnome/help/gnumeric/C/r5519.html +share/gnome/help/gnumeric/C/r5546.html +share/gnome/help/gnumeric/C/r5571.html +share/gnome/help/gnumeric/C/r5591.html +share/gnome/help/gnumeric/C/r5611.html +share/gnome/help/gnumeric/C/r5635.html +share/gnome/help/gnumeric/C/r5660.html +share/gnome/help/gnumeric/C/r5684.html +share/gnome/help/gnumeric/C/r5709.html +share/gnome/help/gnumeric/C/r5733.html +share/gnome/help/gnumeric/C/r5761.html +share/gnome/help/gnumeric/C/r5784.html +share/gnome/help/gnumeric/C/r5811.html +share/gnome/help/gnumeric/C/r5835.html +share/gnome/help/gnumeric/C/r5855.html +share/gnome/help/gnumeric/C/r5878.html +share/gnome/help/gnumeric/C/r5902.html +share/gnome/help/gnumeric/C/r5942.html +share/gnome/help/gnumeric/C/r5965.html +share/gnome/help/gnumeric/C/r5988.html +share/gnome/help/gnumeric/C/r6013.html +share/gnome/help/gnumeric/C/r6038.html +share/gnome/help/gnumeric/C/r6061.html +share/gnome/help/gnumeric/C/r6084.html +share/gnome/help/gnumeric/C/r6107.html +share/gnome/help/gnumeric/C/r6135.html +share/gnome/help/gnumeric/C/r6155.html +share/gnome/help/gnumeric/C/r6178.html +share/gnome/help/gnumeric/C/r6200.html +share/gnome/help/gnumeric/C/r6240.html +share/gnome/help/gnumeric/C/r6265.html +share/gnome/help/gnumeric/C/r6287.html +share/gnome/help/gnumeric/C/r6308.html +share/gnome/help/gnumeric/C/r6333.html +share/gnome/help/gnumeric/C/r6355.html +share/gnome/help/gnumeric/C/r6384.html +share/gnome/help/gnumeric/C/r6408.html +share/gnome/help/gnumeric/C/r6433.html +share/gnome/help/gnumeric/C/r6457.html +share/gnome/help/gnumeric/C/r6484.html +share/gnome/help/gnumeric/C/r6506.html +share/gnome/help/gnumeric/C/r6529.html +share/gnome/help/gnumeric/C/r6555.html +share/gnome/help/gnumeric/C/r6579.html +share/gnome/help/gnumeric/C/r6599.html +share/gnome/help/gnumeric/C/r6626.html +share/gnome/help/gnumeric/C/r6651.html +share/gnome/help/gnumeric/C/r6675.html +share/gnome/help/gnumeric/C/r6698.html +share/gnome/help/gnumeric/C/r6723.html +share/gnome/help/gnumeric/C/r6745.html +share/gnome/help/gnumeric/C/r6768.html +share/gnome/help/gnumeric/C/r6790.html +share/gnome/help/gnumeric/C/r6832.html +share/gnome/help/gnumeric/C/r6855.html +share/gnome/help/gnumeric/C/r6878.html +share/gnome/help/gnumeric/C/r6899.html +share/gnome/help/gnumeric/C/r6931.html +share/gnome/help/gnumeric/C/r6956.html +share/gnome/help/gnumeric/C/r6981.html +share/gnome/help/gnumeric/C/r7001.html +share/gnome/help/gnumeric/C/r7024.html +share/gnome/help/gnumeric/C/r7049.html +share/gnome/help/gnumeric/C/r7073.html +share/gnome/help/gnumeric/C/r7094.html +share/gnome/help/gnumeric/C/r7117.html +share/gnome/help/gnumeric/C/r7142.html +share/gnome/help/gnumeric/C/r7165.html +share/gnome/help/gnumeric/C/r7194.html +share/gnome/help/gnumeric/C/r7218.html +share/gnome/help/gnumeric/C/r7240.html +share/gnome/help/gnumeric/C/r7267.html +share/gnome/help/gnumeric/C/r7289.html +share/gnome/help/gnumeric/C/r7316.html +share/gnome/help/gnumeric/C/r7336.html +share/gnome/help/gnumeric/C/r7362.html +share/gnome/help/gnumeric/C/r7387.html +share/gnome/help/gnumeric/C/r7412.html +share/gnome/help/gnumeric/C/r7436.html +share/gnome/help/gnumeric/C/r7463.html +share/gnome/help/gnumeric/C/r7503.html +share/gnome/help/gnumeric/C/r7529.html +share/gnome/help/gnumeric/C/r7552.html +share/gnome/help/gnumeric/C/r7574.html +share/gnome/help/gnumeric/C/r7597.html +share/gnome/help/gnumeric/C/r7619.html +share/gnome/help/gnumeric/C/r7639.html +share/gnome/help/gnumeric/C/r7664.html +share/gnome/help/gnumeric/C/r7686.html +share/gnome/help/gnumeric/C/r7712.html +share/gnome/help/gnumeric/C/r7735.html +share/gnome/help/gnumeric/C/r7760.html +share/gnome/help/gnumeric/C/r7788.html +share/gnome/help/gnumeric/C/r7818.html +share/gnome/help/gnumeric/C/r7842.html +share/gnome/help/gnumeric/C/r7868.html +share/gnome/help/gnumeric/C/r7888.html +share/gnome/help/gnumeric/C/r7924.html +share/gnome/help/gnumeric/C/r7941.html +share/gnome/help/gnumeric/C/r7963.html +share/gnome/help/gnumeric/C/r7988.html +share/gnome/help/gnumeric/C/r8013.html +share/gnome/help/gnumeric/C/r8037.html +share/gnome/help/gnumeric/C/r8060.html +share/gnome/help/gnumeric/C/r8083.html +share/gnome/help/gnumeric/C/r8106.html +share/gnome/help/gnumeric/C/r8139.html +share/gnome/help/gnumeric/C/r8161.html +share/gnome/help/gnumeric/C/r8188.html +share/gnome/help/gnumeric/C/r8208.html +share/gnome/help/gnumeric/C/r8248.html +share/gnome/help/gnumeric/C/r8271.html +share/gnome/help/gnumeric/C/r8294.html +share/gnome/help/gnumeric/C/r8317.html +share/gnome/help/gnumeric/C/r8341.html +share/gnome/help/gnumeric/C/r8365.html +share/gnome/help/gnumeric/C/r8391.html +share/gnome/help/gnumeric/C/r8413.html +share/gnome/help/gnumeric/C/r8437.html +share/gnome/help/gnumeric/C/r8465.html +share/gnome/help/gnumeric/C/r8488.html +share/gnome/help/gnumeric/C/r8508.html +share/gnome/help/gnumeric/C/r8530.html +share/gnome/help/gnumeric/C/r8557.html +share/gnome/help/gnumeric/C/r8580.html +share/gnome/help/gnumeric/C/r8602.html +share/gnome/help/gnumeric/C/r8626.html +share/gnome/help/gnumeric/C/r8659.html +share/gnome/help/gnumeric/C/r8687.html +share/gnome/help/gnumeric/C/r8711.html +share/gnome/help/gnumeric/C/r8733.html +share/gnome/help/gnumeric/C/r8761.html +share/gnome/help/gnumeric/C/r8787.html +share/gnome/help/gnumeric/C/r8810.html +share/gnome/help/gnumeric/C/r8833.html +share/gnome/help/gnumeric/C/r8861.html +share/gnome/help/gnumeric/C/r8885.html +share/gnome/help/gnumeric/C/r8910.html +share/gnome/help/gnumeric/C/r8938.html +share/gnome/help/gnumeric/C/r8965.html +share/gnome/help/gnumeric/C/r8983.html +share/gnome/help/gnumeric/C/r9007.html +share/gnome/help/gnumeric/C/r9035.html +share/gnome/help/gnumeric/C/r9063.html +share/gnome/help/gnumeric/C/r9086.html +share/gnome/help/gnumeric/C/r9108.html +share/gnome/help/gnumeric/C/r9131.html +share/gnome/help/gnumeric/C/r9151.html +share/gnome/help/gnumeric/C/r9179.html +share/gnome/help/gnumeric/C/r9200.html +share/gnome/help/gnumeric/C/r9223.html +share/gnome/help/gnumeric/C/r9247.html +share/gnome/help/gnumeric/C/r9271.html +share/gnome/help/gnumeric/C/r9299.html +share/gnome/help/gnumeric/C/r9322.html +share/gnome/help/gnumeric/C/r9351.html +share/gnome/help/gnumeric/C/r9373.html +share/gnome/help/gnumeric/C/r9397.html +share/gnome/help/gnumeric/C/r9418.html +share/gnome/help/gnumeric/C/r9442.html +share/gnome/help/gnumeric/C/r9465.html +share/gnome/help/gnumeric/C/r9490.html +share/gnome/help/gnumeric/C/r9513.html +share/gnome/help/gnumeric/C/r9533.html +share/gnome/help/gnumeric/C/r9554.html +share/gnome/help/gnumeric/C/r9579.html +share/gnome/help/gnumeric/C/r9608.html +share/gnome/help/gnumeric/C/r9633.html +share/gnome/help/gnumeric/C/r9653.html +share/gnome/help/gnumeric/C/r9673.html +share/gnome/help/gnumeric/C/r9695.html +share/gnome/help/gnumeric/C/r9717.html +share/gnome/help/gnumeric/C/r9741.html +share/gnome/help/gnumeric/C/r9767.html +share/gnome/help/gnumeric/C/r9788.html +share/gnome/help/gnumeric/C/r9829.html +share/gnome/help/gnumeric/C/r9857.html +share/gnome/help/gnumeric/C/r9877.html +share/gnome/help/gnumeric/C/r9917.html +share/gnome/help/gnumeric/C/r9938.html +share/gnome/help/gnumeric/C/r9961.html share/gnome/help/gnumeric/C/rest.html share/gnome/help/gnumeric/C/selecting-cells-entering-formulas.html share/gnome/help/gnumeric/C/solver.html @@ -631,6 +648,8 @@ share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/da/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo share/locale/el/LC_MESSAGES/gnumeric.mo +share/locale/en_AU/LC_MESSAGES/gnumeric.mo +share/locale/en_CA/LC_MESSAGES/gnumeric.mo share/locale/en_GB/LC_MESSAGES/gnumeric.mo share/locale/es/LC_MESSAGES/gnumeric.mo share/locale/es_DO/LC_MESSAGES/gnumeric.mo @@ -658,6 +677,7 @@ share/locale/pt_BR/LC_MESSAGES/gnumeric.mo share/locale/ru/LC_MESSAGES/gnumeric.mo share/locale/sk/LC_MESSAGES/gnumeric.mo share/locale/sv/LC_MESSAGES/gnumeric.mo +share/locale/tr/LC_MESSAGES/gnumeric.mo share/locale/uk/LC_MESSAGES/gnumeric.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @@ -665,15 +685,32 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/help/gnumeric/C @dirrm share/gnome/help/gnumeric @dirrm share/gnome/gnumeric/%%VERSION%%/templates -@dirrm share/gnome/gnumeric/%%VERSION%%/python @dirrm share/gnome/gnumeric/%%VERSION%%/idl -@dirrm share/gnome/gnumeric/%%VERSION%%/guile @dirrm share/gnome/gnumeric/%%VERSION%%/glade +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Financial +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Colourful +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/Classical +@dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D @dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates @dirrm share/gnome/gnumeric/%%VERSION%% @dirrm share/gnome/gnumeric @unexec rmdir %D/share/gnome/oaf 2>/dev/null || true @dirrm share/gnome/pixmaps/gnumeric +@dirrm lib/gnumeric/%%VERSION%%/plugins/xml2 +@dirrm lib/gnumeric/%%VERSION%%/plugins/xbase +@dirrm lib/gnumeric/%%VERSION%%/plugins/sylk +@dirrm lib/gnumeric/%%VERSION%%/plugins/sc +@dirrm lib/gnumeric/%%VERSION%%/plugins/plan_perfect +@dirrm lib/gnumeric/%%VERSION%%/plugins/oleo +@dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory +@dirrm lib/gnumeric/%%VERSION%%/plugins/lotus +@dirrm lib/gnumeric/%%VERSION%%/plugins/html +@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif +@dirrm lib/gnumeric/%%VERSION%%/plugins/gb +@dirrm lib/gnumeric/%%VERSION%%/plugins/dif +@dirrm lib/gnumeric/%%VERSION%%/plugins/applix @dirrm lib/gnumeric/%%VERSION%%/plugins @dirrm lib/gnumeric/%%VERSION%% @dirrm lib/gnumeric diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net-im/gnomeicu/files/patch-configure b/net-im/gnomeicu/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net-im/gnomeicu/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net-im/gnomeicu/files/patch-src::kanji_conv.c b/net-im/gnomeicu/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net-im/gnomeicu/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net-im/gnomeicu2/Makefile +++ b/net-im/gnomeicu2/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net-im/gnomeicu2/files/patch-configure b/net-im/gnomeicu2/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net-im/gnomeicu2/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net-im/gnomeicu2/files/patch-src::kanji_conv.c b/net-im/gnomeicu2/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net-im/gnomeicu2/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/net/gabber/Makefile b/net/gabber/Makefile index 5bd0cc242746..cd08c634f55a 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -6,19 +6,15 @@ # PORTNAME= gabber -PORTVERSION= 0.8.1 -CATEGORIES= net +PORTVERSION= 0.8.2 +CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= erich@tacni.net -LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \ - gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \ - sigc.1:${PORTSDIR}/devel/libsigc++ \ - gal.4:${PORTSDIR}/x11-toolkits/gal \ - giconv.2:${PORTSDIR}/converters/libiconv \ - glade.4:${PORTSDIR}/devel/libglade +LIB_DEPENDS= gnomemm.6:${PORTSDIR}/x11-toolkits/gnome-- \ + gal.6:${PORTSDIR}/x11-toolkits/gal USE_X_PREFIX= yes USE_GMAKE= yes @@ -35,5 +31,7 @@ post-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC}/src -name "*.[ch]" | xargs ${PERL} -pi -e \ + 's|\<iconv.h\>|\<giconv.h\>|g' .include <bsd.port.mk> diff --git a/net/gabber/distinfo b/net/gabber/distinfo index a3f5bcc745ea..663f1a094092 100644 --- a/net/gabber/distinfo +++ b/net/gabber/distinfo @@ -1 +1 @@ -MD5 (gabber-0.8.1.tar.gz) = a0f5d038665cd244b891d998c15791c0 +MD5 (gabber-0.8.2.tar.gz) = fd7e2884e28dff9029222768ec7a1af1 diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae index 850bd445eed4..d2eafb79abbf 100644 --- a/net/gabber/files/patch-ae +++ b/net/gabber/files/patch-ae @@ -1,15 +1,14 @@ ---- src/GabberConfig.hh.in.orig Thu Jan 18 12:28:59 2001 -+++ src/GabberConfig.hh.in Thu Jan 18 12:30:07 2001 -@@ -3,9 +3,9 @@ - #include <config.h> - static const char* GABBER_PACKAGE = PACKAGE; +--- src/GabberConfig.hh.in.orig Sat Feb 3 23:19:41 2001 ++++ src/GabberConfig.hh.in Wed Mar 28 14:37:49 2001 +@@ -5,7 +5,7 @@ static const char* GABBER_VERSION = VERSION; --static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade"; +-static const char* GABBER_GLADEDIR = "@prefix@/share/gabber/"; -static const char* GABBER_SHAREDIR = "@prefix@/share/gabber/"; -+static const char* GABBER_GLADEFILE = "@prefix@/share/gnome/gabber/gabber.glade"; -+static const char* GABBER_SHAREDIR = "@prefix@/share/gnome/gabber/"; ++static const char* GABBER_GLADEDIR = "@datadir@/gabber/"; ++static const char* GABBER_SHAREDIR = "@datadir@/gabber/"; static const char* GABBER_CONFIG = "/Gabber/"; -static const char* GABBER_PIXPATH = "@prefix@/share/pixmaps/gabber/"; +-static const char* GABBER_CSSFILE = "@prefix@/share/gabber/gabber-logs.css"; +static const char* GABBER_PIXPATH = "@datadir@/pixmaps/gabber/"; - static const char* GABBER_CSSFILE = "@prefix@/share/gabber/gabber-logs.css"; ++static const char* GABBER_CSSFILE = "@datadir@/gabber/gabber-logs.css"; #endif diff --git a/net/gabber/files/patch-aj b/net/gabber/files/patch-aj deleted file mode 100644 index 4d3bae2d00af..000000000000 --- a/net/gabber/files/patch-aj +++ /dev/null @@ -1,68 +0,0 @@ ---- configure.in.orig Thu Jan 18 08:22:50 2001 -+++ configure.in Mon Jan 29 23:48:54 2001 -@@ -70,15 +70,15 @@ - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $ICONV_CFLAGS" --LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" --AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([ --#include <iconv.h> -+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" -+AC_CACHE_CHECK(for iconv in -lgiconv, ac_cv_libiconv, AC_TRY_LINK([ -+#include <giconv.h> - ], [ - iconv_t cd; - cd = iconv_open ("UTF-8", "ISO-8859-1"); - ], ac_cv_libiconv=yes, ac_cv_libiconv=no)) - if test $ac_cv_libiconv = yes; then -- ICONV_LIBS="$ICONV_LIBS -liconv" -+ ICONV_LIBS="$ICONV_LIBS -lgiconv" - have_iconv=yes - else - CFLAGS="$save_CFLAGS" -@@ -91,7 +91,7 @@ - AC_CHECK_FUNCS(gnu_get_libc_version) - fi - AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([ --#include <iconv.h> -+#include <giconv.h> - #include <stdlib.h> - #include <string.h> - #ifdef HAVE_GNU_GET_LIBC_VERSION -@@ -151,22 +151,22 @@ - dnl ****************************** - dnl Gnome App Lib checking - dnl ****************************** --dnl AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3) --dnl if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then --dnl vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \ --dnl awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'` --dnl if test "$vers" -ge 30000; then --dnl AC_MSG_RESULT(found) --dnl else --dnl AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3) --dnl fi --dnl else --dnl AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed) --dnl fi -+AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3) -+if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then -+ vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \ -+ awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'` -+ if test "$vers" -ge 30000; then -+ AC_MSG_RESULT(found) -+ else -+ AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3) -+ fi -+else -+ AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed) -+fi - - dnl add 'gal' to both of these if you want gal dependency --EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui` $ICONV_LIBS $UNICODE_LIBS" --EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade` $ICONV_CFLAGS $UNICODE_CFLAGS" -+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui gal` $ICONV_LIBS $UNICODE_LIBS" -+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade gal` $ICONV_CFLAGS $UNICODE_CFLAGS" - - AC_SUBST(EXTRA_GNOME_LIBS) - AC_SUBST(EXTRA_GNOME_CFLAGS) diff --git a/net/gabber/files/patch-ak b/net/gabber/files/patch-ak deleted file mode 100644 index 6edc8c35475d..000000000000 --- a/net/gabber/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/GabberUtility.cc.orig Thu Jan 18 12:39:58 2001 -+++ src/GabberUtility.cc Thu Jan 18 12:40:12 2001 -@@ -1,7 +1,7 @@ - - #include "GabberUtility.hh" - #include "Gabber.hh" --#include "e-unicode.h" -+#include <gal/widgets/e-unicode.h> - - using namespace jabberoo; - diff --git a/net/gabber/files/patch-al b/net/gabber/files/patch-al index ee8e5d30071f..1cb21d75c9ef 100644 --- a/net/gabber/files/patch-al +++ b/net/gabber/files/patch-al @@ -1,42 +1,26 @@ ---- configure.orig Thu Jan 18 08:27:41 2001 -+++ configure Mon Jan 29 23:54:52 2001 -@@ -4900,9 +4900,9 @@ - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" +--- configure.orig Wed Mar 28 19:22:35 2001 ++++ configure Thu Apr 19 12:54:15 2001 +@@ -4974,5 +4974,5 @@ CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:4906: checking for iconv in -liconv" >&5 +-echo "configure:4978: checking for iconv in -liconv" >&5 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:4906: checking for iconv in -lgiconv" >&5 ++echo "configure:4978: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4910,7 +4910,7 @@ - #line 4911 "configure" - #include "confdefs.h" +@@ -4984,3 +4984,3 @@ -#include <iconv.h> +#include <giconv.h> - int main() { - -@@ -4933,7 +4933,7 @@ - - echo "$ac_t""$ac_cv_libiconv" 1>&6 +@@ -5007,3 +5007,3 @@ if test $ac_cv_libiconv = yes; then - ICONV_LIBS="$ICONV_LIBS -liconv" + ICONV_LIBS="$ICONV_LIBS -lgiconv" have_iconv=yes - else - CFLAGS="$save_CFLAGS" -@@ -5059,7 +5059,7 @@ - #line 5060 "configure" - #include "confdefs.h" +@@ -5133,3 +5133,3 @@ -#include <iconv.h> +#include <giconv.h> #include <stdlib.h> - #include <string.h> - #ifdef HAVE_GNU_GET_LIBC_VERSION diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am index 2aef3a0a4ea5..9ac7b8700186 100644 --- a/net/gabber/files/patch-am +++ b/net/gabber/files/patch-am @@ -1,11 +1,7 @@ ---- src/Makefile.in.orig Thu Jan 18 08:32:41 2001 -+++ src/Makefile.in Mon Jan 29 23:59:01 2001 -@@ -148,7 +148,7 @@ - gabber_SOURCES = main.cc xtext.h xtext.c e-cache.h e-cache.c e-font.h e-font.c e-unicode.h e-unicode.c TCPTransmitter.hh TCPTransmitter.cc GabberLogger.hh GabberLogger.cc GabberUtility.hh GabberUtility.cc ConfigManager.hh ConfigManager.cc GabberApp.hh GabberApp.cc BaseGabberWindow.hh BaseGabberWindow.cc GabberWin.hh GabberWin.cc ChatView.hh ChatView.cc RosterView.hh RosterView.cc LoginDlg.hh LoginDlg.cc SubscriptionRequestDlg.hh SubscriptionRequestDlg.cc PrefsWin.hh PrefsWin.cc GCJoinDlg.hh GCJoinDlg.cc EditUserDlg.hh EditUserDlg.cc EasyOptionMenu.hh EasyOptionMenu.cc StatusDlg.hh StatusDlg.cc AddToGroupDlg.hh AddToGroupDlg.cc AddUserDruid.hh AddUserDruid.cc WelcomeDruid.hh WelcomeDruid.cc UserInfoWin.hh UserInfoWin.cc StatusDock.hh StatusDock.cc RawXML.hh RawXML.cc HistoryDlg.hh HistoryDlg.cc TransInfoDlg.hh TransInfoDlg.cc AgentInterface.hh AgentInterface.cc FilterInterface.hh FilterInterface.cc EditGroupsDlg.hh EditGroupsDlg.cc MessageManager.hh MessageManager.cc MessageViews.hh MessageViews.cc GPGInterface.hh GPGInterface.cc GabberGPG.hh GabberGPG.cc $(ssl_sources) +--- src/Makefile.in.orig Wed Mar 14 16:07:36 2001 ++++ src/Makefile.in Wed Mar 28 14:52:10 2001 +@@ -156,3 +156,3 @@ - --gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -+gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -liconv - - gabber_LDFLAGS = @GABBER_STATIC@ +-gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml ++gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -lgiconv diff --git a/net/gabber/files/patch-ao b/net/gabber/files/patch-ao deleted file mode 100644 index 673ba27ee2c3..000000000000 --- a/net/gabber/files/patch-ao +++ /dev/null @@ -1,11 +0,0 @@ ---- jabberoo/src/Makefile.in.orig Tue Jan 30 02:10:13 2001 -+++ jabberoo/src/Makefile.in Tue Jan 30 02:10:32 2001 -@@ -74,7 +74,7 @@ - libjabberoo_a_LIBS = ../expat/libexpat.a @SIGC_LIBS@ - INCLUDES = -I../include @SIGC_CFLAGS@ - --CXXFLAGS = -O2 -+#CXXFLAGS = -O2 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = - LIBRARIES = $(noinst_LIBRARIES) diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist index 6af8f7bfe356..182720afab38 100644 --- a/net/gabber/pkg-plist +++ b/net/gabber/pkg-plist @@ -1,62 +1,103 @@ bin/gabber etc/sound/events/gabber.soundlist -share/locale/da/LC_MESSAGES/gabber.mo -share/locale/de/LC_MESSAGES/gabber.mo -share/locale/fr/LC_MESSAGES/gabber.mo -share/locale/ru/LC_MESSAGES/gabber.mo -share/gnome/gabber/gabber.glade +share/gnome/apps/Internet/gabber.desktop +share/gnome/gabber/AUDruid_win.glade +share/gnome/gabber/AgentBrowser_dlg.glade +share/gnome/gabber/Autoupdate_dlg.glade +share/gnome/gabber/ContactInfo_dlg.glade +share/gnome/gabber/ContactRecv_dlg.glade +share/gnome/gabber/ContactSend_dlg.glade +share/gnome/gabber/EditGroups_dlg.glade +share/gnome/gabber/FilterList_dlg.glade +share/gnome/gabber/Filter_dlg.glade +share/gnome/gabber/GCIRecv_dlg.glade +share/gnome/gabber/GCI_dlg.glade +share/gnome/gabber/GCJoin_dlg.glade +share/gnome/gabber/GC_win.glade +share/gnome/gabber/GPGInfo_dlg.glade +share/gnome/gabber/GPGPass_dlg.glade +share/gnome/gabber/Gabber_win.glade +share/gnome/gabber/IgnoreAdd_dlg.glade +share/gnome/gabber/Ignore_dlg.glade +share/gnome/gabber/Login_dlg.glade +share/gnome/gabber/Message_win.glade +share/gnome/gabber/MyContactInfo_win.glade +share/gnome/gabber/OOOChat_win.glade +share/gnome/gabber/Prefs_win.glade +share/gnome/gabber/RawXML_dlg.glade +share/gnome/gabber/RegDruid_win.glade +share/gnome/gabber/Status_dlg.glade +share/gnome/gabber/SubscriptionRequest_dlg.glade +share/gnome/gabber/TransInfo_dlg.glade +share/gnome/gabber/Welcome_win.glade share/gnome/gabber/gabber-logs.css +share/gnome/gabber/glade-add-group-menu.xpm +share/gnome/gabber/glade-alert.xpm +share/gnome/gabber/glade-blank.xpm +share/gnome/gabber/glade-contact.xpm +share/gnome/gabber/glade-delete-user-menu.xpm +share/gnome/gabber/glade-delete-user.xpm +share/gnome/gabber/glade-edit-group-menu.xpm +share/gnome/gabber/glade-edit-user-menu.xpm +share/gnome/gabber/glade-edit-user.xpm share/gnome/gabber/glade-gabber-logo.png +share/gnome/gabber/glade-gabber-sideways.png +share/gnome/gabber/glade-gci.xpm +share/gnome/gabber/glade-group.xpm +share/gnome/gabber/glade-groupchat-menu.xpm +share/gnome/gabber/glade-groupchat.xpm share/gnome/gabber/glade-message.xpm +share/gnome/gabber/glade-new-user-menu.xpm +share/gnome/gabber/glade-new-user.xpm +share/gnome/gabber/glade-noclose.xpm share/gnome/gabber/glade-ooochat.xpm -share/gnome/gabber/glade-blank.xpm share/gnome/gabber/glade-s10n.xpm -share/gnome/gabber/glade-new-user.xpm -share/gnome/gabber/glade-new-user-menu.xpm -share/gnome/gabber/glade-edit-user.xpm -share/gnome/gabber/glade-edit-user-menu.xpm -share/gnome/gabber/glade-edit-group-menu.xpm -share/gnome/gabber/glade-delete-user.xpm -share/gnome/gabber/glade-delete-user-menu.xpm -share/gnome/gabber/glade-groupchat.xpm -share/gnome/gabber/glade-groupchat-menu.xpm -share/gnome/gabber/glade-users.xpm -share/gnome/gabber/glade-sendasooo.xpm +share/gnome/gabber/glade-send-contact-menu.xpm +share/gnome/gabber/glade-send-gci.xpm share/gnome/gabber/glade-sendasnormal.xpm -share/gnome/gabber/glade-noclose.xpm -share/gnome/gabber/glade-gabber-sideways.png +share/gnome/gabber/glade-sendasooo.xpm +share/gnome/gabber/glade-unlock-key.xpm +share/gnome/gabber/glade-users.xpm +share/gnome/gabber/gpg-badsigned.xpm share/gnome/gabber/gpg-encrypted.xpm -share/gnome/gabber/gpg-unencrypted.xpm share/gnome/gabber/gpg-signed.xpm -share/gnome/gabber/gpg-badsigned.xpm +share/gnome/gabber/gpg-unencrypted.xpm share/gnome/gabber/gpg-unsigned.xpm -share/gnome/gabber/glade-alert.xpm -share/gnome/gabber/glade-unlock-key.xpm -share/gnome/pixmaps/gabber.png -share/gnome/pixmaps/gabber/away.xpm -share/gnome/pixmaps/gabber/chat.xpm -share/gnome/pixmaps/gabber/dnd.xpm -share/gnome/pixmaps/gabber/offline.xpm -share/gnome/pixmaps/gabber/online.xpm -share/gnome/pixmaps/gabber/stalker.xpm -share/gnome/pixmaps/gabber/xa.xpm -share/gnome/pixmaps/gabber/gnome-gabber.xpm -share/gnome/pixmaps/gabber/gnome-message.xpm -share/gnome/pixmaps/gabber/gnome-ooochat.xpm -share/gnome/pixmaps/gabber/gnome-s10n.xpm -share/gnome/sounds/Gabber/gabber_message_queue.wav -share/gnome/sounds/Gabber/gabber_message_recv.wav -share/gnome/sounds/Gabber/gabber_ooochat_queue.wav -share/gnome/sounds/Gabber/gabber_ooochat_recv.wav -share/gnome/sounds/Gabber/gabber_online.wav -share/gnome/sounds/Gabber/gabber_offline.wav -share/gnome/sounds/Gabber/gabber_encrypted.wav -share/gnome/sounds/Gabber/gabber_subrequest.wav -share/gnome/sounds/Gabber/gabber_startup.wav -share/gnome/sounds/Gabber/gabber_connected.wav -share/gnome/help/gabber/C/index.html -share/gnome/help/gabber/C/topic.dat +share/gnome/gabber/offline.xpm +share/gnome/help/gabber/C/agents-search.html +share/gnome/help/gabber/C/agents.html +share/gnome/help/gabber/C/authors.html +share/gnome/help/gabber/C/bugs.html +share/gnome/help/gabber/C/docbook.css +share/gnome/help/gabber/C/first.html +share/gnome/help/gabber/C/first.png share/gnome/help/gabber/C/gabber.sgml +share/gnome/help/gabber/C/index.html +share/gnome/help/gabber/C/intro.html +share/gnome/help/gabber/C/license.html +share/gnome/help/gabber/C/login.html +share/gnome/help/gabber/C/login.png +share/gnome/help/gabber/C/main-menubar.html +share/gnome/help/gabber/C/main-status.html +share/gnome/help/gabber/C/main-toolbar.html +share/gnome/help/gabber/C/main.html +share/gnome/help/gabber/C/main.png +share/gnome/help/gabber/C/msg-gc.html +share/gnome/help/gabber/C/msg-normal.html +share/gnome/help/gabber/C/msg-normal.png +share/gnome/help/gabber/C/msg-ooo.html +share/gnome/help/gabber/C/msg-ooo.png +share/gnome/help/gabber/C/msg-que.html +share/gnome/help/gabber/C/msg-rules.html +share/gnome/help/gabber/C/msg.html +share/gnome/help/gabber/C/panel.html +share/gnome/help/gabber/C/pref-appearance.html +share/gnome/help/gabber/C/pref-autoaway.html +share/gnome/help/gabber/C/pref-connection.html +share/gnome/help/gabber/C/pref-encryption.html +share/gnome/help/gabber/C/pref-logs.html +share/gnome/help/gabber/C/pref-msg.html +share/gnome/help/gabber/C/pref.html share/gnome/help/gabber/C/stylesheet-images/caution.gif share/gnome/help/gabber/C/stylesheet-images/home.gif share/gnome/help/gabber/C/stylesheet-images/important.gif @@ -69,31 +110,59 @@ share/gnome/help/gabber/C/stylesheet-images/toc-minus.gif share/gnome/help/gabber/C/stylesheet-images/toc-plus.gif share/gnome/help/gabber/C/stylesheet-images/up.gif share/gnome/help/gabber/C/stylesheet-images/warning.gif -share/gnome/help/gabber/C/agents.html -share/gnome/help/gabber/C/authors.html -share/gnome/help/gabber/C/bugs.html -share/gnome/help/gabber/C/first.html -share/gnome/help/gabber/C/license.html -share/gnome/help/gabber/C/ln7.html -share/gnome/help/gabber/C/login.html -share/gnome/help/gabber/C/main.html -share/gnome/help/gabber/C/msg.html -share/gnome/help/gabber/C/panel.html -share/gnome/help/gabber/C/pref.html +share/gnome/help/gabber/C/topic.dat +share/gnome/help/gabber/C/userinfo-vcard.html share/gnome/help/gabber/C/userinfo.html +share/gnome/help/gabber/C/users-adduser.html +share/gnome/help/gabber/C/users-deluser.html +share/gnome/help/gabber/C/users-edituser.html +share/gnome/help/gabber/C/users-history.html +share/gnome/help/gabber/C/users-ignore.html +share/gnome/help/gabber/C/users-send.html share/gnome/help/gabber/C/users.html -share/gnome/help/gabber/C/docbook.css -share/gnome/help/gabber/C/first.png -share/gnome/help/gabber/C/login.png -share/gnome/help/gabber/C/main.png -share/gnome/help/gabber/C/msg-normal.png -share/gnome/help/gabber/C/msg-ooo.png -share/gnome/apps/Internet/gabber.desktop +share/gnome/omf/gabber/gabber-C.omf +share/gnome/pixmaps/gabber.png +share/gnome/pixmaps/gabber/away.xpm +share/gnome/pixmaps/gabber/chat.xpm +share/gnome/pixmaps/gabber/dnd.xpm +share/gnome/pixmaps/gabber/gnome-editgroups.xpm +share/gnome/pixmaps/gabber/gnome-gabber.xpm +share/gnome/pixmaps/gabber/gnome-gpg.xpm +share/gnome/pixmaps/gabber/gnome-groupchat.xpm +share/gnome/pixmaps/gabber/gnome-message.xpm +share/gnome/pixmaps/gabber/gnome-ooochat.xpm +share/gnome/pixmaps/gabber/gnome-s10n.xpm +share/gnome/pixmaps/gabber/gnome-userinfo.xpm +share/gnome/pixmaps/gabber/offline.xpm +share/gnome/pixmaps/gabber/online.xpm +share/gnome/pixmaps/gabber/stalker.xpm +share/gnome/pixmaps/gabber/xa.xpm +share/gnome/sounds/Gabber/gabber_connected.wav +share/gnome/sounds/Gabber/gabber_encrypted.wav +share/gnome/sounds/Gabber/gabber_message_queue.wav +share/gnome/sounds/Gabber/gabber_message_recv.wav +share/gnome/sounds/Gabber/gabber_offline.wav +share/gnome/sounds/Gabber/gabber_online.wav +share/gnome/sounds/Gabber/gabber_ooochat_queue.wav +share/gnome/sounds/Gabber/gabber_ooochat_recv.wav +share/gnome/sounds/Gabber/gabber_startup.wav +share/gnome/sounds/Gabber/gabber_subrequest.wav +share/locale/da/LC_MESSAGES/gabber.mo +share/locale/de/LC_MESSAGES/gabber.mo +share/locale/es/LC_MESSAGES/gabber.mo +share/locale/fi/LC_MESSAGES/gabber.mo +share/locale/fr/LC_MESSAGES/gabber.mo +share/locale/nl/LC_MESSAGES/gabber.mo +share/locale/no/LC_MESSAGES/gabber.mo +share/locale/ru/LC_MESSAGES/gabber.mo +share/locale/sv/LC_MESSAGES/gabber.mo +share/locale/tr/LC_MESSAGES/gabber.mo @unexec rmdir %D/etc/sound/events 2>/dev/null || true @unexec rmdir %D/etc/sound 2>/dev/null || true -@dirrm share/gnome/gabber -@dirrm share/gnome/pixmaps/gabber @dirrm share/gnome/sounds/Gabber +@dirrm share/gnome/pixmaps/gabber +@dirrm share/gnome/omf/gabber @dirrm share/gnome/help/gabber/C/stylesheet-images @dirrm share/gnome/help/gabber/C @dirrm share/gnome/help/gabber +@dirrm share/gnome/gabber diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net/gnomeicu/files/patch-configure b/net/gnomeicu/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net/gnomeicu/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net/gnomeicu/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net/gnomeicu/gnomeicu/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net/gnomeicu2/files/patch-configure b/net/gnomeicu2/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net/gnomeicu2/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net/gnomeicu2/files/patch-src::kanji_conv.c b/net/gnomeicu2/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net/gnomeicu2/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/news/pan/Makefile b/news/pan/Makefile index 80d02c1d8cc9..86d654c3c863 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -6,14 +6,13 @@ # PORTNAME= pan -PORTVERSION= 0.9.3 +PORTVERSION= 0.9.6 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/${PORTVERSION}/ MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml +LIB_DEPENDS= gtkhtml.10:${PORTSDIR}/www/gtkhtml USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/news/pan/distinfo b/news/pan/distinfo index 744682d6e656..5b176c3c1792 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -1 +1 @@ -MD5 (pan-0.9.3.tar.bz2) = e53d513162a63dc3ed0daef520d6eefa +MD5 (pan-0.9.6.tar.bz2) = 0b94b871aa4c99a847fe10e1ba4be916 diff --git a/news/pan2/Makefile b/news/pan2/Makefile index 80d02c1d8cc9..86d654c3c863 100644 --- a/news/pan2/Makefile +++ b/news/pan2/Makefile @@ -6,14 +6,13 @@ # PORTNAME= pan -PORTVERSION= 0.9.3 +PORTVERSION= 0.9.6 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/${PORTVERSION}/ MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml +LIB_DEPENDS= gtkhtml.10:${PORTSDIR}/www/gtkhtml USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/news/pan2/distinfo b/news/pan2/distinfo index 744682d6e656..5b176c3c1792 100644 --- a/news/pan2/distinfo +++ b/news/pan2/distinfo @@ -1 +1 @@ -MD5 (pan-0.9.3.tar.bz2) = e53d513162a63dc3ed0daef520d6eefa +MD5 (pan-0.9.6.tar.bz2) = 0b94b871aa4c99a847fe10e1ba4be916 diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index a09ddce7fa3e..d468fdb63207 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -6,17 +6,13 @@ # PORTNAME= medusa -PORTVERSION= 0.3.0 +PORTVERSION= 0.5.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/medusa MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= oaf.0:${PORTSDIR}/devel/oaf \ - gnomevfs.0:${PORTSDIR}/devel/gnomevfs \ - gconf-1.1:${PORTSDIR}/devel/gconf - USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= yes @@ -25,6 +21,11 @@ CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +MAN1= medusa-config.1 medusa-idled.1 msearch.1 +MAN5= medusa.conf.5 medusa-file-index-stoplist.5 +MAN7= medusa-search-uri.7 +MAN8= medusa-searchd.8 + pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo index 73277c115dc7..093f228950c6 100644 --- a/sysutils/medusa/distinfo +++ b/sysutils/medusa/distinfo @@ -1 +1 @@ -MD5 (medusa-0.3.0.tar.gz) = 36fb25ff70d8983c625fd9bf31f995aa +MD5 (medusa-0.5.0.tar.gz) = 6c93b219bfeccb5456570c2a464b72fb diff --git a/sysutils/medusa/files/patch-aa b/sysutils/medusa/files/patch-aa index 3e1c22c5e37b..e7173e2122b8 100644 --- a/sysutils/medusa/files/patch-aa +++ b/sysutils/medusa/files/patch-aa @@ -6,14 +6,20 @@ +#define O_SYNC 0 +#endif file_descriptor = open (file_name, O_RDWR | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR); ---- libmedusa/medusa-index-progress.c.orig Mon Oct 16 16:46:51 2000 -+++ libmedusa/medusa-index-progress.c Fri Nov 3 11:38:01 2000 -@@ -90,2 +90,5 @@ - g_return_val_if_fail (disk_information_was_found, NULL); +--- libmedusa/medusa-index-progress.c.orig Thu Feb 22 06:58:11 2001 ++++ libmedusa/medusa-index-progress.c Fri Mar 2 13:40:31 2001 +@@ -56,3 +56,5 @@ + #elif HAVE_STATFS ++#ifndef __FreeBSD__ + # include <sys/statfs.h> ++#endif + #else +@@ -90,2 +92,5 @@ + unlink (INDEX_PROGRESS_FILE_NAME); +#ifdef __FreeBSD__ +#define O_SYNC 0 +#endif - output_fd = open (INDEX_PROGRESS_FILE_NAME, O_RDWR | O_CREAT | O_EXCL | O_SYNC); + } --- libmedusa/medusa-unindexed-search.c.orig Wed Sep 20 14:03:58 2000 +++ libmedusa/medusa-unindexed-search.c Fri Nov 3 11:38:30 2000 @@ -1068,2 +1068,5 @@ diff --git a/sysutils/medusa/files/patch-af b/sysutils/medusa/files/patch-af index 5b9286b2a6fd..4179bfc65b31 100644 --- a/sysutils/medusa/files/patch-af +++ b/sysutils/medusa/files/patch-af @@ -8,8 +8,8 @@ -#include <sys/types.h> #include <sys/un.h> ---- indexer/medusa-file-index-daemon.c.orig Wed Jan 17 21:55:16 2001 -+++ indexer/medusa-file-index-daemon.c Mon Jan 29 13:42:35 2001 +--- indexer/medusa-file-index-daemon.c.orig Thu Feb 22 06:58:10 2001 ++++ indexer/medusa-file-index-daemon.c Fri Mar 2 13:46:16 2001 @@ -44,3 +44,8 @@ #include <sys/un.h> +#ifdef __FreeBSD__ @@ -18,4 +18,10 @@ +#else #include <sys/vfs.h> +#endif - #include <time.h> + +@@ -49,3 +54,5 @@ + #elif defined(HAVE_STATFS) ++#ifndef __FreeBSD__ + #include <sys/statfs.h> ++#endif + #endif /* HAVE_STATVFS */ diff --git a/sysutils/medusa/files/patch-ah b/sysutils/medusa/files/patch-ah new file mode 100644 index 000000000000..4ccf7ffb4f61 --- /dev/null +++ b/sysutils/medusa/files/patch-ah @@ -0,0 +1,28 @@ +--- search-service/medusa-file-search-daemon.c.orig Wed Feb 21 01:33:37 2001 ++++ search-service/medusa-file-search-daemon.c Fri Mar 2 16:11:21 2001 +@@ -204,2 +204,17 @@ + ++#ifdef __FreeBSD__ ++#include <sys/wait.h> ++ ++static void ++grim_reaper(int signo) ++{ ++ pid_t pid; ++ int stat; ++ ++ while ((pid = waitpid(-1, &stat, WNOHANG)) > 0) ++ ; ++ return; ++} ++#endif ++ + int main (int argc, char *argv[]) +@@ -273,3 +288,7 @@ + in the Unix Environment", page 280) */ ++#ifdef __FreeBSD__ ++ signal (SIGCHLD, grim_reaper); ++#else + signal (SIGCLD, SIG_IGN); ++#endif + diff --git a/sysutils/medusa/pkg-plist b/sysutils/medusa/pkg-plist index 37342825877d..7361d9bf93d1 100644 --- a/sysutils/medusa/pkg-plist +++ b/sysutils/medusa/pkg-plist @@ -10,11 +10,15 @@ include/libmedusa/medusa-index-progress.h include/libmedusa/medusa-index-service-private.h include/libmedusa/medusa-index-service.h include/libmedusa/medusa-indexed-search.h +include/libmedusa/medusa-lock-file-paths.h +include/libmedusa/medusa-lock.h include/libmedusa/medusa-log.h include/libmedusa/medusa-search-service-private.h include/libmedusa/medusa-search-service.h include/libmedusa/medusa-service-private.h +include/libmedusa/medusa-stdio-extensions.h include/libmedusa/medusa-string.h +include/libmedusa/medusa-system-state.h include/libmedusa/medusa-unindexed-search.h include/libmedusa/medusa-unsearched-locations.h include/libmedusa/medusa-utils.h diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 6b045d0f6e7b..439ad1446603 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -6,19 +6,16 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ - ghttp.1:${PORTSDIR}/www/libghttp \ - wwwzip.1:${PORTSDIR}/www/libwww \ - gconf-1.1:${PORTSDIR}/devel/gconf \ +LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ pspell.4:${PORTSDIR}/textproc/pspell \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo index 20554d4fdabd..6ff5d3fdadf9 100644 --- a/www/gtkhtml/distinfo +++ b/www/gtkhtml/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.8.2.tar.gz) = 3ade33b17db2eefdfe0e8a2f26effe8b +MD5 (gtkhtml-0.9.2.tar.gz) = 538bd169b875a06d68be74fe7176a8f7 diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist index 6243c1958f0f..2580bafd2442 100644 --- a/www/gtkhtml/pkg-plist +++ b/www/gtkhtml/pkg-plist @@ -60,6 +60,7 @@ include/gtkhtml/htmllinktext.h include/gtkhtml/htmllist.h include/gtkhtml/htmlobject.h include/gtkhtml/htmlpainter.h +include/gtkhtml/htmlplainpainter.h include/gtkhtml/htmlprinter.h include/gtkhtml/htmlradio.h include/gtkhtml/htmlreplace.h @@ -72,6 +73,7 @@ include/gtkhtml/htmlstack.h include/gtkhtml/htmlstringtokenizer.h include/gtkhtml/htmltable.h include/gtkhtml/htmltablecell.h +include/gtkhtml/htmltablepriv.h include/gtkhtml/htmltext.h include/gtkhtml/htmltextarea.h include/gtkhtml/htmltextinput.h @@ -85,7 +87,7 @@ include/gtkhtml/htmlvspace.h lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.8 +lib/libgtkhtml.so.10 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/gtkhtml/Editor.idl @@ -98,8 +100,8 @@ share/gnome/html/gtkhtml-sections.txt share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oafinfo -share/gnome/oaf/GNOME_GtkHTML_Editor.oafinfo +share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf +share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml share/locale/az/LC_MESSAGES/gtkhtml.mo share/locale/cs/LC_MESSAGES/gtkhtml.mo diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 6b045d0f6e7b..439ad1446603 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -6,19 +6,16 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ - ghttp.1:${PORTSDIR}/www/libghttp \ - wwwzip.1:${PORTSDIR}/www/libwww \ - gconf-1.1:${PORTSDIR}/devel/gconf \ +LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ pspell.4:${PORTSDIR}/textproc/pspell \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 20554d4fdabd..6ff5d3fdadf9 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.8.2.tar.gz) = 3ade33b17db2eefdfe0e8a2f26effe8b +MD5 (gtkhtml-0.9.2.tar.gz) = 538bd169b875a06d68be74fe7176a8f7 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 6243c1958f0f..2580bafd2442 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -60,6 +60,7 @@ include/gtkhtml/htmllinktext.h include/gtkhtml/htmllist.h include/gtkhtml/htmlobject.h include/gtkhtml/htmlpainter.h +include/gtkhtml/htmlplainpainter.h include/gtkhtml/htmlprinter.h include/gtkhtml/htmlradio.h include/gtkhtml/htmlreplace.h @@ -72,6 +73,7 @@ include/gtkhtml/htmlstack.h include/gtkhtml/htmlstringtokenizer.h include/gtkhtml/htmltable.h include/gtkhtml/htmltablecell.h +include/gtkhtml/htmltablepriv.h include/gtkhtml/htmltext.h include/gtkhtml/htmltextarea.h include/gtkhtml/htmltextinput.h @@ -85,7 +87,7 @@ include/gtkhtml/htmlvspace.h lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.8 +lib/libgtkhtml.so.10 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/gtkhtml/Editor.idl @@ -98,8 +100,8 @@ share/gnome/html/gtkhtml-sections.txt share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oafinfo -share/gnome/oaf/GNOME_GtkHTML_Editor.oafinfo +share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf +share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml share/locale/az/LC_MESSAGES/gtkhtml.mo share/locale/cs/LC_MESSAGES/gtkhtml.mo diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 6b045d0f6e7b..439ad1446603 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -6,19 +6,16 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ - ghttp.1:${PORTSDIR}/www/libghttp \ - wwwzip.1:${PORTSDIR}/www/libwww \ - gconf-1.1:${PORTSDIR}/devel/gconf \ +LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ pspell.4:${PORTSDIR}/textproc/pspell \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 20554d4fdabd..6ff5d3fdadf9 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.8.2.tar.gz) = 3ade33b17db2eefdfe0e8a2f26effe8b +MD5 (gtkhtml-0.9.2.tar.gz) = 538bd169b875a06d68be74fe7176a8f7 diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index 6243c1958f0f..2580bafd2442 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -60,6 +60,7 @@ include/gtkhtml/htmllinktext.h include/gtkhtml/htmllist.h include/gtkhtml/htmlobject.h include/gtkhtml/htmlpainter.h +include/gtkhtml/htmlplainpainter.h include/gtkhtml/htmlprinter.h include/gtkhtml/htmlradio.h include/gtkhtml/htmlreplace.h @@ -72,6 +73,7 @@ include/gtkhtml/htmlstack.h include/gtkhtml/htmlstringtokenizer.h include/gtkhtml/htmltable.h include/gtkhtml/htmltablecell.h +include/gtkhtml/htmltablepriv.h include/gtkhtml/htmltext.h include/gtkhtml/htmltextarea.h include/gtkhtml/htmltextinput.h @@ -85,7 +87,7 @@ include/gtkhtml/htmlvspace.h lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.8 +lib/libgtkhtml.so.10 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/gtkhtml/Editor.idl @@ -98,8 +100,8 @@ share/gnome/html/gtkhtml-sections.txt share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oafinfo -share/gnome/oaf/GNOME_GtkHTML_Editor.oafinfo +share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf +share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml share/locale/az/LC_MESSAGES/gtkhtml.mo share/locale/cs/LC_MESSAGES/gtkhtml.mo diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 6b045d0f6e7b..439ad1446603 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -6,19 +6,16 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \ - ghttp.1:${PORTSDIR}/www/libghttp \ - wwwzip.1:${PORTSDIR}/www/libwww \ - gconf-1.1:${PORTSDIR}/devel/gconf \ +LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ pspell.4:${PORTSDIR}/textproc/pspell \ - gal.4:${PORTSDIR}/x11-toolkits/gal + gal.6:${PORTSDIR}/x11-toolkits/gal USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo index 20554d4fdabd..6ff5d3fdadf9 100644 --- a/www/libgtkhtml/distinfo +++ b/www/libgtkhtml/distinfo @@ -1 +1 @@ -MD5 (gtkhtml-0.8.2.tar.gz) = 3ade33b17db2eefdfe0e8a2f26effe8b +MD5 (gtkhtml-0.9.2.tar.gz) = 538bd169b875a06d68be74fe7176a8f7 diff --git a/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist index 6243c1958f0f..2580bafd2442 100644 --- a/www/libgtkhtml/pkg-plist +++ b/www/libgtkhtml/pkg-plist @@ -60,6 +60,7 @@ include/gtkhtml/htmllinktext.h include/gtkhtml/htmllist.h include/gtkhtml/htmlobject.h include/gtkhtml/htmlpainter.h +include/gtkhtml/htmlplainpainter.h include/gtkhtml/htmlprinter.h include/gtkhtml/htmlradio.h include/gtkhtml/htmlreplace.h @@ -72,6 +73,7 @@ include/gtkhtml/htmlstack.h include/gtkhtml/htmlstringtokenizer.h include/gtkhtml/htmltable.h include/gtkhtml/htmltablecell.h +include/gtkhtml/htmltablepriv.h include/gtkhtml/htmltext.h include/gtkhtml/htmltextarea.h include/gtkhtml/htmltextinput.h @@ -85,7 +87,7 @@ include/gtkhtml/htmlvspace.h lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.8 +lib/libgtkhtml.so.10 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/gtkhtml/Editor.idl @@ -98,8 +100,8 @@ share/gnome/html/gtkhtml-sections.txt share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oafinfo -share/gnome/oaf/GNOME_GtkHTML_Editor.oafinfo +share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf +share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml share/locale/az/LC_MESSAGES/gtkhtml.mo share/locale/cs/LC_MESSAGES/gtkhtml.mo diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index cec3b027a7a1..67941553d6a9 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -6,22 +6,22 @@ # PORTNAME= nautilus -PORTVERSION= 0.8 +PORTVERSION= 1.0.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= unstable/sources/nautilus +MASTER_SITE_SUBDIR= stable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ - freetype-config:${PORTSDIR}/print/freetype2 # XXX +BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX +# The following is only needed if --with-eazel-services is brought in, +# which it isn't, because it depends on ammonite, which is Linux-only +# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm + LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - bz2.1:${PORTSDIR}/archivers/bzip2 \ freetype.6:${PORTSDIR}/print/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) MOZILLA= mozilla BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -34,12 +34,12 @@ USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ - --with-freetype2-include-place=${LOCALBASE}/include/freetype2 +CONFIGURE_ARGS= --with-freetype2-lib-place=${X11BASE}/lib \ + --with-freetype2-include-place=${X11BASE}/include/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/mozilla MOZILLA_LIBS= "-L${X11BASE}/lib/${MOZILLA}" @@ -50,9 +50,11 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -.if !defined(WITH_MOZILLA) +MAN1= nautilus-xml-migrate.1 + +.if !defined(WITHOUT_MOZILLA) pre-extract: - @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" + @${ECHO} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA" .endif pre-patch: diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 554338f88a7e..11d30f6f75f6 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1 +1 @@ -MD5 (nautilus-0.8.tar.gz) = 26e6403619559477d02f1cabb7681e4c +MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa index 4f01381ab0bb..5c7b55cccce7 100644 --- a/x11-fm/nautilus/files/patch-aa +++ b/x11-fm/nautilus/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed Jan 31 17:42:11 2001 -+++ configure Wed Jan 31 17:52:50 2001 -@@ -41,9 +41,9 @@ - ac_help="$ac_help - --enable-eazel-services Enable support for Eazel services (default is no)" +--- configure.orig Mon Mar 12 19:48:16 2001 ++++ configure Fri Mar 16 15:02:38 2001 +@@ -45,5 +45,5 @@ ac_help="$ac_help - --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" @@ -13,49 +8,31 @@ $FreeBSD$ - --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help - --with-freetype2-prefix=PATH freetype2 installation prefix" - ac_help="$ac_help -@@ -2789,15 +2789,15 @@ - _found_freetype2="no" - +@@ -3216,4 +3216,4 @@ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. -if test "${with_freetype2_libraries+set}" = set; then - withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval - fi - - +@@ -3223,4 +3223,4 @@ # Check whether --with-freetype2-includes or --without-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval - fi - -@@ -2927,7 +2927,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3354,3 +3354,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2933 "configure" - #include "confdefs.h" -@@ -2967,7 +2967,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3394,3 +3394,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2973 "configure" - #include "confdefs.h" -@@ -2995,10 +2995,10 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -3422,6 +3422,6 @@ echo "$ac_t""yes" 1>&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -64,23 +41,13 @@ $FreeBSD$ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi - - else -@@ -3235,7 +3235,7 @@ - - CC="$_save_cc" +@@ -3662,3 +3662,3 @@ -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3598,7 +3598,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- rpm_libs=-lbz2 -+ rpm_libs="-lrpm -lbz2" - else - echo "$ac_t""no" 1>&6 +@@ -6117,3 +6117,3 @@ + if test x$SCROLLKEEPER_CONFIG = xno; then +- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; } ++ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2 fi diff --git a/x11-fm/nautilus/files/patch-ab b/x11-fm/nautilus/files/patch-ab index a46aeaaf19d8..169e4d76349d 100644 --- a/x11-fm/nautilus/files/patch-ab +++ b/x11-fm/nautilus/files/patch-ab @@ -1,13 +1,28 @@ ---- Makefile.in.orig Wed Aug 16 08:26:30 2000 -+++ Makefile.in Wed Aug 23 14:56:45 2000 -@@ -501,8 +501,8 @@ - $(mkinstalldirs) $(DESTDIR)/$(prefix)/bin - @list='nautilus-clean.sh'; for p in $$list; do\ +--- Makefile.in.orig Mon Mar 12 19:49:51 2001 ++++ Makefile.in Fri Mar 16 16:15:38 2001 +@@ -202,3 +202,3 @@ + +-SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po omf-install $(NULL) ++SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po $(NULL) + +@@ -607,4 +607,4 @@ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ - $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ +@@ -620,4 +620,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ + done +@@ -628,4 +628,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ done - diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac index 632cbbc8420a..8e4edd0bf3ab 100644 --- a/x11-fm/nautilus/files/patch-ac +++ b/x11-fm/nautilus/files/patch-ac @@ -1,54 +1,92 @@ $FreeBSD$ ---- libnautilus-extensions/nautilus-volume-monitor.c.orig Tue Jan 16 03:31:56 2001 -+++ libnautilus-extensions/nautilus-volume-monitor.c Wed Jan 31 21:29:21 2001 -@@ -60,7 +60,13 @@ - #include <fstab.h> +--- libnautilus-extensions/nautilus-volume-monitor.c.orig Sat Feb 24 01:54:34 2001 ++++ libnautilus-extensions/nautilus-volume-monitor.c Sun Mar 11 15:46:11 2001 +@@ -68,6 +68,12 @@ + #include <mntent.h> #endif +#ifdef __FreeBSD__ +#include <sys/param.h> +#include <sys/ucred.h> +#include <sys/mount.h> -+#else - #include <mntent.h> +#endif ++ + #ifdef HAVE_SYS_MNTTAB_H + #define SOLARIS_MNT 1 + #include <sys/mnttab.h> +@@ -327,6 +333,12 @@ + has_removable_mntent_options (struct mnttab *ent) + { - #ifdef MOUNT_AUDIO_CD ++#elif defined(__FreeBSD__) ++ ++static gboolean ++has_removable_mntent_options (struct fstab *ent) ++{ ++ + #else + + static gboolean +@@ -335,12 +347,18 @@ + + #endif /* HAVE_SYS_MNTTAB_H */ + ++#ifndef __FreeBSD__ + /* Use "owner" or "user" or "users" as our way of determining a removable volume */ + if (hasmntopt (ent, "user") != NULL + || hasmntopt (ent, "users") != NULL + || hasmntopt (ent, "owner") != NULL) { + return TRUE; + } ++#else ++ if (strstr (ent->fs_mntops, "noauto") != NULL) { ++ return TRUE; ++ } ++#endif -@@ -264,16 +270,25 @@ - GList * - nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor) + #if SOLARIS_MNT && HAVE_VOL + if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) { +@@ -360,23 +378,32 @@ + static GList * + get_removable_volumes (void) { +#ifndef __FreeBSD__ FILE *file; - GList *volumes; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; + struct mnttab *ent = &dummy_ent; + #else struct mntent *ent; -+#else -+ struct fstab *ent; -+#endif + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++struct fstab *ent; ++#endif /* __FreeBSD__ */ + GList *volumes; NautilusVolume *volume; volumes = NULL; +#ifndef __FreeBSD__ - file = setmntent (_PATH_MNTTAB, "r"); - g_return_val_if_fail (file != NULL, NULL); + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return NULL; + } +#else + setfsent(); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ - while ((ent = getmntent (file)) != NULL) { - /* Use noauto as our way of determining a removable volume */ - if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) { -@@ -281,6 +296,15 @@ - volume->device_path = g_strdup (ent->mnt_fsname); - volume->mount_path = g_strdup (ent->mnt_dir); + #if HAVE_SYS_MNTTAB_H + while (! getmntent (file, ent)) { + /* On Solaris look for /vol/ for determining a removable volume */ +@@ -396,12 +423,27 @@ volume->filesystem = g_strdup (ent->mnt_type); -+#else /* FreeBSD, probably ;) */ + + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ + while ((ent = getfsent ()) != NULL) { + /* Use noauto as our way of determining a removable volume */ + if (strstr (ent->fs_mntops, "noauto") != NULL) { @@ -56,11 +94,11 @@ $FreeBSD$ + volume->device_path = g_strdup (ent->fs_spec); + volume->mount_path = g_strdup (ent->fs_file); + volume->filesystem = g_strdup (ent->fs_vfstype); -+#endif - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - volumes = g_list_append (volumes, volume); -@@ -290,7 +314,11 @@ ++ volume->is_removable = TRUE; ++ volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL); ++#endif /* __FreeBSD__ */ + + volumes = mount_volume_add_filesystem (volume, volumes); } } @@ -72,62 +110,158 @@ $FreeBSD$ #ifdef MOUNT_AUDIO_CD volume = g_new0 (NautilusVolume, 1); -@@ -682,15 +710,27 @@ +@@ -419,6 +461,7 @@ + static gboolean + volume_is_removable (const NautilusVolume *volume) { - GList *current_mounts = NULL; - NautilusVolume *volume = NULL; +#ifndef __FreeBSD__ - FILE *fh; + FILE *file; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; +@@ -426,13 +469,21 @@ + #else + struct mntent *ent; + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++ struct fstab *ent; ++#endif /* __FreeBSD__ */ + ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ + + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + #if HAVE_SYS_MNTTAB_H + while (!getmntent (file, ent)) { + if (strcmp (volume->device_path, ent->mnt_special) == 0) { +@@ -455,8 +506,23 @@ + } + + #endif /* HAVE_SYS_MNTTAB_H */ +- ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ /* Use noauto as our way of determining a removable volume */ ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && has_removable_mntent_options (ent)) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++#endif /* __FreeBSD__ */ ++ ++ ++#ifndef __FreeBSD__ + fclose (file); ++#else ++ endfsent(); ++#endif + return FALSE; + } + +@@ -484,14 +550,23 @@ + } + } + #else ++#ifndef __FreeBSD__ + struct mntent *ent; +- ++#else ++ struct fstab *ent; ++#endif ++ ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } +- ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ ++ + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + while ((ent = getmntent (file)) != NULL) { + if (strcmp (volume->device_path, ent->mnt_fsname) == 0) { + if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) { +@@ -500,9 +575,21 @@ + } + } + } ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && strstr (ent->fs_type, FSTAB_RO) != NULL) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++ endfsent(); ++#endif + #endif + ++#ifndef __FreeBSD__ + fclose (file); ++#endif + return FALSE; + } + +@@ -975,14 +1062,26 @@ + + + #else ++#ifndef __FreeBSD__ char line[PATH_MAX * 3]; char device_name[sizeof (line)]; NautilusStringList *list; -+#else ++#else /* __FreeBSD__ */ + struct statfs *mounted; + int mounted_num; + int i; -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ /* Open /proc/mounts */ fh = fopen (PATH_PROC_MOUNTS, "r"); g_return_val_if_fail (fh != NULL, NULL); -+#else ++#else /* __FreeBSD__ */ + mounted_num = getmntinfo(&mounted, MNT_WAIT); + g_return_val_if_fail (mounted_num > 0, NULL); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ while (fgets (line, sizeof(line), fh)) { if (sscanf (line, "%s", device_name) == 1) { - list = nautilus_string_list_new_from_tokens (line, " ", FALSE); -@@ -702,17 +742,25 @@ + list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE); +@@ -995,11 +1094,20 @@ volume->device_path = nautilus_string_list_nth (list, 0); volume->mount_path = nautilus_string_list_nth (list, 1); volume->filesystem = nautilus_string_list_nth (list, 2); -- -+#else ++#else /* __FreeBSD__ */ + for (i = 0; i < mounted_num; i++) { + volume = g_new0 (NautilusVolume, 1); + volume->device_path = g_strdup(mounted[i].f_mntfromname); + volume->mount_path = g_strdup(mounted[i].f_mntonname); + volume->filesystem = g_strdup(mounted[i].f_fstypename); +#endif /* __FreeBSD__ */ - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - current_mounts = g_list_append (current_mounts, volume); - } else { - nautilus_volume_monitor_free_volume (volume); - } + current_mounts = mount_volume_add_filesystem (volume, current_mounts); +#ifndef __FreeBSD__ } nautilus_string_list_free (list); } } -+#endif ++#endif /* __FreeBSD__ */ } - #ifdef MOUNT_AUDIO_CD -@@ -728,7 +776,9 @@ + #endif /* SOLARIS_MNT */ +@@ -1019,7 +1127,9 @@ } #endif @@ -137,53 +271,7 @@ $FreeBSD$ return current_mounts; -@@ -889,6 +939,45 @@ - return TRUE; - } - -+#ifdef 0 -+#ifdef __FreeBSD__ -+static void -+fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent) -+{ -+ NautilusVolume *volume; -+ gboolean mounted; -+ -+ volume = g_new0 (NautilusVolume, 1); -+ volume->device_path = g_strdup(ent->fs_spec); -+ volume->mount_path = g_strdup(ent->fs_file); -+ -+ mounted = FALSE; -+ -+ if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) { -+ mounted = mount_volume_floppy_add (monitor, volume); -+ } else if (strcmp (ent->fs_vfstype, "ufs") == 0) { -+ mounted = mount_volume_ext2_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "nfs") == 0) { -+ mounted = mount_volume_nfs_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "cd9660") == 0) { -+ mounted = mount_volume_iso9660_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "msdos") == 0) { -+ mounted = mount_volume_msdos_add (volume); -+ } -+ -+ if (mounted) { -+ volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL; -+ monitor->details->volumes = g_list_append (monitor->details->volumes, volume); -+ mount_volume_add_aliases (monitor, volume->device_path, volume); -+ } else { -+ g_free (volume->device_path); -+ g_free (volume->mount_path); -+ g_free (volume); -+ } -+} -+#endif -+#endif -+ - static void - cdrom_ioctl_get_info (int fd) - { -@@ -1025,6 +1114,14 @@ +@@ -1375,6 +1485,14 @@ break; } } @@ -198,3 +286,12 @@ $FreeBSD$ } #endif +@@ -1869,7 +1987,7 @@ + } + + if (mounted) { +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__) + volume->is_removable = volume_is_removable (volume); + volume->is_read_only = volume_is_read_only (volume); + #endif /* SOLARIS_MNT */ diff --git a/x11-fm/nautilus/files/patch-xml-i18n-extract b/x11-fm/nautilus/files/patch-xml-i18n-extract deleted file mode 100644 index a21354cc11b4..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-extract +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-extract 2001/01/31 17:44:52 1.1 -+++ xml-i18n-extract 2001/01/31 17:45:08 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - # diff --git a/x11-fm/nautilus/files/patch-xml-i18n-merge b/x11-fm/nautilus/files/patch-xml-i18n-merge deleted file mode 100644 index 137e5978ddfd..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-merge +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-merge 2001/01/31 17:44:52 1.1 -+++ xml-i18n-merge 2001/01/31 17:45:16 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # - # The XML Translation Merge Tool diff --git a/x11-fm/nautilus/files/patch-xml-i18n-update b/x11-fm/nautilus/files/patch-xml-i18n-update deleted file mode 100644 index abdebb38482b..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-update +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-update 2001/01/31 17:44:52 1.1 -+++ xml-i18n-update 2001/01/31 17:45:22 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # The GNOME Translation Update Tool - # diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 1901db766717..5d4f6e3c0e56 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -15,19 +15,24 @@ bin/nautilus-launcher-applet %%MOZILLA:%%bin/nautilus-mozilla-content-view bin/nautilus-music-view bin/nautilus-notes +bin/nautilus-preferences-applet +bin/nautilus-restore-settings-to-default.sh bin/nautilus-sample-content-view bin/nautilus-sidebar-loser bin/nautilus-text-view bin/nautilus-throbber bin/nautilus-verify-rpm.sh +bin/nautilus-xml-migrate bin/run-nautilus etc/CORBA/servers/nautilus-launcher-applet.gnorba +etc/CORBA/servers/nautilus-preferences-applet.gnorba etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h include/libnautilus/nautilus-bonobo-workarounds.h include/libnautilus/nautilus-clipboard.h include/libnautilus/nautilus-distributed-undo.h +include/libnautilus/nautilus-idle-queue.h include/libnautilus/nautilus-undo-private.h include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h @@ -44,17 +49,236 @@ lib/libnautilus.so.0 lib/vfs/modules/libvfs-help.so share/gnome/apps/Applications/nautilus.desktop share/gnome/help/gnufdl/C/gnufdl.sgml -share/gnome/help/nautilus/C/custicon.png -share/gnome/help/nautilus/C/full.png -share/gnome/help/nautilus/C/license.html -share/gnome/help/nautilus/C/locbar.png -share/gnome/help/nautilus/C/nautilus.sgml -share/gnome/help/nautilus/C/player.png -share/gnome/help/nautilus/C/prefmenu.png -share/gnome/help/nautilus/C/sidebar.png -share/gnome/help/nautilus/C/viewmenu.png -share/gnome/hyperbola/maps/pages.map +share/gnome/help/gnugpl/C/gnugpl.sgml +share/gnome/help/nautilus-quick-reference/C/figures/emblems.png +share/gnome/help/nautilus-quick-reference/C/figures/find.png +share/gnome/help/nautilus-quick-reference/C/figures/full.png +share/gnome/help/nautilus-quick-reference/C/figures/locbar.png +share/gnome/help/nautilus-quick-reference/C/figures/menubar.png +share/gnome/help/nautilus-quick-reference/C/figures/music.png +share/gnome/help/nautilus-quick-reference/C/figures/navbar.png +share/gnome/help/nautilus-quick-reference/C/figures/patterns.png +share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/C/figures/softcat.png +share/gnome/help/nautilus-quick-reference/C/figures/storage.png +share/gnome/help/nautilus-quick-reference/C/figures/themes.png +share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/C/index.html +share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/es/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/es/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/es/figures/find_small.png +share/gnome/help/nautilus-quick-reference/es/figures/full_small.png +share/gnome/help/nautilus-quick-reference/es/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/music_small.png +share/gnome/help/nautilus-quick-reference/es/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/softcat.png +share/gnome/help/nautilus-quick-reference/es/figures/storage.png +share/gnome/help/nautilus-quick-reference/es/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/es/index.html +share/gnome/help/nautilus-quick-reference/ko/figures/emblems.png +share/gnome/help/nautilus-quick-reference/ko/figures/find.png +share/gnome/help/nautilus-quick-reference/ko/figures/full.png +share/gnome/help/nautilus-quick-reference/ko/figures/locbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/menubar.png +share/gnome/help/nautilus-quick-reference/ko/figures/music.png +share/gnome/help/nautilus-quick-reference/ko/figures/navbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/patterns.png +share/gnome/help/nautilus-quick-reference/ko/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/ko/figures/softcat.png +share/gnome/help/nautilus-quick-reference/ko/figures/storage.png +share/gnome/help/nautilus-quick-reference/ko/figures/themes.png +share/gnome/help/nautilus-quick-reference/ko/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/ko/index.html +share/gnome/help/nautilus-quick-reference/no/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/no/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/no/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/no/figures/find_small.png +share/gnome/help/nautilus-quick-reference/no/figures/full_small.png +share/gnome/help/nautilus-quick-reference/no/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/music_small.png +share/gnome/help/nautilus-quick-reference/no/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/softcat.png +share/gnome/help/nautilus-quick-reference/no/figures/storage.png +share/gnome/help/nautilus-quick-reference/no/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/no/index.html +share/gnome/help/nautilus-quick-reference/sv/figures/emblems.png +share/gnome/help/nautilus-quick-reference/sv/figures/find.png +share/gnome/help/nautilus-quick-reference/sv/figures/full.png +share/gnome/help/nautilus-quick-reference/sv/figures/locbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/menubar.png +share/gnome/help/nautilus-quick-reference/sv/figures/music.png +share/gnome/help/nautilus-quick-reference/sv/figures/navbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/patterns.png +share/gnome/help/nautilus-quick-reference/sv/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/sv/figures/softcat.png +share/gnome/help/nautilus-quick-reference/sv/figures/storage.png +share/gnome/help/nautilus-quick-reference/sv/figures/themes.png +share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/sv/index.html +share/gnome/help/nautilus-release-notes/C/beta.html +share/gnome/help/nautilus-release-notes/C/docbook.css +share/gnome/help/nautilus-release-notes/C/index.html +share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml +share/gnome/help/nautilus-release-notes/C/mozilla.html +share/gnome/help/nautilus-release-notes/C/new10.html +share/gnome/help/nautilus-release-notes/C/new102.html +share/gnome/help/nautilus-release-notes/C/require.html +share/gnome/help/nautilus-release-notes/C/searching.html +share/gnome/help/nautilus-release-notes/C/session.html +share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/C/chapter1.html +share/gnome/help/nautilus-user-manual/C/chapter2.html +share/gnome/help/nautilus-user-manual/C/docbook.css +share/gnome/help/nautilus-user-manual/C/figures/custicon.png +share/gnome/help/nautilus-user-manual/C/figures/full-1.png +share/gnome/help/nautilus-user-manual/C/figures/full-2.png +share/gnome/help/nautilus-user-manual/C/figures/full-3.png +share/gnome/help/nautilus-user-manual/C/figures/full-4.png +share/gnome/help/nautilus-user-manual/C/figures/full-5.png +share/gnome/help/nautilus-user-manual/C/figures/full-6.png +share/gnome/help/nautilus-user-manual/C/figures/full.png +share/gnome/help/nautilus-user-manual/C/figures/link.png +share/gnome/help/nautilus-user-manual/C/figures/locbar.png +share/gnome/help/nautilus-user-manual/C/figures/noread.png +share/gnome/help/nautilus-user-manual/C/figures/nowrite.png +share/gnome/help/nautilus-user-manual/C/figures/part-1.png +share/gnome/help/nautilus-user-manual/C/figures/part-2.png +share/gnome/help/nautilus-user-manual/C/figures/part-3.png +share/gnome/help/nautilus-user-manual/C/figures/part.png +share/gnome/help/nautilus-user-manual/C/figures/player-1.png +share/gnome/help/nautilus-user-manual/C/figures/player-2.png +share/gnome/help/nautilus-user-manual/C/figures/player-3.png +share/gnome/help/nautilus-user-manual/C/figures/player-4.png +share/gnome/help/nautilus-user-manual/C/figures/player.png +share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/C/figures/sidebar.png +share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/C/gnome.html +share/gnome/help/nautilus-user-manual/C/home.html +share/gnome/help/nautilus-user-manual/C/index.html +share/gnome/help/nautilus-user-manual/C/introdesktop.html +share/gnome/help/nautilus-user-manual/C/ln21.html +share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/C/navigating.html +share/gnome/help/nautilus-user-manual/C/session.html +share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/chapter1.html +share/gnome/help/nautilus-user-manual/es/chapter2.html +share/gnome/help/nautilus-user-manual/es/default.html +share/gnome/help/nautilus-user-manual/es/docbook.css +share/gnome/help/nautilus-user-manual/es/figures/custicon.png +share/gnome/help/nautilus-user-manual/es/figures/full.png +share/gnome/help/nautilus-user-manual/es/figures/link.png +share/gnome/help/nautilus-user-manual/es/figures/locbar.png +share/gnome/help/nautilus-user-manual/es/figures/noread.png +share/gnome/help/nautilus-user-manual/es/figures/nowrite.png +share/gnome/help/nautilus-user-manual/es/figures/part.png +share/gnome/help/nautilus-user-manual/es/figures/player.png +share/gnome/help/nautilus-user-manual/es/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/es/figures/sidebar.png +share/gnome/help/nautilus-user-manual/es/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/es/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/es/gnome.html +share/gnome/help/nautilus-user-manual/es/home.html +share/gnome/help/nautilus-user-manual/es/index.html +share/gnome/help/nautilus-user-manual/es/introdesktop.html +share/gnome/help/nautilus-user-manual/es/ln18.html +share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/es/navigating.html +share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/tree.html +share/gnome/help/nautilus-user-manual/es/viewopen.html +share/gnome/help/nautilus-user-manual/ko/chapter1.html +share/gnome/help/nautilus-user-manual/ko/chapter2.html +share/gnome/help/nautilus-user-manual/ko/docbook.css +share/gnome/help/nautilus-user-manual/ko/figures/custicon.png +share/gnome/help/nautilus-user-manual/ko/figures/full-1.png +share/gnome/help/nautilus-user-manual/ko/figures/full-2.png +share/gnome/help/nautilus-user-manual/ko/figures/full-3.png +share/gnome/help/nautilus-user-manual/ko/figures/full-4.png +share/gnome/help/nautilus-user-manual/ko/figures/full-5.png +share/gnome/help/nautilus-user-manual/ko/figures/full-6.png +share/gnome/help/nautilus-user-manual/ko/figures/full.png +share/gnome/help/nautilus-user-manual/ko/figures/link.png +share/gnome/help/nautilus-user-manual/ko/figures/locbar.png +share/gnome/help/nautilus-user-manual/ko/figures/noread.png +share/gnome/help/nautilus-user-manual/ko/figures/nowrite.png +share/gnome/help/nautilus-user-manual/ko/figures/part-1.png +share/gnome/help/nautilus-user-manual/ko/figures/part-2.png +share/gnome/help/nautilus-user-manual/ko/figures/part-3.png +share/gnome/help/nautilus-user-manual/ko/figures/part.png +share/gnome/help/nautilus-user-manual/ko/figures/player-1.png +share/gnome/help/nautilus-user-manual/ko/figures/player-2.png +share/gnome/help/nautilus-user-manual/ko/figures/player-3.png +share/gnome/help/nautilus-user-manual/ko/figures/player-4.png +share/gnome/help/nautilus-user-manual/ko/figures/player.png +share/gnome/help/nautilus-user-manual/ko/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/sidebar.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/ko/gnome.html +share/gnome/help/nautilus-user-manual/ko/home.html +share/gnome/help/nautilus-user-manual/ko/index.html +share/gnome/help/nautilus-user-manual/ko/introdesktop.html +share/gnome/help/nautilus-user-manual/ko/ln18.html +share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/ko/navigating.html +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/ko/tree.html +share/gnome/help/nautilus-user-manual/ko/viewopen.html share/gnome/nautilus/browser.xml +share/gnome/nautilus/components/hyperbola/maps/pages.map +share/gnome/nautilus/components/hyperbola/topleveldocs.xml share/gnome/nautilus/emblems/OK.png share/gnome/nautilus/emblems/certified.png share/gnome/nautilus/emblems/cool.png @@ -67,8 +291,6 @@ share/gnome/nautilus/emblems/important.png share/gnome/nautilus/emblems/new.png share/gnome/nautilus/emblems/ohno.png share/gnome/nautilus/emblems/personal.png -share/gnome/nautilus/emblems/secret.png -share/gnome/nautilus/emblems/shared.png share/gnome/nautilus/emblems/special.png share/gnome/nautilus/emblems/urgent.png share/gnome/nautilus/fonts/urw/fonts.dir @@ -86,6 +308,7 @@ share/gnome/nautilus/fonts/urw/n019024l.pfb share/gnome/nautilus/fonts/urw/n019024l.pfm share/gnome/nautilus/linksets/apps.xml share/gnome/nautilus/linksets/desktop.xml +share/gnome/nautilus/linksets/home.xml share/gnome/nautilus/linksets/portals.xml share/gnome/nautilus/linksets/search_engines.xml share/gnome/nautilus/nautilus-extras.placeholder @@ -122,14 +345,9 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/services/text/english_to_french.xml -share/gnome/nautilus/services/text/french_to_english.xml share/gnome/nautilus/services/text/google.xml share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/static_bookmarks.xml -share/gnome/nautilus/top/.nautilus-metafile.xml -share/gnome/nautilus/top/Computer -share/gnome/nautilus/top/Services share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf share/gnome/oaf/Nautilus_Control_throbber.oaf share/gnome/oaf/Nautilus_View_content-loser.oaf @@ -191,15 +409,33 @@ share/gnome/pixmaps/nautilus/arlo/decrement.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12.png share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-192.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36.png share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory-72.png share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-96.png share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory.png share/gnome/pixmaps/nautilus/arlo/i-directory.xml +share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-12.png share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-192.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36.png share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-72.png share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png @@ -258,10 +494,16 @@ share/gnome/pixmaps/nautilus/arlo/throbber/025.png share/gnome/pixmaps/nautilus/arlo/throbber/026.png share/gnome/pixmaps/nautilus/arlo/throbber/027.png share/gnome/pixmaps/nautilus/arlo/throbber/028.png +share/gnome/pixmaps/nautilus/arlo/throbber/029.png +share/gnome/pixmaps/nautilus/arlo/throbber/030.png share/gnome/pixmaps/nautilus/arlo/throbber/rest.png share/gnome/pixmaps/nautilus/arlo/zoom_body.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png +share/gnome/pixmaps/nautilus/bubble-LL.png +share/gnome/pixmaps/nautilus/bubble-LR.png +share/gnome/pixmaps/nautilus/bubble-UL.png +share/gnome/pixmaps/nautilus/bubble-UR.png share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/computer.png @@ -283,21 +525,23 @@ share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.png share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png share/gnome/pixmaps/nautilus/crux_eggplant/increment.png @@ -350,6 +594,8 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/decrement.png @@ -357,7 +603,28 @@ share/gnome/pixmaps/nautilus/default.xml share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png -share/gnome/pixmaps/nautilus/eazel-logo.gif +share/gnome/pixmaps/nautilus/eazel-logos/About_Image.png +share/gnome/pixmaps/nautilus/eazel-logos/LICENSE +share/gnome/pixmaps/nautilus/eazel-logos/about_background.png +share/gnome/pixmaps/nautilus/eazel-logos/default.xml +share/gnome/pixmaps/nautilus/eazel-logos/druid_header.png +share/gnome/pixmaps/nautilus/eazel-logos/eazel-logo-right-side-logo.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/001.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/002.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/003.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/004.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/005.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/006.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/007.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/008.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/009.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/010.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/011.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/012.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/013.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/014.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/015.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/rest.png share/gnome/pixmaps/nautilus/emblem-OK.svg share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg @@ -373,9 +640,10 @@ share/gnome/pixmaps/nautilus/emblem-noread.svg share/gnome/pixmaps/nautilus/emblem-nowrite.svg share/gnome/pixmaps/nautilus/emblem-ohno.svg share/gnome/pixmaps/nautilus/emblem-personal.svg -share/gnome/pixmaps/nautilus/emblem-secret.svg -share/gnome/pixmaps/nautilus/emblem-shared.svg share/gnome/pixmaps/nautilus/emblem-special.svg +share/gnome/pixmaps/nautilus/emblem-symbolic-link-12.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-24.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-36.png share/gnome/pixmaps/nautilus/emblem-symbolic-link.png share/gnome/pixmaps/nautilus/emblem-trash.png share/gnome/pixmaps/nautilus/emblem-urgent.svg @@ -456,6 +724,8 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png share/gnome/pixmaps/nautilus/gnome-video-mpeg.png share/gnome/pixmaps/nautilus/gnome-video-quicktime.png share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png +share/gnome/pixmaps/nautilus/gnome/SearchWeb.png +share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml share/gnome/pixmaps/nautilus/gnome/i-directory-12.png share/gnome/pixmaps/nautilus/gnome/i-directory-192.png @@ -485,7 +755,9 @@ share/gnome/pixmaps/nautilus/gnome/throbber/008.png share/gnome/pixmaps/nautilus/gnome/throbber/009.png share/gnome/pixmaps/nautilus/gnome/throbber/010.png share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/hand.svg +share/gnome/pixmaps/nautilus/hand-72.png +share/gnome/pixmaps/nautilus/hand-96.png +share/gnome/pixmaps/nautilus/hand.png share/gnome/pixmaps/nautilus/home.png share/gnome/pixmaps/nautilus/i-blockdev.png share/gnome/pixmaps/nautilus/i-bookmark-20.png @@ -572,7 +844,6 @@ share/gnome/pixmaps/nautilus/loading.png share/gnome/pixmaps/nautilus/manual.png share/gnome/pixmaps/nautilus/memory_chip.gif share/gnome/pixmaps/nautilus/multi-ok.png -share/gnome/pixmaps/nautilus/nautilus-logo.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png share/gnome/pixmaps/nautilus/netscape.png share/gnome/pixmaps/nautilus/not.png @@ -620,9 +891,25 @@ share/gnome/pixmaps/nautilus/throbber/012.png share/gnome/pixmaps/nautilus/throbber/013.png share/gnome/pixmaps/nautilus/throbber/014.png share/gnome/pixmaps/nautilus/throbber/015.png +share/gnome/pixmaps/nautilus/throbber/016.png +share/gnome/pixmaps/nautilus/throbber/017.png +share/gnome/pixmaps/nautilus/throbber/018.png +share/gnome/pixmaps/nautilus/throbber/019.png +share/gnome/pixmaps/nautilus/throbber/020.png +share/gnome/pixmaps/nautilus/throbber/021.png +share/gnome/pixmaps/nautilus/throbber/022.png +share/gnome/pixmaps/nautilus/throbber/023.png +share/gnome/pixmaps/nautilus/throbber/024.png +share/gnome/pixmaps/nautilus/throbber/025.png +share/gnome/pixmaps/nautilus/throbber/026.png +share/gnome/pixmaps/nautilus/throbber/027.png +share/gnome/pixmaps/nautilus/throbber/028.png +share/gnome/pixmaps/nautilus/throbber/029.png +share/gnome/pixmaps/nautilus/throbber/030.png share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png share/gnome/pixmaps/nautilus/thumbnail_frame.png +share/gnome/pixmaps/nautilus/tiny-alert.png share/gnome/pixmaps/nautilus/trash-empty.png share/gnome/pixmaps/nautilus/trash-full.png share/gnome/pixmaps/nautilus/uparrow.png @@ -669,9 +956,11 @@ share/gnome/ui/nautilus-service-ui.xml share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml share/gnome/ui/nautilus-text-view-ui.xml +share/locale/az/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo +share/locale/el/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/fi/LC_MESSAGES/nautilus.mo @@ -683,11 +972,13 @@ share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo +share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo share/locale/sk/LC_MESSAGES/nautilus.mo +share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo @@ -698,6 +989,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome +@dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber +@dirrm share/gnome/pixmaps/nautilus/eazel-logos @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds @@ -708,7 +1001,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/arlo @dirrm share/gnome/pixmaps/nautilus/ardmore @dirrm share/gnome/pixmaps/nautilus -@dirrm share/gnome/nautilus/top @dirrm share/gnome/nautilus/services/text @dirrm share/gnome/nautilus/services @dirrm share/gnome/nautilus/patterns @@ -716,11 +1008,37 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/nautilus/fonts/urw @dirrm share/gnome/nautilus/fonts @dirrm share/gnome/nautilus/emblems +@dirrm share/gnome/nautilus/components/hyperbola/maps +@dirrm share/gnome/nautilus/components/hyperbola +@dirrm share/gnome/nautilus/components @dirrm share/gnome/nautilus -@dirrm share/gnome/hyperbola/maps -@dirrm share/gnome/hyperbola -@dirrm share/gnome/help/nautilus/C -@dirrm share/gnome/help/nautilus +@dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/ko/figures +@dirrm share/gnome/help/nautilus-user-manual/ko +@dirrm share/gnome/help/nautilus-user-manual/es/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/es/figures +@dirrm share/gnome/help/nautilus-user-manual/es +@dirrm share/gnome/help/nautilus-user-manual/C/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/C/figures +@dirrm share/gnome/help/nautilus-user-manual/C +@dirrm share/gnome/help/nautilus-user-manual +@dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images +@dirrm share/gnome/help/nautilus-release-notes/C/figures +@dirrm share/gnome/help/nautilus-release-notes/C +@dirrm share/gnome/help/nautilus-release-notes +@dirrm share/gnome/help/nautilus-quick-reference/sv/figures +@dirrm share/gnome/help/nautilus-quick-reference/sv +@dirrm share/gnome/help/nautilus-quick-reference/no/figures +@dirrm share/gnome/help/nautilus-quick-reference/no +@dirrm share/gnome/help/nautilus-quick-reference/ko/figures +@dirrm share/gnome/help/nautilus-quick-reference/ko +@dirrm share/gnome/help/nautilus-quick-reference/es/figures +@dirrm share/gnome/help/nautilus-quick-reference/es +@dirrm share/gnome/help/nautilus-quick-reference/C/figures +@dirrm share/gnome/help/nautilus-quick-reference/C +@dirrm share/gnome/help/nautilus-quick-reference +@dirrm share/gnome/help/gnugpl/C +@dirrm share/gnome/help/gnugpl @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl @dirrm include/libnautilus diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index cec3b027a7a1..67941553d6a9 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,22 +6,22 @@ # PORTNAME= nautilus -PORTVERSION= 0.8 +PORTVERSION= 1.0.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= unstable/sources/nautilus +MASTER_SITE_SUBDIR= stable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ - freetype-config:${PORTSDIR}/print/freetype2 # XXX +BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX +# The following is only needed if --with-eazel-services is brought in, +# which it isn't, because it depends on ammonite, which is Linux-only +# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm + LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - bz2.1:${PORTSDIR}/archivers/bzip2 \ freetype.6:${PORTSDIR}/print/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) MOZILLA= mozilla BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -34,12 +34,12 @@ USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ - --with-freetype2-include-place=${LOCALBASE}/include/freetype2 +CONFIGURE_ARGS= --with-freetype2-lib-place=${X11BASE}/lib \ + --with-freetype2-include-place=${X11BASE}/include/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/mozilla MOZILLA_LIBS= "-L${X11BASE}/lib/${MOZILLA}" @@ -50,9 +50,11 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -.if !defined(WITH_MOZILLA) +MAN1= nautilus-xml-migrate.1 + +.if !defined(WITHOUT_MOZILLA) pre-extract: - @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" + @${ECHO} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA" .endif pre-patch: diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 554338f88a7e..11d30f6f75f6 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1 +1 @@ -MD5 (nautilus-0.8.tar.gz) = 26e6403619559477d02f1cabb7681e4c +MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 4f01381ab0bb..5c7b55cccce7 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed Jan 31 17:42:11 2001 -+++ configure Wed Jan 31 17:52:50 2001 -@@ -41,9 +41,9 @@ - ac_help="$ac_help - --enable-eazel-services Enable support for Eazel services (default is no)" +--- configure.orig Mon Mar 12 19:48:16 2001 ++++ configure Fri Mar 16 15:02:38 2001 +@@ -45,5 +45,5 @@ ac_help="$ac_help - --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" @@ -13,49 +8,31 @@ $FreeBSD$ - --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help - --with-freetype2-prefix=PATH freetype2 installation prefix" - ac_help="$ac_help -@@ -2789,15 +2789,15 @@ - _found_freetype2="no" - +@@ -3216,4 +3216,4 @@ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. -if test "${with_freetype2_libraries+set}" = set; then - withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval - fi - - +@@ -3223,4 +3223,4 @@ # Check whether --with-freetype2-includes or --without-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval - fi - -@@ -2927,7 +2927,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3354,3 +3354,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2933 "configure" - #include "confdefs.h" -@@ -2967,7 +2967,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3394,3 +3394,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <<EOF - #line 2973 "configure" - #include "confdefs.h" -@@ -2995,10 +2995,10 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +@@ -3422,6 +3422,6 @@ echo "$ac_t""yes" 1>&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -64,23 +41,13 @@ $FreeBSD$ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi - - else -@@ -3235,7 +3235,7 @@ - - CC="$_save_cc" +@@ -3662,3 +3662,3 @@ -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3598,7 +3598,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- rpm_libs=-lbz2 -+ rpm_libs="-lrpm -lbz2" - else - echo "$ac_t""no" 1>&6 +@@ -6117,3 +6117,3 @@ + if test x$SCROLLKEEPER_CONFIG = xno; then +- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; } ++ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2 fi diff --git a/x11-fm/nautilus2/files/patch-ab b/x11-fm/nautilus2/files/patch-ab index a46aeaaf19d8..169e4d76349d 100644 --- a/x11-fm/nautilus2/files/patch-ab +++ b/x11-fm/nautilus2/files/patch-ab @@ -1,13 +1,28 @@ ---- Makefile.in.orig Wed Aug 16 08:26:30 2000 -+++ Makefile.in Wed Aug 23 14:56:45 2000 -@@ -501,8 +501,8 @@ - $(mkinstalldirs) $(DESTDIR)/$(prefix)/bin - @list='nautilus-clean.sh'; for p in $$list; do\ +--- Makefile.in.orig Mon Mar 12 19:49:51 2001 ++++ Makefile.in Fri Mar 16 16:15:38 2001 +@@ -202,3 +202,3 @@ + +-SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po omf-install $(NULL) ++SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po $(NULL) + +@@ -607,4 +607,4 @@ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ - $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ +@@ -620,4 +620,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ + done +@@ -628,4 +628,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ done - diff --git a/x11-fm/nautilus2/files/patch-ac b/x11-fm/nautilus2/files/patch-ac index 632cbbc8420a..8e4edd0bf3ab 100644 --- a/x11-fm/nautilus2/files/patch-ac +++ b/x11-fm/nautilus2/files/patch-ac @@ -1,54 +1,92 @@ $FreeBSD$ ---- libnautilus-extensions/nautilus-volume-monitor.c.orig Tue Jan 16 03:31:56 2001 -+++ libnautilus-extensions/nautilus-volume-monitor.c Wed Jan 31 21:29:21 2001 -@@ -60,7 +60,13 @@ - #include <fstab.h> +--- libnautilus-extensions/nautilus-volume-monitor.c.orig Sat Feb 24 01:54:34 2001 ++++ libnautilus-extensions/nautilus-volume-monitor.c Sun Mar 11 15:46:11 2001 +@@ -68,6 +68,12 @@ + #include <mntent.h> #endif +#ifdef __FreeBSD__ +#include <sys/param.h> +#include <sys/ucred.h> +#include <sys/mount.h> -+#else - #include <mntent.h> +#endif ++ + #ifdef HAVE_SYS_MNTTAB_H + #define SOLARIS_MNT 1 + #include <sys/mnttab.h> +@@ -327,6 +333,12 @@ + has_removable_mntent_options (struct mnttab *ent) + { - #ifdef MOUNT_AUDIO_CD ++#elif defined(__FreeBSD__) ++ ++static gboolean ++has_removable_mntent_options (struct fstab *ent) ++{ ++ + #else + + static gboolean +@@ -335,12 +347,18 @@ + + #endif /* HAVE_SYS_MNTTAB_H */ + ++#ifndef __FreeBSD__ + /* Use "owner" or "user" or "users" as our way of determining a removable volume */ + if (hasmntopt (ent, "user") != NULL + || hasmntopt (ent, "users") != NULL + || hasmntopt (ent, "owner") != NULL) { + return TRUE; + } ++#else ++ if (strstr (ent->fs_mntops, "noauto") != NULL) { ++ return TRUE; ++ } ++#endif -@@ -264,16 +270,25 @@ - GList * - nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor) + #if SOLARIS_MNT && HAVE_VOL + if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) { +@@ -360,23 +378,32 @@ + static GList * + get_removable_volumes (void) { +#ifndef __FreeBSD__ FILE *file; - GList *volumes; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; + struct mnttab *ent = &dummy_ent; + #else struct mntent *ent; -+#else -+ struct fstab *ent; -+#endif + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++struct fstab *ent; ++#endif /* __FreeBSD__ */ + GList *volumes; NautilusVolume *volume; volumes = NULL; +#ifndef __FreeBSD__ - file = setmntent (_PATH_MNTTAB, "r"); - g_return_val_if_fail (file != NULL, NULL); + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return NULL; + } +#else + setfsent(); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ - while ((ent = getmntent (file)) != NULL) { - /* Use noauto as our way of determining a removable volume */ - if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) { -@@ -281,6 +296,15 @@ - volume->device_path = g_strdup (ent->mnt_fsname); - volume->mount_path = g_strdup (ent->mnt_dir); + #if HAVE_SYS_MNTTAB_H + while (! getmntent (file, ent)) { + /* On Solaris look for /vol/ for determining a removable volume */ +@@ -396,12 +423,27 @@ volume->filesystem = g_strdup (ent->mnt_type); -+#else /* FreeBSD, probably ;) */ + + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ + while ((ent = getfsent ()) != NULL) { + /* Use noauto as our way of determining a removable volume */ + if (strstr (ent->fs_mntops, "noauto") != NULL) { @@ -56,11 +94,11 @@ $FreeBSD$ + volume->device_path = g_strdup (ent->fs_spec); + volume->mount_path = g_strdup (ent->fs_file); + volume->filesystem = g_strdup (ent->fs_vfstype); -+#endif - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - volumes = g_list_append (volumes, volume); -@@ -290,7 +314,11 @@ ++ volume->is_removable = TRUE; ++ volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL); ++#endif /* __FreeBSD__ */ + + volumes = mount_volume_add_filesystem (volume, volumes); } } @@ -72,62 +110,158 @@ $FreeBSD$ #ifdef MOUNT_AUDIO_CD volume = g_new0 (NautilusVolume, 1); -@@ -682,15 +710,27 @@ +@@ -419,6 +461,7 @@ + static gboolean + volume_is_removable (const NautilusVolume *volume) { - GList *current_mounts = NULL; - NautilusVolume *volume = NULL; +#ifndef __FreeBSD__ - FILE *fh; + FILE *file; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; +@@ -426,13 +469,21 @@ + #else + struct mntent *ent; + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++ struct fstab *ent; ++#endif /* __FreeBSD__ */ + ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ + + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + #if HAVE_SYS_MNTTAB_H + while (!getmntent (file, ent)) { + if (strcmp (volume->device_path, ent->mnt_special) == 0) { +@@ -455,8 +506,23 @@ + } + + #endif /* HAVE_SYS_MNTTAB_H */ +- ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ /* Use noauto as our way of determining a removable volume */ ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && has_removable_mntent_options (ent)) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++#endif /* __FreeBSD__ */ ++ ++ ++#ifndef __FreeBSD__ + fclose (file); ++#else ++ endfsent(); ++#endif + return FALSE; + } + +@@ -484,14 +550,23 @@ + } + } + #else ++#ifndef __FreeBSD__ + struct mntent *ent; +- ++#else ++ struct fstab *ent; ++#endif ++ ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } +- ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ ++ + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + while ((ent = getmntent (file)) != NULL) { + if (strcmp (volume->device_path, ent->mnt_fsname) == 0) { + if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) { +@@ -500,9 +575,21 @@ + } + } + } ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && strstr (ent->fs_type, FSTAB_RO) != NULL) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++ endfsent(); ++#endif + #endif + ++#ifndef __FreeBSD__ + fclose (file); ++#endif + return FALSE; + } + +@@ -975,14 +1062,26 @@ + + + #else ++#ifndef __FreeBSD__ char line[PATH_MAX * 3]; char device_name[sizeof (line)]; NautilusStringList *list; -+#else ++#else /* __FreeBSD__ */ + struct statfs *mounted; + int mounted_num; + int i; -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ /* Open /proc/mounts */ fh = fopen (PATH_PROC_MOUNTS, "r"); g_return_val_if_fail (fh != NULL, NULL); -+#else ++#else /* __FreeBSD__ */ + mounted_num = getmntinfo(&mounted, MNT_WAIT); + g_return_val_if_fail (mounted_num > 0, NULL); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ while (fgets (line, sizeof(line), fh)) { if (sscanf (line, "%s", device_name) == 1) { - list = nautilus_string_list_new_from_tokens (line, " ", FALSE); -@@ -702,17 +742,25 @@ + list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE); +@@ -995,11 +1094,20 @@ volume->device_path = nautilus_string_list_nth (list, 0); volume->mount_path = nautilus_string_list_nth (list, 1); volume->filesystem = nautilus_string_list_nth (list, 2); -- -+#else ++#else /* __FreeBSD__ */ + for (i = 0; i < mounted_num; i++) { + volume = g_new0 (NautilusVolume, 1); + volume->device_path = g_strdup(mounted[i].f_mntfromname); + volume->mount_path = g_strdup(mounted[i].f_mntonname); + volume->filesystem = g_strdup(mounted[i].f_fstypename); +#endif /* __FreeBSD__ */ - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - current_mounts = g_list_append (current_mounts, volume); - } else { - nautilus_volume_monitor_free_volume (volume); - } + current_mounts = mount_volume_add_filesystem (volume, current_mounts); +#ifndef __FreeBSD__ } nautilus_string_list_free (list); } } -+#endif ++#endif /* __FreeBSD__ */ } - #ifdef MOUNT_AUDIO_CD -@@ -728,7 +776,9 @@ + #endif /* SOLARIS_MNT */ +@@ -1019,7 +1127,9 @@ } #endif @@ -137,53 +271,7 @@ $FreeBSD$ return current_mounts; -@@ -889,6 +939,45 @@ - return TRUE; - } - -+#ifdef 0 -+#ifdef __FreeBSD__ -+static void -+fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent) -+{ -+ NautilusVolume *volume; -+ gboolean mounted; -+ -+ volume = g_new0 (NautilusVolume, 1); -+ volume->device_path = g_strdup(ent->fs_spec); -+ volume->mount_path = g_strdup(ent->fs_file); -+ -+ mounted = FALSE; -+ -+ if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) { -+ mounted = mount_volume_floppy_add (monitor, volume); -+ } else if (strcmp (ent->fs_vfstype, "ufs") == 0) { -+ mounted = mount_volume_ext2_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "nfs") == 0) { -+ mounted = mount_volume_nfs_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "cd9660") == 0) { -+ mounted = mount_volume_iso9660_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "msdos") == 0) { -+ mounted = mount_volume_msdos_add (volume); -+ } -+ -+ if (mounted) { -+ volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL; -+ monitor->details->volumes = g_list_append (monitor->details->volumes, volume); -+ mount_volume_add_aliases (monitor, volume->device_path, volume); -+ } else { -+ g_free (volume->device_path); -+ g_free (volume->mount_path); -+ g_free (volume); -+ } -+} -+#endif -+#endif -+ - static void - cdrom_ioctl_get_info (int fd) - { -@@ -1025,6 +1114,14 @@ +@@ -1375,6 +1485,14 @@ break; } } @@ -198,3 +286,12 @@ $FreeBSD$ } #endif +@@ -1869,7 +1987,7 @@ + } + + if (mounted) { +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__) + volume->is_removable = volume_is_removable (volume); + volume->is_read_only = volume_is_read_only (volume); + #endif /* SOLARIS_MNT */ diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-extract b/x11-fm/nautilus2/files/patch-xml-i18n-extract deleted file mode 100644 index a21354cc11b4..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-extract +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-extract 2001/01/31 17:44:52 1.1 -+++ xml-i18n-extract 2001/01/31 17:45:08 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - # diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-merge b/x11-fm/nautilus2/files/patch-xml-i18n-merge deleted file mode 100644 index 137e5978ddfd..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-merge +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-merge 2001/01/31 17:44:52 1.1 -+++ xml-i18n-merge 2001/01/31 17:45:16 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # - # The XML Translation Merge Tool diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-update b/x11-fm/nautilus2/files/patch-xml-i18n-update deleted file mode 100644 index abdebb38482b..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-update +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-update 2001/01/31 17:44:52 1.1 -+++ xml-i18n-update 2001/01/31 17:45:22 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # The GNOME Translation Update Tool - # diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 1901db766717..5d4f6e3c0e56 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -15,19 +15,24 @@ bin/nautilus-launcher-applet %%MOZILLA:%%bin/nautilus-mozilla-content-view bin/nautilus-music-view bin/nautilus-notes +bin/nautilus-preferences-applet +bin/nautilus-restore-settings-to-default.sh bin/nautilus-sample-content-view bin/nautilus-sidebar-loser bin/nautilus-text-view bin/nautilus-throbber bin/nautilus-verify-rpm.sh +bin/nautilus-xml-migrate bin/run-nautilus etc/CORBA/servers/nautilus-launcher-applet.gnorba +etc/CORBA/servers/nautilus-preferences-applet.gnorba etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h include/libnautilus/nautilus-bonobo-workarounds.h include/libnautilus/nautilus-clipboard.h include/libnautilus/nautilus-distributed-undo.h +include/libnautilus/nautilus-idle-queue.h include/libnautilus/nautilus-undo-private.h include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h @@ -44,17 +49,236 @@ lib/libnautilus.so.0 lib/vfs/modules/libvfs-help.so share/gnome/apps/Applications/nautilus.desktop share/gnome/help/gnufdl/C/gnufdl.sgml -share/gnome/help/nautilus/C/custicon.png -share/gnome/help/nautilus/C/full.png -share/gnome/help/nautilus/C/license.html -share/gnome/help/nautilus/C/locbar.png -share/gnome/help/nautilus/C/nautilus.sgml -share/gnome/help/nautilus/C/player.png -share/gnome/help/nautilus/C/prefmenu.png -share/gnome/help/nautilus/C/sidebar.png -share/gnome/help/nautilus/C/viewmenu.png -share/gnome/hyperbola/maps/pages.map +share/gnome/help/gnugpl/C/gnugpl.sgml +share/gnome/help/nautilus-quick-reference/C/figures/emblems.png +share/gnome/help/nautilus-quick-reference/C/figures/find.png +share/gnome/help/nautilus-quick-reference/C/figures/full.png +share/gnome/help/nautilus-quick-reference/C/figures/locbar.png +share/gnome/help/nautilus-quick-reference/C/figures/menubar.png +share/gnome/help/nautilus-quick-reference/C/figures/music.png +share/gnome/help/nautilus-quick-reference/C/figures/navbar.png +share/gnome/help/nautilus-quick-reference/C/figures/patterns.png +share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/C/figures/softcat.png +share/gnome/help/nautilus-quick-reference/C/figures/storage.png +share/gnome/help/nautilus-quick-reference/C/figures/themes.png +share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/C/index.html +share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/es/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/es/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/es/figures/find_small.png +share/gnome/help/nautilus-quick-reference/es/figures/full_small.png +share/gnome/help/nautilus-quick-reference/es/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/music_small.png +share/gnome/help/nautilus-quick-reference/es/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/softcat.png +share/gnome/help/nautilus-quick-reference/es/figures/storage.png +share/gnome/help/nautilus-quick-reference/es/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/es/index.html +share/gnome/help/nautilus-quick-reference/ko/figures/emblems.png +share/gnome/help/nautilus-quick-reference/ko/figures/find.png +share/gnome/help/nautilus-quick-reference/ko/figures/full.png +share/gnome/help/nautilus-quick-reference/ko/figures/locbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/menubar.png +share/gnome/help/nautilus-quick-reference/ko/figures/music.png +share/gnome/help/nautilus-quick-reference/ko/figures/navbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/patterns.png +share/gnome/help/nautilus-quick-reference/ko/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/ko/figures/softcat.png +share/gnome/help/nautilus-quick-reference/ko/figures/storage.png +share/gnome/help/nautilus-quick-reference/ko/figures/themes.png +share/gnome/help/nautilus-quick-reference/ko/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/ko/index.html +share/gnome/help/nautilus-quick-reference/no/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/no/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/no/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/no/figures/find_small.png +share/gnome/help/nautilus-quick-reference/no/figures/full_small.png +share/gnome/help/nautilus-quick-reference/no/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/music_small.png +share/gnome/help/nautilus-quick-reference/no/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/softcat.png +share/gnome/help/nautilus-quick-reference/no/figures/storage.png +share/gnome/help/nautilus-quick-reference/no/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/no/index.html +share/gnome/help/nautilus-quick-reference/sv/figures/emblems.png +share/gnome/help/nautilus-quick-reference/sv/figures/find.png +share/gnome/help/nautilus-quick-reference/sv/figures/full.png +share/gnome/help/nautilus-quick-reference/sv/figures/locbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/menubar.png +share/gnome/help/nautilus-quick-reference/sv/figures/music.png +share/gnome/help/nautilus-quick-reference/sv/figures/navbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/patterns.png +share/gnome/help/nautilus-quick-reference/sv/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/sv/figures/softcat.png +share/gnome/help/nautilus-quick-reference/sv/figures/storage.png +share/gnome/help/nautilus-quick-reference/sv/figures/themes.png +share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/sv/index.html +share/gnome/help/nautilus-release-notes/C/beta.html +share/gnome/help/nautilus-release-notes/C/docbook.css +share/gnome/help/nautilus-release-notes/C/index.html +share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml +share/gnome/help/nautilus-release-notes/C/mozilla.html +share/gnome/help/nautilus-release-notes/C/new10.html +share/gnome/help/nautilus-release-notes/C/new102.html +share/gnome/help/nautilus-release-notes/C/require.html +share/gnome/help/nautilus-release-notes/C/searching.html +share/gnome/help/nautilus-release-notes/C/session.html +share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/C/chapter1.html +share/gnome/help/nautilus-user-manual/C/chapter2.html +share/gnome/help/nautilus-user-manual/C/docbook.css +share/gnome/help/nautilus-user-manual/C/figures/custicon.png +share/gnome/help/nautilus-user-manual/C/figures/full-1.png +share/gnome/help/nautilus-user-manual/C/figures/full-2.png +share/gnome/help/nautilus-user-manual/C/figures/full-3.png +share/gnome/help/nautilus-user-manual/C/figures/full-4.png +share/gnome/help/nautilus-user-manual/C/figures/full-5.png +share/gnome/help/nautilus-user-manual/C/figures/full-6.png +share/gnome/help/nautilus-user-manual/C/figures/full.png +share/gnome/help/nautilus-user-manual/C/figures/link.png +share/gnome/help/nautilus-user-manual/C/figures/locbar.png +share/gnome/help/nautilus-user-manual/C/figures/noread.png +share/gnome/help/nautilus-user-manual/C/figures/nowrite.png +share/gnome/help/nautilus-user-manual/C/figures/part-1.png +share/gnome/help/nautilus-user-manual/C/figures/part-2.png +share/gnome/help/nautilus-user-manual/C/figures/part-3.png +share/gnome/help/nautilus-user-manual/C/figures/part.png +share/gnome/help/nautilus-user-manual/C/figures/player-1.png +share/gnome/help/nautilus-user-manual/C/figures/player-2.png +share/gnome/help/nautilus-user-manual/C/figures/player-3.png +share/gnome/help/nautilus-user-manual/C/figures/player-4.png +share/gnome/help/nautilus-user-manual/C/figures/player.png +share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/C/figures/sidebar.png +share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/C/gnome.html +share/gnome/help/nautilus-user-manual/C/home.html +share/gnome/help/nautilus-user-manual/C/index.html +share/gnome/help/nautilus-user-manual/C/introdesktop.html +share/gnome/help/nautilus-user-manual/C/ln21.html +share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/C/navigating.html +share/gnome/help/nautilus-user-manual/C/session.html +share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/chapter1.html +share/gnome/help/nautilus-user-manual/es/chapter2.html +share/gnome/help/nautilus-user-manual/es/default.html +share/gnome/help/nautilus-user-manual/es/docbook.css +share/gnome/help/nautilus-user-manual/es/figures/custicon.png +share/gnome/help/nautilus-user-manual/es/figures/full.png +share/gnome/help/nautilus-user-manual/es/figures/link.png +share/gnome/help/nautilus-user-manual/es/figures/locbar.png +share/gnome/help/nautilus-user-manual/es/figures/noread.png +share/gnome/help/nautilus-user-manual/es/figures/nowrite.png +share/gnome/help/nautilus-user-manual/es/figures/part.png +share/gnome/help/nautilus-user-manual/es/figures/player.png +share/gnome/help/nautilus-user-manual/es/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/es/figures/sidebar.png +share/gnome/help/nautilus-user-manual/es/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/es/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/es/gnome.html +share/gnome/help/nautilus-user-manual/es/home.html +share/gnome/help/nautilus-user-manual/es/index.html +share/gnome/help/nautilus-user-manual/es/introdesktop.html +share/gnome/help/nautilus-user-manual/es/ln18.html +share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/es/navigating.html +share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/tree.html +share/gnome/help/nautilus-user-manual/es/viewopen.html +share/gnome/help/nautilus-user-manual/ko/chapter1.html +share/gnome/help/nautilus-user-manual/ko/chapter2.html +share/gnome/help/nautilus-user-manual/ko/docbook.css +share/gnome/help/nautilus-user-manual/ko/figures/custicon.png +share/gnome/help/nautilus-user-manual/ko/figures/full-1.png +share/gnome/help/nautilus-user-manual/ko/figures/full-2.png +share/gnome/help/nautilus-user-manual/ko/figures/full-3.png +share/gnome/help/nautilus-user-manual/ko/figures/full-4.png +share/gnome/help/nautilus-user-manual/ko/figures/full-5.png +share/gnome/help/nautilus-user-manual/ko/figures/full-6.png +share/gnome/help/nautilus-user-manual/ko/figures/full.png +share/gnome/help/nautilus-user-manual/ko/figures/link.png +share/gnome/help/nautilus-user-manual/ko/figures/locbar.png +share/gnome/help/nautilus-user-manual/ko/figures/noread.png +share/gnome/help/nautilus-user-manual/ko/figures/nowrite.png +share/gnome/help/nautilus-user-manual/ko/figures/part-1.png +share/gnome/help/nautilus-user-manual/ko/figures/part-2.png +share/gnome/help/nautilus-user-manual/ko/figures/part-3.png +share/gnome/help/nautilus-user-manual/ko/figures/part.png +share/gnome/help/nautilus-user-manual/ko/figures/player-1.png +share/gnome/help/nautilus-user-manual/ko/figures/player-2.png +share/gnome/help/nautilus-user-manual/ko/figures/player-3.png +share/gnome/help/nautilus-user-manual/ko/figures/player-4.png +share/gnome/help/nautilus-user-manual/ko/figures/player.png +share/gnome/help/nautilus-user-manual/ko/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/sidebar.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/ko/gnome.html +share/gnome/help/nautilus-user-manual/ko/home.html +share/gnome/help/nautilus-user-manual/ko/index.html +share/gnome/help/nautilus-user-manual/ko/introdesktop.html +share/gnome/help/nautilus-user-manual/ko/ln18.html +share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/ko/navigating.html +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/ko/tree.html +share/gnome/help/nautilus-user-manual/ko/viewopen.html share/gnome/nautilus/browser.xml +share/gnome/nautilus/components/hyperbola/maps/pages.map +share/gnome/nautilus/components/hyperbola/topleveldocs.xml share/gnome/nautilus/emblems/OK.png share/gnome/nautilus/emblems/certified.png share/gnome/nautilus/emblems/cool.png @@ -67,8 +291,6 @@ share/gnome/nautilus/emblems/important.png share/gnome/nautilus/emblems/new.png share/gnome/nautilus/emblems/ohno.png share/gnome/nautilus/emblems/personal.png -share/gnome/nautilus/emblems/secret.png -share/gnome/nautilus/emblems/shared.png share/gnome/nautilus/emblems/special.png share/gnome/nautilus/emblems/urgent.png share/gnome/nautilus/fonts/urw/fonts.dir @@ -86,6 +308,7 @@ share/gnome/nautilus/fonts/urw/n019024l.pfb share/gnome/nautilus/fonts/urw/n019024l.pfm share/gnome/nautilus/linksets/apps.xml share/gnome/nautilus/linksets/desktop.xml +share/gnome/nautilus/linksets/home.xml share/gnome/nautilus/linksets/portals.xml share/gnome/nautilus/linksets/search_engines.xml share/gnome/nautilus/nautilus-extras.placeholder @@ -122,14 +345,9 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/services/text/english_to_french.xml -share/gnome/nautilus/services/text/french_to_english.xml share/gnome/nautilus/services/text/google.xml share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/static_bookmarks.xml -share/gnome/nautilus/top/.nautilus-metafile.xml -share/gnome/nautilus/top/Computer -share/gnome/nautilus/top/Services share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf share/gnome/oaf/Nautilus_Control_throbber.oaf share/gnome/oaf/Nautilus_View_content-loser.oaf @@ -191,15 +409,33 @@ share/gnome/pixmaps/nautilus/arlo/decrement.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12.png share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-192.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36.png share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory-72.png share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-96.png share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory.png share/gnome/pixmaps/nautilus/arlo/i-directory.xml +share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-12.png share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-192.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36.png share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-72.png share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png @@ -258,10 +494,16 @@ share/gnome/pixmaps/nautilus/arlo/throbber/025.png share/gnome/pixmaps/nautilus/arlo/throbber/026.png share/gnome/pixmaps/nautilus/arlo/throbber/027.png share/gnome/pixmaps/nautilus/arlo/throbber/028.png +share/gnome/pixmaps/nautilus/arlo/throbber/029.png +share/gnome/pixmaps/nautilus/arlo/throbber/030.png share/gnome/pixmaps/nautilus/arlo/throbber/rest.png share/gnome/pixmaps/nautilus/arlo/zoom_body.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png +share/gnome/pixmaps/nautilus/bubble-LL.png +share/gnome/pixmaps/nautilus/bubble-LR.png +share/gnome/pixmaps/nautilus/bubble-UL.png +share/gnome/pixmaps/nautilus/bubble-UR.png share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/computer.png @@ -283,21 +525,23 @@ share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.png share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png share/gnome/pixmaps/nautilus/crux_eggplant/increment.png @@ -350,6 +594,8 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/decrement.png @@ -357,7 +603,28 @@ share/gnome/pixmaps/nautilus/default.xml share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png -share/gnome/pixmaps/nautilus/eazel-logo.gif +share/gnome/pixmaps/nautilus/eazel-logos/About_Image.png +share/gnome/pixmaps/nautilus/eazel-logos/LICENSE +share/gnome/pixmaps/nautilus/eazel-logos/about_background.png +share/gnome/pixmaps/nautilus/eazel-logos/default.xml +share/gnome/pixmaps/nautilus/eazel-logos/druid_header.png +share/gnome/pixmaps/nautilus/eazel-logos/eazel-logo-right-side-logo.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/001.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/002.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/003.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/004.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/005.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/006.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/007.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/008.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/009.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/010.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/011.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/012.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/013.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/014.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/015.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/rest.png share/gnome/pixmaps/nautilus/emblem-OK.svg share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg @@ -373,9 +640,10 @@ share/gnome/pixmaps/nautilus/emblem-noread.svg share/gnome/pixmaps/nautilus/emblem-nowrite.svg share/gnome/pixmaps/nautilus/emblem-ohno.svg share/gnome/pixmaps/nautilus/emblem-personal.svg -share/gnome/pixmaps/nautilus/emblem-secret.svg -share/gnome/pixmaps/nautilus/emblem-shared.svg share/gnome/pixmaps/nautilus/emblem-special.svg +share/gnome/pixmaps/nautilus/emblem-symbolic-link-12.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-24.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-36.png share/gnome/pixmaps/nautilus/emblem-symbolic-link.png share/gnome/pixmaps/nautilus/emblem-trash.png share/gnome/pixmaps/nautilus/emblem-urgent.svg @@ -456,6 +724,8 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png share/gnome/pixmaps/nautilus/gnome-video-mpeg.png share/gnome/pixmaps/nautilus/gnome-video-quicktime.png share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png +share/gnome/pixmaps/nautilus/gnome/SearchWeb.png +share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml share/gnome/pixmaps/nautilus/gnome/i-directory-12.png share/gnome/pixmaps/nautilus/gnome/i-directory-192.png @@ -485,7 +755,9 @@ share/gnome/pixmaps/nautilus/gnome/throbber/008.png share/gnome/pixmaps/nautilus/gnome/throbber/009.png share/gnome/pixmaps/nautilus/gnome/throbber/010.png share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/hand.svg +share/gnome/pixmaps/nautilus/hand-72.png +share/gnome/pixmaps/nautilus/hand-96.png +share/gnome/pixmaps/nautilus/hand.png share/gnome/pixmaps/nautilus/home.png share/gnome/pixmaps/nautilus/i-blockdev.png share/gnome/pixmaps/nautilus/i-bookmark-20.png @@ -572,7 +844,6 @@ share/gnome/pixmaps/nautilus/loading.png share/gnome/pixmaps/nautilus/manual.png share/gnome/pixmaps/nautilus/memory_chip.gif share/gnome/pixmaps/nautilus/multi-ok.png -share/gnome/pixmaps/nautilus/nautilus-logo.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png share/gnome/pixmaps/nautilus/netscape.png share/gnome/pixmaps/nautilus/not.png @@ -620,9 +891,25 @@ share/gnome/pixmaps/nautilus/throbber/012.png share/gnome/pixmaps/nautilus/throbber/013.png share/gnome/pixmaps/nautilus/throbber/014.png share/gnome/pixmaps/nautilus/throbber/015.png +share/gnome/pixmaps/nautilus/throbber/016.png +share/gnome/pixmaps/nautilus/throbber/017.png +share/gnome/pixmaps/nautilus/throbber/018.png +share/gnome/pixmaps/nautilus/throbber/019.png +share/gnome/pixmaps/nautilus/throbber/020.png +share/gnome/pixmaps/nautilus/throbber/021.png +share/gnome/pixmaps/nautilus/throbber/022.png +share/gnome/pixmaps/nautilus/throbber/023.png +share/gnome/pixmaps/nautilus/throbber/024.png +share/gnome/pixmaps/nautilus/throbber/025.png +share/gnome/pixmaps/nautilus/throbber/026.png +share/gnome/pixmaps/nautilus/throbber/027.png +share/gnome/pixmaps/nautilus/throbber/028.png +share/gnome/pixmaps/nautilus/throbber/029.png +share/gnome/pixmaps/nautilus/throbber/030.png share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png share/gnome/pixmaps/nautilus/thumbnail_frame.png +share/gnome/pixmaps/nautilus/tiny-alert.png share/gnome/pixmaps/nautilus/trash-empty.png share/gnome/pixmaps/nautilus/trash-full.png share/gnome/pixmaps/nautilus/uparrow.png @@ -669,9 +956,11 @@ share/gnome/ui/nautilus-service-ui.xml share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml share/gnome/ui/nautilus-text-view-ui.xml +share/locale/az/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo +share/locale/el/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/fi/LC_MESSAGES/nautilus.mo @@ -683,11 +972,13 @@ share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo +share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo share/locale/sk/LC_MESSAGES/nautilus.mo +share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo @@ -698,6 +989,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome +@dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber +@dirrm share/gnome/pixmaps/nautilus/eazel-logos @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds @@ -708,7 +1001,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/arlo @dirrm share/gnome/pixmaps/nautilus/ardmore @dirrm share/gnome/pixmaps/nautilus -@dirrm share/gnome/nautilus/top @dirrm share/gnome/nautilus/services/text @dirrm share/gnome/nautilus/services @dirrm share/gnome/nautilus/patterns @@ -716,11 +1008,37 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/nautilus/fonts/urw @dirrm share/gnome/nautilus/fonts @dirrm share/gnome/nautilus/emblems +@dirrm share/gnome/nautilus/components/hyperbola/maps +@dirrm share/gnome/nautilus/components/hyperbola +@dirrm share/gnome/nautilus/components @dirrm share/gnome/nautilus -@dirrm share/gnome/hyperbola/maps -@dirrm share/gnome/hyperbola -@dirrm share/gnome/help/nautilus/C -@dirrm share/gnome/help/nautilus +@dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/ko/figures +@dirrm share/gnome/help/nautilus-user-manual/ko +@dirrm share/gnome/help/nautilus-user-manual/es/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/es/figures +@dirrm share/gnome/help/nautilus-user-manual/es +@dirrm share/gnome/help/nautilus-user-manual/C/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/C/figures +@dirrm share/gnome/help/nautilus-user-manual/C +@dirrm share/gnome/help/nautilus-user-manual +@dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images +@dirrm share/gnome/help/nautilus-release-notes/C/figures +@dirrm share/gnome/help/nautilus-release-notes/C +@dirrm share/gnome/help/nautilus-release-notes +@dirrm share/gnome/help/nautilus-quick-reference/sv/figures +@dirrm share/gnome/help/nautilus-quick-reference/sv +@dirrm share/gnome/help/nautilus-quick-reference/no/figures +@dirrm share/gnome/help/nautilus-quick-reference/no +@dirrm share/gnome/help/nautilus-quick-reference/ko/figures +@dirrm share/gnome/help/nautilus-quick-reference/ko +@dirrm share/gnome/help/nautilus-quick-reference/es/figures +@dirrm share/gnome/help/nautilus-quick-reference/es +@dirrm share/gnome/help/nautilus-quick-reference/C/figures +@dirrm share/gnome/help/nautilus-quick-reference/C +@dirrm share/gnome/help/nautilus-quick-reference +@dirrm share/gnome/help/gnugpl/C +@dirrm share/gnome/help/gnugpl @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl @dirrm include/libnautilus diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 21724db1b826..533567735a3c 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -6,17 +6,14 @@ # PORTNAME= gal -PORTVERSION= 0.5 +PORTVERSION= 0.7 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gal MAINTAINER?= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade \ - unicode.0:${PORTSDIR}/devel/libunicode \ - gnomevfs.0:${PORTSDIR}/devel/gnomevfs \ +LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \ giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo index 10d952f8519a..ed789c5d1c54 100644 --- a/x11-toolkits/gal/distinfo +++ b/x11-toolkits/gal/distinfo @@ -1 +1 @@ -MD5 (gal-0.5.tar.gz) = 1aaf233130fa116334da2edc516b8958 +MD5 (gal-0.7.tar.gz) = 4f8003ca81a71627de1a7f8b49a07af3 diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa index 79bbe96885e2..8aaa875e5d28 100644 --- a/x11-toolkits/gal/files/patch-aa +++ b/x11-toolkits/gal/files/patch-aa @@ -1,31 +1,31 @@ ---- configure.orig Thu Feb 8 13:54:31 2001 -+++ configure Fri Feb 9 10:46:57 2001 -@@ -5017,5 +5017,5 @@ +--- configure.orig Mon Apr 16 17:12:51 2001 ++++ configure Thu Apr 19 11:45:12 2001 +@@ -5026,5 +5026,5 @@ CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:5021: checking for iconv in -liconv" >&5 +-echo "configure:5030: checking for iconv in -liconv" >&5 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:5021: checking for iconv in -lgiconv" >&5 ++echo "configure:5030: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then -@@ -5027,3 +5027,3 @@ +@@ -5036,3 +5036,3 @@ -#include <iconv.h> +#include <giconv.h> -@@ -5050,3 +5050,3 @@ +@@ -5059,3 +5059,3 @@ if test $ac_cv_libiconv = yes; then - ICONV_LIBS="$ICONV_LIBS -liconv" + ICONV_LIBS="$ICONV_LIBS -lgiconv" have_iconv=yes -@@ -5176,3 +5176,3 @@ +@@ -5185,3 +5185,3 @@ -#include <iconv.h> +#include <giconv.h> #include <stdlib.h> -@@ -5302,4 +5302,4 @@ - echo "configure:5303: checking for GTK >= 1.2.7" >&5 +@@ -5311,4 +5311,4 @@ + echo "configure:5312: checking for GTK >= 1.2.7" >&5 -if gtk-config --version > /dev/null 2>&1; then - vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if $GTK_CONFIG --version > /dev/null 2>&1; then diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist index f9532138063f..f8cdf3051280 100644 --- a/x11-toolkits/gal/pkg-plist +++ b/x11-toolkits/gal/pkg-plist @@ -3,9 +3,14 @@ include/gal/e-paned/e-hpaned.h include/gal/e-paned/e-paned.h include/gal/e-paned/e-vpaned.h include/gal/e-table/e-cell-checkbox.h +include/gal/e-table/e-cell-combo.h include/gal/e-table/e-cell-date.h +include/gal/e-table/e-cell-float.h include/gal/e-table/e-cell-number.h +include/gal/e-table/e-cell-pixbuf.h +include/gal/e-table/e-cell-popup.h include/gal/e-table/e-cell-size.h +include/gal/e-table/e-cell-spin-button.h include/gal/e-table/e-cell-text.h include/gal/e-table/e-cell-toggle.h include/gal/e-table/e-cell-tree.h @@ -27,6 +32,8 @@ include/gal/e-table/e-table-header-item.h include/gal/e-table/e-table-header-utils.h include/gal/e-table/e-table-header.h include/gal/e-table/e-table-item.h +include/gal/e-table/e-table-memory-callbacks.h +include/gal/e-table/e-table-memory.h include/gal/e-table/e-table-model.h include/gal/e-table/e-table-one.h include/gal/e-table/e-table-scrolled.h @@ -36,19 +43,27 @@ include/gal/e-table/e-table-sort-info.h include/gal/e-table/e-table-sorted-variable.h include/gal/e-table/e-table-sorted.h include/gal/e-table/e-table-sorter.h +include/gal/e-table/e-table-sorting-utils.h include/gal/e-table/e-table-specification.h include/gal/e-table/e-table-state.h include/gal/e-table/e-table-subset-variable.h include/gal/e-table/e-table-subset.h -include/gal/e-table/e-table-text-model.h include/gal/e-table/e-table-tooltip.h +include/gal/e-table/e-table-utils.h include/gal/e-table/e-table.h +include/gal/e-table/e-tree-memory-callbacks.h +include/gal/e-table/e-tree-memory.h include/gal/e-table/e-tree-model.h -include/gal/e-table/e-tree-simple.h +include/gal/e-table/e-tree-scrolled.h +include/gal/e-table/e-tree-selection-model.h +include/gal/e-table/e-tree-sorted.h +include/gal/e-table/e-tree-table-adapter.h +include/gal/e-table/e-tree.h +include/gal/e-text/e-completion-view.h +include/gal/e-text/e-completion.h include/gal/e-text/e-entry.h -include/gal/e-text/e-text-event-processor-emacs-like.h -include/gal/e-text/e-text-event-processor-types.h -include/gal/e-text/e-text-event-processor.h +include/gal/e-text/e-table-text-model.h +include/gal/e-text/e-text-model-repos.h include/gal/e-text/e-text-model-uri.h include/gal/e-text/e-text-model.h include/gal/e-text/e-text.h @@ -66,8 +81,13 @@ include/gal/shortcut-bar/e-icon-bar.h include/gal/shortcut-bar/e-shortcut-bar.h include/gal/shortcut-bar/e-shortcut-model.h include/gal/shortcut-bar/e-vscrolled-bar.h +include/gal/util/e-bit-array.h include/gal/util/e-cache.h include/gal/util/e-i18n.h +include/gal/util/e-sorter.h +include/gal/util/e-text-event-processor-emacs-like.h +include/gal/util/e-text-event-processor-types.h +include/gal/util/e-text-event-processor.h include/gal/util/e-util.h include/gal/util/e-xml-utils.h include/gal/widgets/color-group.h @@ -81,11 +101,15 @@ include/gal/widgets/e-cursors.h include/gal/widgets/e-font.h include/gal/widgets/e-gui-utils.h include/gal/widgets/e-hscrollbar.h +include/gal/widgets/e-hsv-utils.h include/gal/widgets/e-popup-menu.h include/gal/widgets/e-printable.h include/gal/widgets/e-reflow-sorted.h include/gal/widgets/e-reflow.h include/gal/widgets/e-scroll-frame.h +include/gal/widgets/e-selection-model-array.h +include/gal/widgets/e-selection-model-simple.h +include/gal/widgets/e-selection-model.h include/gal/widgets/e-unicode.h include/gal/widgets/e-vscrollbar.h include/gal/widgets/gtk-combo-box.h @@ -95,7 +119,7 @@ include/gal/widgets/widget-color-combo.h include/gal/widgets/widget-pixmap-combo.h lib/libgal.a lib/libgal.so -lib/libgal.so.4 +lib/libgal.so.6 share/gnome/etable/%%VERSION%%/glade/e-table-config.glade share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade share/gnome/etable/%%VERSION%%/glade/e-table-group.glade @@ -108,6 +132,7 @@ share/gnome/gal/html/gal-sections.txt share/gnome/gal/html/gal.hierarchy share/gnome/gal/html/gal.signals share/gnome/gal/html/gal.types +share/locale/az/LC_MESSAGES/gal.mo share/locale/ca/LC_MESSAGES/gal.mo share/locale/da/LC_MESSAGES/gal.mo share/locale/de/LC_MESSAGES/gal.mo @@ -124,6 +149,7 @@ share/locale/lt/LC_MESSAGES/gal.mo share/locale/no/LC_MESSAGES/gal.mo share/locale/pl/LC_MESSAGES/gal.mo share/locale/pt_BR/LC_MESSAGES/gal.mo +share/locale/ro/LC_MESSAGES/gal.mo share/locale/ru/LC_MESSAGES/gal.mo share/locale/sk/LC_MESSAGES/gal.mo share/locale/sv/LC_MESSAGES/gal.mo diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 21724db1b826..533567735a3c 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,17 +6,14 @@ # PORTNAME= gal -PORTVERSION= 0.5 +PORTVERSION= 0.7 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gal MAINTAINER?= ade@FreeBSD.org -LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - glade.4:${PORTSDIR}/devel/libglade \ - unicode.0:${PORTSDIR}/devel/libunicode \ - gnomevfs.0:${PORTSDIR}/devel/gnomevfs \ +LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \ giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 10d952f8519a..ed789c5d1c54 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1 +1 @@ -MD5 (gal-0.5.tar.gz) = 1aaf233130fa116334da2edc516b8958 +MD5 (gal-0.7.tar.gz) = 4f8003ca81a71627de1a7f8b49a07af3 diff --git a/x11-toolkits/gal2/files/patch-aa b/x11-toolkits/gal2/files/patch-aa index 79bbe96885e2..8aaa875e5d28 100644 --- a/x11-toolkits/gal2/files/patch-aa +++ b/x11-toolkits/gal2/files/patch-aa @@ -1,31 +1,31 @@ ---- configure.orig Thu Feb 8 13:54:31 2001 -+++ configure Fri Feb 9 10:46:57 2001 -@@ -5017,5 +5017,5 @@ +--- configure.orig Mon Apr 16 17:12:51 2001 ++++ configure Thu Apr 19 11:45:12 2001 +@@ -5026,5 +5026,5 @@ CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:5021: checking for iconv in -liconv" >&5 +-echo "configure:5030: checking for iconv in -liconv" >&5 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:5021: checking for iconv in -lgiconv" >&5 ++echo "configure:5030: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then -@@ -5027,3 +5027,3 @@ +@@ -5036,3 +5036,3 @@ -#include <iconv.h> +#include <giconv.h> -@@ -5050,3 +5050,3 @@ +@@ -5059,3 +5059,3 @@ if test $ac_cv_libiconv = yes; then - ICONV_LIBS="$ICONV_LIBS -liconv" + ICONV_LIBS="$ICONV_LIBS -lgiconv" have_iconv=yes -@@ -5176,3 +5176,3 @@ +@@ -5185,3 +5185,3 @@ -#include <iconv.h> +#include <giconv.h> #include <stdlib.h> -@@ -5302,4 +5302,4 @@ - echo "configure:5303: checking for GTK >= 1.2.7" >&5 +@@ -5311,4 +5311,4 @@ + echo "configure:5312: checking for GTK >= 1.2.7" >&5 -if gtk-config --version > /dev/null 2>&1; then - vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +if $GTK_CONFIG --version > /dev/null 2>&1; then diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index f9532138063f..f8cdf3051280 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -3,9 +3,14 @@ include/gal/e-paned/e-hpaned.h include/gal/e-paned/e-paned.h include/gal/e-paned/e-vpaned.h include/gal/e-table/e-cell-checkbox.h +include/gal/e-table/e-cell-combo.h include/gal/e-table/e-cell-date.h +include/gal/e-table/e-cell-float.h include/gal/e-table/e-cell-number.h +include/gal/e-table/e-cell-pixbuf.h +include/gal/e-table/e-cell-popup.h include/gal/e-table/e-cell-size.h +include/gal/e-table/e-cell-spin-button.h include/gal/e-table/e-cell-text.h include/gal/e-table/e-cell-toggle.h include/gal/e-table/e-cell-tree.h @@ -27,6 +32,8 @@ include/gal/e-table/e-table-header-item.h include/gal/e-table/e-table-header-utils.h include/gal/e-table/e-table-header.h include/gal/e-table/e-table-item.h +include/gal/e-table/e-table-memory-callbacks.h +include/gal/e-table/e-table-memory.h include/gal/e-table/e-table-model.h include/gal/e-table/e-table-one.h include/gal/e-table/e-table-scrolled.h @@ -36,19 +43,27 @@ include/gal/e-table/e-table-sort-info.h include/gal/e-table/e-table-sorted-variable.h include/gal/e-table/e-table-sorted.h include/gal/e-table/e-table-sorter.h +include/gal/e-table/e-table-sorting-utils.h include/gal/e-table/e-table-specification.h include/gal/e-table/e-table-state.h include/gal/e-table/e-table-subset-variable.h include/gal/e-table/e-table-subset.h -include/gal/e-table/e-table-text-model.h include/gal/e-table/e-table-tooltip.h +include/gal/e-table/e-table-utils.h include/gal/e-table/e-table.h +include/gal/e-table/e-tree-memory-callbacks.h +include/gal/e-table/e-tree-memory.h include/gal/e-table/e-tree-model.h -include/gal/e-table/e-tree-simple.h +include/gal/e-table/e-tree-scrolled.h +include/gal/e-table/e-tree-selection-model.h +include/gal/e-table/e-tree-sorted.h +include/gal/e-table/e-tree-table-adapter.h +include/gal/e-table/e-tree.h +include/gal/e-text/e-completion-view.h +include/gal/e-text/e-completion.h include/gal/e-text/e-entry.h -include/gal/e-text/e-text-event-processor-emacs-like.h -include/gal/e-text/e-text-event-processor-types.h -include/gal/e-text/e-text-event-processor.h +include/gal/e-text/e-table-text-model.h +include/gal/e-text/e-text-model-repos.h include/gal/e-text/e-text-model-uri.h include/gal/e-text/e-text-model.h include/gal/e-text/e-text.h @@ -66,8 +81,13 @@ include/gal/shortcut-bar/e-icon-bar.h include/gal/shortcut-bar/e-shortcut-bar.h include/gal/shortcut-bar/e-shortcut-model.h include/gal/shortcut-bar/e-vscrolled-bar.h +include/gal/util/e-bit-array.h include/gal/util/e-cache.h include/gal/util/e-i18n.h +include/gal/util/e-sorter.h +include/gal/util/e-text-event-processor-emacs-like.h +include/gal/util/e-text-event-processor-types.h +include/gal/util/e-text-event-processor.h include/gal/util/e-util.h include/gal/util/e-xml-utils.h include/gal/widgets/color-group.h @@ -81,11 +101,15 @@ include/gal/widgets/e-cursors.h include/gal/widgets/e-font.h include/gal/widgets/e-gui-utils.h include/gal/widgets/e-hscrollbar.h +include/gal/widgets/e-hsv-utils.h include/gal/widgets/e-popup-menu.h include/gal/widgets/e-printable.h include/gal/widgets/e-reflow-sorted.h include/gal/widgets/e-reflow.h include/gal/widgets/e-scroll-frame.h +include/gal/widgets/e-selection-model-array.h +include/gal/widgets/e-selection-model-simple.h +include/gal/widgets/e-selection-model.h include/gal/widgets/e-unicode.h include/gal/widgets/e-vscrollbar.h include/gal/widgets/gtk-combo-box.h @@ -95,7 +119,7 @@ include/gal/widgets/widget-color-combo.h include/gal/widgets/widget-pixmap-combo.h lib/libgal.a lib/libgal.so -lib/libgal.so.4 +lib/libgal.so.6 share/gnome/etable/%%VERSION%%/glade/e-table-config.glade share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade share/gnome/etable/%%VERSION%%/glade/e-table-group.glade @@ -108,6 +132,7 @@ share/gnome/gal/html/gal-sections.txt share/gnome/gal/html/gal.hierarchy share/gnome/gal/html/gal.signals share/gnome/gal/html/gal.types +share/locale/az/LC_MESSAGES/gal.mo share/locale/ca/LC_MESSAGES/gal.mo share/locale/da/LC_MESSAGES/gal.mo share/locale/de/LC_MESSAGES/gal.mo @@ -124,6 +149,7 @@ share/locale/lt/LC_MESSAGES/gal.mo share/locale/no/LC_MESSAGES/gal.mo share/locale/pl/LC_MESSAGES/gal.mo share/locale/pt_BR/LC_MESSAGES/gal.mo +share/locale/ro/LC_MESSAGES/gal.mo share/locale/ru/LC_MESSAGES/gal.mo share/locale/sk/LC_MESSAGES/gal.mo share/locale/sv/LC_MESSAGES/gal.mo diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile index 87c085df42bc..64eefe9b184e 100644 --- a/x11-toolkits/gob/Makefile +++ b/x11-toolkits/gob/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gob -PORTVERSION= 1.0.8 +PORTVERSION= 1.0.9 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.5z.com/pub/gob/ diff --git a/x11-toolkits/gob/distinfo b/x11-toolkits/gob/distinfo index 363614ceb6b1..ca427d6454f0 100644 --- a/x11-toolkits/gob/distinfo +++ b/x11-toolkits/gob/distinfo @@ -1 +1 @@ -MD5 (gob-1.0.8.tar.gz) = b020e8df621fc90674c9c5c6332900e4 +MD5 (gob-1.0.9.tar.gz) = c32b6af9d6d3fe0f325a10bf369365dc diff --git a/x11/Makefile b/x11/Makefile index d06c9c6d978e..867d1d3195ce 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -32,6 +32,7 @@ SUBDIR += gdm SUBDIR += gmessage SUBDIR += gnome + SUBDIR += gnome-fifth-toe SUBDIR += gnomeapplets SUBDIR += gnomecore SUBDIR += gnomelibs diff --git a/x11/gnome-fifth-toe/Makefile b/x11/gnome-fifth-toe/Makefile new file mode 100644 index 000000000000..cd56bcd3978e --- /dev/null +++ b/x11/gnome-fifth-toe/Makefile @@ -0,0 +1,49 @@ +# New ports collection makefile for: gnome +# Date created: 18th April 2001 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnome-fifth-toe +PORTVERSION= 1.4 +CATEGORIES= x11 gnome +MASTER_SITES= # empty +DISTFILES= # empty +EXTRACT_ONLY= # empty + +MAINTAINER= ade@FreeBSD.org + +RUN_DEPENDS= mozilla:${PORTSDIR}/www/mozilla \ + galeon:${PORTSDIR}/www/galeon \ + gabber:${PORTSDIR}/net/gabber \ + pan:${PORTSDIR}/news/pan \ + gnumeric:${PORTSDIR}/math/gnumeric \ + sodipodi:${PORTSDIR}/graphics/sodipodi \ + atomix:${PORTSDIR}/games/atomix \ + balsa:${PORTSDIR}/mail/balsa \ + bombermaze:${PORTSDIR}/games/bombermaze \ + dia:${PORTSDIR}/graphics/dia \ + eog:${PORTSDIR}/graphics/eog \ + gedit:${PORTSDIR}/editors/gedit \ + gimp:${PORTSDIR}/graphics/gimp1 \ + glimmer:${PORTSDIR}/editors/glimmer \ + gnomeicu:${PORTSDIR}/net/gnomeicu \ + gob:${PORTSDIR}/x11-toolkits/gob \ + gtm:${PORTSDIR}/ftp/gtm \ + gnucash:${PORTSDIR}/deskutils/gnucash \ + abiword:${PORTSDIR}/editors/AbiWord + +# We're still missing a few things from the "official" distribution +# All can be found in stable/sources on MASTER_SITE_GNOME +# +# anjuta, firestarter, fpm, gfax, gnome-db, gnome-lokkit, gnomoku, +# gnorpm, googlizer, guppi, merlin-cpufire, radioactive, toutdoux + +NO_BUILD= yes +USE_GNOME= yes +USE_PYTHON= yes + +do-install: # empty + +.include <bsd.port.mk> diff --git a/x11/gnome-fifth-toe/pkg-comment b/x11/gnome-fifth-toe/pkg-comment new file mode 100644 index 000000000000..76f066e9d170 --- /dev/null +++ b/x11/gnome-fifth-toe/pkg-comment @@ -0,0 +1 @@ +The "meta-port" for the GNOME "Fifth-Toe" extra package set diff --git a/x11/gnome-fifth-toe/pkg-descr b/x11/gnome-fifth-toe/pkg-descr new file mode 100644 index 000000000000..a3bb199588d4 --- /dev/null +++ b/x11/gnome-fifth-toe/pkg-descr @@ -0,0 +1,4 @@ +GNOME "Fifth-Toe" + +A collection of programs that GNOME users may find useful, all brought +together with the convenience of a single "meta-port". diff --git a/x11/gnome-fifth-toe/pkg-plist b/x11/gnome-fifth-toe/pkg-plist new file mode 100644 index 000000000000..549a621fec0c --- /dev/null +++ b/x11/gnome-fifth-toe/pkg-plist @@ -0,0 +1 @@ +@comment this plist intentionally left empty diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile new file mode 100644 index 000000000000..cd56bcd3978e --- /dev/null +++ b/x11/gnome2-fifth-toe/Makefile @@ -0,0 +1,49 @@ +# New ports collection makefile for: gnome +# Date created: 18th April 2001 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnome-fifth-toe +PORTVERSION= 1.4 +CATEGORIES= x11 gnome +MASTER_SITES= # empty +DISTFILES= # empty +EXTRACT_ONLY= # empty + +MAINTAINER= ade@FreeBSD.org + +RUN_DEPENDS= mozilla:${PORTSDIR}/www/mozilla \ + galeon:${PORTSDIR}/www/galeon \ + gabber:${PORTSDIR}/net/gabber \ + pan:${PORTSDIR}/news/pan \ + gnumeric:${PORTSDIR}/math/gnumeric \ + sodipodi:${PORTSDIR}/graphics/sodipodi \ + atomix:${PORTSDIR}/games/atomix \ + balsa:${PORTSDIR}/mail/balsa \ + bombermaze:${PORTSDIR}/games/bombermaze \ + dia:${PORTSDIR}/graphics/dia \ + eog:${PORTSDIR}/graphics/eog \ + gedit:${PORTSDIR}/editors/gedit \ + gimp:${PORTSDIR}/graphics/gimp1 \ + glimmer:${PORTSDIR}/editors/glimmer \ + gnomeicu:${PORTSDIR}/net/gnomeicu \ + gob:${PORTSDIR}/x11-toolkits/gob \ + gtm:${PORTSDIR}/ftp/gtm \ + gnucash:${PORTSDIR}/deskutils/gnucash \ + abiword:${PORTSDIR}/editors/AbiWord + +# We're still missing a few things from the "official" distribution +# All can be found in stable/sources on MASTER_SITE_GNOME +# +# anjuta, firestarter, fpm, gfax, gnome-db, gnome-lokkit, gnomoku, +# gnorpm, googlizer, guppi, merlin-cpufire, radioactive, toutdoux + +NO_BUILD= yes +USE_GNOME= yes +USE_PYTHON= yes + +do-install: # empty + +.include <bsd.port.mk> diff --git a/x11/gnome2-fifth-toe/pkg-comment b/x11/gnome2-fifth-toe/pkg-comment new file mode 100644 index 000000000000..76f066e9d170 --- /dev/null +++ b/x11/gnome2-fifth-toe/pkg-comment @@ -0,0 +1 @@ +The "meta-port" for the GNOME "Fifth-Toe" extra package set diff --git a/x11/gnome2-fifth-toe/pkg-descr b/x11/gnome2-fifth-toe/pkg-descr new file mode 100644 index 000000000000..a3bb199588d4 --- /dev/null +++ b/x11/gnome2-fifth-toe/pkg-descr @@ -0,0 +1,4 @@ +GNOME "Fifth-Toe" + +A collection of programs that GNOME users may find useful, all brought +together with the convenience of a single "meta-port". diff --git a/x11/gnome2-fifth-toe/pkg-plist b/x11/gnome2-fifth-toe/pkg-plist new file mode 100644 index 000000000000..549a621fec0c --- /dev/null +++ b/x11/gnome2-fifth-toe/pkg-plist @@ -0,0 +1 @@ +@comment this plist intentionally left empty |