USE_PKGLOCALEDIR

4 files changed, 17 insertions, 37 deletions

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 8556488efbe..b660a4bdc0b 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/09/21 07:14:02 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2002/11/30 13:36:14 salo Exp $
 #
 
 DISTNAME=		jpilot-0.99
@@ -15,12 +15,12 @@ BUILD_USES_MSGFMT=	# defined
 CONFLICTS+=		jpilot-libplugin-[0-9]*
 
 USE_BUILDLINK2=		# defined
+USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
 CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo
index 05b1d7d8a80..6b747815c71 100644
--- a/comms/jpilot/distinfo
+++ b/comms/jpilot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/09/21 07:14:03 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/11/30 13:36:14 salo Exp $
 
 SHA1 (jpilot-0.99.tar.gz) = d52e4b31872c1b20bf882c8a062fdb954c8f4b1f
 Size (jpilot-0.99.tar.gz) = 488619 bytes
 SHA1 (patch-aa) = 4773e948de2d499cdb07f735d5cbc46c1fde5b92
-SHA1 (patch-ab) = 16b18f6b1bdff8e0b97cf975c0dd3e85181fe9c0
+SHA1 (patch-ab) = d0363a51220defc09147f4f176fe25d384bb3666
 SHA1 (patch-ac) = 1dfab3f52134426e362d9bf1a11cad036d5981e7
 SHA1 (patch-ad) = ae9ebca51baaca6f2542a2ac9fbd98e31f85ac34
-SHA1 (patch-ae) = b781ab9b8da70b9a5e4cf657aff9c20b3c201cc7
+SHA1 (patch-ae) = 418faa42e6d7decf8e8914f279ba30700b657496
diff --git a/comms/jpilot/patches/patch-ab b/comms/jpilot/patches/patch-ab
index aec64116d9a..3596076e640 100644
--- a/comms/jpilot/patches/patch-ab
+++ b/comms/jpilot/patches/patch-ab
@@ -1,25 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2001/03/01 20:38:15 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2002/11/30 13:36:14 salo Exp $
 
---- configure.in.orig	Tue Feb  6 14:26:38 2001
-+++ configure.in
-@@ -56,6 +56,9 @@
- dnl AM_WITH_NLS()
- AM_GNU_GETTEXT
- 
-+# Use PKGLOCALEDIR to determine location of installed locale files.
-+DATADIRNAME="${PKGLOCALEDIR}"
-+
- if test "x$MSGFMT" = "xno"; then
-    if test "x$GMSGFMT" = "xno"; then
-       AC_MSG_RESULT(I can't find gettext)
-@@ -179,6 +182,10 @@
-    LIBS="$LIBS -ldl"
+--- configure.in.orig	Tue Feb  6 20:26:38 2001
++++ configure.in	Sat Nov 30 13:49:28 2002
+@@ -180,6 +180,10 @@
     AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);] , have_dlopen=yes, , )
     LIBS="$save_LIBS"
-+
+ 
 +   if test "x$have_dlopen" != "yes"; then
 +      AC_TRY_LINK([#include <dlfcn.h>], [dlopen("huh",0);], have_dlopen=yes,, )
 +   fi
- 
++
     if test "x$have_dlopen" = "xyes"; then
        AC_DEFINE(ENABLE_PLUGINS)
+       AC_MSG_RESULT(ok, plugin support enabled)
diff --git a/comms/jpilot/patches/patch-ae b/comms/jpilot/patches/patch-ae
index ffbd00010ae..edba86a6a2d 100644
--- a/comms/jpilot/patches/patch-ae
+++ b/comms/jpilot/patches/patch-ae
@@ -1,18 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/09/21 07:14:04 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2002/11/30 13:36:14 salo Exp $
 
---- configure.orig	Tue Feb  6 11:31:18 2001
-+++ configure
-@@ -3633,6 +3633,9 @@ fi
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
- 
-+# Use PKGLOCALEDIR to determine location of installed locale files.
-+DATADIRNAME="${PKGLOCALEDIR}"
-+
- if test "x$MSGFMT" = "xno"; then
-    if test "x$GMSGFMT" = "xno"; then
-       echo "$ac_t""I can't find gettext" 1>&6
-@@ -3831,6 +3834,25 @@ fi
+--- configure.orig	Tue Feb  6 20:31:18 2001
++++ configure	Sat Nov 30 13:49:01 2002
+@@ -3831,6 +3831,25 @@
  rm -f conftest*
     LIBS="$save_LIBS"
  
@@ -38,7 +28,7 @@ $NetBSD: patch-ae,v 1.2 2002/09/21 07:14:04 jlam Exp $
     if test "x$have_dlopen" = "xyes"; then
        cat >> confdefs.h <<\EOF
  #define ENABLE_PLUGINS 1
-@@ -3866,7 +3888,7 @@ fi
+@@ -3866,7 +3885,7 @@
  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
  if test "${with_gtk_prefix+set}" = set; then
    withval="$with_gtk_prefix"