# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # databases_libiodbc.diff # databases_unixODBC.diff # echo x - databases_libiodbc.diff sed 's/^X//' >databases_libiodbc.diff << 'END-of-databases_libiodbc.diff' Xdiff -urN /usr/ports/databases/libiodbc/Makefile databases/libiodbc/Makefile X--- /usr/ports/databases/libiodbc/Makefile Wed Feb 4 18:56:11 2004 X+++ databases/libiodbc/Makefile Sun Feb 8 11:37:56 2004 X@@ -17,6 +17,8 @@ X MAINTAINER= ebakke@trolltech.com X COMMENT= An ODBC 3.x driver manager, for universal data source access X X+CONFLICTS= unixODBC-* X+ X USE_LIBTOOL= yes X USE_GMAKE= yes X INSTALLS_SHLIB= yes END-of-databases_libiodbc.diff echo x - databases_unixODBC.diff sed 's/^X//' >databases_unixODBC.diff << 'END-of-databases_unixODBC.diff' Xdiff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile X--- /usr/ports/databases/unixODBC/Makefile Sat Jan 17 14:43:10 2004 X+++ databases/unixODBC/Makefile Sun Feb 8 18:05:23 2004 X@@ -16,6 +16,8 @@ X X LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv X X+CONFLICTS= libiodbc-* X+ X USE_REINPLACE= yes X USE_LIBTOOL= yes X CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} END-of-databases_unixODBC.diff exit