Diff for /src/share/mk/Attic/bsd.port.mk between versions 1.22 and 1.23

version 1.22, 2004/11/27 13:22:26 version 1.23, 2004/11/28 22:29:19
Line 1 Line 1
 # $FreeBSD: src/share/mk/bsd.port.mk,v 1.303.2.2 2002/07/17 19:08:23 ru Exp $  # $FreeBSD: src/share/mk/bsd.port.mk,v 1.303.2.2 2002/07/17 19:08:23 ru Exp $
# $DragonFly$# $DragonFly: src/share/mk/bsd.port.mk,v 1.22 2004/11/27 13:22:26 joerg Exp $
   
 PORTSDIR?=      /usr/ports  PORTSDIR?=      /usr/ports
 DFPORTSDIR?=    /usr/dfports  DFPORTSDIR?=    /usr/dfports
Line 45  CCVER= gcc34 Line 45  CCVER= gcc34
   
 .else  .else
   
   .if !defined(BEFOREPORTMK)
   .undef PORTSDIR
   .endif
   
 .undef BEFOREPORTMK  .undef BEFOREPORTMK
 .undef AFTERPORTMK  .undef AFTERPORTMK
   
Line 77  TARGETS+= reinstall Line 81  TARGETS+= reinstall
 TARGETS+=       install  TARGETS+=       install
 TARGETS+=       tags  TARGETS+=       tags
   
.undef PORTSDIR.if !defined(_DFPORTS_REDIRECT)
 _DFPORTS_REDIRECT=
 .if !make(package-depends-list) && !make(all-depends-list) && \  .if !make(package-depends-list) && !make(all-depends-list) && \
     !make(run-depends-list) && !make(build-depends-list) && \      !make(run-depends-list) && !make(build-depends-list) && \
    !make(describe) && !defined(DFPORTS_WARNING)    !make(describe)
 .BEGIN:  .BEGIN:
         @echo "WARNING, USING DRAGONFLY OVERRIDE ${DFPORTSDIR}/${PORTPATH}"          @echo "WARNING, USING DRAGONFLY OVERRIDE ${DFPORTSDIR}/${PORTPATH}"
         cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS}          cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS}
DFPORTS_WARNING=.else
 .BEGIN:
         @cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS} 
 .endif
 .endif  .endif
   
 .if !empty(.TARGETS)  .if !empty(.TARGETS)
Line 104  X_WINDOW_SYSTEM?= xfree86-4 Line 112  X_WINDOW_SYSTEM?= xfree86-4
 CAT?=                   cat  CAT?=                   cat
 PREFIX?=                /usr  PREFIX?=                /usr
 PERL_LEVEL?=            5  PERL_LEVEL?=            5
   LOCALBASE?=             /usr/local
   SED?=                   /usr/bin/sed
   ECHO_CMD?=              echo
   GREP?=                  /usr/bin/grep
   AWK?=                   /usr/bin/awk
   UNAME?=                 /usr/bin/uname
   EXPR?=                  /bin/expr
   HAVE_SDL?=
   
 # WORKAROUND to get portupgrade working  # WORKAROUND to get portupgrade working
 # Taken from: ${PORTSDIR}/Mk/bsd.port.mk  # Taken from: ${PORTSDIR}/Mk/bsd.port.mk

Removed from v.1.22  
changed lines
  Added in v.1.23