5 files changed, 128 insertions, 115 deletions

diff --git a/editors/uzap/files/patch-a b/editors/uzap/files/patch-a
index 6593df88550c..1e1f4624888d 100644
--- a/editors/uzap/files/patch-a
+++ b/editors/uzap/files/patch-a
@@ -1,40 +1,42 @@
-*** Makefile.orig	Thu Mar 30 20:04:11 1989
---- Makefile	Mon Jun 19 22:15:57 1995
-***************
-*** 1,7 ****
-  # Makefile for Uzap.
-! BINDIR = /usr/local
-! MANDIR = /usr/man/manl
-! MSECT = l
-  
-  uzap: uzap.o edit.o search.o screen.o
-  	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
---- 1,9 ----
-  # Makefile for Uzap.
-! BINDIR = ${PREFIX}/bin/
-! MANDIR = ${PREFIX}/man/man1
-! MSECT = 1
-! 
-! all: uzap
-  
-  uzap: uzap.o edit.o search.o screen.o
-  	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
-***************
-*** 19,26 ****
-  	cc -c -O screen.c
-  
-  install: uzap
-! 	install -s -m 771 uzap $(BINDIR)
-! 	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
-  
-  clean:
-! 	rm -f *.o core uzap
---- 21,28 ----
-  	cc -c -O screen.c
-  
-  install: uzap
-! 	install -s -m 755 -o bin -g bin uzap $(BINDIR)
-! 	install -c -m 644 -o bin -g bin uzap.man $(MANDIR)/uzap.$(MSECT)
-  
-  clean:
-! 	rm -f *.o core *.core uzap
+--- Makefile.orig	Thu Mar 30 10:04:11 1989
++++ Makefile	Sun Oct 19 02:17:28 2003
+@@ -1,26 +1,28 @@
+ # Makefile for Uzap.
+-BINDIR = /usr/local
+-MANDIR = /usr/man/manl
+-MSECT = l
++BINDIR = ${PREFIX}/bin/
++MANDIR = ${PREFIX}/man/man1
++MSECT = 1
++
++all: uzap
+ 
+ uzap: uzap.o edit.o search.o screen.o
+-	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
++	$(CC) $(CFLAGS) uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
+ 
+ uzap.o: uzap.c 
+-	cc -c -O uzap.c  
++	$(CC) -c $(CFLAGS) uzap.c  
+ 
+ edit.o: edit.c
+-	cc -c -O edit.c 
++	$(CC) -c $(CFLAGS) edit.c 
+ 
+ search.o: search.c
+-	cc -c -O search.c
++	$(CC) -c $(CFLAGS) search.c
+ 
+ screen.o: screen.c
+-	cc -c -O screen.c
++	$(CC) -c $(CFLAGS) screen.c
+ 
+ install: uzap
+-	install -s -m 771 uzap $(BINDIR)
+-	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
++	install -s -m 755 -o bin -g bin uzap $(BINDIR)
++	install -c -m 644 -o bin -g bin uzap.man $(MANDIR)/uzap.$(MSECT)
+ 
+ clean:
+-	rm -f *.o core uzap
++	rm -f *.o core *.core uzap
diff --git a/ftp/ncftp/files/patch-aa b/ftp/ncftp/files/patch-aa
index e2a827a4d1cc..7b5e57335254 100644
--- a/ftp/ncftp/files/patch-aa
+++ b/ftp/ncftp/files/patch-aa
@@ -1,36 +1,35 @@
-*** Makefile.orig	Sun Oct  1 17:50:58 1995
---- Makefile	Thu Nov 14 13:10:49 1996
-***************
-*** 13,19 ****
-  
-  # Program definitions.  See the README, part C.
-  #--------------------------------------------------------------------------
-! PDEFS =
-  #PDEFS = -DGETLINE
-  #PDEFS = -DREADLINE -DCURSES
-  #PDEFS = -DSOCKS
---- 13,19 ----
-  
-  # Program definitions.  See the README, part C.
-  #--------------------------------------------------------------------------
-! PDEFS = -DREADLINE
-  #PDEFS = -DGETLINE
-  #PDEFS = -DREADLINE -DCURSES
-  #PDEFS = -DSOCKS
-***************
-*** 53,59 ****
-  # You'll need to know where the Rconnect.o object file is if you want
-  #   to use Socks.
-  #--------------------------------------------------------------------------
-! LIBS =
-  #LIBS = -ldbmalloc
-  #LIBS = -lgetline
-  #LIBS = -lreadline -lcurses
---- 53,59 ----
-  # You'll need to know where the Rconnect.o object file is if you want
-  #   to use Socks.
-  #--------------------------------------------------------------------------
-! LIBS = -lreadline
-  #LIBS = -ldbmalloc
-  #LIBS = -lgetline
-  #LIBS = -lreadline -lcurses
+--- Makefile.orig	Sun Oct  1 17:50:58 1995
++++ Makefile	Sun Oct 19 02:18:45 2003
+@@ -13,7 +13,7 @@
+ 
+ # Program definitions.  See the README, part C.
+ #--------------------------------------------------------------------------
+-PDEFS =
++PDEFS = -DREADLINE
+ #PDEFS = -DGETLINE
+ #PDEFS = -DREADLINE -DCURSES
+ #PDEFS = -DSOCKS
+@@ -24,11 +24,12 @@
+ # Choose your compiler and flags below.  Make sure you use an ANSI compiler
+ # that handles new style function declarations and prototypes (gcc should).
+ #--------------------------------------------------------------------------
+-CC = cc
++CC ?= cc
+ #CC = gcc
+ 
++CFLAGS ?= -O -pipe
+ #CFLAGS = $(TERM_INC) -O
+-CFLAGS = $(TERM_INC) -O2
++CFLAGS += $(TERM_INC)
+ #CFLAGS = $(TERM_INC) -g
+ 
+ LFLAGS = -s
+@@ -53,7 +54,7 @@
+ # You'll need to know where the Rconnect.o object file is if you want
+ #   to use Socks.
+ #--------------------------------------------------------------------------
+-LIBS =
++LIBS = -lreadline
+ #LIBS = -ldbmalloc
+ #LIBS = -lgetline
+ #LIBS = -lreadline -lcurses
diff --git a/ftp/ncftp1/files/patch-aa b/ftp/ncftp1/files/patch-aa
index e2a827a4d1cc..7b5e57335254 100644
--- a/ftp/ncftp1/files/patch-aa
+++ b/ftp/ncftp1/files/patch-aa
@@ -1,36 +1,35 @@
-*** Makefile.orig	Sun Oct  1 17:50:58 1995
---- Makefile	Thu Nov 14 13:10:49 1996
-***************
-*** 13,19 ****
-  
-  # Program definitions.  See the README, part C.
-  #--------------------------------------------------------------------------
-! PDEFS =
-  #PDEFS = -DGETLINE
-  #PDEFS = -DREADLINE -DCURSES
-  #PDEFS = -DSOCKS
---- 13,19 ----
-  
-  # Program definitions.  See the README, part C.
-  #--------------------------------------------------------------------------
-! PDEFS = -DREADLINE
-  #PDEFS = -DGETLINE
-  #PDEFS = -DREADLINE -DCURSES
-  #PDEFS = -DSOCKS
-***************
-*** 53,59 ****
-  # You'll need to know where the Rconnect.o object file is if you want
-  #   to use Socks.
-  #--------------------------------------------------------------------------
-! LIBS =
-  #LIBS = -ldbmalloc
-  #LIBS = -lgetline
-  #LIBS = -lreadline -lcurses
---- 53,59 ----
-  # You'll need to know where the Rconnect.o object file is if you want
-  #   to use Socks.
-  #--------------------------------------------------------------------------
-! LIBS = -lreadline
-  #LIBS = -ldbmalloc
-  #LIBS = -lgetline
-  #LIBS = -lreadline -lcurses
+--- Makefile.orig	Sun Oct  1 17:50:58 1995
++++ Makefile	Sun Oct 19 02:18:45 2003
+@@ -13,7 +13,7 @@
+ 
+ # Program definitions.  See the README, part C.
+ #--------------------------------------------------------------------------
+-PDEFS =
++PDEFS = -DREADLINE
+ #PDEFS = -DGETLINE
+ #PDEFS = -DREADLINE -DCURSES
+ #PDEFS = -DSOCKS
+@@ -24,11 +24,12 @@
+ # Choose your compiler and flags below.  Make sure you use an ANSI compiler
+ # that handles new style function declarations and prototypes (gcc should).
+ #--------------------------------------------------------------------------
+-CC = cc
++CC ?= cc
+ #CC = gcc
+ 
++CFLAGS ?= -O -pipe
+ #CFLAGS = $(TERM_INC) -O
+-CFLAGS = $(TERM_INC) -O2
++CFLAGS += $(TERM_INC)
+ #CFLAGS = $(TERM_INC) -g
+ 
+ LFLAGS = -s
+@@ -53,7 +54,7 @@
+ # You'll need to know where the Rconnect.o object file is if you want
+ #   to use Socks.
+ #--------------------------------------------------------------------------
+-LIBS =
++LIBS = -lreadline
+ #LIBS = -ldbmalloc
+ #LIBS = -lgetline
+ #LIBS = -lreadline -lcurses
diff --git a/games/pentix/files/patch-aa b/games/pentix/files/patch-aa
index 0a82d5d16595..315105348f72 100644
--- a/games/pentix/files/patch-aa
+++ b/games/pentix/files/patch-aa
@@ -1,7 +1,12 @@
 --- Makefile.orig	Sat Sep 23 14:14:43 2000
-+++ Makefile	Sat Nov 11 01:42:49 2000
-@@ -4,9 +4,9 @@
- CFLAGS = -O2 -Wall
++++ Makefile	Sun Oct 19 02:22:03 2003
+@@ -1,12 +1,12 @@
+ # pentix make file
+ 
+-CC = cc
+-CFLAGS = -O2 -Wall
++CC ?= cc
++CFLAGS ?= -O -pipe
  LFLAGS = -lncurses 
  
 -BINDIR = /usr/local/bin
diff --git a/graphics/giftool/files/patch-aa b/graphics/giftool/files/patch-aa
new file mode 100644
index 000000000000..54fb7e481ccf
--- /dev/null
+++ b/graphics/giftool/files/patch-aa
@@ -0,0 +1,8 @@
+--- Makefile.orig	Fri Dec  9 11:16:58 1994
++++ Makefile	Sun Oct 19 02:23:29 2003
+@@ -1,4 +1,4 @@
+-CFLAGS = -O2
++CFLAGS ?= -O -pipe
+ 
+ LIBS = # -lsent
+