Update port to version 8.0 (R8B-0).

Remove my code to handle the documentation merge for patched releases, it
was rather obscure and error-prone. I'll rewrite it in a simpler way next
time I'll need to perform the merge.

Also include a fix for erlang-mode under emacs21 (by Hal Snyder
<hal@vailsys.com> on the erlang mailing list).

1 files changed, 46 insertions, 71 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 9e2f28e59442..173809e4920a 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	7.4.0
+PORTVERSION=	8.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R7B-4
+DISTNAME=	otp_src_R8B-0
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -35,29 +35,19 @@ CONFIGURE_TARGET=	# Empty
 # Don't clutter up /usr/ports/distfiles with all distfiles (including patches)
 DIST_SUBDIR=	erlang
 
-ERLANG_MAN=     otp_doc_man_R7B.tar.gz
+ERLANG_MAN=     otp_man_R8B-0.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R7B01.tar.gz
+ERLANG_DOCS=	otp_html_R8B-0.tar.gz
 .endif
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .endif
+
 USE_GMAKE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
-# UPDATED_PACKAGES is the list of updated packages which documentation must
-# be pulled in from the docs tarball. "erts" lives in the erlang root
-# directory and should never be prefixed by lib/. See below for Java related
-# packages.
-
-UPDATED_PACKAGES=	erts lib/asn1 lib/cosEvent lib/cosNotification \
-			lib/cosTime lib/ic lib/inets lib/kernel lib/mnesia \
-			lib/mnesia_session lib/orber lib/os_mon \
-			lib/runtime_tools lib/sasl lib/snmp lib/stdlib \
-			lib/tools
-
 .if !defined(WITHOUT_JAVA)
 # The Java applications that are part of the Erlang distribution are
 # not strictly necessary - it is included for completeness sake. A
@@ -69,24 +59,21 @@ UPDATED_PACKAGES=	erts lib/asn1 lib/cosEvent lib/cosNotification \
 
 BUILD_DEPENDS+=  ${JAVAPORT}
 
-# The following UPDATED_PACKAGES depend on java.
-# UPDATED_PACKAGES+=	# nothing yet
-
-# Make sure javabindir is in the path
+# Make sure JAVABINDIR is in the path
 CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
 MAKE_ENV+=      PATH=${PATH}:${JAVABINDIR}
 SCRIPT_ENV+=    PATH=${PATH}:${JAVABINDIR}
 .endif
 
-# If X11 is not used, skip gs and etk applications.
-pre-build:
-.if defined(WITHOUT_X11)
-	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
-	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
-.endif
+# Workaround for a ./configure recursion bug which leads to INSTALL being
+# set to "../../../../[...]"
+post-patch:
+	@cd ${WRKSRC} && ${CAT} ${FILESDIR}/post-patch-configure | ${PATCH}
 
-# Check if javac is really in ${JAVABINDIR}.
 pre-configure:
+# Regenerate erts configuration script
+	cd ${WRKSRC}/erts && ${AUTOCONF}
+# Check if javac is really in ${JAVABINDIR}.
 .if !defined(WITHOUT_JAVA)
 	@if [ ! -x ${JAVABINDIR}/javac ]; then \
 		${ECHO_MSG} ">> Error: cannot find javac in JAVABINDIR."; \
@@ -95,55 +82,30 @@ pre-configure:
 	fi
 .endif
 
+# If X11 is not used, skip gs and etk applications.
+.if defined(WITHOUT_X11)
+	@${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
+	@${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
+.endif
+
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 post-install:
 	@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 		-C ${PREFIX}/lib/erlang
+	@${RM} -rf ${PREFIX}/lib/erlang/man/cat?
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/lib/erlang/temp
 	@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${PREFIX}/lib/erlang/temp
-	@${RM} -rf ${PREFIX}/lib/erlang/man/cat?
-	${CP} -R ${PREFIX}/lib/erlang/temp/doc ${PREFIX}/lib/erlang
-
-	@for erlang_package in ${UPDATED_PACKAGES}; do \
-		epkg_libpathname=${PREFIX}/lib/erlang/$${erlang_package}-*; \
-		epkg_docpathname=${PREFIX}/lib/erlang/temp/$${erlang_package}-*; \
-		epkg_libdirname=`dirname $${epkg_libpathname}`; \
-		epkg_docdirname=`dirname $${epkg_docpathname}`; \
-		epkg_libbasename=`basename $${epkg_libpathname}`; \
-		epkg_docbasename=`basename $${epkg_docpathname}`; \
-		if [ -z "$${epkg_docbasename}" -o -z "$${epkg_libbasename}" ]; then \
-			${ECHO_MSG} ">> Error: post-install target failed to merge documentation"; \
-			exit 1; \
-		fi; \
-		${ECHO_MSG} ">> Documentation merge: $${epkg_docbasename} -> $${epkg_libbasename}"; \
-		${PERL} -pi -e "s/$${epkg_docbasename}/$${epkg_libbasename}/g;" \
-			${PREFIX}/lib/erlang/doc/index.html; \
-		lib_notes=$${epkg_libpathname}/notes.html; \
-		doc_notes=$${epkg_docpathname}/notes.html; \
-		lib_history=$${epkg_libpathname}/notes_history.html; \
-		doc_history=$${epkg_docpathname}/notes_history.html; \
-		if [ -e $${doc_notes} -a ! -e $${lib_notes} ]; then \
-			${CP} $${doc_notes} $${epkg_libpathname}; \
-		fi; \
-		if [ -e $${doc_history} -a ! -e $${lib_history} ]; then \
-			${CP} $${doc_history} $${epkg_libpathname}; \
-		fi; \
-		${CP} -R $${epkg_docpathname}/doc \
-			$${epkg_libpathname}/; \
-	done
-	@${RM} -rf ${PREFIX}/lib/erlang/temp
+		-C ${PREFIX}/lib/erlang
 .endif
-	sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
+	@sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
 	cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
-	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \
+	@cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \
 		| ${GREP} -v "^lib/erlang/man" \
 		| sort \
 		> ${WRKDIR}/PLIST.lib-erlang
-	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \
+	@cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \
 		| ${GREP} -v "^lib/erlang/man" \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-erlang
@@ -166,7 +128,7 @@ NOMANCOMPRESS=	yes
 
 MAN1PREFIX=	${PREFIX}/lib/erlang
 MAN1=		epmd.1 erl.1 erl_call.1 erlc.1 erlsrv.1 start_erl.1 \
-		werl.1 run_erl.1 start.1
+		werl.1 run_erl.1 start.1 driver_entry.1 erl_driver.1
 
 MAN3PREFIX=	${PREFIX}/lib/erlang
 MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
@@ -215,11 +177,10 @@ MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
 		CosNotifyChannelAdmin_StructuredProxyPushConsumer.3 \
 		CosNotifyChannelAdmin_StructuredProxyPushSupplier.3 \
 		CosTransactions_TransactionFactory.3 Module_Interface.3 \
-		OrberEventChannel.3 OrberEventChannel_EventChannelFactory.3 \
 		beam_lib.3 digraph_utils.3 orddict.3 sets.3 win32reg.3 \
 		comet.3 erl_com.3 \
 		alarm_handler.3 any.3 application.3 appmon.3 asn1ct.3 \
-		asn1rt.3 auth.3 c.3 calendar.3 coast.3 code.3 compile.3 \
+		asn1rt.3 auth.3 c.3 calendar.3 code.3 compile.3 \
 		corba.3 corba_object.3 cosTransactions.3 cpu_sup.3 crypto.3 \
 		dbg.3 dets.3 dict.3 digraph.3 disk_log.3 disksup.3 epp.3 \
 		eprof.3 erl_boot_server.3 erl_connect.3 erl_ddll.3 \
@@ -227,15 +188,15 @@ MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
 		erl_id_trans.3 erl_internal.3 erl_lint.3 erl_malloc.3 \
 		erl_marshal.3 erl_parse.3 erl_pp.3 erl_prim_loader.3 \
 		erl_scan.3 erl_set_memory_block.3 erlang.3 error_handler.3 \
-		error_logger.3 etk.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
-		eva_server.3 eva_snmp_adaptation.3 eva_sup.3 exref.3 \
+		error_logger.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
+		eva_server.3 eva_snmp_adaptation.3 eva_sup.3 \
 		file.3 filename.3 ftp.3 gen_event.3 gen_fsm.3 gen_server.3 \
 		gen_tcp.3 gen_udp.3 global.3 global_group.3 gs.3 heart.3 \
 		httpd.3 httpd_conf.3 httpd_core.3 httpd_socket.3 httpd_util.3 \
 		i.3 ic.3 inet.3 init.3 instrument.3 int.3 io.3 io_lib.3 lib.3 \
 		lists.3 lname.3 lname_component.3 log.3 log_mf_h.3 \
 		log_server.3 log_snmp.3 log_snmpea.3 make.3 math.3 memsup.3 \
-		mesh.3 mesh_lib.3 mesh_snmp.3 mnemosyne.3 mnesia.3 \
+		mnemosyne.3 mnesia.3 \
 		mnesia_registry.3 mnesia_session.3 mod_actions.3 mod_alias.3 \
 		mod_auth.3 mod_cgi.3 mod_dir.3 mod_disk_log.3 mod_esi.3 \
 		mod_include.3 mod_log.3 mod_security.3 net_adm.3 net_kernel.3 \
@@ -250,14 +211,28 @@ MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
 		snmp_target_mib.3 snmp_user_based_sm_mib.3 \
 		snmp_view_based_acm_mib.3 ssl.3 ssl_socket.3 string.3 \
 		supervisor.3 supervisor_bridge.3 sys.3 systools.3 tags.3 \
-		timer.3 tk.3 toolbar.3 tv.3 unix.3 user.3 wrap_log_reader.3 \
-		xref.3 yecc.3
+		timer.3 toolbar.3 tv.3 unix.3 user.3 wrap_log_reader.3 \
+		xref.3 yecc.3 CosFileTransfer_Directory.3 \
+		CosFileTransfer_File.3 CosFileTransfer_FileIterator.3 \
+		CosFileTransfer_FileTransferSession.3 \
+		CosFileTransfer_VirtualFileSystem.3 \
+		CosPropertyService_PropertiesIterator.3 \
+		CosPropertyService_PropertyNamesIterator.3 \
+		CosPropertyService_PropertySet.3 \
+		CosPropertyService_PropertySetDef.3 \
+		CosPropertyService_PropertySetDefFactory.3 \
+		CosPropertyService_PropertySetFactory.3 \
+		com_gen.3 cosEventApp.3 cosFileTransferApp.3 \
+		cosProperty.3 cover.3 ei.3 ei_connect.3 file_sorter.3 \
+		fprof.3 gb_sets.3 gb_trees.3 interceptors.3 megaco.3 \
+		megaco_flex_scanner.3 megaco_tcp.3 megaco_udp.3 \
+		megaco_user.3 mod_browser.3 mod_htaccess.3 sofs.3 webtool.3
 
 MAN4PREFIX=	${PREFIX}/lib/erlang
 MAN4=		app.4 appup.4 config.4 rel.4 relup.4 script.4
 
 MAN6PREFIX=	${PREFIX}/lib/erlang
-MAN6=		crypto.6 eva.6 inets.6 kernel.6 mesh.6 runtime_tools.6 \
+MAN6=		crypto.6 eva.6 inets.6 kernel.6 runtime_tools.6 \
 		sasl.6 snmp.6 ssl.6
 
 .include <bsd.port.mk>