Attachment 18224 Details for Bug 32851 – file.diff

[patch] file.diff

file.diff (text/plain), 5.26 KB, created by tkato on 2001-12-15 08:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2001-12-15 08:10:01 UTC

Size: 5.26 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	Thu Aug 23 19:47:09 2001
>+++ databases/unixODBC/Makefile	Thu Dec 13 06:28:00 2001
>@@ -6,27 +6,25 @@
> #
> 
> PORTNAME=	unixODBC
>-PORTVERSION=	2.0.9
>+PORTVERSION=	2.1.0
> CATEGORIES=	databases
> MASTER_SITES=	http://www.unixodbc.org/
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-USE_LIBTOOL=	yes
>+GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-static --enable-shared
> INSTALLS_SHLIB=	yes
> 
> .if defined(WITH_GUI)
> USE_QT_VER=	2
> QT_NONSTANDARD=	yes
>-CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
>+CONFIGURE_ENV=	MOC="${MOC}" \
>+		QTINC="${X11BASE}/include/qt2" \
>+		QTLIB="${X11BASE}/lib" \
> 		USER_INCLUDES="${QTCPPFLAGS}" \
> 		USER_LDFLAGS="${QTCFGLIBS}"
>-CONFIGURE_ARGS+=	--enable-gui \
>-			--with-qt-includes=${X11BASE}/include/qt2 \
>-			--with-qt-libraries=${X11BASE}/lib \
>-			--with-extra-includes=${LOCALBASE}/include \
>-			--with-extra-libs=${LOCALBASE}/lib
>+CONFIGURE_ARGS+=	--enable-gui
> PLIST_SUB=	GUI:=""
> .else
> CONFIGURE_ARGS+=	--disable-gui
>@@ -35,20 +33,16 @@
> 
> .if defined(WITH_PTHREAD)
> CONFIGURE_ARGS+=	--enable-threads=yes
>+QT_NAME=		qt2-mt
> .else
> CONFIGURE_ARGS+=	--enable-threads=no
>+QT_NAME=		qt2
> .endif
> 
>-pre-patch:
>-.if defined(WITH_PTHREAD)
>+post-patch:
> 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-			 s|-lqt|-lqt2-mt|g' ${WRKSRC}/configure
>-.else
>-	@${PERL} -pi -e 's|-lqt|-lqt2|g' ${WRKSRC}/configure
>-.endif
>-
>-pre-build:
>-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
>+		 s|"-lqt"|"-l${QT_NAME}"|g ; \
>+		 s|"-lqt-mt"|"-l${QT_NAME}"|g' ${WRKSRC}/configure
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
>--- /usr/ports/databases/unixODBC/distinfo	Thu Aug 23 19:47:10 2001
>+++ databases/unixODBC/distinfo	Wed Nov 28 04:14:17 2001
>@@ -1 +1 @@
>-MD5 (unixODBC-2.0.9.tar.gz) = 0e7b50be602aea5788fd940d7620da0e
>+MD5 (unixODBC-2.1.0.tar.gz) = 32f48117e6e14343a928e22385595c81
>diff -urN /usr/ports/databases/unixODBC/files/patch-ltmain.sh databases/unixODBC/files/patch-ltmain.sh
>--- /usr/ports/databases/unixODBC/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
>+++ databases/unixODBC/files/patch-ltmain.sh	Thu Dec 13 05:47:24 2001
>@@ -0,0 +1,33 @@
>+--- 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	Mon Jul 23 12:54:43 2001
>+++ databases/unixODBC/pkg-plist	Fri Dec 14 17:42:37 2001
>@@ -15,90 +15,73 @@
> include/sqlucode.h
> include/uodbc_stats.h
> lib/libboundparam.a
>-lib/libboundparam.la
> lib/libboundparam.so
> lib/libboundparam.so.1
> lib/libesoobS.a
>-lib/libesoobS.la
> lib/libesoobS.so
> lib/libesoobS.so.1
> lib/libgtrtst.a
>-lib/libgtrtst.la
> lib/libgtrtst.so
> lib/libgtrtst.so.1
> lib/libnn.a
>-lib/libnn.la
> lib/libnn.so
> lib/libnn.so.1
> lib/libodbc.a
>-lib/libodbc.la
> lib/libodbc.so
> lib/libodbc.so.1
> lib/libodbccr.a
>-lib/libodbccr.la
> lib/libodbccr.so
> lib/libodbccr.so.1
> lib/libodbcdrvcfg1S.a
>-lib/libodbcdrvcfg1S.la
> lib/libodbcdrvcfg1S.so
> lib/libodbcdrvcfg1S.so.1
> lib/libodbcdrvcfg2S.a
>-lib/libodbcdrvcfg2S.la
> lib/libodbcdrvcfg2S.so
> lib/libodbcdrvcfg2S.so.1
> lib/libodbcextras.a
>-lib/libodbcextras.la
> lib/libodbcextras.so
> lib/libodbcextras.so.1
> lib/libodbcinst.a
>-lib/libodbcinst.la
> 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.la
> lib/libodbcminiS.so
> lib/libodbcminiS.so.1
> lib/libodbcmyS.a
>-lib/libodbcmyS.la
> lib/libodbcmyS.so
> lib/libodbcmyS.so.1
> lib/libodbcnnS.a
>-lib/libodbcnnS.la
> lib/libodbcnnS.so
> lib/libodbcnnS.so.1
> lib/libodbcpsql.a
>-lib/libodbcpsql.la
> lib/libodbcpsql.so
> lib/libodbcpsql.so.1
> lib/libodbcpsql.so.2
> lib/libodbcpsqlS.a
>-lib/libodbcpsqlS.la
> lib/libodbcpsqlS.so
> lib/libodbcpsqlS.so.1
> lib/libodbctxt.a
>-lib/libodbctxt.la
>+lib/libodbctxt.so
>+lib/libodbctxt.so.1
> lib/libodbctxtS.a
>-lib/libodbctxtS.la
> lib/libodbctxtS.so
> lib/libodbctxtS.so.1
> lib/liboplodbcS.a
>-lib/liboplodbcS.la
> lib/liboplodbcS.so
> lib/liboplodbcS.so.1
> lib/liboraodbcS.a
>-lib/liboraodbcS.la
> lib/liboraodbcS.so
> lib/liboraodbcS.so.1
> lib/libsapdbS.a
>-lib/libsapdbS.la
> lib/libsapdbS.so
> lib/libsapdbS.so.1
> lib/libtdsS.a
>-lib/libtdsS.la
> lib/libtdsS.so
> lib/libtdsS.so.1
> lib/libtemplate.a
>-lib/libtemplate.la
> lib/libtemplate.so
> lib/libtemplate.so.1
> %%PORTDOCS%%share/doc/unixODBC/AdministratorManual/index.html

Actions: View | Diff

Attachments on bug 32851: 18224