Date: Fri, 5 Jan 2001 19:59:47 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24093: Update port: databases/unixODBC to 2.0.0 Message-ID: <200101060359.f063xlk30263@freefall.freebsd.org> Resent-Message-ID: <200101060400.f06402q30297@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24093 >Category: ports >Synopsis: Update port: databases/unixODBC to 2.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 05 20:00:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.0.0 New file: files/patch-ab files/patch-ac Remove file: files/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile --- /usr/ports/databases/unixODBC/Makefile Wed Nov 29 03:59:18 2000 +++ databases/unixODBC/Makefile Sat Jan 6 07:31:18 2001 @@ -6,27 +6,38 @@ # PORTNAME= unixODBC -PORTVERSION= 1.8.13 +PORTVERSION= 2.0.0 CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ MAINTAINER= ports@FreeBSD.org +USE_AUTOMAKE= yes +AUTOMAKE_ARGS= --include-deps USE_LIBTOOL= yes +CONFIGURE_ARGS= --enable-static --enable-shared INSTALLS_SHLIB= yes .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 +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 + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/unixODBC + ${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . \ + | ${TAR} -C ${PREFIX}/share/doc/unixODBC --unlink -xf - + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/unixODBC .endif .include <bsd.port.mk> diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo --- /usr/ports/databases/unixODBC/distinfo Wed Nov 29 03:59:19 2000 +++ databases/unixODBC/distinfo Fri Jan 5 20:29:53 2001 @@ -1 +1 @@ -MD5 (unixODBC-1.8.13.tar.gz) = 732338e03ab52a7382968ef2a0f6dd51 +MD5 (unixODBC-2.0.0.tar.gz) = 7007bf0764d195b6adac268aff6e206b diff -urN /usr/ports/databases/unixODBC/files/patch-aa databases/unixODBC/files/patch-aa --- /usr/ports/databases/unixODBC/files/patch-aa Wed Nov 29 03:59:19 2000 +++ databases/unixODBC/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,56 +0,0 @@ ---- 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)' - - - diff -urN /usr/ports/databases/unixODBC/files/patch-ab databases/unixODBC/files/patch-ab --- /usr/ports/databases/unixODBC/files/patch-ab Thu Jan 1 09:00:00 1970 +++ databases/unixODBC/files/patch-ab Sat Jan 6 10:09:15 2001 @@ -0,0 +1,47 @@ +--- aclocal.m4.orig Fri Jan 5 00:08:12 2001 ++++ aclocal.m4 Sat Jan 6 06:48:33 2001 +@@ -518,7 +518,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= +@@ -565,7 +565,7 @@ + [ + AC_REQUIRE([K_PATH_X]) + AC_REQUIRE([KDE_USE_QT]) +-LIBQT="-lqt" ++LIBQT="-lqt2" + if test $kde_qtver = 2; then + + AC_REQUIRE([AC_FIND_PNG]) +@@ -704,7 +704,7 @@ + AC_SUBST(QT_LDFLAGS) + AC_PATH_QT_MOC + +-LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11)' ++LIB_QT='-lqt2 $(LIBPNG) -lXext $(LIB_X11)' + AC_SUBST(LIB_QT) + + ]) +@@ -2587,7 +2587,7 @@ + + AC_DEFUN(KDE_CHECK_LIBPTHREAD, + [ +-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"], LIBPTHREAD= ) ++AC_CHECK_FUNC(c_r, pthread_create, [LIBPTHREAD="-pthread"], LIBPTHREAD= ) + AC_SUBST(LIBPTHREAD) + ]) + +@@ -2709,7 +2709,7 @@ + kde_python_link_found=no + KDE_TRY_LINK_PYTHON(normal) + KDE_TRY_LINK_PYTHON(m, -lm) +-KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD) ++KDE_TRY_LINK_PYTHON(c_r, $LIBPTHREAD) + KDE_TRY_LINK_PYTHON(tcl, -ltcl) + KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm], [], + [AC_MSG_WARN([it seems, Python depends on another library. diff -urN /usr/ports/databases/unixODBC/files/patch-ac databases/unixODBC/files/patch-ac --- /usr/ports/databases/unixODBC/files/patch-ac Thu Jan 1 09:00:00 1970 +++ databases/unixODBC/files/patch-ac Sat Jan 6 06:53:12 2001 @@ -0,0 +1,48 @@ +--- configure.in.orig Fri Jan 5 00:07:39 2001 ++++ configure.in Sat Jan 6 06:53:02 2001 +@@ -97,8 +97,8 @@ + AC_DEFINE(HAVE_READLINE, 1)]) + AC_SUBST(READLINE) + +-AC_CHECK_LIB(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)]) +-AC_CHECK_LIB(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)]) ++AC_CHECK_FUNC(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)]) ++AC_CHECK_FUNC(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)]) + + LIBADD_DL= + AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], +@@ -121,25 +121,26 @@ + AC_DEFINE(HAVE_LIBPTH,1) + else + AC_CHECK_LIB(pthread, pthread_mutex_lock ) +- AC_CHECK_LIB(pthread, pthread_mutex_lock, ++ AC_CHECK_FUNC(c_r, pthread_mutex_lock, + [ + AC_DEFINE(HAVE_LIBPTHREAD,1) + if test "x$ac_cv_prog_gcc"="xyes"; then +- CFLAGS="$CFLAGS -pthread" ++ LIBS="$LIBS -pthread" ++ AC_DEFINE(_THREAD_SAFE,1) + fi + ] ) + + AC_CHECK_LIB(thread, mutex_lock ) +- AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] ) ++ AC_CHECK_FUNC(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] ) + fi + fi + + if test "x$stats" = "xtrue"; then +- AC_CHECK_LIB( c, ftok,[],[stats=false] ) +- AC_CHECK_LIB( c, semget,[],[stats=false] ) +- AC_CHECK_LIB( c, shmget,[],[stats=false] ) +- AC_CHECK_LIB( c, semop,[],[stats=false] ) +- AC_CHECK_LIB( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] ) ++ AC_CHECK_FUNC( c, ftok,[],[stats=false] ) ++ AC_CHECK_FUNC( c, semget,[],[stats=false] ) ++ AC_CHECK_FUNC( c, shmget,[],[stats=false] ) ++ AC_CHECK_FUNC( c, semop,[],[stats=false] ) ++ AC_CHECK_FUNC( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] ) + fi + + if test "x$stats" = "xtrue"; then diff -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist --- /usr/ports/databases/unixODBC/pkg-plist Wed Nov 29 03:59:19 2000 +++ databases/unixODBC/pkg-plist Sat Jan 6 07:38:21 2001 @@ -11,6 +11,8 @@ include/sql.h include/sqlext.h include/sqltypes.h +include/sqlucode.h +include/uodbc_stats.h lib/libesoobS.a lib/libesoobS.so lib/libesoobS.so.1 @@ -65,3 +67,67 @@ lib/libtemplate.a lib/libtemplate.so lib/libtemplate.so.1 +share/doc/unixODBC/AdministratorManual/index.html +share/doc/unixODBC/AdministratorManual/odbcinst.html +share/doc/unixODBC/AdministratorManual/php3.html +share/doc/unixODBC/AdministratorManual/unixODBC.gif +share/doc/unixODBC/AdministratorManual/unixODBCsetup.html +share/doc/unixODBC/ProgrammerManual/Tutorial/close.html +share/doc/unixODBC/ProgrammerManual/Tutorial/conne.html +share/doc/unixODBC/ProgrammerManual/Tutorial/dsn.html +share/doc/unixODBC/ProgrammerManual/Tutorial/gloss.html +share/doc/unixODBC/ProgrammerManual/Tutorial/index.html +share/doc/unixODBC/ProgrammerManual/Tutorial/intro.html +share/doc/unixODBC/ProgrammerManual/Tutorial/navi.html +share/doc/unixODBC/ProgrammerManual/Tutorial/odbc.css +share/doc/unixODBC/ProgrammerManual/Tutorial/query.html +share/doc/unixODBC/ProgrammerManual/Tutorial/resul.html +share/doc/unixODBC/ProgrammerManual/index.html +share/doc/unixODBC/ProgrammerManual/unixODBC.gif +share/doc/unixODBC/UserManual/Figure1.gif +share/doc/unixODBC/UserManual/Figure2.gif +share/doc/unixODBC/UserManual/Figure3.gif +share/doc/unixODBC/UserManual/Figure4.gif +share/doc/unixODBC/UserManual/Figure6.gif +share/doc/unixODBC/UserManual/My.sql +share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif +share/doc/unixODBC/UserManual/index.html +share/doc/unixODBC/UserManual/unixODBC.gif +share/doc/unixODBC/index.html +share/doc/unixODBC/lst/InternalStructure.gif +share/doc/unixODBC/lst/InternalStructure.html +share/doc/unixODBC/lst/InternalStructure.vsd +share/doc/unixODBC/lst/InternalStructure2.gif +share/doc/unixODBC/lst/InternalStructure2.html +share/doc/unixODBC/lst/InternalStructure3.gif +share/doc/unixODBC/lst/InternalStructure3.html +share/doc/unixODBC/lst/InternalStructure4.gif +share/doc/unixODBC/lst/InternalStructure4.html +share/doc/unixODBC/lst/InternalStructure5.gif +share/doc/unixODBC/lst/InternalStructure5.html +share/doc/unixODBC/lst/InternalStructure6.gif +share/doc/unixODBC/lst/InternalStructure6.html +share/doc/unixODBC/lst/InternalStructure7.gif +share/doc/unixODBC/lst/InternalStructure7.html +share/doc/unixODBC/lst/InternalStructure8.gif +share/doc/unixODBC/lst/InternalStructure8.html +share/doc/unixODBC/lst/InternalStructure9.gif +share/doc/unixODBC/lst/InternalStructure9.html +share/doc/unixODBC/lst/back.gif +share/doc/unixODBC/lst/next.gif +share/doc/unixODBC/smallbook.gif +share/doc/unixODBC/sqi/InternalStructure.gif +share/doc/unixODBC/sqi/InternalStructure.html +share/doc/unixODBC/sqi/InternalStructure.vsd +share/doc/unixODBC/sqi/InternalStructure2.gif +share/doc/unixODBC/sqi/InternalStructure2.html +share/doc/unixODBC/sqi/back.gif +share/doc/unixODBC/sqi/next.gif +share/doc/unixODBC/unixODBC.gif +@dirrm share/doc/unixODBC/sqi +@dirrm share/doc/unixODBC/lst +@dirrm share/doc/unixODBC/UserManual +@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial +@dirrm share/doc/unixODBC/ProgrammerManual +@dirrm share/doc/unixODBC/AdministratorManual +@dirrm share/doc/unixODBC >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101060359.f063xlk30263>