obnc-libstd: fix build failures

[Dean Matzkov <bapabooiee%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dean Matzkov <bapabooiee%gmail.com@localhost>
Pushed By:	bapa
Date:		Fri Jan 25 01:23:03 2019 -0700
Changeset:	13524a900a812f068b8c822ed23210fe0d04f172

Modified Files:
	obnc-libstd/Makefile
	obnc-libstd/PLIST
	obnc-libstd/TODO

Log Message:
obnc-libstd: fix build failures

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=13524a900a812f068b8c822ed23210fe0d04f172

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 obnc-libstd/Makefile | 15 ++++++++++-----
 obnc-libstd/PLIST    | 33 +++++++++++++++++++++++++++++++++
 obnc-libstd/TODO     |  8 --------
 3 files changed, 43 insertions(+), 13 deletions(-)

diffs:
diff --git a/obnc-libstd/Makefile b/obnc-libstd/Makefile
index 58c9584080..f6e3fe8d3d 100644
--- a/obnc-libstd/Makefile
+++ b/obnc-libstd/Makefile
@@ -16,16 +16,21 @@ WRKSRC=	${WRKDIR}/${PKGNAME_NOREV}
 
 USE_LANGUAGES=	c
 
+DEPENDS+=	obnc-[0-9]*:../../wip/obnc
+
 do-build:
 	cd ${WRKSRC} && \
 		${PKGSRC_SETENV} ${MAKE_ENV} \
 		./build
 
-# Unlike obnc which uses ``./install --destdir=DESTDIR``, obnc-libstd
-# uses ``./install DESTDIR`` instead.
-# do-install:
-# 	cd ${WRKSRC} && \
-# 		./install ${DESTDIR}
+do-install:
+	cd ${WRKSRC} && \
+	./install \
+		--prefix=${PREFIX} \
+		--destdir=${DESTDIR}
+
+	# obnc also installs this same file, so remove to prevent conflicts
+	rm -f ${DESTDIR}${PREFIX}/share/doc/obnc/obncdoc/index.html
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../wip/obnc/buildlink3.mk"
diff --git a/obnc-libstd/PLIST b/obnc-libstd/PLIST
index e69de29bb2..f0d364de23 100644
--- a/obnc-libstd/PLIST
+++ b/obnc-libstd/PLIST
@@ -0,0 +1,33 @@
+@comment $NetBSD$
+include/obnc/std/stdArgs.h
+include/obnc/std/stdConvert.h
+include/obnc/std/stdEnv.h
+include/obnc/std/stdErr.h
+include/obnc/std/stdTrap.h
+lib/obnc/std/stdArgs.imp
+lib/obnc/std/stdArgs.o
+lib/obnc/std/stdArgs.sym
+lib/obnc/std/stdConvert.imp
+lib/obnc/std/stdConvert.o
+lib/obnc/std/stdConvert.sym
+lib/obnc/std/stdEnv.imp
+lib/obnc/std/stdEnv.o
+lib/obnc/std/stdEnv.sym
+lib/obnc/std/stdErr.imp
+lib/obnc/std/stdErr.o
+lib/obnc/std/stdErr.sym
+lib/obnc/std/stdTrap.imp
+lib/obnc/std/stdTrap.o
+lib/obnc/std/stdTrap.sym
+share/doc/obnc/obncdoc/std/index.html
+share/doc/obnc/obncdoc/std/stdArgs.def
+share/doc/obnc/obncdoc/std/stdArgs.def.html
+share/doc/obnc/obncdoc/std/stdConvert.def
+share/doc/obnc/obncdoc/std/stdConvert.def.html
+share/doc/obnc/obncdoc/std/stdEnv.def
+share/doc/obnc/obncdoc/std/stdEnv.def.html
+share/doc/obnc/obncdoc/std/stdErr.def
+share/doc/obnc/obncdoc/std/stdErr.def.html
+share/doc/obnc/obncdoc/std/stdTrap.def
+share/doc/obnc/obncdoc/std/stdTrap.def.html
+share/doc/obnc/obncdoc/std/style.css
diff --git a/obnc-libstd/TODO b/obnc-libstd/TODO
index 88ae76eb63..2ce1189111 100644
--- a/obnc-libstd/TODO
+++ b/obnc-libstd/TODO
@@ -2,12 +2,4 @@
   license doesn't seem to be in $PKGSRC/licenses. For now it's left as GPL v3
   (same license as obnc) until we can figure out what to do about this.
 
-- obnc-libstd fails to build, likely because of the soft build failures
-  noted in obnc/TODO.
-
-- obnc and obnc-libstd both apparently have ${PREFIX}/doc/obnc/obncdoc/index.html
-  files. So be prepared for PLIST conflicts once this package builds successfully.
-
-- Make sure ${PREFIX}/share/doc/obnc/obncdoc/std gets installed.
-
 - Improve the DESCR.