From 99d701a5a82d4ba3342174295fb728bcd9e6931c Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Mon, 27 Aug 2007 09:00:31 +0000
Subject: - Update to 5.6 snapshot 20070825 - Remove tack which was removed in
 20070303 rollup patch   tack is now distributed as another tarball - Remmove
 some files removed in 20070714 rollup patch

---
 devel/ncurses-devel/Makefile         |  6 +++-
 devel/ncurses-devel/Makefile.man     |  1 -
 devel/ncurses-devel/distinfo         |  9 ++++++
 devel/ncurses-devel/files/patch-tack | 57 ------------------------------------
 devel/ncurses-devel/pkg-plist        |  1 -
 5 files changed, 14 insertions(+), 60 deletions(-)
 delete mode 100644 devel/ncurses-devel/files/patch-tack

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index 59c67565aacf..74eec0f5cdb2 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -27,7 +27,8 @@ PATCHES=	20061223 20061230 20070106 20070113 20070120 20070127 20070128 \
 		20070203 20070210 20070217 20070224 20070303 20070310 20070311 \
 		20070317 20070324 20070331 20070407 20070414 20070421 20070428 \
 		20070505 20070512 20070526 20070602 20070609 20070612 20070623 \
-		20070630 20070707 20070714 20070716 20070721 20070728
+		20070630 20070707 20070714 20070716 20070721 20070728 20070812 \
+		20070818 20070825
 
 RELEASE=	5.6
 
@@ -134,6 +135,9 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,$$(INSTALL_PROG) ncurses-config,@INSTALL_SCRIPT@ ncurses-config,' ${WRKSRC}/misc/Makefile.in
+	@${RM} -rf ${WRKSRC}/tack \
+	 ${WRKSRC}/Ada95/src/terminal_interface-curses.adb
+	 ${WRKSRC}/mkinstalldirs
 
 post-configure:
 .if !defined(WITHOUT_WIDEC)
diff --git a/devel/ncurses-devel/Makefile.man b/devel/ncurses-devel/Makefile.man
index 65122d81b78b..510b2e8a1fe0 100644
--- a/devel/ncurses-devel/Makefile.man
+++ b/devel/ncurses-devel/Makefile.man
@@ -9,7 +9,6 @@ MAN1=	\
 	clear.1 \
 	infocmp.1m \
 	infotocap.1m \
-	tack.1 \
 	tic.1m \
 	toe.1m \
 	tput.1 \
diff --git a/devel/ncurses-devel/distinfo b/devel/ncurses-devel/distinfo
index b15b4ecc1260..e1d5e19afbef 100644
--- a/devel/ncurses-devel/distinfo
+++ b/devel/ncurses-devel/distinfo
@@ -103,3 +103,12 @@ SIZE (ncurses/ncurses-5.6-20070721.patch.gz) = 13252
 MD5 (ncurses/ncurses-5.6-20070728.patch.gz) = 0b27dc5c8c4cda5709776dadd88729ac
 SHA256 (ncurses/ncurses-5.6-20070728.patch.gz) = 0d87fc3594b3c17679bda56918036b557fec6c42e96fd549f4aa512fee4f842f
 SIZE (ncurses/ncurses-5.6-20070728.patch.gz) = 63045
+MD5 (ncurses/ncurses-5.6-20070812.patch.gz) = c0700a82b27ef001e7a7f269238ce1b4
+SHA256 (ncurses/ncurses-5.6-20070812.patch.gz) = 9c7f8af0d2e9af1bddfacf53ce6817bbdcd1659e7de1b8d5764d342bfeccf4eb
+SIZE (ncurses/ncurses-5.6-20070812.patch.gz) = 47141
+MD5 (ncurses/ncurses-5.6-20070818.patch.gz) = 612c113fd821f90962217646786ebc2b
+SHA256 (ncurses/ncurses-5.6-20070818.patch.gz) = 982d8b51b0de8a7543a9bea1d71a437a339c0c45fa77c3c84673c941bf7b77a7
+SIZE (ncurses/ncurses-5.6-20070818.patch.gz) = 18247
+MD5 (ncurses/ncurses-5.6-20070825.patch.gz) = 7dcbfdb966d419e62855af64bc1846d1
+SHA256 (ncurses/ncurses-5.6-20070825.patch.gz) = 630e0557a5bbe75057df18d4fef757b6f1a80e5a494e9f2551586c3cd982fe47
+SIZE (ncurses/ncurses-5.6-20070825.patch.gz) = 2218
diff --git a/devel/ncurses-devel/files/patch-tack b/devel/ncurses-devel/files/patch-tack
deleted file mode 100644
index f7d9fea6329b..000000000000
--- a/devel/ncurses-devel/files/patch-tack
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN tack-1.04/Makefile.in tack-1.05/Makefile.in
---- tack-1.04/Makefile.in	Sun Apr  8 23:57:15 2007
-+++ tack/Makefile.in	Mon Apr 30 04:49:12 2007
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.46 2007/04/08 15:57:15 tom Exp $
-+# $Id: Makefile.in,v 1.47 2007/04/29 20:49:12 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -98,7 +98,7 @@
- LOCAL_LIBDIR	= @top_builddir@/lib
- 
- LD		= @LD@
--LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
-+LINK		= @LINK_PROGS@ $(LIBTOOL_LINK)
- LDFLAGS		= @EXTRA_LDFLAGS@ \
- 		@TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
-diff -ruN tack-1.04/configure tack-1.05/configure
---- tack-1.04/configure	Mon Apr  9 00:04:45 2007
-+++ tack/configure	Mon Apr 30 07:51:35 2007
-@@ -1205,7 +1205,7 @@
- LIB_CLEAN=""				
- LIB_COMPILE=""				
- LIB_INSTALL=""				
--LIB_LINK=""				
-+LIB_LINK='$(CC)'			
- LIB_SUFFIX=""				
- LIB_UNINSTALL=""			
- LINK_PROGS=""				
-@@ -2754,7 +2754,7 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
- if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-@@ -3678,7 +3678,7 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
- if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-@@ -4304,7 +4304,7 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
- if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index e1a5cff692a5..daf80a60450b 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -1,7 +1,6 @@
 bin/clear
 bin/infocmp
 bin/reset
-bin/tack
 bin/tput
 bin/tset
 %%TERMINFO%%bin/tic
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0