summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2013-08-24 12:32:33 +0000
committerdanfe <danfe@FreeBSD.org>2013-08-24 12:32:33 +0000
commit36318d7e1853d6699503a62ab1559c6bf4c34d6e (patch)
tree74feb4abeb6fba93b6d2dcc04f7248f94538834a
parentb588c8955c3e74302be26cf8721084c16eaa8ff4 (diff)
downloadFreeBSD-ports-36318d7e1853d6699503a62ab1559c6bf4c34d6e.zip
FreeBSD-ports-36318d7e1853d6699503a62ab1559c6bf4c34d6e.tar.gz
- Fix parallel (-jX) builds by using NamedMakeSubdirs() macro instead of
MakeSubdirs(); doing so allows imake to generate non-racy dependencies - Ensure that MAKE has correct value; cleanup the COMMENT while I'm here
-rw-r--r--misc/xless/Makefile5
-rw-r--r--misc/xless/files/patch-aa9
2 files changed, 12 insertions, 2 deletions
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index 2198782..0c5c1b6 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -10,11 +10,12 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= applications
MAINTAINER= ports@FreeBSD.org
-COMMENT= X11 viewer for text files. Useful as an add-on tool for other apps
+COMMENT= X11-based viewer for text files
-MAKE_JOBS_UNSAFE= yes
USES= imake
USE_XORG= ice sm x11 xaw xext xmu xpm xt
+MAKE_ARGS= MAKE="${MAKE_CMD}"
+
MAN1= xless.1
MANCOMPRESSED= yes
diff --git a/misc/xless/files/patch-aa b/misc/xless/files/patch-aa
index a71f4ff..6327fc1 100644
--- a/misc/xless/files/patch-aa
+++ b/misc/xless/files/patch-aa
@@ -10,3 +10,12 @@
SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
+@@ -24,7 +25,7 @@ LOCAL_LIBRARIES = -Lregexp -lregexp XawC
+ #define PassCDebugFlags
+ #endif
+
+-MakeSubdirs($(SUBDIRS))
++NamedMakeSubdirs(./regexp/libregexp.a,$(SUBDIRS))
+ ComplexProgramTarget(xless)
+
+ InstallNonExec(xless.help, $(LIBDIR))
OpenPOWER on IntegriCloud