USE_PKGLOCALEDIR, remove unnecessary patch, delint.

4 files changed, 44 insertions, 68 deletions

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.)