From 22645a942c3cf747d39da0c5df868d1da154e9d0 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 5 Jan 2004 11:28:07 +0000
Subject: bl3ify

---
 net/netcat/Makefile |  8 ++++++--
 net/unison/Makefile | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'net')

diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 091de691b51..c8df30369da 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/11/23 01:23:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/05 11:29:41 jlam Exp $
 
 DISTNAME=	nc110
 PKGNAME=	netcat-1.10
@@ -17,7 +17,9 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.atstake.com/research/tools/network_utilities/
 COMMENT=	Read and write data across network connections
 
-USE_BUILDLINK2=	yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 MAKE_ENV+=	DFLAGS="-DGAPING_SECURITY_HOLE -DTELNET"
 ALL_TARGET=	${LOWER_OPSYS}
 
@@ -26,6 +28,8 @@ EXAMPLE_DIR=	share/examples/nc
 
 PLIST_SRC=	${PKGDIR}/PLIST ${WRKSRC}/data/PLIST.data
 
+INSTALLATION_DIRS=	man/man1 sbin
+
 post-build:
 	@cd ${WRKSRC}/data && ${SETENV} ${MAKE_ENV} ${MAKE} ${EXTRA_PROGS}
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index e7c919d226a..f2404ae0676 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 17:11:26 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/05 11:28:52 jlam Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
@@ -11,11 +11,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 
-BUILD_DEPENDS=	ocaml>=3.00:../../lang/ocaml
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 # docs: unison-manual.pdf/html/ps/dvi
+USE_BUILDLINK3=	yes
 USE_GMAKE=	yes
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
@@ -28,12 +29,14 @@ MAKE_FLAGS+=	NATIVE=true
 MAKE_FLAGS+=	NATIVE=false
 .endif
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 MAKE_FLAGS+=	THREADS=true
 .endif
 
+INSTALLATION_DIRS=	bin
+
 post-install:
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
@@ -46,4 +49,5 @@ post-install:
 		${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/TODO.txt ${PREFIX}/share/doc/unison
 
+.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3