svn commit: r353966 - head/devel/distel

[Jimmy Olgeni]

Author: olgeni
Date: Tue May 13 15:49:43 2014
New Revision: 353966
URL: http://svnweb.freebsd.org/changeset/ports/353966
QAT: https://qat.redports.org/buildarchive/r353966/

Log:
  Add staging support and clean up plist.

Modified:
  head/devel/distel/Makefile
  head/devel/distel/pkg-plist   (contents, props changed)

Modified: head/devel/distel/Makefile
==============================================================================
--- head/devel/distel/Makefile	Tue May 13 15:38:51 2014	(r353965)
+++ head/devel/distel/Makefile	Tue May 13 15:49:43 2014	(r353966)
@@ -22,29 +22,27 @@ USE_EMACS=	yes
 DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
 DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 do-build:
 	@${MKDIR} ${WRKSRC}/ebin
 	@cd ${WRKSRC} && erlc -W0 -o ebin/ +debug_info src/*.erl
 
 do-install:
-	@${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/elisp/*el ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/elisp/*el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@for FILE in ${DISTEL_DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${DOCSDIR}/html
-	@${MKDIR} ${DISTEL_ROOT}
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${STAGEDIR}${DOCSDIR}/html
 .endif
-	@${MKDIR} ${DISTEL_ROOT}/src
-	@${MKDIR} ${DISTEL_ROOT}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/src/*.erl ${DISTEL_ROOT}/src
-	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${DISTEL_ROOT}/ebin
-	@${LN} -sf ${DISTNAME} ${PREFIX}/lib/erlang/lib/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/src
+	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/ebin
+	@${INSTALL_DATA} ${WRKSRC}/src/*.erl ${STAGEDIR}${DISTEL_ROOT}/src
+	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${STAGEDIR}${DISTEL_ROOT}/ebin
+	@${LN} -sf ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/devel/distel/pkg-plist
==============================================================================
--- head/devel/distel/pkg-plist	Tue May 13 15:38:51 2014	(r353965)
+++ head/devel/distel/pkg-plist	Tue May 13 15:49:43 2014	(r353966)
@@ -1,11 +1,12 @@
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/distel.beam
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/distel_ie.beam
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/fdoc.beam
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/otp_doc.beam
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/distel.erl
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/distel_ie.erl
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
-%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/otp_doc.erl
+lib/erlang/lib/distel
+lib/erlang/lib/distel-%%VERSION%%/ebin/distel.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/distel_ie.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/fdoc.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/otp_doc.beam
+lib/erlang/lib/distel-%%VERSION%%/src/distel.erl
+lib/erlang/lib/distel-%%VERSION%%/src/distel_ie.erl
+lib/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
+lib/erlang/lib/distel-%%VERSION%%/src/otp_doc.erl
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -49,8 +50,8 @@
 @dirrm %%EMACS_SITE_LISPDIR%%/distel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src
- at dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin
- at dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%
- at exec ln -sf distel-%%VERSION%% %D/%%LIB32DIR%%/erlang/lib/distel
- at unexec rm -f %D/%%LIB32DIR%%/erlang/lib/distel
+ at dirrm lib/erlang/lib/distel-%%VERSION%%/src
+ at dirrm lib/erlang/lib/distel-%%VERSION%%/ebin
+ at dirrm lib/erlang/lib/distel-%%VERSION%%
+ at dirrmtry lib/erlang/lib
+ at dirrmtry lib/erlang