Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/devel/gmake/Makefile	2002/11/28 10:04:36	1.37
+++ pkgsrc/devel/gmake/Makefile	2011/01/17 12:53:23	1.75
@@ -1,40 +1,65 @@
-# $NetBSD: Makefile,v 1.37 2002/11/28 10:04:36 tron Exp $
+# $NetBSD: Makefile,v 1.75 2011/01/17 12:53:23 is Exp $
 
-DISTNAME=       make-3.80
-PKGNAME=        gmake-3.80
+DISTNAME=	make-3.82
+PKGNAME=	g${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:=make/}
+MASTER_SITES=	${MASTER_SITE_GNU:=make/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/make/make.html
 COMMENT=	GNU version of 'make' utility
+LICENSE=	gnu-gpl-v3
 
-USE_BUILDLINK2=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--program-prefix="g"
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-TEXINFO_OVERRIDE=	YES
-TEXINFO_REQD=		4.0
-
-post-extract:
-	${MV} ${WRKSRC}/doc/make.texi ${WRKSRC}/doc/make.texi.orig
-	${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \
-	    < ${WRKSRC}/doc/make.texi.orig > ${WRKSRC}/doc/make.texi
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-post-install:
-	${CHMOD} g-s ${PREFIX}/bin/gmake
-	${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake
+GNU_CONFIGURE=		yes
+TEXINFO_REQD+=		4.0
+INFO_FILES=		yes
 
 # NOTE:  the 'test' target requires perl, but since gmake does
 # not otherwise require it, perl is not listed as an explicit
 # dependency
-test: build
-	cd ${WRKSRC} && \
-		${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/tests.log
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../mk/texinfo.mk"
+TEST_TARGET=		check
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GNU_PROGRAM_PREFIX)
+CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX:Q}
+.endif
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
+BUILD_DEFS+=		GNU_PROGRAM_PREFIX
+
+PLIST_VARS+=		gmake
+
+.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
+PLIST.gmake=		yes
+.endif
+
+PLIST_SRC=		${PKGDIR}/PLIST
+
+GMAKE_LOCALE?=		yes
+BUILD_DEFS+=		GMAKE_LOCALE
+MAKEFLAGS+=		GMAKE_LOCALE=${GMAKE_LOCALE:Q}
+.if !empty(GMAKE_LOCALE:M[yY][eE][sS])
+USE_PKGLOCALEDIR=		yes
+PLIST_SRC+=			${PKGDIR}/PLIST.locale
+USE_TOOLS+=			msgfmt
+.  include "../../devel/gettext-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-libintl
+CONFIGURE_ARGS+=	--without-libiconv
+.endif
+
+post-install:
+	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
+.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
+	${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake
+.endif
+
+USE_TOOLS+=perl
+
 .include "../../mk/bsd.pkg.mk"