diff options
Diffstat (limited to 'databases/unixODBC')
| -rw-r--r-- | databases/unixODBC/Makefile | 18 | ||||
| -rw-r--r-- | databases/unixODBC/distinfo | 2 | ||||
| -rw-r--r-- | databases/unixODBC/files/patch-ab | 47 | ||||
| -rw-r--r-- | databases/unixODBC/files/patch-ac | 40 | ||||
| -rw-r--r-- | databases/unixODBC/pkg-plist | 34 |
5 files changed, 46 insertions, 95 deletions
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index ffcc2f7..99bc796 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -6,21 +6,22 @@ # PORTNAME= unixODBC -PORTVERSION= 2.0.5 +PORTVERSION= 2.0.7 CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ MAINTAINER= ports@FreeBSD.org -USE_AUTOMAKE= yes -AUTOMAKE_ARGS= --include-deps -USE_LIBTOOL= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static --enable-shared INSTALLS_SHLIB= yes .if defined(WITH_GUI) -USE_QT2= yes -CONFIGURE_ENV= MOC="${X11BASE}/bin/moc2" +USE_QT_VER= 2 +QT_NONSTANDARD= yes +CONFIGURE_ENV= MOC="${MOC}" LIBQT="-l${QTNAME}" \ + USER_INCLUDES="${QTCPPFLAGS}" \ + USER_LDFLAGS="${QTCFGLIBS}" CONFIGURE_ARGS+= --enable-gui \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ @@ -32,6 +33,11 @@ CONFIGURE_ARGS+= --disable-gui PLIST_SUB= GUI:="@comment " .endif +pre-patch: + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|-lqt|-lqt2|g' ${WRKSRC}/configure + @${PERL} -pi -e 's| -lc||g' ${WRKSRC}/ltmain.sh + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/unixODBC diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo index 1979f27..cb9397c 100644 --- a/databases/unixODBC/distinfo +++ b/databases/unixODBC/distinfo @@ -1 +1 @@ -MD5 (unixODBC-2.0.5.tar.gz) = fb587aed6ce2aacf6868ba1a45f272eb +MD5 (unixODBC-2.0.7.tar.gz) = d862b82c655e38bd97511bdf21441320 diff --git a/databases/unixODBC/files/patch-ab b/databases/unixODBC/files/patch-ab deleted file mode 100644 index 0d7e217..0000000 --- a/databases/unixODBC/files/patch-ab +++ /dev/null @@ -1,47 +0,0 @@ ---- aclocal.m4.orig Mon Jan 15 05:45:19 2001 -+++ aclocal.m4 Wed Jan 24 00:32:54 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_LIB(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 --git a/databases/unixODBC/files/patch-ac b/databases/unixODBC/files/patch-ac deleted file mode 100644 index a975a14..0000000 --- a/databases/unixODBC/files/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.in.orig Wed Mar 21 22:15:36 2001 -+++ configure.in Thu Mar 22 07:09:08 2001 -@@ -143,12 +143,13 @@ - ]) - - if test "x$gotthread" = "xno"; then -- AC_CHECK_LIBPT(pthread, pthread_mutex_lock, -+ AC_CHECK_LIBPT(c_r, pthread_mutex_lock, - [ - AC_DEFINE(HAVE_LIBPTHREAD,1) - if test "x$ac_cv_prog_gcc"="xyes"; then - dnl Check if the compiler will build with -pthread as a option - AC_CHECK_COMP_OPT(pthread) -+ AC_DEFINE(_THREAD_SAFE,1) - else - dnl Check if the compiler will build with -mt as a option - AC_CHECK_COMP_OPT(mt) -@@ -156,16 +157,16 @@ - ]) - fi - -- AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] ) -+ AC_CHECK_FUNC(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(ftok,[],[stats=false] ) -+ AC_CHECK_FUNC(semget,[],[stats=false] ) -+ AC_CHECK_FUNC(shmget,[],[stats=false] ) -+ AC_CHECK_FUNC(semop,[],[stats=false] ) -+ AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] ) - fi - - if test "x$stats" = "xtrue"; then diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist index f9b617e..cf4ae86 100644 --- a/databases/unixODBC/pkg-plist +++ b/databases/unixODBC/pkg-plist @@ -1,11 +1,12 @@ %%GUI:%%bin/DataManager %%GUI:%%bin/ODBCConfig -%%GUI:%%bin/odbctest bin/dltest bin/isql bin/odbcinst +%%GUI:%%bin/odbctest etc/odbc.ini etc/odbcinst.ini +include/autotest.h include/odbcinst.h include/odbcinstext.h include/sql.h @@ -13,62 +14,93 @@ include/sqlext.h include/sqltypes.h 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 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 |
