summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-12-12 16:20:48 +0000
committerwiz <wiz@pkgsrc.org>2001-12-12 16:20:48 +0000
commitec5a65751e4ef1ffef3d311e951fc6f3b8f422ff (patch)
tree1ae2af600368101233f22a731e2c6bc50bdf113a /misc
parent5c813d6a0ecc2b4305a3aabc4403edf2d99336a8 (diff)
downloadpkgsrc-ec5a65751e4ef1ffef3d311e951fc6f3b8f422ff.tar.gz
Use PKGLOCALEDIR. Use ncurses' and gettext-lib's buildlink.mks instead
of USE_CURSES and USE_LIBINTL. XXX: libgtop needs to provide a buildlink.mk before this package can be strongly buildlinked.
Diffstat (limited to 'misc')
-rw-r--r--misc/gnome-utils/Makefile15
-rw-r--r--misc/gnome-utils/distinfo6
-rw-r--r--misc/gnome-utils/patches/patch-ac8
-rw-r--r--misc/gnome-utils/patches/patch-ad4
4 files changed, 13 insertions, 20 deletions
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 6d2c8331de3..a2299e7f0ba 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.42 2001/10/13 08:30:25 rh Exp $
+## $NetBSD: Makefile,v 1.43 2001/12/12 16:20:48 wiz Exp $
DISTNAME= gnome-utils-1.4.1
CATEGORIES= misc x11 gnome
@@ -12,21 +12,14 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
DEPENDS+= libgtop>=1.0.12:../../devel/libgtop
-USE_CURSES= YES
USE_GMAKE= YES
-USE_LIBINTL= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${NEED_NCURSES} == "YES"
-CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE}
-CPPFLAGS+= -I${LOCALBASE}/include
-.endif
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
.include "../../devel/libglade/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/ncurses/buildlink.mk"
.include "../../x11/gnome-core/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/distinfo b/misc/gnome-utils/distinfo
index 2f1bfe3b81b..d499448baf7 100644
--- a/misc/gnome-utils/distinfo
+++ b/misc/gnome-utils/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2001/10/13 08:30:25 rh Exp $
+$NetBSD: distinfo,v 1.6 2001/12/12 16:20:48 wiz Exp $
SHA1 (gnome-utils-1.4.1.tar.gz) = a266e22838231ea7e6df5487d2787f33abe59961
Size (gnome-utils-1.4.1.tar.gz) = 4342060 bytes
SHA1 (patch-aa) = 27b24e4d80033c285cebde37e263583c4a9905af
SHA1 (patch-ab) = cf12496463e31f48c75caab18ffe4a93db8d5781
-SHA1 (patch-ac) = bc777253f3b87eecd7e10381bb8ad42d756f5230
-SHA1 (patch-ad) = 4a5732215858eab2c7ed1a0e14df2a6e4b3c8af7
+SHA1 (patch-ac) = 005b8705db1c6831728dafe48bfdf57bae608629
+SHA1 (patch-ad) = 80278c67121f6537c3cc9c5fe122b91c56ff1477
SHA1 (patch-af) = 60d22abb2c4c1813d51d90116901b543cf1be99a
SHA1 (patch-ag) = 96d31d113f8aa5ca3e881768e2395052d8c01fe6
SHA1 (patch-ah) = 9d4ceb307deb5123ac77330c5e9f94771ad88300
diff --git a/misc/gnome-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac
index a8689de671e..e569af309db 100644
--- a/misc/gnome-utils/patches/patch-ac
+++ b/misc/gnome-utils/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2001/10/13 08:30:25 rh Exp $
+$NetBSD: patch-ac,v 1.5 2001/12/12 16:20:49 wiz Exp $
--- configure.orig Fri Oct 5 07:22:36 2001
+++ configure
@@ -7,14 +7,14 @@ $NetBSD: patch-ac,v 1.4 2001/10/13 08:30:25 rh Exp $
rm -rf conftest*
CATOBJEXT=.gmo
- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
++ DATADIRNAME=${PKGLOCALEDIR}
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
-+ DATADIRNAME=${LOCALEDIR}
++ DATADIRNAME=${PKGLOCALEDIR}
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.4 2001/10/13 08:30:25 rh Exp $
POSUB=po
else
- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
++ DATADIRNAME=${PKGLOCALEDIR}
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
diff --git a/misc/gnome-utils/patches/patch-ad b/misc/gnome-utils/patches/patch-ad
index b8448e507eb..b9efe68e7f1 100644
--- a/misc/gnome-utils/patches/patch-ad
+++ b/misc/gnome-utils/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2001/02/13 11:47:03 tron Exp $
+$NetBSD: patch-ad,v 1.3 2001/12/12 16:20:50 wiz Exp $
--- aclocal.m4.orig Fri May 19 19:48:53 2000
+++ aclocal.m4 Thu Nov 9 20:56:05 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2001/02/13 11:47:03 tron Exp $
DATADIRNAME=share],
[CATOBJEXT=.mo
- DATADIRNAME=lib])
-+ DATADIRNAME=${LOCALEDIR}])
++ DATADIRNAME=${PKGLOCALEDIR}])
INSTOBJEXT=.mo
fi
fi