Attachment 171952 Details for Bug 210623 – patch3

[patch] patch3

gmake.patch (text/plain), 7.45 KB, created by Tijl Coosemans on 2016-06-29 16:43:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-06-29 16:43:25 UTC

Size: 7.45 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 417778)
>+++ MOVED	(working copy)
>@@ -8374,3 +8374,4 @@ graphics/linux-c6-dri-compat|graphics/li
> security/py-letsencrypt|security/py-certbot|2016-06-23|The LetsEncrypt project has renamed the utility
> textproc/py-beautifulsoup4|www/py-beautifulsoup|2016-06-26|Duplicate port deleted
> textproc/kibana42|textproc/kibana45|2016-06-27|Has expired: not actively supported - use kibana 4.5 (textproc/kibana45) instead
>+devel/gmake-lite|devel/gmake|2016-06-29|No longer needed
>Index: Mk/Uses/gmake.mk
>===================================================================
>--- Mk/Uses/gmake.mk	(revision 417708)
>+++ Mk/Uses/gmake.mk	(working copy)
>@@ -3,7 +3,7 @@
> # Provide support to use the GNU make
> #
> # Feature:		gmake
>-# Usage:		USES=gmake[:lite]
>+# Usage:		USES=gmake
> #
> # MAINTAINER: portmgr@FreeBSD.org
> 
>@@ -11,19 +11,11 @@
> _INCLUDE_USES_GMAKE_MK=	yes
> 
> .if !empty(gmake_ARGS)
>-.if ${gmake_ARGS} == lite
>-_GMAKE_EXT=	-lite
>-.else
>-IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument: lite
>-.endif
>-.endif
>-
>-.if defined(DIET)
>-_GMAKE_EXT=	-lite
>+IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
> .endif
> 
>-BUILD_DEPENDS+=		gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT}
>-CONFIGURE_ENV+=		MAKE=gmake${_GMAKE_EXT}
>-MAKE_CMD=		gmake${_GMAKE_EXT}
>+BUILD_DEPENDS+=		gmake:devel/gmake
>+CONFIGURE_ENV+=		MAKE=gmake
>+MAKE_CMD=		gmake
> 
> .endif
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 417708)
>+++ devel/Makefile	(working copy)
>@@ -706,7 +706,6 @@
>     SUBDIR += glrparser
>     SUBDIR += glui
>     SUBDIR += gmake
>-    SUBDIR += gmake-lite
>     SUBDIR += gnatcoll
>     SUBDIR += gnatpython
>     SUBDIR += gnome-builder
>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 417708)
>+++ devel/gmake/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gmake
> PORTVERSION=	4.2.1
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	GNU/make
> DISTNAME=	make-${PORTVERSION}
>@@ -19,11 +20,10 @@ 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 makeinfo tar:bzip2
>+USES=		cpe tar:bzip2
> CPE_VENDOR=	gnu
> 
> OPTIONS_DEFINE=	NLS
>Index: devel/gmake/files/patch-doc_make.text
>===================================================================
>--- devel/gmake/files/patch-doc_make.text	(revision 417708)
>+++ devel/gmake/files/patch-doc_make.text	(nonexistent)
>@@ -1,7 +0,0 @@
>---- doc/make.texi.orig	2010-07-19 02:10:54.000000000 -0500
>-+++ doc/make.texi	2011-03-02 17:01:58.000000000 -0600
>-@@ -54,3 +54,3 @@
>- @direntry
>--* Make: (make).            Remake files automatically.
>-+* GNU Make: (make).            Remake files automatically.
>- @end direntry
>
>Property changes on: devel/gmake/files/patch-doc_make.text
>___________________________________________________________________
>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/Makefile
>===================================================================
>--- devel/gmake-lite/Makefile	(revision 417708)
>+++ devel/gmake-lite/Makefile	(nonexistent)
>@@ -1,37 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	make
>-PORTVERSION=	4.2.1
>-CATEGORIES=	devel ports-mgmt
>-MASTER_SITES=	GNU
>-PKGNAMEPREFIX=	g
>-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=
>-
>-USES=	cpe tar:bzip2
>-CPE_VENDOR=	gnu
>-
>-PLIST_FILES=	bin/gmake-lite \
>-		man/man1/gmake-lite.1.gz
>-
>-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
>-
>-.include <bsd.port.mk>
>
>Property changes on: devel/gmake-lite/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ 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/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/slibtool/Makefile
>===================================================================
>--- devel/slibtool/Makefile	(revision 417708)
>+++ devel/slibtool/Makefile	(working copy)
>@@ -12,7 +12,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING.SLIBTOOL
> 
> HAS_CONFIGURE=	yes
>-USES=		gmake:lite tar:xz
>+USES=		gmake tar:xz
> 
> post-patch:
> 	${REINPLACE_CMD} -e "s/make/${MAKE_CMD}/g" ${WRKSRC}/configure
>Index: misc/help2man/Makefile
>===================================================================
>--- misc/help2man/Makefile	(revision 417708)
>+++ misc/help2man/Makefile	(working copy)
>@@ -17,8 +17,7 @@ OPTIONS_DEFINE=	NLS
> 
> LIBS+=		-L${LOCALBASE}/lib
> GNU_CONFIGURE=	yes
>-# keep gmake:lite has a dependency to avoid circular dependency
>-USES=		gmake:lite perl5
>+USES=		gmake perl5
> 
> INFO=		${PORTNAME}
> PLIST_FILES=	bin/${PORTNAME} \
>Index: print/texinfo/Makefile
>===================================================================
>--- print/texinfo/Makefile	(revision 417708)
>+++ print/texinfo/Makefile	(working copy)
>@@ -25,10 +25,10 @@ NLS_CONFIGURE_ENABLE=	nls
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install install-tex
> PKGDEINSTALL=	${PKGINSTALL}
>-USES+=		charsetfix cpe gmake:lite ncurses perl5 tar:xz
>+USES+=		charsetfix cpe gmake ncurses perl5 tar:xz
> 
> MAKE_ARGS=	TEXMF=${LOCALBASE}/${TEXMF} PERL=${LOCALBASE}/bin/perl
>-INFO=		texinfo info-stnd info
>+INFO=		texinfo info-stnd
> CPE_VENDOR=	gnu
> CPE_VERSION=	${PORTVERSION:R}
>

Actions: View | Diff

Attachments on bug 210623: 171864 | 171911 | 171952