diff options
| -rw-r--r-- | databases/unixODBC/Makefile | 15 | ||||
| -rw-r--r-- | databases/unixODBC/distinfo | 2 | ||||
| -rw-r--r-- | databases/unixODBC/files/patch-ad | 13 | ||||
| -rw-r--r-- | databases/unixODBC/pkg-plist | 2 |
4 files changed, 22 insertions, 10 deletions
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index 7e09882daaa8..7a2975cc5c45 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -6,14 +6,13 @@ # PORTNAME= unixODBC -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= databases MASTER_SITES= http://www.unixodbc.org/ MAINTAINER= ports@FreeBSD.org -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-static --enable-shared INSTALLS_SHLIB= yes @@ -47,14 +46,16 @@ pre-patch: .else @${PERL} -pi -e 's|-lqt|-lqt2|g' ${WRKSRC}/configure .endif - @${PERL} -pi -e 's| -lc||g' ${WRKSRC}/ltmain.sh + +pre-build: + @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/unixODBC + @${MKDIR} ${DOCSDIR} ${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . \ - | ${TAR} -C ${PREFIX}/share/doc/unixODBC --unlink -xf - - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/unixODBC + | ${TAR} -C ${DOCSDIR} --unlink -xf - + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo index cb9397cbd73a..29607ff201a7 100644 --- a/databases/unixODBC/distinfo +++ b/databases/unixODBC/distinfo @@ -1 +1 @@ -MD5 (unixODBC-2.0.7.tar.gz) = d862b82c655e38bd97511bdf21441320 +MD5 (unixODBC-2.0.8.tar.gz) = 8b86e29adc2f3ff0713cde9c1a20c5ec diff --git a/databases/unixODBC/files/patch-ad b/databases/unixODBC/files/patch-ad new file mode 100644 index 000000000000..b9c9ce14faa1 --- /dev/null +++ b/databases/unixODBC/files/patch-ad @@ -0,0 +1,13 @@ +--- sqp/lex.l Thu Jun 21 23:30:52 2001 ++++ ../../ports/databases/unixODBC/work/unixODBC-2.0.8/sqp/lex.l Sat Jul 14 09:27:09 2001 +@@ -13,9 +13,9 @@ + + %{ + ++#include "sqp.h" + #include "yac.h" + #include <string.h> +-#include "sqp.h" + + #undef YY_INPUT + #define YY_INPUT(b, r, ms) (r = my_yyinput(b, ms)) diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist index cf4ae861c133..952beac2c4dc 100644 --- a/databases/unixODBC/pkg-plist +++ b/databases/unixODBC/pkg-plist @@ -77,8 +77,6 @@ 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 |