summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2002-12-01 15:37:58 +0000
committersalo <salo@pkgsrc.org>2002-12-01 15:37:58 +0000
commite225805136d780a78c9a0d9f77ebaa7dea7f15fc (patch)
tree88f4c69208b6ef82dfd505015e3bd5a76dead9c9
parent0138cbfe45c7fd9314f0bfdaaf570985823b3cb7 (diff)
downloadpkgsrc-e225805136d780a78c9a0d9f77ebaa7dea7f15fc.tar.gz
USE_PKGLOCALEDIR, remove unnecessary patch, delint.
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/evolution/Makefile5
-rw-r--r--mail/evolution/PLIST76
-rw-r--r--mail/evolution/distinfo4
-rw-r--r--mail/evolution/patches/patch-aa27
-rw-r--r--mail/fetchmail/Makefile3
-rw-r--r--mail/fetchmail/PLIST24
-rw-r--r--mail/mutt/Makefile5
-rw-r--r--mail/mutt/distinfo4
-rw-r--r--mail/mutt/patches/patch-ab13
-rw-r--r--mail/spruce/Makefile12
-rw-r--r--mail/spruce/distinfo3
-rw-r--r--mail/spruce/patches/patch-ab13
-rw-r--r--mail/sylpheed-claws/Makefile7
-rw-r--r--mail/sylpheed/Makefile3
15 files changed, 85 insertions, 118 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 005f5c87854..4de9be8086f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/10/29 07:56:21 elric Exp $
+# $NetBSD: Makefile,v 1.26 2002/12/01 15:37:58 salo Exp $
#
DISTNAME= balsa-1.4.0
@@ -15,11 +15,11 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_X11BASE= yes
USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CONFIGURE_ARGS+= --disable-more-warnings --without-esmtp \
--enable-pcre
-CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8cf55906add..729ff30da77 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/10/19 10:54:54 rh Exp $
+# $NetBSD: Makefile,v 1.28 2002/12/01 15:37:58 salo Exp $
DISTNAME= evolution-1.0.8
PKGREVISION= 4
@@ -24,6 +24,7 @@ USE_X11BASE= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/libical/libtool
USE_BUILDLINK2= YES
+USE_PKGLOCALEDIR= YES
YACC= ${PREFIX}/bin/bison -y
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -56,7 +57,7 @@ pre-configure:
DISPLAY?= # empty if unset
checkforx:
-.if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO!} == "NO"
+.if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO{ NO!} == "NO"
.if exists(${X11BASE}/bin/Xvfb)
-${SETENV} XAUTHORITY= ${X11BASE}/bin/Xvfb :2 &
DISPLAY= ':2'
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index d9fc154b773..b60b5dbd2ed 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/10/11 09:29:59 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/12/01 15:37:58 salo Exp $
bin/csv2vcard
bin/evolution
bin/evolution-addressbook
@@ -1206,43 +1206,43 @@ share/libical-evolution/zoneinfo/Pacific/Wake.ics
share/libical-evolution/zoneinfo/Pacific/Wallis.ics
share/libical-evolution/zoneinfo/Pacific/Yap.ics
share/libical-evolution/zoneinfo/zones.tab
-share/locale/az/LC_MESSAGES/evolution.mo
-share/locale/bg/LC_MESSAGES/evolution.mo
-share/locale/ca/LC_MESSAGES/evolution.mo
-share/locale/da/LC_MESSAGES/evolution.mo
-share/locale/de/LC_MESSAGES/evolution.mo
-share/locale/el/LC_MESSAGES/evolution.mo
-share/locale/en_AU/LC_MESSAGES/evolution.mo
-share/locale/en_GB/LC_MESSAGES/evolution.mo
-share/locale/es/LC_MESSAGES/evolution.mo
-share/locale/et/LC_MESSAGES/evolution.mo
-share/locale/eu/LC_MESSAGES/evolution.mo
-share/locale/fi/LC_MESSAGES/evolution.mo
-share/locale/fr/LC_MESSAGES/evolution.mo
-share/locale/ga/LC_MESSAGES/evolution.mo
-share/locale/gl/LC_MESSAGES/evolution.mo
-share/locale/hu/LC_MESSAGES/evolution.mo
-share/locale/it/LC_MESSAGES/evolution.mo
-share/locale/ja/LC_MESSAGES/evolution.mo
-share/locale/ko/LC_MESSAGES/evolution.mo
-share/locale/lt/LC_MESSAGES/evolution.mo
-share/locale/lv/LC_MESSAGES/evolution.mo
-share/locale/nl/LC_MESSAGES/evolution.mo
-share/locale/nn/LC_MESSAGES/evolution.mo
-share/locale/no/LC_MESSAGES/evolution.mo
-share/locale/pl/LC_MESSAGES/evolution.mo
-share/locale/pt/LC_MESSAGES/evolution.mo
-share/locale/pt_BR/LC_MESSAGES/evolution.mo
-share/locale/ro/LC_MESSAGES/evolution.mo
-share/locale/ru/LC_MESSAGES/evolution.mo
-share/locale/sk/LC_MESSAGES/evolution.mo
-share/locale/sl/LC_MESSAGES/evolution.mo
-share/locale/sv/LC_MESSAGES/evolution.mo
-share/locale/tr/LC_MESSAGES/evolution.mo
-share/locale/uk/LC_MESSAGES/evolution.mo
-share/locale/vi/LC_MESSAGES/evolution.mo
-share/locale/zh_CN/LC_MESSAGES/evolution.mo
-share/locale/zh_TW/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evolution.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evolution.mo
share/mime-info/evolution.keys
share/mime-info/evolution.mime
share/oaf/GNOME_Evolution_Addressbook.oaf
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 35b53ef3554..8e970dd0bec 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2002/10/11 09:29:59 rh Exp $
+$NetBSD: distinfo,v 1.18 2002/12/01 15:37:59 salo Exp $
SHA1 (evolution-1.0.8.tar.bz2) = 68e0545f15f7ab3bc43f386ff8f829f1836e05ef
Size (evolution-1.0.8.tar.bz2) = 10772710 bytes
-SHA1 (patch-aa) = edeb3cf97d2192a5c0045d85a589c648036116a4
+SHA1 (patch-aa) = e571e75bcb93801bc6132bb2ca3f96abbde22494
SHA1 (patch-ab) = 3715bf4f43c80c902bbe346a25370fd14126722f
SHA1 (patch-ac) = c9feb5ca0dff4b4751bdd3e1d48468eb59fb14d0
SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
index cb40f7f1a01..33f0c4c4821 100644
--- a/mail/evolution/patches/patch-aa
+++ b/mail/evolution/patches/patch-aa
@@ -1,32 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2002/07/12 23:39:50 mycroft Exp $
+$NetBSD: patch-aa,v 1.12 2002/12/01 15:37:59 salo Exp $
--- configure.orig Thu Jun 20 19:55:20 2002
+++ configure Wed Jul 10 22:44:39 2002
-@@ -8406,13 +8406,13 @@
- if { (eval echo configure:8407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- CATOBJEXT=.gmo
-- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
- else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=${LOCALEDIR}
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
-@@ -8641,7 +8641,7 @@
- # We need to process the po/ directory.
- POSUB=po
- else
-- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi
@@ -9237,8 +9237,8 @@
# This can only change between Evolution versions (and then can only
# go up.)
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 2e59680f9f1..67881788ca5 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2002/11/24 19:55:37 chris Exp $
+# $NetBSD: Makefile,v 1.123 2002/12/01 15:37:59 salo Exp $
DISTNAME= fetchmail-6.1.2
CATEGORIES= mail
@@ -13,6 +13,7 @@ COMMENT= batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
+USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-hesiod
CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess
diff --git a/mail/fetchmail/PLIST b/mail/fetchmail/PLIST
index 2c62c1fd435..1b87c3db779 100644
--- a/mail/fetchmail/PLIST
+++ b/mail/fetchmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/12 18:48:20 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/01 15:37:59 salo Exp $
bin/fetchmail
man/man1/fetchmail.1
share/doc/fetchmail/README
@@ -9,15 +9,15 @@ share/doc/fetchmail/FEATURES
share/doc/fetchmail/fetchmail-FAQ.html
share/doc/fetchmail/design-notes.html
share/doc/fetchmail/fetchmail-features.html
-share/locale/ca/LC_MESSAGES/fetchmail.mo
-share/locale/cs/LC_MESSAGES/fetchmail.mo
-share/locale/da/LC_MESSAGES/fetchmail.mo
-share/locale/de/LC_MESSAGES/fetchmail.mo
-share/locale/es/LC_MESSAGES/fetchmail.mo
-share/locale/fr/LC_MESSAGES/fetchmail.mo
-share/locale/gl/LC_MESSAGES/fetchmail.mo
-share/locale/ja/LC_MESSAGES/fetchmail.mo
-share/locale/pl/LC_MESSAGES/fetchmail.mo
-share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
-share/locale/tr/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/fetchmail.mo
@dirrm share/doc/fetchmail
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 820e90217cb..93eb103cd92 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2002/11/30 14:59:39 grant Exp $
+# $NetBSD: Makefile,v 1.89 2002/12/01 15:38:00 salo Exp $
DISTNAME= mutt-1.4i
PKGNAME= ${DISTNAME:C/i$//}
@@ -13,10 +13,9 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.mutt.org/
COMMENT= text-based MIME mail client with PGP support
-USE_BUILDLINK2= # defined
-
BUILD_USES_MSGFMT= # defined
+USE_BUILDLINK2= # defined
USE_GMAKE= # defined
GNU_CONFIGURE= # defined
USE_PKGLOCALEDIR= # defined
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 0f10dbc4efe..7fb99c39904 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2002/11/30 14:59:39 grant Exp $
+$NetBSD: distinfo,v 1.11 2002/12/01 15:38:00 salo Exp $
SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
Size (mutt-1.4i.tar.gz) = 2554158 bytes
-SHA1 (patch-ab) = ceb983dd36cd5d8960c41b8f232cc5210b99f50b
+SHA1 (patch-ab) = e0d3c5b90c94a501436aa037f5538c4ab12b04bc
SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
index eea715e7aa8..b62c781e548 100644
--- a/mail/mutt/patches/patch-ab
+++ b/mail/mutt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2002/11/27 19:05:40 jmmv Exp $
+$NetBSD: patch-ab,v 1.10 2002/12/01 15:38:00 salo Exp $
--- Makefile.in.orig Wed May 29 11:31:04 2002
-+++ Makefile.in
-@@ -23,7 +23,8 @@ bindir = @bindir@
++++ Makefile.in Sun Dec 1 16:25:32 2002
+@@ -23,9 +23,11 @@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
@@ -11,13 +11,16 @@ $NetBSD: patch-ab,v 1.9 2002/11/27 19:05:40 jmmv Exp $
+realsysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
++localedir = $(prefix)/share/locale
libdir = @libdir@
-@@ -139,7 +140,7 @@ makedoc_DEPENDENCIES =
+ infodir = @infodir@
+ mandir = @mandir@
+@@ -139,7 +141,7 @@
CPP = @CPP@
-DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1
-+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(realsysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1
++DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(realsysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 897f65abc0f..579d814ddd4 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/07/17 11:22:38 agc Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/01 15:38:00 salo Exp $
#
DISTNAME= spruce-0.5.17
@@ -12,10 +12,10 @@ COMMENT= MIME-aware, GNOME-based email program
DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
-USE_X11= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-
-MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+USE_X11= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/spruce/distinfo b/mail/spruce/distinfo
index fbc002791c7..ff57ae6d493 100644
--- a/mail/spruce/distinfo
+++ b/mail/spruce/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/07/17 11:22:38 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/12/01 15:38:00 salo Exp $
SHA1 (spruce-0.5.17.tar.gz) = 9d9d28d88f334e36fc95855da0c4e3ab07781b10
Size (spruce-0.5.17.tar.gz) = 343206 bytes
SHA1 (patch-aa) = 4e886e46b91b1569bc6e3a6987394c54b8dbd4c6
-SHA1 (patch-ab) = f6d966b44058d8bf39dd294cf01db114ad64d626
diff --git a/mail/spruce/patches/patch-ab b/mail/spruce/patches/patch-ab
deleted file mode 100644
index b25c80e4fcf..00000000000
--- a/mail/spruce/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/07/17 11:22:39 agc Exp $
-
---- po/Makefile.in.in 2002/07/17 11:08:47 1.1
-+++ po/Makefile.in.in 2002/07/17 11:09:44
-@@ -18,7 +18,7 @@
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/${PKGLOCALEDIR}
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 18982353b78..f19072d9649 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/10/27 10:29:43 grant Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/01 15:38:01 salo Exp $
DISTNAME= sylpheed-0.8.5claws
PKGNAME= sylpheed-claws-0.8.5
@@ -10,11 +10,12 @@ MAINTAINER= ptiJo@noos.fr
HOMEPAGE= http://sylpheed-claws.sourceforge.net/
COMMENT= X based e-mail and netnews client
-CONFLICTS= sylpheed-[0-9]*
-
BUILD_USES_MSGFMT= yes
+CONFLICTS= sylpheed-[0-9]*
+
USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index bfc0d77b355..07fd5fcc5b6 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/11/24 13:31:56 chris Exp $
+# $NetBSD: Makefile,v 1.27 2002/12/01 15:38:01 salo Exp $
DISTNAME= sylpheed-0.8.6
PKGREVISION= 1
@@ -15,6 +15,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS= sylpheed-claws-[0-9]*
USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
USE_GMAKE= yes