Date: Tue, 6 Aug 2013 15:44:38 +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: r324319 - in head/devel/tpasm: . files Message-ID: <201308061544.r76FicjN053388@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Aug 6 15:44:38 2013 New Revision: 324319 URL: http://svnweb.freebsd.org/changeset/ports/324319 Log: - Convert USE_GMAKE, drop currently no-op MAKE_JOBS_SAFE - Utilize new options framework for DOCS and EXAMPLES - Undo the damage done in r310483 (per ports/174183): restore the patch instead of hard-to-read in-place editing of Makefile; switch back to atomic, $cwd-agnostic INSTALL_* statements Pointyhat to: Kato's ports sweatshop lemmings Added: head/devel/tpasm/files/ - copied from r310482, head/devel/tpasm/files/ Modified: head/devel/tpasm/Makefile head/devel/tpasm/files/patch-Makefile Modified: head/devel/tpasm/Makefile ============================================================================== --- head/devel/tpasm/Makefile Tue Aug 6 15:23:12 2013 (r324318) +++ head/devel/tpasm/Makefile Tue Aug 6 15:44:38 2013 (r324319) @@ -13,33 +13,26 @@ COMMENT= Cross-assembler for variety of LICENSE= GPLv2 -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes +USES= gmake -PORTDOCS= * +PORTDOCS= CONVERSION_C166.TXT MANUAL.TXT README*.TXT PORTEXAMPLES= * -post-patch: - @${REINPLACE_CMD} -e \ - 's|-O2|| ; \ - s|CFLAGS=|CFLAGS+=| ; \ - s|$$(CC) -O|$$(CXX) $$(LDFLAGS)| ; \ - s|-lstdc++||' ${WRKSRC}/Makefile +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin @${MKDIR} ${PREFIX}/libdata/${PORTNAME} - (cd ${WRKSRC}/include \ - && ${INSTALL_DATA} * ${PREFIX}/libdata/${PORTNAME}) -.if !defined(NOPORTDOCS) + ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/libdata/${PORTNAME} +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} -.for i in CONVERSION_C166.TXT MANUAL.TXT README*.TXT - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) -.endfor + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} - (cd ${WRKSRC}/samples && ${INSTALL_DATA} * ${EXAMPLESDIR}) + ${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR} .endif .include <bsd.port.mk> Modified: head/devel/tpasm/files/patch-Makefile ============================================================================== --- head/devel/tpasm/files/patch-Makefile Wed Jan 16 08:16:20 2013 (r310482) +++ head/devel/tpasm/files/patch-Makefile Tue Aug 6 15:44:38 2013 (r324319) @@ -6,8 +6,24 @@ # error message lines. The default should be NO-WRAPPING. -OPTIONS=-O2 -Wall -x c++ -fmessage-length=0 -fno-exceptions -CFLAGS=$(INCLUDES) $(OPTIONS) -+OPTIONS=-x c++ -fmessage-length=0 -fno-exceptions -+CFLAGS+=$(INCLUDES) $(OPTIONS) ++OPTIONS=-fmessage-length=0 -fno-exceptions ++CXXFLAGS+=$(INCLUDES) $(OPTIONS) OBJECTS = \ globals.o \ +@@ -44,7 +44,7 @@ + all : tpasm + + tpasm : $(OBJECTS) +- $(CC) -O $(OBJECTS) -lstdc++ -o tpasm ++ $(CXX) $(OBJECTS) -o $@ + + clean : + rm -f *.o +@@ -58,5 +58,5 @@ + # suffix rules (this makes sure that the ".o" files + # end up in their respective directories on all systems) + .c.o: +- ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $< ++ ${CXX} ${CXXFLAGS} ${CPPFLAGS} -o $@ -c $< +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308061544.r76FicjN053388>