diff options
| -rw-r--r-- | databases/freetds-devel/Makefile | 14 | ||||
| -rw-r--r-- | databases/freetds-devel/distinfo | 4 | ||||
| -rw-r--r-- | databases/freetds-devel/files/patch-src_tds_tls.c | 13 |
3 files changed, 21 insertions, 10 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 032951d03ad8..3d6cacbb1562 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 0.92.1003 +PORTVERSION= 0.96.3 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/ @@ -16,9 +16,8 @@ LICENSE= LGPL20 WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION} TDS_VER?= 7.2 -USES= gmake iconv libtool:keepla pkgconfig tar:bzip2 +USES= autoreconf gmake iconv libtool:keepla pkgconfig tar:bzip2 GNU_GONFIGURE= yes -USE_AUTOTOOLS= autoconf:env CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes @@ -66,13 +65,13 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \ ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g ; \ s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \ s|%%ICONV_LIB%%|${ICONV_LIB}|' @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ - s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in + s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \ s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure @@ -81,13 +80,12 @@ post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide @${MKDIR} ${STAGEDIR}${DOCSDIR}/reference - @${MKDIR} ${STAGEDIR}${DOCSDIR}/images @${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';' @${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';' - @${FIND} ${WRKSRC}/doc/images -name \*.gif \ - -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/images/ ';' + @cd ${WRKSRC}/doc && \ + ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR} .endif diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo index 4d6300146fd7..03d346d054c3 100644 --- a/databases/freetds-devel/distinfo +++ b/databases/freetds-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (freetds-dev.0.92.1003.tar.bz2) = edc6c8b0991380ac93abd77d8752885124755ea1b356a94b73ff4347a24ee791 -SIZE (freetds-dev.0.92.1003.tar.bz2) = 3175651 +SHA256 (freetds-dev.0.96.3.tar.bz2) = 742ab1cce0792f19a95cc6df32ee735f019eecb42e10985cd36f3af9049ec1a4 +SIZE (freetds-dev.0.96.3.tar.bz2) = 3188218 diff --git a/databases/freetds-devel/files/patch-src_tds_tls.c b/databases/freetds-devel/files/patch-src_tds_tls.c new file mode 100644 index 000000000000..ab6cb0b46925 --- /dev/null +++ b/databases/freetds-devel/files/patch-src_tds_tls.c @@ -0,0 +1,13 @@ +--- src/tds/tls.c.orig 2015-05-10 16:53:53.649667739 +0600 ++++ src/tds/tls.c 2015-05-10 17:04:29.479624026 +0600 +@@ -46,6 +46,10 @@ + #include <sys/stat.h> + #endif /* HAVE_SYS_STAT_H */ + ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/socket.h> ++#endif ++ + #include <freetds/tds.h> + #include <freetds/string.h> + #include <freetds/tls.h> |