fix the build after the change in the default Java ports; remove

X11BASE; add OPTIONS; sort USE* and options-handling blocs; remove
outdated Java conditionals and checks for unsupported versions of
FreeBSD; remove unnecessary dependence on gmake; fix default FFLAGS;
reposition LICENSE*

1 files changed, 66 insertions, 90 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index d15d713..b03eb33 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -7,86 +7,77 @@
 
 PORTNAME=	mpich2
 DISTVERSION=	1.3.2p1
+PORTREVISION=	1
 PORTEPOCH=	5
-CATEGORIES=	net parallel
+CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
 DIST_SUBDIR=	mpich
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A portable implementation of MPI-1 and MPI-2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_JAVA	don't build MPE Jumpshot-4
-# - WITHOUT_X11		disable MPE graphics routines
-# - WITH_SMPD		use SMPD instead of MPD for OS-mixed cluster
-# - WITH_RECV_TIMEOUT	set a non-default MPIEXEC_RECV_TIMEOUT
-#-----------------------------------------------------------------------
-
 LICENSE=	MPICH
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN=		does not package
-
-.if defined(MAINTAINER_MODE)
-WITH_RECV_TIMEOUT?=	100
-.else
-WITH_RECV_TIMEOUT?=	20
-.endif
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USE_PYTHON=	yes
-USE_PERL5_BUILD=yes
+GNU_CONFIGURE=	yes
+USE_FORTRAN=	yes
 USE_GNOME=	pkgconfig
+USE_LDCONFIG=	yes
+USE_PERL5_BUILD=yes
+USE_PYTHON=	yes
+
+OPTIONS=	JAVA	"build MPE Jumpshot-4" on \
+		SMPD	"use SMPD instead of MPD, for a mixed-OS cluster" off \
+		X11	"build MPE graphics routines" on
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-romio --enable-shared	\
-		--docdir=${DOCSDIR}
-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" 	\
-		PACKAGE=${PORTNAME}
+		--docdir="${DOCSDIR}"
+CONFIGURE_ENV=	FCFLAGS="${FFLAGS}" \
+		PACKAGE=${PORTNAME} \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
-FFLAGS?=	-O2
-NOCCACHE=	yes
-MAKE_ENV=	CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
-.if defined(WITH_DEBUG)
-MAKE_ENV+=	VERBOSE=1
+.if ${FFLAGS} == "-O"
+FFLAGS =	-O2
 .endif
-MAKE_JOBS_UNSAFE=	yes
-
-CONFLICTS=	lam-7.* mpiexec-0.*
-
-USE_FORTRAN=	yes
-FCFLAGS+=	${FFLAGS}
-CONFIGURE_ENV+=	FC="${FC}" FCFLAGS="${FCFLAGS}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
 
-USE_LDCONFIG=	yes
+MAKE_ENV=	CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
+NOCCACHE=	yes
 
-SUB_FILES=	pkg-message
+CONFLICTS=	lam-7.* mpd-[0-9]* mpiexec-0.*
+MAKE_JOBS_UNSAFE=	yes
 
 VERSO=		2.2
 VERSOM=		${VERSO:R}
 PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--disable-graphics
-WITHOUT_JAVA=	yes
-PLIST_SUB+=	X11="@comment "
-.else
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include --x-libraries==${X11BASE}/lib
-USE_XORG=	x11 xt
-PLIST_SUB+=	X11=${PLX11}
+SUB_FILES=	pkg-message
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+MAKE_ENV+=	VERBOSE=1
+.endif
+
+.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
+WITHOUT_JAVA=	no_java_available_for_${ARCH}
 .endif
+
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
 PLIST_SUB+=	JAVA="@comment "
 PLX11=		"@comment "
 .else
+.if defined(WITHOUT_X11)
+IGNORE =	WITH_JAVA requires WITH_X11
+.endif
+CONFIGURE_ARGS+=	--with-java="${JAVA_HOME}"
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
@@ -95,6 +86,14 @@ PLIST_SUB+=	JAVA=""
 PLX11=		""
 .endif
 
+#define WITH_RECV_TIMEOUT to be an appropriate value (>20 for slow machines),
+#in order to set a different default MPIEXEC_RECV_TIMEOUT
+.if defined(MAINTAINER_MODE)
+WITH_RECV_TIMEOUT?=	100
+.else
+WITH_RECV_TIMEOUT?=	20
+.endif
+
 .if defined(WITH_SMPD)
 CONFIGURE_ARGS+=	--with-pmi=smpd --with-pm=smpd
 PLIST_SUB+=	PM_MPD="@comment " PM_SMPD=""
@@ -103,6 +102,21 @@ CONFIGURE_ARGS+=	--with-pmi=simple --with-pm=mpd
 PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
 .endif
 
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--disable-graphics
+PLIST_SUB+=	X11="@comment "
+.else
+CONFIGURE_ARGS+=	--x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib
+USE_XORG=	x11 xt
+PLIST_SUB+=	X11=${PLX11}
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
+.include "${FILESDIR}/manpages"
+.endif
+
 THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
 		test/mpi/threads/pt2pt/Makefile.in		\
 		src/mpe2/src/logging/configure			\
@@ -117,44 +131,6 @@ CONFPFX2FIX1=	src/pm/mpd/mpd.py
 CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
 		src/pm/mpd/mpdroot.c
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700000 && defined(PACKAGE_BUILDING)
-WITHOUT_JAVA=	yo	# No package for Java ATM
-.endif
-
-.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-WITHOUT_JAVA=	yo	# No package for Java ATM
-.endif
-
-.if ${ARCH} == "amd64"
-# gmake should not be required, this is a work-around
-USE_GMAKE=	yes
-.endif
-
-.if ${OSVERSION} < 700000
-BROKEN=	Requested timer clock_gettime (POSIX) is not available for ${OSREL}
-.endif
-
-.if !defined(NOPORTDOCS)
-.include "${FILESDIR}/manpages"
-.endif
-
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You could define the following options:"
-.if !defined(WITHOUT_JAVA)
-	@${ECHO_MSG} "- WITHOUT_JAVA	do not build MPE Jumpshot-4"
-.endif
-.if !defined(WITHOUT_X11)
-	@${ECHO_MSG} "- WITHOUT_X11	disable MPE graphics routines"
-.endif
-.if !defined(WITH_SMPD)
-	@${ECHO_MSG} "- WITH_SMPD	use SMPD instead of MPD, to work with SMPD under MS Windows"
-.endif
-	@${ECHO_MSG} "- WITH_RECV_TIMEOUT set it to a value > 20 on slow machines"
-	@${ECHO_MSG}
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
@@ -204,7 +180,7 @@ regression-test:	install
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .endif
-	@${ECHO_MSG} "Don't hesitate to increase MPIEXEC_RECV_TIMEOUT if needed!"
+	@${ECHO_MSG} "Increase MPIEXEC_RECV_TIMEOUT if needed!"
 	${PREFIX}/bin/mpd &
 	(cd ${WRKSRC} && \
 	PATH=${PATH}:${PREFIX}/bin VERBOSE=1 ${MAKE} testing)