4 files changed, 49 insertions, 115 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index fbc8b7bfb64a..bfb0d40c18f7 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,20 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.82.1
-PORTREVISION=	6
+PORTVERSION=	0.91
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/${PORTNAME}/stable
 PKGNAMESUFFIX=	-devel
-DISTNAME=	freetds-patched
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fbsd-ports@opsec.eu
 COMMENT=	Sybase/Microsoft TDS protocol library
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.dev.20110409
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
@@ -79,7 +76,7 @@ PLIST_SUB+=	ODBC="@comment "
 # relies on sybase-style dblib
 .if defined(WITH_MSDBLIB)
 CONFIGURE_ARGS+=	--enable-msdblib
-TDS_VER=	7.0
+TDS_VER=	7.2
 .endif
 
 post-extract:
@@ -100,7 +97,8 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/reference ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/userguide ${DOCSDIR}
 .endif
 	@${MKDIR} ${PREFIX}/etc/freetds
 	@${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 5a78951b964b..e1bc63fac06e 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freetds-patched.tgz) = 1141c84f8629f5a20bb729850b01fa66b1f43bf7b41907518a13107d7cdcb8a7
-SIZE (freetds-patched.tgz) = 2020672
+SHA256 (freetds-0.91.tar.gz) = 6a8148bd803aebceac6862b0dead1c5d9659f7e1038993abfe0ce8febb322465
+SIZE (freetds-0.91.tar.gz) = 2136329
diff --git a/databases/freetds-devel/files/patch-doc_Makefile.in b/databases/freetds-devel/files/patch-doc_Makefile.in
index 8a96f1b1765a..622a9489be91 100644
--- a/databases/freetds-devel/files/patch-doc_Makefile.in
+++ b/databases/freetds-devel/files/patch-doc_Makefile.in
@@ -1,113 +1,47 @@
---- doc/Makefile.in.orig	2011-04-09 08:17:20.000000000 +0000
-+++ doc/Makefile.in	2011-08-22 17:21:49.000000000 +0000
-@@ -400,29 +400,29 @@
- 	test -z "$$files" || { \
- 	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
- 	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
--install-nobase_dataDATA: $(nobase_data_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
--	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
--	$(am__nobase_list) | while read dir files; do \
--	  xfiles=; for file in $$files; do \
--	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
--	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
--	  test -z "$$xfiles" || { \
--	    test "x$$dir" = x. || { \
--	      echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
--	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
--	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
--	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \
--	done
--
--uninstall-nobase_dataDATA:
--	@$(NORMAL_UNINSTALL)
--	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
--	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(datadir)" && rm -f $$files
-+#install-nobase_dataDATA: $(nobase_data_DATA)
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
-+#	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
-+#	$(am__nobase_list) | while read dir files; do \
-+#	  xfiles=; for file in $$files; do \
-+#	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-+#	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-+#	  test -z "$$xfiles" || { \
-+#	    test "x$$dir" = x. || { \
-+#	      echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
-+#	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
-+#	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
-+#	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \
-+#	done
-+
-+#uninstall-nobase_dataDATA:
-+#	@$(NORMAL_UNINSTALL)
-+#	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
-+#	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-+#	test -n "$$files" || exit 0; \
-+#	echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \
-+#	cd "$(DESTDIR)$(datadir)" && rm -f $$files
- tags: TAGS
- TAGS:
- 
-@@ -522,8 +522,7 @@
+--- doc/Makefile.in.orig	2011-09-06 20:44:07.000000000 +0200
++++ doc/Makefile.in	2011-09-06 20:54:10.000000000 +0200
+@@ -507,7 +507,7 @@
  
  info-am:
  
--install-data-am: install-data-local install-man \
--	install-nobase_dataDATA
+-install-data-am: install-data-local install-man
 +install-data-am: install-man
  
  install-dvi: install-dvi-am
  
-@@ -535,7 +534,7 @@
- 
- install-html-am:
- 
--install-info: install-info-am
-+#install-info: install-info-am
- 
- install-info-am:
- 
-@@ -567,7 +566,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-local uninstall-man uninstall-nobase_dataDATA
-+#uninstall-am: uninstall-local uninstall-man uninstall-nobase_dataDATA
- 
- uninstall-man: uninstall-man1 uninstall-man5
- 
-@@ -588,21 +587,21 @@
- 	uninstall-man1 uninstall-man5 uninstall-nobase_dataDATA
- 
- 
--$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
-+#$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
- 
--$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
-+#$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
- 
--doc:  $(DOCDIR)/userguide $(DOCDIR)/reference
-+#doc:  $(DOCDIR)/userguide $(DOCDIR)/reference
- 
- dist:	man
- 
- man:	$(man_MANS)
- 
--installdirs: 
--	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
--				$(TARGET_DOCDIR)/reference    \
--				$(TARGET_DOCDIR)/images       \
--				$(TARGET_DOCDIR)/images/callouts 2>&1
-+#installdirs: 
-+#	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
-+#				$(TARGET_DOCDIR)/reference    \
-+#				$(TARGET_DOCDIR)/images       \
-+#				$(TARGET_DOCDIR)/images/callouts 2>&1
- 
- freebcp.1: freebcp.txt
- 	$(TXT2MAN) $(MANOPTS) $(srcdir)/freebcp.txt >.$@
+@@ -561,7 +561,7 @@
+ 	clean-local dist-hook distclean distclean-generic \
+ 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-local install-dvi install-dvi-am install-exec \
++	install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-man install-man1 install-man5 \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
+@@ -641,16 +641,16 @@
+ 
+ # If we built the documentation ourselves, install that, 
+ # else if we have access to distributed documentation, install that.  
+-install-data-local: installdirs $(noinst_DATA)
+-	$(mkinstalldirs) $(DOCDIR) 2>&1
+-	if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \
+-	find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \
+-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';'
+-	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
+-	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
+-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
+-	cd $(srcdir) && find images -name \*.gif -exec \
+-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
++#install-data-local: installdirs $(noinst_DATA)
++#	$(mkinstalldirs) $(DOCDIR) 2>&1
++#	if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \
++#	find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \
++#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';'
++#	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
++#	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
++#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
++#	cd $(srcdir) && find images -name \*.gif -exec \
++#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
+ 
+ uninstall-local:
+ 	rm -rf $(TARGET_DOCDIR)
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 9d3224bf52da..923bd0c4498b 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -20,6 +20,7 @@ include/sybdb.h
 include/syberror.h
 include/sybfront.h
 include/tds_sysdep_public.h
+include/odbcss.h
 lib/libct.a
 lib/libct.la
 lib/libct.so
@@ -32,4 +33,5 @@ lib/libsybdb.so.5
 %%ODBC%%lib/libtdsodbc.so
 %%ODBC%%lib/libtdsodbc.la
 %%ODBC%%lib/libtdsodbc.a
+%%ODBC%%bin/bsqlodbc
 @dirrm etc/freetds