diff options
| author | salo <salo@pkgsrc.org> | 2002-12-01 16:25:56 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2002-12-01 16:25:56 +0000 |
| commit | f2a0c3d054b9559544bceb5b69df191caa2a8f3b (patch) | |
| tree | bb4150dfdc571ca894c7717238e6978989cbf554 /misc/gnome-utils | |
| parent | e51dc157648cd2f8e1d25173f2b42a0c3b0ed077 (diff) | |
| download | pkgsrc-f2a0c3d054b9559544bceb5b69df191caa2a8f3b.tar.gz | |
USE_PKGLOCALEDIR, remove unnecessary patch, delint.
Diffstat (limited to 'misc/gnome-utils')
| -rw-r--r-- | misc/gnome-utils/Makefile | 4 | ||||
| -rw-r--r-- | misc/gnome-utils/distinfo | 5 | ||||
| -rw-r--r-- | misc/gnome-utils/patches/patch-ac | 27 | ||||
| -rw-r--r-- | misc/gnome-utils/patches/patch-ad | 13 |
4 files changed, 5 insertions, 44 deletions
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index ba384bbc597..fc6120379cc 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,4 +1,4 @@ -## $NetBSD: Makefile,v 1.50 2002/11/02 02:42:04 rh Exp $ +## $NetBSD: Makefile,v 1.51 2002/12/01 16:25:56 salo Exp $ DISTNAME= gnome-utils-1.4.1 PKGREVISION= 3 @@ -15,9 +15,9 @@ BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools USE_GMAKE= YES USE_X11BASE= YES USE_BUILDLINK2= YES +USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} .include "../../textproc/scrollkeeper/buildlink2.mk" diff --git a/misc/gnome-utils/distinfo b/misc/gnome-utils/distinfo index d499448baf7..05c56b6fbf6 100644 --- a/misc/gnome-utils/distinfo +++ b/misc/gnome-utils/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.6 2001/12/12 16:20:48 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/12/01 16:25:56 salo 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) = 005b8705db1c6831728dafe48bfdf57bae608629 -SHA1 (patch-ad) = 80278c67121f6537c3cc9c5fe122b91c56ff1477 +SHA1 (patch-ac) = 628d3dbade2eb8e3a76dd670c5fd6a9f0df99134 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 e569af309db..15e1f3054c7 100644 --- a/misc/gnome-utils/patches/patch-ac +++ b/misc/gnome-utils/patches/patch-ac @@ -1,32 +1,7 @@ -$NetBSD: patch-ac,v 1.5 2001/12/12 16:20:49 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2002/12/01 16:25:57 salo Exp $ --- configure.orig Fri Oct 5 07:22:36 2001 +++ configure -@@ -5223,13 +5223,13 @@ - if { (eval echo configure:5224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - CATOBJEXT=.gmo -- DATADIRNAME=share -+ DATADIRNAME=${PKGLOCALEDIR} - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=${PKGLOCALEDIR} - fi - rm -f conftest* - INSTOBJEXT=.mo -@@ -5458,7 +5458,7 @@ - # We need to process the po/ directory. - POSUB=po - else -- DATADIRNAME=share -+ DATADIRNAME=${PKGLOCALEDIR} - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi @@ -6468,125 +6468,8 @@ fi diff --git a/misc/gnome-utils/patches/patch-ad b/misc/gnome-utils/patches/patch-ad deleted file mode 100644 index b9efe68e7f1..00000000000 --- a/misc/gnome-utils/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$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 -@@ -946,7 +946,7 @@ - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo -- DATADIRNAME=lib]) -+ DATADIRNAME=${PKGLOCALEDIR}]) - INSTOBJEXT=.mo - fi - fi |