diff options
| -rw-r--r-- | mk/bulk/build.conf-example | 4 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 10 | ||||
| -rw-r--r-- | mk/fetch/sites.mk | 6 | ||||
| -rwxr-xr-x | mk/scripts/mkreadme | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index fb0be9ca478..1581ccf2a1e 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -1,4 +1,4 @@ -# $NetBSD: build.conf-example,v 1.38 2008/11/19 16:27:14 sketch Exp $ +# $NetBSD: build.conf-example,v 1.39 2011/04/22 09:03:52 spz Exp $ # # This is an example configuration file for pkgsrc bulk builds. # Actually it's a shell script that is sourced in by the pre-build, @@ -102,5 +102,5 @@ MKSUMMARY=no #SIGN_AS=username@NetBSD.org # Destination for packages and rsync options. -RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/i386 +RSYNC_DST=ftp.NetBSD.org:/pub/pkgsrc/packages/NetBSD/SomeArch/${osrev}-201xQy/ RSYNC_OPTS='-e ssh' diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index cc855d48b99..711ed25a341 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.199 2011/02/21 07:38:38 obache Exp $ +# $NetBSD: mk.conf,v 1.200 2011/04/22 09:03:52 spz Exp $ # # This file provides default values for variables that may be overridden @@ -597,7 +597,7 @@ WARN_NO_OBJECT_FMT?=yes # "arch" are replaced with OS release ("1.5", ...) and architecture # ("mipsel", ...) # Possible: any ftp url, see above. -# Default: ftp://ftp.NetBSD.org/pub/NetBSD/packages/$${rel}/$${arch} +# Default: ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${rel}/$${arch} #BIN_INSTALL_FLAGS= # List of flags passed to pkg_add(8) in the bin_install package. @@ -1822,8 +1822,8 @@ XEN12_USE_COM2?= NO # http://mirror.pacific.net.au/openoffice/ \ # http://planetmirror.com/pub/openoffice/ #MASTER_SITE_SOURCEFORGE=http://optusnet.dl.sourceforge.net/sourceforge/ -#MASTER_SITE_BACKUP= ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ -#MASTER_SITE_LOCAL= ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ +#MASTER_SITE_BACKUP= ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ +#MASTER_SITE_LOCAL= ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/ # # Austria @@ -1903,7 +1903,7 @@ XEN12_USE_COM2?= NO #MASTER_SITE_MOZILLA= ftp://ftp.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/ #MASTER_SITE_XEMACS= ftp://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/ #MASTER_SITE_BACKUP= \ -# ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ +# ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ # USA # diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk index 0896bcecb48..783a74c2747 100644 --- a/mk/fetch/sites.mk +++ b/mk/fetch/sites.mk @@ -1,4 +1,4 @@ -# $NetBSD: sites.mk,v 1.83 2011/03/29 12:49:05 zafer Exp $ +# $NetBSD: sites.mk,v 1.84 2011/04/22 09:03:53 spz Exp $ # # This Makefile fragment defines read-only MASTER_SITE_* variables # representing some well-known master distribution sites for software. @@ -462,6 +462,6 @@ MASTER_SITE_NETLIB+= \ # The primary backup site. MASTER_SITE_BACKUP?= \ ftp://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \ - ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ \ - http://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ \ + ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \ + http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \ ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/ diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index e93ccf95060..40bfe1752cc 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.25 2010/07/21 12:29:46 spz Exp $ +# $NetBSD: mkreadme,v 1.26 2011/04/22 09:03:53 spz Exp $ # # Script for README.html generation # @@ -103,7 +103,7 @@ usage(){ echo " " echo " -v|--version Displays the version of this script and exits." echo " " - echo "Example: $prog -p /pub/NetBSD/packages/pkgsrc -P /pub/NetBSD/packages -f" + echo "Example: $prog -p /pub/pkgsrc/current/pkgsrc -P /pub/pkgsrc -f" echo " " } |