diff options
Diffstat (limited to 'devel/gmake')
| -rw-r--r-- | devel/gmake/Makefile | 9 | ||||
| -rw-r--r-- | devel/gmake/distinfo | 2 | ||||
| -rw-r--r-- | devel/gmake/files/patch-aa | 18 | ||||
| -rw-r--r-- | devel/gmake/files/patch-ab | 6 | ||||
| -rw-r--r-- | devel/gmake/files/patch-gettext.c | 32 | ||||
| -rw-r--r-- | devel/gmake/pkg-plist | 9 |
6 files changed, 27 insertions, 49 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index ce8d5b070e51..3f4a864e315a 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gmake -PORTVERSION= 3.79.1 -PORTREVISION= 3 +PORTVERSION= 3.80 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= make @@ -15,11 +14,12 @@ DISTNAME= make-${PORTVERSION} MAINTAINER= ports@FreeBSD.org +USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g \ --with-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LOCALE_H -DHAVE_LC_MESSAGES" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" MAKEINFO="/usr/bin/makeinfo" MAN1= gmake.1 @@ -27,6 +27,9 @@ MAN1= gmake.1 .error You have `USE_GMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif +post-patch: + ${RM} ${WRKSRC}/doc/make.info* + # joerg@freebsd.org says our getloadavg() no longer requires setgid kmem post-install: diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index 8d801b874338..3246195df08e 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1 +1 @@ -MD5 (make-3.79.1.tar.gz) = 22ea95c125c7b80e04354d4ee4ae960d +MD5 (make-3.80.tar.bz2) = 0bbd1df101bc0294d440471e50feca71 diff --git a/devel/gmake/files/patch-aa b/devel/gmake/files/patch-aa index a4ee85a822cd..b037a724fb6a 100644 --- a/devel/gmake/files/patch-aa +++ b/devel/gmake/files/patch-aa @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Apr 5 11:23:54 2000 -+++ Makefile.in Tue Apr 25 17:27:41 2000 -@@ -72,7 +72,7 @@ - GLOBINC = @GLOBINC@ - GLOBLIB = @GLOBLIB@ - LIBOBJS = @LIBOBJS@ +--- doc/Makefile.in.orig Mon Oct 7 23:09:23 2002 ++++ doc/Makefile.in Mon Oct 7 23:09:31 2002 +@@ -76,7 +76,7 @@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split - MOFILES = @MOFILES@ - PACKAGE = @PACKAGE@ - PERL = @PERL@ + MAKE_HOST = @MAKE_HOST@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ diff --git a/devel/gmake/files/patch-ab b/devel/gmake/files/patch-ab index 4e02af526f68..4d7d9551e18b 100644 --- a/devel/gmake/files/patch-ab +++ b/devel/gmake/files/patch-ab @@ -1,6 +1,6 @@ ---- make.texinfo.orig Thu Sep 23 13:40:19 1999 -+++ make.texinfo Wed Dec 1 09:03:16 1999 -@@ -24,9 +24,9 @@ +--- doc/make.texi.orig Mon Oct 7 22:57:59 2002 ++++ doc/make.texi Mon Oct 7 22:58:03 2002 +@@ -25,9 +25,9 @@ @c Combine the program and concept indices: @syncodeindex pg cp diff --git a/devel/gmake/files/patch-gettext.c b/devel/gmake/files/patch-gettext.c deleted file mode 100644 index fd98d7e3604d..000000000000 --- a/devel/gmake/files/patch-gettext.c +++ /dev/null @@ -1,32 +0,0 @@ - -$FreeBSD$ - ---- gettext.c.orig Wed Feb 9 08:02:18 2000 -+++ gettext.c Sun Jul 28 04:22:31 2002 -@@ -22,6 +22,10 @@ - # include <config.h> - #endif - -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ - #ifdef __GNUC__ - # define alloca __builtin_alloca - # define HAVE_ALLOCA 1 -@@ -1294,6 +1298,15 @@ - { - FREE_BLOCKS (block_list); - return added; -+ } -+ if (string_space != new_pool) -+ { -+ size_t i; -+ for (i = 0; i < nmap; i++) -+ { -+ map[i].alias += new_pool - string_space; -+ map[i].value += new_pool - string_space; -+ } - } - string_space = new_pool; - string_space_max = new_size; diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist index a956421674fa..2a2b0baa601a 100644 --- a/devel/gmake/pkg-plist +++ b/devel/gmake/pkg-plist @@ -2,15 +2,22 @@ bin/gmake @unexec install-info --delete %D/info/make.info %D/info/dir info/make.info @exec install-info %D/info/make.info %D/info/dir +share/locale/da/LC_MESSAGES/make.mo share/locale/de/LC_MESSAGES/make.mo share/locale/es/LC_MESSAGES/make.mo share/locale/fr/LC_MESSAGES/make.mo -share/locale/ko/LC_MESSAGES/make.mo +share/locale/gl/LC_MESSAGES/make.mo +share/locale/he/LC_MESSAGES/make.mo +share/locale/hr/LC_MESSAGES/make.mo share/locale/ja/LC_MESSAGES/make.mo +share/locale/ko/LC_MESSAGES/make.mo share/locale/nl/LC_MESSAGES/make.mo share/locale/pl/LC_MESSAGES/make.mo share/locale/pt_BR/LC_MESSAGES/make.mo share/locale/ru/LC_MESSAGES/make.mo +share/locale/sv/LC_MESSAGES/make.mo +share/locale/tr/LC_MESSAGES/make.mo +share/locale/zh_CN/LC_MESSAGES/make.mo @unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/* 2>/dev/null || true @unexec rmdir %D/share/locale 2>/dev/null || true |