bl3ify

5 files changed, 31 insertions, 21 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index de72b2e7b17..2af78704f35 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2004/01/05 23:34:03 jlam Exp $
 #
 
 DISTNAME=	slang-1.4.9
@@ -17,10 +17,12 @@ MAINTAINER=    	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.s-lang.org/
 COMMENT=	Routines for rapid alpha-numeric terminal applications development
 
-USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
-GNU_CONFIGURE=		# defined
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/autoconf/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/autoconf/config.sub
@@ -32,14 +34,10 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-# Debian doesn't have ltermcap, use ncurses instead
+# Debian doesn't have -ltermcap, use -lncurses instead
 .if ${OPSYS} == "Linux" && ${LOWER_VENDOR} == "debian"
-post-patch:
-	${SED} -e 's/ -ltermcap / /' ${WRKSRC}/src/Makefile.in > \
-		${WRKSRC}/src/Makefile.in.tmp &&		\
-		${MV} ${WRKSRC}/src/Makefile.in.tmp ${WRKSRC}/src/Makefile.in
-
-. include "../../devel/ncurses/buildlink2.mk"
+BUILDLINK_TRANSFORM+=	S:-liconv:
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libcrack/Makefile b/security/libcrack/Makefile
index 36947abcffb..3386a1bc799 100644
--- a/security/libcrack/Makefile
+++ b/security/libcrack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:20:10 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/05 23:35:58 jlam Exp $
 #
 
 DISTNAME=	cracklib,2.7
@@ -11,8 +11,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.users.dircon.co.uk/~crypto/
 COMMENT=	Password checking library
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
-USE_BUILDLINK2=	YES
+
+INSTALLATION_DIRS=	bin include/cracklib lib libdata
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/cracklib
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index e99ced5e66f..7261c448651 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:53:13 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/05 23:36:32 jlam Exp $
 #
 
 DISTNAME=		rsaref
@@ -14,7 +14,9 @@ COMMENT=		Encryption/authentication library, RSA/MDX/DES
 CRYPTO=			yes
 LICENSE=		no-commercial-use
 
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 MAKEFILE=		unix/makefile
 ALL_TARGET=		librsaref.la
@@ -23,11 +25,13 @@ do-configure:
 	@${RM} -f ${WRKDIR}/source/rsaref && ${LN} -sf . ${WRKDIR}/source/rsaref
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/rsaref ${PREFIX}/share/doc/rsaref
+	${INSTALL_DATA_DIR} ${PREFIX}/lib
+	${INSTALL_DATA_DIR} ${PREFIX}/include/rsaref
 	cd ${WRKSRC} && ${LIBTOOL} ${INSTALL_DATA} librsaref.la ${PREFIX}/lib
 .for file in des.h global.h md2.h md5.h rsa.h rsaref.h
 	${INSTALL_DATA} ${WRKDIR}/source/${file} ${PREFIX}/include/rsaref/
 .endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rsaref
 	cd ${WRKDIR}/doc && ${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 68b1196b558..2e8f011bd56 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:54:14 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/05 23:43:06 jlam Exp $
 #
 
 DISTNAME=	expat-1.95.6
@@ -10,11 +10,13 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://expat.sourceforge.net/
 COMMENT=	XML parser library written in C
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_GMAKE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 DOCDIR=	${PREFIX}/share/doc/html/expat
 
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index a88854a390b..99582f3cfdb 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/12/23 11:56:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/05 23:43:06 jlam Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.0alpha1
@@ -9,8 +9,10 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://xmlcatmgr.sourceforge.net/
 COMMENT=	XML (and SGML) catalog manager
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 HAS_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	-p ${PREFIX}