Change PLIST generation to allow installing custom libraries in

erlang/lib. Makefile.lib lists the stock OTP libraries to avoid
cluttering the main Makefile. Time for PORTREVISION bump.

6 files changed, 136 insertions, 2 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2712ab3d1735..2ffb8a8c2e19 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
@@ -104,12 +105,33 @@ post-install:
 	@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang
 	@sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
 	cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
+
+# All non-library files.
+
 	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \
 		| ${GREP} -v "^lib/erlang/man" \
+		| ${GREP} -v "^lib/erlang/lib" \
 		| sort \
 		> ${WRKDIR}/PLIST.lib-erlang
+
+# Stock OTP libraries.
+
+	for LIBRARY in ${OTP_LIBS}; do \
+		cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \
+	done | sort >> ${WRKDIR}/PLIST.lib-erlang
+
+# Stock OTP library directories.
+
+	for LIBRARY in ${OTP_LIBS}; do \
+		cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \
+		    	| ${SED} -e 's/^/@dirrm /g'; \
+	done | sort -r >> ${WRKDIR}/PLIST.lib-erlang
+
+# Other directories.
+
 	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \
 		| ${GREP} -v "^lib/erlang/man" \
+		| ${GREP} -v "^lib/erlang/lib" \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-erlang
 
@@ -134,5 +156,7 @@ MAN3PREFIX=	${PREFIX}/lib/erlang
 MAN4PREFIX=	${PREFIX}/lib/erlang
 MAN6PREFIX=	${PREFIX}/lib/erlang
 
+.include "Makefile.lib"
 .include "Makefile.man"
+
 .include <bsd.port.mk>
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
new file mode 100644
index 000000000000..36a808366697
--- /dev/null
+++ b/lang/erlang/Makefile.lib
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+OTP_LIBS=	appmon-2.1.1 \
+		asn1-1.4 \
+		compiler-4.1 \
+		cosEvent-2.0 \
+		cosEventDomain-1.0 \
+		cosFileTransfer-1.0.2 \
+		cosNotification-1.0.6 \
+		cosProperty-1.0.1 \
+		cosTime-1.0.1.1 \
+		cosTransactions-1.1.2 \
+		crypto-1.1.2 \
+		debugger-2.1 \
+		erl_interface-3.3.2 \
+		et-1.0 \
+		eva-2.0.3 \
+		gs-1.5.0 \
+		hipe-2.0 \
+		ic-4.1.6 \
+		inets-3.0 \
+		jinterface-1.2.1 \
+		kernel-2.8.0 \
+		megaco-1.1.0 \
+		mnemosyne-1.2.5 \
+		mnesia-4.1 \
+		mnesia_session-1.1.5 \
+		observer-0.9 \
+		odbc-1.0 \
+		orber-3.3 \
+		os_mon-1.6.0 \
+		parsetools-1.2 \
+		pman-2.4.1 \
+		runtime_tools-1.3 \
+		sasl-1.9.4 \
+		snmp-3.3.8 \
+		ssl-2.3.5 \
+		stdlib-1.11.0 \
+		toolbar-1.1.0 \
+		tools-2.1 \
+		tv-2.0.4 \
+		webtool-0.7.1
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index 67fc8852673b..fb0cd4adc086 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -13,4 +13,5 @@ bin/escript
 @dirrm lib/erlang/man/man3
 @dirrm lib/erlang/man/man1
 @dirrm lib/erlang/man
-@dirrm lib/erlang
+@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
+@unexec rmdir %D/lib/erlang 2>/dev/null || true
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 2712ab3d1735..2ffb8a8c2e19 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
@@ -104,12 +105,33 @@ post-install:
 	@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/erlang
 	@sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
 	cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
+
+# All non-library files.
+
 	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \
 		| ${GREP} -v "^lib/erlang/man" \
+		| ${GREP} -v "^lib/erlang/lib" \
 		| sort \
 		> ${WRKDIR}/PLIST.lib-erlang
+
+# Stock OTP libraries.
+
+	for LIBRARY in ${OTP_LIBS}; do \
+		cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \
+	done | sort >> ${WRKDIR}/PLIST.lib-erlang
+
+# Stock OTP library directories.
+
+	for LIBRARY in ${OTP_LIBS}; do \
+		cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \
+		    	| ${SED} -e 's/^/@dirrm /g'; \
+	done | sort -r >> ${WRKDIR}/PLIST.lib-erlang
+
+# Other directories.
+
 	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \
 		| ${GREP} -v "^lib/erlang/man" \
+		| ${GREP} -v "^lib/erlang/lib" \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-erlang
 
@@ -134,5 +156,7 @@ MAN3PREFIX=	${PREFIX}/lib/erlang
 MAN4PREFIX=	${PREFIX}/lib/erlang
 MAN6PREFIX=	${PREFIX}/lib/erlang
 
+.include "Makefile.lib"
 .include "Makefile.man"
+
 .include <bsd.port.mk>
diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib
new file mode 100644
index 000000000000..36a808366697
--- /dev/null
+++ b/lang/erlang14/Makefile.lib
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+OTP_LIBS=	appmon-2.1.1 \
+		asn1-1.4 \
+		compiler-4.1 \
+		cosEvent-2.0 \
+		cosEventDomain-1.0 \
+		cosFileTransfer-1.0.2 \
+		cosNotification-1.0.6 \
+		cosProperty-1.0.1 \
+		cosTime-1.0.1.1 \
+		cosTransactions-1.1.2 \
+		crypto-1.1.2 \
+		debugger-2.1 \
+		erl_interface-3.3.2 \
+		et-1.0 \
+		eva-2.0.3 \
+		gs-1.5.0 \
+		hipe-2.0 \
+		ic-4.1.6 \
+		inets-3.0 \
+		jinterface-1.2.1 \
+		kernel-2.8.0 \
+		megaco-1.1.0 \
+		mnemosyne-1.2.5 \
+		mnesia-4.1 \
+		mnesia_session-1.1.5 \
+		observer-0.9 \
+		odbc-1.0 \
+		orber-3.3 \
+		os_mon-1.6.0 \
+		parsetools-1.2 \
+		pman-2.4.1 \
+		runtime_tools-1.3 \
+		sasl-1.9.4 \
+		snmp-3.3.8 \
+		ssl-2.3.5 \
+		stdlib-1.11.0 \
+		toolbar-1.1.0 \
+		tools-2.1 \
+		tv-2.0.4 \
+		webtool-0.7.1
diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist
index 67fc8852673b..fb0cd4adc086 100644
--- a/lang/erlang14/pkg-plist
+++ b/lang/erlang14/pkg-plist
@@ -13,4 +13,5 @@ bin/escript
 @dirrm lib/erlang/man/man3
 @dirrm lib/erlang/man/man1
 @dirrm lib/erlang/man
-@dirrm lib/erlang
+@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
+@unexec rmdir %D/lib/erlang 2>/dev/null || true