diff options
-rw-r--r-- | devel/gmake/Makefile | 9 | ||||
-rw-r--r-- | devel/gmake/PLIST.locale | 9 | ||||
-rw-r--r-- | devel/gmake/distinfo | 17 | ||||
-rw-r--r-- | devel/gmake/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ac | 6 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ad | 22 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ae | 18 | ||||
-rw-r--r-- | devel/gmake/patches/patch-af | 11 | ||||
-rw-r--r-- | devel/gmake/patches/patch-ag | 13 |
9 files changed, 31 insertions, 80 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 463315f4906..c1069b8e2a3 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2006/03/30 03:44:43 jlam Exp $ +# $NetBSD: Makefile,v 1.66 2006/04/02 20:10:51 wiz Exp $ -DISTNAME= make-3.80 -PKGNAME= gmake-3.80 -PKGREVISION= 5 +DISTNAME= make-3.81 +PKGNAME= g${DISTNAME} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -13,7 +12,7 @@ COMMENT= GNU version of 'make' utility PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -TEXINFO_REQD= 4.0 +TEXINFO_REQD+= 4.0 INFO_FILES= # PLIST # NOTE: the 'test' target requires perl, but since gmake does diff --git a/devel/gmake/PLIST.locale b/devel/gmake/PLIST.locale index ab5490589fb..151be5a7965 100644 --- a/devel/gmake/PLIST.locale +++ b/devel/gmake/PLIST.locale @@ -1,17 +1,24 @@ -@comment $NetBSD: PLIST.locale,v 1.1 2004/03/25 23:31:22 jlam Exp $ +@comment $NetBSD: PLIST.locale,v 1.2 2006/04/02 20:10:51 wiz Exp $ +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/id/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/make.mo +${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/make.mo diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index b6393491870..fb0ab9a13da 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.14 2006/03/16 18:36:44 jlam Exp $ +$NetBSD: distinfo,v 1.15 2006/04/02 20:10:51 wiz Exp $ -SHA1 (make-3.80.tar.gz) = 12cd7822d9cd7c1f12cc50df87366ec61915a277 -RMD160 (make-3.80.tar.gz) = c89488af208e5871d199857600f16e156de03cd7 -Size (make-3.80.tar.gz) = 1211924 bytes -SHA1 (patch-aa) = 43de674c2c3eca8f5119165c95fc1ff5a3b91b06 -SHA1 (patch-ac) = 6362dee903d013d4f1d0c3e81bd15107fe796a5b -SHA1 (patch-ad) = 7874662cb9345c4107fcc2aab7184ccd4c93090d -SHA1 (patch-ae) = 7baeabf65a5ceee682134edf90654c53bfb9ee11 -SHA1 (patch-af) = 40b0298a2b9d62ea127e07fcb317c1e38d86a35b -SHA1 (patch-ag) = 8aa14e44c82c8ac21085ad3c5e82b84b4447012e +SHA1 (make-3.81.tar.gz) = cd4fa5a3184176492bf0799593a8f250a728210c +RMD160 (make-3.81.tar.gz) = a713a72875cb9a29568677c98022465c6f55cbbf +Size (make-3.81.tar.gz) = 1564560 bytes +SHA1 (patch-aa) = ba88ee2175c7c2258fc647b3654b2f725cf75a50 +SHA1 (patch-ac) = de18956fde66fa3fc61a991bb3e6724d9c5b1eac +SHA1 (patch-af) = 067cac366694ce33e5bc52ef937603ae17d3bc2e diff --git a/devel/gmake/patches/patch-aa b/devel/gmake/patches/patch-aa index 0bab643bf6f..5b22d1fe0de 100644 --- a/devel/gmake/patches/patch-aa +++ b/devel/gmake/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2003/02/21 12:40:54 grant Exp $ +$NetBSD: patch-aa,v 1.10 2006/04/02 20:10:51 wiz Exp $ ---- make.h.orig Thu Sep 12 02:55:44 2002 +--- make.h.orig 2006-02-15 23:54:43.000000000 +0000 +++ make.h -@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */ +@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth # ifdef _AIX #pragma alloca # else diff --git a/devel/gmake/patches/patch-ac b/devel/gmake/patches/patch-ac index c229e125a25..0172fbb93e2 100644 --- a/devel/gmake/patches/patch-ac +++ b/devel/gmake/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2003/02/21 12:40:55 grant Exp $ +$NetBSD: patch-ac,v 1.5 2006/04/02 20:10:51 wiz Exp $ ---- glob/glob.c.orig Sat Jan 22 16:43:03 2000 +--- glob/glob.c.orig 2006-03-10 02:20:45.000000000 +0000 +++ glob/glob.c -@@ -215,13 +215,13 @@ my_realloc (p, n) +@@ -216,13 +216,13 @@ my_realloc (p, n) # ifdef HAVE_ALLOCA_H # include <alloca.h> # else /* Not HAVE_ALLOCA_H. */ diff --git a/devel/gmake/patches/patch-ad b/devel/gmake/patches/patch-ad deleted file mode 100644 index cb2e8d762f4..00000000000 --- a/devel/gmake/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2003/02/21 12:40:55 grant Exp $ - ---- glob/glob.h.orig Sat Jan 22 16:43:03 2000 -+++ glob/glob.h -@@ -47,6 +47,9 @@ extern "C" { - - /* We need `size_t' for the following definitions. */ - #ifndef __size_t -+#if defined __FreeBSD__ -+#define __size_t size_t -+#else - # if defined __GNUC__ && __GNUC__ >= 2 - typedef __SIZE_TYPE__ __size_t; - # else -@@ -59,6 +62,7 @@ typedef __SIZE_TYPE__ __size_t; - */ - #if !(defined __DECC && defined __SIZE_T) - typedef unsigned long int __size_t; -+#endif - #endif - # endif - #else diff --git a/devel/gmake/patches/patch-ae b/devel/gmake/patches/patch-ae deleted file mode 100644 index 29632981f93..00000000000 --- a/devel/gmake/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2002/10/16 00:21:22 dmcmahill Exp $ - ---- getopt.c.orig Tue Jan 25 02:42:51 2000 -+++ getopt.c -@@ -79,9 +79,13 @@ - # endif - #endif - -+#ifdef HAVE_GETTEXT -+#include <libintl.h> -+#else - /* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ - #include "gettext.h" -+#endif - #define _(msgid) gettext (msgid) - - diff --git a/devel/gmake/patches/patch-af b/devel/gmake/patches/patch-af index 500b25ce971..f8c66b27862 100644 --- a/devel/gmake/patches/patch-af +++ b/devel/gmake/patches/patch-af @@ -1,9 +1,10 @@ -$NetBSD: patch-af,v 1.1 2003/07/10 22:40:33 seb Exp $ +$NetBSD: patch-af,v 1.2 2006/04/02 20:10:51 wiz Exp $ ---- doc/make.info.orig 2003-07-10 21:57:52.000000000 +0000 +--- doc/make.info.orig 2006-04-01 06:41:04.000000000 +0000 +++ doc/make.info -@@ -1,8 +1,8 @@ - This is make.info, produced by makeinfo version 4.2 from make.texi. +@@ -23,9 +23,9 @@ Foundation, Inc. + modify this GNU Manual, like GNU software. Copies published by + the Free Software Foundation raise funds for GNU development." -INFO-DIR-SECTION GNU Packages +INFO-DIR-SECTION Programming & development tools @@ -12,4 +13,4 @@ $NetBSD: patch-af,v 1.1 2003/07/10 22:40:33 seb Exp $ +* GNU make: (make). Remake files automatically. END-INFO-DIR-ENTRY - This file documents the GNU Make utility, which determines + diff --git a/devel/gmake/patches/patch-ag b/devel/gmake/patches/patch-ag deleted file mode 100644 index 1e2fb18fe41..00000000000 --- a/devel/gmake/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/02/07 18:31:57 jlam Exp $ - ---- Makefile.in.orig 2002-10-03 22:56:12.000000000 -0400 -+++ Makefile.in -@@ -209,7 +209,7 @@ inst_group = @KMEM_GROUP@ - noinst_PROGRAMS = loadavg - loadavg_SOURCES = loadavg.c - loadavg_CFLAGS = -DTEST --loadavg_LDADD = @GETLOADAVG_LIBS@ -+loadavg_LDADD = @GETLOADAVG_LIBS@ @LIBINTL@ - - # > check-regression - # |