 @@ -1,14 +1,14 @@
-# $NetBSD: fetch.mk,v 1.54 2012/02/06 12:41:29 fhajny Exp $
+# $NetBSD: fetch.mk,v 1.55 2012/02/06 12:49:38 fhajny Exp $
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 # Where to put distfiles that don't have any other master site
 MASTER_SITE_LOCAL?=	${MASTER_SITE_BACKUP:=LOCAL_PORTS/}
 # Set up _ORDERED_SITES to work out the exact list of sites for every file,
 # using the dynamic sites script, or ordering according to the master site
 # list, MASTER_SORT_RANDOM randomization feature, or the patterns in
 # MASTER_SORT or MASTER_SORT_REGEX as appropriate.
 # No actual sorting is done until _ORDERED_SITES is expanded.
+#
 @@ -256,26 +256,27 @@ _FETCH_ARGS+=	${PKG_VERBOSE:D-v}
 .if exists(${DISTINFO_FILE})
 _FETCH_ARGS+=	${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q}
 .endif
 .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
 _FETCH_ARGS+=	-r
 .endif
 .if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
 _FETCH_ARGS+=	-d ${DIST_SUBDIR}
 .endif
 .PHONY: do-fetch-file
 do-fetch-file: .USE
 	@${STEP_MSG} "Fetching ${.TARGET:T}"
 	${RUN} ${MKDIR} ${.TARGET:H}
 	${RUN}								\
 	for d in "" ${DIST_PATH:S/:/ /g}; do				\
 		case $$d in						\
 		""|${DISTDIR})	continue ;;				\
 		esac;							\
 		file="$$d/${DIST_SUBDIR}/${.TARGET:T}";			\
 		if ${TEST} -f $$file; then				\
 			${ECHO} "Using $$file";				\
 			${RM} -f ${.TARGET};				\
 			${LN} -s $$file ${.TARGET};			\
 		fi;							\
 	done
 	${RUN}								\

 @@ -1,14 +1,14 @@
-# $NetBSD: replace.mk,v 1.242 2012/02/06 12:41:29 fhajny Exp $
+# $NetBSD: replace.mk,v 1.243 2012/02/06 12:49:38 fhajny Exp $
+#
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -727,27 +727,27 @@ TOOLS_DEPENDS.shlock?=		shlock>=20020114
 TOOLS_CREATE+=			shlock
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.shlock=shlock
 TOOLS_PATH.shlock=		${TOOLS_PREFIX.shlock}/bin/shlock
 .  endif
 .endif
 .if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar)
 .  if !empty(PKGPATH:Marchivers/pax)
 MAKEFLAGS+=			TOOLS_IGNORE.tar=
 .  elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
 TOOLS_DEPENDS.tar?=		pax>=20040802:../../archivers/pax
 TOOLS_CREATE+=			tar
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tar=pax
-TOOLS_PATH.tar=			${TOOLS_PREFIX.tar}/bin/${NBPAX_PROGRAM_PREFIX}tar
+TOOLS_PATH.tar=			${TOOLS_PREFIX.tar}/bin/tar
 .  endif
 .endif
 .if !defined(TOOLS_IGNORE.tclsh) && !empty(_USE_TOOLS:Mtclsh)
 .  if !empty(PKGPATH:Mlang/tcl)
 MAKEFLAGS+=			TOOLS_IGNORE.tclsh=
 .  elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS])
 TOOLS_DEPENDS.tclsh?=		tcl>=8.4:../../lang/tcl
 TOOLS_CREATE+=			tclsh
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tclsh=tcl
 TOOLS_PATH.tclsh=		${TOOLS_PREFIX.tclsh}/bin/tclsh
 .  endif
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: transform-gcc,v 1.23 2012/02/06 12:41:29 fhajny Exp $
+# $NetBSD: transform-gcc,v 1.24 2012/02/06 12:49:38 fhajny Exp $
+#
 # This file handles the transformations needed for gcc that can be done
 # looking at only one argument at a time.
+#
 transform_setname "transform-gcc"
 case $arg in
 # Standard options.
 -[EcgOos]		|\
 -[DILlU]?*		|\
 -O[01]			) transform_pass ;;
 @@ -102,29 +102,26 @@ case $arg in
 -Wreturn-type		|\
 -Wshadow		|\
 -Wsign-compare		|\
 -Wstrict-aliasing	|\
 -Wstrict-prototypes	|\
 -Wswitch		|\
 -Wunused		|\
 -Wundef			|\
 -Wwrite-strings		) transform_pass ;;
 # There are some packages suppressing all warnings. We don't want that.
 -w			) transform_discard ;;
 # Discard visibility (Sun linker won't support it)
 -fvisibility=*          ) transform_discard ;;
 # Options specific to g++.
 -fexceptions		|\
 -fmessage-length=*	|\
 -fno-check-new		|\
 -fno-exceptions		|\
 -fno-rtti		|\
 -Wno-non-virtual-dtor	|\
 -ftemplate-depth=*	) transform_pass ;;
 # Options specific to Objective C
 -fgnu-runtime		|\
 -fconstant-string-class=* ) transform_pass ;;