Use buildlink2.

2 files changed, 40 insertions, 43 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index aa696a22bac..da25a84c6a3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/07/17 12:05:44 rh Exp $
+# $NetBSD: Makefile,v 1.21 2002/10/08 17:50:59 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
@@ -12,9 +12,8 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Applets for GNOME
 
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
-DEPENDS+=		gnome-core>=1.4.0.4nb1:../../x11/gnome-core
-DEPENDS+=		libgtop>=1.0.12nb2:../../devel/libgtop
 
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
@@ -23,9 +22,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=        --localstatedir=${X11PREFIX}/var/lib
-CPPFLAGS+=		-I${LOCALBASE}/include
-
-AUTOGEN_ENV=		NOCONFIGURE=1
-AUTOGEN_ENV+=		srcdir=${WRKSRC}
 
+.include "../../devel/libgtop/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST
index 41c09a61eea..3d306478839 100644
--- a/x11/gnome-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/17 12:05:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/08 17:50:59 wiz Exp $
 bin/another_clock_applet
 bin/asclock_applet
 bin/battery_applet
@@ -1151,41 +1151,41 @@ share/gnome/help/whereami_applet/it/topic.dat
 share/gnome/help/whereami_applet/it/whereami.sgml
 share/gnome/help/whereami_applet/it/whereami_applet.sgml
 share/gweather/Locations
-share/locale/az.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ca.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/cs.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/da.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/de.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/el.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/en_GB.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/es.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/et.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/eu.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/fi.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/fr.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ga.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/gl.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/hu.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/it.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ja.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ko.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/lt.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/nl.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/nn.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/no.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/pl.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/pt.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/pt_BR.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ro.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/ru.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/sk.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/sl.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/sv.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/tr.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/uk.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/wa.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/zh_CN.GB2312.mo/LC_MESSAGES/gnome-applets.mo
-share/locale/zh_TW.mo/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-applets.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-applets.mo
 share/odometer/57chevy/57chevy-small-black.png
 share/odometer/57chevy/57chevy-small-red.png
 share/odometer/57chevy/themedata