Attachment 171911 Details for Bug 210623 – patch2

[patch] patch2

gmake.patch (text/plain), 5.61 KB, created by Tijl Coosemans on 2016-06-28 14:45:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-06-28 14:45:05 UTC

Size: 5.61 KB

patch

obsolete

>Index: Mk/Uses/gmake.mk
>===================================================================
>--- Mk/Uses/gmake.mk	(revision 417708)
>+++ Mk/Uses/gmake.mk	(working copy)
>@@ -18,12 +18,12 @@ IGNORE=	Incorrect 'USES+= gmake:${gmake_
> .endif
> .endif
> 
>-.if defined(DIET)
>+.if !exists(${LOCALBASE}/include/gnumake.h)
> _GMAKE_EXT=	-lite
> .endif
> 
>-BUILD_DEPENDS+=		gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT}
>-CONFIGURE_ENV+=		MAKE=gmake${_GMAKE_EXT}
>-MAKE_CMD=		gmake${_GMAKE_EXT}
>+BUILD_DEPENDS+=		gmake${_GMAKE_EXT}>=4.2.1_1:devel/gmake${_GMAKE_EXT}
>+CONFIGURE_ENV+=		MAKE=gmake
>+MAKE_CMD=		gmake
> 
> .endif
>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 417708)
>+++ devel/gmake/Makefile	(working copy)
>@@ -1,30 +1,35 @@
> # Created by: jkh
> # $FreeBSD$
> 
>-PORTNAME=	gmake
>+PORTNAME=	make
> PORTVERSION=	4.2.1
>+PORTREVISION?=	1	# also gmake-lite
> CATEGORIES=	devel
> MASTER_SITES=	GNU/make
>-DISTNAME=	make-${PORTVERSION}
>+PKGNAMEPREFIX=	g
> 
> # note: before committing to this port, contact portmgr to arrange for an
> # experimental ports run.  Untested commits may be backed out at portmgr's
> # discretion.
> MAINTAINER=	tijl@FreeBSD.org
>-COMMENT=	GNU version of 'make' utility
>+COMMENT=	GNU Make
> 
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--program-prefix=g \
>+CONFIGURE_ARGS+=--program-prefix=g \
> 		--without-guile
> CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
> # fmake does not like PO_DEPENDS_ON_POT being undefined
> MAKE_ARGS=	PO_DEPENDS_ON_POT=
> 
>-USES=		cpe makeinfo tar:bzip2
>+USES=		cpe tar:bzip2
> CPE_VENDOR=	gnu
>+.if empty(PKGNAMESUFFIX)
>+USES+=		makeinfo
>+INFO=		make
>+.endif
> 
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
>@@ -34,6 +39,4 @@ NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
> 			--with-libintl-prefix=${LOCALBASE}
> NLS_CONFIGURE_ENABLE=	nls
> 
>-INFO=		make
>-
> .include <bsd.port.mk>
>Index: devel/gmake/pkg-plist
>===================================================================
>--- devel/gmake/pkg-plist	(revision 417708)
>+++ devel/gmake/pkg-plist	(working copy)
>@@ -26,3 +26,4 @@ include/gnumake.h
> %%NLS%%share/locale/vi/LC_MESSAGES/make.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
> man/man1/gmake.1.gz
>+@postunexec [ ! -f %D/bin/gmake-lite ] || ln -sf gmake-lite %D/bin/gmake
>Index: devel/gmake-lite/Makefile
>===================================================================
>--- devel/gmake-lite/Makefile	(revision 417708)
>+++ devel/gmake-lite/Makefile	(working copy)
>@@ -1,37 +1,16 @@
> # $FreeBSD$
> 
>-PORTNAME=	make
>-PORTVERSION=	4.2.1
>-CATEGORIES=	devel ports-mgmt
>-MASTER_SITES=	GNU
>-PKGNAMEPREFIX=	g
>+PORTREVISION=	1
> PKGNAMESUFFIX=	-lite
> 
>-MAINTAINER=	bapt@FreeBSD.org
>-COMMENT=	Minimalist version of gnu make
>-
>-LICENSE=	GPLv3
>-LICENSE_FILE=	${WRKSRC}/COPYING
>-
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--program-prefix=g \
>-			--program-suffix=-lite \
>-			--without-guile \
>-			--disable-nls
>-# fmake does not like PO_DEPENDS_ON_POT being undefined
>-MAKE_ARGS=	PO_DEPENDS_ON_POT=
>+MASTERDIR=	${.CURDIR}/../gmake
>+PLIST=		${.CURDIR}/pkg-plist
> 
>-USES=	cpe tar:bzip2
>-CPE_VENDOR=	gnu
>+CONFIGURE_ARGS=	--disable-nls --program-suffix=-lite
> 
>-PLIST_FILES=	bin/gmake-lite \
>-		man/man1/gmake-lite.1.gz
>+OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
> 
> post-patch:
>-	${REINPLACE_CMD} -e "s/ doc / /g" ${WRKSRC}/Makefile.in
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/make ${STAGEDIR}${PREFIX}/bin/gmake-lite
>-	${INSTALL_MAN} ${WRKSRC}/make.1 ${STAGEDIR}${PREFIX}/man/man1/gmake-lite.1
>+	@${REINPLACE_CMD} 's/ doc / /' ${WRKSRC}/Makefile.in
> 
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: devel/gmake-lite/distinfo
>===================================================================
>--- devel/gmake-lite/distinfo	(revision 417708)
>+++ devel/gmake-lite/distinfo	(nonexistent)
>@@ -1,3 +0,0 @@
>-TIMESTAMP = 1466116939
>-SHA256 (make-4.2.1.tar.bz2) = d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
>-SIZE (make-4.2.1.tar.bz2) = 1407126
>
>Property changes on: devel/gmake-lite/distinfo
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/gmake-lite/pkg-descr
>===================================================================
>--- devel/gmake-lite/pkg-descr	(revision 417708)
>+++ devel/gmake-lite/pkg-descr	(nonexistent)
>@@ -1,3 +0,0 @@
>-Minimalistic version of GNU make
>-
>-WWW: http://www.gnu.org/software/make/make.html
>
>Property changes on: devel/gmake-lite/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/gmake-lite/pkg-plist
>===================================================================
>--- devel/gmake-lite/pkg-plist	(nonexistent)
>+++ devel/gmake-lite/pkg-plist	(working copy)
>@@ -0,0 +1,5 @@
>+bin/gmake-lite
>+@comment include/gnumake.h
>+man/man1/gmake-lite.1.gz
>+@postexec [ -f %D/bin/gmake ] || ln -sf gmake-lite %D/bin/gmake
>+@preunexec [ ! -L %D/bin/gmake ] || rm -f %D/bin/gmake
>
>Property changes on: devel/gmake-lite/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 210623: 171864 | 171911 | 171952