summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2014-09-24 15:34:14 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2014-09-24 15:34:14 +0000
commit801f2e471d7c189b6330df451f31f838f0a71456 (patch)
tree9d0b6d8d2e71be220f695bcb9d22462802ef54cd /lang
parentsyusutils/vagrant: fix with newer bundler (diff)
Cleanup plist generation in Erlang runtime ports.
Notes
Notes: svn path=/head/; revision=369182
Diffstat (limited to 'lang')
-rw-r--r--lang/erlang-runtime15/Makefile20
-rw-r--r--lang/erlang-runtime15/pkg-plist4
-rw-r--r--lang/erlang-runtime16/Makefile20
-rw-r--r--lang/erlang-runtime16/pkg-plist4
-rw-r--r--lang/erlang-runtime17/Makefile20
-rw-r--r--lang/erlang-runtime17/pkg-plist4
6 files changed, 9 insertions, 63 deletions
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 0eaca3570a2f..3cfe73872f53 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -26,7 +26,6 @@ ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
SUB_FILES= pkg-message
SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
-PLIST_SUB= ERLANG_LIB=${ERLANG_LIB}
MAKE_JOBS_UNSAFE=yes
@@ -124,7 +123,6 @@ CONFIGURE_ARGS+=--without-odbc
ERLANG_MAN= otp_doc_man_${ERL_RELEASE}.tar.gz
ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz
-ERLANG_PLIST= ${WRKDIR}/pkg-plist
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads
@@ -178,23 +176,11 @@ post-install:
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \
| ${SORT} \
- | ${SED} -e 's#^#@exec ${MKDIR} %D/#g' \
- > ${ERLANG_PLIST}
+ | ${SED} -e 's#^#@dir #g' \
+ > ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
| ${SORT} \
- >> ${ERLANG_PLIST}
-
- @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d \
- | ${SORT} -r \
- | ${SED} -e 's/^/@dirrm /g' \
- >> ${ERLANG_PLIST}
-
- @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
- @${ECHO_CMD} "/Insert PLIST here" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "r ${ERLANG_PLIST}" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
- @cd ${WRKDIR}; ex < ex.script
+ >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/lang/erlang-runtime15/pkg-plist b/lang/erlang-runtime15/pkg-plist
deleted file mode 100644
index c9aaa67c5538..000000000000
--- a/lang/erlang-runtime15/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment Insert PLIST here
-@comment -=[ begin PLIST.lib-erlang ]=-
-@comment -=[ end PLIST.lib-erlang ]=-
-@dirrmtry lib/%%ERLANG_LIB%%
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 67052ec6be05..33550caef838 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -26,7 +26,6 @@ ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
SUB_FILES= pkg-message
SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
-PLIST_SUB= ERLANG_LIB=${ERLANG_LIB}
MAKE_JOBS_UNSAFE=yes
@@ -124,7 +123,6 @@ CONFIGURE_ARGS+=--without-odbc
ERLANG_MAN= otp_doc_man_${ERL_RELEASE}.tar.gz
ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz
-ERLANG_PLIST= ${WRKDIR}/pkg-plist
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads
@@ -178,23 +176,11 @@ post-install:
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \
| ${SORT} \
- | ${SED} -e 's#^#@exec ${MKDIR} %D/#g' \
- > ${ERLANG_PLIST}
+ | ${SED} -e 's#^#@dir #g' \
+ > ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
| ${SORT} \
- >> ${ERLANG_PLIST}
-
- @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d \
- | ${SORT} -r \
- | ${SED} -e 's/^/@dirrm /g' \
- >> ${ERLANG_PLIST}
-
- @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
- @${ECHO_CMD} "/Insert PLIST here" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "r ${ERLANG_PLIST}" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
- @cd ${WRKDIR}; ex < ex.script
+ >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/lang/erlang-runtime16/pkg-plist b/lang/erlang-runtime16/pkg-plist
deleted file mode 100644
index c9aaa67c5538..000000000000
--- a/lang/erlang-runtime16/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment Insert PLIST here
-@comment -=[ begin PLIST.lib-erlang ]=-
-@comment -=[ end PLIST.lib-erlang ]=-
-@dirrmtry lib/%%ERLANG_LIB%%
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index ad649ab7a229..137b965585e4 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -25,7 +25,6 @@ ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
SUB_FILES= pkg-message
SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
-PLIST_SUB= ERLANG_LIB=${ERLANG_LIB}
MAKE_JOBS_UNSAFE=yes
@@ -124,7 +123,6 @@ CONFIGURE_ARGS+=--without-odbc
ERLANG_MAN= otp_doc_man_${ERL_RELEASE}.tar.gz
ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz
-ERLANG_PLIST= ${WRKDIR}/pkg-plist
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads
@@ -178,23 +176,11 @@ post-install:
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \
| ${SORT} \
- | ${SED} -e 's#^#@exec ${MKDIR} %D/#g' \
- > ${ERLANG_PLIST}
+ | ${SED} -e 's#^#@dir #g' \
+ > ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
| ${SORT} \
- >> ${ERLANG_PLIST}
-
- @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d \
- | ${SORT} -r \
- | ${SED} -e 's/^/@dirrm /g' \
- >> ${ERLANG_PLIST}
-
- @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
- @${ECHO_CMD} "/Insert PLIST here" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "r ${ERLANG_PLIST}" >> ${WRKDIR}/ex.script
- @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
- @cd ${WRKDIR}; ex < ex.script
+ >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/lang/erlang-runtime17/pkg-plist b/lang/erlang-runtime17/pkg-plist
deleted file mode 100644
index c9aaa67c5538..000000000000
--- a/lang/erlang-runtime17/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment Insert PLIST here
-@comment -=[ begin PLIST.lib-erlang ]=-
-@comment -=[ end PLIST.lib-erlang ]=-
-@dirrmtry lib/%%ERLANG_LIB%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 10:16:08 +0000