diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index aa6643d5af96..bbf85c7ba729 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/27 23:17:59 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/12 18:10:14 wiz Exp $
 
 DISTNAME=	gnotepad+-1.3.3
 PKGNAME=	${DISTNAME:S/+//}
@@ -10,14 +10,16 @@ HOMEPAGE=	http://gnotepad.sourceforge.net/
 COMMENT=	easy-to-use, yet fairly feature-rich, simple HTML and text editor for X11
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-USE_LIBINTL=	YES
 USE_LIBTOOL=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_BUILDLINK_ONLY=	YES
 
 GNU_CONFIGURE=	# defined
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../x11/gnome-core/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index c7396ae5241d..3f142d9af6ea 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/02 18:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/12 18:13:25 wiz Exp $
 #
 
 DISTNAME=	gperiodic-1.2.6
@@ -11,13 +11,13 @@ HOMEPAGE=	http://gperiodic.seul.org/
 COMMENT=	Displays a periodic table of the elements
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_LIBINTL=	yes
 USE_X11BASE=	yes
 
+USE_BUILDLINK_ONLY=	yes
+
 pre-configure:
 .for f in config.cache config.h config.log config.status
 	${RM} -f ${WRKSRC}/$f
@@ -26,4 +26,7 @@ pre-configure:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1/
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"