[BACK]Return to bsd.port.mk CVS log [TXT][DIR] Up to [local] / src / share / mk

Diff for /src/share/mk/bsd.port.mk between version 1.27 and 1.28

version 1.27, 1998/04/05 04:20:38 version 1.28, 1998/04/06 21:46:00
Line 676 
Line 676 
 PATCH_SITES:=   ${MASTER_SITE_OVERRIDE} ${PATCH_SITES}  PATCH_SITES:=   ${MASTER_SITE_OVERRIDE} ${PATCH_SITES}
 .endif  .endif
   
   # The following is a FreeBSD construct that dopes not work in OpenBSD.
   # Since OpenBSD does not put packages in /cdrom/ports/packages it
   # is safe to leave (but I may remove it in the future).
   #
 # Search CDROM first if mounted, symlink instead of copy if  # Search CDROM first if mounted, symlink instead of copy if
 # FETCH_SYMLINK_DISTFILES is set  # FETCH_SYMLINK_DISTFILES is set
 .if exists(/cdrom/ports/distfiles)  .if exists(/cdrom/ports/distfiles)
Line 686 
Line 690 
 .endif  .endif
 .endif  .endif
   
   # OpenBSD code to handle ports distfiles on a CDROM.  The distfiles
   # are located in /cdrom/distfiles/${DIST_SUBDIR}/ (assuming that the
   # CDROM is mounted on /cdrom).
   #
   .if exists(/cdrom/distfiles)
   CDROM_SITE:=    /cdrom/distfiles/${DIST_SUBDIR}
   .if defined(FETCH_SYMLINK_DISTFILES)
   CDROM_COPY:=    ${LN}
   CDROM_OPT=              -s
   .else
   CDROM_COPY:=    ${CP}
   CDROM_OPT=              -f
   .endif
   .endif
   
 # Derived names so that they're easily overridable.  # Derived names so that they're easily overridable.
 DISTFILES?=             ${DISTNAME}${EXTRACT_SUFX}  DISTFILES?=             ${DISTNAME}${EXTRACT_SUFX}
 PKGNAME?=               ${DISTNAME}  PKGNAME?=               ${DISTNAME}
Line 976 
Line 995 
                                 ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \                                  ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \
                                 ${ECHO_MSG} ">> Please correct this problem and try again."; \                                  ${ECHO_MSG} ">> Please correct this problem and try again."; \
                                 exit 1; \                                  exit 1; \
                           fi ; \
                           if [ ! -z ${CDROM_COPY} ]; then \
                                   if ${CDROM_COPY} ${CDROM_OPT} ${CDROM_SITE}/$$file .; then \
                                           continue; \
                                   fi ; \
                         fi ; \                          fi ; \
                         ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \                          ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
                         for site in ${MASTER_SITES}; do \                          for site in ${MASTER_SITES}; do \

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28