Attachment 21632 Details for Bug 37836 – file.diff

[patch] file.diff

file.diff (text/plain), 3.15 KB, created by tkato on 2002-05-07 16:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-05-07 16:20:02 UTC

Size: 3.15 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	Sun Feb 10 10:06:33 2002
>+++ databases/unixODBC/Makefile	Sun Apr 28 08:55:45 2002
>@@ -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 -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
>--- /usr/ports/databases/unixODBC/distinfo	Sun Feb 10 10:06:33 2002
>+++ databases/unixODBC/distinfo	Fri Apr 26 22:08:38 2002
>@@ -1 +1 @@
>-MD5 (unixODBC-2.2.0.tar.gz) = ef280d18e855b55592a2472679382008
>+MD5 (unixODBC-2.2.1.tar.gz) = 3b116091eb40e55a1d4ffed337f37768
>diff -urN /usr/ports/databases/unixODBC/files/patch-configure databases/unixODBC/files/patch-configure
>--- /usr/ports/databases/unixODBC/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-configure	Sun Apr 28 08:55:23 2002
>@@ -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 -urN /usr/ports/databases/unixODBC/files/patch-ltmain.sh databases/unixODBC/files/patch-ltmain.sh
>--- /usr/ports/databases/unixODBC/files/patch-ltmain.sh	Tue Dec 18 04:19:44 2001
>+++ databases/unixODBC/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
>@@ -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 -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist
>--- /usr/ports/databases/unixODBC/pkg-plist	Sun Feb 10 10:06:34 2002
>+++ databases/unixODBC/pkg-plist	Sun Apr 28 15:43:52 2002
>@@ -43,8 +43,6 @@
> 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
>@@ -62,8 +60,6 @@
> lib/libodbcpsqlS.so
> lib/libodbcpsqlS.so.1
> lib/libodbctxt.a
>-lib/libodbctxt.so
>-lib/libodbctxt.so.1
> lib/libodbctxtS.a
> lib/libodbctxtS.so
> lib/libodbctxtS.so.1

Actions: View | Diff

Attachments on bug 37836: 21632