From face346f657170dafc746ccf599f8e6d6fabfe2a Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Thu, 15 Aug 2002 21:21:27 +0000 Subject: [PATCH] Fix build. Submitted by: Philip M. Gollucci --- sysutils/asfsm/Makefile | 3 - sysutils/asfsm/files/patch-aa | 170 ++++++++++++++++------------------ 2 files changed, 80 insertions(+), 93 deletions(-) diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile index 575be96ca876..0f21dbb28823 100644 --- a/sysutils/asfsm/Makefile +++ b/sysutils/asfsm/Makefile @@ -12,12 +12,9 @@ DISTNAME= asfsm-1.0pre15 MAINTAINER= jack@germanium.xtalwind.net -BROKEN= "Does not build" - USE_X_PREFIX= yes USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include/X11 MAN1= asfsm.1 diff --git a/sysutils/asfsm/files/patch-aa b/sysutils/asfsm/files/patch-aa index 9616164a0c39..b25fc62dcf87 100644 --- a/sysutils/asfsm/files/patch-aa +++ b/sysutils/asfsm/files/patch-aa @@ -1,90 +1,80 @@ -*** asfsm.c.orig Sun Oct 18 06:02:09 1998 ---- asfsm.c Fri Jun 4 11:10:15 1999 -*************** -*** 98,107 **** - int flag=0; - - /* figure out which "df -" command to use */ -! tempfile=popen("df -Bk","r"); - fscanf(tempfile,"%s",word); - if (!strcmp(word,"Filesystem")) { -! sprintf(dfcommand,"df -Bk"); - } else { - tempfile=popen("df -a","r"); - fscanf(tempfile,"%s",word); ---- 98,107 ---- - int flag=0; - - /* figure out which "df -" command to use */ -! tempfile=popen("df -k","r"); - fscanf(tempfile,"%s",word); - if (!strcmp(word,"Filesystem")) { -! sprintf(dfcommand,"df -k"); - } else { - tempfile=popen("df -a","r"); - fscanf(tempfile,"%s",word); -*************** -*** 135,161 **** - } - fclose(tempfile); - -- /* detect which user mount/unmount command to use */ -- /* by giving umnt a bum parameter (-h) and seeing if it */ -- /* returns anything about an illegal option or if it just says */ -- /* command not found. Different shells have different messages */ -- /* for not finding a command, and which behaves differently too, */ -- /* so this seems a reasonable way to do it. */ -- tempfile=popen("umnt -h > /usr/tmp/testumnt 2> /usr/tmp/testumnt; cat /usr/tmp/testumnt; rm /usr/tmp/testumnt","r"); -- while(!feof(tempfile)) { -- fscanf(tempfile,"%s",word); -- if (!strcmp("option",word)) { -- /* the response must have been -- umnt: ERROR: Illegal option -- h -- or something like it, the command exists */ -- sprintf(mountcmd,"mnt "); -- sprintf(umountcmd,"umnt "); -- flag=1; -- break; -- } -- } -- pclose(tempfile); -- - if (flag==0) { - /* otherwise, the mount/unmount commands must be used */ - sprintf(mountcmd,"mount "); ---- 135,140 ---- -*************** -*** 374,380 **** - fs[counter].percent, - fs[counter].mountdir); - if (strlen(fs[counter].mountdir)>0 && counter<23) { -! if (atoi(fs[counter].blocks)>0 || showzero==1) { - counter++; - } - } else { ---- 353,360 ---- - fs[counter].percent, - fs[counter].mountdir); - if (strlen(fs[counter].mountdir)>0 && counter<23) { -! if ((atoi(fs[counter].blocks)>0 || showzero==1) && -! (strcmp(fs[counter].mountdir, "/proc"))){ - counter++; - } - } else { -*************** -*** 721,727 **** - }; - - if (!feof(fstabfile)) { -! if (buffer[0]!='#') { - strcpy(fstab[fstabcounter].filesystem, - ""); - strcpy(fstab[fstabcounter].mountdir,""); ---- 701,707 ---- - }; - - if (!feof(fstabfile)) { -! if (buffer[0]!='#' && strncmp(buffer, "proc", 4)) { - strcpy(fstab[fstabcounter].filesystem, - ""); - strcpy(fstab[fstabcounter].mountdir,""); + +$FreeBSD$ + +--- asfsm.c.orig Sun Oct 18 12:02:09 1998 ++++ asfsm.c Thu Aug 15 23:19:02 2002 +@@ -2,10 +2,10 @@ + /* Author: David Muse 1997 */ + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #ifdef SIXTEENBIT + #include "16bit/surreal.xpm" + #include "16bit/purplestoneswirl.xpm" +@@ -98,10 +98,10 @@ + int flag=0; + + /* figure out which "df -" command to use */ +- tempfile=popen("df -Bk","r"); ++ tempfile=popen("df -k","r"); + fscanf(tempfile,"%s",word); + if (!strcmp(word,"Filesystem")) { +- sprintf(dfcommand,"df -Bk"); ++ sprintf(dfcommand,"df -k"); + } else { + tempfile=popen("df -a","r"); + fscanf(tempfile,"%s",word); +@@ -135,27 +135,6 @@ + } + fclose(tempfile); + +- /* detect which user mount/unmount command to use */ +- /* by giving umnt a bum parameter (-h) and seeing if it */ +- /* returns anything about an illegal option or if it just says */ +- /* command not found. Different shells have different messages */ +- /* for not finding a command, and which behaves differently too, */ +- /* so this seems a reasonable way to do it. */ +- tempfile=popen("umnt -h > /usr/tmp/testumnt 2> /usr/tmp/testumnt; cat /usr/tmp/testumnt; rm /usr/tmp/testumnt","r"); +- while(!feof(tempfile)) { +- fscanf(tempfile,"%s",word); +- if (!strcmp("option",word)) { +- /* the response must have been +- umnt: ERROR: Illegal option -- h +- or something like it, the command exists */ +- sprintf(mountcmd,"mnt "); +- sprintf(umountcmd,"umnt "); +- flag=1; +- break; +- } +- } +- pclose(tempfile); +- + if (flag==0) { + /* otherwise, the mount/unmount commands must be used */ + sprintf(mountcmd,"mount "); +@@ -374,7 +353,8 @@ + fs[counter].percent, + fs[counter].mountdir); + if (strlen(fs[counter].mountdir)>0 && counter<23) { +- if (atoi(fs[counter].blocks)>0 || showzero==1) { ++ if ((atoi(fs[counter].blocks)>0 || showzero==1) && ++ (strcmp(fs[counter].mountdir, "/proc"))){ + counter++; + } + } else { +@@ -721,7 +701,7 @@ + }; + + if (!feof(fstabfile)) { +- if (buffer[0]!='#') { ++ if (buffer[0]!='#' && strncmp(buffer, "proc", 4)) { + strcpy(fstab[fstabcounter].filesystem, + ""); + strcpy(fstab[fstabcounter].mountdir,"");