Index: head/cad/alliance/Makefile
===================================================================
--- head/cad/alliance/Makefile	(revision 469119)
+++ head/cad/alliance/Makefile	(revision 469120)
@@ -1,47 +1,46 @@
 # Created by: hrs
 # $FreeBSD$
 
 PORTNAME=	alliance
 DISTVERSION=	5.0-20120515
 PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
 		http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \
 		http://www-asim.lip6.fr/pub/alliance/distribution/5.0/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete set of CAD tools and libraries for VLSI design
 
 LICENSE=	Alliance
 LICENSE_NAME=	Alliance VLSI Cad System License
 LICENSE_FILE=	${WRKSRC}/LICENCE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=		fails to link: collect2: error: ld returned 1 exit status
 
 CONFLICTS_INSTALL=	fspclient-*
 
 WRKSRC=		${WRKDIR}/alliance-5.0
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USES=		bison gmake libtool motif
 
 USE_GCC=	any
 HAS_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 ALLIANCE_TOP=	${PREFIX}/alliance
 CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP}
 
 # The port does not build with C++11 or later (bug 219275).
 USE_CXXSTD=	gnu++03
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e '/include <malloc.h>/d' \
 		${WRKSRC}/xgra/src/XSB_parse.c
 
 .include <bsd.port.mk>
Index: head/cad/astk-serveur/Makefile
===================================================================
--- head/cad/astk-serveur/Makefile	(revision 469119)
+++ head/cad/astk-serveur/Makefile	(revision 469120)
@@ -1,295 +1,294 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	astk
 DISTVERSION=	1.13.10-1
 PORTREVISION=	1
 CATEGORIES=	cad
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	Graphical interface for Code_Aster (server side)
 
 LICENSE=	GPLv2
 
 #-----------------------------------------------------------------------
 # You may define these options:
 #
 # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among
 #			zsh (default), bash or ksh;
 # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit);
 # - WITH_PBS: PBS (batch scheduler) support is experimental.
 #
 #-----------------------------------------------------------------------
 
 # There exists a "logical" RUN_DEPENDS towards french/aster for the
 # server part, but it is not set to avoid circular dependences.
 
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}
 
 .if !defined(CLIENT_SEUL)
 USES+=		gettext python:2.7 shebangfix tk:build
 SHEBANG_FILES=	unittest/run_test.py
 .else
 USES+=		tk
 .endif
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	inst_dir=${inst_dir} tools_dir=${tools_dir}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
 S_SCRIPTS=	bin/as_run bin/parallel_cp asrun/installation.py	\
 		share/codeaster/asrun/data/mpirun_template
 S_PYLIBS=	share/codeaster/asrun/examples/alamain.py		\
 		unittest/datafiles/config_serveurs unittest/010_misc.py	\
 		unittest/015_package.py unittest/run_test.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${LOCALBASE}/aster/outils
 conf_dir=	${WRKSRC}/etc/astkrc
 
 .include <bsd.port.pre.mk>
 
 WRKCONF=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration
 .if !defined(CLIENT_SEUL)
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\
 		vaster=${vaster}
 PATCH2RM=	bin/as_run bin/parallel_cp etc/asrun etc/profile.sh	\
 		asrun/config.py asrun/installation.py asrun/system.py	\
 		asrun/common/sysutils.py asrun/system_command.py
 . if exists(${LOCALBASE}/sbin/pbs_server)
 WITH_PBS=	yes
 . endif
 . if exists(${LOCALBASE}/bin/mpirun)
 WITH_MPI=	yes
 . endif
 . if defined(WITH_MPI)
 RUN_DEPENDS+=	${HOME_MPI}/bin/mpirun:net/mpich2
 HOME_MPI=	${LOCALBASE}
 PLIST_SUB+=	MPI=""
 . else
 PLIST_SUB+=	MPI="@comment "
 . endif
 . if defined(WITH_PBS)
 RUN_DEPENDS+=	qsub:sysutils/torque
 . endif
 .else
 RUN_DEPENDS+=	xterm:x11/xterm						\
 		${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:graphics/tkpng
 TKPNG_VER=	0.9
 TKPNG=		tkpng${TKPNG_VER}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT
 PATCHDIR=	${MASTERDIR}/files.client
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster=""	\
 		BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/lib/BWidget-${BWidget_VER}
 PATCH2RM=	bin/astk bin/bsf etc/astkrc/outils lib/init.tcl lib/tkselecteur.tcl
 .endif
 FILESDIR=	${PATCHDIR}
 
 SLAVEDIRS=	cad/astk-client
 
 BWidget_VER=	1.7.0
 
 vaster=		STA${ASTER_VER:R}
 ETCDIR=		${PREFIX}/aster/etc/codeaster
 
 GIBI=		gibi2003
 
 .if defined(WITH_ZSH)
 SHIA=		zsh
 .elif defined(WITH_BASH)
 SHIA=		bash
 .elif defined(WITH_KSH)
 SHIA=		ksh93
 .elif exists(${LOCALBASE}/bin/zsh)
 SHIA=		zsh
 .elif exists(${LOCALBASE}/bin/bash)
 SHIA=		bash
 .elif exists(${LOCALBASE}/bin/ksh93)
 SHIA=		ksh93
 .else
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 BASH2RC=	asrun/calcul.py share/codeaster/asrun/data/mpirun_template
 BASH2RC2=	lib/tkselecteur.tcl
 BASH2RC3=	deprecated_outils.sh extract_info.py deprecated_client.sh	\
 		deprecated_server.sh
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/kwrite)
 WITH_ED=	kwrite
 RUN_DEPENDS+=	${LOCALBASE}/bin/kwrite:editors/kate-kde4
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
 .endif
 
 unamesm=	${OPSYS} ${ARCH}
 v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 
 .if !defined(PACKAGE_BUILDING)
 SERVER_NAME!=	${UNAME} -n
 HOST_NAME!=	/bin/hostname -s
 DOMAIN_NAME=	${SERVER_NAME:S|${HOST_NAME}.||}
 .else
 SERVER_NAME=	put.your.fdqn
 HOST_NAME=	this-hostname
 DOMAIN_NAME=	your.domain-name
 .endif
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 ASTK_LANG=	FR
 .else
 ASTK_LANG=	ENG
 .endif
 
 pre-configure:
 	${RM} ${PATCH2RM:C|^|${WRKSRC}/|:C|$|.orig|}
 
 do-configure:
 .if !defined(CLIENT_SEUL)
 . for scripts in ${S_SCRIPTS}
 	${REINPLACE_CMD} -e "s|?SHELL_EXECUTION?|${SHELL_INSTALL_ASTER}|"	\
 		-e "s|?ASTER_ROOT?|${PREFIX}/aster|" ${WRKSRC}/${scripts}
 . endfor
 	${REINPLACE_CMD} -e "s|?ASTER_VERSION?|${vaster}|"			\
 		 -e 's|#?vers : VVV?|vers : ${vaster}|'				\
 		${WRKSRC}/etc/aster
 	${REINPLACE_CMD} -e 's|?DEBUGGER_COMMAND_POST?|gdb -batch --command=@D @E @C|'\
 		-e 's|?DEBUGGER_COMMAND?|gdb --dbx --command=@D @E @C|'		\
 		${WRKSRC}/etc/asrun
 . if defined(WITH_MPI)
 	${REINPLACE_CMD} -e "s|?MPIRUN?|${HOME_MPI}/bin/mpirun|"		\
 		-e "s|?ASTER_CONFDIR?|${PREFIX}/aster|"				\
 		${WRKSRC}/etc/asrun
 . endif
 . for sc in asrun aster
 	${REINPLACE_CMD} -e "s|?IFDEF?|${v_ifdef}|"				\
 		-e "s|?EDITOR?|${WITH_ED}|"					\
 		-e "s|?TERMINAL?|${LOCALBASE}/bin/xterm|"			\
 		-e "s|?NODE?|${HOST_NAME}|"					\
 		-e "s|LOCALBASE|${LOCALBASE}|"					\
 		${WRKSRC}/etc/${sc}
 . endfor
 	${REINPLACE_CMD} -e "s|?ASTER_ROOT?|${LOCALBASE}/aster|"		\
 		-e 's|?HOME_PYTHON?|${PYTHONBASE}|'				\
 		-e 's|?ASRUN_SITE_PKG?|${PREFIX}/${LINSTDIR}/ASTK_SERV|'	\
 		-e 's|?PYTHON_EXE?|${PYTHON_CMD}|'				\
 		-e 's|?HOME_MED?|${LOCALBASE}|'					\
 		-e 's|?HOME_HDF?|${LOCALBASE}|'					\
 		-e "s|?WISH_EXE?|${WISH}|"					\
 		${WRKSRC}/etc/profile.sh
 . for libs in ${S_PYLIBS}
 	${REINPLACE_CMD} -e "s|/opt/aster/NEW9|${aster_dir}|"			\
 		 -e "s|/opt/aster/NEW10|${aster_dir}|"				\
 		-e "s|/opt/aster/ASTK|${inst_dir}|"				\
 		-e "s|/opt/aster|${LOCALBASE}/aster|g"				\
 		-e "s|/usr/bin/editor|${WITH_ED}|"				\
 		-e "s|/usr/bin/nedit2|${WITH_ED}|"				\
 		-e "s|/usr/bin/nedit|${WITH_ED}|"				\
 		-e "s|/usr/bin/xterm|${LOCALBASE}/bin/xterm|"			\
 		-e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs}
 . endfor
 . if defined(WITH_PBS)
 .   for cf in etc/asrun unittest/datafiles/config_serveurs
 	${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
 		${WRKSRC}/${cf}
 .   endfor
 . endif
 . if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING)
 	${REINPLACE_CMD}	\
 		-e "s|%%MAKE_JOBS_NUMBER%%|self.Shell('${ECHO_CMD} ${MAKE_JOBS_NUMBER}', mach, user)|" \
 		${WRKSRC}/asrun/system.py
 . else
 	${REINPLACE_CMD} -e 's|%%MAKE_JOBS_NUMBER%%|1|'	${WRKSRC}/asrun/system.py
 . endif
 	${REINPLACE_CMD} -e 's|bash|${SHIA}|' ${WRKSRC}/asrun/system_command.py
 . for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 . endfor
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|;s|LINUX|FREEBSD|'	\
 		${WRKSRC}/asrun/core/configuration.py
 .else
 # CLIENT_SEUL
 . for scripts in ${C_SCRIPTS}
 	${REINPLACE_CMD} -e "s|?SHELL_EXECUTION?|${SHELL_INSTALL_ASTER}|"	\
 		-e "s|?ASTER_ROOT?|${PREFIX}/aster|"				\
 		-e "s|wish|${WISH}|;s|%%inst_dir%%|${inst_dir}|"		\
 		${WRKSRC}/${scripts}
 . endfor
 	${REINPLACE_CMD} -e "s|?vaster?|${vaster}|"				\
 		-e "s|?TOOLS_DIR?|${tools_dir}|" ${conf_dir}/outils
 	${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
 		-e "s#?TERMINAL?#${LOCALBASE}/bin/xterm#"			\
 		-e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#"			\
 		-e "s#?SERVER_NAME?#${HOST_NAME}#"				\
 		-e "s#?ASTER_ROOT?#${PREFIX}/aster#"				\
 		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs
 	${REINPLACE_CMD} -e "s#?TERMINAL?#${LOCALBASE}/bin/xterm#"		\
 		-e "s#?ASTER_VERSION?#${ASTER_VER}#"				\
 		-e "s#langue : ENG#langue : ${ASTK_LANG}#"			\
 		-e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#"				\
 		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/prefs
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g"			\
 		${WRKSRC}/lib/tkselecteur.tcl
 	${REINPLACE_CMD} -e "s|%%unamesm%%|${unamesm}|"				\
 		${WRKSRC}/lib/init.tcl
 . for sh in ${BASH2RC2}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 . endfor
 .endif
 .for sh in ${BASH2RC3}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKCONF}/${sh}
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${inst_dir}
 	${CP} -R ${WRKSRC} ${STAGEDIR}${inst_dir}
 .if !defined(CLIENT_SEUL)
 	${MKDIR} ${STAGEDIR}${inst_dir}/ASTK_SERV/etc/codeaster/astkrc	\
 		${STAGEDIR}/${ETCDIR}
 	${TOUCH} ${STAGEDIR}${inst_dir}/ASTK_SERV/etc/codeaster/astkrc/.keep_me
 	${CP} -R ${WRKSRC}/etc/* ${STAGEDIR}${ETCDIR}
 	(cd ${STAGEDIR}${PREFIX} \
 		 && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		 -d ${PREFIX} -f aster)
 	(cd ${STAGEDIR}${PREFIX} \
 		 && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		 -d ${PREFIX} -f aster)
 	${MV} ${STAGEDIR}${ETCDIR}/profile.sh ${STAGEDIR}${ETCDIR}/profile_astk.sh
 . if defined(WITH_MPI)
 	${ECHO_CMD} "localhost" > ${STAGEDIR}${PREFIX}/aster/aster-mpihosts
 . endif
 .endif
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.post.mk>
Index: head/cad/linux-eagle5/Makefile
===================================================================
--- head/cad/linux-eagle5/Makefile	(revision 469119)
+++ head/cad/linux-eagle5/Makefile	(revision 469120)
@@ -1,53 +1,52 @@
 # Created by: Michael Durian <durian@shadetreesoftware.com>
 # $FreeBSD$
 
 PORTNAME=	eagle5
 PORTVERSION=	${EAGLEVERSION}
 PORTREVISION=	6
 CATEGORIES=	cad linux
 MASTER_SITES=	ftp://ftp.cadsoft.de/eagle/program/${EAGLEBASEVERSION}/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	eagle-lin-${EAGLEVERSION}
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Easy to use, yet powerful tool for designing printed circuit boards
 
 LICENSE=	Eagle
 LICENSE_NAME=	Eagle End User License Agreement
 LICENSE_FILE=	${WRKSRC}/doc/license_en.txt
 LICENSE_PERMS=	auto-accept
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/lin-//}
 
 EXTRACT_CMD=	${SED}
 EXTRACT_BEFORE_ARGS=	-e '1,/^__DATA__$$/d'
 EXTRACT_AFTER_ARGS=	| ${BZCAT} -c 2>/dev/null | ${TAR} -xf -
 
 RESTRICTED=	Usage permitted for non-commercial purposes only
 NO_CDROM=	Sale for profit is not permitted
 NO_PACKAGE=	Copying the software is only allowed for backup by an individual licensee
 
 EAGLEBASEVERSION=	5.12
 EAGLEBUGFIX=	0
 EAGLEVERSION=	${EAGLEBASEVERSION}.${EAGLEBUGFIX}
 
 USES=		linux
 USE_LINUX=	xorglibs jpeg png
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-deinstall pkg-message
 
 DESKTOP_ENTRIES=	"Eagle5" "Tool for designing printed circuit boards" \
 			${DATADIR}/ulp/eagle.bmp \
 			"eagle" "Development;Electronics;Engineering;" false
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 	${INSTALL_MAN} ${STAGEDIR}${DATADIR}/doc/eagle.1 ${STAGEDIR}${PREFIX}/man/man1/eagle.1
 	${SED} -e "s:%%DATADIR%%:${DATADIR}:g" ${FILESDIR}/eagle.sh > ${STAGEDIR}${PREFIX}/bin/eagle
 
 .include <bsd.port.mk>
Index: head/devel/boost_build/Makefile
===================================================================
--- head/devel/boost_build/Makefile	(revision 469119)
+++ head/devel/boost_build/Makefile	(revision 469120)
@@ -1,51 +1,50 @@
 # Created by: Bruce M. Simpson
 # $FreeBSD$
 
 PORTNAME=	boost_build
 PORTVERSION=	2.0.m12
 PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	SF/boost/boost-build/2.0-m12
 DISTNAME=	${PORTNAME:S/_/-/g}-${PORTVERSION:S/.m/-m/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible cross-platform build tool suite
 
 LICENSE=	BSL
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
 
 USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME:S/_/-/g}
 NO_BUILD=	defined
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PLIST_FILES=	share/doc/boost.png
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "build kernel options tools util" \
 		${STAGEDIR}${DATADIR} "! -name *.orig")
 	(cd ${WRKSRC} && ${INSTALL_DATA} boost-build.jam bootstrap.jam \
 		build-system.jam site-config.jam user-config.jam \
 		${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKSRC}/boost.png ${STAGEDIR}${PREFIX}/share/doc
 	(cd ${WRKSRC}/doc && ${RM} -r Jamfile.v2 project-root.jam \
 		html/userman_HTML.manifest src)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} .  ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/devel/jline/Makefile
===================================================================
--- head/devel/jline/Makefile	(revision 469119)
+++ head/devel/jline/Makefile	(revision 469120)
@@ -1,57 +1,56 @@
 # Created by: Martin Kammerhofer <mkamm@gmx.net>
 # $FreeBSD$
 
 PORTNAME=	jline
 PORTVERSION=	0.9.94
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Java library for handling console input
 
 LICENSE=	BSD4CLAUSE
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
 USES=		zip
 USE_JAVA=	yes
 OPTIONS_DEFINE=	JLINEPATCH DOCS
 JLINEPATCH_DESC=	Allow ConsoleRunner customized completion
 JLINEJAR=	${WRKSRC}/jline-${PORTVERSION}.jar
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 # Update jar archive with patched jline.ConsoleRunner class.
 do-build:
 .if ${PORT_OPTIONS:MJLINEPATCH}
 	${JAVAC} -classpath ${JLINEJAR} \
 		${WRKSRC}/src/src/main/java/jline/ConsoleRunner.java
 	${JAR} uvf ${JLINEJAR} -C ${WRKSRC}/src/src/main/java \
 		jline/ConsoleRunner.class
 .endif
 
 do-install:
 	${INSTALL_DATA} ${JLINEJAR} ${STAGEDIR}${JAVAJARDIR}
 	${LN} -nfs jline-${PORTVERSION}.jar \
 		   ${STAGEDIR}${JAVAJARDIR}/jline.jar
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/apidocs ${WRKSRC}/examples ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/JLineCompleter.py ${STAGEDIR}${DOCSDIR}/examples
 	${INSTALL_DATA} ${FILESDIR}/jython.sh ${STAGEDIR}${DOCSDIR}/examples
 .endif
 
 # Next rule is for maintainer use only: Automatically (re)create the pkg-plist.
 plist:
 	@test -e ${CONFIGURE_COOKIE} || { \
 		${ECHO_MSG} >&2 "do 'make configure' first!"; exit 64; }
 	${ECHO_CMD} "%%JAVAJARDIR%%/jline-${PORTVERSION}.jar" >${PLIST}
 	${ECHO_CMD} "%%JAVAJARDIR%%/jline.jar" >>${PLIST}
 	( \
 		cd ${WRKSRC} || exit; \
 		${FIND} ./apidocs ./examples -type f | ${SORT};	\
 		${ECHO_CMD} "./examples/JLineCompleter.py";	\
 		${ECHO_CMD} "./examples/jython.sh";		\
 	) | ${SED} -e 's/\.\//%%DOCSDIR%%\//' -e 's/^/%%PORTDOCS%%/' >>${PLIST}
 
 .include <bsd.port.mk>
Index: head/devel/py-mercurialserver/Makefile
===================================================================
--- head/devel/py-mercurialserver/Makefile	(revision 469119)
+++ head/devel/py-mercurialserver/Makefile	(revision 469120)
@@ -1,50 +1,49 @@
 # Created by: Aldis Berjoza <aldis@bsdroot.lv>
 # $FreeBSD$
 
 PORTNAME=	mercurialserver
 PORTVERSION=	1.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://dev.lshift.net/paul/mercurial-server/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SNAME}_${SVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software for hosting mercurial repositories
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	hg:devel/mercurial
 
 WRKSRC=		${WRKDIR}/${SNAME}_${SVERSION}.orig
 SNAME=		mercurial-server
 SVERSION=	1.2
 
 HGUSER=		hg
 HGGROUP=	hg
 USERS=		${HGUSER}
 GROUPS=		${HGGROUP}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		HGUSER=${HGUSER}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 HGSVCONF_FILES=	access.conf \
 		remote-hgrc.d/access.rc \
 		remote-hgrc.d/logging.rc
 
 pre-patch:
 	${SED} -I .orig -e "s#/etc/mercurial-server/#${PREFIX}/etc/${PORTNAME}/#" ${WRKSRC}/src/init/dot-mercurial-server
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/remote-hgrc.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/keys/users
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/keys/root
 .for i in ${HGSVCONF_FILES}
 	${INSTALL_DATA} ${WRKSRC}/src/init/conf/${i} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/${i}
 .endfor
 
 .include <bsd.port.mk>
Index: head/dns/mydns/Makefile
===================================================================
--- head/dns/mydns/Makefile	(revision 469119)
+++ head/dns/mydns/Makefile	(revision 469120)
@@ -1,78 +1,77 @@
 # Created by: Simon Dick <simond@irrelevant.org>
 # $FreeBSD$
 
 PORTNAME=	mydns
 PORTVERSION=	1.1.0
 PORTREVISION=	7
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	DNS server designed to utilize the MySQL database
 
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	ALIAS OPENSSL PGSQL NLS DOCS NLS
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USES=		tar:bzip2 iconv
 
 USE_RC_SUBR=	mydns
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 INFO=		mydns
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALIAS}
 CONFIGURE_ARGS+=--enable-alias
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-openssl \
 		--with-openssl-include=${OPENSSLINC} \
 		--with-openssl-lib=${OPENSSLLIB}
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=--without-mysql \
 		--with-pgsql-include=${LOCALBASE}/include \
 		--with-pgsql-lib=${LOCALBASE}/lib
 PKGNAMESUFFIX=	-pg
 .else
 CONFIGURE_ARGS+=--without-pgsql \
 		--with-mysql-include=${LOCALBASE}/include/mysql \
 		--with-mysql-lib=${LOCALBASE}/lib/mysql
 PKGNAMESUFFIX=	-mysql
 USE_MYSQL=	yes
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.pl ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.pm ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/
 .endif
 	@${STAGEDIR}${PREFIX}/sbin/mydns --dump-config > ${STAGEDIR}${PREFIX}/etc/mydns.conf.sample
 
 .include <bsd.port.mk>
Index: head/dns/mydns-ng/Makefile
===================================================================
--- head/dns/mydns-ng/Makefile	(revision 469119)
+++ head/dns/mydns-ng/Makefile	(revision 469120)
@@ -1,66 +1,65 @@
 # Created by: Simon Dick <simond@irrelevant.org>
 # $FreeBSD$
 
 PORTNAME=	mydns-ng
 PORTVERSION=	1.2.8.31
 PORTREVISION=	4
 CATEGORIES=	dns databases
 MASTER_SITES=	SF/${PORTNAME}/mydns/${PORTVERSION}
 DISTNAME=	mydns-${PORTVERSION}
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Next Generation DNS Server for sql based DNS services
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USES=		iconv
 USE_RC_SUBR=	mydns
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=		mydns
 DOCS=		AUTHORS COPYING ChangeLog NEWS QUICKSTART.mysql QUICKSTART.postgres README TODO
 
 OPTIONS_DEFINE=		DOCS ALIAS SSL NLS
 OPTIONS_SINGLE=		DATABASE
 OPTIONS_SINGLE_DATABASE=	PGSQL MYSQL
 OPTIONS_DEFAULT=	ALIAS MYSQL
 ALIAS_DESC=	Server side aliasas
 ALIAS_CONFIGURE_ENABLE=	alias
 OPTIONS_SUB=	yes
 
 ALIAS_CONFIGURE_ENABLE=	alias
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl \
 			--with-openssl-include=${OPENSSLINC} \
 			--with-openssl-lib=${OPENSSLLIB}
 
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql \
 			--with-pgsql-include=${LOCALBASE}/include \
 			--with-pgsql-lib=${LOCALBASE}/lib
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 
 MYSQL_USE=	MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-include=${LOCALBASE}/include/mysql \
 			--with-mysql-lib=${LOCALBASE}/lib/mysql
 MYSQL_CONFIGURE_OFF=	--without-mysql
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.pl ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/*.pm ${STAGEDIR}${DOCSDIR}/contrib/
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/
 	@${STAGEDIR}${PREFIX}/sbin/mydns --dump-config > ${STAGEDIR}${PREFIX}/etc/mydns.conf.sample
 
 .include <bsd.port.mk>
Index: head/dns/openresolv/Makefile
===================================================================
--- head/dns/openresolv/Makefile	(revision 469119)
+++ head/dns/openresolv/Makefile	(revision 469120)
@@ -1,21 +1,19 @@
 # Created by: Roy Marples <roy@marples.name>
 # $FreeBSD$
 
 PORTNAME=	openresolv
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://roy.marples.name/downloads/openresolv/ \
 		ftp://roy.marples.name/pub/openresolv/
 
 MAINTAINER=	roy@marples.name
 COMMENT=	Resolvconf compatible framework for managing resolv.conf
 
 USES=		tar:bzip2
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-deinstall pkg-message
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.mk>
Index: head/dns/rbldnsd/Makefile
===================================================================
--- head/dns/rbldnsd/Makefile	(revision 469119)
+++ head/dns/rbldnsd/Makefile	(revision 469120)
@@ -1,36 +1,35 @@
 # Created by: Paul Chvostek <paul@it.ca>
 # $FreeBSD$
 
 PORTNAME=	rbldnsd
 PORTVERSION=	0.998
 CATEGORIES=	dns
 MASTER_SITES=	http://www.corpit.ru/mjt/rbldnsd/ \
 		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Small and fast DNS daemon especially for DNSBL zones
 
 LICENSE=	GPLv2
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	rbldnsd
 USERS=		rbldns
 GROUPS=		${USERS}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/example ${STAGEDIR}${ETCDIR}/
 	${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${STAGEDIR}${PREFIX}/man/man8
 
 do-install-DOCS-on:
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES-0.81 ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/math/blacs/Makefile
===================================================================
--- head/math/blacs/Makefile	(revision 469119)
+++ head/math/blacs/Makefile	(revision 469120)
@@ -1,125 +1,124 @@
 # Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
 PORTREVISION=	31
 CATEGORIES=	math
 MASTER_SITES=	NETLIB/blacs
 DISTNAME=	BLACS
 DISTFILES=	mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
 DIST_SUBDIR=	blacs
 EXTRACT_ONLY=	mpiblacs.tgz blacstester.tgz mpiblacs-patch03.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The BLACS (Basic Linear Algebra Communication Subprograms)
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 USES=		fortran gmake
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	blacs_install.ps f77blacsqref.ps lawn94.ps \
 		cblacsqref.ps  mpi_prop.ps mpiblacs_issues.ps
 .endif
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
 WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-openmpi.diff
 .else
 LIB_DEPENDS+=	libmpich.so:net/mpich2
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-mpich.diff
 .endif
 
 F77EXTRAFLAGS=	#-w -fno-globals -fugly-complex
 DEBUG_LEVEL=	0
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 WRKSRC_SHARED=${WRKSRC}_shared
 CFLAGS_SHARED=${CFLAGS} ${FPIC}
 FFLAGS_SHARED=${FFLAGS} ${FPIC}
 SVERSION=1
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if ${ARCH} == "amd64"
 FFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 CFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 .elif ${ARCH} == "i386"
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .else
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 .endif
 .endif
 
 pre-patch:
 	(${CP} ${WRKSRC}/BMAKES/Bmake.MPI-LINUX ${WRKSRC}/Bmake.inc)
 
 post-patch:
 	${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
 
 pre-configure:
 	(${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|   ARCH *.= ar|   ARCMD = ar|'  ${WRKSRC}/Bmake.inc)
 	(${REINPLACE_CMD} -e 's|@WRKSRC@|${WRKSRC_SHARED}|g ; s|@DEBUG_LEVEL@|${DEBUG_LEVEL}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS_SHARED}|g ; s|@F77@|${F77}|g ; s|@FFLAGS@|${FFLAGS_SHARED}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|   ARCH *.= ar|   ARCMD = ar|'  ${WRKSRC_SHARED}/Bmake.inc)
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/SRC/MPI/Makefile
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC_SHARED}/SRC/MPI/Makefile
 
 do-build:
 	(cd ${WRKSRC}; make mpi; make tester)
 	(cd ${WRKSRC_SHARED}; make mpi; make tester)
 
 post-build:
 	${RM} -r ${WRKDIR}/tmp_shared
 	${MKDIR} ${WRKDIR}/tmp_shared
 	${MV} ${WRKSRC_SHARED}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a          ${WRKSRC_SHARED}/LIB/libblacsc.a
 	${MV} ${WRKSRC_SHARED}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a   ${WRKSRC_SHARED}/LIB/libblacsf77.a
 	${MV} ${WRKSRC_SHARED}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a     ${WRKSRC_SHARED}/LIB/libblacs.a
 	${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${MV} {} ${WRKDIR}/tmp_shared \;
 	cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED}  's/\.a//' `; do \
 		${LD} -Bshareable -o $${i}.so.${SVERSION} -x -soname $${i}.so.${SVERSION} --whole-archive $${i}.a ;\
 	${LN} -s $${i}.so.${SVERSION} $${i}.so ;\
 	done
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacsCinit_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsc.a
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacsf77.a
 	${INSTALL_DATA} ${WRKSRC}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a ${STAGEDIR}${PREFIX}/lib/libblacs.a
 
 .for lib in libblacsc libblacsf77 libblacs
 	${INSTALL_LIB} ${WRKDIR}/tmp_shared/${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so.${SVERSION}
 	${LN} -s ${lib}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/${lib}.so
 .endfor
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING
 	( cd ${WRKSRC_SHARED}/TESTING/EXE ; \
 	  ${INSTALL_PROGRAM} xCbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xCbtest_MPI-FreeBSD; \
 	  ${INSTALL_PROGRAM} xFbtest_MPI-FreeBSD-${DEBUG_LEVEL} ${STAGEDIR}${PREFIX}/share/BLACS/TESTING/xFbtest_MPI-FreeBSD; \
 	  ${INSTALL_DATA}  bsbr.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  bt.dat     ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  comb.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING; \
 	  ${INSTALL_DATA}  sdrv.dat   ${STAGEDIR}${PREFIX}/share/BLACS/TESTING)
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/blacs_install.ps   | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/blacs_install.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/cblacsqref.ps      | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/cblacsqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/f77blacsqref.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/f77blacsqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn94.ps          | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn94.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpi_prop.ps        | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpi_prop.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/mpiblacs_issues.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/mpiblacs_issues.ps.gz
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/rapid/Makefile
===================================================================
--- head/math/rapid/Makefile	(revision 469119)
+++ head/math/rapid/Makefile	(revision 469120)
@@ -1,34 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	rapid
 PORTVERSION=	2.01
 CATEGORIES=	math science graphics
 MASTER_SITES=	http://www.cs.sunysb.edu/~algorith/implement/RAPID/distrib/ \
 		http://www.neuro.mcw.edu/Ports/distfiles/
 DISTNAME=	RAPID_v2_01
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Robust and Accurate Polygon Interference Detection
 
 RESTRICTED=	For any commercial purpose, you must request a license from http://www.cs.unc.edu/~geom/OBB/OBBT.html
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 ALL_TARGET=
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_ENV+=	V=1
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	${REINPLACE_CMD} -E "s/friend RAPID_Collide/friend int RAPID_Collide/" ${WRKSRC}/RAPID_private.H
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/RAPID
 	${INSTALL_DATA}	${WRKSRC}/*.H ${STAGEDIR}${PREFIX}/include/RAPID
 	${INSTALL_DATA}	${WRKSRC}/libRAPID.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${FILESDIR}/rapid.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: head/math/scalapack/Makefile
===================================================================
--- head/math/scalapack/Makefile	(revision 469119)
+++ head/math/scalapack/Makefile	(revision 469120)
@@ -1,164 +1,163 @@
 # Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scalapack
 PORTVERSION=	2.0.2
 PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
 DIST_SUBDIR=	scalapack
 EXTRACT_ONLY=	scalapack-${PORTVERSION}.tgz manpages.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The ScaLAPACK Scalable LAPACK library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	elmer-mathlibs-1*
 
 USE_LDCONFIG=	yes
 USES=		cmake fortran pathfix
 CMAKE_ARGS_ST=	-DBUILD_STATIC_LIBS:BOOL=ON
 CMAKE_ARGS_SH=	-DBUILD_SHARED_LIBS:BOOL=ON
 CMAKE_ARGS=	${CMAKE_ARGS_ST}
 
 ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
 		REDIST/SRC SRC TOOLS TOOLS/LAPACK
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tu}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:tu}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 PLIST_SUB=	SVERSION=${SVERSION} PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	scalapack_install.ps scalapackqref.ps  \
 		lawn100.ps pblasqref.ps manual.ps design.ps \
 		pumma_refmanual.ps trans.ps
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=		yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
 LIB_DEPENDS+=	libblas.so:math/blas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
 WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 .else
 #LIB_DEPENDS+=	libmpich.so:net/mpich2
 BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich2
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2
 .endif
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 CFLAGS+=	${FPIC}
 FFLAGS+=	${FPIC}
 SVERSION=	2
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if ${ARCH} == "amd64"
 FFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 CFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 .elif ${ARCH} == "i386"
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .else
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 .endif
 .endif
 
 NOOPT=	-O0
 .if defined(WITH_OPENMPI)
 MPIF77=	${LOCALBASE}/mpi/openmpi/bin/mpif77
 MPICC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 .else
 MPIF77=	${LOCALBASE}/bin/mpif77
 MPICC=	${LOCALBASE}/bin/mpicc
 .endif
 
 # USES=fortran already forces FC to a supported fortran compiler;
 # assume mpicc points to a compatible compiler and force that, too.
 CC=	${MPICC}
 
 pre-configure:
 	${CP} -p ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	${CP} ${WRKSRC}/SLmake.inc.example ${WRKSRC}/SLmake.inc
 	${REINPLACE_CMD} -e 's|@BLAS@|${BLAS}|g; s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g; s|@WRKSRC@|${WRKSRC}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@MPIF77@|${MPIF77}|g ; s|@MPICC@|${MPICC}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@NOOPT@|${NOOPT}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|^ARCH *.= ar|ARCMD = ar|' ${WRKSRC}/SLmake.inc
 .for mkf in ${ARCH2FIX}
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile
 .endfor
 
 post-build:
 	${RM} -r ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
 	${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
 	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libscalapack.a ${STAGEDIR}${PREFIX}/lib
 	${MV} ${STAGEDIR}${PREFIX}/lib/libscalapack.so ${STAGEDIR}${PREFIX}/lib/libscalapack.so.${SVERSION}
 	${LN} -sf libscalapack.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libscalapack.so
 	${INSTALL_MAN}  ${WRKDIR}/MANPAGES/man/manl/*.l ${STAGEDIR}${PREFIX}/man/manl
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING
 	(cd ${WRKSRC}/TESTING/ ;\
 	${INSTALL_PROGRAM} x* ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING ;\
 	${INSTALL_DATA} *.dat ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING)
 	${INSTALL_DATA} ${FILESDIR}/scalapack.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/PBLAS/SRC/*.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/Makefile    ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.cc ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.f  ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/design.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/design.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn100.ps   | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn100.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/manual.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/manual.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/pblasqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pblasqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/pumma_refmanual.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pumma_refmanual.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapack_install.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapack_install.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapackqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapackqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/trans.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/trans.ps.gz
 .endif
 
 .if defined(MAINTAINER_MODE)
 do-test:
 . if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
 	${LOCALBASE}/bin/mpd &
 	(sleep 5 && cd ${BUILD_WRKSRC}/TESTING && ${MAKE_CMD} test)
 	${LOCALBASE}/bin/mpdallexit
 
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/vtk5-data/Makefile
===================================================================
--- head/math/vtk5-data/Makefile	(revision 469119)
+++ head/math/vtk5-data/Makefile	(revision 469120)
@@ -1,25 +1,24 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	vtk
 PORTVERSION=	5.10.1
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${PORTVERSION:R}/ \
 		http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
 PKGNAMESUFFIX=	5-data
 DISTNAME=	vtkdata-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Visualization Toolkit test and example data
 
 WRKSRC=		${WRKDIR}/VTKData${PORTVERSION}
 
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/VTKData
 
 .include <bsd.port.mk>