Imported from pacman-2.4.1.tar.gz

This commit is contained in:
Judd Vinet 2003-04-19 22:31:38 +00:00
parent 37e13ea2d0
commit e9c6f3b213
8 changed files with 27 additions and 21 deletions

View file

@ -1,5 +1,6 @@
VERSION DESCRIPTION VERSION DESCRIPTION
------------------------------------------------------------------ ------------------------------------------------------------------
2.4.1 - Fixed a bug in makepkg's option parsing
2.4 - Added getopt-style options to makeworld 2.4 - Added getopt-style options to makeworld
- Added -w <destdir> to makepkg - Added -w <destdir> to makepkg
- makeworld now properly handles packages with --builddeps - makeworld now properly handles packages with --builddeps

View file

@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
PACVER = 2.4 PACVER = 2.4.1
TOPDIR = @srcdir@ TOPDIR = @srcdir@
SRCDIR = $(TOPDIR)/src/ SRCDIR = $(TOPDIR)/src/

View file

@ -1,8 +1,8 @@
.TH makepkg 8 "April 10, 2003" "makepkg #VERSION#" "" .TH makepkg 8 "April 19, 2003" "makepkg #VERSION#" ""
.SH NAME .SH NAME
makepkg \- package build utility makepkg \- package build utility
.SH SYNOPSIS .SH SYNOPSIS
\fBmakepkg [options] [build_script]\fP \fBmakepkg [options]\fP
.SH DESCRIPTION .SH DESCRIPTION
\fBmakepkg\fP will build packages for you. All it needs is \fBmakepkg\fP will build packages for you. All it needs is
a build-capable linux platform, wget, and some build scripts. The advantage a build-capable linux platform, wget, and some build scripts. The advantage
@ -261,6 +261,9 @@ the \fB--force\fP switch.
.B "\-w <destdir>" .B "\-w <destdir>"
Write the resulting package file to the directory \fI<destdir>\fP instead of the Write the resulting package file to the directory \fI<destdir>\fP instead of the
current working directory. current working directory.
.TP
.B "\-p <buildscript>"
Read the package script \fI<buildscript>\fP instead of the default (\fIPKGBUILD\fP).
.SH CONFIGURATION .SH CONFIGURATION
Configuration options are stored in \fI/etc/makepkg.conf\fP. This file is parsed Configuration options are stored in \fI/etc/makepkg.conf\fP. This file is parsed

View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
myver='2.4' myver='2.4.1'
usage() { usage() {
echo "gensync $myver" echo "gensync $myver"

View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
myver='2.4' myver='2.4.1'
startdir=`pwd` startdir=`pwd`
[ -f /etc/makepkg.conf ] && source /etc/makepkg.conf [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
@ -48,7 +48,7 @@ checkdeps() {
usage() { usage() {
echo "makepkg version $myver" echo "makepkg version $myver"
echo "usage: $0 [options] [build_script]" echo "usage: $0 [options]"
echo "options:" echo "options:"
echo " -c, --clean Clean up work files after build" echo " -c, --clean Clean up work files after build"
echo " -C, --cleancache Clean up source files from the cache" echo " -C, --cleancache Clean up source files from the cache"
@ -58,6 +58,7 @@ usage() {
echo " -i, --install Install package after successful build" echo " -i, --install Install package after successful build"
echo " -f, --force Overwrite existing package" echo " -f, --force Overwrite existing package"
echo " -w <destdir> Write package to <destdir> instead of the working dir" echo " -w <destdir> Write package to <destdir> instead of the working dir"
echo " -p <buildscript> Use an alternate build script (instead of PKGBUILD)"
echo " -h, --help This help" echo " -h, --help This help"
echo echo
echo " if build_script is not specified, makepkg will look for a PKGBUILD" echo " if build_script is not specified, makepkg will look for a PKGBUILD"
@ -88,10 +89,10 @@ while [ "$#" -ne "0" ]; do
--force) FORCE=1 ;; --force) FORCE=1 ;;
--*) --*)
usage usage
exit 1 exit 1
;; ;;
-*) -*)
while getopts "cCsbdifw:-" opt; do while getopts "cCsbdifp:w:-" opt; do
case $opt in case $opt in
c) CLEANUP=1 ;; c) CLEANUP=1 ;;
C) CLEANCACHE=1 ;; C) CLEANCACHE=1 ;;
@ -102,7 +103,9 @@ while [ "$#" -ne "0" ]; do
f) FORCE=1 ;; f) FORCE=1 ;;
w) w)
PKGDEST=$OPTARG PKGDEST=$OPTARG
shift ;;
p)
BUILDSCRIPT=$OPTARG
;; ;;
-) -)
OPTIND=0 OPTIND=0
@ -110,15 +113,13 @@ while [ "$#" -ne "0" ]; do
;; ;;
*) *)
usage usage
exit 1
;; ;;
esac esac
done done
;; ;;
*) *)
if [ "$#" -ne "1" ]; then true
usage
fi
BUILDSCRIPT=$1
;; ;;
esac esac
shift shift
@ -189,6 +190,7 @@ if [ `type -p pacman` -a "$NODEPS" = "0" ]; then
for pkgdir in $candidates; do for pkgdir in $candidates; do
if [ -f $pkgdir/PKGBUILD ]; then if [ -f $pkgdir/PKGBUILD ]; then
cd $pkgdir cd $pkgdir
echo makepkg -i -c -b -w $PKGDEST
makepkg -i -c -b -w $PKGDEST makepkg -i -c -b -w $PKGDEST
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
success=1 success=1

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
toplevel=`pwd` toplevel=`pwd`
version="2.4" version="2.4.1"
usage() { usage() {
echo "makeworld version $version" echo "makeworld version $version"

View file

@ -405,12 +405,6 @@ int pacman_sync(pacdb_t *db, PMList *targets)
/*fprintf(stderr, "%s: not found in sync db. skipping.", local->name);*/ /*fprintf(stderr, "%s: not found in sync db. skipping.", local->name);*/
continue; continue;
} }
/* check if package should be ignored */
if(is_in((char*)i->data, pmo_ignorepkg)) {
fprintf(stderr, ":: %s: ignoring package upgrade\n", (char*)i->data);
ignore = 1;
continue;
}
/* compare versions and see if we need to upgrade */ /* compare versions and see if we need to upgrade */
cmp = rpmvercmp(local->version, sync->pkg->version); cmp = rpmvercmp(local->version, sync->pkg->version);
if(cmp > 0) { if(cmp > 0) {
@ -422,6 +416,12 @@ int pacman_sync(pacdb_t *db, PMList *targets)
} else if(cmp == 0) { } else if(cmp == 0) {
/* versions are identical */ /* versions are identical */
continue; continue;
} else if(is_in((char*)i->data, pmo_ignorepkg)) {
/* package should be ignored (IgnorePkg) */
fprintf(stderr, ":: %s-%s: ignoring package upgrade (%s)\n",
local->name, local->version, sync->pkg->version);
ignore = 1;
continue;
} else { } else {
PMList *lp = NULL; PMList *lp = NULL;
int found = 0; int found = 0;

View file

@ -22,7 +22,7 @@
#define _PAC_PACMAN_H #define _PAC_PACMAN_H
#ifndef PACVER #ifndef PACVER
#define PACVER "2.4" #define PACVER "2.4.1"
#endif #endif
#ifndef PKGDIR #ifndef PKGDIR