Imported from pacman-2.4.1.tar.gz

ChangeLog

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

Makefile.in

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

doc/makepkg.8.in

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

scripts/gensync

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

scripts/makepkg

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

scripts/makeworld

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

src/pacman.c

@@ -405,12 +405,6 @@ int pacman_sync(pacdb_t *db, PMList *targets)
 				/*fprintf(stderr, "%s: not found in sync db.  skipping.", local->name);*/
 				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 */
 			cmp = rpmvercmp(local->version, sync->pkg->version);
 			if(cmp > 0) {
@@ -422,6 +416,12 @@ int pacman_sync(pacdb_t *db, PMList *targets)
 			} else if(cmp == 0) {
 				/* versions are identical */
 				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 {
 				PMList *lp = NULL;
 				int found = 0;

src/pacman.h

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