summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorsalo <salo>2002-12-01 16:25:56 +0000
committersalo <salo>2002-12-01 16:25:56 +0000
commit04d1e89078cb9e87acfe373a25395cd77b94bde4 (patch)
treebb4150dfdc571ca894c7717238e6978989cbf554 /misc
parent3d53f2aa85d40e7b5721fe98811373ff57445f1b (diff)
downloadpkgsrc-04d1e89078cb9e87acfe373a25395cd77b94bde4.tar.gz
USE_PKGLOCALEDIR, remove unnecessary patch, delint.
Diffstat (limited to 'misc')
-rw-r--r--misc/gnome-utils/Makefile4
-rw-r--r--misc/gnome-utils/distinfo5
-rw-r--r--misc/gnome-utils/patches/patch-ac27
-rw-r--r--misc/gnome-utils/patches/patch-ad13
-rw-r--r--misc/gperiodic/Makefile3
-rw-r--r--misc/gperiodic/PLIST14
-rw-r--r--misc/hitchhiker/Makefile9
-rw-r--r--misc/hitchhiker/PLIST4
-rw-r--r--misc/pinfo/Makefile3
-rw-r--r--misc/pinfo/PLIST12
-rw-r--r--misc/rpm/Makefile7
-rw-r--r--misc/rpm/PLIST22
12 files changed, 44 insertions, 79 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
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index a2d6492485c..660deb19e82 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/24 10:20:19 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/01 16:25:57 salo Exp $
#
DISTNAME= gperiodic-1.2.6
@@ -13,6 +13,7 @@ COMMENT= Displays a periodic table of the elements
BUILD_USES_MSGFMT= # defined
USE_BUILDLINK2= # defined
+USE_PKGLOCALEDIR= # defined
USE_X11BASE= # defined
USE_GMAKE= # defined
GNU_CONFIGURE= # defined
diff --git a/misc/gperiodic/PLIST b/misc/gperiodic/PLIST
index 021571c48fb..28d46ad9245 100644
--- a/misc/gperiodic/PLIST
+++ b/misc/gperiodic/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/01 16:25:57 salo Exp $
bin/gperiodic
man/man1/gperiodic.1
-share/locale/de/LC_MESSAGES/gperiodic.mo
-share/locale/es/LC_MESSAGES/gperiodic.mo
-share/locale/fr/LC_MESSAGES/gperiodic.mo
-share/locale/nl/LC_MESSAGES/gperiodic.mo
-share/locale/pt/LC_MESSAGES/gperiodic.mo
-share/locale/it/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gperiodic.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gperiodic.mo
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index 02e38b3a09c..30bf3b3441c 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/23 16:57:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/12/01 16:25:58 salo Exp $
#
DISTNAME= hh2000-0.6
@@ -11,9 +11,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://hirame.hiram.edu/~worleyam
COMMENT= Astronomical simulation and visualization program
-GNU_CONFIGURE= yes
-USE_X11BASE= yes
-USE_BUILDLINK2= yes
+GNU_CONFIGURE= yes
+USE_X11BASE= yes
+USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../graphics/glut/buildlink2.mk"
diff --git a/misc/hitchhiker/PLIST b/misc/hitchhiker/PLIST
index ee0f9b9d23c..baf8e9f031b 100644
--- a/misc/hitchhiker/PLIST
+++ b/misc/hitchhiker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 04:54:24 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/01 16:25:58 salo Exp $
bin/hh2000
share/gnome/apps/Applications/hh2000.desktop
share/hh2000/data/asteroids.csv
@@ -35,7 +35,7 @@ share/hh2000/maps/milkyway2.rgb
share/hh2000/maps/milkyway3.rgb
share/hh2000/maps/sunshine.rgb
share/hh2000/scripts/hhmoviebuilder.csh
-share/locale/es/LC_MESSAGES/hh2000.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/hh2000.mo
share/pixmaps/hh2000/asteroid.xpm
share/pixmaps/hh2000/comet.xpm
share/pixmaps/hh2000/loading.png
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 26f6b76a9af..73174e3430f 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/21 15:04:43 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/01 16:25:58 salo Exp $
#
DISTNAME= pinfo-0.6.1
@@ -12,6 +12,7 @@ COMMENT= Przemek's Info Viewer
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CPPFLAGS= -DDFLT_INFOPATH='\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\"'
diff --git a/misc/pinfo/PLIST b/misc/pinfo/PLIST
index da9258b3f6e..632d5d9c072 100644
--- a/misc/pinfo/PLIST
+++ b/misc/pinfo/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/01 16:25:58 salo Exp $
bin/pinfo
@unexec ${INSTALL_INFO} --delete %D/info/pinfo.info %D/info/dir
info/pinfo.info
@exec ${INSTALL_INFO} %D/info/pinfo.info %D/info/dir
man/man1/pinfo.1
-share/locale/cs/LC_MESSAGES/pinfo.mo
-share/locale/de/LC_MESSAGES/pinfo.mo
-share/locale/pl/LC_MESSAGES/pinfo.mo
-share/locale/ru/LC_MESSAGES/pinfo.mo
-share/locale/sv/LC_MESSAGES/pinfo.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/pinfo.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pinfo.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/pinfo.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/pinfo.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/pinfo.mo
share/examples/pinforc
@exec if [ ! -f %D/etc/pinforc ]; then cp %D/share/examples/pinforc %D/etc/; fi
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 52f2c3c0db8..ebe7f323518 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/10/20 23:19:40 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2002/12/01 16:25:58 salo Exp $
#
DISTNAME= rpm-2.5.4
@@ -10,11 +10,12 @@ MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.rpm.org/
COMMENT= The Red Hat Package Manager
-CONFLICTS+= rpm2cpio<1.0nb1
-
BUILD_USES_MSGFMT= yes
+CONFLICTS+= rpm2cpio<1.0nb1
+
USE_BUILDLINK2= yes
+USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/rpm/PLIST b/misc/rpm/PLIST
index d491631b94d..2a7a90dfc66 100644
--- a/misc/rpm/PLIST
+++ b/misc/rpm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/20 23:20:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/01 16:25:58 salo Exp $
bin/gendiff
bin/rpm
bin/rpm2cpio
@@ -14,15 +14,15 @@ lib/rpm/rpmpopt
lib/rpm/rpmrc
man/man8/rpm.8
man/man8/rpm2cpio.8
-share/locale/cs/LC_MESSAGES/rpm.mo
-share/locale/de/LC_MESSAGES/rpm.mo
-share/locale/fi/LC_MESSAGES/rpm.mo
-share/locale/fr/LC_MESSAGES/rpm.mo
-share/locale/pt_BR/LC_MESSAGES/rpm.mo
-share/locale/ru/LC_MESSAGES/rpm.mo
-share/locale/sk/LC_MESSAGES/rpm.mo
-share/locale/sr/LC_MESSAGES/rpm.mo
-share/locale/sv/LC_MESSAGES/rpm.mo
-share/locale/tr/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/rpm.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/rpm.mo
@unexec ${RMDIR} -p %D/lib/rpm 2>/dev/null || ${TRUE}
@dirrm include/rpm