Upgrade to ncurses-1.9.9g.

Add MANCOMPRESSED, as newer version gzips the manual pages.

Remember to merge the new shared objects in with ldconfig.

Add version numbers to the shared objects in the derived Makefiles.

3 files changed, 51 insertions, 20 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index b1d874a04e8..8d82da543dd 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,11 +1,12 @@
 # New ports collection makefile for:	ncurses
-# Version required:     		1.9.9e
+# Version required:     		1.9.9g
 # Date created:				Tue Oct 28 00:12:41 CET 1997
 # Whom:					Hubert Feyrer (hubertf@netbsd.org)
 #
-# $NetBSD: Makefile,v 1.3 1997/10/28 11:35:46 agc Exp $
+# $NetBSD: Makefile,v 1.4 1997/11/26 14:50:45 agc Exp $
 
-DISTNAME=	ncurses-1.9.9e
+DISTNAME=	ncurses-1.9.9g
+WRKSRC=		${WRKDIR}/ncurses_1.9.9g
 CATEGORIES=	devel
 # XXX this should be moved to ftp.netcom.com:/pub/zm/zmbenhal/ncurses/
 # XXX once upgraded to the latest version - hubertf
@@ -16,6 +17,7 @@ MAINTAINER=	hubertf@netbsd.org
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-normal --with-shared --enable-bsdpad
 
+MANCOMPRESSED=	yes
 MAN1=		captoinfo.1 infocmp.1 tic.1 toe.1
 MAN3=		curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 \
 		curs_beep.3 curs_bkgd.3 curs_border.3 curs_clear.3 \
@@ -57,5 +59,6 @@ post-install:
 	( cd ${PREFIX}/include ; for i in form.h menu.h panel.h ; do \
 	  sed '/#include/s|curses.h|ncurses.h|g' $$i >$$i.BAK ; \
 	  mv $$i.BAK $$i ; done )
+	ldconfig -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/ncurses/files/md5 b/devel/ncurses/files/md5
index 580b8e6f6e6..5e184d1ceb9 100644
--- a/devel/ncurses/files/md5
+++ b/devel/ncurses/files/md5
@@ -1 +1 @@
-MD5 (ncurses-1.9.9e.tar.gz) = 724a87cc8d715ec91f9d1308ba7e26e4
+MD5 (ncurses-1.9.9g.tar.gz) = 4cfe23b29218a11f304652659d4dd84f
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index 0f197cecc2b..16b226218e6 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,27 +1,55 @@
---- progs/Makefile.in.orig	Sun Feb 11 00:08:16 1996
-+++ progs/Makefile.in	Sat Oct 25 01:56:53 1997
-@@ -54,7 +54,7 @@
+--- progs/Makefile.in.orig	Sat Jun 15 21:40:53 1996
++++ progs/Makefile.in	Wed Nov 26 12:18:25 1997
+@@ -79,12 +79,12 @@
  AUTO_SRC = \
  	termsort.c
  
 -PROGS = tic toe infocmp clear tput tset
 +PROGS = tic toe infocmp
  
- TESTPROGS = mvcur tctest hardscroll
+ TESTPROGS = mvcur tctest hardscroll hashmap
  
-@@ -73,15 +73,9 @@
- 	$(INSTALL_PROGRAM) tic $(bindir)/tic
- 	$(INSTALL_PROGRAM) toe $(bindir)/toe
- 	$(INSTALL_PROGRAM) infocmp $(bindir)/infocmp
--	$(INSTALL_PROGRAM) clear $(bindir)/clear
--	$(INSTALL_PROGRAM) tput $(bindir)/tput
--	$(INSTALL_PROGRAM) tset $(bindir)/tset
+ # Default library, for linking applications
+-LIB_CURSES = ../lib/libncurses@DFT_DEP_SUFFIX@
++LIB_CURSES = ../lib/libncurses@DFT_DEP_SUFFIX@@nc_cv_abi_version@
+ 
+ ################################################################################
+ all:	$(AUTO_SRC) $(PROGS) 
+@@ -98,15 +98,9 @@
+ 	$(INSTALL_PROGRAM) tic     $(INSTALL_PREFIX)$(bindir)/tic
+ 	$(INSTALL_PROGRAM) toe     $(INSTALL_PREFIX)$(bindir)/toe
+ 	$(INSTALL_PROGRAM) infocmp $(INSTALL_PREFIX)$(bindir)/infocmp
+-	$(INSTALL_PROGRAM) clear   $(INSTALL_PREFIX)$(bindir)/clear
+-	$(INSTALL_PROGRAM) tput    $(INSTALL_PREFIX)$(bindir)/tput
+-	$(INSTALL_PROGRAM) tset    $(INSTALL_PREFIX)$(bindir)/tset
  	@echo "linking captoinfo to tic"
- 	-@rm -f $(bindir)/captoinfo
- 	-@ln $(bindir)/tic $(bindir)/captoinfo
+ 	-@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo
+ 	-@ln $(INSTALL_PREFIX)$(bindir)/tic $(INSTALL_PREFIX)$(bindir)/captoinfo
 -	@echo "linking reset to tset"
--	-@rm -f $(bindir)/reset
--	-@ln $(bindir)/tset $(bindir)/reset
+-	-@rm -f $(INSTALL_PREFIX)$(bindir)/reset
+-	-@ln $(INSTALL_PREFIX)$(bindir)/tset $(INSTALL_PREFIX)$(bindir)/reset
  
- $(bindir) :
+ $(INSTALL_PREFIX)$(bindir) :
  	$(srcdir)/../mkinstalldirs $@
+--- test/Makefile.in.orig	Wed Nov 26 13:02:17 1997
++++ test/Makefile.in	Wed Nov 26 13:04:53 1997
+@@ -41,6 +41,8 @@
+ 
+ CCFLAGS		= $(CFLAGS) $(CPPFLAGS) $(CFLAGS_@DFT_UPR_MODEL@)
+ 
++ABI_VERSION	= @nc_cv_abi_version@
++
+ LOCAL_LIBS	= @TEST_DEPS@
+ 
+ LINK		= $(CC)
+--- c++/Makefile.in.orig	Wed Nov 26 13:39:11 1997
++++ c++/Makefile.in	Wed Nov 26 13:39:59 1997
+@@ -50,6 +50,8 @@
+ LINK		= $(CXX)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@
+ 
++ABI_VERSION	= @nc_cv_abi_version@
++
+ all: demo
+ 
+ OBJS_DEMO = \