From owner-svn-ports-all@FreeBSD.ORG Thu Mar 19 18:57:41 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D34DEA0B; Thu, 19 Mar 2015 18:57:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3A8F61F; Thu, 19 Mar 2015 18:57:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JIvfhb014315; Thu, 19 Mar 2015 18:57:41 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JIvfA4014313; Thu, 19 Mar 2015 18:57:41 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503191857.t2JIvfA4014313@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 19 Mar 2015 18:57:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381672 - in head/emulators/dtcyber: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 18:57:41 -0000 Author: marino Date: Thu Mar 19 18:57:40 2015 New Revision: 381672 URL: https://svnweb.freebsd.org/changeset/ports/381672 QAT: https://qat.redports.org/buildarchive/r381672/ Log: emulators/dtcyber: Make jobs safe Another example of "all" target containing a "clean" target that seems to have removed object files after they were built. While here, get rid of weird "pre-patch" target since we are patching Makefile.x11 anyway. We can handle some of that substituion with flags. Added: head/emulators/dtcyber/files/patch-Makefile.x11 (contents, props changed) Modified: head/emulators/dtcyber/Makefile Modified: head/emulators/dtcyber/Makefile ============================================================================== --- head/emulators/dtcyber/Makefile Thu Mar 19 18:55:05 2015 (r381671) +++ head/emulators/dtcyber/Makefile Thu Mar 19 18:57:40 2015 (r381672) @@ -18,15 +18,12 @@ USE_XORG= x11 NO_WRKSUBDIR= yes INSTALL_TARGET= MAKEFILE= Makefile.x11 +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message PLIST_FILES= bin/dtcyber %%EXAMPLESDIR%%/cyber.ini %%EXAMPLESDIR%%/cos.tap -pre-patch: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|CFLAGS = -O2|CFLAGS+= |' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.x11 - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dtcyber ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Added: head/emulators/dtcyber/files/patch-Makefile.x11 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/dtcyber/files/patch-Makefile.x11 Thu Mar 19 18:57:40 2015 (r381672) @@ -0,0 +1,27 @@ +--- Makefile.x11.orig 2015-03-19 18:46:41 UTC ++++ Makefile.x11 +@@ -9,14 +9,8 @@ + # + #-------------------------------------------------------------------------- + +-#LIBS = -lm -lX11 -lpthreads + LIBS = -lm -lX11 -lpthread +-#LIBS = -lm -lX11 +-LDFLAGS = -s -L/usr/X11R6/lib +-INCL = -I/usr/X11R6/include +- +-#CFLAGS = -O2 -I. $(INCL) -Wall -Wshadow -Wpointer-arith -Wmissing-prototypes +-CFLAGS = -O2 -I. $(INCL) ++CFLAGS+= -I. + + OBJS = main.o window_x11.o init.o trace.o charset.o dump.o \ + device.o channel.o cpu.o pp.o float.o shift.o operator.o \ +@@ -26,7 +20,7 @@ OBJS = main.o window_x11.o init.o tra + dtcyber: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + +-all: clean dtcyber ++all: dtcyber + + clean: + rm -f *.o