Attachment #171911 for bug #210623




.endif
.endif

.if !exists(${LOCALBASE}/include/gnumake.h)
_GMAKE_EXT=	-lite
.endif

BUILD_DEPENDS+=		gmake${_GMAKE_EXT}>=4.2.1_1:devel/gmake${_GMAKE_EXT}
CONFIGURE_ENV+=		MAKE=gmake
MAKE_CMD=		gmake

.endif




# Created by: jkh
# $FreeBSD$

PORTNAME=	make
PORTVERSION=	4.2.1
PORTREVISION?=	1	# also gmake-lite
CATEGORIES=	devel
MASTER_SITES=	GNU/make
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 Make

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	yes
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 tar:bzip2
CPE_VENDOR=	gnu
.if empty(PKGNAMESUFFIX)
USES+=		makeinfo
INFO=		make
.endif

OPTIONS_DEFINE=	NLS
OPTIONS_SUB=	yes

			--with-libintl-prefix=${LOCALBASE}
NLS_CONFIGURE_ENABLE=	nls

INFO=		make

.include <bsd.port.mk>

Lines 26-28 include/gnumake.h Link Here

(-)devel/gmake/pkg-plist (+1 lines)
26	%%NLS%%share/locale/vi/LC_MESSAGES/make.mo	26	%%NLS%%share/locale/vi/LC_MESSAGES/make.mo
27	%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo	27	%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
28	man/man1/gmake.1.gz	28	man/man1/gmake.1.gz
		29	@postunexec [ ! -f %D/bin/gmake-lite ] \|\| ln -sf gmake-lite %D/bin/gmake




# $FreeBSD$

PORTREVISION=	1
PORTVERSION=	4.2.1
CATEGORIES=	devel ports-mgmt
MASTER_SITES=	GNU
PKGNAMEPREFIX=	g
PKGNAMESUFFIX=	-lite

MASTERDIR=	${.CURDIR}/../gmake
PLIST=		${.CURDIR}/pkg-plist

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=

CONFIGURE_ARGS=	--disable-nls --program-suffix=-lite
CPE_VENDOR=	gnu

OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
		man/man1/gmake-lite.1.gz

post-patch:
	@${REINPLACE_CMD} 's/ doc / /' ${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

.include "${MASTERDIR}/Makefile"

Lines 1-3 Link Here

(-)devel/gmake-lite/distinfo (-3 lines)
1	TIMESTAMP = 1466116939
2	SHA256 (make-4.2.1.tar.bz2) = d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
3	SIZE (make-4.2.1.tar.bz2) = 1407126

Lines 1-3 Link Here

(-)devel/gmake-lite/pkg-descr (-3 lines)
1	Minimalistic version of GNU make
2
3	WWW: http://www.gnu.org/software/make/make.html

Line 0 Link Here

(-)devel/gmake-lite/pkg-plist (+5 lines)
	1	bin/gmake-lite
	2	@comment include/gnumake.h
	3	man/man1/gmake-lite.1.gz
	4	@postexec [ -f %D/bin/gmake ] \|\| ln -sf gmake-lite %D/bin/gmake
	5	@preunexec [ ! -L %D/bin/gmake ] \|\| rm -f %D/bin/gmake

Return to bug 210623

Lines 18-29 IGNORE= Incorrect 'USES+= gmake:${gmake_ Link Here

(-)Mk/Uses/gmake.mk (-4 / +4 lines)
18	.endif	18	.endif
19	.endif	19	.endif
20		20
21	.if defined(DIET)	21	.if !exists(${LOCALBASE}/include/gnumake.h)
22	_GMAKE_EXT= -lite	22	_GMAKE_EXT= -lite
23	.endif	23	.endif
24		24
25	BUILD_DEPENDS+= gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT}	25	BUILD_DEPENDS+= gmake${_GMAKE_EXT}>=4.2.1_1:devel/gmake${_GMAKE_EXT}
26	CONFIGURE_ENV+= MAKE=gmake${_GMAKE_EXT}	26	CONFIGURE_ENV+= MAKE=gmake
27	MAKE_CMD= gmake${_GMAKE_EXT}	27	MAKE_CMD= gmake
28		28
29	.endif	29	.endif

Lines 1-30 Link Here

(-)devel/gmake/Makefile (-7 / +10 lines)
1	# Created by: jkh	1	# Created by: jkh
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gmake	4	PORTNAME= make
5	PORTVERSION= 4.2.1	5	PORTVERSION= 4.2.1
		6	PORTREVISION?= 1 # also gmake-lite
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= GNU/make	8	MASTER_SITES= GNU/make
8	DISTNAME= make-${PORTVERSION}	9	PKGNAMEPREFIX= g
9		10
10	# note: before committing to this port, contact portmgr to arrange for an	11	# note: before committing to this port, contact portmgr to arrange for an
11	# experimental ports run. Untested commits may be backed out at portmgr's	12	# experimental ports run. Untested commits may be backed out at portmgr's
12	# discretion.	13	# discretion.
13	MAINTAINER= tijl@FreeBSD.org	14	MAINTAINER= tijl@FreeBSD.org
14	COMMENT= GNU version of 'make' utility	15	COMMENT= GNU Make
15		16
16	LICENSE= GPLv3	17	LICENSE= GPLv3
17	LICENSE_FILE= ${WRKSRC}/COPYING	18	LICENSE_FILE= ${WRKSRC}/COPYING
18		19
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --program-prefix=g \	21	CONFIGURE_ARGS+=--program-prefix=g \
21	--without-guile	22	--without-guile
22	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	23	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
23	# fmake does not like PO_DEPENDS_ON_POT being undefined	24	# fmake does not like PO_DEPENDS_ON_POT being undefined
24	MAKE_ARGS= PO_DEPENDS_ON_POT=	25	MAKE_ARGS= PO_DEPENDS_ON_POT=
25		26
26	USES= cpe makeinfo tar:bzip2	27	USES= cpe tar:bzip2
27	CPE_VENDOR= gnu	28	CPE_VENDOR= gnu
		29	.if empty(PKGNAMESUFFIX)
		30	USES+= makeinfo
		31	INFO= make
		32	.endif
28		33
29	OPTIONS_DEFINE= NLS	34	OPTIONS_DEFINE= NLS
30	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
Lines 34-39 NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} Link Here
34	--with-libintl-prefix=${LOCALBASE}	39	--with-libintl-prefix=${LOCALBASE}
35	NLS_CONFIGURE_ENABLE= nls	40	NLS_CONFIGURE_ENABLE= nls
36		41
37	INFO= make
38
39	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-37 Link Here

(-)devel/gmake-lite/Makefile (-28 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= make	3	PORTREVISION= 1
4	PORTVERSION= 4.2.1
5	CATEGORIES= devel ports-mgmt
6	MASTER_SITES= GNU
7	PKGNAMEPREFIX= g
8	PKGNAMESUFFIX= -lite	4	PKGNAMESUFFIX= -lite
9		5
10	MAINTAINER= bapt@FreeBSD.org	6	MASTERDIR= ${.CURDIR}/../gmake
11	COMMENT= Minimalist version of gnu make	7	PLIST= ${.CURDIR}/pkg-plist
12
13	LICENSE= GPLv3
14	LICENSE_FILE= ${WRKSRC}/COPYING
15
16	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS+= --program-prefix=g \
18	--program-suffix=-lite \
19	--without-guile \
20	--disable-nls
21	# fmake does not like PO_DEPENDS_ON_POT being undefined
22	MAKE_ARGS= PO_DEPENDS_ON_POT=
23		8
24	USES= cpe tar:bzip2	9	CONFIGURE_ARGS= --disable-nls --program-suffix=-lite
25	CPE_VENDOR= gnu
26		10
27	PLIST_FILES= bin/gmake-lite \	11	OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
28	man/man1/gmake-lite.1.gz
29		12
30	post-patch:	13	post-patch:
31	${REINPLACE_CMD} -e "s/ doc / /g" ${WRKSRC}/Makefile.in	14	@${REINPLACE_CMD} 's/ doc / /' ${WRKSRC}/Makefile.in
32
33	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/make ${STAGEDIR}${PREFIX}/bin/gmake-lite
35	${INSTALL_MAN} ${WRKSRC}/make.1 ${STAGEDIR}${PREFIX}/man/man1/gmake-lite.1
36		15
37	.include <bsd.port.mk>	16	.include "${MASTERDIR}/Makefile"