diff options
| -rw-r--r-- | databases/libodbc++/Makefile | 11 | ||||
| -rw-r--r-- | databases/libodbc++/distinfo | 2 | ||||
| -rw-r--r-- | databases/libodbc++/files/patch-Makefile.in | 19 | ||||
| -rw-r--r-- | databases/libodbc++/files/patch-configure | 26 | ||||
| -rw-r--r-- | databases/libodbc++/pkg-plist | 137 |
5 files changed, 106 insertions, 89 deletions
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index a2b515f1fb87..ab2380b9af8c 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -6,10 +6,9 @@ # PORTNAME= libodbc++ -PORTVERSION= 0.2.2.p5 +PORTVERSION= 0.2.2 CATEGORIES= databases devel -MASTER_SITES= http://orcane.net/freeodbc++/download/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S|.p|pre|} +MASTER_SITES= http://orcane.net/freeodbc++/download/${PORTVERSION}/ MAINTAINER= wjv@FreeBSD.org @@ -17,7 +16,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-isqlxx # libodbc++ needs an ODBC driver manager to be installed, and it supports # both iODBC and unixODBC. The following variable may be set at build-time @@ -48,9 +46,10 @@ CONFIGURE_ARGS+= --with-qt \ --with-qtsqlxx CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" -PLIST_SUB+= PLIST_GUI="" +PLIST_SUB+= PLIST_GUI="" PLIST_NOGUI="@comment " .else -PLIST_SUB+= PLIST_GUI="@comment " +CONFIGURE_ARGS+= --with-isqlxx +PLIST_SUB+= PLIST_GUI="@comment " PLIST_NOGUI="" .endif post-patch: diff --git a/databases/libodbc++/distinfo b/databases/libodbc++/distinfo index da7210eb7f07..d8b11b4283ba 100644 --- a/databases/libodbc++/distinfo +++ b/databases/libodbc++/distinfo @@ -1 +1 @@ -MD5 (libodbc++-0.2.2pre5.tar.bz2) = 0eea820f75439e111011f059f90fe8d3 +MD5 (libodbc++-0.2.2.tar.bz2) = 2b1f8081b2d89c7b65bb70dee06cbe0d diff --git a/databases/libodbc++/files/patch-Makefile.in b/databases/libodbc++/files/patch-Makefile.in index e80965aa67cf..68b416c27a5c 100644 --- a/databases/libodbc++/files/patch-Makefile.in +++ b/databases/libodbc++/files/patch-Makefile.in @@ -6,14 +6,13 @@ ---- Makefile.in.orig Wed Dec 13 03:14:07 2000 -+++ Makefile.in Tue Oct 2 17:19:45 2001 -@@ -114,7 +114,7 @@ +--- Makefile.in.orig Wed Nov 7 17:09:47 2001 ++++ Makefile.in Wed Nov 14 13:09:03 2001 +@@ -123,7 +123,6 @@ + src \ + @SUBDIR_TESTS@ \ + @SUBDIR_QTSQLXX@ \ +-doc \ + @SUBDIR_ISQLXX@ \ + win32 - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = include src @SUBDIR_QT@ @SUBDIR_TESTS@ @SUBDIR_QTSQLXX@ doc @SUBDIR_ISQLXX@ win32 -+SUBDIRS = include src @SUBDIR_QT@ @SUBDIR_TESTS@ @SUBDIR_QTSQLXX@ @SUBDIR_ISQLXX@ win32 - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/databases/libodbc++/files/patch-configure b/databases/libodbc++/files/patch-configure index aacb29a8f4f7..bb3c0ebe84eb 100644 --- a/databases/libodbc++/files/patch-configure +++ b/databases/libodbc++/files/patch-configure @@ -1,14 +1,32 @@ ---- configure.orig Wed Dec 13 02:36:14 2000 -+++ configure Wed Oct 3 17:34:03 2001 -@@ -3752,9 +3752,9 @@ +The fudging of the value of $ltmain is a workaround for a bug in bsd.port.mk, +described (with patch) in PR 31142. + +-- Johann Visagie <wjv@FreeBSD.org> + + + +--- configure.orig Wed Nov 7 17:02:23 2001 ++++ configure Wed Nov 14 13:38:01 2001 +@@ -2823,7 +2823,8 @@ + # All known linkers require a `.a' archive for static linking (except M$VC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" ++ac_aux_dir_tmp="$ac_aux_dir" ++ltmain="$ac_aux_dir_tmp/ltmain.sh" + ofile="$default_ofile" + with_gnu_ld="$lt_cv_prog_gnu_ld" + need_locks="$enable_libtool_lock" +@@ -7136,10 +7137,10 @@ if test "x$enable_threads" = "xyes" then - QT_LIBS="-lqt-mt" + QT_LIBS="-lqt2-mt" + QT_DEFS="-DODBCXX_QT -DQT_THREAD_SUPPORT" else - QT_LIBS="-lqt" + QT_LIBS="-lqt2" + QT_DEFS="-DODBCXX_QT" fi - QT_MOC="$qt_moc" diff --git a/databases/libodbc++/pkg-plist b/databases/libodbc++/pkg-plist index fb1b9b4b1019..de8943323ecd 100644 --- a/databases/libodbc++/pkg-plist +++ b/databases/libodbc++/pkg-plist @@ -1,8 +1,12 @@ %%PLIST_GUI%%bin/qtsql++ +%%PLIST_GUI%%lib/libodbc++_qt.la %%PLIST_GUI%%lib/libodbc++_qt.so %%PLIST_GUI%%lib/libodbc++_qt.so.4 +%%PLIST_NOGUI%%bin/isql++ +%%PLIST_NOGUI%%lib/libodbc++.la +%%PLIST_NOGUI%%lib/libodbc++.so +%%PLIST_NOGUI%%lib/libodbc++.so.4 %%PORTDOCS%%share/doc/libodbc++/INSTALL/book1.html -%%PORTDOCS%%share/doc/libodbc++/INSTALL/docbook.css %%PORTDOCS%%share/doc/libodbc++/INSTALL/drivers.html %%PORTDOCS%%share/doc/libodbc++/INSTALL/installation.html %%PORTDOCS%%share/doc/libodbc++/INSTALL/odbc-driver-manager.html @@ -22,79 +26,78 @@ %%PORTDOCS%%share/doc/libodbc++/INSTALL/stylesheet-images/warning.gif %%PORTDOCS%%share/doc/libodbc++/INSTALL/win32.html %%PORTDOCS%%share/doc/libodbc++/progref/annotated.html -%%PORTDOCS%%share/doc/libodbc++/progref/callablestatement_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__bytes-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__bytes.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__callablestatement-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__callablestatement.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__callablestatement.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__connection-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__connection.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__connection.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__databasemetadata-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__databasemetadata.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__datasource-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__datasource.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__date-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__date.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__date.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__driver-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__driver.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__drivermanager-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__drivermanager.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__drivermessage-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__drivermessage.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__errorhandler-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__errorhandler.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__errorhandler.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__preparedstatement-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__preparedstatement.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__preparedstatement.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__resultset-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__resultset.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__resultset.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__resultsetmetadata-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__resultsetmetadata.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlexception-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlexception.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlexception.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlwarning-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlwarning.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__sqlwarning.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__statement-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__statement.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__statement.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__time-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__time.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__time.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__timestamp-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__timestamp.gif -%%PORTDOCS%%share/doc/libodbc++/progref/class_odbc__timestamp.html -%%PORTDOCS%%share/doc/libodbc++/progref/config-win32_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/config_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/connection_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/databasemetadata_h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/callablestatement_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_bytes-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_bytes.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_callable_statement-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_callable_statement.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_callable_statement.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_connection-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_connection.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_connection.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_data_source-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_data_source.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_database_meta_data-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_database_meta_data.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_date-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_date.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_date.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver_manager-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver_manager.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver_message-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_driver_message.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_error_handler-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_error_handler.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_error_handler.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_prepared_statement-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_prepared_statement.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_prepared_statement.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_result_set-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_result_set.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_result_set.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_result_set_meta_data-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_result_set_meta_data.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_exception-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_exception.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_exception.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_warning-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_warning.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_s_q_l_warning.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_statement-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_statement.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_statement.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_time-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_time.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_time.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_timestamp-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_timestamp.gif +%%PORTDOCS%%share/doc/libodbc++/progref/classodbc_1_1_timestamp.html +%%PORTDOCS%%share/doc/libodbc++/progref/config-win32_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/config_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/connection_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/databasemetadata_8h-source.html %%PORTDOCS%%share/doc/libodbc++/progref/doxygen.css %%PORTDOCS%%share/doc/libodbc++/progref/doxygen.gif -%%PORTDOCS%%share/doc/libodbc++/progref/drivermanager_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/errorhandler_h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/drivermanager_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/errorhandler_8h-source.html %%PORTDOCS%%share/doc/libodbc++/progref/files.html %%PORTDOCS%%share/doc/libodbc++/progref/functions.html %%PORTDOCS%%share/doc/libodbc++/progref/hierarchy.html %%PORTDOCS%%share/doc/libodbc++/progref/index.html -%%PORTDOCS%%share/doc/libodbc++/progref/namespace_odbc.html %%PORTDOCS%%share/doc/libodbc++/progref/namespacemembers.html +%%PORTDOCS%%share/doc/libodbc++/progref/namespaceodbc.html %%PORTDOCS%%share/doc/libodbc++/progref/namespaces.html -%%PORTDOCS%%share/doc/libodbc++/progref/preparedstatement_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/resultset_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/resultsetmetadata_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/setup_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/statement_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/struct_odbc__types-members.html -%%PORTDOCS%%share/doc/libodbc++/progref/struct_odbc__types.html -%%PORTDOCS%%share/doc/libodbc++/progref/threads_h-source.html -%%PORTDOCS%%share/doc/libodbc++/progref/types_h-source.html -bin/isql++ +%%PORTDOCS%%share/doc/libodbc++/progref/preparedstatement_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/resultset_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/resultsetmetadata_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/setup_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/statement_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/structodbc_1_1_types-members.html +%%PORTDOCS%%share/doc/libodbc++/progref/structodbc_1_1_types.html +%%PORTDOCS%%share/doc/libodbc++/progref/threads_8h-source.html +%%PORTDOCS%%share/doc/libodbc++/progref/types_8h-source.html include/odbc++/callablestatement.h include/odbc++/config.h include/odbc++/connection.h @@ -108,8 +111,6 @@ include/odbc++/setup.h include/odbc++/statement.h include/odbc++/threads.h include/odbc++/types.h -lib/libodbc++.so -lib/libodbc++.so.4 @dirrm include/odbc++ %%PORTDOCS%%@dirrm share/doc/libodbc++/progref %%PORTDOCS%%@dirrm share/doc/libodbc++/INSTALL/stylesheet-images |