Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2014 22:22:55 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341128 - head/graphics/xpaint/files
Message-ID:  <201401252222.s0PMMteg051777@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Sat Jan 25 22:22:54 2014
New Revision: 341128
URL: http://svnweb.freebsd.org/changeset/ports/341128
QAT: https://qat.redports.org/buildarchive/r341128/

Log:
  Fix build issue when MAKE_JOBS_UNSAFE is set

Modified:
  head/graphics/xpaint/files/patch-Makefile.in

Modified: head/graphics/xpaint/files/patch-Makefile.in
==============================================================================
--- head/graphics/xpaint/files/patch-Makefile.in	Sat Jan 25 22:18:46 2014	(r341127)
+++ head/graphics/xpaint/files/patch-Makefile.in	Sat Jan 25 22:22:54 2014	(r341128)
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	2013-01-26 15:21:12.000000000 +0100
-+++ Makefile.in	2013-09-16 13:34:14.000000000 +0200
++++ Makefile.in	2014-01-25 23:16:07.000000000 +0100
 @@ -283,7 +283,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  BINDIR = $(prefix)/bin
@@ -27,22 +27,23 @@
  
  DefaultRC.txt.h: substads DefaultRC
  	./substads -ad2c DefaultRC $@
-@@ -1020,8 +1020,7 @@ DefaultRC.txt.h: substads DefaultRC
+@@ -1020,21 +1020,20 @@ DefaultRC.txt.h: substads DefaultRC
  messages.h: preproc
  	./preproc > messages.h
  
 -XPaint.ad: app-defaults
 -	$(CC) substads.c -o substads
+-	cd app-defaults ; \
 +XPaint.ad: substads app-defaults
- 	cd app-defaults ; \
++	(cd app-defaults ; \
  	../substads -appdefs \
  	            XPAINT_VERSION $(PACKAGE_VERSION) \
-@@ -1029,12 +1028,12 @@ XPaint.ad: app-defaults
+ 		    XPAINT_SHAREDIR $(SHAREDIR) \
  		    XPAINT_PRINT_COMMAND "$(PRINT_COMMAND)" \
  		    XPAINT_POSTSCRIPT_VIEWER "$(POSTSCRIPT_VIEWER)" \
- 		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
--	cp -p app-defaults/out/XPaint XPaint.ad
-+	cp -p out/XPaint ../XPaint.ad
+-		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
++		    XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)")
+ 	cp -p app-defaults/out/XPaint XPaint.ad
  
  XPaint.ad.h: substads XPaint.ad
  	./substads -ad2c XPaint.ad $@



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252222.s0PMMteg051777>