From 17b6cc0afe9b40f3959b94130e056a822adc30b4 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Wed, 1 May 2002 20:23:03 +0000 Subject: - Move misc documentation into share/doc where it belongs; - use USE_LIBTOOL while I here; - make gnome-hint from gnomecore actually working; - bump PORTREVISIONs. --- databases/libgda2/Makefile | 3 ++- databases/libgda2/files/patch-configure | 13 ++++++++++ ...h-doc::C::reference::libgda-client::Makefile.in | 14 +++++++++++ ...h-doc::C::reference::libgda-common::Makefile.in | 14 +++++++++++ databases/libgda2/files/patch-ltmain.sh | 28 ---------------------- databases/libgda2/pkg-plist | 25 +++++++++---------- 6 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 databases/libgda2/files/patch-configure create mode 100644 databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in create mode 100644 databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in delete mode 100644 databases/libgda2/files/patch-ltmain.sh (limited to 'databases/libgda2') diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index abfd7e86a720..0fb8c4353fdf 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgda PORTVERSION= 0.2.96 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/${PORTNAME} @@ -22,7 +23,7 @@ USE_X_PREFIX= yes USE_GNOMECTRL= yes USE_GMAKE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" diff --git a/databases/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure new file mode 100644 index 000000000000..948849e89223 --- /dev/null +++ b/databases/libgda2/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/05/01 08:18:05 1.1 ++++ configure 2002/05/01 08:19:03 +@@ -5785,6 +5785,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in new file mode 100644 index 000000000000..463f043f902c --- /dev/null +++ b/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1 ++++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40 +@@ -171,7 +171,7 @@ + LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a " + + +-DOC_DIR = $(datadir)/html ++DOC_DIR = $(prefix)/share/doc/libgda + + DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt + diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in new file mode 100644 index 000000000000..25b6b1ddc2e5 --- /dev/null +++ b/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1 ++++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35 +@@ -171,7 +171,7 @@ + LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a " + + +-DOC_DIR = $(datadir)/html ++DOC_DIR = $(prefix)/share/doc/libgda + + DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt + diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/databases/libgda2/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index 52a3a3b5368b..60028e4563a1 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -58,6 +58,18 @@ lib/libgda-common.so.0 lib/libgda-server.a lib/libgda-server.so lib/libgda-server.so.0 +share/doc/libgda/libgda-client-decl.txt +share/doc/libgda/libgda-client-sections.txt +share/doc/libgda/libgda-client.args +share/doc/libgda/libgda-client.hierarchy +share/doc/libgda/libgda-client.signals +share/doc/libgda/libgda-client.types +share/doc/libgda/libgda-common-decl.txt +share/doc/libgda/libgda-common-sections.txt +share/doc/libgda/libgda-common.args +share/doc/libgda/libgda-common.hierarchy +share/doc/libgda/libgda-common.signals +share/doc/libgda/libgda-common.types share/gnome/gda/templates/gda-srv-command.c.tmpl share/gnome/gda/templates/gda-srv-connection.c.tmpl share/gnome/gda/templates/gda-srv-recordset.c.tmpl @@ -149,18 +161,6 @@ 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/gnome/html/libgda-client-decl.txt -share/gnome/html/libgda-client-sections.txt -share/gnome/html/libgda-client.args -share/gnome/html/libgda-client.hierarchy -share/gnome/html/libgda-client.signals -share/gnome/html/libgda-client.types -share/gnome/html/libgda-common-decl.txt -share/gnome/html/libgda-common-sections.txt -share/gnome/html/libgda-common.args -share/gnome/html/libgda-common.hierarchy -share/gnome/html/libgda-common.signals -share/gnome/html/libgda-common.types share/gnome/idl/GDA.idl share/gnome/idl/GDA_Command.idl share/gnome/idl/GDA_Connection.idl @@ -206,6 +206,7 @@ share/locale/uk/LC_MESSAGES/libgda.mo @dirrm share/gnome/help/libgda @dirrm share/gnome/gda/templates @dirrm share/gnome/gda +@dirrm share/doc/libgda @dirrm include/libgda-%%VERSION%%/gda++ @dirrm include/libgda-%%VERSION%%/gda @dirrm include/libgda-%%VERSION%% -- cgit v1.2.3