Date: Fri, 30 Aug 2013 03:37:22 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325658 - in head/devel/as31: . files Message-ID: <201308300337.r7U3bMBG016264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Aug 30 03:37:22 2013 New Revision: 325658 URL: http://svnweb.freebsd.org/changeset/ports/325658 Log: - Unbreak parallel builds (-jX): their makefile has a "bison" rule which outputs two files and is triggered twice; use GNU make(1) with ordered prerequisites to avoid this race - Revert r143367 (and drop MAKE_ARGS) since we now need a patch anyways - While here, convert to OptionsNG, tighten COMMENT, sort the knobs, etc. - Reformat port description Reported by: marino Added: head/devel/as31/files/ - copied from r95187, head/devel/as31/files/ Modified: head/devel/as31/Makefile head/devel/as31/files/patch-Makefile (contents, props changed) head/devel/as31/pkg-descr Modified: head/devel/as31/Makefile ============================================================================== --- head/devel/as31/Makefile Fri Aug 30 02:06:44 2013 (r325657) +++ head/devel/as31/Makefile Fri Aug 30 03:37:22 2013 (r325658) @@ -9,28 +9,33 @@ MASTER_SITES= http://www.pjrc.com/tech/8 DISTNAME= ${PORTNAME}_beta3 MAINTAINER= ports@FreeBSD.org -COMMENT= A free 8051 assembler - -.ifndef(WITHOUT_X11) -USE_GNOME= gtk12 -PLIST_SUB+= X11="" -.else -ALL_TARGET= as31 -PLIST_SUB+= X11="@comment " -.endif -USES= bison +COMMENT= Free 8051 assembler +# GNU make(1) allows parallel (-jX) builds to work: we plug a race in +# "bison" rule (which outputs multiple files) via order prerequisites +# (see files/patch-Makefile) +USES= bison gmake WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" MAN1= as31.1 PLIST_FILES= bin/as31 %%X11%%bin/as31_gtk +OPTIONS_DEFINE= X11 +OPTIONS_SUB= yes + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} +USE_GNOME= gtk12 +.else +ALL_TARGET= as31 +.endif + do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/as31 ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/as31.1 ${MANPREFIX}/man/man1 -.ifndef(WITHOUT_X11) - @${INSTALL} ${WRKSRC}/as31_gtk ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/as31 ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/as31.1 ${MANPREFIX}/man/man1 +.if ${PORT_OPTIONS:MX11} + ${INSTALL_PROGRAM} ${WRKSRC}/as31_gtk ${PREFIX}/bin .endif .include <bsd.port.mk> Modified: head/devel/as31/files/patch-Makefile ============================================================================== --- head/devel/as31/files/patch-Makefile Sat Dec 6 13:26:11 2003 (r95187) +++ head/devel/as31/files/patch-Makefile Fri Aug 30 03:37:22 2013 (r325658) @@ -6,8 +6,19 @@ #Use this CFLAGS line with gcc on linux -CFLAGS=-O3 -Wall -CC=gcc -+#CFLAGS=-O3 -Wall -+#CC=gcc ++CFLAGS?=-O3 -Wall ++CC?=gcc #Use this CFLAGS line on solaris, etc #CFLAGS=-O +@@ -44,8 +44,9 @@ as31_gtk: $(OBJ) as31_gtk.o + chmod a+rx as31 + strip as31 + +-parser.c parser.h: parser.y ++parser.c: parser.y + bison -d -o parser.c parser.y ++parser.h: | parser.c + + as31_gtk.o: as31_gtk.c as31.h + $(CC) $(CFLAGS) `gtk-config --cflags` -c as31_gtk.c Modified: head/devel/as31/pkg-descr ============================================================================== --- head/devel/as31/pkg-descr Fri Aug 30 02:06:44 2013 (r325657) +++ head/devel/as31/pkg-descr Fri Aug 30 03:37:22 2013 (r325658) @@ -1,7 +1,7 @@ -AS31 is a free 8051 assembler originally written by Ken Stauffer. -Versions of AS31 found here include important bug fixes and added -features, such as standard intel-hex output format for use with -PAULMON2 and EPROM programmers. AS31 is a good tool for building -small 8051-based projects that are written in 100% 8051 assembly language. +AS31 is a free 8051 assembler originally written by Ken Stauffer. Versions +of AS31 found here include important bug fixes and added features, such as +standard intel-hex output format for use with PAULMON2 and EPROM programmers. +AS31 is a good tool for building small 8051-based projects that are written +in 100% 8051 assembly language. WWW: http://www.pjrc.com/tech/8051/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308300337.r7U3bMBG016264>