- Update to 0.82.1.dev.20110409

- Pet portlint(1) by extracting CPPFLAGS from CONFIGURE_ENV
- Sort pkg-plist
- Pass maintainership to submitter

PR:		ports/158385
Submitted by:	Kurt Jaeger <fbsd-ports@opsec.eu>

4 files changed, 73 insertions, 63 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 5fa709b65ef..fbc8b7bfb64 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.82.1
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
@@ -15,17 +15,17 @@ PKGNAMESUFFIX=	-devel
 DISTNAME=	freetds-patched
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER=	fbsd-ports@opsec.eu
 COMMENT=	Sybase/Microsoft TDS protocol library
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.dev.20100810
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.dev.20110409
 TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
 USE_LDCONFIG=	yes
 
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index ab24283300e..5a78951b964 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freetds-patched.tgz) = ed56aa2e6241ccd6bf737348af04041d97a80ec78505482d3befe3040d35896d
-SIZE (freetds-patched.tgz) = 1654164
+SHA256 (freetds-patched.tgz) = 1141c84f8629f5a20bb729850b01fa66b1f43bf7b41907518a13107d7cdcb8a7
+SIZE (freetds-patched.tgz) = 2020672
diff --git a/databases/freetds-devel/files/patch-doc_Makefile.in b/databases/freetds-devel/files/patch-doc_Makefile.in
index 069ea22e72a..8a96f1b1765 100644
--- a/databases/freetds-devel/files/patch-doc_Makefile.in
+++ b/databases/freetds-devel/files/patch-doc_Makefile.in
@@ -1,78 +1,88 @@
---- doc/Makefile.in.orig	2008-11-11 04:55:16.000000000 -0900
-+++ doc/Makefile.in	2008-12-04 01:16:56.000000000 -0900
-@@ -408,25 +408,25 @@
- 	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
- 	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
- 	done
+--- 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)"
--	@$(am__vpath_adj_setup) \
--	list='$(nobase_data_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  $(am__vpath_adj) \
--	  echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
--	  $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+-	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)
--	@$(am__vpath_adj_setup) \
--	list='$(nobase_data_DATA)'; for p in $$list; do \
--	  $(am__vpath_adj) \
--	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
--	done
+-	@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)"
-+#	@$(am__vpath_adj_setup) \
-+#	list='$(nobase_data_DATA)'; for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  $(am__vpath_adj) \
-+#	  echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-+#	  $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
++#	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)
-+#	@$(am__vpath_adj_setup) \
-+#	list='$(nobase_data_DATA)'; for p in $$list; do \
-+#	  $(am__vpath_adj) \
-+#	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-+#	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
-+#	done
++#	@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:
  
-@@ -508,12 +508,11 @@
+@@ -522,8 +522,7 @@
  
  info-am:
  
 -install-data-am: install-data-local install-man \
 -	install-nobase_dataDATA
-+install-data-am: install-man 
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-am
  
- install-exec-am:
+@@ -535,7 +534,7 @@
+ 
+ install-html-am:
  
 -install-info: install-info-am
 +#install-info: install-info-am
  
- install-man: install-man1 install-man5
+ install-info-am:
  
-@@ -535,8 +534,8 @@
+@@ -567,7 +566,7 @@
  
  ps-am:
  
--uninstall-am: uninstall-info-am uninstall-local uninstall-man \
--	uninstall-nobase_dataDATA
-+#uninstall-am: uninstall-info-am uninstall-local uninstall-man \
-+
+-uninstall-am: uninstall-local uninstall-man uninstall-nobase_dataDATA
++#uninstall-am: uninstall-local uninstall-man uninstall-nobase_dataDATA
  
  uninstall-man: uninstall-man1 uninstall-man5
  
-@@ -554,21 +553,21 @@
- 	uninstall-nobase_dataDATA
+@@ -588,21 +587,21 @@
+ 	uninstall-man1 uninstall-man5 uninstall-nobase_dataDATA
  
  
 -$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index ee0e80b9cf6..9d3224bf52d 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,15 +1,15 @@
-bin/fisql
-bin/tsql
-bin/freebcp
 bin/bsqldb
-bin/defncopy
 bin/datacopy
+bin/defncopy
+bin/fisql
+bin/freebcp
 bin/osql
 bin/tdspool
-etc/pool.conf.dist
+bin/tsql
+etc/freetds/interfaces.dist
 etc/freetds.conf.dist
 etc/locales.conf.dist
-etc/freetds/interfaces.dist
+etc/pool.conf.dist
 include/bkpublic.h
 include/cspublic.h
 include/cstypes.h
@@ -17,17 +17,17 @@ include/ctpublic.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h
-include/sybfront.h
 include/syberror.h
+include/sybfront.h
 include/tds_sysdep_public.h
-lib/libct.so.4
-lib/libct.so
-lib/libct.la
 lib/libct.a
-lib/libsybdb.so.5
-lib/libsybdb.so
-lib/libsybdb.la
+lib/libct.la
+lib/libct.so
+lib/libct.so.4
 lib/libsybdb.a
+lib/libsybdb.la
+lib/libsybdb.so
+lib/libsybdb.so.5
 %%ODBC%%lib/libtdsodbc.so.0
 %%ODBC%%lib/libtdsodbc.so
 %%ODBC%%lib/libtdsodbc.la