Update from the port maintainer:

Cleaner compile and make depend cycle.

Update of FreeBSD's version numbers.

(Closing PR #1875.)

Submitted by:	Lars Koeller

4 files changed, 34 insertions, 36 deletions

diff --git a/sysutils/xperfmon/files/patch-aa b/sysutils/xperfmon/files/patch-aa
index c13332da725f..34596e00688b 100644
--- a/sysutils/xperfmon/files/patch-aa
+++ b/sysutils/xperfmon/files/patch-aa
@@ -1,9 +1,9 @@
-diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 *** ../xperfmon++/freebsd_system.c	Thu Jan  1 01:00:00 1970
---- ./freebsd_system.c	Mon May  6 18:39:46 1996
+--- ./freebsd_system.c	Sun Sep 22 17:14:41 1996
 ***************
 *** 0 ****
---- 1,580 ----
+--- 1,581 ----
 + /*
 +  * Perfmon Performance Monitor
 +  *
@@ -11,7 +11,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 +  * Copyright 1989, PCS Computer Systeme GmbH, West Germany
 +  * Copyright 1994, Sterling Software @ NASA-Ames Research Center
 +  * Copyright 1995, Regents of the University of California,
-+  *                 Lars Köller <Lars_Koeller@odie.physik2.uni-rostock.de
++  *                 Lars Kler <Lars_Koeller@odie.physik2.uni-rostock.de
 +  *
 +  * Permission to use, copy, modify, distribute, and sell this software and its
 +  * documentation for any purpose is hereby granted without fee, provided that
@@ -102,7 +102,8 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 +  * 2.2-current has been bumped to 199512 recently).  Recognize the old
 +  * 2.2-current as NFSv3 for a grace period.
 +  * FreeBSD 2.0.5 was 199504, btw.  Both, 2.0.5 and 2.1 don't have
-+  * NFSv3.  (FreeBSD-2.1.5 is 199607)
++  * NFSv3.
++  * Also 2.1.5 which is 199607 don't have NFSv3! So check > 199607
 +  */
 + #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
 + # define HAS_NFS_V3
diff --git a/sysutils/xperfmon/files/patch-ab b/sysutils/xperfmon/files/patch-ab
index 34865c5ce92c..3ae8e1169082 100644
--- a/sysutils/xperfmon/files/patch-ab
+++ b/sysutils/xperfmon/files/patch-ab
@@ -18,14 +18,15 @@ diff -cd ../xperfmon++/Imakefile ./Imakefile
   
   ComplexProgramTarget(xperfmon++)
   
---- 17,37 ----
-  SYS_MODULE=	sgi_system
+--- 17,38 ----
+  SYS_MODULE=   sgi_system
   #endif
   
 ! #if defined (FreeBSDArchitecture)
-! FreeBSDFLAGS=	-lkvm
+! FreeBSDFLAGS= -lkvm
 ! SYS_MODULE=     freebsd_system
-! CC=		gcc -D_HAVE_PARAM_H
+! CC=           gcc
+! EXTRA_DEFINES=  -D_HAVE_PARAM_H
 ! #endif
 ! 
 ! EXTRA_LIBRARIES =     $(SUNFLAGS) $(MIPSFLAGS) $(SGIFLAGS) $(FreeBSDFLAGS)
@@ -39,10 +40,7 @@ diff -cd ../xperfmon++/Imakefile ./Imakefile
 !        OBJS = TimeChart.o StripChart.o misc.o $(SYS_MODULE).o xperfmon.o
   
   ComplexProgramTarget(xperfmon++)
-  
-Only in ../xperfmon++: Imakefile.old
-Only in ../xperfmon++: Makefile
-Only in ./: RCS
+
 diff -cd ../xperfmon++/README ./README
 *** ../xperfmon++/README	Wed Jul 27 22:29:30 1994
 --- ./README	Sat May  4 10:46:36 1996
@@ -54,20 +52,20 @@ diff -cd ../xperfmon++/README ./README
   
 + 
 + 3-15-95		Completely new port of systemdependent file (bsd_system.c) for FreeBSD-2.X
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
 + 
 + 8-16-95		Quick and dirty workaround of -geometry option bug.
 + 		But there are still some side effects when changing the geometry. 
 + 		Fix memory leak in bsd_system.c
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
 + 
 + 30-10-95	Change 'Free Mem' graph to 'Free Swap' cause the FreeBSD memory system
 + 		tries to minimize the free unused amount of memory.
 + 		Include basic support for FreeBSD > 2.1.
 + 		Number of interrupts now independent from 'Update Intervall'
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 + 
 + 11-12-95        Fix -geometry bug! Now there is only a MIN_WIDTH of 185 pixels, and the
@@ -76,13 +74,13 @@ diff -cd ../xperfmon++/README ./README
 + 		Change 'Free  Swap' graph from absolut into percent values.
 + 		All graphs shoud be independent of the 'Update Intervall'.
 + 		Modify graph labels and add unit of each graph.
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 + 
 + 5-4-96		Fix some event problems that consumes a lot of cpu power after resizing
 + 		(mwm) or restart of an window manager. Make xperfmon compile with
 + 		FreeBSD-current (2.2, changes in get_swapspace)
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 diff -cd ../xperfmon++/XPerfmon++.ad ./XPerfmon++.ad
 *** ../xperfmon++/XPerfmon++.ad	Wed Jul 27 22:29:32 1994
diff --git a/sysutils/xperfmon3/files/patch-aa b/sysutils/xperfmon3/files/patch-aa
index c13332da725f..34596e00688b 100644
--- a/sysutils/xperfmon3/files/patch-aa
+++ b/sysutils/xperfmon3/files/patch-aa
@@ -1,9 +1,9 @@
-diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 *** ../xperfmon++/freebsd_system.c	Thu Jan  1 01:00:00 1970
---- ./freebsd_system.c	Mon May  6 18:39:46 1996
+--- ./freebsd_system.c	Sun Sep 22 17:14:41 1996
 ***************
 *** 0 ****
---- 1,580 ----
+--- 1,581 ----
 + /*
 +  * Perfmon Performance Monitor
 +  *
@@ -11,7 +11,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 +  * Copyright 1989, PCS Computer Systeme GmbH, West Germany
 +  * Copyright 1994, Sterling Software @ NASA-Ames Research Center
 +  * Copyright 1995, Regents of the University of California,
-+  *                 Lars Köller <Lars_Koeller@odie.physik2.uni-rostock.de
++  *                 Lars Kler <Lars_Koeller@odie.physik2.uni-rostock.de
 +  *
 +  * Permission to use, copy, modify, distribute, and sell this software and its
 +  * documentation for any purpose is hereby granted without fee, provided that
@@ -102,7 +102,8 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
 +  * 2.2-current has been bumped to 199512 recently).  Recognize the old
 +  * 2.2-current as NFSv3 for a grace period.
 +  * FreeBSD 2.0.5 was 199504, btw.  Both, 2.0.5 and 2.1 don't have
-+  * NFSv3.  (FreeBSD-2.1.5 is 199607)
++  * NFSv3.
++  * Also 2.1.5 which is 199607 don't have NFSv3! So check > 199607
 +  */
 + #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
 + # define HAS_NFS_V3
diff --git a/sysutils/xperfmon3/files/patch-ab b/sysutils/xperfmon3/files/patch-ab
index 34865c5ce92c..3ae8e1169082 100644
--- a/sysutils/xperfmon3/files/patch-ab
+++ b/sysutils/xperfmon3/files/patch-ab
@@ -18,14 +18,15 @@ diff -cd ../xperfmon++/Imakefile ./Imakefile
   
   ComplexProgramTarget(xperfmon++)
   
---- 17,37 ----
-  SYS_MODULE=	sgi_system
+--- 17,38 ----
+  SYS_MODULE=   sgi_system
   #endif
   
 ! #if defined (FreeBSDArchitecture)
-! FreeBSDFLAGS=	-lkvm
+! FreeBSDFLAGS= -lkvm
 ! SYS_MODULE=     freebsd_system
-! CC=		gcc -D_HAVE_PARAM_H
+! CC=           gcc
+! EXTRA_DEFINES=  -D_HAVE_PARAM_H
 ! #endif
 ! 
 ! EXTRA_LIBRARIES =     $(SUNFLAGS) $(MIPSFLAGS) $(SGIFLAGS) $(FreeBSDFLAGS)
@@ -39,10 +40,7 @@ diff -cd ../xperfmon++/Imakefile ./Imakefile
 !        OBJS = TimeChart.o StripChart.o misc.o $(SYS_MODULE).o xperfmon.o
   
   ComplexProgramTarget(xperfmon++)
-  
-Only in ../xperfmon++: Imakefile.old
-Only in ../xperfmon++: Makefile
-Only in ./: RCS
+
 diff -cd ../xperfmon++/README ./README
 *** ../xperfmon++/README	Wed Jul 27 22:29:30 1994
 --- ./README	Sat May  4 10:46:36 1996
@@ -54,20 +52,20 @@ diff -cd ../xperfmon++/README ./README
   
 + 
 + 3-15-95		Completely new port of systemdependent file (bsd_system.c) for FreeBSD-2.X
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
 + 
 + 8-16-95		Quick and dirty workaround of -geometry option bug.
 + 		But there are still some side effects when changing the geometry. 
 + 		Fix memory leak in bsd_system.c
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
 + 
 + 30-10-95	Change 'Free Mem' graph to 'Free Swap' cause the FreeBSD memory system
 + 		tries to minimize the free unused amount of memory.
 + 		Include basic support for FreeBSD > 2.1.
 + 		Number of interrupts now independent from 'Update Intervall'
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 + 
 + 11-12-95        Fix -geometry bug! Now there is only a MIN_WIDTH of 185 pixels, and the
@@ -76,13 +74,13 @@ diff -cd ../xperfmon++/README ./README
 + 		Change 'Free  Swap' graph from absolut into percent values.
 + 		All graphs shoud be independent of the 'Update Intervall'.
 + 		Modify graph labels and add unit of each graph.
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 + 
 + 5-4-96		Fix some event problems that consumes a lot of cpu power after resizing
 + 		(mwm) or restart of an window manager. Make xperfmon compile with
 + 		FreeBSD-current (2.2, changes in get_swapspace)
-+ 		by Lars Köller @University of Rostock, Germany.
++ 		by Lars K$B(Bler @University of Rostock, Germany.
 + 		E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
 diff -cd ../xperfmon++/XPerfmon++.ad ./XPerfmon++.ad
 *** ../xperfmon++/XPerfmon++.ad	Wed Jul 27 22:29:32 1994