Go ahead and build and install the the ncurses C++ application framework

library.  This was a side-effect of trying to deal with --with-cxx and
--without-cxx.  We accept the default --with-cxx.  This should work
regardless of whether libg++ exists.

7 files changed, 137 insertions, 93 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index affcb1f1a09..631617fe758 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/09/13 20:04:48 fredb Exp $
+# $NetBSD: Makefile,v 1.27 1999/09/24 00:39:13 jlam Exp $
 
 DISTNAME=		ncurses-4.2
 CATEGORIES=		devel
@@ -32,4 +32,8 @@ post-patch:
 		<$$i >`basename $$i .3x`.3; \
 	  ${RM} -f $$i; done )
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/c++/demo.cc \
+		${PREFIX}/share/examples/ncurses++demo.cc
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ncurses/files/patch-sum b/devel/ncurses/files/patch-sum
index 561083a19cf..37005537826 100644
--- a/devel/ncurses/files/patch-sum
+++ b/devel/ncurses/files/patch-sum
@@ -1,13 +1,15 @@
-$NetBSD: patch-sum,v 1.3 1999/09/13 21:20:33 fredb Exp $
+$NetBSD: patch-sum,v 1.4 1999/09/24 00:39:13 jlam Exp $
 
 MD5 (patch-aa) = a6827fdf571e7aefa149b94accb44b4a
-MD5 (patch-ab) = 336064d47267bc61ed2541c56711fe1f
+MD5 (patch-ab) = a6ae37871c4b82f9b6a8af5beaf74352
 MD5 (patch-ac) = 546d83d15d2279277a6c77e754dbb93a
 MD5 (patch-ad) = 8f9e20face0c55074e54bf7176252a7d
 MD5 (patch-ae) = dad6ffedeff83e83afadeac434fa9972
-MD5 (patch-af) = d1363605fbea0778e4118044b3ec24b6
+MD5 (patch-af) = 0ba3fe9b0477d8685e0f5bc56bad7220
 MD5 (patch-ag) = 5ef845ba624a0c0baef232e4d55b0f1f
 MD5 (patch-ah) = e6a3861102bbfc130fb4c2ee35c6e3a2
 MD5 (patch-ai) = 3401ca1e14d53edb6b0d33ac199a7a86
 MD5 (patch-aj) = f357ce3e57468cecd3f4dd3994bcbaf2
 MD5 (patch-ak) = daff9fdb31fa1c1eacdcf21d893ff49b
+MD5 (patch-al) = fd24f510fe2e5372142f314493e0fd37
+MD5 (patch-am) = b98afdbc5071a3fb154eba8adf201f2b
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 4bb5391b369..33037c6b923 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.6 1999/09/13 21:20:34 fredb Exp $
+$NetBSD: patch-ab,v 1.7 1999/09/24 00:39:13 jlam Exp $
 
---- configure.orig	Thu Feb 12 17:46:01 1998
-+++ configure	Mon Sep 13 15:33:07 1999
+--- configure.orig	Thu Feb 12 18:46:01 1998
++++ configure	Thu Sep 23 16:45:08 1999
 @@ -1628,6 +1628,7 @@
      test -z "$cf_dir" && cf_dir=/usr/man
      cf_rename=""
      cf_format=no
-+    if false ; then	# install unformatted man pages
++    if false; then	# install unformatted man pages
      for cf_name in $cf_dir/*/date.[01]* $cf_dir/*/date
      do
         cf_test=`echo $cf_name | sed -e 's/*//'`
@@ -24,87 +24,21 @@ $NetBSD: patch-ab,v 1.6 1999/09/13 21:20:34 fredb Exp $
  	
  	case $DFT_LWR_MODEL in
 -	normal)  DFT_DEP_SUFFIX='.a'   ;;
-+	normal)  DFT_DEP_SUFFIX='.la'  ;;
++	normal)  DFT_DEP_SUFFIX='.la'   ;;
  	debug)   DFT_DEP_SUFFIX='_g.a' ;;
  	profile) DFT_DEP_SUFFIX='_p.a' ;;
  	shared)
-@@ -4842,36 +4845,37 @@
- cross_compiling=$ac_cv_prog_cxx_cross
- 
- 	
--cf_cxx_library=unknown
--if test $ac_cv_prog_gxx = yes; then
--	echo $ac_n "checking for libg++""... $ac_c" 1>&6
--echo "configure:4849: checking for libg++" >&5
--	cf_save="$LIBS"
--	LIBS="$LIBS -lg++ -lm"
--	cat > conftest.$ac_ext <<EOF
--#line 4853 "configure"
--#include "confdefs.h"
--
--#include <builtin.h>
--	
--int main() {
--float foo=abs(1.0)
--; return 0; }
--EOF
--if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
--  rm -rf conftest*
--  cf_cxx_library=yes
--	 CXXLIBS="$CXXLIBS -lg++ -lm"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  cf_cxx_library=no
--fi
--rm -f conftest*
--	LIBS="$cf_save"
-+cf_cxx_library=no
-+#cf_cxx_library=unknown
-+#if test $ac_cv_prog_gxx = yes; then
-+#	echo $ac_n "checking for libg++""... $ac_c" 1>&6
-+#echo "configure:4849: checking for libg++" >&5
-+#	cf_save="$LIBS"
-+#	LIBS="$LIBS -lg++ -lm"
-+#	cat > conftest.$ac_ext <<EOF
-+##line 4853 "configure"
-+##include "confdefs.h"
-+#
-+##include <builtin.h>
-+#	
-+#int main() {
-+#float foo=abs(1.0)
-+#; return 0; }
-+#EOF
-+#if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+#  rm -rf conftest*
-+#  cf_cxx_library=yes
-+#	 CXXLIBS="$CXXLIBS -lg++ -lm"
-+#else
-+#  echo "configure: failed program was:" >&5
-+#  cat conftest.$ac_ext >&5
-+#  rm -rf conftest*
-+#  cf_cxx_library=no
-+#fi
-+#rm -f conftest*
-+#	LIBS="$cf_save"
- 	echo "$ac_t""$cf_cxx_library" 1>&6
--fi
-+#fi
- 
- 	echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
- echo "configure:4878: checking how to run the C++ preprocessor" >&5
-@@ -5310,7 +5314,7 @@
+@@ -5310,7 +5313,8 @@
  
  # dependencies and linker-arguments for test-programs
  TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
 -TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
 +TEST_ARGS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_ARGS"
++
  
  # dependencies and linker-arguments for utility-programs
  PROG_ARGS="$TEST_ARGS"
-@@ -5353,16 +5357,13 @@
+@@ -5353,16 +5357,16 @@
  EOF
  
  			TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
@@ -117,31 +51,43 @@ $NetBSD: patch-ab,v 1.6 1999/09/13 21:20:34 fredb Exp $
 -TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
 -
 -
-+TEST_ARGS="-L\$(libdir) $TEST_ARGS"
  
 -PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
++# Put $(libdir) last so we ensure programs are linked against newly-built
++# versions of libraries.
++TEST_ARGS="$TEST_ARGS -L\$(libdir)"
++PROG_ARGS="$PROG_ARGS -L\$(libdir)"
  
  
  SRC_SUBDIRS="man include"
-@@ -5888,7 +5889,7 @@
+@@ -5371,7 +5375,7 @@
+ 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
+ done
+ SRC_SUBDIRS="$SRC_SUBDIRS misc test"
+-test $cf_cxx_library != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
++test "X$cf_with_cxx" != Xno && SRC_SUBDIRS="$SRC_SUBDIRS c++"
+ 
+ ADA_SUBDIRS=
+ if test "$ac_cv_prog_gnat_correct" = yes && test -d $srcdir/Ada95; then
+@@ -5888,7 +5892,7 @@
  			
  	
  	case $cf_item in
 -	normal)  cf_suffix='.a'   ;;
-+	normal)  cf_suffix='.la'  ;;
++	normal)  cf_suffix='.la'   ;;
  	debug)   cf_suffix='_g.a' ;;
  	profile) cf_suffix='_p.a' ;;
  	shared)
-@@ -5931,7 +5932,7 @@
+@@ -5931,7 +5935,7 @@
  			
  	
  	case $cf_item in
 -	normal)  cf_suffix='.a'   ;;
-+	normal)  cf_suffix='.la'  ;;
++	normal)  cf_suffix='.la'   ;;
  	debug)   cf_suffix='_g.a' ;;
  	profile) cf_suffix='_p.a' ;;
  	shared)
-@@ -6120,7 +6121,7 @@
+@@ -6120,7 +6124,7 @@
  		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
  		do
  			echo "	@ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af
index 3d39d6ccbd0..a7cee3dbbcb 100644
--- a/devel/ncurses/patches/patch-af
+++ b/devel/ncurses/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 1999/07/06 07:51:05 jlam Exp $
+$NetBSD: patch-af,v 1.2 1999/09/24 00:39:13 jlam Exp $
 
 --- mk-2nd.awk.orig	Wed Feb 11 07:13:53 1998
-+++ mk-2nd.awk	Tue Jun 29 17:47:39 1999
++++ mk-2nd.awk	Thu Sep 23 17:24:17 1999
 @@ -74,9 +74,11 @@
  			if ( $1 != "" ) {
  				print  ""
@@ -14,12 +14,14 @@ $NetBSD: patch-af,v 1.1 1999/07/06 07:51:05 jlam Exp $
  					compile="CC"
  					suffix=".c"
  				}
-@@ -89,10 +91,17 @@
+@@ -89,10 +91,14 @@
  					atsign="@"
  					printf "\t@echo 'compiling %s (%s)'\n", $1, model
  				}
 -				if ( $3 == "." || srcdir == "." )
 -					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s", atsign, model, compile, MODEL, name, $1, suffix
+-				else
+-					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
 +				if ( $3 == "." || srcdir == "." ) {
 +					libprefix="../"
 +					dirname=name
@@ -27,11 +29,7 @@ $NetBSD: patch-af,v 1.1 1999/07/06 07:51:05 jlam Exp $
 +					libprefix=""
 +					dirname=$3
 +				}
-+				if ( $2 == "lib" )
-+					printf "\t%scd ../%s; $(LIBTOOL) %s --mode=compile $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, cplusplus, compile, MODEL, libprefix, dirname, $1, suffix
- 				else
--					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
-+					printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, compile, MODEL, libprefix, dirname, $1, suffix
++				printf "\t%scd ../%s; $(LIBTOOL) %s --mode=compile $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, cplusplus, compile, MODEL, libprefix, dirname, $1, suffix
  			} else {
  				printf "%s", $1
  				for (n = 2; n <= NF; n++) printf " %s", $n
diff --git a/devel/ncurses/patches/patch-al b/devel/ncurses/patches/patch-al
new file mode 100644
index 00000000000..c9595935eee
--- /dev/null
+++ b/devel/ncurses/patches/patch-al
@@ -0,0 +1,71 @@
+$NetBSD: patch-al,v 1.1 1999/09/24 00:39:13 jlam Exp $
+
+--- c++/Makefile.in.orig	Mon Mar  2 07:00:25 1998
++++ c++/Makefile.in	Thu Sep 23 18:25:59 1999
+@@ -73,10 +73,9 @@
+ LINK		= $(CXX)
+ 
+ LIBROOT	= ncurses++
+-LIBNAME	= ../lib/lib$(LIBROOT).a
++LIBNAME	= lib$(LIBROOT).la
+ 
+-LDFLAGS		= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \
+-	-l$(LIBROOT) \
++LDFLAGS		= @EXTRA_LDFLAGS@ ../lib/$(LIBNAME) \
+ 	@TEST_ARGS@ @LDFLAGS@ \
+ 	@LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
+ 
+@@ -90,7 +89,7 @@
+ AUTO_SRC	= \
+ 		etip.h
+ 
+-all:		$(AUTO_SRC) $(LIBNAME) demo
++all:		$(AUTO_SRC) ../lib/$(LIBNAME) demo
+ 
+ sources :	$(AUTO_SRC)
+ 
+@@ -106,9 +105,8 @@
+ 	$(MODEL)/cursesapp.o \
+ 	$(MODEL)/cursesmain.o
+ 
+-$(LIBNAME) : $(LIB_OBJS)
+-	$(AR) $(AR_OPTS) $@ $?
+-	$(RANLIB) $@
++../lib/$(LIBNAME) : $(LIB_OBJS)
++	cd ../lib && $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)
+ 
+ OBJS_DEMO = $(MODEL)/demo.o
+ 
+@@ -116,9 +114,9 @@
+ 	$(cursesf_h) $(cursesm_h) $(cursesapp_h)
+ 
+ demo:	$(OBJS_DEMO) \
+-	$(LIBNAME)  \
++	../lib/$(LIBNAME)  \
+ 	@TEST_DEPS@
+-	@ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
++	@ECHO_LINK@ $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+ 
+ etip.h:	$(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
+ 	cp $(srcdir)/etip.h.in $@
+@@ -128,8 +126,9 @@
+ 	$(srcdir)/../mkinstalldirs $@
+ 
+ install \
+-install.libs:: $(LIBNAME) $(INSTALL_PREFIX)$(libdir)
+-	$(INSTALL) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME)
++install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)
++	cd ../lib && $(LIBTOOL) --cplusplus --mode=install $(INSTALL_DATA) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)
++
+ 
+ uninstall \
+ uninstall.libs::
+@@ -139,7 +138,7 @@
+ 	-rm -f core tags TAGS *~ *.ln *.atac trace
+ 
+ clean :: mostlyclean
+-	-rm -f demo $(AUTO_SRC) $(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
++	-rm -f demo $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
+ 
+ distclean :: clean
+ 	-rm -f Makefile
diff --git a/devel/ncurses/patches/patch-am b/devel/ncurses/patches/patch-am
new file mode 100644
index 00000000000..f159e15c5c7
--- /dev/null
+++ b/devel/ncurses/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 1999/09/24 00:39:13 jlam Exp $
+
+--- c++/cursesw.h.orig	Tue Jan 20 11:53:50 1998
++++ c++/cursesw.h	Thu Sep 23 12:00:14 1999
+@@ -18,7 +18,7 @@
+ #endif
+ 
+ extern "C" {
+-#  include   <curses.h>
++#  include   <ncurses.h>
+ }
+ 
+ /* SCO 3.2v4 curses.h includes term.h, which defines lines as a macro.
diff --git a/devel/ncurses/pkg/PLIST b/devel/ncurses/pkg/PLIST
index 147a306b52a..209455cb473 100644
--- a/devel/ncurses/pkg/PLIST
+++ b/devel/ncurses/pkg/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.9 1999/07/06 07:51:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/09/24 00:39:13 jlam Exp $
 bin/captoinfo
 bin/infocmp
 bin/infotocap
 bin/tic
 bin/toe
+include/cursesapp.h
+include/cursesf.h
+include/cursesm.h
+include/cursesp.h
+include/cursesw.h
+include/cursslk.h
 include/eti.h
+include/etip.h
 include/form.h
 include/menu.h
 include/panel.h
@@ -16,6 +23,8 @@ lib/libform.a
 lib/libform.so.4.2
 lib/libmenu.a
 lib/libmenu.so.4.2
+lib/libncurses++.a
+lib/libncurses++.so.4.2
 lib/libncurses.a
 lib/libncurses.so.4.2
 lib/libpanel.a
@@ -120,6 +129,7 @@ man/man3/wresize.3
 man/man5/term.5
 man/man5/terminfo.5
 man/man7/term.7
+share/examples/ncurses++demo.cc
 share/tabset/std
 share/tabset/stdcrt
 share/tabset/vt100