diff options
| -rw-r--r-- | lang/erlang/Makefile | 15 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c | 10 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_odbc_configure | 11 | ||||
| -rw-r--r-- | lang/erlang14/Makefile | 15 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c | 10 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_odbc_configure | 11 |
6 files changed, 72 insertions, 0 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 98fc962d986a..a75bc5ddee0a 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= r10b6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/ \ @@ -26,6 +27,16 @@ COMMENT= A functional programming language from Ericsson RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif +.if !defined(WITHOUT_ODBC) +DRIVER_MANAGER?= iodbc + +.if ${DRIVER_MANAGER} == "unixodbc" +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +.else # assume we're using iodbc +LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc +.endif +.endif + # Set JAVABINDIR to where you have javac, if different from below JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14 @@ -46,6 +57,10 @@ CONFIGURE_TARGET= # Empty CONFIGURE_ARGS+= --enable-threads --enable-hipe --enable-kernel-poll NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + .include <bsd.port.pre.mk> .if !exists(${JAVABINDIR}/java) diff --git a/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c b/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c new file mode 100644 index 000000000000..985785bd8e26 --- /dev/null +++ b/lang/erlang/files/patch-lib_odbc_c_src_odbcserver.c @@ -0,0 +1,10 @@ +--- lib/odbc/c_src/odbcserver.c.orig Sat Jun 25 17:34:20 2005 ++++ lib/odbc/c_src/odbcserver.c Sat Jun 25 17:34:33 2005 +@@ -107,6 +107,7 @@ + #include <sys/socket.h> + #include <sys/uio.h> + #include <netdb.h> ++#include <netinet/in.h> + #endif + + #include "ei.h" diff --git a/lang/erlang/files/patch-lib_odbc_configure b/lang/erlang/files/patch-lib_odbc_configure new file mode 100644 index 000000000000..fdb9d50eac0a --- /dev/null +++ b/lang/erlang/files/patch-lib_odbc_configure @@ -0,0 +1,11 @@ +--- lib/odbc/configure.orig Sat Jun 25 18:33:21 2005 ++++ lib/odbc/configure Sat Jun 25 18:33:51 2005 +@@ -1096,7 +1096,7 @@ + echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6 + echo "configure:1098: checking for odbc in standard locations" >&5 + for dir in /opt/local/pgm/odbc /usr/local/odbc /usr/odbc \ +- /usr ++ /usr /usr/local + do + if test -f "$dir/include/sql.h"; then + is_odbc_std_location=yes diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 98fc962d986a..a75bc5ddee0a 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= r10b6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/ \ @@ -26,6 +27,16 @@ COMMENT= A functional programming language from Ericsson RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif +.if !defined(WITHOUT_ODBC) +DRIVER_MANAGER?= iodbc + +.if ${DRIVER_MANAGER} == "unixodbc" +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +.else # assume we're using iodbc +LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc +.endif +.endif + # Set JAVABINDIR to where you have javac, if different from below JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14 @@ -46,6 +57,10 @@ CONFIGURE_TARGET= # Empty CONFIGURE_ARGS+= --enable-threads --enable-hipe --enable-kernel-poll NOPRECIOUSMAKEVARS= yes # Prevent exporting of "ARCH" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + .include <bsd.port.pre.mk> .if !exists(${JAVABINDIR}/java) diff --git a/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c b/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c new file mode 100644 index 000000000000..985785bd8e26 --- /dev/null +++ b/lang/erlang14/files/patch-lib_odbc_c_src_odbcserver.c @@ -0,0 +1,10 @@ +--- lib/odbc/c_src/odbcserver.c.orig Sat Jun 25 17:34:20 2005 ++++ lib/odbc/c_src/odbcserver.c Sat Jun 25 17:34:33 2005 +@@ -107,6 +107,7 @@ + #include <sys/socket.h> + #include <sys/uio.h> + #include <netdb.h> ++#include <netinet/in.h> + #endif + + #include "ei.h" diff --git a/lang/erlang14/files/patch-lib_odbc_configure b/lang/erlang14/files/patch-lib_odbc_configure new file mode 100644 index 000000000000..fdb9d50eac0a --- /dev/null +++ b/lang/erlang14/files/patch-lib_odbc_configure @@ -0,0 +1,11 @@ +--- lib/odbc/configure.orig Sat Jun 25 18:33:21 2005 ++++ lib/odbc/configure Sat Jun 25 18:33:51 2005 +@@ -1096,7 +1096,7 @@ + echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6 + echo "configure:1098: checking for odbc in standard locations" >&5 + for dir in /opt/local/pgm/odbc /usr/local/odbc /usr/odbc \ +- /usr ++ /usr /usr/local + do + if test -f "$dir/include/sql.h"; then + is_odbc_std_location=yes |