Sync to HEAD

author: jlam <jlam> 2003-08-19 20:11:08 +0000
committer: jlam <jlam> 2003-08-19 20:11:08 +0000
commit: 11e39ec6fedfac4b0936c996f4f513f5a8752589 (patch)
tree: 240859f7e79f4a13a9ff098fe5449adf86e04eb2
parent: d1693f7a3848b5faf7dd036ad41c2be92f4aeb0a (diff)
download: pkgsrc-11e39ec6fedfac4b0936c996f4f513f5a8752589.tar.gz
5 files changed, 55 insertions, 44 deletions
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index 3538357423f..6c112b55041 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.22 2003/05/06 17:42:03 jmmv Exp $
+# $NetBSD: post-build,v 1.22.2.1 2003/08/19 20:11:09 jlam Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -38,6 +38,8 @@ getconf("arch"); 		# `uname -m`
 chomp($date=`date`);
 $reportf=basename($REPORT);
 
+chomp($os=`uname -s`);
+
 # extract the name of the files used for the build log and broken build log.
 # these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf
 chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`);
@@ -63,7 +65,7 @@ $verbose=1;
 
 if ($verbose) {
 	print "\n";
-	print "*** NetBSD $osrev/$arch\n";
+	print "*** $os $osrev/$arch\n";
 	print "*** Result of bulk pkgsrc build as of $date:\n";
 	print "\n";
 	printf ("%-23s State       \tBreaks\t(last modified, maintainer)\n","Pkg");
@@ -87,12 +89,12 @@ open(HTML,">$REPORT") or die "Can't write $REPORT: $!\n";
 print HTML <<EOHTML
 <HTML>
 <HEAD>
-<TITLE>NetBSD-$osrev/$arch bulk package build</TITLE>
+<TITLE>$os-$osrev/$arch bulk package build</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#cccccc>
 
-<H1> NetBSD $osrev/$arch </H1>
+<H1> $os $osrev/$arch </H1>
 <H2>Output of the pkgsrc bulk build<BR>
     as of $date</H2>
 
@@ -135,15 +137,25 @@ while (<BF>) {
 	$nunpackaged++;
     }
 
-    # The idea of this is stolen from bsd.pkg.mk's
-    # show-pkgtools-version target - thanks Al! :-)
-    $whofile = `find ${USR_PKGSRC}/${pkg} -type f -print  | xargs ident 2>/dev/null | awk '\$1 ~ /\\\$NetBSD/ { gsub("/", "", \$4); print \$4 " " \$6 " " \$2 }' | sort -n | tail -n 1 | awk '{ print \$2 " " \$3 }' `;
-    $whofile=~s/,v$//;
-    chomp($whofile);
-    ($who,$file) = split(/\s+/, $whofile);
+    @idents = `find ${USR_PKGSRC}/${pkg} -type f -print | xargs grep \\\$NetBSD`;
+    $datetime = "";
+    $who = "nobody";
+    $file = "";
+    $ver = "";
+    foreach $ident (@idents) {
+	$ident =~ /\$[N]etBSD: ([^ ]*),v ([^ ]*) ([^ ]*) ([^ ]*) ([^ ]*) Exp \$/;
+	if ("$3 $4" gt $datetime) {
+	    $datetime = "$3 $4";
+	    $who = $5;
+	    $file = $1;
+	    $ver = $1;
+	}
+    }
 
-    # $maintainer=`( cd $USR_PKGSRC/$pkg ; ( echo '.include "Makefile"' ; echo 'bla: ; \@echo ${MAINTAINER}' ) | $ENV{"BMAKE"} -f - bla )`;
-    $maintainer=`grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile | awk '{ print \$2\$3\$4\$5\$6}' | sed -e 's/\</&lt;/g' -e 's/\>/&gt;/g'`;
+    $maintainer=`grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile`;
+    $maintainer =~ s/MAINTAINER=[ \t]*//;
+    $maintainer =~ s/</&lt;/g;
+    $maintainer =~ s/>/&gt;/g;
     chomp($maintainer);
    
     print HTML "<TR><TD><A HREF=\"$bf\">$pkg</A>";
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 5e7a054cdd8..9cc88252646 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -37,6 +37,10 @@ if [ -z "$RSYNC_DST_SPECIFIC" -o -z "$RSYNC_DST_OTHER" ]; then
 	echo "the major.minor release string is used.  For example, on a 1.5.1"
 	echo "alpha system you would use:"
 	echo "  user@ftp.netbsd.org:/pub/NetBSD/packages/1.5/alpha"
+	echo "If you are building from pkgsrc current, set the destination"
+	echo "to major.minor-latest. For example, on a 1.6.1 m68k system where"
+	echo "building pkgsrc current (assuming pkgsrc-1-6 is already built):
+	echo "  user@ftp.netbsd.org:/pub/NetBSD/packages/1.6-latest/m68k"
 	echo " "
 	exit 1
 fi
@@ -125,4 +129,3 @@ fi
 if [ "$failed" = "no" ]; then
 	rm -fr $TMP
 fi
-
diff --git a/mk/emacs.mk b/mk/emacs.mk
index afe8328d133..d8d253e5bbe 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.14 2003/04/24 18:22:07 jmc Exp $
+# $NetBSD: emacs.mk,v 1.14.4.1 2003/08/19 20:11:08 jlam Exp $
 #
 # A Makefile fragment for Emacs Lisp packages.
 #
@@ -84,7 +84,7 @@ _EMACS_VERSION_XEMACS_MINOR=	${_EMACS_VERSION_XEMACS:C/^[0-9]*\.//:C/[^0-9].*//}
 	${_EMACS_VERSION_XEMACS_MINOR} == "5"
 _EMACS_VERSION_xemacs215_INSTALLED=	yes
 .elif ${_EMACS_VERSION_XEMACS_MAJOR} == "21" && \
-	${_EMACS_VERSION_XEMACS_MINOR} == "1"
+	${_EMACS_VERSION_XEMACS_MINOR} == "4"
 _EMACS_VERSION_xemacs214_INSTALLED=	yes
 .endif
 .endif
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index d088e164357..c09c6b3ad69 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.14.2.3 2003/08/16 09:08:50 jlam Exp $
+# $NetBSD: texinfo.mk,v 1.14.2.4 2003/08/19 20:11:08 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
 # not empty or USE_MAKEINFO is not "no".
@@ -48,16 +48,6 @@ FILES_SUBST+=		INSTALL_INFO=${INSTALL_INFO:Q}
 FILES_SUBST+=		INFO_DIR=${INFO_DIR:Q}
 .endif # INFO_FILES
 
-# When not using buildlink2 set INSTALL_INFO in environment to ${TRUE}
-# so the package build/install step does not register itself the info
-# files as this is the job of the INSTALL script.
-# This is far from being 100% robust but it is "Mostly Harmless"
-# when it fails to catch some install-info invocations.
-.if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+=		INSTALL_INFO="${TRUE}"
-MAKE_ENV+=		INSTALL_INFO="${TRUE}"
-.endif
-
 .if empty(USE_MAKEINFO:M[nN][oO])
 #
 # Handle makeinfo.
@@ -121,20 +111,6 @@ MAKEINFO_ARGS+=		${_MAKEINFO_SPLIT_SIZE_ARG}
 .    endif
 MAKEINFO=		${_MAKEINFO} ${MAKEINFO_ARGS}
 .  endif
-
-# When not using buildlink2 set MAKEINFO in environment to the pathname
-# of the right makeinfo command.
-.  if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+=		MAKEINFO="${MAKEINFO}"
-MAKE_ENV+=		MAKEINFO="${MAKEINFO}"
-.  endif
-
-.else # !USE_MAKEINFO
-# When not using buildlink2 set MAKEINFO in environment to ${FALSE}
-.  if !empty(USE_BUILDLINK2:M[nN][oO])
-CONFIGURE_ENV+=		MAKEINFO="${FALSE}"
-MAKE_ENV+=		MAKEINFO="${FALSE}"
-.  endif
 .endif # USE_MAKEINFO
 
 .endif # TEXINFO_MK
diff --git a/mk/tools.mk b/mk/tools.mk
index 9861cd42ce7..286040ece4a 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.4.2.3 2003/08/16 09:08:50 jlam Exp $
+# $NetBSD: tools.mk,v 1.4.2.4 2003/08/19 20:11:09 jlam Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -115,6 +115,12 @@ ${TOOLS_DIR}/bin/makeinfo: ${_GNU_MISSING}
 
 _TOOLS=		awk grep sed
 
+.if defined(_IGNORE_USE_GNU_TOOLS)
+USE_GNU_TOOLS:=		# empty
+.else
+USE_GNU_TOOLS?=		# empty
+.endif
+
 # These platforms already have GNU versions of the tools in the base
 # system, so no need to pull in the pkgsrc versions; we will use these
 # instead.
@@ -131,7 +137,7 @@ _TOOLS_OPSYS_HAS_GNU.sed+=	Linux-*-*
 #
 _TOOLS_REPLACE_OPSYS.awk+=	SunOS-*-*
 _TOOLS_REPLACE_OPSYS.grep+=	SunOS-*-*
-_TOOLS_REPLACE_OPSYS.sed+=	# empty
+_TOOLS_REPLACE_OPSYS.sed+=	SunOS-*-*
 
 # These platforms have completely unusable versions of these tools, and
 # no suitable replacement is available.
@@ -166,15 +172,17 @@ _TOOLS_NEED_GNU.${_tool_}=	NO
 _TOOLS_NEED_GNU.${_tool_}=	YES
 .    endif
 .  endfor
+.endfor	# USE_GNU_TOOLS
 #
 # Are we using a GNUish system tool in place of the needed GNU tool?
 #
+.for _tool_ in ${_TOOLS}
 .  for _pattern_ in ${_TOOLS_REPLACE_OPSYS.${_tool_}}
 .    if !empty(MACHINE_PLATFORM:M${_pattern_})
-TOOLS_REPLACE.${_tool_}=	YES
+_TOOLS_REPLACE.${_tool_}=	YES
 .    endif
 .  endfor
-.endfor	# USE_GNU_TOOLS
+.endfor	_TOOLS
 
 .if ${_TOOLS_REPLACE.awk} == "YES"
 _TOOLS_OVERRIDE.awk=	YES
@@ -186,6 +194,10 @@ _TOOLS_OVERRIDE.awk=	YES
 _TOOLS_PROGNAME.awk=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
 AWK:=			${_TOOLS_PROGNAME.awk}
 .endif
+.if !empty(PKGPATH:Mlang/gawk)
+_TOOLS_OVERRIDE.awk=	NO
+MAKEFLAGS+=		_IGNORE_USE_GNU_TOOLS=
+.endif
 
 .if ${_TOOLS_REPLACE.grep} == "YES"
 _TOOLS_OVERRIDE.grep=	YES
@@ -197,6 +209,10 @@ _TOOLS_OVERRIDE.grep=	YES
 _TOOLS_PROGNAME.grep=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
 GREP:=			${_TOOLS_PROGNAME.grep}
 .endif
+.if !empty(PKGPATH:Mtextproc/grep)
+_TOOLS_OVERRIDE.grep=	NO
+MAKEFLAGS+=		_IGNORE_USE_GNU_TOOLS=
+.endif
 
 .if ${_TOOLS_REPLACE.sed} == "YES"
 _TOOLS_OVERRIDE.sed=	YES
@@ -208,6 +224,10 @@ _TOOLS_OVERRIDE.sed=	YES
 _TOOLS_PROGNAME.sed=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
 SED:=			${_TOOLS_PROGNAME.sed}
 .endif
+.if !empty(PKGPATH:Mtextproc/gsed)
+_TOOLS_OVERRIDE.sed=	NO
+MAKEFLAGS+=		_IGNORE_USE_GNU_TOOLS=
+.endif
 
 # If _TOOLS_OVERRIDE.<tool> is actually set to "YES", then we override
 # the tool with the one specified in _TOOLS_PROGNAME.<tool>.
author	jlam <jlam>	2003-08-19 20:11:08 +0000
committer	jlam <jlam>	2003-08-19 20:11:08 +0000
commit	11e39ec6fedfac4b0936c996f4f513f5a8752589 (patch)
tree	240859f7e79f4a13a9ff098fe5449adf86e04eb2
parent	d1693f7a3848b5faf7dd036ad41c2be92f4aeb0a (diff)
download	pkgsrc-11e39ec6fedfac4b0936c996f4f513f5a8752589.tar.gz