Sun May 8 15:12:22 2011 UTC ()
PR pkg/37952. Minor clean-ups. Use only one line USE_TOOLS+=...


(cheusov)
diff -r1.59 -r1.60 pkgsrc/parallel/pvm3/Makefile
cvs diff -r1.59 -r1.60 pkgsrc/parallel/pvm3/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/pvm3/Makefile 2010/07/30 10:36:34 1.59
+++ pkgsrc/parallel/pvm3/Makefile 2011/05/08 15:12:22 1.60
@@ -1,45 +1,43 @@ @@ -1,45 +1,43 @@
1# $NetBSD: Makefile,v 1.59 2010/07/30 10:36:34 asau Exp $ 1# $NetBSD: Makefile,v 1.60 2011/05/08 15:12:22 cheusov Exp $
2 2
3DISTNAME= pvm3.4.6 3DISTNAME= pvm3.4.6
4PKGNAME= pvm-3.4.6 4PKGNAME= pvm-3.4.6
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= parallel 6CATEGORIES= parallel
7MASTER_SITES= ${MASTER_SITE_NETLIB:=pvm3/} 7MASTER_SITES= ${MASTER_SITE_NETLIB:=pvm3/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.csm.ornl.gov/pvm/pvm_home.html 11HOMEPAGE= http://www.csm.ornl.gov/pvm/pvm_home.html
12COMMENT= Parallel Virtual Machine libraries and environment 12COMMENT= Parallel Virtual Machine libraries and environment
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= m4 
17 
18.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
19BUILD_DEFS+= PVM_SSH 17BUILD_DEFS+= PVM_SSH
20 18
21.if !defined(PVM_SSH) 19.if !defined(PVM_SSH)
22PKG_FAIL_REASON+= PVM_SSH must be defined by the pkgsrc user. 20PKG_FAIL_REASON+= PVM_SSH must be defined by the pkgsrc user.
23.else 21.else
24. if ${PVM_SSH:M${LOCALBASE}/*} != "" 22. if ${PVM_SSH:M${LOCALBASE}/*} != ""
25DEPENDS+= {openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh 23DEPENDS+= {openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh
26. endif 24. endif
27.endif 25.endif
28 26
29WRKSRC= ${WRKDIR}/pvm3 27WRKSRC= ${WRKDIR}/pvm3
30USE_LANGUAGES= c fortran77 28USE_LANGUAGES= c fortran77
31USE_LIBTOOL= yes 29USE_LIBTOOL= yes
32USE_TOOLS+= gmake 30USE_TOOLS+= gmake m4
33MAKE_JOBS_SAFE= no 31MAKE_JOBS_SAFE= no
34 32
35PVM_ROOT= ${WRKSRC} 33PVM_ROOT= ${WRKSRC}
36MAKE_ENV+= PVM_ROOT=${WRKSRC:Q} 34MAKE_ENV+= PVM_ROOT=${WRKSRC:Q}
37MAKE_ENV+= PVM_ARCH= 35MAKE_ENV+= PVM_ARCH=
38MAKE_ENV+= SSH=${PVM_SSH:Q} 36MAKE_ENV+= SSH=${PVM_SSH:Q}
39MAKE_ENV+= MKDIR=${MKDIR:Q} 37MAKE_ENV+= MKDIR=${MKDIR:Q}
40MAKE_ENV+= PVMLIB_VER=3:4 38MAKE_ENV+= PVMLIB_VER=3:4
41MAKE_ENV+= PVM_DIR=${PVM_DIR:Q} 39MAKE_ENV+= PVM_DIR=${PVM_DIR:Q}
42BUILD_TARGET= all install 40BUILD_TARGET= all install
43 41
44# Set PVM_ARCH to the correct value for this machine platform. 42# Set PVM_ARCH to the correct value for this machine platform.
45.include "arch.mk" 43.include "arch.mk"