%n pms %v 3.33 %c * %l * %b * %d * %f * %t pms-3.33.tgz %w Linux %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N pms-3.33/Makefile pms-MCC/Makefile --- pms-3.33/Makefile Thu Jul 14 03:36:00 1994 +++ pms-MCC/Makefile Sat Aug 10 00:41:28 1996 @@ -9,8 +9,8 @@ CC= gcc -CFLAGS= -O2 -m486 -Wall +CFLAGS= -O6 -m386 -fomit-frame-pointer -Dpms_ftw=ftw LDFLAGS= -s -pms: pms.c ftw.o system.o +pms: pms.o system.o ftw.o: ftw.c @@ -19,6 +19,6 @@ install: pms pms.1 - install -m 755 pms /bin - install -m 644 pms.1 /usr/man/man1 + install -s -m 555 pms /usr/bin + install -m 444 pms.1 /usr/man/man1 && gzip -9f /usr/man/man1/pms.1 clean: diff -ru2N pms-3.33/pms.1 pms-MCC/pms.1 --- pms-3.33/pms.1 Sun Jul 10 18:19:00 1994 +++ pms-MCC/pms.1 Sat Aug 10 00:34:28 1996 @@ -118,5 +118,5 @@ .B -P option (or -.IR /var/adm/pms , +.IR /var/log/pms , by default). .TP @@ -170,4 +170,15 @@ environment variable for compilation). .TP +.BI \-X " path" +Equivalent to +.BI \-T " path " \-P " path " \-S +.IR " /tmp" . +This allows the tar and notes files to be in the same directory; +the variable +.B PMSTARDIR +does not contain either +.RI \" TAR_FILES \" +or the 'where' element. +.TP .BI \-Bc " package" Build the package, from source, up through compilation (i.e., but do not @@ -506,5 +517,5 @@ .B .old versions of the files are deleted and the "Notes" file (usually in -.IR /var/adm/pms ) +.IR /var/log/pms ) is updated to reflect the filenames, modes, and owners listed in the tar file. Finally, a @@ -520,5 +531,5 @@ and will print information about the package. The default directory is -.I /var/adm/pms +.I /var/log/pms and can be changed with the .B \-P diff -ru2N pms-3.33/pms.c pms-MCC/pms.c --- pms-3.33/pms.c Wed Jul 20 18:01:00 1994 +++ pms-MCC/pms.c Sat Aug 10 00:34:28 1996 @@ -50,5 +50,5 @@ #define VERSION "$Revision: 3.33 $" -#define DEFAULT_PMSPATH "var/adm/pms" +#define DEFAULT_PMSPATH "var/log/pms" #define DEFAULT_SOURCEPATH "usr/src" #define ALTERNATE_NOTES_NAME "NOTES" @@ -77,4 +77,5 @@ static int BuildInstall = 0; static int BuildAll = 0; +static int UseLongTarPath = 1; static char *MyPath = NULL; static char *PackageName = NULL; @@ -320,5 +321,5 @@ if (!fetch( "tar tvvf 2>/dev/null" ) || !*count) { Compressed = 1; - fetch( "tar ztvvf" ); + fetch( "tar zitvvf" ); } @@ -528,5 +529,5 @@ if (UseTarDotOld) { /* Maybe we are untarring tar? */ if (Compressed) - sprintf( buffer, "tar.old zxvvpCf %s %s", Root, filename ); + sprintf( buffer, "tar.old zixvvpCf %s %s", Root, filename ); else sprintf( buffer, "tar.old xvvpCf %s %s", Root, filename ); @@ -536,5 +537,5 @@ if (Compressed) - sprintf( buffer, "tar zxvvpCf %s %s", Root, filename ); + sprintf( buffer, "tar zixvvpCf %s %s", Root, filename ); else sprintf( buffer, "tar xvvpCf %s %s", Root, filename ); @@ -1305,8 +1306,8 @@ if (TarPath[ strlen( TarPath ) - 1 ] == '/') - sprintf( buffer, "tar zScvvpTf %s %s%s.tar.gz", + sprintf( buffer, "tar ziScvvpTf %s %s%s.tar.gz", tmp_file, TarPath, pkg ); else - sprintf( buffer, "tar zScvvpTf %s %s/%s.tar.gz", + sprintf( buffer, "tar ziScvvpTf %s %s/%s.tar.gz", tmp_file, TarPath, pkg ); @@ -1405,5 +1406,5 @@ fprintf( strOut, "cd $BUILDDIR\n" ); fprintf( strOut, "rm -rf $NAME-$VERSION\n" ); - fprintf( strOut, "tar zxvf $SRCTARDIR/$TARFILE\n" ); + fprintf( strOut, "tar zixvf $SRCTARDIR/$TARFILE\n" ); fprintf( strOut, "cd $NAME-$VERSION\n" ); fprintf( strOut, "\n" ); @@ -1522,4 +1523,5 @@ fprintf( strOut, "export WHERE=%s\n", where ); fprintf( strOut, "export BUILDDIR=%s/%s\n", SourcePath, where ); + if (UseLongTarPath) fprintf( strOut, "export SRCTARDIR=%s/%sTAR_FILES/%s\n", @@ -1527,4 +1529,5 @@ PrivateTarFiles ? "PRIVATE_" : "", where ); + else fprintf( strOut, "export SRCTARDIR=%s", TarPath ); break; case 'p': @@ -1604,4 +1607,5 @@ " [-P path] (pms path)\n" " [-S path] (source path)\n" + " [-X path] (pms and source path)\n" " [-B opt package] (build)\n" " [-p] (use private tar files)\n" @@ -1641,5 +1645,5 @@ if (tmp) PMSPath = strdup( tmp ); - while ((c = getopt( argc, argv, "vi:lq:d:f:t:pDnR:T:P:S:B:" )) != EOF) + while ((c = getopt( argc, argv, "vi:lq:d:f:t:pDnR:T:P:S:X:B:" )) != EOF) switch (c) { case 'D': ++Debug; break; @@ -1653,4 +1657,6 @@ case 'R': Root = optarg; break; case 'T': TarPath = optarg; break; + case 'X': TarPath = optarg; SourcePath = "/tmp"; + UseLongTarPath = 0; case 'P': PMSPath = optarg; break; case 'S': SourcePath = optarg; break; ENDPATCH make * make install %%