1 files changed, 34 insertions, 47 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 107f2f19b71..19c6d99d883 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,59 +1,46 @@
-# $NetBSD: Makefile,v 1.31 2000/07/14 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2000/10/12 14:56:42 jlam Exp $
 
-DISTNAME=		ncurses-5.0
+DISTNAME=		ncurses-${NC_VERS}
+NC_VERS=		5.1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=ncurses/} \
-			ftp://ftp.clark.net/pub/dickey/ncurses/
+			ftp://dickey.his.com/ncurses/ \
+			ftp://dickey.his.com/ncurses/${NC_VERS}/
+DISTFILES+=		${NC_PATCH}
 
 MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.clark.net/pub/dickey/ncurses/ncurses.html
+HOMEPAGE=		http://dickey.his.com/ncurses/ncurses.html
+
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+NC_PATCH=		patch-5.1-20001009.sh
 
-GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
-CONFIGURE_ARGS+=	--with-normal --enable-bsdpad \
-			--without-shared --without-debug --without-profile \
-			--without-gpm --without-ada \
-			--with-manpage-format=normal
-MAKE_ENV+=		NCURSES_MAJOR="${NCURSES_MAJOR}" \
-			NCURSES_MINOR="${NCURSES_MINOR}"
-
-# Define these here so they can be conveniently changed when ncurses
-# is integrated into the NetBSD source tree.
-#
-NCURSES_MAJOR=		5
-NCURSES_MINOR=		0
-
-# The following installed headers directly reference <curses.h> and must be
-# altered to reference <ncurses.h> instead.
-#
-CURSES_INCLUDES=	c++/cursesw.h form/form.h include/unctrl.h \
-			menu/menu.h panel/panel.h
-CURSES_MAN_WITH_TABLES=	captoinfo.1m curs_addch.3x curs_attr.3x \
-			curs_getch.3x curs_inch.3x curs_mouse.3x \
-			form.3x infocmp.1m menu.3x ncurses.3x
-#			terminfo.5 is handled by patch-ac
-SED_NCURSES=		'/\#[ 	]*include/s/curses.h/ncurses.h/'
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-libtool
+CONFIGURE_ARGS+=	--enable-bsdpad
+CONFIGURE_ARGS+=	--with-cxx-binding
+CONFIGURE_ARGS+=	--without-ada
+CONFIGURE_ARGS+=	--without-curses-h
+CONFIGURE_ARGS+=	--without-gpm
+CONFIGURE_ARGS+=	--with-manpage-format=normal
+CONFIGURE_ARGS+=	--with-manpage-tbl
+
+# Remove these manpages from the distribution so they won't get installed
+CURSES_NO_MAN=		clear.1 tput.1 tset.1
+
+post-extract:
+	cd ${WRKSRC} && ${SH} ${DISTDIR}/${DIST_SUBDIR}/${NC_PATCH}
+	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 
 post-configure:
-	cd ${WRKSRC};							\
-	${LN} -sf curses.h include/ncurses.h;				\
-	for file in ${CURSES_INCLUDES}; do				\
-		${SED} -e ${SED_NCURSES} <$${file} >$${file}.tmp;	\
-		${MV} -f $${file}.tmp $${file};				\
-	done
-	cd ${WRKSRC}/man;						\
-	${RM} -f clear.1 tput.1 tset.1;					\
-	for file in ${CURSES_MAN_WITH_TABLES}; do			\
-		tbl $${file} > $${file}.notbl;				\
-		${MV} $${file}.notbl $${file};				\
-	done;								\
-	for file in *.1m; do						\
-		${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .1m`.1; \
-		${RM} -f $${file};					\
-	done;								\
-	for file in *.3x; do						\
-		${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .3x`.3; \
-		${RM} -f $${file};					\
+	cd ${WRKSRC}/man;					\
+	${RM} -f ${CURSES_NO_MAN};				\
+	for file in *.1m; do					\
+		${MV} -f $${file} `basename $${file} .1m`.1; 	\
+	done;							\
+	for file in *.3x; do					\
+		${MV} -f $${file} `basename $${file} .3x`.3; 	\
 	done
 
 post-install: