svn commit: r331244 - in head/lang/erlang-runtime16: . files
Jimmy Olgeni
olgeni at FreeBSD.org
Tue Oct 22 09:20:17 UTC 2013
Author: olgeni
Date: Tue Oct 22 09:20:15 2013
New Revision: 331244
URL: http://svnweb.freebsd.org/changeset/ports/331244
Log:
- Upgrade to version R16B02.
- Add staging support and simplify plist generation.
- Add LDFLAGS to unbreak the ODBC build.
Deleted:
head/lang/erlang-runtime16/Makefile.lib
head/lang/erlang-runtime16/Makefile.man
Modified:
head/lang/erlang-runtime16/Makefile
head/lang/erlang-runtime16/distinfo
head/lang/erlang-runtime16/files/pkg-message.in
head/lang/erlang-runtime16/pkg-plist
Modified: head/lang/erlang-runtime16/Makefile
==============================================================================
--- head/lang/erlang-runtime16/Makefile Tue Oct 22 09:06:59 2013 (r331243)
+++ head/lang/erlang-runtime16/Makefile Tue Oct 22 09:20:15 2013 (r331244)
@@ -2,15 +2,11 @@
# $FreeBSD$
PORTNAME= erlang
-PORTVERSION= 16.b.01
+PORTVERSION= 16.b.02
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
- http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \
- http://www.erlang.se/doc/:erlangse \
- http://www.erlang.se/publications/:publications \
- http://www.sics.se/~joe/thesis/:joe \
- ${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
+ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg
PKGNAMESUFFIX= -runtime
DISTNAME= otp_src_${ERL_RELEASE}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \
@@ -25,12 +21,12 @@ COMMENT= A functional programming langua
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}${PORTVERSION:C/\..*//}
-WRKSRC= ${WRKDIR}/otp_src_R16B01
+WRKSRC= ${WRKDIR}/otp_src_R16B02
ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
SUB_FILES= pkg-message
-SUB_LIST= TOOLS_VSN=${TOOLS_VSN} ERLANG_LIB=${ERLANG_LIB}
+SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
PLIST_SUB= ERLANG_LIB=${ERLANG_LIB}
MAKE_JOBS_UNSAFE=yes
@@ -54,8 +50,8 @@ ERL_RELEASE= R${PORTVERSION:S/.//g:U}
USES= gmake perl5
GNU_CONFIGURE= yes
+LDFLAGS+= -L${LOCALBASE}/lib
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
@@ -168,73 +164,36 @@ MAKE_ARGS+= ARCH=x86
# Erlang man pages are more of internal documentation using the man format than
# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-NO_MANCOMPRESS= yes
-
-MAN1PREFIX= ${PREFIX}/lib/${ERLANG_LIB}
-MAN3PREFIX= ${PREFIX}/lib/${ERLANG_LIB}
-MAN4PREFIX= ${PREFIX}/lib/${ERLANG_LIB}
-MAN6PREFIX= ${PREFIX}/lib/${ERLANG_LIB}
-MAN7PREFIX= ${PREFIX}/lib/${ERLANG_LIB}
-
# 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:
@for SECTION in 1 3 4 6 7; do \
${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
- -C ${PREFIX}/lib/${ERLANG_LIB} \
+ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
done
- @${RM} -rf ${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+ @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+
.if ${PORT_OPTIONS:MDOCS}
@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
- -C ${PREFIX}/lib/${ERLANG_LIB}
+ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
- ${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
.endif
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${ERLANG_LIB}
- @${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/${ERLANG_LIB}
-# All non-library files.
-
- @cd ${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \
- | ${GREP} -v "^lib/${ERLANG_LIB}/lib" \
+ @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \
| ${SORT} \
| ${SED} -e 's#^#@exec ${MKDIR} %D/#g' \
> ${ERLANG_PLIST}
- @cd ${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
- | ${GREP} -v "^lib/${ERLANG_LIB}/man" \
- | ${GREP} -v "^lib/${ERLANG_LIB}/lib" \
+ @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
| ${SORT} \
>> ${ERLANG_PLIST}
-# Stock OTP libraries.
-
- @for LIBRARY in ${OTP_LIBS}; do \
- cd ${PREFIX}; ${TEST} -d lib/${ERLANG_LIB}/lib/$${LIBRARY} \
- && ${FIND} lib/${ERLANG_LIB}/lib/$${LIBRARY} -type f -o -type l; \
- done | ${SORT} >> ${ERLANG_PLIST}
-
-# Stock OTP library directories.
-
- @for LIBRARY in ${OTP_LIBS}; do \
- cd ${PREFIX}; ${TEST} -d lib/${ERLANG_LIB}/lib/$${LIBRARY} \
- && ${FIND} lib/${ERLANG_LIB}/lib/$${LIBRARY} -type d -empty \
- | ${SED} -e 's#^#@exec ${MKDIR} %D/#g'; \
- done | ${SORT} >> ${ERLANG_PLIST}
-
- @for LIBRARY in ${OTP_LIBS}; do \
- cd ${PREFIX}; ${TEST} -d lib/${ERLANG_LIB}/lib/$${LIBRARY} \
- && ${FIND} lib/${ERLANG_LIB}/lib/$${LIBRARY} -type d \
- | ${SED} -e 's/^/@dirrm /g'; \
- done | ${SORT} -r >> ${ERLANG_PLIST}
-
-# Other directories.
-
- @cd ${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d | ${SORT} -r \
- | ${GREP} -v "^lib/${ERLANG_LIB}/man" \
- | ${GREP} -v "^lib/${ERLANG_LIB}/lib" \
+ @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d \
+ | ${SORT} -r \
| ${SED} -e 's/^/@dirrm /g' \
>> ${ERLANG_PLIST}
@@ -244,9 +203,5 @@ post-install:
@${ECHO_CMD} "r ${ERLANG_PLIST}" >> ${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
@cd ${WRKDIR}; ex < ex.script
- @${CAT} ${PKGMESSAGE}
-
-.include "Makefile.lib"
-.include "Makefile.man"
.include <bsd.port.mk>
Modified: head/lang/erlang-runtime16/distinfo
==============================================================================
--- head/lang/erlang-runtime16/distinfo Tue Oct 22 09:06:59 2013 (r331243)
+++ head/lang/erlang-runtime16/distinfo Tue Oct 22 09:20:15 2013 (r331244)
@@ -1,6 +1,6 @@
-SHA256 (erlang/otp_src_R16B01.tar.gz) = da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0
-SIZE (erlang/otp_src_R16B01.tar.gz) = 65813898
-SHA256 (erlang/otp_doc_man_R16B01.tar.gz) = 71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2
-SIZE (erlang/otp_doc_man_R16B01.tar.gz) = 1316676
-SHA256 (erlang/otp_doc_html_R16B01.tar.gz) = fa8fc507b3f799e8ff4d2ab800f054f3f99b39212e348504024403a6951bd036
-SIZE (erlang/otp_doc_html_R16B01.tar.gz) = 33129717
+SHA256 (erlang/otp_src_R16B02.tar.gz) = 6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85
+SIZE (erlang/otp_src_R16B02.tar.gz) = 66023455
+SHA256 (erlang/otp_doc_man_R16B02.tar.gz) = b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789
+SIZE (erlang/otp_doc_man_R16B02.tar.gz) = 1318271
+SHA256 (erlang/otp_doc_html_R16B02.tar.gz) = 2d54119b30c4d905b6b1298865309c3392fefb1580ad69725e997644bed04b7f
+SIZE (erlang/otp_doc_html_R16B02.tar.gz) = 33241266
Modified: head/lang/erlang-runtime16/files/pkg-message.in
==============================================================================
--- head/lang/erlang-runtime16/files/pkg-message.in Tue Oct 22 09:06:59 2013 (r331243)
+++ head/lang/erlang-runtime16/files/pkg-message.in Tue Oct 22 09:20:15 2013 (r331244)
@@ -1,13 +1,4 @@
===========================================================================
-Installation tips:
-
-You can find an emacs mode for Erlang here:
-
- %%LOCALBASE%%/lib/%%ERLANG_LIB%%/lib/tools-%%TOOLS_VSN%%/emacs
-
-You may wish to add the following line to /etc/manpath.config:
-
-OPTIONAL_MANPATH %%LOCALBASE%%/lib/%%ERLANG_LIB%%/man
To use this runtime port for development or testing, just prepend
its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable.
Modified: head/lang/erlang-runtime16/pkg-plist
==============================================================================
--- head/lang/erlang-runtime16/pkg-plist Tue Oct 22 09:06:59 2013 (r331243)
+++ head/lang/erlang-runtime16/pkg-plist Tue Oct 22 09:20:15 2013 (r331244)
@@ -1,11 +1,4 @@
@comment Insert PLIST here
@comment -=[ begin PLIST.lib-erlang ]=-
@comment -=[ end PLIST.lib-erlang ]=-
- at dirrm lib/%%ERLANG_LIB%%/man/man7
- at dirrm lib/%%ERLANG_LIB%%/man/man6
- at dirrm lib/%%ERLANG_LIB%%/man/man4
- at dirrm lib/%%ERLANG_LIB%%/man/man3
- at dirrm lib/%%ERLANG_LIB%%/man/man1
- at dirrm lib/%%ERLANG_LIB%%/man
- at dirrmtry lib/%%ERLANG_LIB%%/lib
@dirrmtry lib/%%ERLANG_LIB%%
More information about the svn-ports-all
mailing list