diff options
| author | antoine <antoine@FreeBSD.org> | 2014-11-30 07:56:21 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-11-30 07:56:21 +0800 |
| commit | 65d67a5e250b8eaae5a1a0e51be1ed9db9a9f9db (patch) | |
| tree | b9b200deba5ee13f85f9929e27d33e5ed944d2bb /Mk | |
| parent | de947b323d57ccd68458903328b036a21cd7f83f (diff) | |
| download | freebsd-ports-gnome-65d67a5e250b8eaae5a1a0e51be1ed9db9a9f9db.tar.gz freebsd-ports-gnome-65d67a5e250b8eaae5a1a0e51be1ed9db9a9f9db.tar.zst freebsd-ports-gnome-65d67a5e250b8eaae5a1a0e51be1ed9db9a9f9db.zip | |
Cleanup plist of ocaml ports
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.ocaml.mk | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk index 48a849456053..2a5fdbe7dc03 100644 --- a/Mk/bsd.ocaml.mk +++ b/Mk/bsd.ocaml.mk @@ -130,7 +130,6 @@ ocaml-findlib: @${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} . endif - @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}/${DIR}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ >> ${TMPPLIST} . endfor @@ -155,10 +154,8 @@ ocaml-ldconfig: .if defined(USE_OCAML_WASH) . if !target(ocaml-wash) ocaml-wash: - @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}" >> ${TMPPLIST} # If ld.conf is empty - @${ECHO_CMD} "@rmtry ${OCAML_LDCONF}" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrmtry ${OCAML_LIBDIR}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST} . endif .endif @@ -177,25 +174,6 @@ ocaml-wash: @${DO_NADA} .endif -# -# XXX: temporary workaround for non-standard PREFIX -# -.if !target(add-plist-post) -add-plist-post: -. if (${PREFIX} != ${LOCALBASE} && \ - ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") - @${ECHO_CMD} "@dirrmtry ${PREFIX}" >> ${TMPPLIST} -. else - @${DO_NADA} -. endif - -# If we are using PORTDOCS macro port cannot delete OCAML_DOCSDIR, so -# we shoud try to accomodate it -. if defined(PORTDOCS) - @${ECHO_CMD} "@dirrmtry ${OCAML_DOCSDIR}" >> ${TMPPLIST} -. endif -.endif - .endif #!defined(OCAML_include) .if defined(_POSTMKINCLUDED) |