diff options
author | sobomax <sobomax@FreeBSD.org> | 2001-07-26 21:25:37 +0800 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2001-07-26 21:25:37 +0800 |
commit | 4c236dd0eccf7f1dd4ee47bdb2556243c68cd078 (patch) | |
tree | 8b709c7a774ec1ef73a07419842b47fc8d6eaaec /databases/libgda | |
parent | 62a409976ca92f72fa02b769781ef382f4132783 (diff) | |
download | freebsd-ports-gnome-4c236dd0eccf7f1dd4ee47bdb2556243c68cd078.tar.gz freebsd-ports-gnome-4c236dd0eccf7f1dd4ee47bdb2556243c68cd078.tar.zst freebsd-ports-gnome-4c236dd0eccf7f1dd4ee47bdb2556243c68cd078.zip |
- Fix a silly GNUism in the configure script (`==' instead of `='), that
results in perl module not being built;
- remove useless USE_LIBTOOL.
Diffstat (limited to 'databases/libgda')
-rw-r--r-- | databases/libgda/Makefile | 6 | ||||
-rw-r--r-- | databases/libgda/files/patch-configure | 72 | ||||
-rw-r--r-- | databases/libgda/files/patch-ltmain.sh | 18 | ||||
-rw-r--r-- | databases/libgda/pkg-plist | 18 |
4 files changed, 73 insertions, 41 deletions
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index e63377a45006..d5655f589dee 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgda PORTVERSION= 0.2.10 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-db @@ -18,12 +19,15 @@ LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \ USE_GNOMECTRL= yes USE_GMAKE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" +MAN3= Gnome::GDA::Client.3 Gnome::GDA::Common.3 +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} + pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure index 71c871b4fca1..29982c39abc5 100644 --- a/databases/libgda/files/patch-configure +++ b/databases/libgda/files/patch-configure @@ -1,62 +1,56 @@ ---- configure.orig Wed Jun 13 18:45:10 2001 -+++ configure Tue Jun 19 00:39:40 2001 -@@ -5389,4 +5389,19 @@ + +$FreeBSD$ + +--- configure.orig Thu Jul 26 15:51:10 2001 ++++ configure Thu Jul 26 16:09:53 2001 +@@ -6238,7 +6240,7 @@ -- -- -+# Actually configure libtool. ac_aux_dir is where install-sh is found. -+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -+$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \ -+|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+ -+# Reload cache, that may have been modified by ltconfig -+if test -r "$cache_file"; then -+ echo "loading cache $cache_file" -+ . $cache_file -+else -+ echo "creating cache $cache_file" -+ > $cache_file -+fi -@@ -5394,3 +5409,3 @@ - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -@@ -5399,2 +5414,7 @@ - -+# Redirect the config.log output again, so that the ltconfig log is not -+# clobbered by the next message. -+exec 5>>./config.log -+ -+ - # Prevent multiple expansion -@@ -7911,3 +7931,3 @@ +-if test $perl_val == true; then ++if test $perl_val = true; then + WITH_PERL_TRUE= + WITH_PERL_FALSE='#' + else +@@ -7909,7 +7911,7 @@ + #line 7910 "configure" + #include "confdefs.h" #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> int main() { -@@ -7928,3 +7948,3 @@ + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -7926,12 +7928,12 @@ + rm -f conftest* + if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" + LIBS="$LIBS -lgiconv" cat > conftest.$ac_ext <<EOF -@@ -7933,3 +7953,3 @@ + #line 7932 "configure" + #include "confdefs.h" #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> int main() { -@@ -7971,3 +7991,3 @@ + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); +@@ -7969,7 +7971,7 @@ + #include "confdefs.h" + #include <stdlib.h> -#include <iconv.h> +#include <giconv.h> extern -@@ -8009,3 +8029,3 @@ + #ifdef __cplusplus + "C" +@@ -8007,7 +8009,7 @@ + fi + LIBICONV= if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" + LIBICONV="-lgiconv" fi + + diff --git a/databases/libgda/files/patch-ltmain.sh b/databases/libgda/files/patch-ltmain.sh new file mode 100644 index 000000000000..0c594216b0e1 --- /dev/null +++ b/databases/libgda/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/23 09:45:58 1.1 ++++ ltmain.sh 2001/07/23 09:46:28 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if 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/libgda/pkg-plist b/databases/libgda/pkg-plist index 8f1f4385065d..f66db28d66d2 100644 --- a/databases/libgda/pkg-plist +++ b/databases/libgda/pkg-plist @@ -45,6 +45,16 @@ lib/libgda-common.so.0 lib/libgda-server.a lib/libgda-server.so lib/libgda-server.so.0 +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/GDA/Client.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/GDA/Common.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Client/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Client/Client.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Client/Client.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Client/autosplit.ix +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Common/.packlist +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Common/Common.bs +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Common/Common.so +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Common/autosplit.ix share/gda/templates/gda-srv-command.c.tmpl share/gda/templates/gda-srv-connection.c.tmpl share/gda/templates/gda-srv-recordset.c.tmpl @@ -158,8 +168,8 @@ share/gnome/idl/GDA_Command.idl share/gnome/idl/GDA_Connection.idl share/gnome/idl/GDA_Error.idl share/gnome/idl/GDA_Field.idl -share/gnome/idl/GDA_Recordset.idl share/gnome/idl/GDA_Parameter.idl +share/gnome/idl/GDA_Recordset.idl share/gnome/oaf/GNOME_GDA_Provider_Default.oaf share/locale/ca/LC_MESSAGES/libgda.mo share/locale/da/LC_MESSAGES/libgda.mo @@ -191,5 +201,11 @@ share/locale/uk/LC_MESSAGES/libgda.mo @dirrm share/gnome/help/libgda @dirrm share/gda/templates @dirrm share/gda +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Common +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA/Client +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/GDA +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/GDA +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome @dirrm include/gda/gda++ @dirrm include/gda |