FreeBSD Bugzilla – Attachment 48829 Details for
Bug 74691
Fix pkg-plist handling for ports that set PREFIX
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 1.61 KB, created by
Kris Kennaway
on 2004-12-04 23:20:29 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Kris Kennaway
Created:
2004-12-04 23:20:29 UTC
Size:
1.61 KB
patch
obsolete
>Index: bsd.port.mk >=================================================================== >RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v >retrieving revision 1.500 >diff -u -r1.500 bsd.port.mk >--- bsd.port.mk 19 Nov 2004 13:45:07 -0000 1.500 >+++ bsd.port.mk 4 Dec 2004 23:23:41 -0000 >@@ -3576,7 +3576,7 @@ > _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \ > pre-su-install-script do-install post-install \ > post-install-script add-plist-info add-plist-docs \ >- compress-man run-ldconfig fake-pkg security-check >+ add-plist-post compress-man run-ldconfig fake-pkg security-check > _PACKAGE_DEP= install > _PACKAGE_SEQ= package-message pre-package pre-package-script \ > do-package post-package-script >@@ -4677,8 +4677,20 @@ > @${ECHO_CMD} "@exec install-info %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ > >> ${TMPPLIST} > .endfor >-.if !defined(NO_MTREE) >+.if (${PREFIX} != "/usr") > @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} >+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE}) >+ @${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST} >+.endif >+.endif >+ >+# If we're installing into a non-standard PREFIX, we need to remove that directory at >+# deinstall-time >+add-plist-post: >+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") >+ @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} >+.else >+ @${DO_NADA} > .endif > > # Compress (or uncompress) and symlink manpages.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 74691
: 48829