Convert to buildlink2.

Use PKGLOCALEDIR instead of homebrewn LOCALEDIR.
Share distinfo between sawfish-replibs and sawfish.

4 files changed, 13 insertions, 25 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 42ec2d22d6b..50f3ab58538 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/05/31 00:53:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/08 13:22:37 wiz Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -10,25 +10,13 @@ DEPENDS+=		sawfish-replibs-${SF_VERS}nb2:../../wm/sawfish-replibs
 
 USE_X11BASE=		# defined
 
-CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
-MAKE_ENV+=		LOCALEDIR=${LOCALEDIR}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 TEXINFO_OVERRIDE=	YES
 BUILD_USES_MSGFMT=	YES
 
 PLIST_SUBST+=		SF_VERS=${SF_VERS}
 
-.include "../../mk/bsd.prefs.mk"
-
-# The directory in which locale files are found is:
-#
-#	${PREFIX}/${LOCALEDIR}/locale/<lang>/LC_MESSAGES
-#
-.if ${OPSYS} == "SunOS"
-LOCALEDIR=		lib
-.else
-LOCALEDIR=		share
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/themes
 	${TOUCH} ${PREFIX}/share/sawfish/themes/.directory
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 5043565eca9..a0f62ef3934 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2002/05/16 16:58:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2002/10/08 13:22:37 wiz Exp $
 
 DISTNAME=		sawfish-${SF_VERS}
 SF_VERS=		1.0.1
@@ -8,18 +8,18 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://sawmill.sourceforge.net/
 
-DEPENDS+=		librep>=0.15.1nb1:../../lang/librep
 DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
 
 USE_X11=		# defined
-
+USE_BUILDLINK2=		# defined
 USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
 
-FILESDIR=		${.CURDIR}/../../wm/sawfish/files
+DISTINFO_FILE=		${.CURDIR}/../../wm/sawfish/distinfo
 PATCHDIR=		${.CURDIR}/../../wm/sawfish/patches
 
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../x11/controlcenter/buildlink.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../lang/librep/buildlink2.mk"
+.include "../../x11/controlcenter/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index 1e4e45a323e..3b35e6d93e2 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/10/22 02:34:38 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/10/08 13:22:37 wiz Exp $
 
 SHA1 (sawfish-1.0.1.tar.gz) = bd254134da79b66da431f4b61f9fb2f3b2cf378f
 Size (sawfish-1.0.1.tar.gz) = 1326727 bytes
-SHA1 (patch-aa) = 18f4912ef5ae1a5201643b90aaac3f5f0a0c1550
+SHA1 (patch-aa) = 68ebcda2da73b32c245844d7b753e6b68e880647
 SHA1 (patch-ab) = 20ffaa03c787c0edaee2cdeea5855395ebb57fdc
 SHA1 (patch-ac) = 0f9558d5c968074d5ecf76534952478f128c2c29
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
index 7da1bc98f45..0c46598b1a2 100644
--- a/wm/sawfish/patches/patch-aa
+++ b/wm/sawfish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/04/03 08:43:50 toshii Exp $
+$NetBSD: patch-aa,v 1.4 2002/10/08 13:22:37 wiz Exp $
 
 --- configure.orig	Thu Mar 15 08:12:53 2001
 +++ configure
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/03 08:43:50 toshii Exp $
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
 -localedir='${datadir}/locale'
-+localedir='${prefix}/${LOCALEDIR}/locale'
++localedir='${prefix}/${PKGLOCALEDIR}/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  # Extract the first word of "gcc", so it can be a program name with args.