diff options
| author | OKAZAKI Tetsurou <okazaki@FreeBSD.org> | 2002-07-02 05:13:19 +0000 |
|---|---|---|
| committer | OKAZAKI Tetsurou <okazaki@FreeBSD.org> | 2002-07-02 05:13:19 +0000 |
| commit | c42ff00e0e1e65733ad1922936b41f7170f7f49e (patch) | |
| tree | 53b63653b521ff2949853959e485886782e42e48 /databases | |
| parent | Upgrade to 3.1.20 (diff) | |
Update to 2.2.1.
PR: 37836
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=62307
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/unixODBC/Makefile | 4 | ||||
| -rw-r--r-- | databases/unixODBC/distinfo | 2 | ||||
| -rw-r--r-- | databases/unixODBC/files/patch-configure | 10 | ||||
| -rw-r--r-- | databases/unixODBC/files/patch-ltmain.sh | 33 | ||||
| -rw-r--r-- | databases/unixODBC/pkg-plist | 2 |
5 files changed, 13 insertions, 38 deletions
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index 5fc0e11b771b..311cc3b3a04e 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -6,13 +6,13 @@ # PORTNAME= unixODBC -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ MAINTAINER= ports@FreeBSD.org -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static --enable-shared INSTALLS_SHLIB= yes diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo index b325266dab22..c25817508f15 100644 --- a/databases/unixODBC/distinfo +++ b/databases/unixODBC/distinfo @@ -1 +1 @@ -MD5 (unixODBC-2.2.0.tar.gz) = ef280d18e855b55592a2472679382008 +MD5 (unixODBC-2.2.1.tar.gz) = 3b116091eb40e55a1d4ffed337f37768 diff --git a/databases/unixODBC/files/patch-configure b/databases/unixODBC/files/patch-configure new file mode 100644 index 000000000000..1d796a6f6118 --- /dev/null +++ b/databases/unixODBC/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Sun Apr 28 08:36:46 2002 ++++ configure Sun Apr 28 08:55:08 2002 +@@ -5733,6 +5733,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/unixODBC/files/patch-ltmain.sh b/databases/unixODBC/files/patch-ltmain.sh deleted file mode 100644 index c4dc6f8a5cff..000000000000 --- a/databases/unixODBC/files/patch-ltmain.sh +++ /dev/null @@ -1,33 +0,0 @@ ---- ltmain.sh.orig Wed Oct 31 22:35:16 2001 -+++ ltmain.sh Thu Dec 13 05:47:16 2001 -@@ -944,6 +944,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -2408,6 +2409,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 +4179,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/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist index c4e13c3e4ce0..811b222e753c 100644 --- a/databases/unixODBC/pkg-plist +++ b/databases/unixODBC/pkg-plist @@ -43,8 +43,6 @@ lib/libodbcinst.a lib/libodbcinst.so lib/libodbcinst.so.1 %%GUI:%%lib/libodbcinstQ.a -%%GUI:%%lib/libodbcinstQ.so -%%GUI:%%lib/libodbcinstQ.so.1 lib/libodbcminiS.a lib/libodbcminiS.so lib/libodbcminiS.so.1 |