Attachment 171019 Details for Bug 209868 – patch4

[patch] patch4

gmake.patch (text/plain), 4.72 KB, created by Tijl Coosemans on 2016-06-04 18:49:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-06-04 18:49:44 UTC

Size: 4.72 KB

patch

obsolete

>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 415543)
>+++ devel/gmake/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gmake
>-PORTVERSION=	4.1
>-PORTREVISION=	2
>+PORTVERSION=	4.2
> CATEGORIES=	devel
> MASTER_SITES=	GNU/make
> DISTNAME=	make-${PORTVERSION}
>@@ -15,10 +14,14 @@ MAINTAINER=	tijl@FreeBSD.org
> COMMENT=	GNU version of 'make' utility
> 
> 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
> CPE_VENDOR=	gnu
>@@ -31,8 +34,6 @@ NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
> 			--with-libintl-prefix=${LOCALBASE}
> NLS_CONFIGURE_ENABLE=	nls
> 
>-CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
>-
> INFO=		make
> 
> .include <bsd.port.mk>
>Index: devel/gmake/distinfo
>===================================================================
>--- devel/gmake/distinfo	(revision 415543)
>+++ devel/gmake/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (make-4.1.tar.bz2) = 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
>-SIZE (make-4.1.tar.bz2) = 1327342
>+TIMESTAMP = 1464634898
>+SHA256 (make-4.2.tar.bz2) = 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f
>+SIZE (make-4.2.tar.bz2) = 1400539
>Index: devel/gmake/pkg-descr
>===================================================================
>--- devel/gmake/pkg-descr	(revision 415543)
>+++ devel/gmake/pkg-descr	(working copy)
>@@ -2,4 +2,4 @@ GNU make is a tool that controls the gen
> non-source files from source files.  Its purpose is the same as that
> of the utility make(1).
> 
>-WWW: http://www.gnu.org/software/make/make.html
>+WWW: https://www.gnu.org/software/make/
>Index: deskutils/tomboy/Makefile
>===================================================================
>--- deskutils/tomboy/Makefile	(revision 415543)
>+++ deskutils/tomboy/Makefile	(working copy)
>@@ -36,7 +36,7 @@ EVOLUTION_DESC=	Build evolution addin
> # Restrict to stable (even) versions, indicated by the second component.
> PORTSCOUT=	limitw:1,even
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MEVOLUTION}
> CONFIGURE_ARGS+=--enable-evolution
>@@ -51,5 +51,7 @@ PLIST_SUB+=	EVOLUTION="@comment "
> post-patch:
> 	@${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \
> 		${WRKSRC}/Tomboy/tomboy*.in
>+	@${REINPLACE_CMD} 's/(TARGET_NAME$$)/(TARGET_NAME)/' \
>+		${WRKSRC}/Tomboy/Makefile.in
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
>===================================================================
>--- devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile	(nonexistent)
>+++ devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile	(working copy)
>@@ -0,0 +1,15 @@
>+--- syntax/Makefile.orig	2011-12-08 04:46:54 UTC
>++++ syntax/Makefile
>+@@ -39,9 +39,9 @@ ifneq (${TYPECONV},)
>+ MAIN_TC := pa_deriving_tc.ml
>+ endif
>+ 
>+-CLASSES_CMO := $(patsubst %.ml,classes/%.cmo$,${CLASSES})
>+-CLASSES_CMX := $(patsubst %.ml,classes/%.cmx$,${CLASSES})
>+-CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps$,${CLASSES})
>++CLASSES_CMO := $(patsubst %.ml,classes/%.cmo,${CLASSES})
>++CLASSES_CMX := $(patsubst %.ml,classes/%.cmx,${CLASSES})
>++CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps,${CLASSES})
>+ 
>+ ${CLASSES_CMO} ${CLASSES_CMX} ${CLASSES_DEPS}: \
>+ 	LIBS+=-syntax camlp4o -package camlp4.quotations.o -I classes
>
>Property changes on: devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
>___________________________________________________________________
>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
>Index: games/0ad/files/patch-libraries__source__spidermonkey__build.sh
>===================================================================
>--- games/0ad/files/patch-libraries__source__spidermonkey__build.sh	(revision 415543)
>+++ games/0ad/files/patch-libraries__source__spidermonkey__build.sh	(working copy)
>@@ -1,6 +1,14 @@
>---- libraries/source/spidermonkey/build.sh.orig	2015-01-24 14:46:52 UTC
>+--- libraries/source/spidermonkey/build.sh.orig	2015-09-30 20:28:13 UTC
> +++ libraries/source/spidermonkey/build.sh
>-@@ -95,6 +95,14 @@ cd mozjs31/js/src
>+@@ -25,7 +25,6 @@ else
>+   MAKE=${MAKE:="make"}
>+ fi
>+ 
>+-MAKE_OPTS="${JOBS}"
>+ 
>+ CONF_OPTS="--enable-shared-js --enable-gcgenerational --disable-tests --without-intl-api" # --enable-trace-logging"
>+ 
>+@@ -82,6 +81,14 @@ cd js/src
>  rm -rf build-debug
>  rm -rf build-release
>

Actions: View | Diff

Attachments on bug 209868: 170838 | 170904 | 170975 | 171019