bl3ify

4 files changed, 21 insertions, 12 deletions

diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 7b6cc065062..71ff79f0812 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/09 08:32:13 tron Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/06 07:17:13 jlam Exp $
 
 DISTNAME=	xautolock-pl15
 PKGNAME=	xautolock-1.15
@@ -10,7 +10,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	tron@NetBSD.org
 COMMENT=	Activate xlock after a user defined time of inactivity
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -21,9 +23,11 @@ PLIST_SRC=	${WRKDIR}/PLIST
 post-install:
 	${GREP} -v '^man/cat' ${PKGDIR}/PLIST >${PLIST_SRC}
 .else
+INSTALLATION_DIRS=	man/man1
+
 post-install:
 	cd ${WRKSRC}; \
-	${INSTALL_MAN} xautolock.man ${X11PREFIX}/man/man1/xautolock.1
+	${INSTALL_MAN} xautolock.man ${PREFIX}/man/man1/xautolock.1
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index ec2bf3a1b1f..6b72900aad6 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2003/11/30 22:58:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/06 07:17:13 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,10 +23,10 @@ COMMENT=	Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=	--with-mesagl
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 49b2799cab8..9a447ccda65 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/12/31 03:06:37 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/01/06 07:17:13 jlam Exp $
 #
 # This Makefile.common is included by:
 #
@@ -23,7 +23,9 @@ DISTINFO_FILE?=		${.CURDIR}/../xlockmore/distinfo
 PATCHDIR?=		${.CURDIR}/../xlockmore/patches
 PLIST_SRC?=		${.CURDIR}/../xlockmore/PLIST
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_X11BASE=		YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -49,7 +51,7 @@ CONFIGURE_ARGS+=        --without-gtk
 
 .if ${OPSYS} == "NetBSD"
 .  if defined(USE_OSS)
-.    include "../../audio/oss/buildlink2.mk"
+.    include "../../audio/oss/buildlink3.mk"
 BUILDLINK_DEPENDS.oss=	oss-[0-9]*
 XLOCK_AUDIOPLAY?=	${BUILDLINK_PREFIX.oss}/bin/ossplay
 .  else
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index fbe28ea882e..787ec19bcdd 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/04 09:27:01 seb Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/06 07:17:13 jlam Exp $
 #
 
 DISTNAME=	xpaste-1.1
@@ -11,6 +11,9 @@ EXTRACT_SUFX=	.shar.gz
 MAINTAINER=	seb@NetBSD.org
 COMMENT=	Display the content of the X11 paste buffer in a window
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"