kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to version 0.32.0

Browse source 
- Default values of variables PKG_SUFX, DISTDIR, PKGSRCDIR, BMAKE
    and PKG_INFO_CMD are embedded to scripts itself and are obtained
    from pkgsrc. Manual pages do not tell what is the default.

  - tests/test.sh:

    fix in regression test #3, pkgsrc vs. pkgsrc+wip ==> XXXX vs. XXXXX

    fix in regression test #11 (Darwin)

    "make test" doesn't need "make install" anymore
This commit is contained in:
Aleksey Cheusov 2009-09-19 13:31:58 +00:00 committed by Thomas Klausner
parent fd73b6c74e
commit d557c8d229
17 changed files with 59 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg_summary-utils/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.31 2009/08/10 19:37:06 cheusov Exp $
# $NetBSD: Makefile,v 1.32 2009/09/19 13:31:58 cheusov Exp $
DISTNAME= pkg_summary-utils-${VERSION}
CATEGORIES= pkgtools
@ -24,8 +24,6 @@ CONFLICTS+= pkg_src_update_summary-[0-9]*
CONFLICTS+= pkg_update_summary-[0-9]*
CONFLICTS+= pkg_summary4view-[0-9]*
.include "../../wip/pkg_summary-utils/files/Makefile.version"
TEST_TARGET= test
NO_CHECKSUM= yes
@ -44,7 +42,12 @@ MAKE_ENV+= MKCATPAGES=no
MAKE_ENV+= AWKMODDIR=${PREFIX}/share/runawk
MAKE_ENV+= SH=${SH:Q}
MAKE_ENV+= BMAKE=${MAKE:Q}
MAKE_ENV+= DISTDIR=${DISTDIR}
MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR}
MAKE_ENV+= PKG_SUFX=${PKG_SUFX}
MAKE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q}
AUTO_MKDIRS= yes
.include "../../wip/pkg_summary-utils/files/version.mk"
.include "../../mk/bsd.pkg.mk"

10
pkg_summary-utils/files/Makefile
View file

@ -6,19 +6,19 @@ MANDIR?= ${PREFIX}/man
DOCDIR= ${PREFIX}/share/doc/pkg_summary-utils
AWKMODDIR?= ${PREFIX}/share/awk
MKSCRIPTSDIR?= ${PREFIX}/share/psu_mk
DISTDIR?= /usr/pkgsrc/distfiles
INST_DIR?= ${INSTALL} -d
SH?= /bin/sh
AWK?= /usr/bin/awk
PKG_INFO_CMD?= /usr/sbin/pkg_info -K /var/db/pkg
# NetBSD make is required for pkgsrc
BMAKE?= /usr/bin/make
#############################################################
.include "Makefile.version"
SCRIPTS= pkg_cmp_summary pkg_list_all_pkgs
SCRIPTS+= pkg_refresh_summary pkg_src_fetch_var
SCRIPTS+= pkg_micro_src_summary pkg_src_summary
@ -61,6 +61,11 @@ PROJECTNAME= pkg_summary-utils
-e 's,@@mkscriptsdir@@,${MKSCRIPTSDIR},g' \
-e 's,@SH@,${SH},g' \
-e 's,@AWK@,${AWK},g' \
-e 's,@DISTDIR@,${DISTDIR},g' \
-e 's,@PKGSRCDIR@,${PKGSRCDIR},g' \
-e 's,@BMAKE@,${BMAKE},g' \
-e 's,@PKG_SUFX@,${PKG_SUFX},g' \
-e 's,@PKG_INFO_CMD@,${PKG_INFO_CMD},g' \
${.ALLSRC} > ${.TARGET} && chmod +x ${.TARGET}
.PHONY: clean-my
@ -100,4 +105,5 @@ test : all
############################################################
.include "version.mk"
.include <bsd.prog.mk>

1
pkg_summary-utils/files/Makefile.version
View file

@ -1 +0,0 @@
VERSION= 0.31.0

15
pkg_summary-utils/files/NEWS
View file

@ -1,3 +1,18 @@
----------------------------------------------------------------------
Version 0.32.0, by Aleksey Cheusov, Sat, 19 Sep 2009 15:18:45 +0300
- Default values of variables PKG_SUFX, DISTDIR, PKGSRCDIR, BMAKE
and PKG_INFO_CMD are embedded to scripts itself and are obtained
from pkgsrc. Manual pages do not tell what is the default.
- tests/test.sh:
fix in regression test #3, pkgsrc vs. pkgsrc+wip ==> XXXX vs. XXXXX
fix in regression test #11 (Darwin)
"make test" doesn't need "make install" anymore
----------------------------------------------------------------------
Version 0.31.0, by Aleksey Cheusov, Sun, 9 Aug 2009 21:08:34 +0300

4
pkg_summary-utils/files/pkg_cleanup_distdir.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_cleanup_distdir.1,v 1.1 2009/03/31 20:31:46 cheusov Exp $
.\" $NetBSD: pkg_cleanup_distdir.1,v 1.2 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2008 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -37,7 +37,7 @@ Remove unreferenced files and empty subdirectories
.SH ENVIRONMENT
.TP
.B DISTDIR
Directory that contains distfiles, it defaults to /usr/pkgsrc/distfiles
Directory that contains distfiles
.SH EXAMPLES
.VB
pkg_cleanup_distdir -r /usr/pkgsrc/pkg_src_summary.txt

2
pkg_summary-utils/files/pkg_cleanup_distdir.in
View file

@ -67,7 +67,7 @@ while test $# -ne 0; do
shift
done
DISTDIR=${DISTDIR:=/usr/pkgsrc/distfiles}
DISTDIR=${DISTDIR:=@DISTDIR@}
cd "$DISTDIR"
useful_distfiles (){

6
pkg_summary-utils/files/pkg_list_all_pkgs.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_list_all_pkgs.1,v 1.6 2008/11/07 17:55:46 cheusov Exp $
.\" $NetBSD: pkg_list_all_pkgs.1,v 1.7 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2008 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -31,10 +31,10 @@ display help message
.SH ENVIRONMENT
.TP
.B PKGSRCDIR
pkgsrc root directory, defaults to /usr/pkgsrc
pkgsrc root directory
.TP
.B BMAKE
path to pkgsrc friendly make utility, defaults to make
path to pkgsrc friendly make utility
.SH EXAMPLES
.VB
pkg_list_all_pkgs

4
pkg_summary-utils/files/pkg_list_all_pkgs.in
View file

@ -57,11 +57,11 @@ done
############################################################
# user settable variables
if test -z "$PKGSRCDIR"; then
PKGSRCDIR=/usr/pkgsrc
PKGSRCDIR=@PKGSRCDIR@
fi
if test -z "$BMAKE"; then
BMAKE=make
BMAKE=@BMAKE@
fi
############################################################

6
pkg_summary-utils/files/pkg_micro_src_summary.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_micro_src_summary.1,v 1.9 2008/11/07 17:55:46 cheusov Exp $
.\" $NetBSD: pkg_micro_src_summary.1,v 1.10 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2008 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -47,10 +47,10 @@ MAINTAINER etc., but not PLIST, DESCRIPTION, GZIP_CMD or similar.
.SH ENVIRONMENT
.TP
.B PKGSRCDIR
pkgsrc root directory, defaults to /usr/pkgsrc
pkgsrc root directory
.TP
.B BMAKE
path to pkgsrc friendly make utility, defaults to make
path to pkgsrc friendly make utility
.SH EXAMPLES
.VB
pkg_micro_src_summary wip/dict-server wip/dict-mueller7 x11/xxkb

9
pkg_summary-utils/files/pkg_micro_src_summary.in
View file

@ -28,13 +28,8 @@ set -e
############################################################
# user settable variables
if test -z "$PKGSRCDIR"; then
export PKGSRCDIR=/usr/pkgsrc # export - for pkg_src_fetch_var
fi
if test -z "$BMAKE"; then
export BMAKE=make
fi
export PKGSRCDIR=${PKGSRCDIR:=@PKGSRCDIR@} # export - for pkg_src_fetch_var
export BMAKE=${BMAKE:=@BMAKE@}
############################################################
tmpdir=/tmp/pkg_micro_src_summary.$$

6
pkg_summary-utils/files/pkg_src_summary.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_src_summary.1,v 1.21 2009/08/09 18:13:38 cheusov Exp $
.\" $NetBSD: pkg_src_summary.1,v 1.22 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2008 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -76,10 +76,10 @@ do not read list of packages from stdin and from pkgpathN arguments
.SH ENVIRONMENT
.TP
.B PKGSRCDIR
pkgsrc root directory, defaults to /usr/pkgsrc
pkgsrc root directory
.TP
.B BMAKE
path to pkgsrc friendly make utility, defaults to make
path to pkgsrc friendly make utility
.TP
.B PSS_SLAVES
Space separated list of remote hosts or +<Number> for distributed

13
pkg_summary-utils/files/pkg_src_summary.in
View file

@ -32,17 +32,10 @@ export LC_ALL=C
############################################################
# user settable variables
if test -z "$PKGSRCDIR"; then
PKGSRCDIR=/usr/pkgsrc
fi
PKGSRCDIR=${PKGSRCDIR:=@PKGSRCDIR@}
BMAKE=${BMAKE:=@BMAKE@}
PSS_MKSCRIPTSDIR=${PSS_MKSCRIPTSDIR:=@@mkscriptsdir@@}
if test -z "$BMAKE"; then
BMAKE=make
fi
if test -z "$PSS_MKSCRIPTSDIR"; then
PSS_MKSCRIPTSDIR=@@mkscriptsdir@@
fi
############################################################
usage (){
cat 1>&2 <<EOF

6
pkg_summary-utils/files/pkg_update_src_summary.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_update_src_summary.1,v 1.12 2008/11/07 17:55:46 cheusov Exp $
.\" $NetBSD: pkg_update_src_summary.1,v 1.13 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2008 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -48,10 +48,10 @@ pkg_src_summary(1)
.SH ENVIRONMENT
.TP
.B PKGSRCDIR
pkgsrc root directory, defaults to /usr/pkgsrc
pkgsrc root directory
.TP
.B BMAKE
path to pkgsrc friendly make utility, defaults to make
path to pkgsrc friendly make utility
.TP
.B PSS_OPTIONS
passed to pkg_src_summary subprocesses

9
pkg_summary-utils/files/pkg_update_src_summary.in
View file

@ -28,13 +28,8 @@ set -e
############################################################
# user settable variables
if test -z "$PKGSRCDIR"; then
PKGSRCDIR=/usr/pkgsrc
fi
if test -z "$BMAKE"; then
BMAKE=make
fi
PKGSRCDIR=${PKGSRCDIR:=@PKGSRCDIR@}
BMAKE=${BMAKE:=@BMAKE@}
############################################################
usage (){

6
pkg_summary-utils/files/pkg_update_summary.1
View file

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_update_summary.1,v 1.6 2008/11/07 17:55:46 cheusov Exp $
.\" $NetBSD: pkg_update_summary.1,v 1.7 2009/09/19 13:31:58 cheusov Exp $
.\"
.\" Copyright (c) 2007 by Aleksey Cheusov (vle@gmx.net)
.\" Absolutely no warranty.
@ -54,13 +54,13 @@ only newest versions for each PKGPATH:PKGBASE pair is kept in summary
.SH ENVIRONMENT
.TP
.B PKG_SUFX
Binary package extension, either .tgz or .tbz, defaults to '.tgz'
Binary package extension (either .tgz or .tbz).
.TP
.B TEST_CMD
Solaris's test command does not like option -nt, defaults to 'test'
.TP
.B PKG_INFO_CMD
Path to pkg_info command, defaults to 'pkg_info'
Path to pkg_info command
.SH EXAMPLES
.VB
pkg_update_summary /srv/packages/All/pkg_summary.txt /srv/packages/All

8
pkg_summary-utils/files/pkg_update_summary.in
View file

@ -57,14 +57,10 @@ while test $# -ne 0; do
shift
done
if test -z "$PKG_SUFX"; then
PKG_SUFX=.tgz
fi
PKG_SUFX=${PKG_SUFX:=@PKG_SUFX@}
PKG_SUFX_RE="`echo $PKG_SUFX | sed 's,[.],[.],g'`"
if test -z "$PKG_INFO_CMD"; then
PKG_INFO_CMD=pkg_info
fi
PKG_INFO_CMD="${PKG_INFO_CMD:=@PKG_INFO_CMD@}"
if test -z "$TEST_CMD"; then
TEST_CMD=test

1
pkg_summary-utils/files/version.mk Normal file
View file

@ -0,0 +1 @@
VERSION= 0.32.0