Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Oct 2013 20:30:23 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331993 - head/devel/common_lib
Message-ID:  <201310292030.r9TKUNd6023612@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Tue Oct 29 20:30:23 2013
New Revision: 331993
URL: http://svnweb.freebsd.org/changeset/ports/331993

Log:
  - Add staging support.
  - Do not mute install commands.
  - Cleanup plist.

Modified:
  head/devel/common_lib/Makefile
  head/devel/common_lib/pkg-plist

Modified: head/devel/common_lib/Makefile
==============================================================================
--- head/devel/common_lib/Makefile	Tue Oct 29 20:24:04 2013	(r331992)
+++ head/devel/common_lib/Makefile	Tue Oct 29 20:30:23 2013	(r331993)
@@ -25,31 +25,20 @@ USE_DOS2UNIX=	Makefile
 ALL_TARGET=	compile doc
 USES=		iconv:build
 
-MAN1=		common_lib.1
-MAN3=		cl_application.3 cl_binary.3 cl_calendar.3 cl_consumer.3 \
-		cl_csv.3 cl_dqueue.3 cl_lists.3 cl_math.3 cl_pool.3 cl_queue.3 \
-		cl_queue_srv.3 cl_queue_tab.3 cl_stats.3 cl_string.3 cl_timer.3
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${REINPLACE_CMD} -e "s@&lt;@<@g" -e "s@&gt;@>@g" ${WRKSRC}/doc/*.ndoc
 
 do-install:
-.for manpage in ${MAN1} ${MAN3}
-	@${ICONV_CMD} -f UTF-8 -t ISO-8859-1 ${WRKSRC}/doc/man/${manpage} > ${WRKSRC}/doc/man/${manpage}.iconv
-.endfor
-.for manpage in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage}.iconv ${MAN1PREFIX}/man/man1/${manpage}
-.endfor
-.for manpage in ${MAN3}
-	@${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage}.iconv ${MAN3PREFIX}/man/man3/${manpage}
-.endfor
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src
-	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src
+	@for manpage in ${WRKSRC}/doc/man/*; do \
+		${MV} $${manpage} $${manpage}.src; \
+		${ICONV_CMD} -f UTF-8 -t ISO-8859-1 $${manpage}.src > $${manpage}; \
+	done
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src
+	${INSTALL_DATA} ${WRKSRC}/ebin/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin
+	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src
 
 .include <bsd.port.mk>

Modified: head/devel/common_lib/pkg-plist
==============================================================================
--- head/devel/common_lib/pkg-plist	Tue Oct 29 20:24:04 2013	(r331992)
+++ head/devel/common_lib/pkg-plist	Tue Oct 29 20:30:23 2013	(r331993)
@@ -1,44 +1,60 @@
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_application.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_bin.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_binary.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_calendar.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_consumer.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_csv.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_dqueue.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_lists.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_math.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_pool.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue_srv.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue_tab.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_stats.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_string.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_timer.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_timer_srv.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/cl_url.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib.app
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib_sup.beam
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_application.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_bin.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_binary.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_calendar.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_consumer.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_csv.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_dqueue.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_lists.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_math.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_pool.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_queue.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_queue_srv.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_queue_tab.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_stats.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_string.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_timer.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_timer_srv.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/cl_url.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/common_lib.erl
-%%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src/common_lib_sup.erl
-@dirrm %%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/ebin
-@dirrm %%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%/src
-@dirrm %%LIB32DIR%%/erlang/lib/common_lib-%%VERSION%%
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_application.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_bin.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_binary.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_calendar.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_consumer.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_csv.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_dqueue.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_lists.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_math.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_pool.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue_srv.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_queue_tab.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_stats.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_string.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_timer.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_timer_srv.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/cl_url.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib.app
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib.beam
+lib/erlang/lib/common_lib-%%VERSION%%/ebin/common_lib_sup.beam
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_application.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_bin.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_binary.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_calendar.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_consumer.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_csv.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_dqueue.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_lists.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_math.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_pool.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_queue.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_queue_srv.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_queue_tab.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_stats.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_string.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_timer.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_timer_srv.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/cl_url.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/common_lib.erl
+lib/erlang/lib/common_lib-%%VERSION%%/src/common_lib_sup.erl
+man/man1/common_lib.1.gz
+man/man3/cl_application.3.gz
+man/man3/cl_binary.3.gz
+man/man3/cl_calendar.3.gz
+man/man3/cl_consumer.3.gz
+man/man3/cl_csv.3.gz
+man/man3/cl_dqueue.3.gz
+man/man3/cl_lists.3.gz
+man/man3/cl_math.3.gz
+man/man3/cl_pool.3.gz
+man/man3/cl_queue.3.gz
+man/man3/cl_queue_srv.3.gz
+man/man3/cl_queue_tab.3.gz
+man/man3/cl_stats.3.gz
+man/man3/cl_string.3.gz
+man/man3/cl_timer.3.gz
+@dirrm lib/erlang/lib/common_lib-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/common_lib-%%VERSION%%/src
+@dirrm lib/erlang/lib/common_lib-%%VERSION%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310292030.r9TKUNd6023612>