Attachment 163273 Details for Bug 204652 – patch

[patch] patch

flex.patch (text/plain), 5.80 KB, created by Yuri Victorovich on 2015-11-18 01:37:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-11-18 01:37:18 UTC

Size: 5.80 KB

patch

obsolete

>diff -ruN textproc/flex/Makefile textproc/flex/Makefile
>--- textproc/flex/Makefile	2015-11-17 17:30:11.284288000 -0800
>+++ textproc/flex/Makefile	2015-11-17 17:21:49.354737000 -0800
>@@ -1,36 +1,57 @@
> # $FreeBSD: head/textproc/flex/Makefile 366840 2014-09-01 07:26:14Z tijl $
> 
>-PORTNAME=	flex
>-PORTVERSION=	2.5.39
>-PORTREVISION=	2
>-CATEGORIES=	textproc
>-MASTER_SITES=	SF/${PORTNAME}
>-
>-MAINTAINER=	johans@FreeBSD.org
>-COMMENT=	Fast lexical analyzer generator
>-
>-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
>-		gm4:${PORTSDIR}/devel/m4
>-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
>+PORTNAME=		flex
>+PORTVERSION=		2.6.0
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=		textproc
>+
>+MAINTAINER=		johans@FreeBSD.org
>+COMMENT=		Fast lexical analyzer generator
>+
>+LICENSE=		BSD3CLAUSE
>+LICENSE_FILE=		${WRKSRC}/COPYING
>+
>+BUILD_DEPENDS=		help2man:${PORTSDIR}/misc/help2man \
>+			gm4:${PORTSDIR}/devel/m4
>+RUN_DEPENDS=		gm4:${PORTSDIR}/devel/m4
> 
>-USES=		bison gmake libtool makeinfo tar:bzip2
>-GNU_CONFIGURE=	yes
>+USE_GITHUB=		yes
>+GH_ACCOUNT=		westes
>+
>+USES=			autoreconf bison gmake libtool makeinfo tar:bzip2
>+GNU_CONFIGURE=		yes
> # install flex header to its own dir to avoid conflict with system flex.
>-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
>-CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="makeinfo --no-split"
>-INSTALL_TARGET=	install-strip
>-
>-INFO=		flex
>-
>-OPTIONS_DEFINE=	DOCS NLS
>-OPTIONS_SUB=	yes
>-NLS_USES=	gettext iconv
>+CONFIGURE_ARGS=		--includedir=${PREFIX}/include/flex --disable-shared
>+CONFIGURE_ENV=		M4=${LOCALBASE}/bin/gm4 MAKEINFO="makeinfo --no-split"
>+INSTALL_TARGET=		install-strip
>+
>+INFO=			flex
>+
>+OPTIONS_DEFINE=		DOCS NLS EXAMPLES
>+OPTIONS_SUB=		yes
>+NLS_USES=		gettext iconv
> NLS_CONFIGURE_ENABLE=	nls
>+DOCS_USE=		TEX=base:build,tex:build,dvipsk:build
>+DOCS_BUILD_DEPENDS+=	texi2dvi:${PORTSDIR}/print/texinfo
>+CFLAGS+=		-fPIC -DPIC
>+
>+.include <bsd.port.options.mk>
> 
> post-patch:	.SILENT
>-	${REINPLACE_CMD} -Ee 's/tests//' \
>-		-e '/mode=compile ..CC/s/\\$$/-fPIC -DPIC &/' \
>-		${WRKSRC}/Makefile.in
>-	${RM} -f ${WRKSRC}/doc/*.info*
>+	${REINPLACE_CMD} -e 's/^examples.*//g' \
>+		${WRKSRC}/configure.ac
>+	${REINPLACE_CMD} -e 's/tests \\/\\/' -e 's/examples \\/\\/' \
>+		${WRKSRC}/Makefile.am
>+.if !${PORT_OPTIONS:MDOCS}
>+	${REINPLACE_CMD} -e 's/^dist_doc_DATA/#dist_doc_DATA/' \
>+		${WRKSRC}/doc/Makefile.am
>+.endif
>+
>+post-install:
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
>+	@${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.am
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN textproc/flex/distinfo textproc/flex/distinfo
>--- textproc/flex/distinfo	2015-11-17 16:25:40.559075000 -0800
>+++ textproc/flex/distinfo	2015-11-17 11:50:31.585738000 -0800
>@@ -1,2 +1,2 @@
>-SHA256 (flex-2.5.39.tar.bz2) = add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f
>-SIZE (flex-2.5.39.tar.bz2) = 1612101
>+SHA256 (westes-flex-v2.6.0_GH0.tar.bz2) = cde6e46064a941a3810f7bbc612a2c39cb3aa29ce7eb775089c2515d0adfa7e9
>+SIZE (westes-flex-v2.6.0_GH0.tar.bz2) = 591320
>diff -ruN textproc/flex/pkg-plist textproc/flex/pkg-plist
>--- textproc/flex/pkg-plist	2015-11-17 16:25:40.598301000 -0800
>+++ textproc/flex/pkg-plist	2015-11-17 17:18:52.109567000 -0800
>@@ -9,7 +9,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/ONEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/flex.pdf
> %%NLS%%share/locale/ca/LC_MESSAGES/flex.mo
> %%NLS%%share/locale/da/LC_MESSAGES/flex.mo
>@@ -34,3 +33,48 @@
> %%NLS%%share/locale/vi/LC_MESSAGES/flex.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/flex.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/flex.mo
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debflex.awk
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/Makefile.am
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/mywc.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/wc1.l
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/wc2.l
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/wc3.l
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/wc4.l
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fastwc/wc5.l
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/ChangeLog
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/Makefile.am
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/Makefile.examples
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/cat.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/dates.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/datetest.dat
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/eof_rules.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/eof_test01.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/eof_test02.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/eof_test03.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/expr.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/expr.y
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/front.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/front.y
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/j2t.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/myname.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/myname.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/myname2.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/numbers.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/pas_include.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/pascal.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/reject.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/replace.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/string1.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/string2.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/strtest.dat
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/unput.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/user_act.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/userinit.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/wc.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/yymore.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/yymore2.lex
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manual/yymoretest.dat
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testxxLexer.l

Actions: View | Diff

Attachments on bug 204652: 163273 | 163274