mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-26 05:02:18 +00:00
Update to version 1.8.13
PR: 23133 Submitted by: Ports Fury
This commit is contained in:
Kevin Lo
parent
e70118daad
commit
f7017a32c2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=35490
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= unixODBC
|
||||
PORTVERSION= 1.8.8
|
||||
PORTVERSION= 1.8.13
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= http://www.unixodbc.org/
|
||||
|
||||
@ -14,11 +14,19 @@ MAINTAINER= ports@FreeBSD.org
|
||||
|
||||
USE_LIBTOOL= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
.if defined(WITH_X)
|
||||
USE_XLIB= yes
|
||||
CONFIGURE_ARGS+=--enable-gui
|
||||
|
||||
.if defined(WITH_GUI)
|
||||
USE_QT2= yes
|
||||
CONFIGURE_ENV= MOC="${X11BASE}/bin/moc2"
|
||||
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
|
||||
PLIST_SUB= GUI:=""
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-gui
|
||||
CONFIGURE_ARGS= --disable-gui
|
||||
PLIST_SUB= GUI:="@comment "
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (unixODBC-1.8.8.tar.gz) = 1c3c91534757d0372b5ae97baa41fd2f
|
||||
MD5 (unixODBC-1.8.13.tar.gz) = 732338e03ab52a7382968ef2a0f6dd51
|
||||
|
||||
@ -1,56 +1,56 @@
|
||||
--- configure.orig Fri May 12 07:50:57 2000
|
||||
+++ configure Fri May 12 07:57:18 2000
|
||||
@@ -2565,6 +2565,53 @@
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
--- configure.orig Tue Nov 14 20:11:45 2000
|
||||
+++ configure Sat Nov 25 14:16:03 2000
|
||||
@@ -2578,14 +2578,14 @@
|
||||
|
||||
|
||||
if test "x$thread" = "xtrue"; then
|
||||
- echo $ac_n "checking for pthread_mutex_lock in -lpthread""... $ac_c" 1>&6
|
||||
-echo "configure:2583: checking for pthread_mutex_lock in -lpthread" >&5
|
||||
+ echo $ac_n "checking for pthread_mutex_lock in -pthread""... $ac_c" 1>&6
|
||||
+echo "configure:2583: checking for pthread_mutex_lock in -pthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_mutex_lock | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2591 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -2619,7 +2619,7 @@
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
- LIBS="-lpthread $LIBS"
|
||||
+ LIBS="-pthread $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
@@ -3323,7 +3323,7 @@
|
||||
|
||||
|
||||
|
||||
-LIBQT="-lqt"
|
||||
+LIBQT="-lqt2"
|
||||
if test $kde_qtver = 2; then
|
||||
|
||||
|
||||
@@ -3531,7 +3531,7 @@
|
||||
|
||||
CXXFLAGS="$CXXFLAGS -I$qt_includes"
|
||||
LDFLAGS="$X_LDFLAGS"
|
||||
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
|
||||
+LIBS="-lqt2 -lXext -lX11 $LIBSOCKET"
|
||||
LD_LIBRARY_PATH=
|
||||
export LD_LIBRARY_PATH
|
||||
LIBRARY_PATH=
|
||||
@@ -3695,7 +3695,7 @@
|
||||
|
||||
|
||||
|
||||
-LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11)'
|
||||
+LIB_QT='-lqt2 $(LIBPNG) -lXext $(LIB_X11)'
|
||||
|
||||
|
||||
|
||||
+ echo $ac_n "checking for pthread_mutex_lock in -lc_r""... $ac_c" 1>&6
|
||||
+echo "configure:2523: checking for pthread_mutex_lock in -lc_r" >&5
|
||||
+ac_lib_var=`echo c_r'_'pthread_mutex_lock | sed 'y%./+-%__p_%'`
|
||||
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
+ echo $ac_n "(cached) $ac_c" 1>&6
|
||||
+else
|
||||
+ ac_save_LIBS="$LIBS"
|
||||
+LIBS="$LIBS -lc_r"
|
||||
+cat > conftest.$ac_ext <<EOF
|
||||
+#line 2531 "configure"
|
||||
+#include "confdefs.h"
|
||||
+/* Override any gcc2 internal prototype to avoid an error. */
|
||||
+/* We use char because int might match the return type of a gcc2
|
||||
+ builtin and then its argument prototype would still apply. */
|
||||
+char pthread_mutex_lock ();
|
||||
+
|
||||
+int main() {
|
||||
+pthread_mutex_lock ()
|
||||
+; return 0; }
|
||||
+EOF
|
||||
+if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
+ rm -rf conftest*
|
||||
+ eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
+else
|
||||
+ echo "configure: failed program was:" >&5
|
||||
+ cat conftest.$ac_ext >&5
|
||||
+ rm -rf conftest*
|
||||
+ eval "ac_cv_lib_$ac_lib_var=no"
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+LIBS="$ac_save_LIBS"
|
||||
+
|
||||
+fi
|
||||
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
+ echo "$ac_t""yes" 1>&6
|
||||
+ ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
+ cat >> confdefs.h <<EOF
|
||||
+#define $ac_tr_lib 1
|
||||
+EOF
|
||||
+
|
||||
+ LIBS="$LIBS -lc_r"
|
||||
+
|
||||
+else
|
||||
+ echo "$ac_t""no" 1>&6
|
||||
+fi
|
||||
+
|
||||
echo $ac_n "checking for mutex_lock in -lthread""... $ac_c" 1>&6
|
||||
echo "configure:2570: checking for mutex_lock in -lthread" >&5
|
||||
ac_lib_var=`echo thread'_'mutex_lock | sed 'y%./+-%__p_%'`
|
||||
|
||||
@ -1,58 +1,67 @@
|
||||
bin/odbcinst
|
||||
bin/isql
|
||||
%%GUI:%%bin/DataManager
|
||||
%%GUI:%%bin/ODBCConfig
|
||||
%%GUI:%%bin/odbctest
|
||||
bin/dltest
|
||||
etc/odbcinst.ini
|
||||
bin/isql
|
||||
bin/odbcinst
|
||||
etc/odbc.ini
|
||||
etc/odbcinst.ini
|
||||
include/odbcinst.h
|
||||
include/odbcinstext.h
|
||||
include/sql.h
|
||||
include/sqlext.h
|
||||
include/sqltypes.h
|
||||
lib/libodbcextras.so.1
|
||||
lib/libodbcextras.so
|
||||
lib/libodbcextras.a
|
||||
lib/libodbcinst.so.1
|
||||
lib/libodbcinst.so
|
||||
lib/libodbcinst.a
|
||||
lib/libodbc.so.1
|
||||
lib/libodbc.so
|
||||
lib/libodbc.a
|
||||
lib/libodbccr.so.1
|
||||
lib/libodbccr.so
|
||||
lib/libodbccr.a
|
||||
lib/libodbcdrvcfg1S.so.1
|
||||
lib/libodbcdrvcfg1S.so
|
||||
lib/libodbcdrvcfg1S.a
|
||||
lib/libodbcdrvcfg2S.so.1
|
||||
lib/libodbcdrvcfg2S.so
|
||||
lib/libodbcdrvcfg2S.a
|
||||
lib/libodbcpsqlS.so.1
|
||||
lib/libodbcpsqlS.so
|
||||
lib/libodbcpsqlS.a
|
||||
lib/libodbcminiS.so.1
|
||||
lib/libodbcminiS.so
|
||||
lib/libodbcminiS.a
|
||||
lib/libodbcmyS.so.1
|
||||
lib/libodbcmyS.so
|
||||
lib/libodbcmyS.a
|
||||
lib/libodbcnnS.so.1
|
||||
lib/libodbcnnS.so
|
||||
lib/libodbcnnS.a
|
||||
lib/libesoobS.so.1
|
||||
lib/libesoobS.so
|
||||
lib/libesoobS.a
|
||||
lib/liboplodbcS.so.1
|
||||
lib/liboplodbcS.so
|
||||
lib/liboplodbcS.a
|
||||
lib/libodbcpsql.so.1
|
||||
lib/libodbcpsql.so
|
||||
lib/libodbcpsql.a
|
||||
lib/libodbctxt.so.1
|
||||
lib/libodbctxt.so
|
||||
lib/libodbctxt.a
|
||||
lib/libtemplate.so.1
|
||||
lib/libtemplate.so
|
||||
lib/libtemplate.a
|
||||
lib/libnn.so.1
|
||||
lib/libnn.so
|
||||
lib/libesoobS.so
|
||||
lib/libesoobS.so.1
|
||||
lib/libnn.a
|
||||
lib/libnn.so
|
||||
lib/libnn.so.1
|
||||
lib/libodbc.a
|
||||
lib/libodbc.so
|
||||
lib/libodbc.so.1
|
||||
lib/libodbccr.a
|
||||
lib/libodbccr.so
|
||||
lib/libodbccr.so.1
|
||||
lib/libodbcdrvcfg1S.a
|
||||
lib/libodbcdrvcfg1S.so
|
||||
lib/libodbcdrvcfg1S.so.1
|
||||
lib/libodbcdrvcfg2S.a
|
||||
lib/libodbcdrvcfg2S.so
|
||||
lib/libodbcdrvcfg2S.so.1
|
||||
lib/libodbcextras.a
|
||||
lib/libodbcextras.so
|
||||
lib/libodbcextras.so.1
|
||||
lib/libodbcinst.a
|
||||
lib/libodbcinst.so
|
||||
lib/libodbcinst.so.1
|
||||
lib/libodbcminiS.a
|
||||
lib/libodbcminiS.so
|
||||
lib/libodbcminiS.so.1
|
||||
lib/libodbcmyS.a
|
||||
lib/libodbcmyS.so
|
||||
lib/libodbcmyS.so.1
|
||||
lib/libodbcnnS.a
|
||||
lib/libodbcnnS.so
|
||||
lib/libodbcnnS.so.1
|
||||
lib/libodbcpsql.a
|
||||
lib/libodbcpsql.so
|
||||
lib/libodbcpsql.so.1
|
||||
lib/libodbcpsqlS.a
|
||||
lib/libodbcpsqlS.so
|
||||
lib/libodbcpsqlS.so.1
|
||||
lib/libodbctxt.a
|
||||
lib/libodbctxt.so
|
||||
lib/libodbctxt.so.1
|
||||
lib/liboplodbcS.a
|
||||
lib/liboplodbcS.so
|
||||
lib/liboplodbcS.so.1
|
||||
lib/liboraodbcS.a
|
||||
lib/liboraodbcS.so
|
||||
lib/liboraodbcS.so.1
|
||||
lib/libtdsS.a
|
||||
lib/libtdsS.so
|
||||
lib/libtdsS.so.1
|
||||
lib/libtemplate.a
|
||||
lib/libtemplate.so
|
||||
lib/libtemplate.so.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user