mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

- Fix build on RELENG_4 [1]

Browse Source 
- Fix build with iODBC
- Bump PORTREVISION

Found by:	kris (via pointyhat) [1]
This commit is contained in:
Max Khon 2005-09-13 11:38:17 +00:00
parent f4fca10049
commit 78d3b664fc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=142578
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
databases/mysql2odbc/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= mysql2odbc PORTNAME= mysql2odbc
PORTVERSION= 0.99.2 PORTVERSION= 0.99.2
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://www.iodbc.org/downloads/mysql2odbc/ MASTER_SITES= http://www.iodbc.org/downloads/mysql2odbc/
@ -16,10 +17,16 @@ COMMENT= Openlink MySQL-ODBC Gateway
OPTIONS= UNIXODBC "Build with unixODBC" on \ OPTIONS= UNIXODBC "Build with unixODBC" on \
IODBC "Build with iODBC" off \ IODBC "Build with iODBC" off \
.include <bsd.port.pre.mk>
.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) .if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
WITH_UNIXODBC= yes WITH_UNIXODBC= yes
.endif .endif
.if defined(WITH_UNIXODBC) && defined(WITH_IODBC)
.error "UNIXODBC and IODBC options are mutually exclusive"
.endif
.if defined(WITH_UNIXODBC) .if defined(WITH_UNIXODBC)
LIB_DEPENDS= odbc:${PORTSDIR}/databases/unixODBC LIB_DEPENDS= odbc:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS= --with-unixodbc=${LOCALBASE} CONFIGURE_ARGS= --with-unixodbc=${LOCALBASE}
@ -32,9 +39,10 @@ CONFIGURE_ARGS= --with-iodbc
CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool:13 USE_AUTOTOOLS= libtool:13
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
.include <bsd.port.mk> .include <bsd.port.post.mk>

12
databases/mysql2odbc/files/patch-mtest.c
View File

@ -1,6 +1,6 @@
--- mtest.c.orig Sat Aug 20 16:05:55 2005 --- mtest.c.orig Fri Jun 20 21:39:48 2003
+++ mtest.c Sat Aug 20 16:06:01 2005 +++ mtest.c Tue Sep 13 18:21:18 2005
@@ -27,7 +27,7 @@ @@ -27,10 +27,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <memory.h> #include <memory.h>
@ -8,4 +8,8 @@
+#include <stdlib.h> +#include <stdlib.h>
#ifndef WIN32 #ifndef WIN32
# include <getopt.h> -# include <getopt.h>
+# include <unistd.h>
#endif
#ifdef FAKE