Fix build (use correct #include path and library name), and respect

CC and CFLAGS.

4 files changed, 116 insertions, 0 deletions

diff --git a/net/xisp/files/patch-Makefile.nodes b/net/xisp/files/patch-Makefile.nodes
new file mode 100644
index 000000000000..d69670accece
--- /dev/null
+++ b/net/xisp/files/patch-Makefile.nodes
@@ -0,0 +1,86 @@
+--- Makefile.nodes.orig	Sun Aug  8 06:43:28 1999
++++ Makefile.nodes	Wed Nov 27 04:43:56 2002
+@@ -201,10 +201,9 @@
+ GROUP      = dialer
+ CHAT_PATH  = /usr/bin
+ PPPD_PATH  = /usr/sbin
+-GCCFLAGS   = -Wall -O
+ EXTRALIBS  = 
+ LINKX11    = -Wl,-R$(LIBX11)
+-LINKFORMS  = -L$(LIBFORMS) -lxforms
++LINKFORMS  = -L$(LIBFORMS) -lforms
+ INSTALL    = /usr/bin/install
+ MODEM_DEV  = cuaa0
+ MODEM_DEVS = cuaa0 cuaa1 cuaa2 cuaa3
+@@ -238,7 +237,7 @@
+ #
+ # gcc option flags
+ #------------------
+-GCCOPTS   = $(GCCFLAGS) $(DEFINES) $(EXTRADEFS)
++GCCOPTS   = $(CFLAGS) $(DEFINES) $(EXTRADEFS)
+ #
+ #=====================================================================
+ #       You shouldn't need to edit anything below this line          |
+@@ -247,49 +246,49 @@
+ all: xisp xispdial xisprccv xispterm xispid
+ 
+ xisp: xisp.o nodes.o warn.o network.o rcio.o logs.o
+-	gcc $(LINKX11) -o xisp xisp.o nodes.o warn.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm -lmd
++	$(CC) $(LINKX11) -o xisp xisp.o nodes.o warn.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm -lmd
+ 
+ xisp.o: xisp.h xisp.c xisp.xpm version.h common.h pcode.h network.h rcio.h logs.h help.c peHelp.c excl.xpm
+-	gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c xisp.c
++	$(CC) $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c xisp.c
+ 
+ xisp.xpm:
+ 	cp $(XPMIMAGE) xisp.xpm
+ 
+ pcode.o: pcode.h pcode.c
+-	gcc $(GCCOPTS) -c pcode.c
++	$(CC) $(GCCOPTS) -c pcode.c
+ 
+ nodes.o: pcode.h
+-	gcc $(GCCOPTS) -c nodes.c
++	$(CC) $(GCCOPTS) -c nodes.c
+ 
+ warn.o:
+-	gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c warn.c
++	$(CC) $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c warn.c
+ 
+ nowarn.o:
+-	gcc $(GCCOPTS) -c nowarn.c
++	$(CC) $(GCCOPTS) -c nowarn.c
+ 
+ network.o: network.h network.c
+-	gcc $(GCCOPTS) -c network.c
++	$(CC) $(GCCOPTS) -c network.c
+ 
+ xispdial: xispdial.c common.h version.h
+-	gcc $(GCCOPTS) -o xispdial xispdial.c
++	$(CC) $(GCCOPTS) -o xispdial xispdial.c
+ 
+ xisprccv: xisprccv.o nodes.o nowarn.o
+ 	gcc -o xisprccv xisprccv.o nodes.o nowarn.o $(EXTRALIBS) -lm -lmd
+ 
+ xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h
+-	gcc $(GCCOPTS) -c xisprccv.c
++	$(CC) $(GCCOPTS) -c xisprccv.c
+ 
+ xispterm: xispterm.h xispterm.c
+-	gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
++	$(CC) $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm
+ 
+ rcio.o: rcio.h rcio.c common.h version.h
+-	gcc $(GCCOPTS) -c rcio.c
++	$(CC) $(GCCOPTS) -c rcio.c
+ 
+ logs.o: logs.h logs.c version.h
+-	gcc $(GCCOPTS) -c logs.c
++	$(CC) $(GCCOPTS) -c logs.c
+ 
+ xispid: xispid.c
+-	gcc $(GCCOPTS) -o xispid xispid.c
++	$(CC) $(GCCOPTS) -o xispid xispid.c
+ 
+ install: xisp xispdial xisprccv xispterm xispid
+ 	if [ ! -d $(DESTDIR)$(BINX11) ]; then $(INSTALL) -d $(DESTDIR)$(BINX11); fi
diff --git a/net/xisp/files/patch-warn.c b/net/xisp/files/patch-warn.c
new file mode 100644
index 000000000000..3eeae44484b8
--- /dev/null
+++ b/net/xisp/files/patch-warn.c
@@ -0,0 +1,8 @@
+--- warn.c.orig	Wed Nov 27 04:34:55 2002
++++ warn.c	Wed Nov 27 04:35:24 2002
+@@ -1,4 +1,4 @@
+-#include <forms.h>
++#include <X11/forms.h>
+ 
+ /*
+  * No DES information 
diff --git a/net/xisp/files/patch-xisp.c b/net/xisp/files/patch-xisp.c
new file mode 100644
index 000000000000..1286fff52fc4
--- /dev/null
+++ b/net/xisp/files/patch-xisp.c
@@ -0,0 +1,11 @@
+--- xisp.c.orig	Wed Nov 27 04:36:07 2002
++++ xisp.c	Wed Nov 27 04:36:12 2002
+@@ -18,7 +18,7 @@
+    For author contact information, look in the README file.
+ */
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/net/xisp/files/patch-xispterm.c b/net/xisp/files/patch-xispterm.c
new file mode 100644
index 000000000000..55aba061dd06
--- /dev/null
+++ b/net/xisp/files/patch-xispterm.c
@@ -0,0 +1,11 @@
+--- xispterm.c.orig	Wed Nov 27 04:35:03 2002
++++ xispterm.c	Wed Nov 27 04:35:08 2002
+@@ -18,7 +18,7 @@
+    For author contact information, look in the README file.
+ */
+ 
+-#include <forms.h>
++#include <X11/forms.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <varargs.h>