/[ports]/head/Mk/bsd.port.mk
ViewVC logotype

Diff of /head/Mk/bsd.port.mk

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 368570 by bdrewery, Fri Sep 19 15:44:55 2014 UTC revision 368803 by bapt, Mon Sep 22 05:47:32 2014 UTC
# Line 1099  CO_ENV+=       STAGEDIR=${STAGEDIR} \ Line 1099  CO_ENV+=       STAGEDIR=${STAGEDIR} \
1099                          PLIST_SUB_SED="${PLIST_SUB_SED}" \                          PLIST_SUB_SED="${PLIST_SUB_SED}" \
1100                          PORT_OPTIONS="${PORT_OPTIONS}" \                          PORT_OPTIONS="${PORT_OPTIONS}" \
1101                          PORTSDIR="${PORTSDIR}"                          PORTSDIR="${PORTSDIR}"
1102  MINIMAL_PKG_VERSION=    1.3.7  MINIMAL_PKG_VERSION=    1.3.8
1103    
1104  # make sure bmake treats -V as expected  # make sure bmake treats -V as expected
1105  .MAKE.EXPAND_VARIABLES= yes  .MAKE.EXPAND_VARIABLES= yes
# Line 3695  check-umask: Line 3695  check-umask:
3695  .endif  .endif
3696    
3697  .if !target(install-mtree)  .if !target(install-mtree)
3698  install-mtree: ${PREFIX}  install-mtree:
3699          @if [ ${UID} != 0 ]; then \          @${DO_NADA}
                 if [ -w ${PREFIX}/ ]; then \  
                         ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \  
                 else \  
                         ${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \  
                         ${FALSE}; \  
                 fi; \  
         fi  
 .if !defined(NO_MTREE)  
         @if [ ${UID} = 0 ]; then \  
                 if [ ! -f ${MTREE_FILE} ]; then \  
                         ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \  
                         ${ECHO_MSG} "Copy it from a suitable location (e.g., ${SRC_BASE}/etc/mtree) and try again."; \  
                         exit 1; \  
                 else \  
                         ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \  
                         if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \  
                                 cd ${PREFIX}/share/nls; \  
                                 for link in POSIX en_US.US-ASCII; \  
                                 do \  
                                         if [ x"`${READLINK_CMD} $${link}`" != x"C" ]; \  
                                         then \  
                                                 ${LN} -shf C $${link}; \  
                                         fi; \  
                                 done; \  
                         fi; \  
                 fi; \  
         else \  
                 ${ECHO_MSG} "Warning: not superuser, can't run mtree."; \  
                 ${ECHO_MSG} "You may want to become root and try again to ensure correct permissions."; \  
         fi  
 .endif  
3700  .endif  .endif
3701    
3702  .if !target(install-ldconfig-file)  .if !target(install-ldconfig-file)
Legend:
Removed from v.368570  
changed lines
  Added in v.368803
  ViewVC Help
Powered by ViewVC 1.1.27