svn commit: r324754 - head/graphics/plotutils

[Alexey Dokuchaev]

Author: danfe
Date: Thu Aug 15 07:35:19 2013
New Revision: 324754
URL: http://svnweb.freebsd.org/changeset/ports/324754

Log:
  - Unbreak parallel builds (-jX) on recent -CURRENT, where our make(1) is
    bmake(1), which does not play nice with libtool way of building things
  - While here, convert LIB_DEPENDS to new form, sort the knobs a bit, and
    hook test target to our standard "regression-test" one
  
  Reported by:	marino
  Tested by:	marino (poudriere testport)
  Approved by:	miwi, bapt (portmgr, implicit)

Modified:
  head/graphics/plotutils/Makefile

Modified: head/graphics/plotutils/Makefile
==============================================================================
--- head/graphics/plotutils/Makefile	Thu Aug 15 07:33:43 2013	(r324753)
+++ head/graphics/plotutils/Makefile	Thu Aug 15 07:35:19 2013	(r324754)
@@ -1,4 +1,4 @@
-# Created by: Chuck Robey (chuckr)
+# Created by: Chuck Robey <chuckr at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	plotutils
@@ -11,21 +11,23 @@ MASTER_SITES=	GNU
 MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	Plotting library and toolkit
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		motif
+USES=		gmake motif	# parallel builds are broken with bmake(1)
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi --with-motif
 USE_LDCONFIG=	yes
 
-MAN1=		ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
-INFO=		libxmi plotutils
-
-#CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+MAN1=		ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
+INFO=		libxmi plotutils
+
 test: build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} check)
+	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} ${_MAKE_JOBS} \
+		${MAKE_ARGS} check
+
+regression-test: test
 
 .include <bsd.port.mk>